misc minor doc fixes

Author: benkeen

clients/forms/edit_submission.php

@@ -74,7 +74,7 @@
 // handle POST requests
 $failed_validation = false;
 if (isset($_POST) && !empty($_POST)) {
-	// add the view ID to the request hash, for use by the ft_update_submission function
+	// add the view ID to the request hash, for use by the Submissions::updateSubmission method
 	$request["view_id"] = $view_id;
 	$request["editable_field_ids"] = $editable_field_ids;
 	list($success, $message) = Submissions::updateSubmission($form_id, $submission_id, $request);

global/code/Emails.class.php

@@ -1511,7 +1511,7 @@ private static function getFormEmailFieldHeaders($form_email_id, $submission_inf
 
 
     /**
-     * This function is tightly coupled with ft_get_email_components and has gotten increasingly more awful as
+     * This function is tightly coupled with Emails::getEmailComponents and has gotten increasingly more awful as
      * time passed. It examines the content of an email template and detects any field and file attachments.
      * Field attachments are files that have been uploaded through a form field; file attachments are just files
      * on the server that want to be sent out. It then returns the updated email template (i.e. minus the
@@ -1521,6 +1521,7 @@ private static function getFormEmailFieldHeaders($form_email_id, $submission_inf
      * @param string $template_str the email template (HTML or text)
      * @param integer $form_id
      * @param array $submission_placeholders
+	 * @return array
      */
     private static function extractEmailAttachmentInfo($template_str, $form_id, $submission_placeholders)
     {
@@ -1605,7 +1606,7 @@ private static function extractEmailAttachmentInfo($template_str, $form_id, $sub
 
 
     /**
-     * Strongly coupled with the ft_get_email_components function, this does the legwork to find out exactly what
+     * Strongly coupled with the Emails::getEmailComponents method, this does the legwork to find out exactly what
      * text and HTML (Smarty) content should be in the emails. Returns BOTH, regardless of whether the template is
      * only using one.
      *
@@ -1614,6 +1615,7 @@ private static function extractEmailAttachmentInfo($template_str, $form_id, $sub
      * @param array $email_template
      * @param boolean $is_test
      * @param array $test_settings
+	 * @return array
      */
     private static function getEmailTemplateContent($form_id, $submission_id, $email_template, $is_test, $test_settings)
     {

global/code/FieldSizes.class.php

@@ -74,10 +74,11 @@ public static function generateFieldTypeSizesMapJs($namespace = "page_ns")
 
 
     /**
-     * The counterpart function to ft_generate_field_type_sizes_map_js: this generate a hash of field size keys (1char, tiny, etc)
+     * The counterpart function to FieldSizes::generateFieldTypeSizesMapJs: this generate a hash of field size keys (1char, tiny, etc)
      * to their label (in the appropriate language).
      *
      * @param string $namespace
+	 * @return string
      */
     public static function generateFieldTypeSizeLabels($namespace = "page_ns")
     {

global/code/FieldTypes.class.php

@@ -912,7 +912,7 @@ public static function getFileFieldTypeIds()
 	 *                     anything else you want
 	 *                field_types - all, or any that are relevant. But it should be an array, anyway
 	 *                value - the actual value stored in the field
-	 *                settings - (from ft_get_settings())
+	 *                settings - (from Settings::get())
 	 * @return string
 	 */
 	public static function generateViewableField($params)

global/code/Fields.class.php

@@ -937,7 +937,7 @@ public static function getNumFormFields($form_id)
 
     /**
      * A getter function to retrieve everything about a form field from the database column name. This is used in
-     * the ft_search_submissions function.
+     * the Submissions::searchSubmissions method.
      *
      * @param integer $form_id
      * @param string $col_name

global/code/General.class.php

@@ -1142,8 +1142,8 @@ public static function generatePassword($length = 8)
 
 
 	/**
-	 * This was added in 2.1.0. and replaces ft_build_and_cache_upgrade_info() which really wasn't necessary.
-	 * It returns a hash of information to pass in a hidden form when the user clicks "Update".
+	 * Returns a hash of information to pass in a hidden form when the user clicks "Update".
+	 * @return array
 	 */
 	public static function getFormtoolsInstalledComponents()
 	{

global/code/Hooks.class.php

@@ -257,7 +257,7 @@ function_name = :function_name
 
     /**
      * This processes all template hooks for a particular template location (e.g. edit client page, at the top).
-     * It works similarly to the ft_process_hooks function, except there are no options to override values in the
+     * It works similarly to the Hooks::processHooks function, except there are no options to override values in the
      * template. This is used purely to insert content into the templates.
      *
      * @param string $location

global/code/Menus.class.php

@@ -539,9 +539,8 @@ public static function getAdminMenu()
     }
 
     /**
-     * A wrapper function for ft_get_client_menu (and getAdminMenu). Returns all info
-     * about a menu, regardless of type. If it's an admin menu, it'll be returned with an empty "clients"
-     * hash key.
+     * A wrapper function for Menus::getClientMenu (and getAdminMenu). Returns all info about a menu, regardless of
+	 * type. If it's an admin menu, it'll be returned with an empty "clients" hash key.
      *
      * @param integer $menu_id
      * @return
@@ -627,7 +626,7 @@ public static function getMenuItems($menu_id)
     /**
      * Called whenever an item is removed from a menu - OUTSIDE of the main administrator update menu
      * pages (client & admin). This updates the order to ensure its consistent (i.e. no gaps). Note:
-     * this doesn't update the cached menu. If that's needed, you need to call the ft_cache_account_menu
+     * this doesn't update the cached menu. If that's needed, you need to call the Menus::cacheAccountMenu
      * function separately
      *
      * @param integer $menu_id

global/code/Modules.class.php

@@ -776,10 +776,10 @@ public static function getModuleNamespace($module_folder)
     }
 
     /**
-     * Sets one or more module settings. This basically acts as a wrapper function for ft_set_settings,
+     * Sets one or more module settings. This basically acts as a wrapper function for Settings::set(),
      * which ensures that the module field is set appropriately.
      *
-     * @param array $setting_name a hash of "setting_name" => "setting_value"
+     * @param array hash of "setting_name" => "setting_value"
      */
     public static function setModuleSettings($settings)
     {

global/code/OptionLists.class.php

@@ -320,7 +320,7 @@ public static function getOptionList($list_id)
      *   [1] => ...
      *
      * Whether or not the option list is grouped is found in the "is_grouped" field in the ft_option_lists
-     * table. That info is not returned by this function - only by ft_get_option_list().
+     * table. That info is not returned by this function - only by OptionsLists::getOptionList().
      *
      * @param integer $list_id the option list ID
      * @return array