From 4a5ffa7a12c687b46346be9052a3d2fdaeecebee Mon Sep 17 00:00:00 2001 From: Crack Date: Tue, 3 Aug 2010 00:55:57 +0200 Subject: [PATCH] File comments: - remove @license and @version from comments - add vim settings - change descriptions in form definition files --- libraries/config/ConfigFile.class.php | 4 +- libraries/config/Form.class.php | 4 +- libraries/config/FormDisplay.class.php | 4 +- libraries/config/FormDisplay.tpl.php | 4 +- libraries/config/config_functions.lib.php | 2 +- libraries/config/messages.inc.php | 4 +- libraries/config/setup.forms.php | 15 +- libraries/config/user_preferences.forms.php | 12 +- libraries/config/validate.lib.php | 4 +- libraries/user_preferences.inc.php | 3 +- setup/config.php | 5 +- setup/frames/config.inc.php | 5 +- setup/frames/form.inc.php | 5 +- setup/frames/index.inc.php | 4 +- setup/frames/menu.inc.php | 4 +- setup/frames/servers.inc.php | 4 +- setup/index.php | 1 - setup/lib/ConfigGenerator.class.php | 5 +- setup/lib/common.inc.php | 4 +- setup/lib/form_processing.lib.php | 5 +- setup/lib/forms.inc.php | 5 +- setup/lib/index.lib.php | 6 +- setup/lib/messages.inc.php | 380 -------------------- setup/validate.php | 6 +- 24 files changed, 58 insertions(+), 437 deletions(-) delete mode 100644 setup/lib/messages.inc.php diff --git a/libraries/config/ConfigFile.class.php b/libraries/config/ConfigFile.class.php index 3b9d6f231..41ffe4b07 100644 --- a/libraries/config/ConfigFile.class.php +++ b/libraries/config/ConfigFile.class.php @@ -1,9 +1,9 @@ array(1 => array( - * 'pmadb' => 'phpmyadmin'))); + * 'Servers/1/pmadb' => 'phpmyadmin' * - * @package phpMyAdmin-setup - * @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0 - * @version $Id$ + * To group options, use: + * ':group:' . __('group name') // just define a group + * or + * 'option' => ':group' // group starting from this option + * End group blocks with: + * ':group:end' + * + * @package phpMyAdmin-setup */ $forms = array(); diff --git a/libraries/config/user_preferences.forms.php b/libraries/config/user_preferences.forms.php index 0e913b9d6..a5e5e62f1 100644 --- a/libraries/config/user_preferences.forms.php +++ b/libraries/config/user_preferences.forms.php @@ -1,13 +1,21 @@ 'phpmyadmin'); + * 'Servers/1/pmadb' => 'phpmyadmin' + * + * To group options, use: + * ':group:' . __('group name') // just define a group + * or + * 'option' => ':group' // group starting from this option + * End group blocks with: + * ':group:end' * * @package phpMyAdmin */ diff --git a/libraries/config/validate.lib.php b/libraries/config/validate.lib.php index b44281593..d5e2f7616 100644 --- a/libraries/config/validate.lib.php +++ b/libraries/config/validate.lib.php @@ -1,4 +1,5 @@ * @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0 - * @version $Id$ */ /** diff --git a/setup/lib/ConfigGenerator.class.php b/setup/lib/ConfigGenerator.class.php index bae95a59f..ddad7f124 100644 --- a/setup/lib/ConfigGenerator.class.php +++ b/setup/lib/ConfigGenerator.class.php @@ -1,14 +1,15 @@ array(1 => array( * 'pmadb' => 'phpmyadmin'))); * - * @package phpMyAdmin-setup - * @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0 - * @version $Id$ + * @package phpMyAdmin-setup */ $forms = array(); diff --git a/setup/lib/index.lib.php b/setup/lib/index.lib.php index 151480da2..17c9cf675 100644 --- a/setup/lib/index.lib.php +++ b/setup/lib/index.lib.php @@ -1,14 +1,12 @@ , http://yehg.net/lab * Version check taken from the old setup script by Michal Čihař * - * @package phpMyAdmin-setup - * @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0 - * @version $Id$ + * @package phpMyAdmin-setup */ if (!defined('PHPMYADMIN')) { diff --git a/setup/lib/messages.inc.php b/setup/lib/messages.inc.php deleted file mode 100644 index d1ceb05ed..000000000 --- a/setup/lib/messages.inc.php +++ /dev/null @@ -1,380 +0,0 @@ - diff --git a/setup/validate.php b/setup/validate.php index e8d7a7f6d..beeba71ce 100644 --- a/setup/validate.php +++ b/setup/validate.php @@ -1,11 +1,9 @@ - * @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0 - * @version $Id$ + * @package phpMyAdmin-setup */ /**