- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11680-g6b75d60
by Michal Čihař 22 Jul '11

22 Jul '11

The branch, master has been updated via 6b75d60e91d8a937e3356ce1aad673be0ee0bfaa (commit) from 236582fb4f86ed8ae6022afc17af37e1d4a19cb9 (commit) - Log ----------------------------------------------------------------- commit 6b75d60e91d8a937e3356ce1aad673be0ee0bfaa Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Jul 22 09:27:49 2011 +0200 Document that this is IPv4 only ----------------------------------------------------------------------- Summary of changes: libraries/ip_allow_deny.lib.php | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/libraries/ip_allow_deny.lib.php b/libraries/ip_allow_deny.lib.php index 2b969d1..ad4b4a3 100644 --- a/libraries/ip_allow_deny.lib.php +++ b/libraries/ip_allow_deny.lib.php @@ -4,6 +4,8 @@ * This library is used with the server IP allow/deny host authentication * feature * + * @todo Broken for IPv6 + * * @package phpMyAdmin */ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11679-g236582f
by Michal Čihař 22 Jul '11

22 Jul '11

The branch, master has been updated via 236582fb4f86ed8ae6022afc17af37e1d4a19cb9 (commit) from 9405dbb82a38ca03e0d5a54e06b73be80ec51692 (commit) - Log ----------------------------------------------------------------- commit 236582fb4f86ed8ae6022afc17af37e1d4a19cb9 Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Jul 22 09:25:14 2011 +0200 Fix mistakenly broken regexp ----------------------------------------------------------------------- Summary of changes: libraries/common.lib.php | 2 +- libraries/ip_allow_deny.lib.php | 4 ++-- libraries/sqlparser.lib.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 1607d6e..27d99bc 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -567,7 +567,7 @@ function PMA_mysqlDie($error_message = '', $the_query = '', } // end if if (!empty($error_message)) { - $error_message = preg_replace("@((\015\012)|(\015)|(\012)) {3,}@", "\n\n", $error_message); + $error_message = preg_replace("@((\015\012)|(\015)|(\012)){3,}@", "\n\n", $error_message); } // modified to show the help on error-returns // (now error-messages-server) diff --git a/libraries/ip_allow_deny.lib.php b/libraries/ip_allow_deny.lib.php index c8481ba..2b969d1 100644 --- a/libraries/ip_allow_deny.lib.php +++ b/libraries/ip_allow_deny.lib.php @@ -30,7 +30,7 @@ function PMA_getIp() $trusted_header_value = PMA_getenv($GLOBALS['cfg']['TrustedProxies'][$direct_ip]); $matches = array(); // the $ checks that the header contains only one IP address, ?: makes sure the () don't capture - $is_ip = preg_match('|^(?:[0-9]{1,3}\.) {3,3}[0-9]{1,3}$|', $trusted_header_value, $matches); + $is_ip = preg_match('|^(?:[0-9]{1,3}\.){3,3}[0-9]{1,3}$|', $trusted_header_value, $matches); if ($is_ip && (count($matches) == 1)) { // True IP behind a proxy return $matches[0]; @@ -46,7 +46,7 @@ function PMA_getIp() * Based on IP Pattern Matcher * Originally by J.Adams <jna(a)retina.net> * Found on <http://www.php.net/manual/en/function.ip2long.php> - * Modified for phpMyAdmin + * Modified for phpMyAdmin * * Matches: * xxx.xxx.xxx.xxx (exact) diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php index 267d99b..91ec780 100644 --- a/libraries/sqlparser.lib.php +++ b/libraries/sqlparser.lib.php @@ -2725,7 +2725,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { function PMA_SQP_formatNone($arr) { $formatted_sql = htmlspecialchars($arr['raw']); - $formatted_sql = preg_replace("@((\015\012)|(\015)|(\012)) {3,}@", "\n\n", $formatted_sql); + $formatted_sql = preg_replace("@((\015\012)|(\015)|(\012)){3,}@", "\n\n", $formatted_sql); return $formatted_sql; } // end of the "PMA_SQP_formatNone()" function hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11678-g9405dbb
by Michal Čihař 22 Jul '11

22 Jul '11

The branch, master has been updated via 9405dbb82a38ca03e0d5a54e06b73be80ec51692 (commit) from 25bda8e991f2820971c343315cd3ab3d974b2684 (commit) - Log ----------------------------------------------------------------- commit 9405dbb82a38ca03e0d5a54e06b73be80ec51692 Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Jul 22 09:21:55 2011 +0200 Fix spacing after @param ----------------------------------------------------------------------- Summary of changes: db_search.php | 8 +- export.php | 2 +- libraries/Config.class.php | 30 ++-- libraries/Error.class.php | 18 +- libraries/Error_Handler.class.php | 22 ++-- libraries/File.class.php | 32 ++-- libraries/Index.class.php | 28 ++-- libraries/List.class.php | 6 +- libraries/List_Database.class.php | 14 +- libraries/Message.class.php | 72 ++++---- libraries/StorageEngine.class.php | 16 +- libraries/Table.class.php | 108 ++++++------ libraries/Theme.class.php | 16 +- libraries/Theme_Manager.class.php | 10 +- libraries/Tracker.class.php | 72 ++++---- libraries/blowfish.php | 8 +- libraries/bookmark.lib.php | 20 +- libraries/charset_conversion.lib.php | 6 +- libraries/common.lib.php | 222 +++++++++++++------------- libraries/core.lib.php | 58 ++++---- libraries/database_interface.lib.php | 122 +++++++------- libraries/db_info.inc.php | 6 +- libraries/db_structure.lib.php | 10 +- libraries/display_select_lang.lib.php | 4 +- libraries/display_tbl.lib.php | 148 ++++++++-------- libraries/export/codegen.php | 16 +- libraries/export/csv.php | 16 +- libraries/export/htmlword.php | 36 ++-- libraries/export/json.php | 16 +- libraries/export/latex.php | 38 ++-- libraries/export/mediawiki.php | 16 +- libraries/export/ods.php | 16 +- libraries/export/odt.php | 36 ++-- libraries/export/pdf.php | 16 +- libraries/export/php_array.php | 16 +- libraries/export/sql.php | 70 ++++---- libraries/export/texytext.php | 36 ++-- libraries/export/xls.php | 16 +- libraries/export/xlsx.php | 16 +- libraries/export/xml.php | 16 +- libraries/export/yaml.php | 16 +- libraries/file_listing.php | 10 +- libraries/grab_globals.lib.php | 6 +- libraries/iconv_wrapper.lib.php | 6 +- libraries/import.lib.php | 50 +++--- libraries/ip_allow_deny.lib.php | 6 +- libraries/js_escape.lib.php | 6 +- libraries/kanji-encoding.lib.php | 14 +- libraries/mysql_charsets.lib.php | 4 +- libraries/opendocument.lib.php | 4 +- libraries/plugin_interface.lib.php | 40 +++--- libraries/relation.lib.php | 86 +++++----- libraries/sanitizing.lib.php | 4 +- libraries/select_lang.lib.php | 6 +- libraries/select_server.lib.php | 4 +- libraries/server_synchronize.lib.php | 294 ++++++++++++++++---------------- libraries/sql_query_form.lib.php | 12 +- libraries/sqlparser.lib.php | 34 ++-- libraries/sqlvalidator.class.php | 68 ++++---- libraries/sqlvalidator.lib.php | 2 +- libraries/string.lib.php | 16 +- libraries/string_mb.lib.php | 16 +- libraries/string_native.lib.php | 16 +- libraries/string_type_ctype.lib.php | 14 +- libraries/string_type_native.lib.php | 14 +- libraries/transformations.lib.php | 22 ++-- libraries/url_generating.lib.php | 16 +- libraries/zip.lib.php | 8 +- libraries/zip_extension.lib.php | 4 +- main.php | 16 +- navigation.php | 14 +- pmd_common.php | 2 +- server_privileges.php | 14 +- tbl_relation.php | 8 +- tbl_tracking.php | 8 +- 75 files changed, 1147 insertions(+), 1147 deletions(-) diff --git a/db_search.php b/db_search.php index 6191b14..acbe0cb 100644 --- a/db_search.php +++ b/db_search.php @@ -113,10 +113,10 @@ if (isset($_REQUEST['submit_search'])) { * explode * count * strlen - * @param string the table name - * @param string restrict the search to this field - * @param string the string to search - * @param integer type of search (1 -> 1 word at least, 2 -> all words, + * @param string the table name + * @param string restrict the search to this field + * @param string the string to search + * @param integer type of search (1 -> 1 word at least, 2 -> all words, * 3 -> exact string, 4 -> regexp) * * @return array 3 SQL querys (for count, display and delete results) diff --git a/export.php b/export.php index 36c1d58..d7c2f87 100644 --- a/export.php +++ b/export.php @@ -129,7 +129,7 @@ $time_start = time(); * Output handler for all exports, if needed buffering, it stores data into * $dump_buffer, otherwise it prints thems out. * - * @param string $line the insert statement + * @param string $line the insert statement * @return bool Whether output suceeded */ function PMA_exportOutputHandler($line) diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 28f9ac3..0130252 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -75,7 +75,7 @@ class PMA_Config /** * constructor * - * @param string source to read config from + * @param string source to read config from */ function __construct($source = null) { @@ -333,7 +333,7 @@ class PMA_Config * loads configuration from $source, usally the config file * should be called on object creation * - * @param string $source config file + * @param string $source config file */ function load($source = null) { @@ -563,7 +563,7 @@ class PMA_Config /** * set source - * @param string $source + * @param string $source */ function setSource($source) { @@ -635,7 +635,7 @@ class PMA_Config /** * returns specific config setting - * @param string $setting + * @param string $setting * @return mixed value */ function get($setting) @@ -649,8 +649,8 @@ class PMA_Config /** * sets configuration variable * - * @param string $setting configuration option - * @param string $value new value for configuration option + * @param string $setting configuration option + * @param string $value new value for configuration option */ function set($setting, $value) { @@ -1075,7 +1075,7 @@ class PMA_Config * returns options for font size selection * * @static - * @param string $current_size current selected font size with unit + * @param string $current_size current selected font size with unit * @return array selectable font sizes */ static protected function _getFontsizeOptions($current_size = '82%') @@ -1135,7 +1135,7 @@ class PMA_Config * returns html selectbox for font sizes * * @static - * @param string $current_size currently slected font size with unit + * @param string $current_size currently slected font size with unit * @return string html selectbox */ static protected function _getFontsizeSelection() @@ -1169,7 +1169,7 @@ class PMA_Config * return complete font size selection form * * @static - * @param string $current_size currently slected font size with unit + * @param string $current_size currently slected font size with unit * @return string html selectbox */ static public function getFontsizeForm() @@ -1187,7 +1187,7 @@ class PMA_Config /** * removes cookie * - * @param string $cookie name of cookie to remove + * @param string $cookie name of cookie to remove * @return boolean result of setcookie() */ function removeCookie($cookie) @@ -1200,11 +1200,11 @@ class PMA_Config * sets cookie if value is different from current cokkie value, * or removes if value is equal to default * - * @param string $cookie name of cookie to remove - * @param mixed $value new cookie value - * @param string $default default value - * @param int $validity validity of cookie in seconds (default is one month) - * @param bool $httponlt whether cookie is only for HTTP (and not for scripts) + * @param string $cookie name of cookie to remove + * @param mixed $value new cookie value + * @param string $default default value + * @param int $validity validity of cookie in seconds (default is one month) + * @param bool $httponlt whether cookie is only for HTTP (and not for scripts) * @return boolean result of setcookie() */ function setCookie($cookie, $value, $default = null, $validity = null, $httponly = true) diff --git a/libraries/Error.class.php b/libraries/Error.class.php index e5d105c..1925a61 100644 --- a/libraries/Error.class.php +++ b/libraries/Error.class.php @@ -93,10 +93,10 @@ class PMA_Error extends PMA_Message /** * Constructor * - * @param integer $errno - * @param string $errstr - * @param string $errfile - * @param integer $errline + * @param integer $errno + * @param string $errstr + * @param string $errfile + * @param integer $errline */ public function __construct($errno, $errstr, $errfile, $errline) { @@ -116,7 +116,7 @@ class PMA_Error extends PMA_Message /** * sets PMA_Error::$_backtrace * - * @param array $backtrace + * @param array $backtrace */ public function setBacktrace($backtrace) { @@ -126,7 +126,7 @@ class PMA_Error extends PMA_Message /** * sets PMA_Error::$_line * - * @param integer $line + * @param integer $line */ public function setLine($line) { @@ -136,7 +136,7 @@ class PMA_Error extends PMA_Message /** * sets PMA_Error::$_file * - * @param string $file + * @param string $file */ public function setFile($file) { @@ -147,7 +147,7 @@ class PMA_Error extends PMA_Message /** * returns unique PMA_Error::$_hash, if not exists it will be created * - * @param string $file + * @param string $file * @return string PMA_Error::$_hash */ public function getHash() @@ -329,7 +329,7 @@ class PMA_Error extends PMA_Message * and make users feel save to submit error reports * * @static - * @param string $dest path to be shorten + * @param string $dest path to be shorten * @return string shortened path */ static function relPath($dest) diff --git a/libraries/Error_Handler.class.php b/libraries/Error_Handler.class.php index f65dc4b..1a9cdb0 100644 --- a/libraries/Error_Handler.class.php +++ b/libraries/Error_Handler.class.php @@ -83,10 +83,10 @@ class PMA_Error_Handler * Do not use the context parameter as we want to avoid storing the * complete $GLOBALS inside $_SESSION['errors'] * - * @param integer $errno - * @param string $errstr - * @param string $errfile - * @param integer $errline + * @param integer $errno + * @param string $errstr + * @param string $errfile + * @param integer $errline */ public function handleError($errno, $errstr, $errfile, $errline) { @@ -126,7 +126,7 @@ class PMA_Error_Handler * log error to configured log facility * * @todo finish! - * @param PMA_Error $error + * @param PMA_Error $error */ protected function _logError($error) { @@ -136,10 +136,10 @@ class PMA_Error_Handler /** * trigger a custom error * - * @param string $errorInfo - * @param integer $errorNumber - * @param string $file - * @param integer $line + * @param string $errorInfo + * @param integer $errorNumber + * @param string $file + * @param integer $line */ public function triggerError($errorInfo, $errorNumber = null, $file = null, $line = null) { @@ -150,7 +150,7 @@ class PMA_Error_Handler /** * display fatal error and exit * - * @param PMA_Error $error + * @param PMA_Error $error */ protected function _dispFatalError($error) { @@ -191,7 +191,7 @@ class PMA_Error_Handler /** * display HTML header * - * @param PMA_error $error + * @param PMA_error $error */ protected function _dispPageStart($error = null) { diff --git a/libraries/File.class.php b/libraries/File.class.php index 031a266..bad9bca 100644 --- a/libraries/File.class.php +++ b/libraries/File.class.php @@ -78,7 +78,7 @@ class PMA_File * constructor * * @access public - * @param string $name file name + * @param string $name file name */ function __construct($name = false) { @@ -129,7 +129,7 @@ class PMA_File * file objects with temp flags are deleted with object destruction * * @access public - * @param boolean sets the temp flag + * @param boolean sets the temp flag * @return boolean PMA_File::$_is_temp */ function isTemp($is_temp = null) @@ -145,7 +145,7 @@ class PMA_File * accessor * * @access public - * @param string $name file name + * @param string $name file name */ function setName($name) { @@ -208,7 +208,7 @@ class PMA_File /** * @access public - * @param string name of file uploaded + * @param string name of file uploaded * @return boolean success */ function setUploadedFile($name) @@ -226,8 +226,8 @@ class PMA_File /** * @access public - * @param string $key the md5 hash of the column name - * @param string $rownumber + * @param string $key the md5 hash of the column name + * @param string $rownumber * @return boolean success */ function setUploadedFromTblChangeRequest($key, $rownumber) @@ -319,9 +319,9 @@ class PMA_File * * @access public * @static - * @param array $file the array - * @param string $rownumber - * @param string $key + * @param array $file the array + * @param string $rownumber + * @param string $key * @return array */ function fetchUploadedFromTblChangeRequestMultiple($file, $rownumber, $key) @@ -341,8 +341,8 @@ class PMA_File * sets the name if the file to the one selected in the tbl_change form * * @access public - * @param string $key the md5 hash of the column name - * @param string $rownumber + * @param string $key the md5 hash of the column name + * @param string $rownumber * @return boolean success */ function setSelectedFromTblChangeRequest($key, $rownumber = null) @@ -421,8 +421,8 @@ class PMA_File * and uses the submitted/selected file * * @access public - * @param string $key the md5 hash of the column name - * @param string $rownumber + * @param string $key the md5 hash of the column name + * @param string $rownumber * @return boolean success */ function checkTblChangeForm($key, $rownumber) @@ -444,7 +444,7 @@ class PMA_File /** * * @access public - * @param string $name + * @param string $name * @return boolean success */ function setLocalSelectedFile($name) @@ -672,7 +672,7 @@ class PMA_File /** * advances the file pointer in the file handle by $length bytes/chars * - * @param integer $length numbers of chars/bytes to skip + * @param integer $length numbers of chars/bytes to skip * @return boolean * @todo this function is unused */ @@ -808,7 +808,7 @@ class PMA_File * sets reference to most recent BLOB repository reference * * @access public - * @param string - BLOB repository reference + * @param string - BLOB repository reference */ static function setRecentBLOBReference($ref) { diff --git a/libraries/Index.class.php b/libraries/Index.class.php index 7cc4799..25f613f 100644 --- a/libraries/Index.class.php +++ b/libraries/Index.class.php @@ -86,7 +86,7 @@ class PMA_Index /** * Constructor * - * @param array $params + * @param array $params */ public function __construct($params = array()) { @@ -111,8 +111,8 @@ class PMA_Index /** * returns an array with all indexes from the given table * - * @param string $table - * @param string $schema + * @param string $table + * @param string $schema * @return array */ static public function getFromTable($table, $schema) @@ -129,8 +129,8 @@ class PMA_Index /** * return primary if set, false otherwise * - * @param string $table - * @param string $schema + * @param string $table + * @param string $schema * @return mixed primary index or false if no one exists */ static public function getPrimary($table, $schema) @@ -147,8 +147,8 @@ class PMA_Index /** * Load index data for table * - * @param string $table - * @param string $schema + * @param string $table + * @param string $schema * @return boolean */ static protected function _loadIndexes($table, $schema) @@ -176,7 +176,7 @@ class PMA_Index /** * Add column to index * - * @param array $params column params + * @param array $params column params */ public function addColumn($params) { @@ -216,7 +216,7 @@ class PMA_Index /** * Returns true if $column indexed in this index * - * @param string $column + * @param string $column * @return boolean */ public function hasColumn($column) @@ -403,10 +403,10 @@ class PMA_Index /** * Show index data * - * @param string $table The tablename - * @param array $indexes_info Referenced info array - * @param array $indexes_data Referenced data array - * @param boolean $print_mode + * @param string $table The tablename + * @param array $indexes_info Referenced info array + * @param array $indexes_data Referenced data array + * @param boolean $print_mode * @access public * @return array Index collection array */ @@ -539,7 +539,7 @@ class PMA_Index * Function to check over array of indexes and look for common problems * * @access public - * @param string name of table + * @param string name of table * @return string Output HTML */ static public function findDuplicates($table, $schema) diff --git a/libraries/List.class.php b/libraries/List.class.php index 83a42c1..694546a 100644 --- a/libraries/List.class.php +++ b/libraries/List.class.php @@ -52,7 +52,7 @@ abstract class PMA_List extends ArrayObject * checks if the given db names exists in the current list, if there is * missing at least one item it returns false otherwise true * - * @param string $db_name,.. one or more mysql result resources + * @param string $db_name,.. one or more mysql result resources * @return boolean true if all items exists, otheriwse false */ public function exists() @@ -70,8 +70,8 @@ abstract class PMA_List extends ArrayObject /** * returns HTML <option>-tags to be used inside <select></select> * - * @param mixed $selected the selected db or true for selecting current db - * @param boolean $include_information_schema + * @param mixed $selected the selected db or true for selecting current db + * @param boolean $include_information_schema * @return string HTML option tags */ public function getHtmlOptions($selected = '', $include_information_schema = true) diff --git a/libraries/List_Database.class.php b/libraries/List_Database.class.php index 7616f60..259bbf8 100644 --- a/libraries/List_Database.class.php +++ b/libraries/List_Database.class.php @@ -56,8 +56,8 @@ require_once './libraries/List.class.php'; /** * Constructor * - * @param mixed $db_link_user user database link resource|object - * @param mixed $db_link_control control database link resource|object + * @param mixed $db_link_user user database link resource|object + * @param mixed $db_link_control control database link resource|object */ public function __construct($db_link_user = null, $db_link_control = null) { @@ -89,7 +89,7 @@ require_once './libraries/List.class.php'; * retrieves database list from server * * @todo we could also search mysql tables if all fail? - * @param string $like_db_name usally a db_name containing wildcards + * @param string $like_db_name usally a db_name containing wildcards */ protected function _retrieve($like_db_name = null) { @@ -219,8 +219,8 @@ require_once './libraries/List.class.php'; /** * returns array with dbs grouped with extended infos * - * @param integer $offset - * @param integer $count + * @param integer $offset + * @param integer $count * @return array db list */ public function getGroupedDetails($offset, $count) @@ -297,8 +297,8 @@ require_once './libraries/List.class.php'; /** * returns a part of the items * - * @param integer $offset - * @param integer $count + * @param integer $offset + * @param integer $count * @return array some items */ public function getLimitedItems($offset, $count) diff --git a/libraries/Message.class.php b/libraries/Message.class.php index d5e7d07..5a6afac 100644 --- a/libraries/Message.class.php +++ b/libraries/Message.class.php @@ -137,10 +137,10 @@ class PMA_Message /** * Constructor * - * @param string $string - * @param integer $number - * @param array $params - * @param integer $sanitize + * @param string $string + * @param integer $number + * @param array $params + * @param integer $sanitize */ public function __construct($string = '', $number = PMA_Message::NOTICE, $params = array(), $sanitize = PMA_Message::SANITIZE_NONE) @@ -166,7 +166,7 @@ class PMA_Message * shorthand for getting a simple success message * * @static - * @param string $string a localized string e.g. __('Your SQL query has been executed successfully') + * @param string $string a localized string e.g. __('Your SQL query has been executed successfully') * @return PMA_Message */ static public function success($string = '') @@ -184,7 +184,7 @@ class PMA_Message * shorthand for getting a simple error message * * @static - * @param string $string a localized string e.g. __('Error') + * @param string $string a localized string e.g. __('Error') * @return PMA_Message */ static public function error($string = '') @@ -202,7 +202,7 @@ class PMA_Message * shorthand for getting a simple notice message * * @static - * @param string $string a localized string e.g. __('The additional features for working with linked tables have been deactivated. To find out why click %shere%s.') + * @param string $string a localized string e.g. __('The additional features for working with linked tables have been deactivated. To find out why click %shere%s.') * @return PMA_Message */ static public function notice($string) @@ -216,8 +216,8 @@ class PMA_Message * shorthand for getting a customized message * * @static - * @param string $message - * @param integer $type + * @param string $message + * @param integer $type * @return PMA_Message */ static public function raw($message, $type = PMA_Message::NOTICE) @@ -233,7 +233,7 @@ class PMA_Message * shorthand for getting a customized message * * @static - * @param integer $rows Number of rows + * @param integer $rows Number of rows * @return PMA_Message */ static public function affected_rows($rows) @@ -249,7 +249,7 @@ class PMA_Message * shorthand for getting a customized message * * @static - * @param integer $rows Number of rows + * @param integer $rows Number of rows * @return PMA_Message */ static public function deleted_rows($rows) @@ -265,7 +265,7 @@ class PMA_Message * shorthand for getting a customized message * * @static - * @param integer $rows Number of rows + * @param integer $rows Number of rows * @return PMA_Message */ static public function inserted_rows($rows) @@ -281,7 +281,7 @@ class PMA_Message * shorthand for getting a customized error message * * @static - * @param string $message + * @param string $message * @return PMA_Message */ static public function rawError($message) @@ -295,7 +295,7 @@ class PMA_Message * shorthand for getting a customized notice message * * @static - * @param string $message + * @param string $message * @return PMA_Message */ static public function rawNotice($message) @@ -309,7 +309,7 @@ class PMA_Message * shorthand for getting a customized success message * * @static - * @param string $message + * @param string $message * @return PMA_Message */ static public function rawSuccess($message) @@ -321,7 +321,7 @@ class PMA_Message * returns whether this message is a success message or not * and optionaly makes this message a success message * - * @param boolean $set + * @param boolean $set * @return boolean whether this is a success message or not */ public function isSuccess($set = false) @@ -337,7 +337,7 @@ class PMA_Message * returns whether this message is a notice message or not * and optionally makes this message a notice message * - * @param boolean $set + * @param boolean $set * @return boolean whether this is a notice message or not */ public function isNotice($set = false) @@ -353,7 +353,7 @@ class PMA_Message * returns whether this message is an error message or not * and optionally makes this message an error message * - * @param boolean $set + * @param boolean $set * @return boolean whether this is an error message or not */ public function isError($set = false) @@ -368,8 +368,8 @@ class PMA_Message /** * set raw message (overrides string) * - * @param string $message - * @param boolean $sanitize whether to sanitize $message or not + * @param string $message + * @param boolean $sanitize whether to sanitize $message or not */ public function setMessage($message, $sanitize = false) { @@ -382,8 +382,8 @@ class PMA_Message /** * set string (does not take effect if raw message is set) * - * @param string $_string - * @param boolean $sanitize whether to sanitize $string or not + * @param string $_string + * @param boolean $sanitize whether to sanitize $string or not */ public function setString($_string, $sanitize = true) { @@ -396,7 +396,7 @@ class PMA_Message /** * set message type number * - * @param integer $number + * @param integer $number */ public function setNumber($number) { @@ -413,8 +413,8 @@ class PMA_Message * $message->addParam('<img src="img" />', false); * </code> * - * @param mixed $param - * @param boolean $raw + * @param mixed $param + * @param boolean $raw */ public function addParam($param, $raw = true) { @@ -430,8 +430,8 @@ class PMA_Message /** * add another string to be concatenated on displaying * - * @param string $string to be added - * @param string $separator to use between this and previous string/message + * @param string $string to be added + * @param string $separator to use between this and previous string/message */ public function addString($string, $separator = ' ') { @@ -442,8 +442,8 @@ class PMA_Message /** * add a bunch of messages at once * - * @param array $messages to be added - * @param string $separator to use between this and previous string/message + * @param array $messages to be added + * @param string $separator to use between this and previous string/message */ public function addMessages($messages, $separator = ' ') { @@ -455,8 +455,8 @@ class PMA_Message /** * add another raw message to be concatenated on displaying * - * @param mixed $message to be added - * @param string $separator to use between this and previous string/message + * @param mixed $message to be added + * @param string $separator to use between this and previous string/message */ public function addMessage($message, $separator = ' ') { @@ -474,8 +474,8 @@ class PMA_Message /** * set all params at once, usually used in conjunction with string * - * @param array $params - * @param boolean $sanitize + * @param array $params + * @param boolean $sanitize */ public function setParams($params, $sanitize = false) { @@ -509,7 +509,7 @@ class PMA_Message * Sanitizes $message * * @static - * @param mixed $message the message(s) + * @param mixed $message the message(s) * @return mixed the sanitized message(s) * @access public */ @@ -531,7 +531,7 @@ class PMA_Message * for formatting * * @static - * @param string $message the message + * @param string $message the message * @return string the decoded message * @access public */ @@ -662,7 +662,7 @@ class PMA_Message /** * sets and returns whether the message was displayed or not * - * @param boolean $is_displayed + * @param boolean $is_displayed * @return boolean PMA_Message::$_is_displayed */ public function isDisplayed($is_displayed = false) diff --git a/libraries/StorageEngine.class.php b/libraries/StorageEngine.class.php index d3e1019..bf5de9d 100644 --- a/libraries/StorageEngine.class.php +++ b/libraries/StorageEngine.class.php @@ -68,10 +68,10 @@ class PMA_StorageEngine * returns HTML code for storage engine select box * * @static - * @param string $name The name of the select form element - * @param string $id The ID of the form field - * @param string $selected The selected engine - * @param boolean $offerUnavailableEngines + * @param string $name The name of the select form element + * @param string $id The ID of the form field + * @param string $selected The selected engine + * @param boolean $offerUnavailableEngines * Should unavailable storage engines be offered? * @return string html selectbox */ @@ -106,7 +106,7 @@ class PMA_StorageEngine * * Loads the corresponding engine plugin, if available. * - * @param string $engine The engine ID + * @param string $engine The engine ID * @return object The engine plugin */ static public function getEngine($engine) @@ -127,7 +127,7 @@ class PMA_StorageEngine * return true if given engine name is supported/valid, otherwise false * * @static - * @param string $engine name of engine + * @param string $engine name of engine * @return boolean whether $engine is valid or not */ static public function isValid($engine) @@ -248,7 +248,7 @@ class PMA_StorageEngine /** * Constructor * - * @param string $engine The engine ID + * @param string $engine The engine ID */ function __construct($engine) { @@ -381,7 +381,7 @@ class PMA_StorageEngine * Generates the requested information page * * @abstract - * @param string $id The page ID + * @param string $id The page ID * * @return string The page * boolean or false on error. diff --git a/libraries/Table.class.php b/libraries/Table.class.php index 66ceaea..d2a0dbe 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -63,8 +63,8 @@ class PMA_Table /** * Constructor * - * @param string $table_name table name - * @param string $db_name database name + * @param string $table_name table name + * @param string $db_name database name */ function __construct($table_name, $db_name) { @@ -96,7 +96,7 @@ class PMA_Table /** * sets table name * - * @param string $table_name new table name + * @param string $table_name new table name */ function setName($table_name) { @@ -106,7 +106,7 @@ class PMA_Table /** * returns table name * - * @param boolean $backquoted whether to quote name with backticks `` + * @param boolean $backquoted whether to quote name with backticks `` * @return string table name */ function getName($backquoted = false) @@ -120,7 +120,7 @@ class PMA_Table /** * sets database name for this table * - * @param string $db_name + * @param string $db_name */ function setDbName($db_name) { @@ -130,7 +130,7 @@ class PMA_Table /** * returns database name for this table * - * @param boolean $backquoted whether to quote name with backticks `` + * @param boolean $backquoted whether to quote name with backticks `` * @return string database name for this table */ function getDbName($backquoted = false) @@ -144,7 +144,7 @@ class PMA_Table /** * returns full name for table, including database name * - * @param boolean $backquoted whether to quote name with backticks `` + * @param boolean $backquoted whether to quote name with backticks `` * @return string */ function getFullName($backquoted = false) @@ -175,7 +175,7 @@ class PMA_Table /** * returns value for given setting/param * - * @param string $param name for value to return + * @param string $param name for value to return * @return mixed value for $param */ function get($param) @@ -226,8 +226,8 @@ class PMA_Table * * @deprecated * @todo see what we could do with the possible existence of $table_is_view - * @param string $db the database name - * @param string $table the table name + * @param string $db the database name + * @param string $table the table name * @return boolean whether this is a view */ static protected function _isView($db, $table) @@ -247,8 +247,8 @@ class PMA_Table * * If the ENGINE of the table is MERGE or MRG_MYISAM (alias), this is a merge table. * - * @param string $db the database name - * @param string $table the table name + * @param string $db the database name + * @param string $table the table name * @return boolean true if it is a merge table */ static public function isMerge($db = null, $table = null) @@ -313,19 +313,19 @@ class PMA_Table * * @todo move into class PMA_Column * @todo on the interface, some js to clear the default value when the default current_timestamp is checked - * @param string $name name - * @param string $type type ('INT', 'VARCHAR', 'BIT', ...) - * @param string $length length ('2', '5,2', '', ...) - * @param string $attribute - * @param string $collation - * @param bool|string $null with 'NULL' or 'NOT NULL' - * @param string $default_type whether default is CURRENT_TIMESTAMP, + * @param string $name name + * @param string $type type ('INT', 'VARCHAR', 'BIT', ...) + * @param string $length length ('2', '5,2', '', ...) + * @param string $attribute + * @param string $collation + * @param bool|string $null with 'NULL' or 'NOT NULL' + * @param string $default_type whether default is CURRENT_TIMESTAMP, * NULL, NONE, USER_DEFINED - * @param string $default_value default value for USER_DEFINED default type - * @param string $extra 'AUTO_INCREMENT' - * @param string $comment field comment - * @param array &$field_primary list of fields for PRIMARY KEY - * @param string $index + * @param string $default_value default value for USER_DEFINED default type + * @param string $extra 'AUTO_INCREMENT' + * @param string $comment field comment + * @param array &$field_primary list of fields for PRIMARY KEY + * @param string $index * @return string field specification */ static function generateFieldSpec($name, $type, $length = '', $attribute = '', @@ -424,10 +424,10 @@ class PMA_Table * Revision 13 July 2001: Patch for limiting dump size from * vinay(a)sanisoft.com & girish(a)sanisoft.com * - * @param string $db the current database name - * @param string $table the current table name - * @param bool $force_exact whether to force an exact count - * @param bool $is_view + * @param string $db the current database name + * @param string $table the current table name + * @param bool $force_exact whether to force an exact count + * @param bool $is_view * * @return mixed the number of records if "retain" param is true, * otherwise true @@ -498,21 +498,21 @@ class PMA_Table * Generates column specification for ALTER syntax * * @see PMA_Table::generateFieldSpec() - * @param string $oldcol old column name - * @param string $newcol new column name - * @param string $type type ('INT', 'VARCHAR', 'BIT', ...) - * @param string $length length ('2', '5,2', '', ...) - * @param string $attribute - * @param string $collation - * @param bool|string $null with 'NULL' or 'NOT NULL' - * @param string $default_type whether default is CURRENT_TIMESTAMP, + * @param string $oldcol old column name + * @param string $newcol new column name + * @param string $type type ('INT', 'VARCHAR', 'BIT', ...) + * @param string $length length ('2', '5,2', '', ...) + * @param string $attribute + * @param string $collation + * @param bool|string $null with 'NULL' or 'NOT NULL' + * @param string $default_type whether default is CURRENT_TIMESTAMP, * NULL, NONE, USER_DEFINED - * @param string $default_value default value for USER_DEFINED default type - * @param string $extra 'AUTO_INCREMENT' - * @param string $comment field comment - * @param array &$field_primary list of fields for PRIMARY KEY - * @param string $index - * @param mixed $default_orig + * @param string $default_value default value for USER_DEFINED default type + * @param string $extra 'AUTO_INCREMENT' + * @param string $comment field comment + * @param array &$field_primary list of fields for PRIMARY KEY + * @param string $index + * @param mixed $default_orig * @return string field specification */ static public function generateAlter($oldcol, $newcol, $type, $length, @@ -529,11 +529,11 @@ class PMA_Table * Inserts existing entries in a PMA_* table by reading a value from an old entry * * @global relation variable - * @param string $work The array index, which Relation feature to check ('relwork', 'commwork', ...) - * @param string $pma_table The array index, which PMA-table to update ('bookmark', 'relation', ...) - * @param array $get_fields Which fields will be SELECT'ed from the old entry - * @param array $where_fields Which fields will be used for the WHERE query (array('FIELDNAME' => 'FIELDVALUE')) - * @param array $new_fields Which fields will be used as new VALUES. These are the important + * @param string $work The array index, which Relation feature to check ('relwork', 'commwork', ...) + * @param string $pma_table The array index, which PMA-table to update ('bookmark', 'relation', ...) + * @param array $get_fields Which fields will be SELECT'ed from the old entry + * @param array $where_fields Which fields will be used for the WHERE query (array('FIELDNAME' => 'FIELDVALUE')) + * @param array $new_fields Which fields will be used as new VALUES. These are the important * keys which differ from the old entry. * (array('FIELDNAME' => 'NEW FIELDVALUE')) * @return int|true @@ -995,7 +995,7 @@ class PMA_Table * * @todo add check for valid chars in filename on current system/os * @see http://dev.mysql.com/doc/refman/5.0/en/legal-names.html - * @param string $table_name name to check + * @param string $table_name name to check * @return boolean whether the string is valid or not */ function isValidName($table_name) @@ -1021,9 +1021,9 @@ class PMA_Table /** * renames table * - * @param string $new_name new table name - * @param string $new_db new database name - * @param bool $is_view is this for a VIEW rename? + * @param string $new_name new table name + * @param string $new_db new database name + * @param bool $is_view is this for a VIEW rename? * @return bool success */ function rename($new_name, $new_db = null, $is_view = false) @@ -1161,7 +1161,7 @@ class PMA_Table * - UNIQUE(x,y) // NONE * * - * @param bool $backquoted whether to quote name with backticks `` + * @param bool $backquoted whether to quote name with backticks `` * @return array */ public function getUniqueColumns($backquoted = true) @@ -1188,7 +1188,7 @@ class PMA_Table * * e.g. index(col1, col2) would only return col1 * - * @param bool $backquoted whether to quote name with backticks `` + * @param bool $backquoted whether to quote name with backticks `` * @return array */ public function getIndexedColumns($backquoted = true) @@ -1209,7 +1209,7 @@ class PMA_Table * * returns an array with all columns * - * @param bool $backquoted whether to quote name with backticks `` + * @param bool $backquoted whether to quote name with backticks `` * @return array */ public function getColumns($backquoted = true) diff --git a/libraries/Theme.class.php b/libraries/Theme.class.php index d1b79fd..7b01fa8 100644 --- a/libraries/Theme.class.php +++ b/libraries/Theme.class.php @@ -107,7 +107,7 @@ class PMA_Theme { * * @static * @access public - * @param string $folder path to theme + * @param string $folder path to theme * @return object PMA_Theme */ static public function load($folder) @@ -172,7 +172,7 @@ class PMA_Theme { * set path to theme * * @access public - * @param string $path path to theme + * @param string $path path to theme */ function setPath($path) { @@ -183,7 +183,7 @@ class PMA_Theme { * sets version * * @access public - * @param string new version + * @param string new version */ function setVersion($version) { @@ -206,7 +206,7 @@ class PMA_Theme { * returns true if theme version is equal or higher to $version * * @access public - * @param string $version version to compare to + * @param string $version version to compare to * @return boolean */ function checkVersion($version) @@ -218,7 +218,7 @@ class PMA_Theme { * sets name * * @access public - * @param string $name new name + * @param string $name new name */ function setName($name) { @@ -240,7 +240,7 @@ class PMA_Theme { * sets id * * @access public - * @param string $id new id + * @param string $id new id */ function setId($id) { @@ -260,7 +260,7 @@ class PMA_Theme { /** * @access public - * @param string path to images for this theme + * @param string path to images for this theme */ function setImgPath($path) { @@ -280,7 +280,7 @@ class PMA_Theme { * load css (send to stdout, normally the browser) * * @access public - * @param string $type left, right or print + * @param string $type left, right or print */ function loadCss(&$type) { diff --git a/libraries/Theme_Manager.class.php b/libraries/Theme_Manager.class.php index b179ccc..86ddc8d 100644 --- a/libraries/Theme_Manager.class.php +++ b/libraries/Theme_Manager.class.php @@ -55,7 +55,7 @@ class PMA_Theme_Manager /** * sets path to folder containing the themes * - * @param string $path path to themes folder + * @param string $path path to themes folder * @return boolean success */ function setThemesPath($path) @@ -80,7 +80,7 @@ class PMA_Theme_Manager /** * sets if there are different themes per server * - * @param boolean $per_server + * @param boolean $per_server */ function setThemePerServer($per_server) { @@ -200,7 +200,7 @@ class PMA_Theme_Manager /** * @private - * @param string $folder + * @param string $folder * @return boolean */ /*private*/ function _checkThemeFolder($folder) @@ -252,7 +252,7 @@ class PMA_Theme_Manager /** * checks if given theme name is a known theme * - * @param string $theme name fo theme to check for + * @param string $theme name fo theme to check for */ function checkTheme($theme) { @@ -266,7 +266,7 @@ class PMA_Theme_Manager /** * returns HTML selectbox, with or without form enclosed * - * @param boolean $form whether enclosed by from tags or not + * @param boolean $form whether enclosed by from tags or not */ function getHtmlSelectBox($form = true) { diff --git a/libraries/Tracker.class.php b/libraries/Tracker.class.php index da9a56a..c82d0d9 100644 --- a/libraries/Tracker.class.php +++ b/libraries/Tracker.class.php @@ -168,7 +168,7 @@ class PMA_Tracker * * @static * - * @param string $string part of SQL statement + * @param string $string part of SQL statement * * @return string the name of table */ @@ -198,8 +198,8 @@ class PMA_Tracker * * @static * - * @param string $dbname name of database - * @param string $tablename name of table + * @param string $dbname name of database + * @param string $tablename name of table * * @return boolean true or false */ @@ -250,11 +250,11 @@ class PMA_Tracker * * @static * - * @param string $dbname name of database - * @param string $tablename name of table - * @param string $version version - * @param string $tracking_set set of tracking statements - * @param string $is_view if table is a view + * @param string $dbname name of database + * @param string $tablename name of table + * @param string $version version + * @param string $tracking_set set of tracking statements + * @param string $is_view if table is a view * * @return int result of version insertion */ @@ -357,8 +357,8 @@ class PMA_Tracker * * @static * - * @param string $dbname name of database - * @param string $tablename name of table + * @param string $dbname name of database + * @param string $tablename name of table * * @return int result of version insertion */ @@ -378,10 +378,10 @@ class PMA_Tracker * * @static * - * @param string $dbname name of database - * @param string $version version - * @param string $query query - * @param string $tracking_set set of tracking statements + * @param string $dbname name of database + * @param string $version version + * @param string $query query + * @param string $tracking_set set of tracking statements * * @return int result of version insertion */ @@ -443,10 +443,10 @@ class PMA_Tracker * * @static * - * @param string $dbname name of database - * @param string $tablename name of table - * @param string $version version - * @param integer $new_state the new state of tracking + * @param string $dbname name of database + * @param string $tablename name of table + * @param string $version version + * @param integer $new_state the new state of tracking * * @return int result of SQL query */ @@ -469,11 +469,11 @@ class PMA_Tracker * * @static * - * @param string $dbname name of database - * @param string $tablename name of table - * @param string $version version - * @param string $type type of data(DDL || DML) - * @param string || array $new_data the new tracking data + * @param string $dbname name of database + * @param string $tablename name of table + * @param string $version version + * @param string $type type of data(DDL || DML) + * @param string || array $new_data the new tracking data * * @return bool result of change */ @@ -514,9 +514,9 @@ class PMA_Tracker * * @static * - * @param string $dbname name of database - * @param string $tablename name of table - * @param string $version version + * @param string $dbname name of database + * @param string $tablename name of table + * @param string $version version * * @return int result of SQL query */ @@ -531,9 +531,9 @@ class PMA_Tracker * * @static * - * @param string $dbname name of database - * @param string $tablename name of table - * @param string $version version + * @param string $dbname name of database + * @param string $tablename name of table + * @param string $version version * * @return int result of SQL query */ @@ -549,9 +549,9 @@ class PMA_Tracker * * @static * - * @param string $dbname name of database - * @param string $tablename name of table - * @param string $statement tracked statement + * @param string $dbname name of database + * @param string $tablename name of table + * @param string $statement tracked statement * * @return int (-1 if no version exists | > 0 if a version exists) */ @@ -581,9 +581,9 @@ class PMA_Tracker * * @static * - * @param string $dbname name of database - * @param string $tablename name of table - * @param string $version version number + * @param string $dbname name of database + * @param string $tablename name of table + * @param string $version version number * * @return mixed record DDM log, DDL log, structure snapshot, tracked statements. */ @@ -892,7 +892,7 @@ class PMA_Tracker * * * @static - * @param string $query a SQL query + * @param string $query a SQL query */ static public function handleQuery($query) { diff --git a/libraries/blowfish.php b/libraries/blowfish.php index 710015f..69abf52 100644 --- a/libraries/blowfish.php +++ b/libraries/blowfish.php @@ -483,8 +483,8 @@ class Horde_Cipher_blowfish /** * Encryption using blowfish algorithm * - * @param string original data - * @param string the secret + * @param string original data + * @param string the secret * * @return string the encrypted result * @@ -511,8 +511,8 @@ function PMA_blowfish_encrypt($data, $secret) /** * Decryption using blowfish algorithm * - * @param string encrypted data - * @param string the secret + * @param string encrypted data + * @param string the secret * * @return string original data * diff --git a/libraries/bookmark.lib.php b/libraries/bookmark.lib.php index c978730..723b042 100644 --- a/libraries/bookmark.lib.php +++ b/libraries/bookmark.lib.php @@ -41,7 +41,7 @@ function PMA_Bookmark_getParams() * * @global resource the controluser db connection handle * - * @param string the current database name + * @param string the current database name * * @return array the bookmarks list (key as index, label as value) * @@ -86,11 +86,11 @@ function PMA_Bookmark_getList($db) * * @global resource the controluser db connection handle * - * @param string the current database name - * @param mixed the id of the bookmark to get - * @param string which field to look up the $id - * @param boolean true: get all bookmarks regardless of the owning user - * @param boolean whether to ignore bookmarks with no user + * @param string the current database name + * @param mixed the id of the bookmark to get + * @param string which field to look up the $id + * @param boolean true: get all bookmarks regardless of the owning user + * @param boolean whether to ignore bookmarks with no user * * @return string the sql query * @@ -127,9 +127,9 @@ function PMA_Bookmark_get($db, $id, $id_field = 'id', $action_bookmark_all = fal * * @global resource the controluser db connection handle * - * @param array the properties of the bookmark to add; here, + * @param array the properties of the bookmark to add; here, * $fields['query'] is urlencoded - * @param boolean whether to make the bookmark available for all users + * @param boolean whether to make the bookmark available for all users * * @return boolean whether the INSERT succeeds or not * @@ -156,8 +156,8 @@ function PMA_Bookmark_save($fields, $all_users = false) * * @global resource the controluser db connection handle * - * @param string the current database name - * @param integer the id of the bookmark to get + * @param string the current database name + * @param integer the id of the bookmark to get * * @access public */ diff --git a/libraries/charset_conversion.lib.php b/libraries/charset_conversion.lib.php index 9acd184..b3ae693 100644 --- a/libraries/charset_conversion.lib.php +++ b/libraries/charset_conversion.lib.php @@ -58,9 +58,9 @@ if ($PMA_recoding_engine == PMA_CHARSET_ICONV_AIX) { * Converts encoding of text according to parameters with detected * conversion function. * - * @param string source charset - * @param string target charset - * @param string what to convert + * @param string source charset + * @param string target charset + * @param string what to convert * * @return string converted text * diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 34d20d9..1607d6e 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -207,7 +207,7 @@ function PMA_escape_mysql_wildcards($name) * removes slashes before "_" and "%" characters * Note: This function does not unescape backslashes! * - * @param string $name the string to escape + * @param string $name the string to escape * @return string the escaped string * @access public */ @@ -439,9 +439,9 @@ function PMA_showPHPDocu($target) { /** * returns HTML for a footnote marker and add the messsage to the footnotes * - * @param string $message the error message - * @param bool $bbcode - * @param string $type + * @param string $message the error message + * @param bool $bbcode + * @param string $type * @return string html code for a footnote marker * @access public */ @@ -480,11 +480,11 @@ function PMA_showHint($message, $bbcode = false, $type = 'notice') /** * Displays a MySQL error message in the right frame. * - * @param string $error_message the error message - * @param string $the_query the sql query that failed - * @param bool $is_modify_link whether to show a "modify" link or not - * @param string $back_url the "back" link url (full path is not required) - * @param bool $exit EXIT the page? + * @param string $error_message the error message + * @param string $the_query the sql query that failed + * @param bool $is_modify_link whether to show a "modify" link or not + * @param string $back_url the "back" link url (full path is not required) + * @param bool $exit EXIT the page? * * @global string the curent table * @global string the current db @@ -630,10 +630,10 @@ function PMA_mysqlDie($error_message = '', $the_query = '', /** * returns array with tables of given db with extended information and grouped * - * @param string $db name of db - * @param string $tables name of tables - * @param integer $limit_offset list offset - * @param int|bool $limit_count max tables to return + * @param string $db name of db + * @param string $tables name of tables + * @param integer $limit_offset list offset + * @param int|bool $limit_count max tables to return * @return array (recursive) grouped table list */ function PMA_getTableList($db, $tables = null, $limit_offset = 0, $limit_count = false) @@ -760,9 +760,9 @@ function PMA_getTableList($db, $tables = null, $limit_offset = 0, $limit_count = * * </code> * - * @param mixed $a_name the database, table or field name to "backquote" + * @param mixed $a_name the database, table or field name to "backquote" * or array of it - * @param boolean $do_it a flag to bypass this function (used by dump + * @param boolean $do_it a flag to bypass this function (used by dump * functions) * @return mixed the "backquoted" database, table or field name * @access public @@ -854,10 +854,10 @@ if (!$jsonly) * displays the message and the query * usually the message is the result of the query executed * - * @param string $message the message to display - * @param string $sql_query the query to display - * @param string $type the type (level) of the message - * @param boolean $is_view is this a message after a VIEW operation? + * @param string $message the message to display + * @param string $sql_query the query to display + * @param string $type the type (level) of the message + * @param boolean $is_view is this a message after a VIEW operation? * @return string * @access public */ @@ -1237,7 +1237,7 @@ function PMA_profilingSupported() /** * Displays a form with the Profiling checkbox * - * @param string $sql_query + * @param string $sql_query * @access public */ function PMA_profilingCheckbox($sql_query) @@ -1329,11 +1329,11 @@ function PMA_localizeNumber($value) * echo PMA_formatNumber(0, 6); // 0 * * </code> - * @param double $value the value to format - * @param integer $digits_left number of digits left of the comma - * @param integer $digits_right number of digits right of the comma - * @param boolean $only_down do not reformat numbers below 1 - * @param boolean $noTrailingZero removes trailing zeros right of the comma (default: true) + * @param double $value the value to format + * @param integer $digits_left number of digits left of the comma + * @param integer $digits_right number of digits right of the comma + * @param boolean $only_down do not reformat numbers below 1 + * @param boolean $noTrailingZero removes trailing zeros right of the comma (default: true) * * @return string the formatted value and its unit * @@ -1411,7 +1411,7 @@ function PMA_formatNumber($value, $digits_left = 3, $digits_right = 0, $only_dow /** * Returns the number of bytes when a formatted size is given * - * @param string $formatted_size the size expression (for example 8MB) + * @param string $formatted_size the size expression (for example 8MB) * @return integer The numerical part of the expression (for example 8) */ function PMA_extractValueFromFormattedSize($formatted_size) @@ -1500,8 +1500,8 @@ function PMA_localisedDate($timestamp = -1, $format = '') * returns a tab for tabbed navigation. * If the variables $link and $args ar left empty, an inactive tab is created * - * @param array $tab array with all options - * @param array $url_params + * @param array $tab array with all options + * @param array $url_params * @return string html code for one tab, a link if valid otherwise a span * @access public */ @@ -1599,8 +1599,8 @@ function PMA_generate_html_tab($tab, $url_params = array(), $base_dir='') /** * returns html-code for a tab navigation * - * @param array $tabs one element per tab - * @param string $url_params + * @param array $tabs one element per tab + * @param string $url_params * @return string html-code for tab-navigation */ function PMA_generate_html_tabs($tabs, $url_params, $base_dir='') @@ -1627,14 +1627,14 @@ function PMA_generate_html_tabs($tabs, $url_params, $base_dir='') * Displays a link, or a button if the link's URL is too large, to * accommodate some browsers' limitations * - * @param string $url the URL - * @param string $message the link message - * @param mixed $tag_params string: js confirmation + * @param string $url the URL + * @param string $message the link message + * @param mixed $tag_params string: js confirmation * array: additional tag params (f.e. style="") - * @param boolean $new_form we set this to false when we are already in + * @param boolean $new_form we set this to false when we are already in * a form, to avoid generating nested forms - * @param boolean $strip_img - * @param string $target + * @param boolean $strip_img + * @param string $target * * @return string the results to be echoed or saved in an array */ @@ -1762,7 +1762,7 @@ function PMA_linkOrButton($url, $message, $tag_params = array(), /** * Returns a given timespan value in a readable format. * - * @param int $seconds the timespan + * @param int $seconds the timespan * * @return string the formatted value */ @@ -1791,8 +1791,8 @@ function PMA_timespanFormat($seconds) * http://sf.net/tracker/?func=detail&aid=544361&group_id=23067&atid=377411 * * @todo add a multibyte safe function PMA_STR_split() - * @param string $string The string - * @param string $Separator The Separator (defaults to "<br />\n") + * @param string $string The string + * @param string $Separator The Separator (defaults to "<br />\n") * * @access public * @return string The flipped string @@ -1838,11 +1838,11 @@ function PMA_flipstring($string, $Separator = "<br />\n") * would have to check if the error message file is always available * * @todo use PMA_fatalError() if $die === true? - * @param array $params The names of the parameters needed by the calling script. - * @param bool $die Stop the execution? + * @param array $params The names of the parameters needed by the calling script. + * @param bool $die Stop the execution? * (Set this manually to false in the calling script * until you know all needed parameters to check). - * @param bool $request Whether to include this list in checking for special params. + * @param bool $request Whether to include this list in checking for special params. * @global string path to current script * @global boolean flag whether any special variable was required * @@ -1889,11 +1889,11 @@ function PMA_checkParameters($params, $die = true, $request = true) /** * Function to generate unique condition for specified row. * - * @param resource $handle current query result - * @param integer $fields_cnt number of fields - * @param array $fields_meta meta information about fields - * @param array $row current row - * @param boolean $force_unique generate condition only on pk or unique + * @param resource $handle current query result + * @param integer $fields_cnt number of fields + * @param array $fields_meta meta information about fields + * @param array $row current row + * @param boolean $force_unique generate condition only on pk or unique * * @access public * @return array the calculated condition and whether condition is unique @@ -2011,12 +2011,12 @@ function PMA_getUniqueCondition($handle, $fields_cnt, $fields_meta, $row, $force /** * Generate a button or image tag * - * @param string $button_name name of button element - * @param string $button_class class of button element - * @param string $image_name name of image element - * @param string $text text to display - * @param string $image image to display - * @param string $value + * @param string $button_name name of button element + * @param string $button_class class of button element + * @param string $image_name name of image element + * @param string $text text to display + * @param string $image image to display + * @param string $value * * @access public */ @@ -2052,17 +2052,17 @@ function PMA_buttonOrImage($button_name, $button_class, $image_name, $text, /** * Generate a pagination selector for browsing resultsets * - * @param int $rows Number of rows in the pagination set - * @param int $pageNow current page number - * @param int $nbTotalPage number of total pages - * @param int $showAll If the number of pages is lower than this + * @param int $rows Number of rows in the pagination set + * @param int $pageNow current page number + * @param int $nbTotalPage number of total pages + * @param int $showAll If the number of pages is lower than this * variable, no pages will be omitted in pagination - * @param int $sliceStart How many rows at the beginning should always be shown? - * @param int $sliceEnd How many rows at the end should always be shown? - * @param int $percent Percentage of calculation page offsets to hop to a next page - * @param int $range Near the current page, how many pages should + * @param int $sliceStart How many rows at the beginning should always be shown? + * @param int $sliceEnd How many rows at the end should always be shown? + * @param int $percent Percentage of calculation page offsets to hop to a next page + * @param int $range Near the current page, how many pages should * be considered "nearby" and displayed as well? - * @param string $prompt The prompt to display (sometimes empty) + * @param string $prompt The prompt to display (sometimes empty) * * @return string * @access public @@ -2151,12 +2151,12 @@ function PMA_pageselector($rows, $pageNow = 1, $nbTotalPage = 1, * Generate navigation for a list * * @todo use $pos from $_url_params - * @param int $count number of elements in the list - * @param int $pos current position in the list - * @param array $_url_params url parameters - * @param string $script script name for form target - * @param string $frame target frame - * @param int $max_count maximum number of elements to display from the list + * @param int $count number of elements in the list + * @param int $pos current position in the list + * @param array $_url_params url parameters + * @param string $script script name for form target + * @param string $frame target frame + * @param int $max_count maximum number of elements to display from the list * * @access public */ @@ -2238,7 +2238,7 @@ function PMA_listNavigator($count, $pos, $_url_params, $script, $frame, $max_cou * $user_dir = PMA_userDir('/var/pma_tmp/%u/'); // '/var/pma_tmp/root/' * * </code> - * @param string $dir with wildcard for user + * @param string $dir with wildcard for user * @return string per user directory */ function PMA_userDir($dir) @@ -2254,7 +2254,7 @@ function PMA_userDir($dir) /** * returns html code for db link to default db page * - * @param string $database + * @param string $database * @return string html link to default db page */ function PMA_getDbLink($database = null) @@ -2277,10 +2277,10 @@ function PMA_getDbLink($database = null) * Displays a lightbulb hint explaining a known external bug * that affects a functionality * - * @param string $functionality localized message explaining the func. - * @param string $component 'mysql' (eventually, 'php') - * @param string $minimum_version of this component - * @param string $bugref bug reference for this component + * @param string $functionality localized message explaining the func. + * @param string $component 'mysql' (eventually, 'php') + * @param string $minimum_version of this component + * @param string $bugref bug reference for this component */ function PMA_externalBug($functionality, $component, $minimum_version, $bugref) { @@ -2292,10 +2292,10 @@ function PMA_externalBug($functionality, $component, $minimum_version, $bugref) /** * Generates and echoes an HTML checkbox * - * @param string $html_field_name the checkbox HTML field - * @param string $label - * @param boolean $checked is it initially checked? - * @param boolean $onclick should it submit the form on click? + * @param string $html_field_name the checkbox HTML field + * @param string $label + * @param boolean $checked is it initially checked? + * @param boolean $onclick should it submit the form on click? */ function PMA_display_html_checkbox($html_field_name, $label, $checked, $onclick) { @@ -2305,12 +2305,12 @@ function PMA_display_html_checkbox($html_field_name, $label, $checked, $onclick) /** * Generates and echoes a set of radio HTML fields * - * @param string $html_field_name the radio HTML field - * @param array $choices the choices values and labels - * @param string $checked_choice the choice to check by default - * @param boolean $line_break whether to add an HTML line break after a choice - * @param boolean $escape_label whether to use htmlspecialchars() on label - * @param string $class enclose each choice with a div of this class + * @param string $html_field_name the radio HTML field + * @param array $choices the choices values and labels + * @param string $checked_choice the choice to check by default + * @param boolean $line_break whether to add an HTML line break after a choice + * @param boolean $escape_label whether to use htmlspecialchars() on label + * @param string $class enclose each choice with a div of this class */ function PMA_display_html_radio($html_field_name, $choices, $checked_choice = '', $line_break = true, $escape_label = true, $class='') { foreach ($choices as $choice_value => $choice_label) { @@ -2337,10 +2337,10 @@ function PMA_display_html_radio($html_field_name, $choices, $checked_choice = '' /** * Generates and returns an HTML dropdown * - * @param string $select_name - * @param array $choices choices values - * @param string $active_choice the choice to select by default - * @param string $id id of the select element; can be different in case + * @param string $select_name + * @param array $choices choices values + * @param string $active_choice the choice to select by default + * @param string $id id of the select element; can be different in case * the dropdown is present more than once on the page * @return string * @todo support titles @@ -2365,8 +2365,8 @@ function PMA_generate_html_dropdown($select_name, $choices, $active_choice, $id) * controlling the slider; you have to generate the </div> yourself * after the sliding section. * - * @param string $id the id of the <div> on which to apply the effect - * @param string $message the message to show as a link + * @param string $id the id of the <div> on which to apply the effect + * @param string $message the message to show as a link */ function PMA_generate_slider_effect($id, $message) { @@ -2389,10 +2389,10 @@ function PMA_generate_slider_effect($id, $message) /** * Creates an AJAX sliding toggle button (or and equivalent form when AJAX is disabled) * - * @param string $action The URL for the request to be executed - * @param string $select_name The name for the dropdown box - * @param array $options An array of options (see rte_footer.lib.php) - * @param string $callback A JS snippet to execute when the request is + * @param string $action The URL for the request to be executed + * @param string $select_name The name for the dropdown box + * @param array $options An array of options (see rte_footer.lib.php) + * @param string $callback A JS snippet to execute when the request is * successfully processed * * @return string HTML code for the toggle button @@ -2543,8 +2543,8 @@ function PMA_cacheUnset($var, $server = 0) * in MySQL a BIT field can be from 1 to 64 bits so we need this * function because in PHP, decbin() supports only 32 bits * - * @param numeric $value coming from a BIT field - * @param integer $length + * @param numeric $value coming from a BIT field + * @param integer $length * @return string the printable value */ function PMA_printable_bit_value($value, $length) { @@ -2559,7 +2559,7 @@ function PMA_printable_bit_value($value, $length) { /** * Verifies whether the value contains a non-printable character * - * @param string $value + * @param string $value * @return boolean */ function PMA_contains_nonprintable_ascii($value) { @@ -2570,7 +2570,7 @@ function PMA_contains_nonprintable_ascii($value) { * Converts a BIT type default value * for example, b'010' becomes 010 * - * @param string $bit_default_value + * @param string $bit_default_value * @return string the converted value */ function PMA_convert_bit_default_value($bit_default_value) { @@ -2580,7 +2580,7 @@ function PMA_convert_bit_default_value($bit_default_value) { /** * Extracts the various parts from a field type spec * - * @param string $fieldspec + * @param string $fieldspec * @return array associative array containing type, spec_in_brackets * and possibly enum_set_values (another array) */ @@ -2656,7 +2656,7 @@ function PMA_extractFieldSpec($fieldspec) { /** * Verifies if this table's engine supports foreign keys * - * @param string $engine + * @param string $engine * @return boolean */ function PMA_foreignkey_supported($engine) { @@ -2671,7 +2671,7 @@ function PMA_foreignkey_supported($engine) { /** * Replaces some characters by a displayable equivalent * - * @param string $content + * @param string $content * @return string the content with characters replaced */ function PMA_replace_binary_contents($content) { @@ -2798,9 +2798,9 @@ function PMA_expandUserString($string, $escape = null, $updates = array()) { * function that generates a json output for an ajax request and ends script * execution * - * @param bool $message message string containing the html of the message - * @param bool $success success whether the ajax request was successfull - * @param array $extra_data extra_data optional - any other data as part of the json request + * @param bool $message message string containing the html of the message + * @param bool $success success whether the ajax request was successfull + * @param array $extra_data extra_data optional - any other data as part of the json request * */ function PMA_ajaxResponse($message, $success = true, $extra_data = array()) @@ -2924,8 +2924,8 @@ function PMA_buildActionTitles() { * $cfg['ColumnTypes'] and either returns an array (useful for quickly checking * if a datatype is supported) or an HTML snippet that creates a drop-down list. * - * @param bool $html Whether to generate an html snippet or an array - * @param string $selected The value to mark as selected in HTML mode + * @param bool $html Whether to generate an html snippet or an array + * @param string $selected The value to mark as selected in HTML mode * * @return mixed An HTML snippet or an array of datatypes. * @@ -3007,9 +3007,9 @@ function PMA_unsupportedDatatypes() { /** * Creates a dropdown box with MySQL functions for a particular column. * - * @param array $field Data about the column for which + * @param array $field Data about the column for which * to generate the dropdown - * @param bool $insert_mode Whether the operation is 'insert' + * @param bool $insert_mode Whether the operation is 'insert' * * @global array $cfg PMA configuration * @global array $analyzed_sql Analyzed SQL query @@ -3112,10 +3112,10 @@ function PMA_getFunctionsForField($field, $insert_mode) * // user has this privilege on database 'mydb'. * * - * @param string $priv The privilege to check - * @param mixed $db null, to only check global privileges + * @param string $priv The privilege to check + * @param mixed $db null, to only check global privileges * string, db name where to also check for privileges - * @param mixed $tbl null, to only check global privileges + * @param mixed $tbl null, to only check global privileges * string, db name where to also check for privileges * @return bool */ diff --git a/libraries/core.lib.php b/libraries/core.lib.php index fe533e3..bb542ba 100644 --- a/libraries/core.lib.php +++ b/libraries/core.lib.php @@ -30,9 +30,9 @@ * </code> * * @see PMA_isValid() - * @param mixed $var param to check - * @param mixed $default default value - * @param mixed $type var type or array of values to check against $var + * @param mixed $var param to check + * @param mixed $default default value + * @param mixed $type var type or array of values to check against $var * @return mixed $var or $default */ function PMA_ifSetOr(&$var, $default = null, $type = 'similar') @@ -80,9 +80,9 @@ function PMA_ifSetOr(&$var, $default = null, $type = 'similar') * @todo create some testsuites * @todo add some more var types like hex, bin, ...? * @see http://php.net/gettype - * @param mixed $var variable to check - * @param mixed $type var type or array of valid values to check against $var - * @param mixed $compare var to compare with $var + * @param mixed $var variable to check + * @param mixed $type var type or array of valid values to check against $var + * @param mixed $compare var to compare with $var * @return boolean whether valid or not */ function PMA_isValid(&$var, $type = 'length', $compare = null) @@ -171,7 +171,7 @@ function PMA_isValid(&$var, $type = 'length', $compare = null) * require() when a part of the path comes from an insecure source * like a cookie or form. * - * @param string The path to check + * @param string The path to check * * @return string The secured path * @@ -192,8 +192,8 @@ function PMA_securePath($path) * loads language file if not loaded already * * @todo use detected argument separator (PMA_Config) - * @param string $error_message the error message or named error message - * @param string|array $message_args arguments applied to $error_message + * @param string $error_message the error message or named error message + * @param string|array $message_args arguments applied to $error_message * @return exit */ function PMA_fatalError($error_message, $message_args = null) @@ -276,7 +276,7 @@ function PMA_warnMissingExtension($extension, $fatal = false, $extra = '') /** * returns count of tables in given db * - * @param string $db database to count tables for + * @param string $db database to count tables for * @return integer count of tables in $db */ function PMA_getTableCount($db) @@ -308,7 +308,7 @@ function PMA_getTableCount($db) * (renamed with PMA prefix to avoid double definition when embedded * in Moodle) * - * @param string $size + * @param string $size * @return integer $size */ function PMA_get_real_size($size = 0) @@ -343,9 +343,9 @@ function PMA_get_real_size($size = 0) * * @see http://php.net/array_merge * @see http://php.net/array_merge_recursive - * @param array array to merge - * @param array array to merge - * @param array ... + * @param array array to merge + * @param array array to merge + * @param array ... * @return array merged array */ function PMA_array_merge_recursive() @@ -398,8 +398,8 @@ function PMA_array_merge_recursive() * @see http://www.php-security.org/MOPB/MOPB-02-2007.html * @see http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2006-1549 * - * @param array $array array to walk - * @param string $function function to call for every array element + * @param array $array array to walk + * @param string $function function to call for every array element */ function PMA_arrayWalkRecursive(&$array, $function, $apply_to_keys_also = false) { @@ -431,8 +431,8 @@ function PMA_arrayWalkRecursive(&$array, $function, $apply_to_keys_also = false) * checks given given $page against given $whitelist and returns true if valid * it ignores optionaly query paramters in $page (script.php?ignored) * - * @param string &$page page to check - * @param array $whitelist whitelist to check page against + * @param string &$page page to check + * @param array $whitelist whitelist to check page against * @return boolean whether $page is valid or not (in $whitelist or not) */ function PMA_checkPageValidity(&$page, $whitelist) @@ -460,7 +460,7 @@ function PMA_checkPageValidity(&$page, $whitelist) * searchs in $_SERVER, $_ENV than trys getenv() and apache_getenv() * in this order * - * @param string $var_name variable name + * @param string $var_name variable name * @return string value of $var or empty string */ function PMA_getenv($var_name) { @@ -481,7 +481,7 @@ function PMA_getenv($var_name) { /** * Send HTTP header, taking IIS limits into account (600 seems ok) * - * @param string $uri the header to send + * @param string $uri the header to send * @return boolean always true */ function PMA_sendHeaderLocation($uri) @@ -542,9 +542,9 @@ function PMA_sendHeaderLocation($uri) * $path is a string describing position of an element in an associative array, * eg. Servers/1/host refers to $array[Servers][1][host] * - * @param string $path - * @param array $array - * @param mixed $default + * @param string $path + * @param array $array + * @param mixed $default * @return mixed array element or $default */ function PMA_array_read($path, $array, $default = null) @@ -563,9 +563,9 @@ function PMA_array_read($path, $array, $default = null) /** * Stores value in an array * - * @param string $path - * @param array &$array - * @param mixed $value + * @param string $path + * @param array &$array + * @param mixed $value */ function PMA_array_write($path, &$array, $value) { @@ -584,9 +584,9 @@ function PMA_array_write($path, &$array, $value) /** * Removes value from an array * - * @param string $path - * @param array &$array - * @param mixed $value + * @param string $path + * @param array &$array + * @param mixed $value */ function PMA_array_remove($path, &$array) { diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index e7d08a5..42bd352 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -22,7 +22,7 @@ define('PMA_DBI_GETVAR_GLOBAL', 2); /** * Checks one of the mysql extensions * - * @param string $extension mysql extension to check + * @param string $extension mysql extension to check */ function PMA_DBI_checkMysqlExtension($extension = 'mysql') { if (! function_exists($extension . '_connect')) { @@ -145,7 +145,7 @@ function PMA_DBI_try_query($query, $link = null, $options = 0, $cache_affected_r * uses language to charset mapping from mysql/share/errmsg.txt * and charset names to ISO charset from information_schema.CHARACTER_SETS * - * @param string $message + * @param string $message * @return string $message */ function PMA_DBI_convert_message($message) { @@ -218,8 +218,8 @@ function PMA_DBI_convert_message($message) { /** * returns array with table names for given db * - * @param string $database name of database - * @param mixed $link mysql link resource|object + * @param string $database name of database + * @param mixed $link mysql link resource|object * @return array tables names */ function PMA_DBI_get_tables($database, $link = null) @@ -231,8 +231,8 @@ function PMA_DBI_get_tables($database, $link = null) /** * usort comparison callback * - * @param string $a first argument to sort - * @param string $b second argument to sort + * @param string $a first argument to sort + * @param string $b second argument to sort * * @return integer a value representing whether $a should be before $b in the * sorted array or not @@ -275,14 +275,14 @@ function PMA_usort_comparison_callback($a, $b) * </code> * * @todo move into PMA_Table - * @param string $database database - * @param string|false $table table - * @param boolean|string $tbl_is_group $table is a table group - * @param resource $link mysql link - * @param integer $limit_offset zero-based offset for the count - * @param boolean|integer $limit_count number of tables to return - * @param string $sort_by table attribute to sort by - * @param string $sort_order direction to sort (ASC or DESC) + * @param string $database database + * @param string|false $table table + * @param boolean|string $tbl_is_group $table is a table group + * @param resource $link mysql link + * @param integer $limit_offset zero-based offset for the count + * @param boolean|integer $limit_count number of tables to return + * @param string $sort_by table attribute to sort by + * @param string $sort_order direction to sort (ASC or DESC) * @return array list of tables in given db(s) */ function PMA_DBI_get_tables_full($database, $table = false, $tbl_is_group = false, $link = null, @@ -526,13 +526,13 @@ function PMA_DBI_get_tables_full($database, $table = false, $tbl_is_group = fals * returns array with databases containing extended infos about them * * @todo move into PMA_List_Database? - * @param string $database database - * @param boolean $force_stats retrieve stats also for MySQL < 5 - * @param resource $link mysql link - * @param string $sort_by column to order by - * @param string $sort_order ASC or DESC - * @param integer $limit_offset starting offset for LIMIT - * @param bool|int $limit_count row count for LIMIT or true for $GLOBALS['cfg']['MaxDbList'] + * @param string $database database + * @param boolean $force_stats retrieve stats also for MySQL < 5 + * @param resource $link mysql link + * @param string $sort_by column to order by + * @param string $sort_order ASC or DESC + * @param integer $limit_offset starting offset for LIMIT + * @param bool|int $limit_count row count for LIMIT or true for $GLOBALS['cfg']['MaxDbList'] * @return array $databases */ function PMA_DBI_get_databases_full($database = null, $force_stats = false, @@ -698,10 +698,10 @@ function PMA_DBI_get_databases_full($database = null, $force_stats = false, * returns detailed array with all columns for given table in database, * or all tables/databases * - * @param string $database name of database - * @param string $table name of table to retrieve columns from - * @param string $column name of specific column - * @param mixed $link mysql link resource + * @param string $database name of database + * @param string $table name of table to retrieve columns from + * @param string $column name of specific column + * @param mixed $link mysql link resource * @return array */ function PMA_DBI_get_columns_full($database = null, $table = null, @@ -825,10 +825,10 @@ function PMA_DBI_get_columns_full($database = null, $table = null, /** * array PMA_DBI_get_columns(string $database, string $table, bool $full = false, mysql db link $link = null) * - * @param string $database name of database - * @param string $table name of table to retrieve columns from - * @param boolean $full whether to return full info or only column names - * @param mixed $link mysql link resource + * @param string $database name of database + * @param string $table name of table to retrieve columns from + * @param boolean $full whether to return full info or only column names + * @param mixed $link mysql link resource * @return array column names */ function PMA_DBI_get_columns($database, $table, $full = false, $link = null) @@ -846,9 +846,9 @@ function PMA_DBI_get_columns($database, $table, $full = false, $link = null) /** * returns value of given mysql server variable * - * @param string $var mysql server variable name - * @param int $type PMA_DBI_GETVAR_SESSION|PMA_DBI_GETVAR_GLOBAL - * @param mixed $link mysql link resource|object + * @param string $var mysql server variable name + * @param int $type PMA_DBI_GETVAR_SESSION|PMA_DBI_GETVAR_GLOBAL + * @param mixed $link mysql link resource|object * @return mixed value for mysql server variable */ @@ -881,8 +881,8 @@ function PMA_DBI_get_variable($var, $type = PMA_DBI_GETVAR_SESSION, $link = null * Function called just after a connection to the MySQL database server has been established * It sets the connection collation, and determins the version of MySQL which is running. * - * @param mixed $link mysql link resource|object - * @param boolean $is_controluser + * @param mixed $link mysql link resource|object + * @param boolean $is_controluser */ function PMA_DBI_postConnect($link, $is_controluser = false) { @@ -938,13 +938,13 @@ function PMA_DBI_postConnect($link, $is_controluser = false) * // $user_name = 'John Doe' * </code> * - * @param string|mysql_result $result query or mysql result - * @param integer $row_number row to fetch the value from, + * @param string|mysql_result $result query or mysql result + * @param integer $row_number row to fetch the value from, * starting at 0, with 0 beeing default - * @param integer|string $field field to fetch the value from, + * @param integer|string $field field to fetch the value from, * starting at 0, with 0 beeing default - * @param resource $link mysql link - * @param mixed $options + * @param resource $link mysql link + * @param mixed $options * @return mixed value of first field in first row from result * or false if not found */ @@ -993,12 +993,12 @@ function PMA_DBI_fetch_value($result, $row_number = 0, $field = 0, $link = null, * // $user = array('id' => 123, 'name' => 'John Doe') * </code> * - * @param string|mysql_result $result query or mysql result - * @param string $type NUM|ASSOC|BOTH + * @param string|mysql_result $result query or mysql result + * @param string $type NUM|ASSOC|BOTH * returned array should either numeric * associativ or booth - * @param resource $link mysql link - * @param mixed $options + * @param resource $link mysql link + * @param mixed $options * @return array|boolean first row from result * or false if result is empty */ @@ -1072,13 +1072,13 @@ function PMA_DBI_fetch_single_row($result, $type = 'ASSOC', $link = null, $optio * // $users['admin']['John Doe'] = '123' * </code> * - * @param string|mysql_result $result query or mysql result - * @param string|integer $key field-name or offset + * @param string|mysql_result $result query or mysql result + * @param string|integer $key field-name or offset * used as key for array - * @param string|integer $value value-name or offset + * @param string|integer $value value-name or offset * used as value for array - * @param resource $link mysql link - * @param mixed $options + * @param resource $link mysql link + * @param mixed $options * @return array resultrows or values indexed by $key */ function PMA_DBI_fetch_result($result, $key = null, $value = null, @@ -1202,7 +1202,7 @@ function PMA_DBI_getCompatibilities() /** * returns warnings for last query * - * @param resource $link mysql link resource + * @param resource $link mysql link resource * @return array warnings */ function PMA_DBI_get_warnings($link = null) @@ -1245,9 +1245,9 @@ function PMA_isSuperuser() /** * returns an array of PROCEDURE or FUNCTION names for a db * - * @param string $db db name - * @param string $which PROCEDURE | FUNCTION - * @param resource $link mysql link + * @param string $db db name + * @param string $which PROCEDURE | FUNCTION + * @param resource $link mysql link * * @return array the procedure names or function names */ @@ -1266,10 +1266,10 @@ function PMA_DBI_get_procedures_or_functions($db, $which, $link = null) /** * returns the definition of a specific PROCEDURE, FUNCTION or EVENT * - * @param string $db db name - * @param string $which PROCEDURE | FUNCTION | EVENT - * @param string $name the procedure|function|event name - * @param resource $link mysql link + * @param string $db db name + * @param string $which PROCEDURE | FUNCTION | EVENT + * @param string $name the procedure|function|event name + * @param resource $link mysql link * * @return string the definition */ @@ -1287,9 +1287,9 @@ function PMA_DBI_get_definition($db, $which, $name, $link = null) /** * returns details about the TRIGGERs for a specific table or database * - * @param string $db db name - * @param string $table table name - * @param string $delimiter the delimiter to use (may be empty) + * @param string $db db name + * @param string $table tablme delimiter to use (may be empty)null) null) $optioull)abel = true, $class='') { find out why click %shere%s.')ɣ��*�D��*��*��*ɣ��4�* ��*6 ��!�!�ȣ��ɣ��xt�* ��"��*��*�ȣ��*�ȣ��ov�*��*`v�*�dv�*�iv�*�D��*xt�* ��*�!�!�ȣ��ɣ��=��*��"��*��*�ȣ��*�ȣ��ȣ��ȣ��*�p�ɣ��*�D��*��о��*GHIJKMNOP�ȣ��ɣ��H��*��"��*��*�ȣ��0ov�*��*��*�)��*`v�*�dv�*�iv�*�D��*H��*��࿣��*8��*��*(��*��@��*��*��p��* �nv�*��*�iv�*��x��*��*�dv�*��yx��*��*`v�*@��Zx��*��*�$��*��*�)��*`v�*؄�*�dv�*�iv�*�D��*�m��*�£��*#%')*-.035678:<=�ȣ��ɣ��p�p��*�ã��"��*8��*��*؄�*��*�D��*cf�<��*ɣ��p�p��*�ã��£��*�%��wq�-��s��,~9��u]�� 4Q��U^Qʉ��u��*ēv��B��*Pʣ��F��*F��*?�?��*ʣ��p��0ţ��<��*��*��*�ˣ��B��*`ʣ��ȣ��l��*ɣ��B��*ɣ��e name + * @param string $delimiter the delimiter to use (may be empty) * * @return array information about triggers (may be empty) */ @@ -1352,8 +1352,8 @@ function PMA_DBI_get_triggers($db, $table = '', $delimiter = '//') /** * Returns true if $db.$view_name is a view, false if not * - * @param string $db database name - * @param string $view_name view/table name + * @param string $db database name + * @param string $view_name view/table name * * @return bool true if $db.$view_name is a view, false if not */ diff --git a/libraries/db_info.inc.php b/libraries/db_info.inc.php index de56e83..dc82af4 100644 --- a/libraries/db_info.inc.php +++ b/libraries/db_info.inc.php @@ -35,9 +35,9 @@ $pos = $_SESSION['tmp_user_values']['table_limit_offset']; /** * fills given tooltip arrays * - * @param array $tooltip_truename tooltip data - * @param array $tooltip_aliasname tooltip data - * @param array $table tabledata + * @param array $tooltip_truename tooltip data + * @param array $tooltip_aliasname tooltip data + * @param array $table tabledata */ function PMA_fillTooltip(&$tooltip_truename, &$tooltip_aliasname, $table) { diff --git a/libraries/db_structure.lib.php b/libraries/db_structure.lib.php index 82a3f58..179e752 100644 --- a/libraries/db_structure.lib.php +++ b/libraries/db_structure.lib.php @@ -13,8 +13,8 @@ if (! defined('PHPMYADMIN')) { * void PMA_TableHeader([bool $db_is_information_schema = false]) * display table header (<table><thead>...</thead><tbody>) * - * @param boolean $db_is_information_schema - * @param boolean $replication + * @param boolean $db_is_information_schema + * @param boolean $replication */ function PMA_TableHeader($db_is_information_schema = false, $replication = false) { @@ -65,9 +65,9 @@ function PMA_TableHeader($db_is_information_schema = false, $replication = false /** * Creates a clickable column header for table information * - * @param string title to use for the link - * @param string corresponds to sortable data name mapped in libraries/db_info.inc.php - * @param string initial sort order + * @param string title to use for the link + * @param string corresponds to sortable data name mapped in libraries/db_info.inc.php + * @param string initial sort order * @returns string link to be displayed in the table header */ function PMA_SortableTableHeader($title, $sort, $initial_sort_order = 'ASC') diff --git a/libraries/display_select_lang.lib.php b/libraries/display_select_lang.lib.php index 4f846bf..4ed3ec2 100644 --- a/libraries/display_select_lang.lib.php +++ b/libraries/display_select_lang.lib.php @@ -12,8 +12,8 @@ if (! defined('PHPMYADMIN')) { /** * Sorts available languages by their true english names * - * @param array the array to be sorted - * @param mixed a required parameter + * @param array the array to be sorted + * @param mixed a required parameter * @return the sorted array * @access private */ diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index adaa407..9e02c24 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -28,9 +28,9 @@ require_once './libraries/Index.class.php'; * the "display printable view" option. * Of course '0'/'1' means the feature won't/will be enabled. * - * @param string &$the_disp_mode the synthetic value for display_mode (see a few + * @param string &$the_disp_mode the synthetic value for display_mode (see a few * lines above for explanations) - * @param integer &$the_total the total number of rows returned by the SQL query + * @param integer &$the_total the total number of rows returned by the SQL query * without any programmatically appended "LIMIT" clause * (just a copy of $unlim_num_rows if it exists, else * computed inside this function) @@ -463,10 +463,10 @@ function PMA_displayTableNavigation($pos_next, $pos_prev, $sql_query, $id_for_di /** * Displays the headers of the results table * - * @param array which elements to display - * @param array the list of fields properties - * @param integer the total number of fields returned by the SQL query - * @param array the analyzed query + * @param array which elements to display + * @param array the list of fields properties + * @param integer the total number of fields returned by the SQL query + * @param array the analyzed query * * @return boolean $clause_is_unique * @@ -1060,9 +1060,9 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $ /** * Prepares the display for a value * - * @param string $class - * @param string $condition_field - * @param string $value + * @param string $class + * @param string $condition_field + * @param string $value * * @return string the td */ @@ -1073,8 +1073,8 @@ function PMA_buildValueDisplay($class, $condition_field, $value) { /** * Prepares the display for a null value * - * @param string $class - * @param string $condition_field + * @param string $class + * @param string $condition_field * * @return string the td */ @@ -1086,9 +1086,9 @@ function PMA_buildNullDisplay($class, $condition_field) { /** * Prepares the display for an empty value * - * @param string $class - * @param string $condition_field - * @param string $align + * @param string $class + * @param string $condition_field + * @param string $align * * @return string the td */ @@ -1142,11 +1142,11 @@ function PMA_addClass($class, $condition_field, $meta, $nowrap, $is_field_trunca /** * Displays the body of the results table * - * @param integer the link id associated to the query which results have + * @param integer the link id associated to the query which results have * to be displayed - * @param array which elements to display - * @param array the list of relations - * @param array the analyzed query + * @param array which elements to display + * @param array the list of relations + * @param array the analyzed query * * @return boolean always true * @@ -2026,10 +2026,10 @@ function PMA_displayTable_checkConfigParams() * Displays a table of results returned by a SQL query. * This function is called by the "sql.php" script. * - * @param integer the link id associated to the query which results have + * @param integer the link id associated to the query which results have * to be displayed - * @param array the display mode - * @param array the analyzed query + * @param array the display mode + * @param array the analyzed query * * @global string $db the database name * @global string $table the table name @@ -2392,8 +2392,8 @@ function default_function($buffer) { /** * Displays operations that are available on results. * - * @param array the display mode - * @param array the analyzed query + * @param array the display mode + * @param array the analyzed query * * @global string $db the database name * @global string $table the table name @@ -2535,12 +2535,12 @@ function PMA_displayResultsOperations($the_disp_mode, $analyzed_sql) { * Verifies what to do with non-printable contents (binary or BLOB) * in Browse mode. * - * @param string $category BLOB|BINARY|GEOMETRY - * @param string $content the binary content - * @param string $transform_function - * @param string $transform_options - * @param string $default_function - * @param object $meta the meta-information about this field + * @param string $category BLOB|BINARY|GEOMETRY + * @param string $content the binary content + * @param string $transform_function + * @param string $transform_options + * @param string $default_function + * @param object $meta the meta-information about this field * @return mixed string or float */ function PMA_handle_non_printable_contents($category, $content, $transform_function, $transform_options, $default_function, $meta, $url_params = array()) { @@ -2580,17 +2580,17 @@ function PMA_handle_non_printable_contents($category, $content, $transform_funct * Prepares the displayable content of a data cell in Browse mode, * taking into account foreign key description field and transformations * - * @param string $class - * @param string $condition_field - * @param string $analyzed_sql - * @param object $meta the meta-information about this field - * @param string $map - * @param string $data - * @param string $transform_function - * @param string $default_function - * @param string $nowrap - * @param string $where_comparison - * @param bool $is_field_truncated + * @param string $class + * @param string $condition_field + * @param string $analyzed_sql + * @param object $meta the meta-information about this field + * @param string $map + * @param string $data + * @param string $transform_function + * @param string $default_function + * @param string $nowrap + * @param string $where_comparison + * @param bool $is_field_truncated * @return string formatted data */ function PMA_prepare_row_data($class, $condition_field, $analyzed_sql, $meta, $map, $data, $transform_function, $default_function, $nowrap, $where_comparison, $transform_options, $is_field_truncated ) { @@ -2681,13 +2681,13 @@ function PMA_prepare_row_data($class, $condition_field, $analyzed_sql, $meta, $m /** * Generates a checkbox for multi-row submits * - * @param string $del_url - * @param array $is_display - * @param string $row_no - * @param string $where_clause_html - * @param string $del_query - * @param string $id_suffix - * @param string $class + * @param string $del_url + * @param array $is_display + * @param string $row_no + * @param string $where_clause_html + * @param string $del_query + * @param string $id_suffix + * @param string $class * @return string the generated HTML */ @@ -2710,11 +2710,11 @@ function PMA_generateCheckboxForMulti($del_url, $is_display, $row_no, $where_cla /** * Generates an Edit link * - * @param string $edit_url - * @param string $class - * @param string $edit_str - * @param string $where_clause - * @param string $where_clause_html + * @param string $edit_url + * @param string $class + * @param string $edit_str + * @param string $where_clause + * @param string $where_clause_html * @return string the generated HTML */ function PMA_generateEditLink($edit_url, $class, $edit_str, $where_clause, $where_clause_html) { @@ -2737,10 +2737,10 @@ function PMA_generateEditLink($edit_url, $class, $edit_str, $where_clause, $wher /** * Generates an Copy link * - * @param string $copy_url - * @param string $copy_str - * @param string $where_clause - * @param string $where_clause_html + * @param string $copy_url + * @param string $copy_str + * @param string $where_clause + * @param string $where_clause_html * @return string the generated HTML */ function PMA_generateCopyLink($copy_url, $copy_str, $where_clause, $where_clause_html, $class) { @@ -2767,10 +2767,10 @@ function PMA_generateCopyLink($copy_url, $copy_str, $where_clause, $where_clause /** * Generates a Delete link * - * @param string $del_url - * @param string $del_str - * @param string $js_conf - * @param string $class + * @param string $del_url + * @param string $del_str + * @param string $js_conf + * @param string $class * @return string the generated HTML */ function PMA_generateDeleteLink($del_url, $del_str, $js_conf, $class) { @@ -2791,20 +2791,20 @@ function PMA_generateDeleteLink($del_url, $del_str, $js_conf, $class) { * Generates checkbox and links at some position (left or right) * (only called for horizontal mode) * - * @param string $position - * @param string $del_url - * @param array $is_display - * @param string $row_no - * @param string $where_clause - * @param string $where_clause_html - * @param string $del_query - * @param string $id_suffix - * @param string $edit_url - * @param string $copy_url - * @param string $class - * @param string $edit_str - * @param string $del_str - * @param string $js_conf + * @param string $position + * @param string $del_url + * @param array $is_display + * @param string $row_no + * @param string $where_clause + * @param string $where_clause_html + * @param string $del_query + * @param string $id_suffix + * @param string $edit_url + * @param string $copy_url + * @param string $class + * @param string $edit_str + * @param string $del_str + * @param string $js_conf * @return string the generated HTML */ function PMA_generateCheckboxAndLinks($position, $del_url, $is_display, $row_no, $where_clause, $where_clause_html, $del_query, $id_suffix, $edit_url, $copy_url, $class, $edit_str, $copy_str, $del_str, $js_conf) { diff --git a/libraries/export/codegen.php b/libraries/export/codegen.php index 35fe21d..357eac0 100644 --- a/libraries/export/codegen.php +++ b/libraries/export/codegen.php @@ -73,7 +73,7 @@ function PMA_exportHeader() /** * Outputs database header * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -86,7 +86,7 @@ function PMA_exportDBHeader($db) /** * Outputs database footer * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -99,7 +99,7 @@ function PMA_exportDBFooter($db) /** * Outputs CREATE DATABASE statement * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -112,11 +112,11 @@ function PMA_exportDBCreate($db) /** * Outputs the content of a table in NHibernate format * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param string $sql_query SQL query for obtaining data + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data * @return bool Whether it suceeded * * @access public diff --git a/libraries/export/csv.php b/libraries/export/csv.php index 0240e9b..19ca573 100644 --- a/libraries/export/csv.php +++ b/libraries/export/csv.php @@ -96,7 +96,7 @@ function PMA_exportHeader() { /** * Outputs database header * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -108,7 +108,7 @@ function PMA_exportDBHeader($db) { /** * Outputs database footer * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -120,7 +120,7 @@ function PMA_exportDBFooter($db) { /** * Outputs CREATE DATABASE statement * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -132,11 +132,11 @@ function PMA_exportDBCreate($db) { /** * Outputs the content of a table in CSV format * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param string $sql_query SQL query for obtaining data + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data * @return bool Whether it suceeded * * @access public diff --git a/libraries/export/htmlword.php b/libraries/export/htmlword.php index 049cdc6..6604ac6 100644 --- a/libraries/export/htmlword.php +++ b/libraries/export/htmlword.php @@ -69,7 +69,7 @@ xmlns="http://www.w3.org/TR/REC-html40"> /** * Outputs database header * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -81,7 +81,7 @@ function PMA_exportDBHeader($db) { /** * Outputs database footer * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -93,7 +93,7 @@ function PMA_exportDBFooter($db) { /** * Outputs CREATE DATABASE statement * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -105,11 +105,11 @@ function PMA_exportDBCreate($db) { /** * Outputs the content of a table in HTML (Microsoft Word) format * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param string $sql_query SQL query for obtaining data + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data * @return bool Whether it suceeded * * @access public @@ -170,20 +170,20 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) /** * Outputs table's structure * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param bool $do_relation whether to include relation comments - * @param bool $do_comments whether to include the pmadb-style column comments + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param bool $do_relation whether to include relation comments + * @param bool $do_comments whether to include the pmadb-style column comments * as comments in the structure; this is deprecated * but the parameter is left here because export.php * calls PMA_exportStructure() also for other export * types which use this parameter - * @param bool $do_mime whether to include mime comments - * @param bool $dates whether to include creation/update/check dates - * @param string $export_mode 'create_table', 'triggers', 'create_view', 'stand_in' - * @param string $export_type 'server', 'database', 'table' + * @param bool $do_mime whether to include mime comments + * @param bool $dates whether to include creation/update/check dates + * @param string $export_mode 'create_table', 'triggers', 'create_view', 'stand_in' + * @param string $export_type 'server', 'database', 'table' * @return bool Whether it suceeded * * @access public diff --git a/libraries/export/json.php b/libraries/export/json.php index 989ef88..e008f0c 100644 --- a/libraries/export/json.php +++ b/libraries/export/json.php @@ -67,7 +67,7 @@ function PMA_exportHeader() /** * Outputs database header * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -81,7 +81,7 @@ function PMA_exportDBHeader($db) /** * Outputs database footer * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -94,7 +94,7 @@ function PMA_exportDBFooter($db) /** * Outputs CREATE DATABASE statement * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -107,11 +107,11 @@ function PMA_exportDBCreate($db) /** * Outputs the content of a table in JSON format * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param string $sql_query SQL query for obtaining data + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data * @return bool Whether it suceeded * * @access public diff --git a/libraries/export/latex.php b/libraries/export/latex.php index 0742109..080d0ac 100644 --- a/libraries/export/latex.php +++ b/libraries/export/latex.php @@ -85,7 +85,7 @@ if (isset($plugin_list)) { /** * Escapes some special characters for use in TeX/LaTeX * - * @param string the string to convert + * @param string the string to convert * * @return string the converted string with escape codes * @@ -140,7 +140,7 @@ function PMA_exportHeader() { /** * Outputs database header * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -156,7 +156,7 @@ function PMA_exportDBHeader($db) { /** * Outputs database footer * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -168,7 +168,7 @@ function PMA_exportDBFooter($db) { /** * Outputs CREATE DATABASE statement * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -180,11 +180,11 @@ function PMA_exportDBCreate($db) { /** * Outputs the content of a table in LaTeX table/sideways table environment * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param string $sql_query SQL query for obtaining data + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data * @return bool Whether it suceeded * * @access public @@ -277,20 +277,20 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) { /** * Outputs table's structure * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param bool $do_relation whether to include relation comments - * @param bool $do_comments whether to include the pmadb-style column comments + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param bool $do_relation whether to include relation comments + * @param bool $do_comments whether to include the pmadb-style column comments * as comments in the structure; this is deprecated * but the parameter is left here because export.php * calls PMA_exportStructure() also for other export * types which use this parameter - * @param bool $do_mime whether to include mime comments - * @param bool $dates whether to include creation/update/check dates - * @param string $export_mode 'create_table', 'triggers', 'create_view', 'stand_in' - * @param string $export_type 'server', 'database', 'table' + * @param bool $do_mime whether to include mime comments + * @param bool $dates whether to include creation/update/check dates + * @param string $export_mode 'create_table', 'triggers', 'create_view', 'stand_in' + * @param string $export_type 'server', 'database', 'table' * @return bool Whether it suceeded * * @access public diff --git a/libraries/export/mediawiki.php b/libraries/export/mediawiki.php index 7599df9..8ec3749 100644 --- a/libraries/export/mediawiki.php +++ b/libraries/export/mediawiki.php @@ -49,7 +49,7 @@ function PMA_exportHeader() { /** * Outputs database header * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -61,7 +61,7 @@ function PMA_exportDBHeader($db) { /** * Outputs database footer * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -73,7 +73,7 @@ function PMA_exportDBFooter($db) { /** * Outputs CREATE DATABASE statement * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -85,11 +85,11 @@ function PMA_exportDBCreate($db) { /** * Outputs the content of a table in MediaWiki format * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param string $sql_query SQL query for obtaining data + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data * @return bool Whether it suceeded * * @access public diff --git a/libraries/export/ods.php b/libraries/export/ods.php index 9d9ff13..fa62a96 100644 --- a/libraries/export/ods.php +++ b/libraries/export/ods.php @@ -102,7 +102,7 @@ function PMA_exportHeader() { /** * Outputs database header * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -114,7 +114,7 @@ function PMA_exportDBHeader($db) { /** * Outputs database footer * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -126,7 +126,7 @@ function PMA_exportDBFooter($db) { /** * Outputs CREATE DATABASE statement * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -138,11 +138,11 @@ function PMA_exportDBCreate($db) { /** * Outputs the content of a table in ODS format * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param string $sql_query SQL query for obtaining data + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data * @return bool Whether it suceeded * * @access public diff --git a/libraries/export/odt.php b/libraries/export/odt.php index f2b13a0..dba6e1c 100644 --- a/libraries/export/odt.php +++ b/libraries/export/odt.php @@ -100,7 +100,7 @@ function PMA_exportHeader() { /** * Outputs database header * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -113,7 +113,7 @@ function PMA_exportDBHeader($db) { /** * Outputs database footer * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -125,7 +125,7 @@ function PMA_exportDBFooter($db) { /** * Outputs CREATE DATABASE statement * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -137,11 +137,11 @@ function PMA_exportDBCreate($db) { /** * Outputs the content of a table in ODT format * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param string $sql_query SQL query for obtaining data + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data * @return bool Whether it suceeded * * @access public @@ -209,20 +209,20 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) { /** * Outputs table's structure * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param bool $do_relation whether to include relation comments - * @param bool $do_comments whether to include the pmadb-style column comments + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param bool $do_relation whether to include relation comments + * @param bool $do_comments whether to include the pmadb-style column comments * as comments in the structure; this is deprecated * but the parameter is left here because export.php * calls PMA_exportStructure() also for other export * types which use this parameter - * @param bool $do_mime whether to include mime comments - * @param bool $dates whether to include creation/update/check dates - * @param string $export_mode 'create_table', 'triggers', 'create_view', 'stand_in' - * @param string $export_type 'server', 'database', 'table' + * @param bool $do_mime whether to include mime comments + * @param bool $dates whether to include creation/update/check dates + * @param string $export_mode 'create_table', 'triggers', 'create_view', 'stand_in' + * @param string $export_type 'server', 'database', 'table' * @return bool Whether it suceeded * * @access public diff --git a/libraries/export/pdf.php b/libraries/export/pdf.php index e135bc8..01ffc88 100644 --- a/libraries/export/pdf.php +++ b/libraries/export/pdf.php @@ -408,7 +408,7 @@ function PMA_exportHeader() /** * Outputs database header * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -421,7 +421,7 @@ function PMA_exportDBHeader($db) /** * Outputs database footer * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -434,7 +434,7 @@ function PMA_exportDBFooter($db) /** * Outputs CREATE DATABASE statement * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -447,11 +447,11 @@ function PMA_exportDBCreate($db) /** * Outputs the content of a table in PDF format * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param string $sql_query SQL query for obtaining data + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data * @return bool Whether it suceeded * * @access public diff --git a/libraries/export/php_array.php b/libraries/export/php_array.php index 1996e6f..783afe0 100644 --- a/libraries/export/php_array.php +++ b/libraries/export/php_array.php @@ -68,7 +68,7 @@ function PMA_exportHeader() /** * Outputs database header * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -82,7 +82,7 @@ function PMA_exportDBHeader($db) /** * Outputs database footer * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -95,7 +95,7 @@ function PMA_exportDBFooter($db) /** * Outputs CREATE DATABASE statement * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -108,11 +108,11 @@ function PMA_exportDBCreate($db) /** * Outputs the content of a table as a fragment of PHP code * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param string $sql_query SQL query for obtaining data + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data * @return bool Whether it suceeded * * @access public diff --git a/libraries/export/sql.php b/libraries/export/sql.php index 81058a8..0781db4 100644 --- a/libraries/export/sql.php +++ b/libraries/export/sql.php @@ -304,7 +304,7 @@ if (! isset($sql_backquotes)) { /** * Exports routines (procedures and functions) * - * @param string $db + * @param string $db * @return bool Whether it suceeded * * @access public @@ -371,7 +371,7 @@ function PMA_exportRoutines($db) { /** * Possibly outputs comment * - * @param string $text Text of comment + * @param string $text Text of comment * @return string The formatted comment * * @access private @@ -536,7 +536,7 @@ function PMA_exportHeader() /** * Outputs CREATE DATABASE statement * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -572,7 +572,7 @@ function PMA_exportDBCreate($db) /** * Outputs database header * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -588,7 +588,7 @@ function PMA_exportDBHeader($db) /** * Outputs database footer * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -642,9 +642,9 @@ function PMA_exportDBFooter($db) /** * Returns a stand-in CREATE definition to resolve view dependencies * - * @param string $db the database name - * @param string $view the view name - * @param string $crlf the end of line sequence + * @param string $db the database name + * @param string $view the view name + * @param string $crlf the end of line sequence * @return string resulting definition * * @access public @@ -673,13 +673,13 @@ function PMA_getTableDefStandIn($db, $view, $crlf) { /** * Returns $table's CREATE definition * - * @param string $db the database name - * @param string $table the table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param bool $show_dates whether to include creation/update/check dates - * @param bool $add_semicolon whether to add semicolon and end-of-line at the end - * @param bool $view whether we're handling a view + * @param string $db the database name + * @param string $table the table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param bool $show_dates whether to include creation/update/check dates + * @param bool $add_semicolon whether to add semicolon and end-of-line at the end + * @param bool $view whether we're handling a view * @return string resulting schema * * @access public @@ -878,11 +878,11 @@ function PMA_getTableDef($db, $table, $crlf, $error_url, $show_dates = false, $a /** * Returns $table's comments, relations etc. * - * @param string $db database name - * @param string $table table name - * @param string $crlf end of line sequence - * @param bool $do_relation whether to include relation comments - * @param bool $do_mime whether to include mime comments + * @param string $db database name + * @param string $table table name + * @param string $crlf end of line sequence + * @param bool $do_relation whether to include relation comments + * @param bool $do_mime whether to include mime comments * @return string resulting comments * * @access private @@ -947,20 +947,20 @@ function PMA_getTableComments($db, $table, $crlf, $do_relation = false, $do_mime /** * Outputs table's structure * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param bool $relation whether to include relation comments - * @param bool $comments whether to include the pmadb-style column comments + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param bool $relation whether to include relation comments + * @param bool $comments whether to include the pmadb-style column comments * as comments in the structure; this is deprecated * but the parameter is left here because export.php * calls PMA_exportStructure() also for other export * types which use this parameter - * @param bool $mime whether to include mime comments - * @param bool $dates whether to include creation/update/check dates - * @param string $export_mode 'create_table', 'triggers', 'create_view', 'stand_in' - * @param string $export_type 'server', 'database', 'table' + * @param bool $mime whether to include mime comments + * @param bool $dates whether to include creation/update/check dates + * @param string $export_mode 'create_table', 'triggers', 'create_view', 'stand_in' + * @param string $export_type 'server', 'database', 'table' * @return bool Whether it suceeded * * @access public @@ -1025,11 +1025,11 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $relation = false, /** * Outputs the content of a table in SQL format * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param string $sql_query SQL query for obtaining data + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data * @return bool Whether it suceeded * * @access public diff --git a/libraries/export/texytext.php b/libraries/export/texytext.php index 6294311..06de740 100644 --- a/libraries/export/texytext.php +++ b/libraries/export/texytext.php @@ -57,7 +57,7 @@ function PMA_exportHeader() { /** * Outputs database header * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -69,7 +69,7 @@ function PMA_exportDBHeader($db) { /** * Outputs database footer * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -81,7 +81,7 @@ function PMA_exportDBFooter($db) { /** * Outputs CREATE DATABASE statement * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -93,11 +93,11 @@ function PMA_exportDBCreate($db) { /** * Outputs the content of a table in Texy format * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param string $sql_query SQL query for obtaining data + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data * @return bool Whether it suceeded * * @access public @@ -152,20 +152,20 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) /** * Outputs table's structure * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param bool $do_relation whether to include relation comments - * @param bool $do_comments whether to include the pmadb-style column comments + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param bool $do_relation whether to include relation comments + * @param bool $do_comments whether to include the pmadb-style column comments * as comments in the structure; this is deprecated * but the parameter is left here because export.php * calls PMA_exportStructure() also for other export * types which use this parameter - * @param bool $do_mime whether to include mime comments - * @param bool $dates whether to include creation/update/check dates - * @param string $export_mode 'create_table', 'triggers', 'create_view', 'stand_in' - * @param string $export_type 'server', 'database', 'table' + * @param bool $do_mime whether to include mime comments + * @param bool $dates whether to include creation/update/check dates + * @param string $export_mode 'create_table', 'triggers', 'create_view', 'stand_in' + * @param string $export_type 'server', 'database', 'table' * @return bool Whether it suceeded * * @access public diff --git a/libraries/export/xls.php b/libraries/export/xls.php index 6116e2a..5747f08 100644 --- a/libraries/export/xls.php +++ b/libraries/export/xls.php @@ -91,7 +91,7 @@ function PMA_exportHeader() { /** * Outputs database header * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -105,7 +105,7 @@ function PMA_exportDBHeader($db) { /** * Outputs database footer * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -117,7 +117,7 @@ function PMA_exportDBFooter($db) { /** * Outputs CREATE DATABASE statement * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -129,11 +129,11 @@ function PMA_exportDBCreate($db) { /** * Outputs the content of a table in XLS format * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param string $sql_query SQL query for obtaining data + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data * @return bool Whether it suceeded * * @access public diff --git a/libraries/export/xlsx.php b/libraries/export/xlsx.php index 758d98d..8f5cb19 100644 --- a/libraries/export/xlsx.php +++ b/libraries/export/xlsx.php @@ -90,7 +90,7 @@ function PMA_exportHeader() { /** * Outputs database header * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -104,7 +104,7 @@ function PMA_exportDBHeader($db) { /** * Outputs database footer * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -116,7 +116,7 @@ function PMA_exportDBFooter($db) { /** * Outputs CREATE DATABASE statement * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -128,11 +128,11 @@ function PMA_exportDBCreate($db) { /** * Outputs the content of a table in XLSX format * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param string $sql_query SQL query for obtaining data + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data * @return bool Whether it suceeded * * @access public diff --git a/libraries/export/xml.php b/libraries/export/xml.php index 9247e22..26953af 100644 --- a/libraries/export/xml.php +++ b/libraries/export/xml.php @@ -233,7 +233,7 @@ function PMA_exportHeader() { /** * Outputs database header * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -258,7 +258,7 @@ function PMA_exportDBHeader($db) { /** * Outputs database footer * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -278,7 +278,7 @@ function PMA_exportDBFooter($db) { /** * Outputs CREATE DATABASE statement * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -290,11 +290,11 @@ function PMA_exportDBCreate($db) { /** * Outputs the content of a table in XML format * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param string $sql_query SQL query for obtaining data + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data * @return bool Whether it suceeded * * @access public diff --git a/libraries/export/yaml.php b/libraries/export/yaml.php index 017cae6..26b19a9 100644 --- a/libraries/export/yaml.php +++ b/libraries/export/yaml.php @@ -64,7 +64,7 @@ function PMA_exportHeader() /** * Outputs database header * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -77,7 +77,7 @@ function PMA_exportDBHeader($db) /** * Outputs database footer * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -90,7 +90,7 @@ function PMA_exportDBFooter($db) /** * Outputs CREATE DATABASE statement * - * @param string $db Database name + * @param string $db Database name * @return bool Whether it suceeded * * @access public @@ -103,11 +103,11 @@ function PMA_exportDBCreate($db) /** * Outputs the content of a table in YAML format * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param string $sql_query SQL query for obtaining data + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data * @return bool Whether it suceeded * * @access public diff --git a/libraries/file_listing.php b/libraries/file_listing.php index ff1cf9d..720ba82 100644 --- a/libraries/file_listing.php +++ b/libraries/file_listing.php @@ -10,8 +10,8 @@ /** * Returns array of filtered file names * - * @param string directory to list - * @param string regular expression to match files + * @param string directory to list + * @param string regular expression to match files * @returns array sorted file list on success, false on failure */ function PMA_getDirContent($dir, $expression = '') @@ -39,9 +39,9 @@ function PMA_getDirContent($dir, $expression = '') /** * Returns options of filtered file names * - * @param string directory to list - * @param string regullar expression to match files - * @param string currently active choice + * @param string directory to list + * @param string regullar expression to match files + * @param string currently active choice * @returns array sorted file list on success, false on failure */ function PMA_getFileSelectOptions($dir, $extensions = '', $active = '') diff --git a/libraries/grab_globals.lib.php b/libraries/grab_globals.lib.php index d198855..aafd169 100644 --- a/libraries/grab_globals.lib.php +++ b/libraries/grab_globals.lib.php @@ -15,9 +15,9 @@ if (! defined('PHPMYADMIN')) { /** * copy values from one array to another, usually from a superglobal into $GLOBALS * - * @param array $array values from - * @param array $target values to - * @param boolean $sanitize prevent importing key names in $_import_blacklist + * @param array $array values from + * @param array $target values to + * @param boolean $sanitize prevent importing key names in $_import_blacklist */ function PMA_recursive_extract($array, &$target, $sanitize = true) { diff --git a/libraries/iconv_wrapper.lib.php b/libraries/iconv_wrapper.lib.php index 1f00c13..61e6875 100644 --- a/libraries/iconv_wrapper.lib.php +++ b/libraries/iconv_wrapper.lib.php @@ -40,9 +40,9 @@ $gnu_iconv_to_aix_iconv_codepage_map = array ( * Wrapper around IBM AIX iconv(), whose character set naming differs * from the GNU version of iconv(). * - * @param string input character set - * @param string output character set - * @param string the string to convert + * @param string input character set + * @param string output character set + * @param string the string to convert * * @return mixed converted string or false on failure * diff --git a/libraries/import.lib.php b/libraries/import.lib.php index 79b4ade..73f9008 100644 --- a/libraries/import.lib.php +++ b/libraries/import.lib.php @@ -44,7 +44,7 @@ function PMA_checkTimeout() /** * Detects what compression filse uses * - * @param string $filepath filename to check + * @param string $filepath filename to check * @return string MIME type of compression, none for none * @access public */ @@ -73,9 +73,9 @@ function PMA_detectCompression($filepath) * Runs query inside import buffer. This is needed to allow displaying * of last SELECT, SHOW or HANDLER results and similar nice stuff. * - * @param string $sql query to run - * @param string $full query to display, this might be commented - * @param bool $controluser whether to use control user for queries + * @param string $sql query to run + * @param string $full query to display, this might be commented + * @param bool $controluser whether to use control user for queries * @access public */ function PMA_importRunQuery($sql = '', $full = '', $controluser = false) @@ -207,9 +207,9 @@ function PMA_importRunQuery($sql = '', $full = '', $controluser = false) /** * Looks for the presence of USE to possibly change current db * - * @param string $buffer buffer to examine - * @param string $db current db - * @param bool $reload reload + * @param string $buffer buffer to examine + * @param string $db current db + * @param bool $reload reload * @return array (current or new db, whether to reload) * @access public */ @@ -227,7 +227,7 @@ function PMA_lookForUse($buffer, $db, $reload) /** * Returns next part of imported file/buffer * - * @param int $size size of buffer to read (this is maximal size function will return) + * @param int $size size of buffer to read (this is maximal size function will return) * @return string part of file/buffer * @access public */ @@ -331,7 +331,7 @@ function PMA_importGetNextChunk($size = 32768) * * @access public * - * @param int $num + * @param int $num * @return string The column's "Excel" name */ function PMA_getColumnAlphaName($num) @@ -378,7 +378,7 @@ function PMA_getColumnAlphaName($num) * * @access public * - * @param string $name (i.e. "A", or "BC", etc.) + * @param string $name (i.e. "A", or "BC", etc.) * @return int The column number */ function PMA_getColumnNumberFromName($name) { @@ -437,7 +437,7 @@ define("SIZES", 1); * * @access public * - * @param string $last_cumulative_size + * @param string $last_cumulative_size * @return int Precision of the given decimal size notation */ function PMA_getM($last_cumulative_size) { @@ -449,7 +449,7 @@ function PMA_getM($last_cumulative_size) { * * @access public * - * @param string $last_cumulative_size + * @param string $last_cumulative_size * @return int Scale of the given decimal size notation */ function PMA_getD($last_cumulative_size) { @@ -461,7 +461,7 @@ function PMA_getD($last_cumulative_size) { * * @access public * - * @param string &$cell + * @param string &$cell * @return array Contains the precision, scale, and full size representation of the given decimal cell */ function PMA_getDecimalSize(&$cell) { @@ -482,10 +482,10 @@ function PMA_getDecimalSize(&$cell) { * * @access public * - * @param string $last_cumulative_size Last cumulative column size - * @param int $last_cumulative_type Last cumulative column type (NONE or VARCHAR or DECIMAL or INT or BIGINT) - * @param int $curr_type Type of the current cell (NONE or VARCHAR or DECIMAL or INT or BIGINT) - * @param string &$cell The current cell + * @param string $last_cumulative_size Last cumulative column size + * @param int $last_cumulative_type Last cumulative column type (NONE or VARCHAR or DECIMAL or INT or BIGINT) + * @param int $curr_type Type of the current cell (NONE or VARCHAR or DECIMAL or INT or BIGINT) + * @param string &$cell The current cell * @return string Size of the given cell in the type-appropriate format */ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type, &$cell) { @@ -693,8 +693,8 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type * * @access public * - * @param int $last_cumulative_type Last cumulative column type (VARCHAR or INT or BIGINT or DECIMAL or NONE) - * @param string &$cell String representation of the cell for which a best-fit type is to be determined + * @param int $last_cumulative_type Last cumulative column type (VARCHAR or INT or BIGINT or DECIMAL or NONE) + * @param string &$cell String representation of the cell for which a best-fit type is to be determined * @return int The MySQL type representation (VARCHAR or INT or BIGINT or DECIMAL or NONE) */ function PMA_detectType($last_cumulative_type, &$cell) { @@ -733,7 +733,7 @@ function PMA_detectType($last_cumulative_type, &$cell) { * * @access public * - * @param &$table array(string $table_name, array $col_names, array $rows) + * @param &$table array(string $table_name, array $col_names, array $rows) * @return array array(array $types, array $sizes) */ function PMA_analyzeTable(&$table) { @@ -826,11 +826,11 @@ $import_notice = null; * * @access public * - * @param string $db_name Name of the database - * @param array &$tables Array of tables for the specified database - * @param array &$analyses Analyses of the tables - * @param array &$additional_sql Additional SQL statements to be executed - * @param array $options Associative array of options + * @param string $db_name Name of the database + * @param array &$tables Array of tables for the specified database + * @param array &$analyses Analyses of the tables + * @param array &$additional_sql Additional SQL statements to be executed + * @param array $options Associative array of options * @return void */ function PMA_buildSQL($db_name, &$tables, &$analyses = null, &$additional_sql = null, $options = null) { diff --git a/libraries/ip_allow_deny.lib.php b/libraries/ip_allow_deny.lib.php index 1537b43..c8481ba 100644 --- a/libraries/ip_allow_deny.lib.php +++ b/libraries/ip_allow_deny.lib.php @@ -56,8 +56,8 @@ function PMA_getIp() * Does not match: * xxx.xxx.xxx.xx[yyy-zzz] (range, partial octets not supported) * - * @param string string of IP range to match - * @param string string of IP to test against range + * @param string string of IP range to match + * @param string string of IP to test against range * * @return boolean always true * @@ -112,7 +112,7 @@ function PMA_ipMaskTest($testRange, $ipToTest) /** * Runs through IP Allow/Deny rules the use of it below for more information * - * @param string 'allow' | 'deny' type of rule to match + * @param string 'allow' | 'deny' type of rule to match * * @return bool Matched a rule ? * diff --git a/libraries/js_escape.lib.php b/libraries/js_escape.lib.php index f7e8fb3..53e5052 100644 --- a/libraries/js_escape.lib.php +++ b/libraries/js_escape.lib.php @@ -13,8 +13,8 @@ * This function is used to displays a javascript confirmation box for * "DROP/DELETE/ALTER" queries. * - * @param string $a_string the string to format - * @param boolean $add_backquotes whether to add backquotes to the string or not + * @param string $a_string the string to format + * @param boolean $add_backquotes whether to add backquotes to the string or not * * @return string the formatted string * @@ -42,7 +42,7 @@ function PMA_jsFormat($a_string = '', $add_backquotes = true) * We also remove NUL byte as some browsers (namely MSIE) ignore it and * inserting it anywhere inside </script would allow to bypass this check. * - * @param string $string the string to be escaped + * @param string $string the string to be escaped * @return string the escaped string */ function PMA_escapeJsString($string) diff --git a/libraries/kanji-encoding.lib.php b/libraries/kanji-encoding.lib.php index 552bd13..59891f5 100644 --- a/libraries/kanji-encoding.lib.php +++ b/libraries/kanji-encoding.lib.php @@ -65,9 +65,9 @@ function PMA_change_enc_order() { * Kanji string encoding convert * 2002/1/4 by Y.Kawada * - * @param string the string to convert - * @param string the destination encoding code - * @param string set 'kana' convert to JIS-X208-kana + * @param string the string to convert + * @param string the destination encoding code + * @param string set 'kana' convert to JIS-X208-kana * * @global string the available encoding codes list * @@ -98,9 +98,9 @@ function PMA_kanji_str_conv($str, $enc, $kana) { * Kanji file encoding convert * 2002/1/4 by Y.Kawada * - * @param string the name of the file to convert - * @param string the destination encoding code - * @param string set 'kana' convert to JIS-X208-kana + * @param string the name of the file to convert + * @param string the destination encoding code + * @param string set 'kana' convert to JIS-X208-kana * * @return string the name of the converted file */ @@ -131,7 +131,7 @@ function PMA_kanji_file_conv($file, $enc, $kana) { * Defines radio form fields to switch between encoding modes * 2002/1/4 by Y.Kawada * - * @param string spaces character to prepend the output with + * @param string spaces character to prepend the output with * * @return string xhtml code for the radio controls */ diff --git a/libraries/mysql_charsets.lib.php b/libraries/mysql_charsets.lib.php index 53c309a..fc6b18f 100644 --- a/libraries/mysql_charsets.lib.php +++ b/libraries/mysql_charsets.lib.php @@ -153,7 +153,7 @@ function PMA_generateCharsetQueryPart($collation) { /** * returns collation of given db * - * @param string $db name of db + * @param string $db name of db * @return string collation of $db */ function PMA_getDbCollation($db) { @@ -190,7 +190,7 @@ function PMA_getServerCollation() { * returns description for given collation * * - * @param string $collation MySQL collation string + * @param string $collation MySQL collation string * @return string collation description */ function PMA_getCollationDescr($collation) { diff --git a/libraries/opendocument.lib.php b/libraries/opendocument.lib.php index 810d97f..4af590a 100644 --- a/libraries/opendocument.lib.php +++ b/libraries/opendocument.lib.php @@ -23,8 +23,8 @@ $GLOBALS['OpenDocumentNS'] = 'xmlns:office="urn:oasis:names:tc:opendocument:xmln /** * Minimalistic creator of OASIS OpenDocument * - * @param string desired MIME type - * @param string document content + * @param string desired MIME type + * @param string document content * * @return string OASIS OpenDocument data * diff --git a/libraries/plugin_interface.lib.php b/libraries/plugin_interface.lib.php index 703215f..b0b82f0 100644 --- a/libraries/plugin_interface.lib.php +++ b/libraries/plugin_interface.lib.php @@ -11,8 +11,8 @@ * * Reads all plugin information from directory $plugins_dir. * - * @param string $plugins_dir directrory with plugins - * @param mixed $plugin_param parameter to plugin by which they can decide whether they can work + * @param string $plugins_dir directrory with plugins + * @param mixed $plugin_param parameter to plugin by which they can decide whether they can work * @return array list of plugins */ function PMA_getPlugins($plugins_dir, $plugin_param) @@ -40,7 +40,7 @@ function PMA_getPlugins($plugins_dir, $plugin_param) * * returns locale string for $name or $name if no locale is found * - * @param string $name for local string + * @param string $name for local string * @return string locale string for $name */ function PMA_getString($name) @@ -53,9 +53,9 @@ function PMA_getString($name) * * returns html input tag option 'checked' if plugin $opt should be set by config or request * - * @param string $section name of config section in + * @param string $section name of config section in * $GLOBALS['cfg'][$section] for plugin - * @param string $opt name of option + * @param string $opt name of option * @return string hmtl input tag option 'checked' */ function PMA_pluginCheckboxCheck($section, $opt) @@ -73,9 +73,9 @@ function PMA_pluginCheckboxCheck($section, $opt) * * returns default value for option $opt * - * @param string $section name of config section in + * @param string $section name of config section in * $GLOBALS['cfg'][$section] for plugin - * @param string $opt name of option + * @param string $opt name of option * @return string default value for option $opt */ function PMA_pluginGetDefault($section, $opt) @@ -107,10 +107,10 @@ function PMA_pluginGetDefault($section, $opt) * * returns html input tag option 'checked' if option $opt should be set by config or request * - * @param string $section name of config section in + * @param string $section name of config section in * $GLOBALS['cfg'][$section] for plugin - * @param string $opt name of option - * @param string $val value of option to check against + * @param string $opt name of option + * @param string $val value of option to check against * @return string html input tag option 'checked' */ function PMA_pluginIsActive($section, $opt, $val) @@ -131,11 +131,11 @@ function PMA_pluginIsActive($section, $opt, $val) * returns html select form element for plugin choice * and hidden fields denoting whether each plugin must be exported as a file * - * @param string $section name of config section in + * @param string $section name of config section in * $GLOBALS['cfg'][$section] for plugin - * @param string $name name of select element - * @param array &$list array with plugin configuration defined in plugin file - * @param string $cfgname name of config value, if none same as $name + * @param string $name name of select element + * @param array &$list array with plugin configuration defined in plugin file + * @param string $cfgname name of config value, if none same as $name * @return string html select tag */ function PMA_pluginGetChoice($section, $name, &$list, $cfgname = null) @@ -173,11 +173,11 @@ function PMA_pluginGetChoice($section, $name, &$list, $cfgname = null) * * returns single option in a list element * - * @param string $section name of config section in + * @param string $section name of config section in * $GLOBALS['cfg'][$section] for plugin - * @param string $plugin_name unique plugin name - * @param string $id option id - * @param array &$opt plugin option details + * @param string $plugin_name unique plugin name + * @param string $id option id + * @param array &$opt plugin option details * @return string table row with option */ function PMA_pluginGetOneOption($section, $plugin_name, $id, &$opt) @@ -285,8 +285,8 @@ function PMA_pluginGetOneOption($section, $plugin_name, $id, &$opt) * * return html div with editable options for plugin * - * @param string $section name of config section in $GLOBALS['cfg'][$section] - * @param array &$list array with plugin configuration defined in plugin file + * @param string $section name of config section in $GLOBALS['cfg'][$section] + * @param array &$list array with plugin configuration defined in plugin file * @return string html fieldset with plugin options */ function PMA_pluginGetOptions($section, &$list) diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index 0b74c70..86d4ab1 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -12,8 +12,8 @@ if (! defined('PHPMYADMIN')) { /** * Executes a query as controluser if possible, otherwise as normal user * - * @param string the query to execute - * @param boolean whether to display SQL error messages or not + * @param string the query to execute + * @param boolean whether to display SQL error messages or not * * @return integer the result set, or false if no result set * @@ -42,7 +42,7 @@ function PMA_query_as_controluser($sql, $show_error = true, $options = 0) } // end of the "PMA_query_as_controluser()" function /** - * @param bool $verbose whether to print diagnostic info + * @param bool $verbose whether to print diagnostic info * @return array $cfgRelation */ function PMA_getRelationsParam($verbose = false) @@ -65,7 +65,7 @@ function PMA_getRelationsParam($verbose = false) /** * prints out diagnostic info for pma relation feature * - * @param array $cfgRelation + * @param array $cfgRelation */ function PMA_printRelationsParamDiagnostic($cfgRelation) { @@ -157,10 +157,10 @@ function PMA_printRelationsParamDiagnostic($cfgRelation) /** * prints out one diagnostic message for a feature * - * @param string feature name in a message string - * @param string the $GLOBALS['cfgRelation'] parameter to check - * @param array utility messages - * @param boolean whether to skip a line after the message + * @param string feature name in a message string + * @param string the $GLOBALS['cfgRelation'] parameter to check + * @param array utility messages + * @param boolean whether to skip a line after the message */ function PMA_printDiagMessageForFeature($feature_name, $relation_parameter, $messages, $skip_line=true) { @@ -175,10 +175,10 @@ function PMA_printDiagMessageForFeature($feature_name, $relation_parameter, $mes /** * prints out one diagnostic message for a configuration parameter * - * @param string config parameter name to display - * @param boolean whether this parameter is set - * @param array utility messages - * @param string anchor in Documentation.html + * @param string config parameter name to display + * @param boolean whether this parameter is set + * @param array utility messages + * @param string anchor in Documentation.html */ function PMA_printDiagMessageForParameter($parameter, $relation_parameter_set, $messages, $doc_anchor) { @@ -362,10 +362,10 @@ function PMA__getRelationsParam() * optionally a given column in a table * * @access public - * @param string $db the name of the db to check for - * @param string $table the name of the table to check for - * @param string $column the name of the column to check for - * @param string $source the source for foreign key information + * @param string $db the name of the db to check for + * @param string $table the name of the table to check for + * @param string $column the name of the column to check for + * @param string $source the source for foreign key information * @return array db,table,column */ function PMA_getForeigners($db, $table, $column = '', $source = 'both') @@ -458,8 +458,8 @@ function PMA_getForeigners($db, $table, $column = '', $source = 'both') * Gets the display field of a table * * @access public - * @param string $db the name of the db to check for - * @param string $table the name of the table to check for + * @param string $db the name of the db to check for + * @param string $table the name of the table to check for * @return string field name */ function PMA_getDisplayField($db, $table) @@ -503,8 +503,8 @@ function PMA_getDisplayField($db, $table) * Gets the comments for all rows of a table or the db itself * * @access public - * @param string the name of the db to check for - * @param string the name of the table to check for + * @param string the name of the db to check for + * @param string the name of the table to check for * @return array [field_name] = comment */ function PMA_getComments($db, $table = '') @@ -532,7 +532,7 @@ function PMA_getComments($db, $table = '') * Gets the comment for a db * * @access public - * @param string the name of the db to check for + * @param string the name of the db to check for * @return string comment */ function PMA_getDbComment($db) @@ -564,7 +564,7 @@ function PMA_getDbComment($db) * Gets the comment for a db * * @access public - * @param string the name of the db to check for + * @param string the name of the db to check for * @return string comment */ function PMA_getDbComments() @@ -595,8 +595,8 @@ function PMA_getDbComments() * Set a database comment to a certain value. * * @access public - * @param string $db the name of the db - * @param string $comment the value of the column + * @param string $db the name of the db + * @param string $comment the value of the column * @return boolean true, if comment-query was made. */ function PMA_setDbComment($db, $comment = '') @@ -638,10 +638,10 @@ function PMA_setDbComment($db, $comment = '') /** * Set a SQL history entry * - * @param string $db the name of the db - * @param string $table the name of the table - * @param string $username the username - * @param string $sqlquery the sql query + * @param string $db the name of the db + * @param string $table the name of the table + * @param string $username the username + * @param string $sqlquery the sql query * @access public */ function PMA_setHistory($db, $table, $username, $sqlquery) @@ -696,7 +696,7 @@ function PMA_setHistory($db, $table, $username, $sqlquery) /** * Gets a SQL history entry * - * @param string $username the username + * @param string $username the username * @return array list of history items * @access public */ @@ -725,7 +725,7 @@ function PMA_getHistory($username) * deletes entries that exceeds $cfg['QueryHistoryMax'], oldest first, for the * given user * - * @param string $username the username + * @param string $username the username * @access public */ function PMA_purgeHistory($username) @@ -758,9 +758,9 @@ function PMA_purgeHistory($username) /** * Prepares the dropdown for one mode * - * @param array $foreign the keys and values for foreigns - * @param string $data the current data of the dropdown - * @param string $mode the needed mode + * @param array $foreign the keys and values for foreigns + * @param string $data the current data of the dropdown + * @param string $mode the needed mode * * @return array the <option value=""><option>s * @@ -821,10 +821,10 @@ function PMA__foreignDropdownBuild($foreign, $data, $mode) /** * Outputs dropdown with values of foreign fields * - * @param array array of the displayed row - * @param string the foreign field - * @param string the foreign field to display - * @param string the current data of the dropdown (field in row) + * @param array array of the displayed row + * @param string the foreign field + * @param string the foreign field to display + * @param string the current data of the dropdown (field in row) * @return string the <option value=""><option>s * @access public */ @@ -893,11 +893,11 @@ function PMA_foreignDropdown($disp_row, $foreign_field, $foreign_display, $data, /** * Gets foreign keys in preparation for a drop-down selector * - * @param array array of the foreign keys - * @param string the foreign field name - * @param bool whether to override the total - * @param string a possible filter - * @param string a possible LIMIT clause + * @param array array of the foreign keys + * @param string the foreign field name + * @param bool whether to override the total + * @param string a possible filter + * @param string a possible LIMIT clause * @return array data about the foreign keys * @access public */ @@ -976,7 +976,7 @@ function PMA_getForeignData($foreigners, $field, $override_total, $foreign_filte /** * Finds all related tables * - * @param string whether to go from master to foreign or vice versa + * @param string whether to go from master to foreign or vice versa * @return boolean always true * @global array $tab_left the list of tables that we still couldn't connect * @global array $tab_know the list of allready connected tables diff --git a/libraries/sanitizing.lib.php b/libraries/sanitizing.lib.php index 95a6ec0..b308f1c 100644 --- a/libraries/sanitizing.lib.php +++ b/libraries/sanitizing.lib.php @@ -18,8 +18,8 @@ * * <a title="<?php echo PMA_sanitize($foo, true); ?>">bar</a> * - * @param string the message - * @param boolean whether to escape html in result + * @param string the message + * @param boolean whether to escape html in result * * @return string the sanitized message * diff --git a/libraries/select_lang.lib.php b/libraries/select_lang.lib.php index 7d1de46..284fdbe 100644 --- a/libraries/select_lang.lib.php +++ b/libraries/select_lang.lib.php @@ -102,7 +102,7 @@ function PMA_langCheck() * checks given lang and sets it if valid * returns true on success, otherwise flase * - * @param string $lang language to set + * @param string $lang language to set * @return bool success */ function PMA_langSet(&$lang) @@ -121,8 +121,8 @@ function PMA_langSet(&$lang) * Analyzes some PHP environment variables to find the most probable language * that should be used * - * @param string string to analyze - * @param integer type of the PHP environment variable which value is $str + * @param string string to analyze + * @param integer type of the PHP environment variable which value is $str * * @return bool true on success, otherwise false * diff --git a/libraries/select_server.lib.php b/libraries/select_server.lib.php index 68541d8..6d230ea 100644 --- a/libraries/select_server.lib.php +++ b/libraries/select_server.lib.php @@ -9,8 +9,8 @@ /** * display server selection in list or selectbox form, or option tags only * - * @param boolean $not_only_options whether to include form tags or not - * @param boolean $ommit_fieldset whether to ommit fieldset tag or not + * @param boolean $not_only_options whether to include form tags or not + * @param boolean $ommit_fieldset whether to ommit fieldset tag or not */ function PMA_select_server($not_only_options, $ommit_fieldset) { diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php index 2c7e69c..12cea2a 100644 --- a/libraries/server_synchronize.lib.php +++ b/libraries/server_synchronize.lib.php @@ -372,11 +372,11 @@ function PMA_findDeleteRowsFromTargetTables(&$delete_array, $matching_table, $ma /** * PMA_dataDiffInUncommonTables() finds the data difference in $source_tables_uncommon * - * @param $source_tables_uncommon array of table names; containing table names that are in source db and not in target db - * @param $src_db name of source database - * @param $src_link connection established with source server - * @param $index index of a table from $matching_table array - * @param $row_count number of rows + * @param $source_tables_uncommon array of table names; containing table names that are in source db and not in target db + * @param $src_db name of source database + * @param $src_link connection established with source server + * @param $index index of a table from $matching_table array + * @param $row_count number of rows * @return nothing */ function PMA_dataDiffInUncommonTables($source_tables_uncommon, $src_db, $src_link, $index, &$row_count) @@ -390,15 +390,15 @@ function PMA_dataDiffInUncommonTables($source_tables_uncommon, $src_db, $src_lin * PMA_updateTargetTables() sets the updated field values to target table rows using $update_array[$matching_table_index] * * - * @param $table Array containing matching tables' names - * @param $update_array A three dimensional array containing field + * @param $table Array containing matching tables' names + * @param $update_array A three dimensional array containing field * value updates required for each matching table - * @param $src_db Name of source database - * @param $trg_db Name of target database - * @param $trg_link Connection established with target server - * @param $matching_table_index index of matching table in matching_table_array - * @param $matching_table_keys - * @param $display true/false value + * @param $src_db Name of source database + * @param $trg_db Name of target database + * @param $trg_link Connection established with target server + * @param $matching_table_index index of matching table in matching_table_array + * @param $matching_table_keys + * @param $display true/false value * @return nothing */ function PMA_updateTargetTables($table, $update_array, $src_db, $trg_db, $trg_link, $matching_table_index, $matching_table_keys, $display) @@ -447,30 +447,30 @@ function PMA_updateTargetTables($table, $update_array, $src_db, $trg_db, $trg_li /** * PMA_insertIntoTargetTable() inserts missing rows in the target table using $array_insert[$matching_table_index] * - * @param $matching_table array containing matching table names - * @param $src_db name of source database - * @param $trg_db name of target database - * @param $src_link connection established with source server - * @param $trg_link connection established with target server - * @param $table_fields array containing field names of a table - * @param $array_insert - * @param $matching_table_index index of matching table in matching_table_array - * @param $matching_tables_keys array containing field names that are keys in the matching table - * @param $source_columns array containing source column information - * @param $add_column_array array containing column names that are to be added in target table - * @param $criteria array containing criterias like type, null, collation, default etc - * @param $target_tables_keys array containing field names that are keys in the target table - * @param $uncommon_tables array containing table names that are present in source db but not in targt db - * @param $uncommon_tables_fields array containing field names of the uncommon tables - * @param $uncommon_cols column names that are present in target table and not in source table - * @param $alter_str_array array containing column names that are to be altered - * @param $source_indexes column names on which indexes are made in source table - * @param $target_indexes column names on which indexes are made in target table - * @param $add_indexes_array array containing column names on which index is to be added in target table - * @param $alter_indexes_array array containing column names whose indexes are to be altered. Only index name and uniqueness of an index can be changed - * @param $delete_array array containing rows that are to be deleted - * @param $update_array array containing rows that are to be updated in target - * @param $display true/false value + * @param $matching_table array containing matching table names + * @param $src_db name of source database + * @param $trg_db name of target database + * @param $src_link connection established with source server + * @param $trg_link connection established with target server + * @param $table_fields array containing field names of a table + * @param $array_insert + * @param $matching_table_index index of matching table in matching_table_array + * @param $matching_tables_keys array containing field names that are keys in the matching table + * @param $source_columns array containing source column information + * @param $add_column_array array containing column names that are to be added in target table + * @param $criteria array containing criterias like type, null, collation, default etc + * @param $target_tables_keys array containing field names that are keys in the target table + * @param $uncommon_tables array containing table names that are present in source db but not in targt db + * @param $uncommon_tables_fields array containing field names of the uncommon tables + * @param $uncommon_cols column names that are present in target table and not in source table + * @param $alter_str_array array containing column names that are to be altered + * @param $source_indexes column names on which indexes are made in source table + * @param $target_indexes column names on which indexes are made in target table + * @param $add_indexes_array array containing column names on which index is to be added in target table + * @param $alter_indexes_array array containing column names whose indexes are to be altered. Only index name and uniqueness of an index can be changed + * @param $delete_array array containing rows that are to be deleted + * @param $update_array array containing rows that are to be updated in target + * @param $display true/false value * @return nothing */ function PMA_insertIntoTargetTable($matching_table, $src_db, $trg_db, $src_link, $trg_link, $table_fields, &$array_insert, $matching_table_index, @@ -587,14 +587,14 @@ function PMA_insertIntoTargetTable($matching_table, $src_db, $trg_db, $src_link, /** * PMA_createTargetTables() Create the missing table $uncommon_table in target database * - * @param $src_db name of source database - * @param $trg_db name of target database - * @param $src_link connection established with source server - * @param $trg_link connection established with target server - * @param $uncommon_tables names of tables present in source but not in target - * @param $table_index index of table in $uncommon_tables array - * @param $uncommon_tables_fields field names of the uncommon table - * @param $display true/false value + * @param $src_db name of source database + * @param $trg_db name of target database + * @param $src_link connection established with source server + * @param $trg_link connection established with target server + * @param $uncommon_tables names of tables present in source but not in target + * @param $table_index index of table in $uncommon_tables array + * @param $uncommon_tables_fields field names of the uncommon table + * @param $display true/false value * @return nothing */ function PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link, &$uncommon_tables, $table_index, &$uncommon_tables_fields, $display) @@ -640,14 +640,14 @@ function PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link, &$uncomm /** * PMA_populateTargetTables() inserts data into uncommon tables after they have been created * - * @param $src_db name of source database - * @param $trg_db name of target database - * @param $src_link connection established with source server - * @param $trg_link connection established with target server - * @param $uncommon_tables array containing uncommon table names (table names that are present in source but not in target db) - * @param $table_index index of table in matching_table_array - * @param $uncommon_tables_fields field names of the uncommon table - * @param $display true/false value + * @param $src_db name of source database + * @param $trg_db name of target database + * @param $src_link connection established with source server + * @param $trg_link connection established with target server + * @param $uncommon_tables array containing uncommon table names (table names that are present in source but not in target db) + * @param $table_index index of table in matching_table_array + * @param $uncommon_tables_fields field names of the uncommon table + * @param $display true/false value * * @return nothing * @@ -682,13 +682,13 @@ function PMA_populateTargetTables($src_db, $trg_db, $src_link, $trg_link, $uncom /** * PMA_deleteFromTargetTable() delete rows from target table * - * @param $trg_db name of target database - * @param $trg_link connection established with target server - * @param $matching_tables array containing matching table names - * @param $table_index index of table in matching_table_array - * @param $target_tables_keys primary key names of the target tables - * @param $delete_array array containing the key values of rows that are to be deleted - * @param $display true/false value + * @param $trg_db name of target database + * @param $trg_link connection established with target server + * @param $matching_tables array containing matching table names + * @param $table_index index of table in matching_table_array + * @param $target_tables_keys primary key names of the target tables + * @param $delete_array array containing the key values of rows that are to be deleted + * @param $display true/false value * @return nothing */ function PMA_deleteFromTargetTable($trg_db, $trg_link, $matching_tables, $table_index, $target_tables_keys, $delete_array, $display) @@ -739,21 +739,21 @@ function PMA_deleteFromTargetTable($trg_db, $trg_link, $matching_tables, $table_ * Keys for all the source tables that have a corresponding target table are placed in $matching_tables_keys. * Keys for all the target tables that have a corresponding source table are placed in $target_tables_keys. * - * @param $src_db name of source database - * @param $trg_db name of target database - * @param $src_link connection established with source server - * @param $trg_link connection established with target server - * @param $matching_tables array containing names of matching tables - * @param $source_columns array containing columns information of the source tables - * @param $target_columns array containing columns information of the target tables - * @param $alter_str_array three dimensional associative array first index being the matching table index, second index being column name for which target + * @param $src_db name of source database + * @param $trg_db name of target database + * @param $src_link connection established with source server + * @param $trg_link connection established with target server + * @param $matching_tables array containing names of matching tables + * @param $source_columns array containing columns information of the source tables + * @param $target_columns array containing columns information of the target tables + * @param $alter_str_array three dimensional associative array first index being the matching table index, second index being column name for which target * column have some criteria different and third index containing the criteria which is different. - * @param $add_column_array two dimensional associative array, first index of the array contain the matching table number and second index contain the + * @param $add_column_array two dimensional associative array, first index of the array contain the matching table number and second index contain the * column name which is to be added in the target table - * @param $uncommon_columns array containing the columns that are present in the target table but not in the source table - * @param $criteria array containing the criterias which are to be checked for field that is present in source table and target table - * @param $target_tables_keys array containing the field names which is key in the target table - * @param $matching_table_index integer number of the matching table + * @param $uncommon_columns array containing the columns that are present in the target table but not in the source table + * @param $criteria array containing the criterias which are to be checked for field that is present in source table and target table + * @param $target_tables_keys array containing the field names which is key in the target table + * @param $matching_table_index integer number of the matching table * @return nothing */ function PMA_structureDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matching_tables, &$source_columns, &$target_columns, &$alter_str_array, @@ -802,22 +802,22 @@ function PMA_structureDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matc /** * PMA_addColumnsInTargetTable() adds column that are present in source table but not in target table * - * @param $src_db name of source database - * @param $trg_db name of target database - * @param $src_link connection established with source server - * @param $trg_link connection established with target server - * @param $matching_tables array containing names of matching tables - * @param $source_columns array containing columns information of the source tables - * @param $add_column_array array containing the names of the column(field) that are to be added in the target - * @param $matching_tables_fields - * @param $criteria array containing the criterias - * @param $matching_tables_keys array containing the field names which is key in the source table - * @param $target_tables_keys array containing the field names which is key in the target table - * @param $uncommon_tables array containing the table names that are present in source db and not in target db - * @param $uncommon_tables_fields array containing the names of the fields of the uncommon tables - * @param $table_counter integer number of the matching table - * @param $uncommon_cols - * @param $display true/false value + * @param $src_db name of source database + * @param $trg_db name of target database + * @param $src_link connection established with source server + * @param $trg_link connection established with target server + * @param $matching_tables array containing names of matching tables + * @param $source_columns array containing columns information of the source tables + * @param $add_column_array array containing the names of the column(field) that are to be added in the target + * @param $matching_tables_fields + * @param $criteria array containing the criterias + * @param $matching_tables_keys array containing the field names which is key in the source table + * @param $target_tables_keys array containing the field names which is key in the target table + * @param $uncommon_tables array containing the table names that are present in source db and not in target db + * @param $uncommon_tables_fields array containing the names of the fields of the uncommon tables + * @param $table_counter integer number of the matching table + * @param $uncommon_cols + * @param $display true/false value * @return nothing */ function PMA_addColumnsInTargetTable($src_db, $trg_db, $src_link, $trg_link, $matching_tables, $source_columns, &$add_column_array, $matching_tables_fields, @@ -901,14 +901,14 @@ function PMA_addColumnsInTargetTable($src_db, $trg_db, $src_link, $trg_link, $ma * PMA_checkForeignKeys() checks if the referenced table have foreign keys. * uses PMA_createTargetTables() * - * @param $src_db name of source database - * @param $src_link connection established with source server - * @param $trg_db name of target database - * @param $trg_link connection established with target server - * @param $referenced_table table whose column is a foreign key in another table - * @param $uncommon_tables array containing names that are uncommon - * @param $uncommon_tables_fields field names of the uncommon table - * @param $display true/false value + * @param $src_db name of source database + * @param $src_link connection established with source server + * @param $trg_db name of target database + * @param $trg_link connection established with target server + * @param $referenced_table table whose column is a foreign key in another table + * @param $uncommon_tables array containing names that are uncommon + * @param $uncommon_tables_fields field names of the uncommon table + * @param $display true/false value * @return nothing */ function PMA_checkForeignKeys($src_db, $src_link, $trg_db, $trg_link ,$referenced_table, &$uncommon_tables, &$uncommon_tables_fields, $display) @@ -932,17 +932,17 @@ function PMA_checkForeignKeys($src_db, $src_link, $trg_db, $trg_link ,$reference /** * PMA_alterTargetTableStructure() alters structure of the target table using $alter_str_array * - * @param $trg_db name of target database - * @param $trg_link connection established with target server - * @param $matching_tables array containing names of matching tables - * @param $source_columns array containing columns information of the source table - * @param $alter_str_array array containing the column name and criteria which is to be altered for the targert table - * @param $matching_tables_fields array containing the name of the fields for the matching table - * @param $criteria array containing the criterias - * @param $matching_tables_keys array containing the field names which is key in the source table - * @param $target_tables_keys array containing the field names which is key in the target table - * @param $matching_table_index integer number of the matching table - * @param $display true/false value + * @param $trg_db name of target database + * @param $trg_link connection established with target server + * @param $matching_tables array containing names of matching tables + * @param $source_columns array containing columns information of the source table + * @param $alter_str_array array containing the column name and criteria which is to be altered for the targert table + * @param $matching_tables_fields array containing the name of the fields for the matching table + * @param $criteria array containing the criterias + * @param $matching_tables_keys array containing the field names which is key in the source table + * @param $target_tables_keys array containing the field names which is key in the target table + * @param $matching_table_index integer number of the matching table + * @param $display true/false value * @return nothing */ function PMA_alterTargetTableStructure($trg_db, $trg_link, $matching_tables, &$source_columns, &$alter_str_array, $matching_tables_fields, $criteria, @@ -1067,12 +1067,12 @@ function PMA_alterTargetTableStructure($trg_db, $trg_link, $matching_tables, &$s /** * PMA_removeColumnsFromTargetTable() removes the columns which are present in target table but not in source table. * - * @param $trg_db name of target database - * @param $trg_link connection established with target server - * @param $matching_tables array containing names of matching tables - * @param $uncommon_columns array containing the names of the column which are to be dropped from the target table - * @param $table_counter index of the matching table as in $matchiing_tables array - * @param $display true/false value + * @param $trg_db name of target database + * @param $trg_link connection established with target server + * @param $matching_tables array containing names of matching tables + * @param $uncommon_columns array containing the names of the column which are to be dropped from the target table + * @param $table_counter index of the matching table as in $matchiing_tables array + * @param $display true/false value * @return nothing */ function PMA_removeColumnsFromTargetTable($trg_db, $trg_link, $matching_tables, $uncommon_columns, $table_counter, $display) @@ -1123,17 +1123,17 @@ function PMA_removeColumnsFromTargetTable($trg_db, $trg_link, $matching_tables, * indexes to be altered in $alter_indexes_array and indexes to be removed from target table in $remove_indexes_array. * Only keyname and uniqueness characteristic of the indexes are altered. * - * @param $src_db name of source database - * @param $trg_db name of target database - * @param $src_link connection established with source server - * @param $trg_link connection established with target server - * @param $matching_tables array containing the matching tables name - * @param $source_indexes array containing the indexes of the source table - * @param $target_indexes array containing the indexes of the target table - * @param $add_indexes_array array containing the name of the column on which the index is to be added in the target table - * @param $alter_indexes_array array containing the key name which needs to be altered - * @param $remove_indexes_array array containing the key name of the index which is to be removed from the target table - * @param $table_counter number of the matching table + * @param $src_db name of source database + * @param $trg_db name of target database + * @param $src_link connection established with source server + * @param $trg_link connection established with target server + * @param $matching_tables array containing the matching tables name + * @param $source_indexes array containing the indexes of the source table + * @param $target_indexes array containing the indexes of the target table + * @param $add_indexes_array array containing the name of the column on which the index is to be added in the target table + * @param $alter_indexes_array array containing the key name which needs to be altered + * @param $remove_indexes_array array containing the key name of the index which is to be removed from the target table + * @param $table_counter number of the matching table * @return nothing */ function PMA_indexesDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matching_tables, &$source_indexes, &$target_indexes, &$add_indexes_array, @@ -1188,16 +1188,16 @@ function PMA_indexesDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matchi /** * PMA_applyIndexesDiff() create indexes, alters indexes and remove indexes. * - * @param $trg_db name of target database - * @param $trg_link connection established with target server - * @param $matching_tables array containing the matching tables name - * @param $source_indexes array containing the indexes of the source table - * @param $target_indexes array containing the indexes of the target table - * @param $add_indexes_array array containing the column names on which indexes are to be created in target table - * @param $alter_indexes_array array containing the column names for which indexes are to be altered - * @param $remove_indexes_array array containing the key name of the indexes which are to be removed from the target table - * @param $table_counter number of the matching table - * @param $display true/false value + * @param $trg_db name of target database + * @param $trg_link connection established with target server + * @param $matching_tables array containing the matching tables name + * @param $source_indexes array containing the indexes of the source table + * @param $target_indexes array containing the indexes of the target table + * @param $add_indexes_array array containing the column names on which indexes are to be created in target table + * @param $alter_indexes_array array containing the column names for which indexes are to be altered + * @param $remove_indexes_array array containing the key name of the indexes which are to be removed from the target table + * @param $table_counter number of the matching table + * @param $display true/false value * @return nothing */ function PMA_applyIndexesDiff ($trg_db, $trg_link, $matching_tables, $source_indexes, $target_indexes, $add_indexes_array, $alter_indexes_array, @@ -1276,7 +1276,7 @@ function PMA_applyIndexesDiff ($trg_db, $trg_link, $matching_tables, $source_ind * PMA_displayQuery() displays a query, taking the maximum display size * into account * - * @param $query the query to display + * @param $query the query to display * @return nothing */ function PMA_displayQuery($query) { @@ -1289,7 +1289,7 @@ function PMA_displayQuery($query) { /** * PMA_syncDisplayHeaderSource() shows the header for source database * - * @param string $src_db source db name + * @param string $src_db source db name * @return nothing */ function PMA_syncDisplayHeaderSource($src_db) { @@ -1311,8 +1311,8 @@ function PMA_syncDisplayHeaderSource($src_db) { /** * PMA_syncDisplayHeaderTargetAndMatchingTables() shows the header for target database and the matching tables * - * @param string $trg_db target db name - * @param array $matching_tables + * @param string $trg_db target db name + * @param array $matching_tables * @return boolean $odd_row current value of this toggle */ function PMA_syncDisplayHeaderTargetAndMatchingTables($trg_db, $matching_tables) { @@ -1338,7 +1338,7 @@ function PMA_syncDisplayHeaderTargetAndMatchingTables($trg_db, $matching_tables) /** * PMA_syncDisplayBeginTableRow() displays the TR tag for alternating colors * - * @param boolean $odd_row current status of the toggle + * @param boolean $odd_row current status of the toggle * @return boolean $odd_row final status of the toggle */ function PMA_syncDisplayBeginTableRow($odd_row) { @@ -1352,10 +1352,10 @@ function PMAw($odd_row) { the toggleing colorsg_db, $matching_tables) tablesxes_array, $alter_indexes_array,,elds,tass, $edit_str, $copy_str, $del_str, $js_conf) {��*ɣ��4�* ��*6 ��!�!�ȣ��ɣ��xt�* ��"��*��*�ȣ��*�ȣ��ov�*��*`v�*�dv�*�iv�*�D��*xt�* ��*�!�!�ȣ��ɣ��=��*��"��*��*�ȣ��*�ȣ��ȣ��ȣ��*�p�ɣ��*�D��*��о��*GHIJKMNOP�ȣ��ɣ��H��*��"��*��*�ȣ��0ov�*��*��*�)��*`v�*�dv�*�iv�*�D��*H��*��࿣��*8��*��*(��*��@��*��*��p��* �nv�*��*�iv�*��x��*��*�dv�*��yx��*��*`v�*@��Zx��*��*�$��*��*�)��*`v�*؄�*�dv�*�iv�*�D��*�m��*�£��*#%')*-.035678:<=�ȣ��ɣ��p�p��*�ã��"��*8��*��*؄�*��*�D��*cf�<��*ɣ��p�p��*�ã��£��*�%��wq�-��s��,~9��u]�� 4Q��U^Qʉ��u��*ēv��B��*Pʣ��F��*F��*?�?��*ʣ��p��0ţ��<��*��*��*�ˣ��B��*`ʣ��ȣ��l��*ɣ��B��*ɣ��_syncDisplayBeginTableRow($odd_row) { /** * array PMA_get_column_values (string $database, string $table, string $column , mysql db link $link = null) * - * @param string $database name of database - * @param string $table name of table to retrieve columns from - * @param string $column name of the column to retrieve data from - * @param mixed $link mysql link resource + * @param string $database name of database + * @param string $table name of table to retrieve columns from + * @param string $column name of the column to retrieve data from + * @param mixed $link mysql link resource * @return array $field_values */ function PMA_get_column_values($database, $table, $column, $link = null) @@ -1381,9 +1381,9 @@ function PMA_get_column_values($database, $table, $column, $link = null) /** * array PMA_get_table_indexes($database, $table, $link = null) * - * @param string $database name of database - * @param string $table name of the table whose indexes are to be retreived - * @param mixed $link mysql link resource + * @param string $database name of database + * @param string $table name of the table whose indexes are to be retreived + * @param mixed $link mysql link resource * @return array $indexes */ function PMA_get_table_indexes($database, $table, $link = null) diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php index 06a2b51..e38cac2 100644 --- a/libraries/sql_query_form.lib.php +++ b/libraries/sql_query_form.lib.php @@ -30,12 +30,12 @@ require_once './libraries/bookmark.lib.php'; // used for file listing * @usedby tbl_structure.php * @usedby tbl_tracking.php * @usedby querywindow.php - * @param boolean|string $query query to display in the textarea + * @param boolean|string $query query to display in the textarea * or true to display last executed - * @param boolean|string $display_tab sql|files|history|full|false + * @param boolean|string $display_tab sql|files|history|full|false * what part to display * false if not inside querywindow - * @param string $delimiter + * @param string $delimiter */ function PMA_sqlQueryForm($query = true, $display_tab = false, $delimiter = ';') { @@ -157,9 +157,9 @@ function PMA_sqlQueryForm($query = true, $display_tab = false, $delimiter = ';') * prints querybox fieldset * * @usedby PMA_sqlQueryForm() - * @param string $query query to display in the textarea - * @param boolean $is_querywindow if inside querywindow or not - * @param string $delimiter default delimiter to use + * @param string $query query to display in the textarea + * @param boolean $is_querywindow if inside querywindow or not + * @param string $delimiter default delimiter to use */ function PMA_sqlQueryFormInsert($query = '', $is_querywindow = false, $delimiter = ';') { diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php index 10895f1..267d99b 100644 --- a/libraries/sqlparser.lib.php +++ b/libraries/sqlparser.lib.php @@ -120,8 +120,8 @@ if (! defined('PMA_MINIMUM_COMMON')) { /** * Set an error message for the system * - * @param string The error message - * @param string The failing SQL query + * @param string The error message + * @param string The failing SQL query * * @access private * @scope SQL Parser internal @@ -141,8 +141,8 @@ if (! defined('PMA_MINIMUM_COMMON')) { /** * Do display the bug report * - * @param string The error message - * @param string The failing SQL query + * @param string The error message + * @param string The failing SQL query * * @access public */ @@ -182,7 +182,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { /** * Parses the SQL queries * - * @param string The SQL query list + * @param string The SQL query list * * @return mixed Most of times, nothing... * @@ -795,8 +795,8 @@ if (! defined('PMA_MINIMUM_COMMON')) { /** * Checks for token types being what we want... * - * @param string String of type that we have - * @param string String of type that we want + * @param string String of type that we have + * @param string String of type that we want * * @return boolean result of check * @@ -820,7 +820,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { /** * Analyzes SQL queries * - * @param array The SQL queries + * @param array The SQL queries * * @return array The analyzed SQL queries * @@ -2046,7 +2046,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { * * @todo check why adding a "\n" after the </span> would cause extra blanks * to be displayed: SELECT p . person_name - * @param array The SQL queries html formatted + * @param array The SQL queries html formatted * * @return array The colorized SQL queries * @@ -2069,10 +2069,10 @@ if (! defined('PMA_MINIMUM_COMMON')) { /** * Formats SQL queries to html * - * @param array The SQL queries - * @param string mode - * @param integer starting token - * @param integer number of tokens to format, -1 = all + * @param array The SQL queries + * @param string mode + * @param integer starting token + * @param integer number of tokens to format, -1 = all * * @return string The formatted SQL queries * @@ -2663,9 +2663,9 @@ if (! defined('PMA_MINIMUM_COMMON')) { /** * Builds a CSS rule used for html formatted SQL queries * - * @param string The class name - * @param string The property name - * @param string The property value + * @param string The class name + * @param string The property name + * @param string The property value * * @return string The CSS rule * @@ -2716,7 +2716,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { /** * Gets SQL queries with no format * - * @param array The SQL queries list + * @param array The SQL queries list * * @return string The SQL queries with no format * diff --git a/libraries/sqlvalidator.class.php b/libraries/sqlvalidator.class.php index f7b836a..abbe6e9 100644 --- a/libraries/sqlvalidator.class.php +++ b/libraries/sqlvalidator.class.php @@ -73,7 +73,7 @@ if (!$GLOBALS['sqlvalidator_error']) { /** * Service opening * - * @param string URL of Mimer SQL Validator WSDL file + * @param string URL of Mimer SQL Validator WSDL file * * @return object Object to use * @@ -93,16 +93,16 @@ if (!$GLOBALS['sqlvalidator_error']) { /** * Service initializer to connect to server * - * @param object Service object - * @param string Username - * @param string Password - * @param string Name of calling program - * @param string Version of calling program - * @param string Target DBMS - * @param string Version of target DBMS - * @param string Connection Technology - * @param string version of Connection Technology - * @param integer boolean of 1/0 to specify if we are an interactive system + * @param object Service object + * @param string Username + * @param string Password + * @param string Name of calling program + * @param string Version of calling program + * @param string Target DBMS + * @param string Version of target DBMS + * @param string Connection Technology + * @param string version of Connection Technology + * @param integer boolean of 1/0 to specify if we are an interactive system * * @return object stdClass return object with data * @@ -139,10 +139,10 @@ if (!$GLOBALS['sqlvalidator_error']) { /** * Validator sytem call * - * @param object Service object - * @param object Session object - * @param string SQL Query to validate - * @param string Data return type + * @param object Service object + * @param object Session object + * @param string SQL Query to validate + * @param string Data return type * * @return object stClass return with data * @@ -170,7 +170,7 @@ if (!$GLOBALS['sqlvalidator_error']) { /** * Validator sytem call * - * @param string SQL Query to validate + * @param string SQL Query to validate * * @return object stdClass return with data * @@ -221,8 +221,8 @@ if (!$GLOBALS['sqlvalidator_error']) { /** * Sets credentials * - * @param string the username - * @param string the password + * @param string the username + * @param string the password * * @access public */ @@ -236,8 +236,8 @@ if (!$GLOBALS['sqlvalidator_error']) { /** * Sets the calling program * - * @param string the calling program name - * @param string the calling program revision + * @param string the calling program name + * @param string the calling program revision * * @access public */ @@ -251,8 +251,8 @@ if (!$GLOBALS['sqlvalidator_error']) { /** * Appends the calling program * - * @param string the calling program name - * @param string the calling program revision + * @param string the calling program name + * @param string the calling program revision * * @access public */ @@ -266,8 +266,8 @@ if (!$GLOBALS['sqlvalidator_error']) { /** * Sets the target DBMS * - * @param string the target DBMS name - * @param string the target DBMS revision + * @param string the target DBMS name + * @param string the target DBMS revision * * @access public */ @@ -281,8 +281,8 @@ if (!$GLOBALS['sqlvalidator_error']) { /** * Appends the target DBMS * - * @param string the target DBMS name - * @param string the target DBMS revision + * @param string the target DBMS name + * @param string the target DBMS revision * * @access public */ @@ -296,8 +296,8 @@ if (!$GLOBALS['sqlvalidator_error']) { /** * Sets the connection technology used * - * @param string the connection technology name - * @param string the connection technology revision + * @param string the connection technology name + * @param string the connection technology revision * * @access public */ @@ -311,8 +311,8 @@ if (!$GLOBALS['sqlvalidator_error']) { /** * Appends the connection technology used * - * @param string the connection technology name - * @param string the connection technology revision + * @param string the connection technology name + * @param string the connection technology revision * * @access public */ @@ -326,7 +326,7 @@ if (!$GLOBALS['sqlvalidator_error']) { /** * Sets whether interactive mode should be used or not * - * @param integer whether interactive mode should be used or not + * @param integer whether interactive mode should be used or not * * @access public */ @@ -339,7 +339,7 @@ if (!$GLOBALS['sqlvalidator_error']) { /** * Sets the output type to use * - * @param string the output type to use + * @param string the output type to use * * @access public */ @@ -399,7 +399,7 @@ if (!$GLOBALS['sqlvalidator_error']) { /** * Call to determine just if a query is valid or not. * - * @param string SQL statement to validate + * @param string SQL statement to validate * * @return string Validator string from Mimer * @@ -415,7 +415,7 @@ if (!$GLOBALS['sqlvalidator_error']) { /** * Call for complete validator response * - * @param string SQL statement to validate + * @param string SQL statement to validate * * @return string Validator string from Mimer * diff --git a/libraries/sqlvalidator.lib.php b/libraries/sqlvalidator.lib.php index a559ccf..dd3b8ad 100644 --- a/libraries/sqlvalidator.lib.php +++ b/libraries/sqlvalidator.lib.php @@ -49,7 +49,7 @@ if ($cfg['SQLValidator']['use'] == true) { * * <http://developer.mimer.com/validator/index.htm> * - * @param string SQL query to validate + * @param string SQL query to validate * * @return string Validator result string * diff --git a/libraries/string.lib.php b/libraries/string.lib.php index 6e2d26d..0cfef41 100644 --- a/libraries/string.lib.php +++ b/libraries/string.lib.php @@ -57,9 +57,9 @@ if ($GLOBALS['PMA_allow_ctype']) { /** * Checks if a given character position in the string is escaped or not * - * @param string string to check for - * @param integer the character to check for - * @param integer starting position in the string + * @param string string to check for + * @param integer the character to check for + * @param integer starting position in the string * @return boolean whether the character is escaped or not */ function PMA_STR_charIsEscaped($string, $pos, $start = 0) @@ -88,9 +88,9 @@ function PMA_STR_charIsEscaped($string, $pos, $start = 0) /** * Checks if a number is in a range * - * @param integer number to check for - * @param integer lower bound - * @param integer upper bound + * @param integer number to check for + * @param integer lower bound + * @param integer upper bound * @return boolean whether the number is in the range or not */ function PMA_STR_numberInRangeInclusive($num, $lower, $upper) @@ -101,8 +101,8 @@ function PMA_STR_numberInRangeInclusive($num, $lower, $upper) /** * Checks if a character is an SQL identifier * - * @param string character to check for - * @param boolean whether the dot character is valid or not + * @param string character to check for + * @param boolean whether the dot character is valid or not * @return boolean whether the character is an SQL identifier or not */ function PMA_STR_isSqlIdentifier($c, $dot_is_valid = false) diff --git a/libraries/string_mb.lib.php b/libraries/string_mb.lib.php index 7b8e14b..0feb876 100644 --- a/libraries/string_mb.lib.php +++ b/libraries/string_mb.lib.php @@ -18,7 +18,7 @@ /** * Returns length of string depending on current charset. * - * @param string string to count + * @param string string to count * @return int string length */ function PMA_strlen($string) @@ -29,9 +29,9 @@ function PMA_strlen($string) /** * Returns substring from string, works depending on current charset. * - * @param string $string string to count - * @param int $start start of substring - * @param int $length length of substring + * @param string $string string to count + * @param int $start start of substring + * @param int $length length of substring * @return string */ function PMA_substr($string, $start, $length = 2147483647) @@ -42,9 +42,9 @@ function PMA_substr($string, $start, $length = 2147483647) /** * Returns postion of $needle in $haystack or false if not found * - * @param string $haystack - * @param string $needle - * @param int $offset + * @param string $haystack + * @param string $needle + * @param int $offset * @return integer position of $needle in $haystack or false */ function PMA_strpos($haystack, $needle, $offset = 0) @@ -55,7 +55,7 @@ function PMA_strpos($haystack, $needle, $offset = 0) /** * Make a string lowercase * - * @param string $string + * @param string $string * @return string */ function PMA_strtolower($string) diff --git a/libraries/string_native.lib.php b/libraries/string_native.lib.php index b07c315..6fee5ca 100644 --- a/libraries/string_native.lib.php +++ b/libraries/string_native.lib.php @@ -18,7 +18,7 @@ /** * Returns length of string depending on current charset. * - * @param string string to count + * @param string string to count * @return int string length */ function PMA_strlen($string) @@ -29,9 +29,9 @@ function PMA_strlen($string) /** * Returns substring from string, works depending on current charset. * - * @param string $string string to count - * @param int $start start of substring - * @param int $length length of substring + * @param string $string string to count + * @param int $start start of substring + * @param int $length length of substring * @return string */ function PMA_substr($string, $start, $length = 2147483647) @@ -42,9 +42,9 @@ function PMA_substr($string, $start, $length = 2147483647) /** * Returns postion of $needle in $haystack or false if not found * - * @param string $haystack - * @param string $needle - * @param int $offset + * @param string $haystack + * @param string $needle + * @param int $offset * @return integer position of $needle in $haystack or false */ function PMA_strpos($haystack, $needle, $offset = 0) @@ -55,7 +55,7 @@ function PMA_strpos($haystack, $needle, $offset = 0) /** * Make a string lowercase * - * @param string $string + * @param string $string * @return string */ function PMA_strtolower($string) diff --git a/libraries/string_type_ctype.lib.php b/libraries/string_type_ctype.lib.php index 590e59d..271b0f7 100644 --- a/libraries/string_type_ctype.lib.php +++ b/libraries/string_type_ctype.lib.php @@ -18,7 +18,7 @@ /** * Checks if a character is an alphanumeric one * - * @param string character to check for + * @param string character to check for * @return boolean whether the character is an alphanumeric one or not */ function PMA_STR_isAlnum($c) @@ -29,7 +29,7 @@ function PMA_STR_isAlnum($c) /** * Checks if a character is an alphabetic one * - * @param string character to check for + * @param string character to check for * @return boolean whether the character is an alphabetic one or not */ function PMA_STR_isAlpha($c) @@ -40,7 +40,7 @@ function PMA_STR_isAlpha($c) /** * Checks if a character is a digit * - * @param string character to check for + * @param string character to check for * @return boolean whether the character is a digit or not */ function PMA_STR_isDigit($c) @@ -51,7 +51,7 @@ function PMA_STR_isDigit($c) /** * Checks if a character is an upper alphabetic one * - * @param string character to check for + * @param string character to check for * @return boolean whether the character is an upper alphabetic one or not */ function PMA_STR_isUpper($c) @@ -63,7 +63,7 @@ function PMA_STR_isUpper($c) /** * Checks if a character is a lower alphabetic one * - * @param string character to check for + * @param string character to check for * @return boolean whether the character is a lower alphabetic one or not */ function PMA_STR_isLower($c) @@ -74,7 +74,7 @@ function PMA_STR_isLower($c) /** * Checks if a character is a space one * - * @param string character to check for + * @param string character to check for * @return boolean whether the character is a space one or not */ function PMA_STR_isSpace($c) @@ -85,7 +85,7 @@ function PMA_STR_isSpace($c) /** * Checks if a character is an hexadecimal digit * - * @param string character to check for + * @param string character to check for * @return boolean whether the character is an hexadecimal digit or not */ function PMA_STR_isHexDigit($c) diff --git a/libraries/string_type_native.lib.php b/libraries/string_type_native.lib.php index 0bcb08f..46a6544 100644 --- a/libraries/string_type_native.lib.php +++ b/libraries/string_type_native.lib.php @@ -18,7 +18,7 @@ /** * Checks if a character is an alphanumeric one * - * @param string character to check for + * @param string character to check for * @return boolean whether the character is an alphanumeric one or not */ function PMA_STR_isAlnum($c) @@ -29,7 +29,7 @@ function PMA_STR_isAlnum($c) /** * Checks if a character is an alphabetic one * - * @param string character to check for + * @param string character to check for * @return boolean whether the character is an alphabetic one or not */ function PMA_STR_isAlpha($c) @@ -40,7 +40,7 @@ function PMA_STR_isAlpha($c) /** * Checks if a character is a digit * - * @param string character to check for + * @param string character to check for * @return boolean whether the character is a digit or not */ function PMA_STR_isDigit($c) @@ -55,7 +55,7 @@ function PMA_STR_isDigit($c) /** * Checks if a character is an upper alphabetic one * - * @param string character to check for + * @param string character to check for * @return boolean whether the character is an upper alphabetic one or not */ function PMA_STR_isUpper($c) @@ -70,7 +70,7 @@ function PMA_STR_isUpper($c) /** * Checks if a character is a lower alphabetic one * - * @param string character to check for + * @param string character to check for * @return boolean whether the character is a lower alphabetic one or not */ function PMA_STR_isLower($c) @@ -85,7 +85,7 @@ function PMA_STR_isLower($c) /** * Checks if a character is a space one * - * @param string character to check for + * @param string character to check for * @return boolean whether the character is a space one or not */ function PMA_STR_isSpace($c) @@ -104,7 +104,7 @@ function PMA_STR_isSpace($c) /** * Checks if a character is an hexadecimal digit * - * @param string character to check for + * @param string character to check for * @return boolean whether the character is an hexadecimal digit or not */ function PMA_STR_isHexDigit($c) diff --git a/libraries/transformations.lib.php b/libraries/transformations.lib.php index 4a69e77..a5460ab 100644 --- a/libraries/transformations.lib.php +++ b/libraries/transformations.lib.php @@ -19,7 +19,7 @@ * // } * </code> * - * @param string $option_string comma separated options + * @param string $option_string comma separated options * @return array options */ function PMA_transformation_getOptions($option_string) @@ -118,9 +118,9 @@ function PMA_getAvailableMIMEtypes() * Gets the mimetypes for all columns of a table * * @access public - * @param string $db the name of the db to check for - * @param string $table the name of the table to check for - * @param string $strict whether to include only results having a mimetype set + * @param string $db the name of the db to check for + * @param string $table the name of the table to check for + * @param string $strict whether to include only results having a mimetype set * @return array [field_name][field_key] = field_value */ function PMA_getMIME($db, $table, $strict = false) @@ -149,13 +149,13 @@ function PMA_getMIME($db, $table, $strict = false) * Set a single mimetype to a certain value. * * @access public - * @param string $db the name of the db - * @param string $table the name of the table - * @param string $key the name of the column - * @param string $mimetype the mimetype of the column - * @param string $transformation the transformation of the column - * @param string $transformation_options the transformation options of the column - * @param string $forcedelete force delete, will erase any existing comments for this column + * @param string $db the name of the db + * @param string $table the name of the table + * @param string $key the name of the column + * @param string $mimetype the mimetype of the column + * @param string $transformation the transformation of the column + * @param string $transformation_options the transformation options of the column + * @param string $forcedelete force delete, will erase any existing comments for this column * @return boolean true, if comment-query was made. */ function PMA_setMIME($db, $table, $key, $mimetype, $transformation, diff --git a/libraries/url_generating.lib.php b/libraries/url_generating.lib.php index c8b343b..e3cc02a 100644 --- a/libraries/url_generating.lib.php +++ b/libraries/url_generating.lib.php @@ -10,11 +10,11 @@ * Generates text with hidden inputs. * * @see PMA_generate_common_url() - * @param string optional database name + * @param string optional database name * (can also be an array of parameters) - * @param string optional table name - * @param int indenting level - * @param string do not generate a hidden field for this parameter + * @param string optional table name + * @param int indenting level + * @param string do not generate a hidden field for this parameter * (can be an array of strings) * * @return string string with input fields @@ -160,16 +160,16 @@ function PMA_getHiddenFields($values, $pre = '') * // script.php?server=1&lang=en * </code> * - * @param mixed assoc. array with url params or optional string with database name + * @param mixed assoc. array with url params or optional string with database name * if first param is an array there is also an ? prefixed to the url * - * @param string - if first param is array: 'html' to use htmlspecialchars() + * @param string - if first param is array: 'html' to use htmlspecialchars() * on the resulting URL (for a normal URL displayed in HTML) * or something else to avoid using htmlspecialchars() (for * a URL sent via a header); if not set,'html' is assumed * - if first param is not array: optional table name * - * @param string - if first param is array: optional character to + * @param string - if first param is array: optional character to * use instead of '?' * - if first param is not array: optional character to use * instead of '&' for dividing URL parameters @@ -256,7 +256,7 @@ function PMA_generate_common_url() * extracted from arg_separator.input as set in php.ini * we do not use arg_separator.output to avoid problems with & and & * - * @param string whether to encode separator or not, currently 'none' or 'html' + * @param string whether to encode separator or not, currently 'none' or 'html' * @return string character used for separating url parts usally ; or & * @access public */ diff --git a/libraries/zip.lib.php b/libraries/zip.lib.php index 23f28ce..9208e93 100644 --- a/libraries/zip.lib.php +++ b/libraries/zip.lib.php @@ -71,7 +71,7 @@ class zipfile * Converts an Unix timestamp to a four byte DOS date and time format (date * in high two bytes, time in low two bytes allowing magnitude comparison). * - * @param integer the current Unix timestamp + * @param integer the current Unix timestamp * * @return integer the current date in a four byte DOS format * @@ -97,9 +97,9 @@ class zipfile /** * Adds "file" to archive * - * @param string file contents - * @param string name of the file in the archive (may contains the path) - * @param integer the current timestamp + * @param string file contents + * @param string name of the file in the archive (may contains the path) + * @param integer the current timestamp * * @access public */ diff --git a/libraries/zip_extension.lib.php b/libraries/zip_extension.lib.php index 0527911..b665b74 100644 --- a/libraries/zip_extension.lib.php +++ b/libraries/zip_extension.lib.php @@ -9,7 +9,7 @@ /** * Gets zip file contents * - * @param string $file + * @param string $file * @return array ($error_message, $file_data); $error_message * is empty if no error */ @@ -71,7 +71,7 @@ function PMA_getZipContents($file) /** * Gets zip error message * - * @param integer error code + * @param integer error code * @return string error message */ function PMA_getZipError($code) diff --git a/main.php b/main.php index e1eec63..fd4d448 100644 --- a/main.php +++ b/main.php @@ -368,14 +368,14 @@ if (file_exists('./libraries/language_stats.inc.php')) { /** * prints list item for main page * - * @param string $name displayed text - * @param string $id id, used for css styles - * @param string $url make item as link with $url as target - * @param string $mysql_help_page display a link to MySQL's manual - * @param string $target special target for $url - * @param string $a_id id for the anchor, used for jQuery to hook in functions - * @param string $class class for the li element - * @param string $a_class class for the anchor element + * @param string $name displayed text + * @param string $id id, used for css styles + * @param string $url make item as link with $url as target + * @param string $mysql_help_page display a link to MySQL's manual + * @param string $target special target for $url + * @param string $a_id id for the anchor, used for jQuery to hook in functions + * @param string $class class for the li element + * @param string $a_class class for the anchor element */ function PMA_printListItem($name, $id = null, $url = null, $mysql_help_page = null, $target = null, $a_id = null, $class = null, $a_class = null) { diff --git a/navigation.php b/navigation.php index e473dd8..966f5f2 100644 --- a/navigation.php +++ b/navigation.php @@ -327,9 +327,9 @@ if ($GLOBALS['cfg']['LeftFrameLight'] && strlen($GLOBALS['db'])) { * @global string $href_left * @global string $db_start * @global string $common_url_query - * @param array $ext_dblist extended db list - * @param integer $offset - * @param integer $count + * @param array $ext_dblist extended db list + * @param integer $offset + * @param integer $count */ function PMA_displayDbList($ext_dblist, $offset, $count) { global $element_counter, $img_minus, $img_plus, $href_left, @@ -494,10 +494,10 @@ function PMA_displayDbList($ext_dblist, $offset, $count) { * @global string html code for '-' image * @global string html code for '+' image * @global string html code for self link - * @param array $tables array of tables/tablegroups - * @param boolean $visible whether the list is visible or not - * @param string $tab_group_full full tab group name - * @param string $table_db db of this table + * @param array $tables array of tables/tablegroups + * @param boolean $visible whether the list is visible or not + * @param string $tab_group_full full tab group name + * @param string $table_db db of this table */ function PMA_displayTableList($tables, $visible = false, $tab_group_full = '', $table_db = '') diff --git a/pmd_common.php b/pmd_common.php index cbe37ed..7ca134b 100644 --- a/pmd_common.php +++ b/pmd_common.php @@ -167,7 +167,7 @@ function get_pk_or_unique_keys() /** * returns all indizes * - * @param boolean whether to include ony unique ones + * @param boolean whether to include ony unique ones * @return array indizes */ function get_all_keys($unique_only = false) diff --git a/server_privileges.php b/server_privileges.php index 8dad17d..ba114fb 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -157,7 +157,7 @@ function PMA_wildcardEscapeForGrant($dbname, $tablename) { /** * Generates a condition on the user name * - * @param string the user's initial + * @param string the user's initial * @return string the generated condition */ function PMA_rangeOfUsers($initial = '') @@ -176,8 +176,8 @@ function PMA_rangeOfUsers($initial = '') /** * Extracts the privilege information of a priv table row * - * @param array $row the row - * @param boolean $enableHTML add <dfn> tag with tooltips + * @param array $row the row + * @param boolean $enableHTML add <dfn> tag with tooltips * * @global resource $user_link the database connection * @@ -404,9 +404,9 @@ function PMA_display_column_privs($columns, $row, $name_for_select, /** * Displays the privileges form table * - * @param string $db the database - * @param string $table the table - * @param boolean $submit wheather to display the submit button or not + * @param string $db the database + * @param string $table the table + * @param boolean $submit wheather to display the submit button or not * @global array $cfg the phpMyAdmin configuration * @global ressource $user_link the database connection * @@ -739,7 +739,7 @@ function PMA_displayPrivTable($db = '*', $table = '*', $submit = true) * Displays the fields used by the "new user" form as well as the * "change login information / copy user" form. * - * @param string $mode are we creating a new user or are we just + * @param string $mode are we creating a new user or are we just * changing one? (allowed values: 'new', 'change') * @global array $cfg the phpMyAdmin configuration * @global ressource $user_link the database connection diff --git a/tbl_relation.php b/tbl_relation.php index e3f4338..e204c80 100644 --- a/tbl_relation.php +++ b/tbl_relation.php @@ -48,9 +48,9 @@ $options_array = array( /** * Generate dropdown choices * - * @param string Message to display - * @param string Name of the <select> field - * @param array Choices for dropdown + * @param string Message to display + * @param string Name of the <select> field + * @param array Choices for dropdown * @return string The existing value (for selected) * * @access public @@ -74,7 +74,7 @@ function PMA_generate_dropdown($dropdown_question, $select_name, $choices, $sele /** * Split a string on backquote pairs * - * @param string original string + * @param string original string * @return array containing the elements (and their surrounding backquotes) * * @access public diff --git a/tbl_tracking.php b/tbl_tracking.php index 0003055..e308066 100644 --- a/tbl_tracking.php +++ b/tbl_tracking.php @@ -52,10 +52,10 @@ if (isset($_REQUEST['report_export'])) { /** * Filters tracking entries * - * @param array the entries to filter - * @param string "from" date - * @param string "to" date - * @param string users + * @param array the entries to filter + * @param string "from" date + * @param string "to" date + * @param string users * * @return array filtered entries * hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11677-g25bda8e
by Michal Čihař 22 Jul '11

22 Jul '11

The branch, master has been updated via 25bda8e991f2820971c343315cd3ab3d974b2684 (commit) from 219ec73d69a0bee94ac3bf98757db25360862b39 (commit) - Log ----------------------------------------------------------------- commit 25bda8e991f2820971c343315cd3ab3d974b2684 Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Jul 22 09:18:02 2011 +0200 Fix spacing on opening code block ----------------------------------------------------------------------- Summary of changes: db_datadict.php | 2 +- db_structure.php | 2 +- libraries/common.lib.php | 6 +++--- libraries/export/pdf.php | 10 +++++----- libraries/footer.inc.php | 2 +- libraries/import/ldi.php | 2 +- libraries/ip_allow_deny.lib.php | 2 +- libraries/logging.lib.php | 2 +- libraries/mult_submits.inc.php | 4 ++-- libraries/relation.lib.php | 2 +- libraries/sql_query_form.lib.php | 2 +- libraries/sqlparser.lib.php | 6 +++--- libraries/transformations.lib.php | 2 +- pmd_general.php | 6 +++--- schema_edit.php | 4 ++-- server_privileges.php | 2 +- server_synchronize.php | 2 +- tbl_indexes.php | 2 +- tbl_tracking.php | 10 +++++----- themes.php | 2 +- transformation_wrapper.php | 2 +- 21 files changed, 37 insertions(+), 37 deletions(-) diff --git a/db_datadict.php b/db_datadict.php index acd96dc..531fbe0 100644 --- a/db_datadict.php +++ b/db_datadict.php @@ -91,7 +91,7 @@ while ($row = PMA_DBI_fetch_row($rowset)) { $pk_array[$row['Column_name']] = 1; } // Retains keys informations - if ($row['Key_name'] != $lastIndex){ + if ($row['Key_name'] != $lastIndex) { $indexes[] = $row['Key_name']; $lastIndex = $row['Key_name']; } diff --git a/db_structure.php b/db_structure.php index 6dc82bf..2bae5a7 100644 --- a/db_structure.php +++ b/db_structure.php @@ -367,7 +367,7 @@ foreach ($tables as $keyname => $each_table) { // that needs to be repaired if (isset($each_table['TABLE_ROWS']) && ($each_table['ENGINE'] != null || $table_is_view)) { if ($table_is_view) { - if ($each_table['TABLE_ROWS'] >= $GLOBALS['cfg']['MaxExactCountViews']){ + if ($each_table['TABLE_ROWS'] >= $GLOBALS['cfg']['MaxExactCountViews']) { $row_count_pre = '~'; $sum_row_count_pre = '~'; $show_superscript = PMA_showHint(PMA_sanitize(sprintf(__('This view has at least this number of rows. Please refer to %sdocumentation%s.'), '[a@./Documentation.html#cfg_MaxExactCountViews@_blank]', '[/a]'))); diff --git a/libraries/common.lib.php b/libraries/common.lib.php index fd0701b..34d20d9 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -567,7 +567,7 @@ function PMA_mysqlDie($error_message = '', $the_query = '', } // end if if (!empty($error_message)) { - $error_message = preg_replace("@((\015\012)|(\015)|(\012)){3,}@", "\n\n", $error_message); + $error_message = preg_replace("@((\015\012)|(\015)|(\012)) {3,}@", "\n\n", $error_message); } // modified to show the help on error-returns // (now error-messages-server) @@ -2692,7 +2692,7 @@ function PMA_replace_binary_contents($content) { function PMA_duplicateFirstNewline($string) { $first_occurence = strpos($string, "\r\n"); - if ($first_occurence === 0){ + if ($first_occurence === 0) { $string = "\n".$string; } return $string; @@ -3065,7 +3065,7 @@ function PMA_getFunctionsForField($field, $insert_mode) // Create the output $retval = ' <option></option>' . "\n"; // loop on the dropdown array and print all available options for that field. - foreach ($dropdown as $each_dropdown){ + foreach ($dropdown as $each_dropdown) { $retval .= ' '; $retval .= '<option'; if ($default_function === $each_dropdown) { diff --git a/libraries/export/pdf.php b/libraries/export/pdf.php index bb89fda..e135bc8 100644 --- a/libraries/export/pdf.php +++ b/libraries/export/pdf.php @@ -213,7 +213,7 @@ class PMA_PDF extends TCPDF function setAttributes($attr = array()) { - foreach ($attr as $key => $val){ + foreach ($attr as $key => $val) { $this->$key = $val ; } } @@ -246,20 +246,20 @@ class PMA_PDF extends TCPDF // loop through results header and set initial col widths/ titles/ alignment // if a col title is less than the starting col width, reduce that column size - for ($i = 0; $i < $this->numFields; $i++){ + for ($i = 0; $i < $this->numFields; $i++) { $stringWidth = $this->getstringwidth($this->fields[$i]->name) + 6 ; // save the real title's width $titleWidth[$i] = $stringWidth; $totalTitleWidth += $stringWidth; // set any column titles less than the start width to the column title width - if ($stringWidth < $this->sColWidth){ + if ($stringWidth < $this->sColWidth) { $colFits[$i] = $stringWidth ; } $this->colTitles[$i] = $this->fields[$i]->name; $this->display_column[$i] = true; - switch ($this->fields[$i]->type){ + switch ($this->fields[$i]->type) { case 'int': $this->colAlign[$i] = 'R'; break; @@ -317,7 +317,7 @@ class PMA_PDF extends TCPDF } $totAlreadyFitted = 0; - foreach ($colFits as $key => $val){ + foreach ($colFits as $key => $val) { // set fitted columns to smallest size $this->tablewidths[$key] = $val; // to work out how much (if any) space has been freed up diff --git a/libraries/footer.inc.php b/libraries/footer.inc.php index bbeb04b..aa1af7a 100644 --- a/libraries/footer.inc.php +++ b/libraries/footer.inc.php @@ -70,7 +70,7 @@ if (!$GLOBALS['is_ajax_request']) { <?php if (empty($GLOBALS['error_message'])) { ?> -$(document).ready(function(){ +$(document).ready(function() { // updates current settings if (window.parent.setAll) { window.parent.setAll('<?php diff --git a/libraries/import/ldi.php b/libraries/import/ldi.php index fe5264c..b3b711e 100644 --- a/libraries/import/ldi.php +++ b/libraries/import/ldi.php @@ -80,7 +80,7 @@ if (strlen($ldi_enclosed) > 0) { if (strlen($ldi_escaped) > 0) { $sql .= ' ESCAPED BY \'' . PMA_sqlAddSlashes($ldi_escaped) . '\''; } -if (strlen($ldi_new_line) > 0){ +if (strlen($ldi_new_line) > 0) { if ($ldi_new_line == 'auto') { $ldi_new_line = PMA_whichCrlf() == "\n" ? '\n' : '\r\n'; } diff --git a/libraries/ip_allow_deny.lib.php b/libraries/ip_allow_deny.lib.php index 30bce24..1537b43 100644 --- a/libraries/ip_allow_deny.lib.php +++ b/libraries/ip_allow_deny.lib.php @@ -30,7 +30,7 @@ function PMA_getIp() $trusted_header_value = PMA_getenv($GLOBALS['cfg']['TrustedProxies'][$direct_ip]); $matches = array(); // the $ checks that the header contains only one IP address, ?: makes sure the () don't capture - $is_ip = preg_match('|^(?:[0-9]{1,3}\.){3,3}[0-9]{1,3}$|', $trusted_header_value, $matches); + $is_ip = preg_match('|^(?:[0-9]{1,3}\.) {3,3}[0-9]{1,3}$|', $trusted_header_value, $matches); if ($is_ip && (count($matches) == 1)) { // True IP behind a proxy return $matches[0]; diff --git a/libraries/logging.lib.php b/libraries/logging.lib.php index 8764247..1dabc9a 100644 --- a/libraries/logging.lib.php +++ b/libraries/logging.lib.php @@ -11,7 +11,7 @@ /** * Logs user information to webserver logs. */ -function PMA_log_user($user, $status = 'ok'){ +function PMA_log_user($user, $status = 'ok') { if (function_exists('apache_note')) { apache_note('userID', $user); apache_note('userStatus', $status); diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php index 0f7e218..1d3cbd5 100644 --- a/libraries/mult_submits.inc.php +++ b/libraries/mult_submits.inc.php @@ -246,7 +246,7 @@ if (!empty($submit_mult) && !empty($what)) { <?php echo PMA_generate_common_hidden_inputs($_url_params); ?> -<?php if ($what == 'replace_prefix_tbl' || $what == 'copy_tbl_change_prefix'){ ?> +<?php if ($what == 'replace_prefix_tbl' || $what == 'copy_tbl_change_prefix') { ?> <fieldset class = "input"> <legend><?php echo ($what == 'replace_prefix_tbl' ? __('Replace table prefix') : __('Copy table with prefix')) ?>:</legend> <table> @@ -263,7 +263,7 @@ if (!empty($submit_mult) && !empty($what)) { </fieldset> <?php } - elseif ($what == 'add_prefix_tbl'){ ?> + elseif ($what == 'add_prefix_tbl') { ?> <fieldset class = "input"> <legend><?php echo __('Add table prefix') ?>:</legend> <table> diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index c2acd8e..0b74c70 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -628,7 +628,7 @@ function PMA_setDbComment($db, $comment = '') AND `column_name` = \'(db_comment)\''; } - if (isset($upd_query)){ + if (isset($upd_query)) { return PMA_query_as_controluser($upd_query); } diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php index 5a0f364..06a2b51 100644 --- a/libraries/sql_query_form.lib.php +++ b/libraries/sql_query_form.lib.php @@ -420,7 +420,7 @@ function PMA_sqlQueryFormBookmark() * * @usedby PMA_sqlQueryForm() */ -function PMA_sqlQueryFormUpload(){ +function PMA_sqlQueryFormUpload() { $errors = array (); $matcher = '@\.sql(\.(' . PMA_supportedDecompressions() . '))?$@'; // we allow only SQL here diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php index 8469344..10895f1 100644 --- a/libraries/sqlparser.lib.php +++ b/libraries/sqlparser.lib.php @@ -1523,7 +1523,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { $subresult['queryflags']['need_confirm'] = 1; } - if ($first_reserved_word=='SELECT'){ + if ($first_reserved_word=='SELECT') { $position_of_first_select = $i; } @@ -2550,7 +2550,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { } break; default: - if ($close_docu_link && in_array($arr[$i]['data'], array('LIKE', 'NOT', 'IN', 'REGEXP', 'NULL'))){ + if ($close_docu_link && in_array($arr[$i]['data'], array('LIKE', 'NOT', 'IN', 'REGEXP', 'NULL'))) { $after .= '</a>'; $close_docu_link = false; } else if ($docu && isset($PMA_SQPdata_functions_docs[$arr[$i]['data']])) { @@ -2725,7 +2725,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { function PMA_SQP_formatNone($arr) { $formatted_sql = htmlspecialchars($arr['raw']); - $formatted_sql = preg_replace("@((\015\012)|(\015)|(\012)){3,}@", "\n\n", $formatted_sql); + $formatted_sql = preg_replace("@((\015\012)|(\015)|(\012)) {3,}@", "\n\n", $formatted_sql); return $formatted_sql; } // end of the "PMA_SQP_formatNone()" function diff --git a/libraries/transformations.lib.php b/libraries/transformations.lib.php index e58ecf8..4a69e77 100644 --- a/libraries/transformations.lib.php +++ b/libraries/transformations.lib.php @@ -208,7 +208,7 @@ function PMA_setMIME($db, $table, $key, $mimetype, $transformation, . '\'' . PMA_sqlAddSlashes($transformation_options) . '\')'; } - if (isset($upd_query)){ + if (isset($upd_query)) { return PMA_query_as_controluser($upd_query); } else { return false; diff --git a/pmd_general.php b/pmd_general.php index 10a862c..74ff124 100644 --- a/pmd_general.php +++ b/pmd_general.php @@ -44,8 +44,8 @@ echo ' echo "\n"; if ($_REQUEST['query']) { echo ' - $(document).ready(function(){ - $(".trigger").click(function(){ + $(document).ready(function() { + $(".trigger").click(function() { $(".panel").toggle("fast"); $(this).toggleClass("active"); return false; @@ -113,7 +113,7 @@ echo $script_tabs . $script_contr . $script_display_field; ><img src="pmd/images/pdf.png" alt="key" width="20" height="20" title="<?php echo __('Import/Export coordinates for PDF schema'); ?>" /></a > - <?php if ($_REQUEST['query']){ + <?php if ($_REQUEST['query']) { echo '<a href="#" onClick="build_query(\'SQL Query on Database\', 0)" onmousedown="return false;" class="M_butt" target="_self">'; echo '<img src="pmd/images/query_builder.png" alt="key" width="20" height="20" title="'; diff --git a/schema_edit.php b/schema_edit.php index 1545d8f..4ab41d4 100644 --- a/schema_edit.php +++ b/schema_edit.php @@ -53,7 +53,7 @@ if (! $cfgRelation['displaywork']) { require_once './libraries/footer.inc.php'; } -if (! isset($cfgRelation['table_coords'])){ +if (! isset($cfgRelation['table_coords'])) { echo sprintf(__('<b>%s</b> table not found or not set in %s'), 'table_coords', 'config.inc.php') . '<br />' . "\n" . PMA_showDocu('table_coords') . "\n"; require_once './libraries/footer.inc.php'; @@ -83,7 +83,7 @@ if ($cfgRelation['pdfwork']) { * @param string $do It tells what the Schema is supposed to do * create and select a page, generate schema etc */ - if (isset($_REQUEST['do'])){ + if (isset($_REQUEST['do'])) { $user_schema->setAction($_REQUEST['do']); $user_schema->processUserChoice(); } diff --git a/server_privileges.php b/server_privileges.php index ecd1fa6..8dad17d 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -2376,7 +2376,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs $user_form .= '</tbody>' . "\n" . '</table></form>' . "\n"; - if ($GLOBALS['is_ajax_request'] == true){ + if ($GLOBALS['is_ajax_request'] == true) { $extra_data['user_form'] = $user_form; $message = PMA_Message::success(__('User has been added.')); PMA_ajaxResponse($message, $message->isSuccess(), $extra_data); diff --git a/server_synchronize.php b/server_synchronize.php index 3412336..431ae6b 100644 --- a/server_synchronize.php +++ b/server_synchronize.php @@ -91,7 +91,7 @@ if ((isset($_REQUEST['submit_connect']))) { if (! $src_connection && $src_type != 'cur') { echo __('Could not connect to the source') . '<br />'; } - if (! $trg_connection && $trg_type != 'cur'){ + if (! $trg_connection && $trg_type != 'cur') { echo __('Could not connect to the target'); } echo '</div>'; diff --git a/tbl_indexes.php b/tbl_indexes.php index 84555d8..1daca81 100644 --- a/tbl_indexes.php +++ b/tbl_indexes.php @@ -87,7 +87,7 @@ if (isset($_REQUEST['do_save_data'])) { } } // end while - if (empty($index_fields)){ + if (empty($index_fields)) { $error = PMA_Message::error(__('No index parts defined!')); } else { $sql_query .= ' (' . implode(', ', $index_fields) . ')'; diff --git a/tbl_tracking.php b/tbl_tracking.php index b249f4c..0003055 100644 --- a/tbl_tracking.php +++ b/tbl_tracking.php @@ -369,13 +369,13 @@ if (isset($_REQUEST['snapshot'])) { */ if (isset($_REQUEST['report']) && (isset($_REQUEST['delete_ddlog']) || isset($_REQUEST['delete_dmlog']))) { - if (isset($_REQUEST['delete_ddlog'])){ + if (isset($_REQUEST['delete_ddlog'])) { // Delete ddlog row data $delete_id = $_REQUEST['delete_ddlog']; // Only in case of valable id - if ($delete_id == (int)$delete_id){ + if ($delete_id == (int)$delete_id) { unset($data['ddlog'][$delete_id]); if (PMA_Tracker::changeTrackingData($_REQUEST['db'], $_REQUEST['table'], $_REQUEST['version'], 'DDL', $data['ddlog'])) @@ -386,13 +386,13 @@ if (isset($_REQUEST['report']) && (isset($_REQUEST['delete_ddlog']) || isset($_R } } - if (isset($_REQUEST['delete_dmlog'])){ + if (isset($_REQUEST['delete_dmlog'])) { // Delete dmlog row data $delete_id = $_REQUEST['delete_dmlog']; // Only in case of valable id - if ($delete_id == (int)$delete_id){ + if ($delete_id == (int)$delete_id) { unset($data['dmlog'][$delete_id]); if (PMA_Tracker::changeTrackingData($_REQUEST['db'], $_REQUEST['table'], $_REQUEST['version'], 'DML', $data['dmlog'])) @@ -658,7 +658,7 @@ if ($last_version > 0) { } else { $version_status = __('not active'); } - if ($version['version'] == $last_version){ + if ($version['version'] == $last_version) { if ($version['tracking_active'] == 1) { $tracking_active = true; } else { diff --git a/themes.php b/themes.php index 624c668..0e37ee4 100644 --- a/themes.php +++ b/themes.php @@ -22,7 +22,7 @@ require './libraries/header_meta_style.inc.php'; ?> <script type="text/javascript" language="javascript"> // <![CDATA[ -function takeThis(what){ +function takeThis(what) { if (window.opener && window.opener.document.forms['setTheme'].elements['set_theme']) { window.opener.document.forms['setTheme'].elements['set_theme'].value = what; window.opener.document.forms['setTheme'].submit(); diff --git a/transformation_wrapper.php b/transformation_wrapper.php index 50d7ceb..f229bd3 100644 --- a/transformation_wrapper.php +++ b/transformation_wrapper.php @@ -88,7 +88,7 @@ if (! isset($resize)) { $ratioWidth = $srcWidth/$newWidth; $ratioHeight = $srcHeight/$newHeight; - if ($ratioWidth < $ratioHeight){ + if ($ratioWidth < $ratioHeight) { $destWidth = $srcWidth/$ratioHeight; $destHeight = $newHeight; } else { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11676-g219ec73
by Michal Čihař 22 Jul '11

22 Jul '11

The branch, master has been updated via 219ec73d69a0bee94ac3bf98757db25360862b39 (commit) from 36298932e2a80bbd207b3b86475033f8b728a0b4 (commit) - Log ----------------------------------------------------------------- commit 219ec73d69a0bee94ac3bf98757db25360862b39 Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Jul 22 09:10:37 2011 +0200 Spacing around if ----------------------------------------------------------------------- Summary of changes: chart_export.php | 8 +++--- db_create.php | 4 +- db_export.php | 6 ++-- db_operations.php | 2 +- db_search.php | 4 +- db_structure.php | 2 +- db_tracking.php | 4 +- enum_editor.php | 4 +- libraries/common.inc.php | 2 +- libraries/common.lib.php | 30 ++++++++++++++-------------- libraries/db_common.inc.php | 2 +- libraries/db_info.inc.php | 2 +- libraries/db_links.inc.php | 2 +- libraries/db_structure.lib.php | 8 +++--- libraries/display_export.lib.php | 36 +++++++++++++++++----------------- libraries/display_import.lib.php | 6 ++-- libraries/display_tbl.lib.php | 22 ++++++++++---------- libraries/header.inc.php | 2 +- libraries/mult_submits.inc.php | 2 +- libraries/plugin_interface.lib.php | 12 +++++----- libraries/server_links.inc.php | 2 +- libraries/server_synchronize.lib.php | 20 +++++++++--------- libraries/sql_query_form.lib.php | 2 +- libraries/sysinfo.lib.php | 2 +- libraries/tbl_links.inc.php | 4 +- main.php | 2 +- navigation.php | 2 +- pmd_general.php | 14 ++++++------ pmd_save_pos.php | 2 +- schema_edit.php | 2 +- server_databases.php | 2 +- server_export.php | 6 ++-- server_privileges.php | 18 ++++++++-------- server_status.php | 20 +++++++++--------- server_synchronize.php | 4 +- server_variables.php | 8 +++--- tbl_alter.php | 2 +- tbl_chart.php | 4 +- tbl_create.php | 8 +++--- tbl_indexes.php | 4 +- tbl_operations.php | 4 +- tbl_replace.php | 4 +- tbl_structure.php | 26 ++++++++++++------------ tbl_tracking.php | 10 ++++---- user_password.php | 4 +- 45 files changed, 168 insertions(+), 168 deletions(-) diff --git a/chart_export.php b/chart_export.php index e3a02f0..c05332a 100644 --- a/chart_export.php +++ b/chart_export.php @@ -11,12 +11,12 @@ define('PMA_MINIMUM_COMMON', true); require_once './libraries/common.inc.php'; -if(isset($_REQUEST['filename']) && isset($_REQUEST['image'])) { +if (isset($_REQUEST['filename']) && isset($_REQUEST['image'])) { $allowed = Array( 'image/png'=>'png', 'image/svg+xml'=>'svg'); - if(! isset($allowed[$_REQUEST['type']])) exit('Invalid export type'); + if (! isset($allowed[$_REQUEST['type']])) exit('Invalid export type'); - if(! preg_match("/(".implode("|",$allowed).")$/i", $_REQUEST['filename'])) + if (! preg_match("/(".implode("|",$allowed).")$/i", $_REQUEST['filename'])) $_REQUEST['filename'] .= '.' . $allowed[$_REQUEST['type']]; header("Cache-Control: public"); @@ -25,7 +25,7 @@ if(isset($_REQUEST['filename']) && isset($_REQUEST['image'])) { header("Content-Type: ".$_REQUEST['type']); header("Content-Transfer-Encoding: binary"); - if($allowed[$_REQUEST['type']] != 'svg') + if ($allowed[$_REQUEST['type']] != 'svg') echo base64_decode(substr($_REQUEST['image'], strpos($_REQUEST['image'],',') + 1)); else echo $_REQUEST['image']; diff --git a/db_create.php b/db_create.php index 502ac7f..2d7877a 100644 --- a/db_create.php +++ b/db_create.php @@ -48,7 +48,7 @@ if (! $result) { /** * If in an Ajax request, just display the message with {@link PMA_ajaxResponse} */ - if($GLOBALS['is_ajax_request'] == true) { + if ($GLOBALS['is_ajax_request'] == true) { PMA_ajaxResponse($message, false); } @@ -62,7 +62,7 @@ if (! $result) { /** * If in an Ajax request, build the output and send it */ - if($GLOBALS['is_ajax_request'] == true) { + if ($GLOBALS['is_ajax_request'] == true) { /** * String containing the SQL Query formatted in pretty HTML diff --git a/db_export.php b/db_export.php index aab4c51..f8a4762 100644 --- a/db_export.php +++ b/db_export.php @@ -49,14 +49,14 @@ if (!empty($selected_tbl) && empty($table_select)) { } // Check if the selected tables are defined in $_GET (from clicking Back button on export.php) -if(isset($_GET['table_select'])) { +if (isset($_GET['table_select'])) { $_GET['table_select'] = urldecode($_GET['table_select']); $_GET['table_select'] = explode(",", $_GET['table_select']); } foreach ($tables as $each_table) { - if(isset($_GET['table_select'])) { - if(in_array($each_table['Name'], $_GET['table_select'])) { + if (isset($_GET['table_select'])) { + if (in_array($each_table['Name'], $_GET['table_select'])) { $is_selected = ' selected="selected"'; } else { $is_selected = ''; diff --git a/db_operations.php b/db_operations.php index e2d1e2b..2382389 100644 --- a/db_operations.php +++ b/db_operations.php @@ -300,7 +300,7 @@ if (strlen($db) && (! empty($db_rename) || ! empty($db_copy))) { * Database has been successfully renamed/moved. If in an Ajax request, * generate the output with {@link PMA_ajaxResponse} and exit */ - if( $GLOBALS['is_ajax_request'] == true) { + if ( $GLOBALS['is_ajax_request'] == true) { $extra_data['newname'] = $newname; $extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query); PMA_ajaxResponse($message, $message->isSuccess(), $extra_data); diff --git a/db_search.php b/db_search.php index 69350cd..6191b14 100644 --- a/db_search.php +++ b/db_search.php @@ -92,7 +92,7 @@ if (empty($_REQUEST['field_str']) || ! is_string($_REQUEST['field_str'])) { */ $sub_part = ''; -if( $GLOBALS['is_ajax_request'] != true) { +if ( $GLOBALS['is_ajax_request'] != true) { require './libraries/db_info.inc.php'; echo '<div id="searchresults">'; } @@ -254,7 +254,7 @@ if (isset($_REQUEST['submit_search'])) { /** * If we are in an Ajax request, we need to exit after displaying all the HTML */ -if($GLOBALS['is_ajax_request'] == true) { +if ($GLOBALS['is_ajax_request'] == true) { exit; } else { diff --git a/db_structure.php b/db_structure.php index d1ffdc3..6dc82bf 100644 --- a/db_structure.php +++ b/db_structure.php @@ -372,7 +372,7 @@ foreach ($tables as $keyname => $each_table) { $sum_row_count_pre = '~'; $show_superscript = PMA_showHint(PMA_sanitize(sprintf(__('This view has at least this number of rows. Please refer to %sdocumentation%s.'), '[a@./Documentation.html#cfg_MaxExactCountViews@_blank]', '[/a]'))); } - } elseif($each_table['ENGINE'] == 'InnoDB' && (! $each_table['COUNTED'])) { + } elseif ($each_table['ENGINE'] == 'InnoDB' && (! $each_table['COUNTED'])) { // InnoDB table: we did not get an accurate row count $row_count_pre = '~'; $sum_row_count_pre = '~'; diff --git a/db_tracking.php b/db_tracking.php index 38a231d..df1106e 100644 --- a/db_tracking.php +++ b/db_tracking.php @@ -16,7 +16,7 @@ $GLOBALS['js_include'][] = 'db_structure.js'; /** * If we are not in an Ajax request, then do the common work and show the links etc. */ -if($GLOBALS['is_ajax_request'] != true) { +if ($GLOBALS['is_ajax_request'] != true) { require './libraries/db_common.inc.php'; } $url_query .= '&goto=tbl_tracking.php&back=db_tracking.php'; @@ -34,7 +34,7 @@ if (isset($_REQUEST['delete_tracking']) && isset($_REQUEST['table'])) { * If in an Ajax request, generate the success message and use * {@link PMA_ajaxResponse()} to send the output */ - if($GLOBALS['is_ajax_request'] == true) { + if ($GLOBALS['is_ajax_request'] == true) { $message = PMA_Message::success(); PMA_ajaxResponse($message, true); } diff --git a/enum_editor.php b/enum_editor.php index 5fe962f..9287bb3 100644 --- a/enum_editor.php +++ b/enum_editor.php @@ -33,7 +33,7 @@ require_once './libraries/header_meta_style.inc.php'; // Display the values in text fields, excluding empty strings $field_counter = 0; foreach ($values as $value) { - if(trim($value) != "") { + if (trim($value) != "") { $field_counter++; echo sprintf('<input type="text" size="30" value="%s" name="field' . $field_counter . '" />', htmlspecialchars(str_replace(array("''", '\\\\', "\\'"), array("'", '\\', "'"), substr($value, 1, -1)))); } @@ -41,7 +41,7 @@ require_once './libraries/header_meta_style.inc.php'; $total_fields = $field_counter; // If extra empty fields are added, display them - if(isset($_GET['extra_fields'])) { + if (isset($_GET['extra_fields'])) { $total_fields += $_GET['extra_fields']; for($i = $field_counter+1; $i <= $total_fields; $i++) { echo '<input type="text" size="30" name="field' . $i . '"/>'; diff --git a/libraries/common.inc.php b/libraries/common.inc.php index ed32fab..daf1173 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -1008,7 +1008,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { * Set to true if this is a request made during an inline edit process. This * request is made to retrieve the non-truncated/transformed values. */ -if(isset($_REQUEST['inline_edit']) && $_REQUEST['inline_edit'] == true) { +if (isset($_REQUEST['inline_edit']) && $_REQUEST['inline_edit'] == true) { $GLOBALS['inline_edit'] = true; } else { diff --git a/libraries/common.lib.php b/libraries/common.lib.php index f710b80..fd0701b 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -600,7 +600,7 @@ function PMA_mysqlDie($error_message = '', $the_query = '', * - avoid displaying a Back link * - use PMA_ajaxResponse() to transmit the message and exit */ - if($GLOBALS['is_ajax_request'] == true) { + if ($GLOBALS['is_ajax_request'] == true) { PMA_ajaxResponse($error_msg_output, false); } if (! empty($back_url)) { @@ -779,7 +779,7 @@ function PMA_backquote($a_name, $do_it = true) if (! $do_it) { global $PMA_SQPdata_forbidden_word; - if(! in_array(strtoupper($a_name), $PMA_SQPdata_forbidden_word)) { + if (! in_array(strtoupper($a_name), $PMA_SQPdata_forbidden_word)) { return $a_name; } } @@ -869,7 +869,7 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view * in a string. In some special cases on sql.php, buffering has to be disabled * and hence we check with $GLOBALS['buffer_message'] */ - if( $GLOBALS['is_ajax_request'] == true && ! isset($GLOBALS['buffer_message']) ) { + if ( $GLOBALS['is_ajax_request'] == true && ! isset($GLOBALS['buffer_message']) ) { ob_start(); } global $cfg; @@ -1202,7 +1202,7 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view // If we are in an Ajax request, we have most probably been called in // PMA_ajaxResponse(). Hence, collect the buffer contents and return it // to PMA_ajaxResponse(), which will encode it for JSON. - if( $GLOBALS['is_ajax_request'] == true && ! isset($GLOBALS['buffer_message']) ) { + if ( $GLOBALS['is_ajax_request'] == true && ! isset($GLOBALS['buffer_message']) ) { $buffer_contents = ob_get_contents(); ob_end_clean(); return $buffer_contents; @@ -1341,13 +1341,13 @@ function PMA_localizeNumber($value) */ function PMA_formatNumber($value, $digits_left = 3, $digits_right = 0, $only_down = false, $noTrailingZero = true) { - if($value==0) return '0'; + if ($value==0) return '0'; $originalValue = $value; //number_format is not multibyte safe, str_replace is safe if ($digits_left === 0) { $value = number_format($value, $digits_right); - if($originalValue!=0 && floatval($value) == 0) $value = ' <'.(1/PMA_pow(10,$digits_right)); + if ($originalValue!=0 && floatval($value) == 0) $value = ' <'.(1/PMA_pow(10,$digits_right)); return PMA_localizeNumber($value); } @@ -1388,22 +1388,22 @@ function PMA_formatNumber($value, $digits_left = 3, $digits_right = 0, $only_dow // Lowering the SI prefix by 1 gives us an additional 3 zeros // So if we have 3,6,9,12.. free digits ($digits_left - $cur_digits) to use, then lower the SI prefix $cur_digits = floor(log10($value / PMA_pow(1000, $d, 'pow'))+1); - if($digits_left > $cur_digits) { + if ($digits_left > $cur_digits) { $d-= floor(($digits_left - $cur_digits)/3); } - if($d<0 && $only_down) $d=0; + if ($d<0 && $only_down) $d=0; $value = round($value / (PMA_pow(1000, $d, 'pow') / $dh)) /$dh; $unit = $units[$d]; // If we dont want any zeros after the comma just add the thousand seperator - if($noTrailingZero) + if ($noTrailingZero) $value = PMA_localizeNumber(preg_replace("/(?<=\d)(?=(\d{3})+(?!\d))/",",",$value)); else $value = PMA_localizeNumber(number_format($value, $digits_right)); //number_format is not multibyte safe, str_replace is safe - if($originalValue!=0 && floatval($value) == 0) return ' <'.(1/PMA_pow(10,$digits_right)).' '.$unit; + if ($originalValue!=0 && floatval($value) == 0) return ' <'.(1/PMA_pow(10,$digits_right)).' '.$unit; return $sign . $value . ' ' . $unit; } // end of the 'PMA_formatNumber' function @@ -1541,7 +1541,7 @@ function PMA_generate_html_tab($tab, $url_params = array(), $base_dir='') } // If there are any tab specific URL parameters, merge those with the general URL parameters - if(! empty($tab['url_params']) && is_array($tab['url_params'])) { + if (! empty($tab['url_params']) && is_array($tab['url_params'])) { $url_params = array_merge($url_params, $tab['url_params']); } @@ -2806,7 +2806,7 @@ function PMA_expandUserString($string, $escape = null, $updates = array()) { function PMA_ajaxResponse($message, $success = true, $extra_data = array()) { $response = array(); - if( $success == true ) { + if ( $success == true ) { $response['success'] = true; if ($message instanceof PMA_Message) { $response['message'] = $message->getDisplay(); @@ -2817,7 +2817,7 @@ function PMA_ajaxResponse($message, $success = true, $extra_data = array()) } else { $response['success'] = false; - if($message instanceof PMA_Message) { + if ($message instanceof PMA_Message) { $response['error'] = $message->getDisplay(); } else { @@ -2826,7 +2826,7 @@ function PMA_ajaxResponse($message, $success = true, $extra_data = array()) } // If extra_data has been provided, append it to the response array - if( ! empty($extra_data) && count($extra_data) > 0 ) { + if ( ! empty($extra_data) && count($extra_data) > 0 ) { $response = array_merge($response, $extra_data); } @@ -2841,7 +2841,7 @@ function PMA_ajaxResponse($message, $success = true, $extra_data = array()) echo json_encode($response); - if(!defined('TESTSUITE')) + if (!defined('TESTSUITE')) exit; } diff --git a/libraries/db_common.inc.php b/libraries/db_common.inc.php index 4682122..290bcd1 100644 --- a/libraries/db_common.inc.php +++ b/libraries/db_common.inc.php @@ -69,7 +69,7 @@ if (isset($submitcollation) && !empty($db_collation)) { * db charset change action on db_operations.php. If this causes a bug on * other pages, we might have to move this to a different location. */ - if( $GLOBALS['is_ajax_request'] == true) { + if ( $GLOBALS['is_ajax_request'] == true) { PMA_ajaxResponse($message, $message->isSuccess()); }; } diff --git a/libraries/db_info.inc.php b/libraries/db_info.inc.php index eebad23..de56e83 100644 --- a/libraries/db_info.inc.php +++ b/libraries/db_info.inc.php @@ -247,7 +247,7 @@ unset($each_table, $tbl_group_sql, $db_info_result); * Displays top menu links * If in an Ajax request, we do not need to show this */ -if($GLOBALS['is_ajax_request'] != true) { +if ($GLOBALS['is_ajax_request'] != true) { require './libraries/db_links.inc.php'; } ?> diff --git a/libraries/db_links.inc.php b/libraries/db_links.inc.php index 5a95622..2210899 100644 --- a/libraries/db_links.inc.php +++ b/libraries/db_links.inc.php @@ -61,7 +61,7 @@ $tab_search['text'] = __('Search'); $tab_search['icon'] = 'ic_b_search'; $tab_search['link'] = 'db_search.php'; -if(PMA_Tracker::isActive()) +if (PMA_Tracker::isActive()) { $tab_tracking['text'] = __('Tracking'); $tab_tracking['icon'] = 'ic_eye'; diff --git a/libraries/db_structure.lib.php b/libraries/db_structure.lib.php index 68e4b9d..82a3f58 100644 --- a/libraries/db_structure.lib.php +++ b/libraries/db_structure.lib.php @@ -96,17 +96,17 @@ function PMA_SortableTableHeader($title, $sort, $initial_sort_order = 'ASC') // current sort order is ASC $order_img = ' <img class="icon ic_s_asc" src="themes/dot.gif" alt="'. __('Ascending') . '" title="'. __('Ascending') . '" id="sort_arrow" />'; // but on mouse over, show the reverse order (DESC) - $order_link_params['onmouseover'] = 'if($(\'#sort_arrow\').length > 0) { $(\'#sort_arrow\').attr(\'class\',\'icon ic_s_desc\'); }'; + $order_link_params['onmouseover'] = 'if ($(\'#sort_arrow\').length > 0) { $(\'#sort_arrow\').attr(\'class\',\'icon ic_s_desc\'); }'; // on mouse out, show current sort order (ASC) - $order_link_params['onmouseout'] = 'if($(\'#sort_arrow\').length > 0) { $(\'#sort_arrow\').attr(\'class\',\'icon ic_s_asc\'); }'; + $order_link_params['onmouseout'] = 'if ($(\'#sort_arrow\').length > 0) { $(\'#sort_arrow\').attr(\'class\',\'icon ic_s_asc\'); }'; } else { $future_sort_order = 'ASC'; // current sort order is DESC $order_img = ' <img class="icon ic_s_desc" src="themes/dot.gif" alt="'. __('Descending') . '" title="'. __('Descending') . '" id="sort_arrow" />'; // but on mouse over, show the reverse order (ASC) - $order_link_params['onmouseover'] = 'if($(\'#sort_arrow\').length > 0) { $(\'#sort_arrow\').attr(\'class\',\'icon ic_s_asc\'); }'; + $order_link_params['onmouseover'] = 'if ($(\'#sort_arrow\').length > 0) { $(\'#sort_arrow\').attr(\'class\',\'icon ic_s_asc\'); }'; // on mouse out, show current sort order (DESC) - $order_link_params['onmouseout'] = 'if($(\'#sort_arrow\').length > 0) { $(\'#sort_arrow\').attr(\'class\',\'icon ic_s_desc\'); }'; + $order_link_params['onmouseout'] = 'if ($(\'#sort_arrow\').length > 0) { $(\'#sort_arrow\').attr(\'class\',\'icon ic_s_desc\'); }'; } } diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php index 28e0bf2..75ec919 100644 --- a/libraries/display_export.lib.php +++ b/libraries/display_export.lib.php @@ -56,16 +56,16 @@ if (isset($single_table)) { echo '<input type="hidden" name="export_type" value="' . $export_type . '" />' . "\n"; // If the export method was not set, the default is quick -if(isset($_GET['export_method'])) { +if (isset($_GET['export_method'])) { $cfg['Export']['method'] = $_GET['export_method']; -} elseif(! isset($cfg['Export']['method'])) { +} elseif (! isset($cfg['Export']['method'])) { $cfg['Export']['method'] = 'quick'; } // The export method (quick, custom or custom-no-form) echo '<input type="hidden" name="export_method" value="' . htmlspecialchars($cfg['Export']['method']) . '" />'; -if(isset($_GET['sql_query'])) { +if (isset($_GET['sql_query'])) { echo '<input type="hidden" name="sql_query" value="' . htmlspecialchars($_GET['sql_query']) . '" />' . "\n"; } elseif (! empty($sql_query)) { echo '<input type="hidden" name="sql_query" value="' . htmlspecialchars($sql_query) . '" />' . "\n"; @@ -76,9 +76,9 @@ if(isset($_GET['sql_query'])) { <h2> <img class="icon ic_b_export" src="themes/dot.gif" alt="export" /> <?php - if($export_type == 'server') { + if ($export_type == 'server') { echo __('Exporting databases from the current server'); - } elseif($export_type == 'database') { + } elseif ($export_type == 'database') { printf(__('Exporting tables from "%s" database'), htmlspecialchars($db)); } else { printf(__('Exporting rows from "%s" table'), htmlspecialchars($table)); @@ -91,14 +91,14 @@ if(isset($_GET['sql_query'])) { <ul> <li> <?php echo '<input type="radio" name="quick_or_custom" value="quick" id="radio_quick_export"'; - if(isset($_GET['quick_or_custom'])) { + if (isset($_GET['quick_or_custom'])) { $export_method = $_GET['quick_or_custom']; - if($export_method == 'custom' || $export_method == 'custom_no_form') { + if ($export_method == 'custom' || $export_method == 'custom_no_form') { echo ' />'; } else { echo ' checked="checked" />'; } - } elseif($cfg['Export']['method'] == 'custom' || $cfg['Export']['method'] == 'custom-no-form') { + } elseif ($cfg['Export']['method'] == 'custom' || $cfg['Export']['method'] == 'custom-no-form') { echo ' />'; } else { echo ' checked="checked" />'; @@ -107,14 +107,14 @@ if(isset($_GET['sql_query'])) { </li> <li> <?php echo '<input type="radio" name="quick_or_custom" value="custom" id="radio_custom_export"'; - if(isset($_GET['quick_or_custom'])) { + if (isset($_GET['quick_or_custom'])) { $export_method = $_GET['quick_or_custom']; - if($export_method == 'custom' || $export_method == 'custom_no_form') { + if ($export_method == 'custom' || $export_method == 'custom_no_form') { echo ' checked="checked" />'; } else { echo ' />'; } - } elseif($cfg['Export']['method'] == 'custom' || $cfg['Export']['method'] == 'custom-no-form') { + } elseif ($cfg['Export']['method'] == 'custom' || $cfg['Export']['method'] == 'custom-no-form') { echo ' checked="checked" />'; } else { echo ' />'; @@ -126,9 +126,9 @@ if(isset($_GET['sql_query'])) { <div class="exportoptions" id="databases_and_tables"> <?php - if($export_type == 'server') { + if ($export_type == 'server') { echo '<h3>' . __('Database(s):') . '</h3>'; - } else if($export_type == 'database') { + } else if ($export_type == 'database') { echo '<h3>' . __('Table(s):') . '</h3>'; } if (! empty($multi_values)) { @@ -142,7 +142,7 @@ if(isset($_GET['sql_query'])) { <h3><?php echo __('Rows:'); ?></h3> <ul> <li> - <?php if(isset($_GET['allrows']) && $_GET['allrows'] == 1) { + <?php if (isset($_GET['allrows']) && $_GET['allrows'] == 1) { echo '<input type="radio" name="allrows" value="0" id="radio_allrows_0" />'; } else { echo '<input type="radio" name="allrows" value="0" id="radio_allrows_0" checked="checked" />'; @@ -158,7 +158,7 @@ if(isset($_GET['sql_query'])) { </ul> </li> <li> - <?php if(isset($_GET['allrows']) && $_GET['allrows'] == 0) { + <?php if (isset($_GET['allrows']) && $_GET['allrows'] == 0) { echo '<input type="radio" name="allrows" value="1" id="radio_allrows_1" />'; } else { echo '<input type="radio" name="allrows" value="1" id="radio_allrows_1" checked="checked" />'; @@ -241,7 +241,7 @@ if(isset($_GET['sql_query'])) { <input type="text" name="filename_template" id="filename_template" <?php echo ' value="'; - if(isset($_GET['filename_template'])) { + if (isset($_GET['filename_template'])) { echo $_GET['filename_template']; } else { if ($export_type == 'database') { @@ -276,7 +276,7 @@ if(isset($_GET['sql_query'])) { echo '<select id="select_charset_of_file" name="charset_of_file" size="1">'; foreach ($cfg['AvailableCharsets'] as $temp_charset) { echo '<option value="' . $temp_charset . '"'; - if(isset($_GET['charset_of_file']) && ($_GET['charset_of_file'] != $temp_charset)) { + if (isset($_GET['charset_of_file']) && ($_GET['charset_of_file'] != $temp_charset)) { echo ''; } elseif ((empty($cfg['Export']['charset']) && $temp_charset == 'utf-8') || $temp_charset == $cfg['Export']['charset']) { @@ -288,7 +288,7 @@ if(isset($_GET['sql_query'])) { } // end if ?> <?php - if(isset($_GET['compression'])) { + if (isset($_GET['compression'])) { $selected_compression = $_GET['compression']; } elseif (isset($cfg['Export']['compression'])) { $selected_compression = $cfg['Export']['compression']; diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php index 119ccd1..052a023 100644 --- a/libraries/display_import.lib.php +++ b/libraries/display_import.lib.php @@ -125,9 +125,9 @@ if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") { <h2> <img class="icon ic_b_import" src="themes/dot.gif" alt="import" /> <?php - if($import_type == 'server') { + if ($import_type == 'server') { echo __('Importing into the current server'); - } elseif($import_type == 'database') { + } elseif ($import_type == 'database') { printf(__('Importing into the database "%s"'), htmlspecialchars($db)); } else { printf(__('Importing into the table "%s"'), htmlspecialchars($table)); @@ -160,7 +160,7 @@ if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") { }?> <div class="formelementrow" id="upload_form"> - <?php if($GLOBALS['is_upload'] && !empty($cfg['UploadDir'])) { ?> + <?php if ($GLOBALS['is_upload'] && !empty($cfg['UploadDir'])) { ?> <ul> <li> <input type="radio" name="file_location" id="radio_import_file" /> diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 8bf4f3c..adaa407 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -913,11 +913,11 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $ $order_link_params = array(); if (isset($order_img) && $order_img!='') { if (strstr($order_img, 'asc')) { - $order_link_params['onmouseover'] = 'if($(\'#soimg' . $i . '\').length > 0) { $(\'#soimg' . $i . '\').attr(\'class\', \'icon ic_s_desc\'); }'; - $order_link_params['onmouseout'] = 'if($(\'#soimg' . $i . '\').length > 0) { $(\'#soimg' . $i . '\').attr(\'class\', \'icon ic_s_asc\'); }'; + $order_link_params['onmouseover'] = 'if ($(\'#soimg' . $i . '\').length > 0) { $(\'#soimg' . $i . '\').attr(\'class\', \'icon ic_s_desc\'); }'; + $order_link_params['onmouseout'] = 'if ($(\'#soimg' . $i . '\').length > 0) { $(\'#soimg' . $i . '\').attr(\'class\', \'icon ic_s_asc\'); }'; } elseif (strstr($order_img, 'desc')) { - $order_link_params['onmouseover'] = 'if($(\'#soimg' . $i . '\').length > 0) { $(\'#soimg' . $i . '\').attr(\'class\', \'icon ic_s_asc\'); }'; - $order_link_params['onmouseout'] = 'if($(\'#soimg' . $i . '\').length > 0) { $(\'#soimg' . $i . '\').attr(\'class\', \'icon ic_s_desc\'); }'; + $order_link_params['onmouseover'] = 'if ($(\'#soimg' . $i . '\').length > 0) { $(\'#soimg' . $i . '\').attr(\'class\', \'icon ic_s_asc\'); }'; + $order_link_params['onmouseout'] = 'if ($(\'#soimg' . $i . '\').length > 0) { $(\'#soimg' . $i . '\').attr(\'class\', \'icon ic_s_desc\'); }'; } } if ($GLOBALS['cfg']['HeaderFlipType'] == 'auto') { @@ -1113,22 +1113,22 @@ function PMA_buildEmptyDisplay($class, $condition_field, $meta, $align = '') { function PMA_addClass($class, $condition_field, $meta, $nowrap, $is_field_truncated = false, $transform_function = '', $default_function = '') { // Define classes to be added to this data field based on the type of data $enum_class = ''; - if(strpos($meta->flags, 'enum') !== false) { + if (strpos($meta->flags, 'enum') !== false) { $enum_class = ' enum'; } $set_class = ''; - if(strpos($meta->flags, 'set') !== false) { + if (strpos($meta->flags, 'set') !== false) { $set_class = ' set'; } $bit_class = ''; - if(strpos($meta->type, 'bit') !== false) { + if (strpos($meta->type, 'bit') !== false) { $bit_class = ' bit'; } $mime_type_class = ''; - if(isset($meta->mimetype)) { + if (isset($meta->mimetype)) { $mime_type_class = ' ' . preg_replace('/\//', '_', $meta->mimetype); } @@ -1301,7 +1301,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { // Class definitions required for inline editing jQuery scripts $edit_anchor_class = "edit_row_anchor"; - if( $clause_is_unique == 0) { + if ( $clause_is_unique == 0) { $edit_anchor_class .= ' nonunique'; } } // end if (1.2.1) @@ -2726,7 +2726,7 @@ function PMA_generateEditLink($edit_url, $class, $edit_str, $where_clause, $wher * Where clause for selecting this row uniquely is provided as * a hidden input. Used by jQuery scripts for handling inline editing */ - if(! empty($where_clause)) { + if (! empty($where_clause)) { $ret .= '<input type="hidden" class="where_clause" value ="' . $where_clause_html . '" />'; } $ret .= '</span></td>'; @@ -2756,7 +2756,7 @@ function PMA_generateCopyLink($copy_url, $copy_str, $where_clause, $where_clause * Where clause for selecting this row uniquely is provided as * a hidden input. Used by jQuery scripts for handling inline editing */ - if(! empty($where_clause)) { + if (! empty($where_clause)) { $ret .= '<input type="hidden" class="where_clause" value ="' . $where_clause_html . '" />'; } $ret .= '</span></td>'; diff --git a/libraries/header.inc.php b/libraries/header.inc.php index 5700047..a6ed8ed 100644 --- a/libraries/header.inc.php +++ b/libraries/header.inc.php @@ -198,7 +198,7 @@ if (isset($GLOBALS['is_ajax_request']) && !$GLOBALS['is_ajax_request']) { * Sets a variable to remember headers have been sent */ $GLOBALS['is_header_sent'] = true; -} //end if(!$GLOBALS['is_ajax_request']) +} //end if (!$GLOBALS['is_ajax_request']) else { if (empty($GLOBALS['is_header_sent'])) { require_once './libraries/header_http.inc.php'; diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php index 46a89fc..0f7e218 100644 --- a/libraries/mult_submits.inc.php +++ b/libraries/mult_submits.inc.php @@ -263,7 +263,7 @@ if (!empty($submit_mult) && !empty($what)) { </fieldset> <?php } - elseif($what == 'add_prefix_tbl'){ ?> + elseif ($what == 'add_prefix_tbl'){ ?> <fieldset class = "input"> <legend><?php echo __('Add table prefix') ?>:</legend> <table> diff --git a/libraries/plugin_interface.lib.php b/libraries/plugin_interface.lib.php index ed2f4f9..703215f 100644 --- a/libraries/plugin_interface.lib.php +++ b/libraries/plugin_interface.lib.php @@ -80,7 +80,7 @@ function PMA_pluginCheckboxCheck($section, $opt) */ function PMA_pluginGetDefault($section, $opt) { - if(isset($_GET[$opt])) { // If the form is being repopulated using $_GET data, that is priority + if (isset($_GET[$opt])) { // If the form is being repopulated using $_GET data, that is priority return htmlspecialchars($_GET[$opt]); } elseif (isset($GLOBALS['timeout_passed']) && $GLOBALS['timeout_passed'] && isset($_REQUEST[$opt])) { return htmlspecialchars($_REQUEST[$opt]); @@ -148,7 +148,7 @@ function PMA_pluginGetChoice($section, $name, &$list, $cfgname = null) foreach ($list as $plugin_name => $val) { $ret .= '<option'; // If the form is being repopulated using $_GET data, that is priority - if(isset($_GET[$name]) && $plugin_name == $_GET[$name] || ! isset($_GET[$name]) && $plugin_name == $default) { + if (isset($_GET[$name]) && $plugin_name == $_GET[$name] || ! isset($_GET[$name]) && $plugin_name == $default) { $ret .= ' selected="selected"'; } $ret .= ' value="' . $plugin_name . '">' . PMA_getString($val['text']) . '</option>' . "\n"; @@ -158,7 +158,7 @@ function PMA_pluginGetChoice($section, $name, &$list, $cfgname = null) // Whether each plugin has to be saved as a file foreach ($list as $plugin_name => $val) { $ret .= '<input type="hidden" id="force_file_' . $plugin_name . '" value="'; - if(isset($val['force_file'])) { + if (isset($val['force_file'])) { $ret .= 'true'; } else { $ret .= 'false'; @@ -230,7 +230,7 @@ function PMA_pluginGetOneOption($section, $plugin_name, $id, &$opt) foreach ($opt['values'] as $key => $val) { $ret .= '<li><input type="radio" name="' . $plugin_name . '_' . $opt['name'] . '" value="' . $key . '" id="radio_' . $plugin_name . '_' . $opt['name'] . '_' . $key . '"'; - if($key == $default) { + if ($key == $default) { $ret .= 'checked="checked"'; } $ret .= ' />' . '<label for="radio_' . $plugin_name . '_' . $opt['name'] . '_' . $key . '">' @@ -250,7 +250,7 @@ function PMA_pluginGetOneOption($section, $plugin_name, $id, &$opt) } elseif ($opt['type'] == 'begin_subgroup') { /* each subgroup can have a header, which may also be a form element */ $ret .= PMA_pluginGetOneOption($section, $plugin_name, $id, $opt['subgroup_header']) . '<li class="subgroup"><ul'; - if(isset($opt['subgroup_header']['name'])) { + if (isset($opt['subgroup_header']['name'])) { $ret .= ' id="ul_' . $opt['subgroup_header']['name'] . '">'; } else { $ret .= '>'; @@ -273,7 +273,7 @@ function PMA_pluginGetOneOption($section, $plugin_name, $id, &$opt) } // Close the list element after $opt['doc'] link is displayed - if($opt['type'] == 'bool' || $opt['type'] == 'text' || $opt['type'] == 'message_only' || $opt['type'] == 'select') { + if ($opt['type'] == 'bool' || $opt['type'] == 'text' || $opt['type'] == 'message_only' || $opt['type'] == 'select') { $ret .= '</li>'; } $ret .= "\n"; diff --git a/libraries/server_links.inc.php b/libraries/server_links.inc.php index 4b7198e..19ee5d7 100644 --- a/libraries/server_links.inc.php +++ b/libraries/server_links.inc.php @@ -114,5 +114,5 @@ if (!$GLOBALS['is_ajax_request']) { PMA_showMessage($message); unset($message); } -}// end if($GLOBALS['is_ajax_request'] == true) +}// end if ($GLOBALS['is_ajax_request'] == true) ?> diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php index c32ac4d..2c7e69c 100644 --- a/libraries/server_synchronize.lib.php +++ b/libraries/server_synchronize.lib.php @@ -477,7 +477,7 @@ function PMA_insertIntoTargetTable($matching_table, $src_db, $trg_db, $src_link, $matching_tables_keys, $source_columns, &$add_column_array, $criteria, $target_tables_keys, $uncommon_tables, &$uncommon_tables_fields,$uncommon_cols, &$alter_str_array,&$source_indexes, &$target_indexes, &$add_indexes_array, &$alter_indexes_array, &$delete_array, &$update_array, $display) { - if(isset($array_insert[$matching_table_index])) { + if (isset($array_insert[$matching_table_index])) { if (sizeof($array_insert[$matching_table_index])) { for ($insert_row = 0; $insert_row< sizeof($array_insert[$matching_table_index]); $insert_row++) { if (isset($array_insert[$matching_table_index][$insert_row][$matching_tables_keys[$matching_table_index][0]])) { @@ -828,7 +828,7 @@ function PMA_addColumnsInTargetTable($src_db, $trg_db, $src_link, $trg_link, $ma $query = "ALTER TABLE " . PMA_backquote($trg_db) . '.' . PMA_backquote($matching_tables[$table_counter]). " ADD COLUMN " . $add_column_array[$table_counter][$matching_tables_fields[$table_counter][$i]] . " " . $source_columns[$table_counter][$matching_tables_fields[$table_counter][$i]]['Type']; - if($source_columns[$table_counter][$matching_tables_fields[$table_counter][$i]]['Null'] == 'NO') { + if ($source_columns[$table_counter][$matching_tables_fields[$table_counter][$i]]['Null'] == 'NO') { $query .= ' Not Null '; } elseif ($source_columns[$table_counter][$matching_tables_fields[$table_counter][$i]]['Null'] == 'YES') { $query .= ' Null '; @@ -1004,23 +1004,23 @@ function PMA_alterTargetTableStructure($trg_db, $trg_link, $matching_tables, &$s $sql_query .= " Null " ; } if ($criteria[$i] == 'Collation') { - if( !(isset($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[2]]))) { + if ( !(isset($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[2]]))) { $sql_query .= " Not Null " ; } $sql_query .= " COLLATE " . $alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[$i]] ; } if (($criteria[$i] == 'Default') && ($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[$i]] == 'None')) { - if( !(isset($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[2]]))) { + if ( !(isset($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[2]]))) { $sql_query .= " Not Null " ; } - } elseif($criteria[$i] == 'Default') { - if(! (isset($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[2]]))) { + } elseif ($criteria[$i] == 'Default') { + if (! (isset($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[2]]))) { $sql_query .= " Not Null " ; } if (is_string($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[$i]])) { if ($source_columns[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]]['Type'] != 'timestamp') { $sql_query .= " DEFAULT '" . $alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[$i]] . "'"; - } elseif($source_columns[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]]['Type'] == 'timestamp') { + } elseif ($source_columns[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]]['Type'] == 'timestamp') { $sql_query .= " DEFAULT " . $alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[$i]]; } } elseif (is_numeric($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[$i]])) { @@ -1028,7 +1028,7 @@ function PMA_alterTargetTableStructure($trg_db, $trg_link, $matching_tables, &$s } } if ($criteria[$i] == 'Comment') { - if( !(isset($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[2]]))) { + if ( !(isset($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[2]]))) { $sql_query .= " Not Null " ; } $sql_query .= " COMMENT '" . $alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[$i]] . "'" ; @@ -1162,7 +1162,7 @@ function PMA_indexesDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matchi $z++; } if ($found === false) { - if(! ($source_indexes[$table_counter][$a]['Key_name'] == 'PRIMARY')) { + if (! ($source_indexes[$table_counter][$a]['Key_name'] == 'PRIMARY')) { $add_indexes_array [$table_counter][] = $source_indexes[$table_counter][$a]['Column_name']; } } @@ -1364,7 +1364,7 @@ function PMA_get_column_values($database, $table, $column, $link = null) for ($i=0; $i< sizeof($column); $i++) { $query.= PMA_backquote($column[$i]); - if($i < (sizeof($column)-1)) + if ($i < (sizeof($column)-1)) { $query.= ', '; } diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php index 1a3fd92..5a0f364 100644 --- a/libraries/sql_query_form.lib.php +++ b/libraries/sql_query_form.lib.php @@ -252,7 +252,7 @@ function PMA_sqlQueryFormInsert($query = '', $is_querywindow = false, $delimiter .' dir="' . $GLOBALS['text_dir'] . '"' .$auto_sel . $locking . '>' . htmlspecialchars($query) . '</textarea>' . "\n"; // Add buttons to generate query easily for select all,single select,insert,update and delete - if(count($fields_list)) { + if (count($fields_list)) { echo '<input type="button" value="SELECT *" id="selectall" class="sqlbutton" />'; echo '<input type="button" value="SELECT" id="select" class="sqlbutton" />'; echo '<input type="button" value="INSERT" id="insert" class="sqlbutton" />'; diff --git a/libraries/sysinfo.lib.php b/libraries/sysinfo.lib.php index e996db6..9bcc2dd 100644 --- a/libraries/sysinfo.lib.php +++ b/libraries/sysinfo.lib.php @@ -14,7 +14,7 @@ function getSysInfo() { $sysinfo = array(); - if(in_array(PHP_OS, $supported)) { + if (in_array(PHP_OS, $supported)) { return eval("return new ".PHP_OS."();"); } diff --git a/libraries/tbl_links.inc.php b/libraries/tbl_links.inc.php index ac5bfb3..3de9ed2 100644 --- a/libraries/tbl_links.inc.php +++ b/libraries/tbl_links.inc.php @@ -92,7 +92,7 @@ if (! $tbl_is_view && !$db_is_information_schema) { $tabs['operation']['link'] = 'tbl_operations.php'; $tabs['operation']['text'] = __('Operations'); } -if(PMA_Tracker::isActive()) { +if (PMA_Tracker::isActive()) { $tabs['tracking']['icon'] = 'ic_eye'; $tabs['tracking']['text'] = __('Tracking'); $tabs['tracking']['link'] = 'tbl_tracking.php'; @@ -122,7 +122,7 @@ if ($table_info_num_rows == 0 && !$tbl_is_view) { echo PMA_generate_html_tabs($tabs, $url_params); unset($tabs); -if(PMA_Tracker::isActive() and PMA_Tracker::isTracked($GLOBALS["db"], $GLOBALS["table"])) +if (PMA_Tracker::isActive() and PMA_Tracker::isTracked($GLOBALS["db"], $GLOBALS["table"])) { $msg = PMA_Message::notice('<a href="tbl_tracking.php?'.$url_query.'">'.sprintf(__('Tracking of %s.%s is activated.'), htmlspecialchars($GLOBALS["db"]), htmlspecialchars($GLOBALS["table"])).'</a>'); $msg->display(); diff --git a/main.php b/main.php index f340e80..e1eec63 100644 --- a/main.php +++ b/main.php @@ -295,7 +295,7 @@ if (file_exists('./config')) { */ if ($server > 0) { $cfgRelation = PMA_getRelationsParam(); - if(! $cfgRelation['allworks'] && $cfg['PmaNoRelation_DisableWarning'] == false) { + if (! $cfgRelation['allworks'] && $cfg['PmaNoRelation_DisableWarning'] == false) { $message = PMA_Message::notice(__('The phpMyAdmin configuration storage is not completely configured, some extended features have been deactivated. To find out why click %shere%s.')); $message->addParam('<a href="' . $cfg['PmaAbsoluteUri'] . 'chk_rel.php?' . $common_url_query . '">', false); $message->addParam('</a>', false); diff --git a/navigation.php b/navigation.php index 27859fe..e473dd8 100644 --- a/navigation.php +++ b/navigation.php @@ -576,7 +576,7 @@ function PMA_displayTableList($tables, $visible = false, while (isset($table['is' . $sep . 'group'])) { // get the array with the actual table information foreach ($table as $value) { - if(is_array($value)) { + if (is_array($value)) { $table = $value; } } diff --git a/pmd_general.php b/pmd_general.php index 1307571..10a862c 100644 --- a/pmd_general.php +++ b/pmd_general.php @@ -42,7 +42,7 @@ echo ' var db = "' . PMA_escapeJsString($db) . '"; var token = "' . PMA_escapeJsString($token) . '";'; echo "\n"; - if($_REQUEST['query']) { + if ($_REQUEST['query']) { echo ' $(document).ready(function(){ $(".trigger").click(function(){ @@ -113,7 +113,7 @@ echo $script_tabs . $script_contr . $script_display_field; ><img src="pmd/images/pdf.png" alt="key" width="20" height="20" title="<?php echo __('Import/Export coordinates for PDF schema'); ?>" /></a > - <?php if($_REQUEST['query']){ + <?php if ($_REQUEST['query']){ echo '<a href="#" onClick="build_query(\'SQL Query on Database\', 0)" onmousedown="return false;" class="M_butt" target="_self">'; echo '<img src="pmd/images/query_builder.png" alt="key" width="20" height="20" title="'; @@ -205,7 +205,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { <thead> <tr> <?php - if(isset($_REQUEST['query'])) { + if (isset($_REQUEST['query'])) { echo '<td class="select_all">'; echo '<input type="checkbox" value="select_all_'.htmlspecialchars($t_n_url).'" style="margin: 0px;" '; echo 'id="select_all_'.htmlspecialchars($t_n_url).'" title="select all" '; @@ -238,7 +238,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { echo $GLOBALS['PMD_OUT']["TABLE_NAME_SMALL"][$i]; ?></td> <?php - if(isset($_REQUEST['query'])) { + if (isset($_REQUEST['query'])) { echo '<td class="tab_zag" onmouseover="Table_onover(\''.htmlspecialchars($t_n_url).'\',0,1)" id="id_zag_'.htmlspecialchars($t_n_url).'_2"'; echo 'onmousedown="cur_click=document.getElementById(\''.htmlspecialchars($t_n_url).'\');"'; echo 'onmouseout="Table_onover(\''.htmlspecialchars($t_n_url).'\',1,1)">'; @@ -274,7 +274,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { } ?>)"> <?php - if(isset($_REQUEST['query'])) { + if (isset($_REQUEST['query'])) { echo '<td class="select_all">'; echo '<input value="'.htmlspecialchars($t_n_url).urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]).'"'; echo 'type="checkbox" id="select_'.htmlspecialchars($t_n_url).'._'.urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]).'" '; @@ -315,7 +315,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { </div> </td> <?php - if(isset($_REQUEST['query'])) { + if (isset($_REQUEST['query'])) { //$temp = $GLOBALS['PMD_OUT']["OWNER"][$i].'.'.$GLOBALS['PMD_OUT']["TABLE_NAME_SMALL"][$i]; echo '<td class="small_tab_pref" onmouseover="this.className=\'small_tab_pref2\';"'; echo 'onmouseout="this.className=\'small_tab_pref\';"'; @@ -801,7 +801,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { </table> <?php -if($_REQUEST['query']) { +if ($_REQUEST['query']) { echo '<div class="panel">'; echo '<div style="clear:both;"></div>'; echo '<div id="ab"></div>'; diff --git a/pmd_save_pos.php b/pmd_save_pos.php index 6fefe63..b95b20f 100644 --- a/pmd_save_pos.php +++ b/pmd_save_pos.php @@ -45,7 +45,7 @@ function PMD_err_sav() { } } -if(! empty($die_save_pos)) { +if (! empty($die_save_pos)) { header("Content-Type: text/xml; charset=utf-8"); header("Cache-Control: no-cache"); ?> diff --git a/schema_edit.php b/schema_edit.php index 9b71500..1545d8f 100644 --- a/schema_edit.php +++ b/schema_edit.php @@ -83,7 +83,7 @@ if ($cfgRelation['pdfwork']) { * @param string $do It tells what the Schema is supposed to do * create and select a page, generate schema etc */ - if(isset($_REQUEST['do'])){ + if (isset($_REQUEST['do'])){ $user_schema->setAction($_REQUEST['do']); $user_schema->processUserChoice(); } diff --git a/server_databases.php b/server_databases.php index fb9d1d6..544db90 100644 --- a/server_databases.php +++ b/server_databases.php @@ -180,7 +180,7 @@ if ($databases_count > 0) { { if ($type=="master") $name = __('Master replication'); - elseif($type == "slave") + elseif ($type == "slave") $name = __('Slave replication'); if (${"server_{$type}_status"}) echo ' <th>'. $name .'</th>' . "\n"; diff --git a/server_export.php b/server_export.php index b5a4ca6..d6dd2cf 100644 --- a/server_export.php +++ b/server_export.php @@ -31,14 +31,14 @@ $multi_values .= '<select name="db_select[]" id="db_select" size="10" multiple=" $multi_values .= "\n"; // Check if the selected databases are defined in $_GET (from clicking Back button on export.php) -if(isset($_GET['db_select'])) { +if (isset($_GET['db_select'])) { $_GET['db_select'] = urldecode($_GET['db_select']); $_GET['db_select'] = explode(",", $_GET['db_select']); } foreach ($GLOBALS['pma']->databases as $current_db) { - if(isset($_GET['db_select'])) { - if(in_array($current_db, $_GET['db_select'])) { + if (isset($_GET['db_select'])) { + if (in_array($current_db, $_GET['db_select'])) { $is_selected = ' selected="selected"'; } else { $is_selected = ''; diff --git a/server_privileges.php b/server_privileges.php index e2f19a9..ecd1fa6 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -1046,7 +1046,7 @@ if (isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) { /** * If we are not in an Ajax request, we can't reload navigation now */ - if($GLOBALS['is_ajax_request'] != true) { + if ($GLOBALS['is_ajax_request'] != true) { // this is needed in case tracking is on: $GLOBALS['db'] = $username; $GLOBALS['reload'] = true; @@ -1346,7 +1346,7 @@ if (isset($_REQUEST['delete']) || (isset($_REQUEST['change_copy']) && $_REQUEST[ $queries[] = 'DROP DATABASE IF EXISTS ' . PMA_backquote($this_user) . ';'; $GLOBALS['reload'] = true; - if($GLOBALS['is_ajax_request'] != true) { + if ($GLOBALS['is_ajax_request'] != true) { PMA_reloadNavigation(); } } @@ -1446,11 +1446,11 @@ $link_export = '<a class="export_user_anchor ' . $conditional_class . '" href="s */ if ($GLOBALS['is_ajax_request'] && ! isset($_REQUEST['export']) && (! isset($_REQUEST['adduser']) || $_add_user_error) && ! isset($_REQUEST['initial']) && ! isset($_REQUEST['showall']) && ! isset($_REQUEST['edit_user_dialog']) && ! isset($_REQUEST['db_specific'])) { - if(isset($sql_query)) { + if (isset($sql_query)) { $extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query); } - if(isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) { + if (isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) { /** * generate html on the fly for the new user that was just created. */ @@ -1460,7 +1460,7 @@ if ($GLOBALS['is_ajax_request'] && ! isset($_REQUEST['export']) && (! isset($_RE .'<td>' . htmlspecialchars($hostname) . '</td>' . "\n"; $new_user_string .= '<td>'; - if(!empty($password) || isset($pma_pw)) { + if (!empty($password) || isset($pma_pw)) { $new_user_string .= __('Yes'); } else { @@ -1471,7 +1471,7 @@ if ($GLOBALS['is_ajax_request'] && ! isset($_REQUEST['export']) && (! isset($_RE $new_user_string .= '<td><tt>' . join(', ', PMA_extractPrivInfo('', true)) . '</tt></td>'; //Fill in privileges here $new_user_string .= '<td>'; - if((isset($Grant_priv) && $Grant_priv == 'Y')) { + if ((isset($Grant_priv) && $Grant_priv == 'Y')) { $new_user_string .= __('Yes'); } else { @@ -1498,7 +1498,7 @@ if ($GLOBALS['is_ajax_request'] && ! isset($_REQUEST['export']) && (! isset($_RE $extra_data['new_user_initial_string'] = $new_user_initial_string; } - if(isset($update_privs)) { + if (isset($update_privs)) { $extra_data['db_specific_privs'] = false; if (isset($dbname_is_wildcard)) { $extra_data['db_specific_privs'] = !$dbname_is_wildcard; @@ -1806,7 +1806,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs // A user was selected -> display the user's properties // In an Ajax request, prevent cached values from showing - if($GLOBALS['is_ajax_request'] == true) { + if ($GLOBALS['is_ajax_request'] == true) { header('Cache-Control: no-cache'); } @@ -2376,7 +2376,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs $user_form .= '</tbody>' . "\n" . '</table></form>' . "\n"; - if($GLOBALS['is_ajax_request'] == true){ + if ($GLOBALS['is_ajax_request'] == true){ $extra_data['user_form'] = $user_form; $message = PMA_Message::success(__('User has been added.')); PMA_ajaxResponse($message, $message->isSuccess(), $extra_data); diff --git a/server_status.php b/server_status.php index cf02da7..c88ccdd 100644 --- a/server_status.php +++ b/server_status.php @@ -222,15 +222,15 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { // Ignore undefined index warning, just increase counter by one @$return['sum'][$type] += $row['#']; - if($type=='insert' || $type=='update') { + if ($type=='insert' || $type=='update') { // Group inserts if selected - if($type=='insert' && isset($_REQUEST['groupInserts']) && $_REQUEST['groupInserts'] && preg_match('/^INSERT INTO (`|\'|"|)([^\s\\1]+)\\1/i',$row['argument'],$matches)) { + if ($type=='insert' && isset($_REQUEST['groupInserts']) && $_REQUEST['groupInserts'] && preg_match('/^INSERT INTO (`|\'|"|)([^\s\\1]+)\\1/i',$row['argument'],$matches)) { $insertTables[$matches[2]]++; if ($insertTables[$matches[2]] > 1) { $return['rows'][$insertTablesFirst]['#'] = $insertTables[$matches[2]]; // Add a ... to the end of this query to indicate that there's been other queries - if($return['rows'][$insertTablesFirst]['argument'][strlen($return['rows'][$insertTablesFirst]['argument'])-1] != '.') + if ($return['rows'][$insertTablesFirst]['argument'][strlen($return['rows'][$insertTablesFirst]['argument'])-1] != '.') $return['rows'][$insertTablesFirst]['argument'] .= '<br/>...'; // Group this value, thus do not add to the result list @@ -557,7 +557,7 @@ require './libraries/server_common.inc.php'; require './libraries/server_links.inc.php'; $server = 1; -if(isset($_REQUEST['server']) && intval($_REQUEST['server'])) $server = intval($_REQUEST['server']); +if (isset($_REQUEST['server']) && intval($_REQUEST['server'])) $server = intval($_REQUEST['server']); $server_db_isLocal = strtolower($cfg['Servers'][$server]['host']) == 'localhost' || $cfg['Servers'][$server]['host'] == '127.0.0.1' @@ -722,7 +722,7 @@ function printQueryStatistics() { echo PMA_formatNumber( $total_queries * 60 / $server_status['Uptime'], 0); echo '<br>'; - if($total_queries / $server_status['Uptime'] >= 1) { + if ($total_queries / $server_status['Uptime'] >= 1) { echo 'ø '.__('per second').': '; echo PMA_formatNumber( $total_queries / $server_status['Uptime'], 0); } @@ -768,7 +768,7 @@ function printQueryStatistics() { $name = str_replace(array('Com_', '_'), array('', ' '), $name); // Group together values that make out less than 2% into "Other", but only if we have more than 6 fractions already - if($value < $query_sum * 0.02 && count($chart_json)>6) + if ($value < $query_sum * 0.02 && count($chart_json)>6) $other_sum += $value; else $chart_json[$name] = $value; ?> @@ -1364,7 +1364,7 @@ function printMonitor() { <div id="addChartDialog" title="Add chart" style="display:none;"> <div id="tabGridVariables"> <p><input type="text" name="chartTitle" value="<?php echo __('Chart Title'); ?>" /></p> - <?php if($server_db_isLocal) { ?> + <?php if ($server_db_isLocal) { ?> <input type="radio" name="chartType" value="cpu" id="chartCPU"> <label for="chartCPU"><?php echo __('CPU Usage'); ?></label><br/> @@ -1444,8 +1444,8 @@ function printMonitor() { variableNames = [ <?php $i=0; foreach ($server_status as $name=>$value) { - if(is_numeric($value)) { - if($i++ > 0) echo ", "; + if (is_numeric($value)) { + if ($i++ > 0) echo ", "; echo "'".$name."'"; } } @@ -1462,7 +1462,7 @@ function refreshList($name,$defaultRate=5, $refreshRates=Array(1, 2, 5, 10, 20, foreach ($refreshRates as $rate) { $selected = ($rate == $defaultRate)?' selected="selected"':''; - if($rate<60) + if ($rate<60) echo '<option value="'.$rate.'"'.$selected.'>'.sprintf(_ngettext('%d second', '%d seconds', $rate), $rate).'</option>'; else echo '<option value="'.$rate.'"'.$selected.'>'.sprintf(_ngettext('%d minute', '%d minutes', $rate/60), $rate/60).'</option>'; diff --git a/server_synchronize.php b/server_synchronize.php index 2cb6898..3412336 100644 --- a/server_synchronize.php +++ b/server_synchronize.php @@ -88,10 +88,10 @@ if ((isset($_REQUEST['submit_connect']))) { */ echo '<div class="error">'; - if(! $src_connection && $src_type != 'cur') { + if (! $src_connection && $src_type != 'cur') { echo __('Could not connect to the source') . '<br />'; } - if(! $trg_connection && $trg_type != 'cur'){ + if (! $trg_connection && $trg_type != 'cur'){ echo __('Could not connect to the target'); } echo '</div>'; diff --git a/server_variables.php b/server_variables.php index fbe7094..dcbe192 100644 --- a/server_variables.php +++ b/server_variables.php @@ -34,7 +34,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { // Send with correct charset header('Content-Type: text/html; charset=UTF-8'); - if(isset($_REQUEST['type'])) { + if (isset($_REQUEST['type'])) { switch($_REQUEST['type']) { case 'getval': $varValue = PMA_DBI_fetch_single_row('SHOW GLOBAL VARIABLES WHERE Variable_name="'.PMA_sqlAddslashes($_REQUEST['varName']).'";','NUM'); @@ -42,9 +42,9 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { break; case 'setval': $value = PMA_sqlAddslashes($_REQUEST['varValue']); - if(!is_numeric($value)) $value="'".$value."'"; + if (!is_numeric($value)) $value="'".$value."'"; - if(! preg_match("/[^a-zA-Z0-9_]+/",$_REQUEST['varName']) && PMA_DBI_query('SET GLOBAL '.$_REQUEST['varName'].' = '.$value)) + if (! preg_match("/[^a-zA-Z0-9_]+/",$_REQUEST['varName']) && PMA_DBI_query('SET GLOBAL '.$_REQUEST['varName'].' = '.$value)) // Some values are rounded down etc. $varValue = PMA_DBI_fetch_single_row('SHOW GLOBAL VARIABLES WHERE Variable_name="'.PMA_sqlAddslashes($_REQUEST['varName']).'";','NUM'); @@ -153,7 +153,7 @@ function formatVariable($name,$value) { global $VARIABLE_DOC_LINKS; if (is_numeric($value)) { - if(isset($VARIABLE_DOC_LINKS[$name][3]) && $VARIABLE_DOC_LINKS[$name][3]=='byte') + if (isset($VARIABLE_DOC_LINKS[$name][3]) && $VARIABLE_DOC_LINKS[$name][3]=='byte') return '<abbr title="'.PMA_formatNumber($value, 0).'">'.implode(' ',PMA_formatByteDown($value,3,3)).'</abbr>'; else return PMA_formatNumber($value, 0); } diff --git a/tbl_alter.php b/tbl_alter.php index 316c48e..807a39e 100644 --- a/tbl_alter.php +++ b/tbl_alter.php @@ -130,7 +130,7 @@ if (isset($_REQUEST['do_save_data'])) { } } - if( $GLOBALS['is_ajax_request'] == true) { + if ( $GLOBALS['is_ajax_request'] == true) { $extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query); PMA_ajaxResponse($message, $message->isSuccess(),$extra_data); } diff --git a/tbl_chart.php b/tbl_chart.php index 96befa7..b3589e3 100644 --- a/tbl_chart.php +++ b/tbl_chart.php @@ -94,13 +94,13 @@ url_query = '<?php echo $url_query;?>'; <input type="text" name="chartTitle" value="<?php echo __('Chart title'); ?>"> <?php $keys = array_keys($data[0]); $yaxis=-1; - if(count($keys)>1) { + if (count($keys)>1) { echo '<br>'; echo __('X-Axis:'); ?> <select name="chartXAxis"> <?php foreach ($keys as $idx=>$key) { - if($yaxis==-1 && ($idx==count($data[0])-1 || preg_match("/(date|time)/i",$key))) { + if ($yaxis==-1 && ($idx==count($data[0])-1 || preg_match("/(date|time)/i",$key))) { echo '<option value="'.$idx.'" selected>'.$key.'</option>'; $yaxis=$idx; } else { diff --git a/tbl_create.php b/tbl_create.php index 5259374..fb9c72f 100644 --- a/tbl_create.php +++ b/tbl_create.php @@ -216,7 +216,7 @@ if (isset($_REQUEST['do_save_data'])) { $message = PMA_Message::success(__('Table %1$s has been created.')); $message->addParam(PMA_backquote($db) . '.' . PMA_backquote($table)); - if($GLOBALS['is_ajax_request'] == true) { + if ($GLOBALS['is_ajax_request'] == true) { /** * construct the html for the newly created table's row to be appended @@ -296,7 +296,7 @@ if (isset($_REQUEST['do_save_data'])) { $new_table_string .= '<td> <dfn title="' . PMA_getCollationDescr($tbl_stats['Collation']) . '">'. $tbl_stats['Collation'] .'</dfn></td>' . "\n"; - if($is_show_stats) { + if ($is_show_stats) { $new_table_string .= '<td class="value"> <a href="tbl_structure.php' . PMA_generate_common_url($tbl_url_params) . '#showusage" >' . $formatted_size . ' ' . $unit . '</a> </td>' . "\n" ; $new_table_string .= '<td class="value">' . $overhead . '</td>' . "\n" ; } @@ -342,7 +342,7 @@ if (isset($_REQUEST['do_save_data'])) { */ // This div is used to show the content(eg: create table form with more columns) fetched with AJAX subsequently. -if($GLOBALS['is_ajax_request'] != true) { +if ($GLOBALS['is_ajax_request'] != true) { echo('<div id="create_table_div">'); } @@ -350,7 +350,7 @@ require './libraries/tbl_properties.inc.php'; // Displays the footer require './libraries/footer.inc.php'; -if($GLOBALS['is_ajax_request'] != true) { +if ($GLOBALS['is_ajax_request'] != true) { echo('</div>'); } ?> diff --git a/tbl_indexes.php b/tbl_indexes.php index 39205f2..84555d8 100644 --- a/tbl_indexes.php +++ b/tbl_indexes.php @@ -98,7 +98,7 @@ if (isset($_REQUEST['do_save_data'])) { $message = PMA_Message::success(__('Table %1$s has been altered successfully')); $message->addParam($table); - if( $GLOBALS['is_ajax_request'] == true) { + if ( $GLOBALS['is_ajax_request'] == true) { $extra_data['index_table'] = PMA_Index::getView($table, $db); $extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query); PMA_ajaxResponse($message, $message->isSuccess(), $extra_data); @@ -108,7 +108,7 @@ if (isset($_REQUEST['do_save_data'])) { require './tbl_structure.php'; exit; } else { - if( $GLOBALS['is_ajax_request'] == true) { + if ( $GLOBALS['is_ajax_request'] == true) { $extra_data['error'] = $error; PMA_ajaxResponse($error,false); } diff --git a/tbl_operations.php b/tbl_operations.php index 6cc913d..11021ba 100644 --- a/tbl_operations.php +++ b/tbl_operations.php @@ -70,14 +70,14 @@ $table_alters = array(); /** * If the table has to be moved to some other database */ -if(isset($_REQUEST['submit_move']) || isset($_REQUEST['submit_copy'])) { +if (isset($_REQUEST['submit_move']) || isset($_REQUEST['submit_copy'])) { $_message = ''; require_once './tbl_move_copy.php'; } /** * If the table has to be maintained */ -if(isset($_REQUEST['table_maintenance'])) { +if (isset($_REQUEST['table_maintenance'])) { require_once './sql.php'; unset($result); } diff --git a/tbl_replace.php b/tbl_replace.php index ab20d29..48d01fc 100644 --- a/tbl_replace.php +++ b/tbl_replace.php @@ -312,7 +312,7 @@ if ($is_insert && count($value_sets) > 0) { // Note: logic passes here for inline edit $message = PMA_Message::success(__('No change')); $active_page = $goto_include; - if(! $GLOBALS['is_ajax_request'] == true) { + if (! $GLOBALS['is_ajax_request'] == true) { require_once './libraries/header.inc.php'; } require './' . PMA_securePath($goto_include); @@ -404,7 +404,7 @@ if (! empty($error_messages)) { } unset($error_messages, $warning_messages, $total_affected_rows, $last_messages, $last_message); -if($GLOBALS['is_ajax_request'] == true) { +if ($GLOBALS['is_ajax_request'] == true) { /**Get the total row count of the table*/ $extra_data['row_count'] = PMA_Table::countRecords($_REQUEST['db'],$_REQUEST['table']); $extra_data['sql_query'] = PMA_showMessage(NULL, $GLOBALS['display_query']); diff --git a/tbl_structure.php b/tbl_structure.php index 3cad9d8..afac23f 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -188,7 +188,7 @@ $i = 0; <form method="post" action="tbl_structure.php" name="fieldsForm" id="fieldsForm" <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? ' class="ajax"' : '');?>> <?php echo PMA_generate_common_hidden_inputs($db, $table); echo '<input type="hidden" name="table_type" value='; - if($db_is_information_schema) { + if ($db_is_information_schema) { echo '"information_schema" />'; } else if ($tbl_is_view) { echo '"view" />'; @@ -257,7 +257,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { // for the case ENUM('–','“') $type = htmlspecialchars($type); - if(strlen($type) > $GLOBALS['cfg']['LimitChars']) { + if (strlen($type) > $GLOBALS['cfg']['LimitChars']) { $type = '<abbr title="' . $type . '">' . substr($type, 0, $GLOBALS['cfg']['LimitChars']) . '</abbr>'; } @@ -504,8 +504,8 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { </div> <div <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? ' class="action_primary"' : ''); ?>> <?php - if(isset($primary_enabled)) { - if($primary_enabled) { ?> + if (isset($primary_enabled)) { + if ($primary_enabled) { ?> <a href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ($primary ? ' DROP PRIMARY KEY,' : '') . ' ADD PRIMARY KEY(' . PMA_backquote($row['Field']) . ')'); ?>&message_to_show=<?php echo urlencode(sprintf(__('A primary key has been added on %s'), htmlspecialchars($row['Field']))); ?>"> <?php echo $hidden_titles['Primary']; ?> </a> @@ -517,8 +517,8 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { </div> <div class="action_unique"> <?php - if(isset($unique_enabled)) { - if($unique_enabled) { ?> + if (isset($unique_enabled)) { + if ($unique_enabled) { ?> <a href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' ADD UNIQUE(' . PMA_backquote($row['Field']) . ')'); ?>&message_to_show=<?php echo urlencode(sprintf(__('An index has been added on %s'), htmlspecialchars($row['Field']))); ?>"> <?php echo $hidden_titles['Unique']; ?> </a> @@ -530,8 +530,8 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { </div> <div class="action_index"> <?php - if(isset($index_enabled)) { - if($index_enabled) { ?> + if (isset($index_enabled)) { + if ($index_enabled) { ?> <a href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' ADD INDEX(' . PMA_backquote($row['Field']) . ')'); ?>&message_to_show=<?php echo urlencode(sprintf(__('An index has been added on %s'), htmlspecialchars($row['Field']))); ?>"> <?php echo $hidden_titles['Index']; ?> </a> @@ -543,8 +543,8 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { </div> <div class="action_spatial"> <?php - if(isset($spatial_enabled)) { - if($spatial_enabled) { ?> + if (isset($spatial_enabled)) { + if ($spatial_enabled) { ?> <a href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' ADD SPATIAL(' . PMA_backquote($row['Field']) . ')'); ?>&message_to_show=<?php echo urlencode(sprintf(__('An index has been added on %s'), htmlspecialchars($row['Field']))); ?>"> <?php echo $hidden_titles['Spatial']; ?> </a> @@ -556,8 +556,8 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { </div> <div class="action_fulltext"> <?php - if(isset($fulltext_enabled)) { - if($fulltext_enabled) { ?> + if (isset($fulltext_enabled)) { + if ($fulltext_enabled) { ?> <a href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' ADD FULLTEXT(' . PMA_backquote($row['Field']) . ')'); ?>&message_to_show=<?php echo urlencode(sprintf(__('An index has been added on %s'), htmlspecialchars($row['Field']))); ?>"> <?php echo $hidden_titles['IdxFulltext']; ?> </a> @@ -655,7 +655,7 @@ if (! $tbl_is_view && ! $db_is_information_schema) { echo PMA_showMySQLDocu('Extending_MySQL', 'procedure_analyse') . "\n"; - if(PMA_Tracker::isActive()) + if (PMA_Tracker::isActive()) { echo '<a href="tbl_tracking.php?' . $url_query . '">'; diff --git a/tbl_tracking.php b/tbl_tracking.php index edfc237..b249f4c 100644 --- a/tbl_tracking.php +++ b/tbl_tracking.php @@ -27,7 +27,7 @@ if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) { } if ($_REQUEST['logtype'] == 'schema') { $selection_schema = true; - } elseif($_REQUEST['logtype'] == 'data') { + } elseif ($_REQUEST['logtype'] == 'data') { $selection_data = true; } else { $selection_both = true; @@ -369,13 +369,13 @@ if (isset($_REQUEST['snapshot'])) { */ if (isset($_REQUEST['report']) && (isset($_REQUEST['delete_ddlog']) || isset($_REQUEST['delete_dmlog']))) { - if(isset($_REQUEST['delete_ddlog'])){ + if (isset($_REQUEST['delete_ddlog'])){ // Delete ddlog row data $delete_id = $_REQUEST['delete_ddlog']; // Only in case of valable id - if($delete_id == (int)$delete_id){ + if ($delete_id == (int)$delete_id){ unset($data['ddlog'][$delete_id]); if (PMA_Tracker::changeTrackingData($_REQUEST['db'], $_REQUEST['table'], $_REQUEST['version'], 'DDL', $data['ddlog'])) @@ -386,13 +386,13 @@ if (isset($_REQUEST['report']) && (isset($_REQUEST['delete_ddlog']) || isset($_R } } - if(isset($_REQUEST['delete_dmlog'])){ + if (isset($_REQUEST['delete_dmlog'])){ // Delete dmlog row data $delete_id = $_REQUEST['delete_dmlog']; // Only in case of valable id - if($delete_id == (int)$delete_id){ + if ($delete_id == (int)$delete_id){ unset($data['dmlog'][$delete_id]); if (PMA_Tracker::changeTrackingData($_REQUEST['db'], $_REQUEST['table'], $_REQUEST['version'], 'DML', $data['dmlog'])) diff --git a/user_password.php b/user_password.php index a4eeffe..3ca3442 100644 --- a/user_password.php +++ b/user_password.php @@ -56,7 +56,7 @@ if (isset($_REQUEST['nopass'])) { $password = $_REQUEST['pma_pw']; } - if($GLOBALS['is_ajax_request'] == true && $_error == true) { + if ($GLOBALS['is_ajax_request'] == true && $_error == true) { /** * If in an Ajax request, we don't need to show the rest of the page */ @@ -95,7 +95,7 @@ if (isset($_REQUEST['nopass'])) { $message = PMA_Message::success(__('The profile has been updated.')); - if($GLOBALS['is_ajax_request'] == true) { + if ($GLOBALS['is_ajax_request'] == true) { $extra_data['sql_query'] = PMA_showMessage($message, $sql_query, 'success'); PMA_ajaxResponse($message, true, $extra_data); } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11675-g3629893
by Michal Čihař 22 Jul '11

22 Jul '11

The branch, master has been updated via 36298932e2a80bbd207b3b86475033f8b728a0b4 (commit) from 84c6bd7284968789548b6ac53441774307ab13eb (commit) - Log ----------------------------------------------------------------- commit 36298932e2a80bbd207b3b86475033f8b728a0b4 Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Jul 22 09:07:57 2011 +0200 Spacing around if ----------------------------------------------------------------------- Summary of changes: sql.php | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/sql.php b/sql.php index a954286..657311c 100644 --- a/sql.php +++ b/sql.php @@ -17,7 +17,7 @@ require_once './libraries/bookmark.lib.php'; $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js'; $GLOBALS['js_include'][] = 'tbl_change.js'; -if(isset($_SESSION['profiling'])) { +if (isset($_SESSION['profiling'])) { $GLOBALS['js_include'][] = 'highcharts/highcharts.js'; /* Files required for chart exporting */ $GLOBALS['js_include'][] = 'highcharts/exporting.js'; @@ -108,7 +108,7 @@ if (isset($_REQUEST['get_relational_values']) && $_REQUEST['get_relational_value * * Logic taken from libraries/display_tbl_lib.php */ -if(isset($_REQUEST['get_enum_values']) && $_REQUEST['get_enum_values'] == true) { +if (isset($_REQUEST['get_enum_values']) && $_REQUEST['get_enum_values'] == true) { $field_info_query = 'SHOW FIELDS FROM `' . $db . '`.`' . $table . '` LIKE \'' . $_REQUEST['column'] . '\' ;'; $field_info_result = PMA_DBI_fetch_result($field_info_query, null, null, null, PMA_DBI_QUERY_STORE); @@ -120,7 +120,7 @@ if(isset($_REQUEST['get_enum_values']) && $_REQUEST['get_enum_values'] == true) $dropdown = '<option value=""> </option>'; foreach ($values as $value) { $dropdown .= '<option value="' . htmlspecialchars($value) . '"'; - if($value == $_REQUEST['curr_value']) { + if ($value == $_REQUEST['curr_value']) { $dropdown .= ' selected="selected"'; } $dropdown .= '>' . $value . '</option>'; @@ -135,7 +135,7 @@ if(isset($_REQUEST['get_enum_values']) && $_REQUEST['get_enum_values'] == true) /** * Find possible values for set fields during inline edit. */ -if(isset($_REQUEST['get_set_values']) && $_REQUEST['get_set_values'] == true) { +if (isset($_REQUEST['get_set_values']) && $_REQUEST['get_set_values'] == true) { $field_info_query = 'SHOW FIELDS FROM `' . $db . '`.`' . $table . '` LIKE \'' . $_REQUEST['column'] . '\' ;'; $field_info_result = PMA_DBI_fetch_result($field_info_query, null, null, null, PMA_DBI_QUERY_STORE); @@ -148,7 +148,7 @@ if(isset($_REQUEST['get_set_values']) && $_REQUEST['get_set_values'] == true) { $select = ''; foreach ($values as $value) { $select .= '<option value="' . htmlspecialchars($value) . '"'; - if(in_array($value, $selected_values, true)) { + if (in_array($value, $selected_values, true)) { $select .= ' selected="selected"'; } $select .= '>' . $value . '</option>'; @@ -164,7 +164,7 @@ if(isset($_REQUEST['get_set_values']) && $_REQUEST['get_set_values'] == true) { /** * Check ajax request to set the column order */ -if(isset($_REQUEST['set_col_prefs']) && $_REQUEST['set_col_prefs'] == true) { +if (isset($_REQUEST['set_col_prefs']) && $_REQUEST['set_col_prefs'] == true) { $pmatable = new PMA_Table($table, $db); // set column order @@ -459,7 +459,7 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) { // If a stored procedure was called, there may be more results that are // queued up and waiting to be flushed from the buffer. So let's do that. while (true) { - if(! PMA_DBI_more_results()) { + if (! PMA_DBI_more_results()) { break; } PMA_DBI_next_result(); @@ -478,7 +478,7 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) { $active_page = $goto; $message = PMA_Message::rawError($error); - if( $GLOBALS['is_ajax_request'] == true) { + if ($GLOBALS['is_ajax_request'] == true) { PMA_ajaxResponse($message, false); } @@ -693,7 +693,7 @@ if (0 == $num_rows || $is_affected) { $message->addMessage(')'); } - if( $GLOBALS['is_ajax_request'] == true) { + if ($GLOBALS['is_ajax_request'] == true) { /** * If we are in inline editing, we need to process the relational and @@ -703,7 +703,7 @@ if (0 == $num_rows || $is_affected) { * Logic taken from libraries/display_tbl.lib.php */ - if(isset($_REQUEST['rel_fields_list']) && $_REQUEST['rel_fields_list'] != '') { + if (isset($_REQUEST['rel_fields_list']) && $_REQUEST['rel_fields_list'] != '') { //handle relations work here for updated row. require_once './libraries/relation.lib.php'; @@ -767,7 +767,7 @@ if (0 == $num_rows || $is_affected) { } } - if(isset($_REQUEST['do_transformations']) && $_REQUEST['do_transformations'] == true ) { + if (isset($_REQUEST['do_transformations']) && $_REQUEST['do_transformations'] == true ) { require_once './libraries/transformations.lib.php'; //if some posted fields need to be transformed, generate them here. $mime_map = PMA_getMIME($db, $table); @@ -859,7 +859,7 @@ if (0 == $num_rows || $is_affected) { else { //If we are retrieving the full value of a truncated field or the original // value of a transformed field, show it here and exit - if( $GLOBALS['inline_edit'] == true && $GLOBALS['cfg']['AjaxEnable']) { + if ($GLOBALS['inline_edit'] == true && $GLOBALS['cfg']['AjaxEnable']) { $row = PMA_DBI_fetch_row($result); $extra_data = array(); $extra_data['value'] = $row[0]; @@ -880,7 +880,7 @@ else { unset($message); - if( ! $GLOBALS['is_ajax_request'] || ! $GLOBALS['cfg']['AjaxEnable']) { + if (! $GLOBALS['is_ajax_request'] || ! $GLOBALS['cfg']['AjaxEnable']) { if (strlen($table)) { require './libraries/tbl_common.php'; $url_query .= '&goto=tbl_sql.php&back=tbl_sql.php'; @@ -912,7 +912,7 @@ else { $fields_cnt = count($fields_meta); } - if( ! $GLOBALS['is_ajax_request']) { + if (! $GLOBALS['is_ajax_request']) { //begin the sqlqueryresults div here. container div echo '<div id="sqlqueryresults"'; if ($GLOBALS['cfg']['AjaxEnable']) { @@ -1054,7 +1054,7 @@ window.onload = function() <?php } // end print case - if( $GLOBALS['is_ajax_request'] != true) { + if ($GLOBALS['is_ajax_request'] != true) { echo '</div>'; // end sqlqueryresults div } } // end rows returned @@ -1062,7 +1062,7 @@ window.onload = function() /** * Displays the footer */ -if(! isset($_REQUEST['table_maintenance'])) { +if (! isset($_REQUEST['table_maintenance'])) { require './libraries/footer.inc.php'; } ?> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11674-g84c6bd7
by Michal Čihař 22 Jul '11

22 Jul '11

The branch, master has been updated via 84c6bd7284968789548b6ac53441774307ab13eb (commit) via 12a31298bde7487b6306c87a737f32d8f715f4d2 (commit) via 297bd675cc24299a0ea782829a54f3bdde60b92b (commit) via 7b17fca511b15e59cc6bce44c349909a358b813c (commit) via ea918f98ffa7c7d8e0a78897e6b105c5bba5aa80 (commit) from e501b557de386e6bc1e789126285452a1725bf20 (commit) - Log ----------------------------------------------------------------- commit 84c6bd7284968789548b6ac53441774307ab13eb Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Jul 22 09:06:37 2011 +0200 Fix indentation commit 12a31298bde7487b6306c87a737f32d8f715f4d2 Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Jul 22 09:05:25 2011 +0200 Spacing around if commit 297bd675cc24299a0ea782829a54f3bdde60b92b Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Jul 22 09:02:04 2011 +0200 Wrap long line commit 7b17fca511b15e59cc6bce44c349909a358b813c Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Jul 22 09:01:40 2011 +0200 Add die() calls are on places which should not happen commit ea918f98ffa7c7d8e0a78897e6b105c5bba5aa80 Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Jul 22 08:59:07 2011 +0200 Add file comment ----------------------------------------------------------------------- Summary of changes: export.php | 332 ++++++++++++++++++++++++++++++------------------------------ 1 files changed, 168 insertions(+), 164 deletions(-) diff --git a/export.php b/export.php index f5a985a..36c1d58 100644 --- a/export.php +++ b/export.php @@ -1,7 +1,7 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * @todo too much die here, or? + * Main export hanling code * @package phpMyAdmin */ @@ -15,7 +15,11 @@ require_once './libraries/plugin_interface.lib.php'; PMA_checkParameters(array('what', 'export_type')); // Scan plugins -$export_list = PMA_getPlugins('./libraries/export/', array('export_type' => $export_type, 'single_table' => isset($single_table))); +$export_list = PMA_getPlugins( + './libraries/export/', + array( + 'export_type' => $export_type, + 'single_table' => isset($single_table))); // Backward compatbility $type = $what; @@ -43,7 +47,7 @@ $save_on_server = false; $buffer_needed = false; // Is it a quick or custom export? -if($_REQUEST['quick_or_custom'] == 'quick') { +if ($_REQUEST['quick_or_custom'] == 'quick') { $quick_export = true; } else { $quick_export = false; @@ -58,7 +62,7 @@ if ($_REQUEST['output_format'] == 'astext') { $buffer_needed = true; } if (($quick_export && !empty($_REQUEST['quick_export_onserver'])) || (!$quick_export && !empty($_REQUEST['onserver']))) { - if($quick_export) { + if ($quick_export) { $onserver = $_REQUEST['quick_export_onserver']; } else { $onserver = $_REQUEST['onserver']; @@ -279,7 +283,7 @@ if ($asfile) { $extension_start_pos = strlen($filename) - strlen($export_list[$type]['extension']) - 1; $user_extension = substr($filename, $extension_start_pos, strlen($filename)); $required_extension = "." . $export_list[$type]['extension']; - if(strtolower($user_extension) != $required_extension) { + if (strtolower($user_extension) != $required_extension) { $filename .= $required_extension; } $mime_type = $export_list[$type]['mime_type']; @@ -394,9 +398,9 @@ if (!$save_on_server) { } // Convert the multiple select elements from an array to a string - if($export_type == 'server' && isset($_REQUEST['db_select'])) { + if ($export_type == 'server' && isset($_REQUEST['db_select'])) { $_REQUEST['db_select'] = implode(",", $_REQUEST['db_select']); - } elseif($export_type == 'database' && isset($_REQUEST['table_select'])) { + } elseif ($export_type == 'database' && isset($_REQUEST['table_select'])) { $_REQUEST['table_select'] = implode(",", $_REQUEST['table_select']); } @@ -419,123 +423,182 @@ if (!$save_on_server) { // need exceptions here :-) do { -// Add possibly some comments to export -if (!PMA_exportHeader()) { - break; -} - -// Will we need relation & co. setup? -$do_relation = isset($GLOBALS[$what . '_relation']); -$do_comments = isset($GLOBALS[$what . '_include_comments']); -$do_mime = isset($GLOBALS[$what . '_mime']); -if ($do_relation || $do_comments || $do_mime) { - $cfgRelation = PMA_getRelationsParam(); -} -if ($do_mime) { - require_once './libraries/transformations.lib.php'; -} - -// Include dates in export? -$do_dates = isset($GLOBALS[$what . '_dates']); + // Add possibly some comments to export + if (!PMA_exportHeader()) { + break; + } -/** - * Builds the dump - */ -// Gets the number of tables if a dump of a database has been required -if ($export_type == 'server') { - if (isset($db_select)) { - $tmp_select = implode($db_select, '|'); - $tmp_select = '|' . $tmp_select . '|'; + // Will we need relation & co. setup? + $do_relation = isset($GLOBALS[$what . '_relation']); + $do_comments = isset($GLOBALS[$what . '_include_comments']); + $do_mime = isset($GLOBALS[$what . '_mime']); + if ($do_relation || $do_comments || $do_mime) { + $cfgRelation = PMA_getRelationsParam(); } - // Walk over databases - foreach ($GLOBALS['pma']->databases as $current_db) { - if ((isset($tmp_select) && strpos(' ' . $tmp_select, '|' . $current_db . '|')) - || ! isset($tmp_select)) { - if (!PMA_exportDBHeader($current_db)) { - break 2; - } - if (!PMA_exportDBCreate($current_db)) { - break 2; - } - if (function_exists('PMA_exportRoutines') && strpos($GLOBALS['sql_structure_or_data'], 'structure') !== false && isset($GLOBALS['sql_procedure_function'])) { - PMA_exportRoutines($current_db); - } + if ($do_mime) { + require_once './libraries/transformations.lib.php'; + } + + // Include dates in export? + $do_dates = isset($GLOBALS[$what . '_dates']); - $tables = PMA_DBI_get_tables($current_db); - $views = array(); - foreach ($tables as $table) { - // if this is a view, collect it for later; views must be exported - // after the tables - $is_view = PMA_Table::isView($current_db, $table); - if ($is_view) { - $views[] = $table; + /** + * Builds the dump + */ + // Gets the number of tables if a dump of a database has been required + if ($export_type == 'server') { + if (isset($db_select)) { + $tmp_select = implode($db_select, '|'); + $tmp_select = '|' . $tmp_select . '|'; + } + // Walk over databases + foreach ($GLOBALS['pma']->databases as $current_db) { + if ((isset($tmp_select) && strpos(' ' . $tmp_select, '|' . $current_db . '|')) + || ! isset($tmp_select)) { + if (!PMA_exportDBHeader($current_db)) { + break 2; } - if ($GLOBALS[$what . '_structure_or_data'] == 'structure' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') { - // for a view, export a stand-in definition of the table - // to resolve view dependencies - if (!PMA_exportStructure($current_db, $table, $crlf, $err_url, $do_relation, $do_comments, $do_mime, $do_dates, $is_view ? 'stand_in' : 'create_table', $export_type)) { - break 3; - } + if (!PMA_exportDBCreate($current_db)) { + break 2; } - // if this is a view or a merge table, don't export data - if (($GLOBALS[$what . '_structure_or_data'] == 'data' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') && !($is_view || PMA_Table::isMerge($current_db, $table))) { - $local_query = 'SELECT * FROM ' . PMA_backquote($current_db) . '.' . PMA_backquote($table); - if (!PMA_exportData($current_db, $table, $crlf, $err_url, $local_query)) { - break 3; + if (function_exists('PMA_exportRoutines') && strpos($GLOBALS['sql_structure_or_data'], 'structure') !== false && isset($GLOBALS['sql_procedure_function'])) { + PMA_exportRoutines($current_db); + } + + $tables = PMA_DBI_get_tables($current_db); + $views = array(); + foreach ($tables as $table) { + // if this is a view, collect it for later; views must be exported + // after the tables + $is_view = PMA_Table::isView($current_db, $table); + if ($is_view) { + $views[] = $table; + } + if ($GLOBALS[$what . '_structure_or_data'] == 'structure' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') { + // for a view, export a stand-in definition of the table + // to resolve view dependencies + if (!PMA_exportStructure($current_db, $table, $crlf, $err_url, $do_relation, $do_comments, $do_mime, $do_dates, $is_view ? 'stand_in' : 'create_table', $export_type)) { + break 3; + } + } + // if this is a view or a merge table, don't export data + if (($GLOBALS[$what . '_structure_or_data'] == 'data' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') && !($is_view || PMA_Table::isMerge($current_db, $table))) { + $local_query = 'SELECT * FROM ' . PMA_backquote($current_db) . '.' . PMA_backquote($table); + if (!PMA_exportData($current_db, $table, $crlf, $err_url, $local_query)) { + break 3; + } + } + // now export the triggers (needs to be done after the data because + // triggers can modify already imported tables) + if ($GLOBALS[$what . '_structure_or_data'] == 'structure' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') { + if (!PMA_exportStructure($current_db, $table, $crlf, $err_url, $do_relation, $do_comments, $do_mime, $do_dates, 'triggers', $export_type)) { + break 2; + } } } - // now export the triggers (needs to be done after the data because - // triggers can modify already imported tables) - if ($GLOBALS[$what . '_structure_or_data'] == 'structure' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') { - if (!PMA_exportStructure($current_db, $table, $crlf, $err_url, $do_relation, $do_comments, $do_mime, $do_dates, 'triggers', $export_type)) { - break 2; + foreach ($views as $view) { + // no data export for a view + if ($GLOBALS[$what . '_structure_or_data'] == 'structure' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') { + if (!PMA_exportStructure($current_db, $view, $crlf, $err_url, $do_relation, $do_comments, $do_mime, $do_dates, 'create_view', $export_type)) { + break 3; + } } } + if (!PMA_exportDBFooter($current_db)) { + break 2; + } } - foreach ($views as $view) { - // no data export for a view - if ($GLOBALS[$what . '_structure_or_data'] == 'structure' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') { - if (!PMA_exportStructure($current_db, $view, $crlf, $err_url, $do_relation, $do_comments, $do_mime, $do_dates, 'create_view', $export_type)) { - break 3; - } + } + } elseif ($export_type == 'database') { + if (!PMA_exportDBHeader($db)) { + break; + } + + if (function_exists('PMA_exportRoutines') && strpos($GLOBALS['sql_structure_or_data'], 'structure') !== false && isset($GLOBALS['sql_procedure_function'])) { + PMA_exportRoutines($db); + } + + $i = 0; + $views = array(); + // $tables contains the choices from the user (via $table_select) + foreach ($tables as $table) { + // if this is a view, collect it for later; views must be exported after + // the tables + $is_view = PMA_Table::isView($db, $table); + if ($is_view) { + $views[] = $table; + } + if ($GLOBALS[$what . '_structure_or_data'] == 'structure' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') { + // for a view, export a stand-in definition of the table + // to resolve view dependencies + if (!PMA_exportStructure($db, $table, $crlf, $err_url, $do_relation, $do_comments, $do_mime, $do_dates, $is_view ? 'stand_in' : 'create_table', $export_type)) { + break 2; } } - if (!PMA_exportDBFooter($current_db)) { - break 2; + // if this is a view or a merge table, don't export data + if (($GLOBALS[$what . '_structure_or_data'] == 'data' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') && !($is_view || PMA_Table::isMerge($db, $table))) { + $local_query = 'SELECT * FROM ' . PMA_backquote($db) . '.' . PMA_backquote($table); + if (!PMA_exportData($db, $table, $crlf, $err_url, $local_query)) { + break 2; + } + } + // now export the triggers (needs to be done after the data because + // triggers can modify already imported tables) + if ($GLOBALS[$what . '_structure_or_data'] == 'structure' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') { + if (!PMA_exportStructure($db, $table, $crlf, $err_url, $do_relation, $do_comments, $do_mime, $do_dates, 'triggers', $export_type)) { + break 2; + } + } + } + foreach ($views as $view) { + // no data export for a view + if ($GLOBALS[$what . '_structure_or_data'] == 'structure' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') { + if (!PMA_exportStructure($db, $view, $crlf, $err_url, $do_relation, $do_comments, $do_mime, $do_dates, 'create_view', $export_type)) { + break 2; + } } } - } -} elseif ($export_type == 'database') { - if (!PMA_exportDBHeader($db)) { - break; - } - if (function_exists('PMA_exportRoutines') && strpos($GLOBALS['sql_structure_or_data'], 'structure') !== false && isset($GLOBALS['sql_procedure_function'])) { - PMA_exportRoutines($db); - } + if (!PMA_exportDBFooter($db)) { + break; + } + } else { + if (!PMA_exportDBHeader($db)) { + break; + } + // We export just one table + // $allrows comes from the form when "Dump all rows" has been selected + if ($allrows == '0' && $limit_to > 0 && $limit_from >= 0) { + $add_query = ' LIMIT ' + . (($limit_from > 0) ? $limit_from . ', ' : '') + . $limit_to; + } else { + $add_query = ''; + } - $i = 0; - $views = array(); - // $tables contains the choices from the user (via $table_select) - foreach ($tables as $table) { - // if this is a view, collect it for later; views must be exported after - // the tables $is_view = PMA_Table::isView($db, $table); - if ($is_view) { - $views[] = $table; - } if ($GLOBALS[$what . '_structure_or_data'] == 'structure' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') { - // for a view, export a stand-in definition of the table - // to resolve view dependencies - if (!PMA_exportStructure($db, $table, $crlf, $err_url, $do_relation, $do_comments, $do_mime, $do_dates, $is_view ? 'stand_in' : 'create_table', $export_type)) { - break 2; + if (!PMA_exportStructure($db, $table, $crlf, $err_url, $do_relation, $do_comments, $do_mime, $do_dates, $is_view ? 'create_view' : 'create_table', $export_type)) { + break; } } - // if this is a view or a merge table, don't export data - if (($GLOBALS[$what . '_structure_or_data'] == 'data' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') && !($is_view || PMA_Table::isMerge($db, $table))) { - $local_query = 'SELECT * FROM ' . PMA_backquote($db) . '.' . PMA_backquote($table); + // If this is an export of a single view, we have to export data; + // for example, a PDF report + // if it is a merge table, no data is exported + if (($GLOBALS[$what . '_structure_or_data'] == 'data' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') && ! PMA_Table::isMerge($db, $table)) { + if (!empty($sql_query)) { + // only preg_replace if needed + if (!empty($add_query)) { + // remove trailing semicolon before adding a LIMIT + $sql_query = preg_replace('%;\s*$%', '', $sql_query); + } + $local_query = $sql_query . $add_query; + PMA_DBI_select_db($db); + } else { + $local_query = 'SELECT * FROM ' . PMA_backquote($db) . '.' . PMA_backquote($table) . $add_query; + } if (!PMA_exportData($db, $table, $crlf, $err_url, $local_query)) { - break 2; + break; } } // now export the triggers (needs to be done after the data because @@ -545,72 +608,13 @@ if ($export_type == 'server') { break 2; } } - } - foreach ($views as $view) { - // no data export for a view - if ($GLOBALS[$what . '_structure_or_data'] == 'structure' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') { - if (!PMA_exportStructure($db, $view, $crlf, $err_url, $do_relation, $do_comments, $do_mime, $do_dates, 'create_view', $export_type)) { - break 2; - } - } - } - - if (!PMA_exportDBFooter($db)) { - break; - } -} else { - if (!PMA_exportDBHeader($db)) { - break; - } - // We export just one table - // $allrows comes from the form when "Dump all rows" has been selected - if ($allrows == '0' && $limit_to > 0 && $limit_from >= 0) { - $add_query = ' LIMIT ' - . (($limit_from > 0) ? $limit_from . ', ' : '') - . $limit_to; - } else { - $add_query = ''; - } - - $is_view = PMA_Table::isView($db, $table); - if ($GLOBALS[$what . '_structure_or_data'] == 'structure' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') { - if (!PMA_exportStructure($db, $table, $crlf, $err_url, $do_relation, $do_comments, $do_mime, $do_dates, $is_view ? 'create_view' : 'create_table', $export_type)) { + if (!PMA_exportDBFooter($db)) { break; } } - // If this is an export of a single view, we have to export data; - // for example, a PDF report - // if it is a merge table, no data is exported - if (($GLOBALS[$what . '_structure_or_data'] == 'data' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') && ! PMA_Table::isMerge($db, $table)) { - if (!empty($sql_query)) { - // only preg_replace if needed - if (!empty($add_query)) { - // remove trailing semicolon before adding a LIMIT - $sql_query = preg_replace('%;\s*$%', '', $sql_query); - } - $local_query = $sql_query . $add_query; - PMA_DBI_select_db($db); - } else { - $local_query = 'SELECT * FROM ' . PMA_backquote($db) . '.' . PMA_backquote($table) . $add_query; - } - if (!PMA_exportData($db, $table, $crlf, $err_url, $local_query)) { - break; - } - } - // now export the triggers (needs to be done after the data because - // triggers can modify already imported tables) - if ($GLOBALS[$what . '_structure_or_data'] == 'structure' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') { - if (!PMA_exportStructure($db, $table, $crlf, $err_url, $do_relation, $do_comments, $do_mime, $do_dates, 'triggers', $export_type)) { - break 2; - } - } - if (!PMA_exportDBFooter($db)) { + if (!PMA_exportFooter()) { break; } -} -if (!PMA_exportFooter()) { - break; -} } while (false); // End of fake loop hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11669-ge501b55
by Michal Čihař 22 Jul '11

22 Jul '11

The branch, master has been updated via e501b557de386e6bc1e789126285452a1725bf20 (commit) from 1b57acfa8b7fb11ec63c474e848069a9bde2b07a (commit) - Log ----------------------------------------------------------------- commit e501b557de386e6bc1e789126285452a1725bf20 Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Jul 22 08:56:51 2011 +0200 Wrap long lines ----------------------------------------------------------------------- Summary of changes: server_privileges.php | 145 +++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 116 insertions(+), 29 deletions(-) diff --git a/server_privileges.php b/server_privileges.php index a184682..e2f19a9 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -186,37 +186,124 @@ function PMA_rangeOfUsers($initial = '') function PMA_extractPrivInfo($row = '', $enableHTML = false) { $grants = array( - array('Select_priv', 'SELECT', __('Allows reading data.')), - array('Insert_priv', 'INSERT', __('Allows inserting and replacing data.')), - array('Update_priv', 'UPDATE', __('Allows changing data.')), - array('Delete_priv', 'DELETE', __('Allows deleting data.')), - array('Create_priv', 'CREATE', __('Allows creating new databases and tables.')), - array('Drop_priv', 'DROP', __('Allows dropping databases and tables.')), - array('Reload_priv', 'RELOAD', __('Allows reloading server settings and flushing the server\'s caches.')), - array('Shutdown_priv', 'SHUTDOWN', __('Allows shutting down the server.')), - array('Process_priv', 'PROCESS', __('Allows viewing processes of all users')), - array('File_priv', 'FILE', __('Allows importing data from and exporting data into files.')), - array('References_priv', 'REFERENCES', __('Has no effect in this MySQL version.')), - array('Index_priv', 'INDEX', __('Allows creating and dropping indexes.')), - array('Alter_priv', 'ALTER', __('Allows altering the structure of existing tables.')), - array('Show_db_priv', 'SHOW DATABASES', __('Gives access to the complete list of databases.')), - array('Super_priv', 'SUPER', __('Allows connecting, even if maximum number of connections is reached; required for most administrative operations like setting global variables or killing threads of other users.')), - array('Create_tmp_table_priv', 'CREATE TEMPORARY TABLES', __('Allows creating temporary tables.')), - array('Lock_tables_priv', 'LOCK TABLES', __('Allows locking tables for the current thread.')), - array('Repl_slave_priv', 'REPLICATION SLAVE', __('Needed for the replication slaves.')), - array('Repl_client_priv', 'REPLICATION CLIENT', __('Allows the user to ask where the slaves / masters are.')), - array('Create_view_priv', 'CREATE VIEW', __('Allows creating new views.')), - array('Event_priv', 'EVENT', __('Allows to set up events for the event scheduler')), - array('Trigger_priv', 'TRIGGER', __('Allows creating and dropping triggers')), + array( + 'Select_priv', + 'SELECT', + __('Allows reading data.')), + array( + 'Insert_priv', + 'INSERT', + __('Allows inserting and replacing data.')), + array( + 'Update_priv', + 'UPDATE', + __('Allows changing data.')), + array( + 'Delete_priv', + 'DELETE', + __('Allows deleting data.')), + array( + 'Create_priv', + 'CREATE', + __('Allows creating new databases and tables.')), + array( + 'Drop_priv', + 'DROP', + __('Allows dropping databases and tables.')), + array( + 'Reload_priv', + 'RELOAD', + __('Allows reloading server settings and flushing the server\'s caches.')), + array( + 'Shutdown_priv', + 'SHUTDOWN', + __('Allows shutting down the server.')), + array( + 'Process_priv', + 'PROCESS', + __('Allows viewing processes of all users')), + array( + 'File_priv', + 'FILE', + __('Allows importing data from and exporting data into files.')), + array( + 'References_priv', + 'REFERENCES', + __('Has no effect in this MySQL version.')), + array( + 'Index_priv', + 'INDEX', + __('Allows creating and dropping indexes.')), + array( + 'Alter_priv', + 'ALTER', + __('Allows altering the structure of existing tables.')), + array( + 'Show_db_priv', + 'SHOW DATABASES', + __('Gives access to the complete list of databases.')), + array( + 'Super_priv', + 'SUPER', + __('Allows connecting, even if maximum number of connections is reached; required for most administrative operations like setting global variables or killing threads of other users.')), + array( + 'Create_tmp_table_priv', + 'CREATE TEMPORARY TABLES', + __('Allows creating temporary tables.')), + array( + 'Lock_tables_priv', + 'LOCK TABLES', + __('Allows locking tables for the current thread.')), + array( + 'Repl_slave_priv', + 'REPLICATION SLAVE', + __('Needed for the replication slaves.')), + array( + 'Repl_client_priv', + 'REPLICATION CLIENT', + __('Allows the user to ask where the slaves / masters are.')), + array( + 'Create_view_priv', + 'CREATE VIEW', + __('Allows creating new views.')), + array( + 'Event_priv', + 'EVENT', + __('Allows to set up events for the event scheduler')), + array( + 'Trigger_priv', + 'TRIGGER', + __('Allows creating and dropping triggers')), // for table privs: - array('Create View_priv', 'CREATE VIEW', __('Allows creating new views.')), - array('Show_view_priv', 'SHOW VIEW', __('Allows performing SHOW CREATE VIEW queries.')), + array( + 'Create View_priv', + 'CREATE VIEW', + __('Allows creating new views.')), + array( + 'Show_view_priv', + 'SHOW VIEW', + __('Allows performing SHOW CREATE VIEW queries.')), // for table privs: - array('Show view_priv', 'SHOW VIEW', __('Allows performing SHOW CREATE VIEW queries.')), - array('Create_routine_priv', 'CREATE ROUTINE', __('Allows creating stored routines.')), - array('Alter_routine_priv', 'ALTER ROUTINE', __('Allows altering and dropping stored routines.')), - array('Create_user_priv', 'CREATE USER', __('Allows creating, dropping and renaming user accounts.')), - array('Execute_priv', 'EXECUTE', __('Allows executing stored routines.')), + array( + 'Show view_priv', + 'SHOW VIEW', + __('Allows performing SHOW CREATE VIEW queries.')), + array( + 'Create_routine_priv', + 'CREATE ROUTINE', + __('Allows creating stored routines.')), + array( + 'Alter_routine_priv', + 'ALTER ROUTINE', + __('Allows altering and dropping stored routines.')), + array( + 'Create_user_priv', + 'CREATE USER', + __('Allows creating, dropping and renaming user accounts.')), + array( + 'Execute_priv', + 'EXECUTE', + __('Allows executing stored routines.')), ); if (!empty($row) && isset($row['Table_priv'])) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11668-g1b57acf
by Michal Čihař 22 Jul '11

22 Jul '11

The branch, master has been updated via 1b57acfa8b7fb11ec63c474e848069a9bde2b07a (commit) from ce07c5c78a9a14288455cae6a239f0698e7d3dd9 (commit) - Log ----------------------------------------------------------------- commit 1b57acfa8b7fb11ec63c474e848069a9bde2b07a Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Jul 22 08:53:03 2011 +0200 Remove unused parameter of PMA_wildcardEscapeForGrant and document others ----------------------------------------------------------------------- Summary of changes: server_privileges.php | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/server_privileges.php b/server_privileges.php index 7433c46..a184682 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -134,12 +134,11 @@ $random_n = mt_rand(0,1000000); // a random number that will be appended to the * no escaping (for example test_db) but in mysql.db you'll see test\_db * for a db-specific privilege. * - * @param string $db_and_table - * @param string $dbname - * @param string $tablename - * @return string the escaped (if necessary) $db_and_table + * @param string $dbname Database name + * @param string $tablename Table name + * @return string the escaped (if necessary) database.table */ -function PMA_wildcardEscapeForGrant($db_and_table, $dbname, $tablename) { +function PMA_wildcardEscapeForGrant($dbname, $tablename) { if (! strlen($dbname)) { $db_and_table = '*.*'; @@ -1106,7 +1105,7 @@ if (isset($_REQUEST['change_copy'])) { * Updates privileges */ if (!empty($update_privs)) { - $db_and_table = PMA_wildcardEscapeForGrant($db_and_table, $dbname, (isset($tablename) ? $tablename : '')); + $db_and_table = PMA_wildcardEscapeForGrant($dbname, (isset($tablename) ? $tablename : '')); $sql_query0 = 'REVOKE ALL PRIVILEGES ON ' . $db_and_table @@ -1182,7 +1181,7 @@ if (!empty($update_privs)) { * Revokes Privileges */ if (isset($_REQUEST['revokeall'])) { - $db_and_table = PMA_wildcardEscapeForGrant($db_and_table, $dbname, isset($tablename) ? $tablename : ''); + $db_and_table = PMA_wildcardEscapeForGrant($dbname, isset($tablename) ? $tablename : ''); $sql_query0 = 'REVOKE ALL PRIVILEGES ON ' . $db_and_table hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11667-gce07c5c
by Michal Čihař 22 Jul '11

22 Jul '11

The branch, master has been updated via ce07c5c78a9a14288455cae6a239f0698e7d3dd9 (commit) via cf9809fff227507c64b8a28ec3e97c3e3319b801 (commit) via bafa992f31dafdc2ce17b68928465fd63845f351 (commit) via 858cd15383d4b88dbd50c90e8d3f3f5a9ac6d758 (commit) via 7162fce5ead846dc1a8337becf19b344fc00e088 (commit) via 977490b5bc2bb1149abff63d2d7f703116dfee1d (commit) via 5b3e3cc657f440050a9d7738416d720ef9f73d30 (commit) via fd7be23610bf895df5ccd1147996ac2fa87fc589 (commit) via bbc3c860d30015bf64c0ccd82b7185a640915b07 (commit) via b20fcf6c6976c2fd837f690df03a9d8d33234d25 (commit) via 6c1b0d90cc273171129fca542f0daeb63def47e8 (commit) via 70e466581342c8a5b15fa37d2a67e26e9225eb1f (commit) via 75723a8c4c29792a5e39b57020facc6360ae74da (commit) via 754b4c2b36319b0ea5236fb7db3e128256180d1c (commit) via d4919655248b6b4fddf194aef694cfa217921aba (commit) via 280241b6fcf38525d20ded946a5a9da8c39cd152 (commit) via b832412665e825da7aff272715d0995855307808 (commit) via 4249e1f8afabd6903e0c5268b284820628cd6be8 (commit) via b4594e9a927c25d3d9d6e8dbdb234c3d825754ad (commit) via 2cc67a386309656ea8675c74965fb42181dc4fab (commit) via 30fac6d4a3632c80c8324f5ca07ca7339a4ab327 (commit) via aa72bcf550ecc68fd8972127b4c86da0e7d1fae4 (commit) via c018bcdc1f54f3a02e782f384f1a129734f849cf (commit) via 311a048fd50d8ed30fbfc80315063277a79abe1f (commit) via 4e7684b8a85fcbac382bc2f54848d8e1b8d87dff (commit) via 43897a7b34158c933c2c93c48a107a7bf3e3d185 (commit) via d98a2794c7f0b2bb461d00c2536208bd78f4846d (commit) via 9996c86e7117218c4b0d8f376430fc3c53eec828 (commit) via 5c757aa9b562b8f942c137a71945c5243db24da0 (commit) via e4bce6c06c04fe4629ab89adb3da557b77d154c5 (commit) via 677823224ecd43d78c069f4b49f1d7eff0157b5f (commit) via d3e2dd5986876c321dceeea25009a20700f3ac57 (commit) via 67460570fa0879f488e3008fc6dbc94454e085f6 (commit) via 0d84178ce911b441561565c1cb647149c60f9eb1 (commit) via 97765b2640673844b68dc231ef4266cf1277d197 (commit) via a53838e4cc7117d3694589df29f9f68c1a53b248 (commit) via 61800e25d1aa4175de97bbf59f9205ae82083eb1 (commit) via 065d918598f0953903c9593c3ac091dc6f3830b8 (commit) via fdfea2e1f6b9f37ab0abd8f07ad2b9721cbf441d (commit) via 9ca62ba2ba10a45a7fe39d4662c9e35813ab2bf9 (commit) via 5ddaa806268d1bc6db7c23f6e93a602c26ad5c27 (commit) via 2386d68522fb1b7f88378a6f0253bfe62e0b57f8 (commit) via 196f1e43ae240a8ba0a57376d83682f93d943829 (commit) via dc975b239711d02e77531fc6e27e3a72738e8ce5 (commit) via ebe85f2b6680f68eb3a0e5ff617c6c80416a0a4a (commit) via 2ae978b7f4eac75d36d0fdf7fb152ff9c9e6f00c (commit) via 6ad94579cd687495c80a47c3fc05ca569e2deaf1 (commit) via 7900e345371d6b1f4a53e51a1a5c4e42f398f07d (commit) via 4f02bebaf443d4f3953e344dfe4393a7a59a9f2c (commit) via 047ca78b80740e1dd20de2a69516cf9bf7d2a59d (commit) via 8b279115898e9fe98c09ecb0ec3d4924e711da51 (commit) via 8f5ee2a45b3b67f875484e85ac7fdadfedce9e7e (commit) via ea77dea7c0f8a672c01f0eeca9a3269a0592ae80 (commit) via 76e18d875c4f9dbbc7a17e2f689dd856861ca595 (commit) via 35270a3069907209769c0e599e57e6916e893d84 (commit) via c46aeccbe8df4208c6755733d92a8df5d32eb825 (commit) via 7d9eccdbf0dbef35757f2faf2bd717d11f6c35d3 (commit) via beaf7c72d07514796f58a2fe2a15a517d863aee7 (commit) via cd962d92ef596056f613a83f02c561c45fbf5866 (commit) via 0ccf47fe2b66990ca29375dcc0f0f67cfc053a93 (commit) via 055ae91fc5b1c31c414c7f0c92cc765ad577e243 (commit) via f8afedb0948aae9d46e7016de83050bfa3b8c0ff (commit) via 75161a0cea2738265448cbacbe707d8f20101b68 (commit) via 77ab0becd872a51b3ab9adc461cf0d259ecd4c24 (commit) via d667c4f3564ec335a84e96312c85ef0009acbf20 (commit) via c7113139d65ce1649e9c35df6780f12a19398a7b (commit) via 95e55276841950fc607c12898f1986bb5bc260e1 (commit) via 749cee0f795a2b3be0e6cd8101c4b5e64211ac39 (commit) via 2460fce11ef75600d6b78cb4b166424594ef12d3 (commit) via 6bd662fbc7784dafb84ee14344327e04d9f77b22 (commit) via aa6e4548ab32b0dc6efc1ffb6d38bb68cf2f61b9 (commit) via 930818e004cd14afa6bdbbfb4905df1bd6acc9a3 (commit) via b39c71fbecd44863833c08ad07c88c97ce003c1d (commit) via 99bab35e7adfb90634e19384e4044be4c7af6dd3 (commit) via 4953344f52fe1244e00e00e69cf08c57d4c12d4f (commit) via d2f507892cbd3ef5f8a311b20d46e729005d1b4a (commit) via 1eecab4f736ac626ba22b49a353a1f9b64a9788d (commit) via 0a115497c5eb57d6226b8d959bd92a67cb604262 (commit) via 7f73cd6481adb8855f012b80913219548b1bec54 (commit) via 859878a73c1330d21ceceb444a24bca7f1efe973 (commit) via 3aecd9a07f5bd11d8f1c2d819c5210268007b6ec (commit) via 24466d933176e63b3b46976b250e3541f0d0f6a4 (commit) via b9b9da0fa86d3b8bde25e72ef4f80cd435781900 (commit) via 89f28c3039b469169051695a04cc5e13191ef49f (commit) via bc13a792dfe61e9292f7f5fe1d388cb64ef626b2 (commit) via 28ca6452919f896910e71914c7f0600b3a0b0a0a (commit) via 85ceb133ee9cc3bf7066399f235c84d9372b44b0 (commit) via 5af63f899abfb777f7219867dcb0e9aa43d9d57a (commit) via 0933b9a7888ff623d2b410b6a7196ab746c02b74 (commit) via e65663b153f14b3686f773850da30ce183af0c6a (commit) via f57020d066a8c6bcddda6c508077168ed1564242 (commit) via 4fdd19fd087f2a0ba935580464755f0c1f584f9e (commit) via 370ad6ae674b8307744777866fb8f91589232397 (commit) via ba8584f406d4a6258c44cf3f104ca97324fc62c9 (commit) via fda72b0582976f145aa2c6033ed2d002a1977688 (commit) via 9fac9aea63eb91edd653f9e788af7ed1f8553aa9 (commit) via 0a9ebc0dbdf97feeb0f0cb14c906c956cdf8798a (commit) via c1b5f59f8f0fe2c09a6d02dcd6288c15d4f3b6e3 (commit) via 7dc709162e315dbfc98c0318950f818315e42ca2 (commit) via cc024883c889ee5f5f62eb38a73c483c52657cbf (commit) via 40444b9531a958b1f0eb53ada009ba139bfac457 (commit) via 7cf4c326c349c4338bde21755134dc914771d171 (commit) via 2288b22fd86ec256f9199faa07474822090a6303 (commit) via f429b8a4bac4a72163013d5909b3e22608309bfa (commit) via 361f856de2debed1b799ad52237f4e7dc14df336 (commit) via 1df32d61e75bc94d51f2ac946b93e28779fea53a (commit) via cac09a355eaf5e8008e462b4c2296a15fd5780f2 (commit) via 9149ca92909a295104f6847c0191ed32cd37a1e6 (commit) via 1eedbb7911d8afde1d243c40583430072aed31f1 (commit) via f82530b65f340e49f014bc9b7faeba4fa8f291ce (commit) via 5bd6b1271712ad188c36798a66de9f2a26344d0d (commit) via e5e58ab1f95d60c416b6b2af92e9ca47ebcd0c02 (commit) via 05ef90d7f65f9e070bd882eb238ddf46703f11b4 (commit) via c38f25bcb26e32e2993b77134252e69b327e03aa (commit) via 5c46612c2d896b49a972ca01f190cbb1ff426fcb (commit) via 60fd574c3f2e6f0a5175157d9a94c432263956ff (commit) via bbd8695fbfb4eba81dd74e0854408b8cb723166e (commit) via dce9270c2f54ef33c77c59998b1a8d0fdad5f5e9 (commit) via 4d8ba818e620f16bb73da1432ca6b555b6d813a4 (commit) via 507b8b0b453c6e8734e8c87ae7e0a478a0429c05 (commit) via 9aab5bba0fdc9ca8d8bd06924750ced688282764 (commit) via a6b6f2820e94c08fc62a7b4bd2c35f5a325f6248 (commit) via dd6cd76d0c6d605b3126011334eddf393cee3d0a (commit) via 5aa3b295476c8b823d2360e4693e1b9849ff906d (commit) via 63db64eaaffd5a4b924dd90235349335dbb4c089 (commit) via 9fd87dd1ead2d8bc80960b699e16e71e8dea2055 (commit) via 013fdff416de1aa5f2582ec89901b876388f691f (commit) via 22104f78f53e8d4350af1dbd322a0c00dcd7138a (commit) via fbcb93d6e171d591401087449223823b5e798aaa (commit) via 57813543968a1d4d09a92a651f55de5616756edc (commit) via 2833faaa6e287ebb6d761d6dd8c3a444ed089e54 (commit) via 152a14bf51c9df625954cf4a314f9e96ea4b5c58 (commit) via 2f71a814e7a62310002c90740a17f90a2540457d (commit) via f4fa0c6e3650b1bc099e9bd2807bc9e5791e8b5c (commit) via 7619993c1fedb16d19524bc70426f18cfb8a14bf (commit) via ab96857c710b2066f3e87f919a25df27c8b01a26 (commit) via 191ea287982e80175a4803755b550568c6e17f62 (commit) via f3ea72df09cdc069ad914272e693291b7fcefd38 (commit) via 79cf95a4c2336749d4b8a8af9b8c0c44f599bfbf (commit) via 29d491e4bf4f35b8cdc68a9163e7f46b1b5d8f90 (commit) via bd36c8513b21c59db9a6d3f9ba71423e63631192 (commit) via a2de40da12e006c89c5c361560fd030cf2ab3f59 (commit) via 8b753684e73bac2f9766ea103f65b299bfdd5347 (commit) via 8642a81c07d27c695b49793b2d762370c1518fe8 (commit) via 51f09bd0793a977daea37b6e9645fb948be762cf (commit) via 5fd3864b86536000e8e798ea11d314bb0209d9b1 (commit) via 7b0669ce07c6b445983eb6c4a97654b0b05f32b8 (commit) via bd58d4bdf458178b3a54a9d3907c4f270635d061 (commit) via 23faf4c0e9f7c06788571c0b8a9a8ba104a9e755 (commit) via acf5b81c3f9334a48ec68c0c6cbeace008ed4c15 (commit) via b8404db6f63bcdddd3993fa9932cace43c0ad2e2 (commit) via bb2390d06f39d2d92335a458dae8d7bd1b1531c6 (commit) via 627ceda3909f9616aa0d6f54e6852815e7a87218 (commit) via 78b844f23aeae0d32160ab269eb6edd0274c1902 (commit) via f3875830acffd7a132a586f5408ff8e81d463348 (commit) via 0afb96375de582c07a3049cac866c9ff1a29587f (commit) via 71ad77b1d8637bd15a3e8729edf2336cd1153fb8 (commit) via 719cfb060d1e882a63710c9e3ef47206f1c9dd65 (commit) via ab4d7b79f2b983a66de236ad19f124607e245867 (commit) via 547106c9a341c12ae3e68c1f72f31240a1cc8c07 (commit) via 7f127a29d37236de9d26ca5a22cd2e3f454264cf (commit) via b69bf2422fd4f295bfdfeb91a90cbb1565ded171 (commit) via 9683da06335aae0d1426ac45bb0fc3512c8fb979 (commit) via 01a013f7b7ff32f897a94607e052c8e0cde87c0d (commit) via 711a6a4068215f070b0037b25069d2f3d466011e (commit) via fc8edd52bfe51806cad438ab683415919eedb2f9 (commit) via ec296c85003a0c663518de0911cb559f7b857d38 (commit) via f5750cdaced6610a4b578f9a2e0374e49f444a77 (commit) via 2fc06fac19976749658bf403f617df46d2f37a26 (commit) via e5bfa46356bd01af129fa3360647e0d83fc87286 (commit) via 2b48de8eb285f8b445c7a5bf062feecc2f4319a9 (commit) via b35c3029fbf7db9ec0bfc0db3a04d8767f4a3087 (commit) via e36b7e653f634f6eb51faa9a12f3f9b8ba514a0d (commit) via bef8f483ebe37ba3d007daca9fbe234cf94cacb6 (commit) via 4f987af72b8a242ca5f8c285fc2d3a9bf8055deb (commit) via f40092c46c2c91f3afdc530bcc4956c1c71aafe4 (commit) via 8e250398309b686546450e84e8d9ee86701c2e4f (commit) via 29944782ecf34c2d8f546793187107e2819161fd (commit) via 9c94eab446f43c52a7887ea733a672135e5c2ee3 (commit) via dc36ca8add6898c117ecc5e3419c33e54ab567f1 (commit) via 74deb265b5ec97c27edf91bd8b3f79b5e51f78de (commit) via 057039e6c1a954808a3c04b250d0341cb600aa49 (commit) via 813262d8beb2a205b59d6430b0b5adeb40fb0d68 (commit) via 9b975e8cc4a3ed8f7caae770cfeb371da7ec6c12 (commit) via 48ad4d47b87599403763e91d5ae2735c1492d5cb (commit) via 5d0a05af7ca95d2483896f4bb6d9c8b49348d46e (commit) via d3bab9f885b4366e84a7b53fb99ad863e8cb78d7 (commit) via 4dd0e64fcd400b8a028b71951e8d7af47c547930 (commit) via 6205b0f0c10d983b72889530f52e81037cbe7707 (commit) via 96d52af71caf023358b126a665d44715f949172b (commit) via 8bbd92e2c256888a71a5b22e1e405e3443359df5 (commit) via f7f5c8af219cd1fbfea86ae58a2edd43128be5c8 (commit) via 2618f396f0e1dca2498eb83d6b4da6b256783022 (commit) via bbc79efccaab3e5f210117e4c7ccd017a9609760 (commit) via c93455d4363461904f4afac5bb8615687808b3ef (commit) via 1d634f896b37c61501edf44ba85e7e0e99e632d6 (commit) via 731521708b854d84d7a48a18b5c3d127af799764 (commit) via ad0a3447c55583f600cb20a4f5a91b669e3b227f (commit) via a16e4b1f41e3659ec0ca81c6d24d73b9307266c3 (commit) via 6745a0f0bd3f9b073f0653acbabbbfa5cf5f4f98 (commit) via 1f418406efbceb768630748a8ad62d9bb58cb2a1 (commit) via ba600eab547e2d1478fd74414be7c6c63803f415 (commit) via 13acbb1a2ac553f1a86ba4acb92c1aadffdf96af (commit) via a7b1f51be1bd15685b7193e3be84b857089cc919 (commit) via 3e8633dd102ca384daf0b3bea590583d26ce2559 (commit) via 0a16250f2385c5886851de0e8719c67441d92d5c (commit) via e4a89276c3bec47432f3ce1af65b3e37cc9d21b7 (commit) via 202082763679f699c5f87099b4149288a8f2890b (commit) via 94855e82e225212b127ab2fdf130e65449845eb8 (commit) via 7f3df10199800b852c96c10e23170aa5d6e54f18 (commit) via c28bdc00261c80fd7c8c6121a7078a7d99305fdf (commit) via 46ba2638e5eeadb0537aeeeda306dd96091599b1 (commit) via d4eb139a0357b2f97c5332c4bb58fc45ab8627c6 (commit) via cdafa4226248ab7844df1490cd45ca14f8abdd67 (commit) via aab9f5b5d6aee48c95fee74557be9e1b5b52006b (commit) via 8f23e52a6a20a7cb0856520ad40f8f6e824166c1 (commit) via 8d028ede6f12065afa97a8470d833af94e493233 (commit) via 0fc5d1e110cbce8360f84fef775f8f09d55d36c1 (commit) via 335c9da64cf885614fb4c936b26a4188e059a586 (commit) via c885f46802ddde10a81a912a5970e97a721b150f (commit) via e4d01ae3bd81d410e7023cc754d32b40c42119ff (commit) via 7be50e05260f7179845033fe9774b22c5e9eb59e (commit) via 8be2f739175d0845c603eabaf741ae08c56feb33 (commit) via 9798fcf1d67f7a72cd96f7154cb13926779b41df (commit) via 23e94878201d20ba6b3b29ac6844940fd883cee4 (commit) via 901d8ffeb8dc9bbd1aee241347127bb6a5e6ea35 (commit) via 1ecdb0147668fed7ce8216edc932423c025699a9 (commit) via c735682b06918f5fe7b6089a22082a159d9f66cf (commit) via 211d44448afda9b8171ddd9ed36c08e4ed88e5b3 (commit) via df5be06f2314919369fae4d80f1a0e47729d0275 (commit) via 7cb9e047cdf41c12ee355ff0d18e22398b86d597 (commit) via 0a8feaf83917139fd735607e82368a734dbbe2a1 (commit) via 69987aa24bd93a32bca2f10f3d5fd1daebd0dd69 (commit) via a3927eba05a986fafb7fd935e48df96726912678 (commit) via 6d9494db226b1c5a65f4ccd6d22d2f4989222da1 (commit) via 910235509fc54fb3fad3b8d00bb5ac354773bcb1 (commit) via 4628ab162e46537f1c3b99c74ae9b016cf7a21b1 (commit) via 1218d27a0f0a4cdba84aae469cc80026999ee447 (commit) via 905beb5cd3087ea174ea5361c9ecf2ee20d5285e (commit) via 020c69ba4023b66fc7d2b63c9772416680c4c420 (commit) via c6cdb6fe386232eff79ff29b87883450f0a7ddda (commit) via d268eaba82e7acedd8a8385718155c1905dc30da (commit) via 6ea1abe25c352c976749483f40303eb8f3968e5f (commit) via be1a2a75cb505bb7836e7876ddd1245c57220343 (commit) via 569b8c1099f79a91799f08975ec85db35d550994 (commit) from 49b2ca984a6c38fa7b49aeff3f1344d837cf5834 (commit) - Log ----------------------------------------------------------------- commit ce07c5c78a9a14288455cae6a239f0698e7d3dd9 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jul 22 07:24:58 2011 +0200 Fix format string commit cf9809fff227507c64b8a28ec3e97c3e3319b801 Merge: bafa992f31dafdc2ce17b68928465fd63845f351 49b2ca984a6c38fa7b49aeff3f1344d837cf5834 Author: Pootle server <pootle(a)cihar.com> Date: Thu Jul 21 22:40:16 2011 +0200 Merge remote-tracking branch 'origin/master' commit bafa992f31dafdc2ce17b68928465fd63845f351 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jul 21 20:44:09 2011 +0200 Translation update done using Pootle. commit 858cd15383d4b88dbd50c90e8d3f3f5a9ac6d758 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jul 21 20:41:43 2011 +0200 Translation update done using Pootle. commit 7162fce5ead846dc1a8337becf19b344fc00e088 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jul 21 20:41:28 2011 +0200 Translation update done using Pootle. commit 977490b5bc2bb1149abff63d2d7f703116dfee1d Merge: 5b3e3cc657f440050a9d7738416d720ef9f73d30 4925260d959d8bd7194b912ddd1317c71f7cc42b Author: Pootle server <pootle(a)cihar.com> Date: Thu Jul 21 20:40:14 2011 +0200 Merge remote-tracking branch 'origin/master' commit 5b3e3cc657f440050a9d7738416d720ef9f73d30 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jul 21 20:17:25 2011 +0200 Translation update done using Pootle. commit fd7be23610bf895df5ccd1147996ac2fa87fc589 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jul 21 20:16:55 2011 +0200 Translation update done using Pootle. commit bbc3c860d30015bf64c0ccd82b7185a640915b07 Author: Domen <dbc334(a)gmail.com> Date: Thu Jul 21 19:45:06 2011 +0200 Translation update done using Pootle. commit b20fcf6c6976c2fd837f690df03a9d8d33234d25 Author: Domen <dbc334(a)gmail.com> Date: Thu Jul 21 19:39:40 2011 +0200 Translation update done using Pootle. commit 6c1b0d90cc273171129fca542f0daeb63def47e8 Author: Domen <dbc334(a)gmail.com> Date: Thu Jul 21 19:37:46 2011 +0200 Translation update done using Pootle. commit 70e466581342c8a5b15fa37d2a67e26e9225eb1f Author: Domen <dbc334(a)gmail.com> Date: Thu Jul 21 19:37:05 2011 +0200 Translation update done using Pootle. commit 75723a8c4c29792a5e39b57020facc6360ae74da Author: Domen <dbc334(a)gmail.com> Date: Thu Jul 21 19:36:50 2011 +0200 Translation update done using Pootle. commit 754b4c2b36319b0ea5236fb7db3e128256180d1c Author: Domen <dbc334(a)gmail.com> Date: Thu Jul 21 19:36:37 2011 +0200 Translation update done using Pootle. commit d4919655248b6b4fddf194aef694cfa217921aba Author: Domen <dbc334(a)gmail.com> Date: Thu Jul 21 19:36:22 2011 +0200 Translation update done using Pootle. commit 280241b6fcf38525d20ded946a5a9da8c39cd152 Author: Domen <dbc334(a)gmail.com> Date: Thu Jul 21 19:36:12 2011 +0200 Translation update done using Pootle. commit b832412665e825da7aff272715d0995855307808 Author: Domen <dbc334(a)gmail.com> Date: Thu Jul 21 19:36:04 2011 +0200 Translation update done using Pootle. commit 4249e1f8afabd6903e0c5268b284820628cd6be8 Author: Domen <dbc334(a)gmail.com> Date: Thu Jul 21 19:35:52 2011 +0200 Translation update done using Pootle. commit b4594e9a927c25d3d9d6e8dbdb234c3d825754ad Author: Domen <dbc334(a)gmail.com> Date: Thu Jul 21 19:34:59 2011 +0200 Translation update done using Pootle. commit 2cc67a386309656ea8675c74965fb42181dc4fab Author: Domen <dbc334(a)gmail.com> Date: Thu Jul 21 19:32:59 2011 +0200 Translation update done using Pootle. commit 30fac6d4a3632c80c8324f5ca07ca7339a4ab327 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jul 21 19:27:46 2011 +0200 Translation update done using Pootle. commit aa72bcf550ecc68fd8972127b4c86da0e7d1fae4 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jul 21 19:27:20 2011 +0200 Translation update done using Pootle. commit c018bcdc1f54f3a02e782f384f1a129734f849cf Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jul 21 19:26:06 2011 +0200 Translation update done using Pootle. commit 311a048fd50d8ed30fbfc80315063277a79abe1f Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jul 21 19:25:38 2011 +0200 Translation update done using Pootle. commit 4e7684b8a85fcbac382bc2f54848d8e1b8d87dff Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 19:12:30 2011 +0200 Translation update done using Pootle. commit 43897a7b34158c933c2c93c48a107a7bf3e3d185 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 19:12:25 2011 +0200 Translation update done using Pootle. commit d98a2794c7f0b2bb461d00c2536208bd78f4846d Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 19:12:14 2011 +0200 Translation update done using Pootle. commit 9996c86e7117218c4b0d8f376430fc3c53eec828 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 19:12:08 2011 +0200 Translation update done using Pootle. commit 5c757aa9b562b8f942c137a71945c5243db24da0 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 19:11:50 2011 +0200 Translation update done using Pootle. commit e4bce6c06c04fe4629ab89adb3da557b77d154c5 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 19:11:35 2011 +0200 Translation update done using Pootle. commit 677823224ecd43d78c069f4b49f1d7eff0157b5f Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 19:11:12 2011 +0200 Translation update done using Pootle. commit d3e2dd5986876c321dceeea25009a20700f3ac57 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 19:10:21 2011 +0200 Translation update done using Pootle. commit 67460570fa0879f488e3008fc6dbc94454e085f6 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 19:10:09 2011 +0200 Translation update done using Pootle. commit 0d84178ce911b441561565c1cb647149c60f9eb1 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 19:09:55 2011 +0200 Translation update done using Pootle. commit 97765b2640673844b68dc231ef4266cf1277d197 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 19:09:43 2011 +0200 Translation update done using Pootle. commit a53838e4cc7117d3694589df29f9f68c1a53b248 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 19:09:30 2011 +0200 Translation update done using Pootle. commit 61800e25d1aa4175de97bbf59f9205ae82083eb1 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 19:09:10 2011 +0200 Translation update done using Pootle. commit 065d918598f0953903c9593c3ac091dc6f3830b8 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 19:08:08 2011 +0200 Translation update done using Pootle. commit fdfea2e1f6b9f37ab0abd8f07ad2b9721cbf441d Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 19:07:43 2011 +0200 Translation update done using Pootle. commit 9ca62ba2ba10a45a7fe39d4662c9e35813ab2bf9 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 19:07:31 2011 +0200 Translation update done using Pootle. commit 5ddaa806268d1bc6db7c23f6e93a602c26ad5c27 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 19:07:18 2011 +0200 Translation update done using Pootle. commit 2386d68522fb1b7f88378a6f0253bfe62e0b57f8 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 19:06:51 2011 +0200 Translation update done using Pootle. commit 196f1e43ae240a8ba0a57376d83682f93d943829 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 19:06:38 2011 +0200 Translation update done using Pootle. commit dc975b239711d02e77531fc6e27e3a72738e8ce5 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 19:06:30 2011 +0200 Translation update done using Pootle. commit ebe85f2b6680f68eb3a0e5ff617c6c80416a0a4a Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 19:05:56 2011 +0200 Translation update done using Pootle. commit 2ae978b7f4eac75d36d0fdf7fb152ff9c9e6f00c Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jul 21 19:05:36 2011 +0200 Translation update done using Pootle. commit 6ad94579cd687495c80a47c3fc05ca569e2deaf1 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 19:05:29 2011 +0200 Translation update done using Pootle. commit 7900e345371d6b1f4a53e51a1a5c4e42f398f07d Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jul 21 19:05:15 2011 +0200 Translation update done using Pootle. commit 4f02bebaf443d4f3953e344dfe4393a7a59a9f2c Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 19:04:56 2011 +0200 Translation update done using Pootle. commit 047ca78b80740e1dd20de2a69516cf9bf7d2a59d Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jul 21 19:04:43 2011 +0200 Translation update done using Pootle. commit 8b279115898e9fe98c09ecb0ec3d4924e711da51 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 19:04:01 2011 +0200 Translation update done using Pootle. commit 8f5ee2a45b3b67f875484e85ac7fdadfedce9e7e Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 19:03:48 2011 +0200 Translation update done using Pootle. commit ea77dea7c0f8a672c01f0eeca9a3269a0592ae80 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:59:14 2011 +0200 Translation update done using Pootle. commit 76e18d875c4f9dbbc7a17e2f689dd856861ca595 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:58:11 2011 +0200 Translation update done using Pootle. commit 35270a3069907209769c0e599e57e6916e893d84 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:57:51 2011 +0200 Translation update done using Pootle. commit c46aeccbe8df4208c6755733d92a8df5d32eb825 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:56:41 2011 +0200 Translation update done using Pootle. commit 7d9eccdbf0dbef35757f2faf2bd717d11f6c35d3 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:56:29 2011 +0200 Translation update done using Pootle. commit beaf7c72d07514796f58a2fe2a15a517d863aee7 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:56:18 2011 +0200 Translation update done using Pootle. commit cd962d92ef596056f613a83f02c561c45fbf5866 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:55:29 2011 +0200 Translation update done using Pootle. commit 0ccf47fe2b66990ca29375dcc0f0f67cfc053a93 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:55:19 2011 +0200 Translation update done using Pootle. commit 055ae91fc5b1c31c414c7f0c92cc765ad577e243 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:54:59 2011 +0200 Translation update done using Pootle. commit f8afedb0948aae9d46e7016de83050bfa3b8c0ff Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:54:39 2011 +0200 Translation update done using Pootle. commit 75161a0cea2738265448cbacbe707d8f20101b68 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:50:24 2011 +0200 Translation update done using Pootle. commit 77ab0becd872a51b3ab9adc461cf0d259ecd4c24 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:49:23 2011 +0200 Translation update done using Pootle. commit d667c4f3564ec335a84e96312c85ef0009acbf20 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:48:31 2011 +0200 Translation update done using Pootle. commit c7113139d65ce1649e9c35df6780f12a19398a7b Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:46:34 2011 +0200 Translation update done using Pootle. commit 95e55276841950fc607c12898f1986bb5bc260e1 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:45:30 2011 +0200 Translation update done using Pootle. commit 749cee0f795a2b3be0e6cd8101c4b5e64211ac39 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:45:02 2011 +0200 Translation update done using Pootle. commit 2460fce11ef75600d6b78cb4b166424594ef12d3 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:43:24 2011 +0200 Translation update done using Pootle. commit 6bd662fbc7784dafb84ee14344327e04d9f77b22 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:43:11 2011 +0200 Translation update done using Pootle. commit aa6e4548ab32b0dc6efc1ffb6d38bb68cf2f61b9 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:42:48 2011 +0200 Translation update done using Pootle. commit 930818e004cd14afa6bdbbfb4905df1bd6acc9a3 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:42:38 2011 +0200 Translation update done using Pootle. commit b39c71fbecd44863833c08ad07c88c97ce003c1d Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:42:23 2011 +0200 Translation update done using Pootle. commit 99bab35e7adfb90634e19384e4044be4c7af6dd3 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:42:08 2011 +0200 Translation update done using Pootle. commit 4953344f52fe1244e00e00e69cf08c57d4c12d4f Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:42:03 2011 +0200 Translation update done using Pootle. commit d2f507892cbd3ef5f8a311b20d46e729005d1b4a Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:41:22 2011 +0200 Translation update done using Pootle. commit 1eecab4f736ac626ba22b49a353a1f9b64a9788d Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:40:48 2011 +0200 Translation update done using Pootle. commit 0a115497c5eb57d6226b8d959bd92a67cb604262 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:40:16 2011 +0200 Translation update done using Pootle. commit 7f73cd6481adb8855f012b80913219548b1bec54 Merge: 859878a73c1330d21ceceb444a24bca7f1efe973 e62d62fa124328df9d22f4d1e794148325e8d207 Author: Pootle server <pootle(a)cihar.com> Date: Thu Jul 21 18:40:15 2011 +0200 Merge remote-tracking branch 'origin/master' commit 859878a73c1330d21ceceb444a24bca7f1efe973 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:39:05 2011 +0200 Translation update done using Pootle. commit 3aecd9a07f5bd11d8f1c2d819c5210268007b6ec Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:38:35 2011 +0200 Translation update done using Pootle. commit 24466d933176e63b3b46976b250e3541f0d0f6a4 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:37:50 2011 +0200 Translation update done using Pootle. commit b9b9da0fa86d3b8bde25e72ef4f80cd435781900 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:37:12 2011 +0200 Translation update done using Pootle. commit 89f28c3039b469169051695a04cc5e13191ef49f Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:32:48 2011 +0200 Translation update done using Pootle. commit bc13a792dfe61e9292f7f5fe1d388cb64ef626b2 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:31:49 2011 +0200 Translation update done using Pootle. commit 28ca6452919f896910e71914c7f0600b3a0b0a0a Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:30:39 2011 +0200 Translation update done using Pootle. commit 85ceb133ee9cc3bf7066399f235c84d9372b44b0 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:30:24 2011 +0200 Translation update done using Pootle. commit 5af63f899abfb777f7219867dcb0e9aa43d9d57a Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jul 21 18:30:13 2011 +0200 Translation update done using Pootle. commit 0933b9a7888ff623d2b410b6a7196ab746c02b74 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:29:28 2011 +0200 Translation update done using Pootle. commit e65663b153f14b3686f773850da30ce183af0c6a Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:29:17 2011 +0200 Translation update done using Pootle. commit f57020d066a8c6bcddda6c508077168ed1564242 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:29:04 2011 +0200 Translation update done using Pootle. commit 4fdd19fd087f2a0ba935580464755f0c1f584f9e Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:28:53 2011 +0200 Translation update done using Pootle. commit 370ad6ae674b8307744777866fb8f91589232397 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:28:37 2011 +0200 Translation update done using Pootle. commit ba8584f406d4a6258c44cf3f104ca97324fc62c9 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:28:15 2011 +0200 Translation update done using Pootle. commit fda72b0582976f145aa2c6033ed2d002a1977688 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:27:39 2011 +0200 Translation update done using Pootle. commit 9fac9aea63eb91edd653f9e788af7ed1f8553aa9 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:27:28 2011 +0200 Translation update done using Pootle. commit 0a9ebc0dbdf97feeb0f0cb14c906c956cdf8798a Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:27:11 2011 +0200 Translation update done using Pootle. commit c1b5f59f8f0fe2c09a6d02dcd6288c15d4f3b6e3 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:26:47 2011 +0200 Translation update done using Pootle. commit 7dc709162e315dbfc98c0318950f818315e42ca2 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:26:07 2011 +0200 Translation update done using Pootle. commit cc024883c889ee5f5f62eb38a73c483c52657cbf Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:25:56 2011 +0200 Translation update done using Pootle. commit 40444b9531a958b1f0eb53ada009ba139bfac457 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:25:41 2011 +0200 Translation update done using Pootle. commit 7cf4c326c349c4338bde21755134dc914771d171 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:25:22 2011 +0200 Translation update done using Pootle. commit 2288b22fd86ec256f9199faa07474822090a6303 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:25:03 2011 +0200 Translation update done using Pootle. commit f429b8a4bac4a72163013d5909b3e22608309bfa Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:23:44 2011 +0200 Translation update done using Pootle. commit 361f856de2debed1b799ad52237f4e7dc14df336 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:23:35 2011 +0200 Translation update done using Pootle. commit 1df32d61e75bc94d51f2ac946b93e28779fea53a Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:23:13 2011 +0200 Translation update done using Pootle. commit cac09a355eaf5e8008e462b4c2296a15fd5780f2 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:22:48 2011 +0200 Translation update done using Pootle. commit 9149ca92909a295104f6847c0191ed32cd37a1e6 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:22:31 2011 +0200 Translation update done using Pootle. commit 1eedbb7911d8afde1d243c40583430072aed31f1 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:21:42 2011 +0200 Translation update done using Pootle. commit f82530b65f340e49f014bc9b7faeba4fa8f291ce Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:21:28 2011 +0200 Translation update done using Pootle. commit 5bd6b1271712ad188c36798a66de9f2a26344d0d Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:21:17 2011 +0200 Translation update done using Pootle. commit e5e58ab1f95d60c416b6b2af92e9ca47ebcd0c02 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:20:23 2011 +0200 Translation update done using Pootle. commit 05ef90d7f65f9e070bd882eb238ddf46703f11b4 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:20:12 2011 +0200 Translation update done using Pootle. commit c38f25bcb26e32e2993b77134252e69b327e03aa Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:19:55 2011 +0200 Translation update done using Pootle. commit 5c46612c2d896b49a972ca01f190cbb1ff426fcb Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:19:33 2011 +0200 Translation update done using Pootle. commit 60fd574c3f2e6f0a5175157d9a94c432263956ff Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:18:23 2011 +0200 Translation update done using Pootle. commit bbd8695fbfb4eba81dd74e0854408b8cb723166e Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:18:16 2011 +0200 Translation update done using Pootle. commit dce9270c2f54ef33c77c59998b1a8d0fdad5f5e9 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:17:55 2011 +0200 Translation update done using Pootle. commit 4d8ba818e620f16bb73da1432ca6b555b6d813a4 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:17:26 2011 +0200 Translation update done using Pootle. commit 507b8b0b453c6e8734e8c87ae7e0a478a0429c05 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:16:43 2011 +0200 Translation update done using Pootle. commit 9aab5bba0fdc9ca8d8bd06924750ced688282764 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:16:31 2011 +0200 Translation update done using Pootle. commit a6b6f2820e94c08fc62a7b4bd2c35f5a325f6248 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:15:48 2011 +0200 Translation update done using Pootle. commit dd6cd76d0c6d605b3126011334eddf393cee3d0a Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:15:34 2011 +0200 Translation update done using Pootle. commit 5aa3b295476c8b823d2360e4693e1b9849ff906d Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:15:11 2011 +0200 Translation update done using Pootle. commit 63db64eaaffd5a4b924dd90235349335dbb4c089 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:14:30 2011 +0200 Translation update done using Pootle. commit 9fd87dd1ead2d8bc80960b699e16e71e8dea2055 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jul 21 18:10:55 2011 +0200 Translation update done using Pootle. commit 013fdff416de1aa5f2582ec89901b876388f691f Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jul 21 18:10:40 2011 +0200 Translation update done using Pootle. commit 22104f78f53e8d4350af1dbd322a0c00dcd7138a Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jul 21 18:10:03 2011 +0200 Translation update done using Pootle. commit fbcb93d6e171d591401087449223823b5e798aaa Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jul 21 18:09:30 2011 +0200 Translation update done using Pootle. commit 57813543968a1d4d09a92a651f55de5616756edc Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jul 21 18:09:10 2011 +0200 Translation update done using Pootle. commit 2833faaa6e287ebb6d761d6dd8c3a444ed089e54 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jul 21 18:08:08 2011 +0200 Translation update done using Pootle. commit 152a14bf51c9df625954cf4a314f9e96ea4b5c58 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jul 21 18:06:52 2011 +0200 Translation update done using Pootle. commit 2f71a814e7a62310002c90740a17f90a2540457d Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:05:26 2011 +0200 Translation update done using Pootle. commit f4fa0c6e3650b1bc099e9bd2807bc9e5791e8b5c Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:05:10 2011 +0200 Translation update done using Pootle. commit 7619993c1fedb16d19524bc70426f18cfb8a14bf Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:04:59 2011 +0200 Translation update done using Pootle. commit ab96857c710b2066f3e87f919a25df27c8b01a26 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:04:55 2011 +0200 Translation update done using Pootle. commit 191ea287982e80175a4803755b550568c6e17f62 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:04:37 2011 +0200 Translation update done using Pootle. commit f3ea72df09cdc069ad914272e693291b7fcefd38 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:04:04 2011 +0200 Translation update done using Pootle. commit 79cf95a4c2336749d4b8a8af9b8c0c44f599bfbf Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:03:55 2011 +0200 Translation update done using Pootle. commit 29d491e4bf4f35b8cdc68a9163e7f46b1b5d8f90 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:03:40 2011 +0200 Translation update done using Pootle. commit bd36c8513b21c59db9a6d3f9ba71423e63631192 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:03:10 2011 +0200 Translation update done using Pootle. commit a2de40da12e006c89c5c361560fd030cf2ab3f59 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:02:36 2011 +0200 Translation update done using Pootle. commit 8b753684e73bac2f9766ea103f65b299bfdd5347 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:02:05 2011 +0200 Translation update done using Pootle. commit 8642a81c07d27c695b49793b2d762370c1518fe8 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jul 21 18:01:15 2011 +0200 Translation update done using Pootle. commit 51f09bd0793a977daea37b6e9645fb948be762cf Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:01:10 2011 +0200 Translation update done using Pootle. commit 5fd3864b86536000e8e798ea11d314bb0209d9b1 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jul 21 18:00:48 2011 +0200 Translation update done using Pootle. commit 7b0669ce07c6b445983eb6c4a97654b0b05f32b8 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 18:00:17 2011 +0200 Translation update done using Pootle. commit bd58d4bdf458178b3a54a9d3907c4f270635d061 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jul 21 17:59:52 2011 +0200 Translation update done using Pootle. commit 23faf4c0e9f7c06788571c0b8a9a8ba104a9e755 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:59:51 2011 +0200 Translation update done using Pootle. commit acf5b81c3f9334a48ec68c0c6cbeace008ed4c15 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:59:36 2011 +0200 Translation update done using Pootle. commit b8404db6f63bcdddd3993fa9932cace43c0ad2e2 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:59:25 2011 +0200 Translation update done using Pootle. commit bb2390d06f39d2d92335a458dae8d7bd1b1531c6 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:59:12 2011 +0200 Translation update done using Pootle. commit 627ceda3909f9616aa0d6f54e6852815e7a87218 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:58:41 2011 +0200 Translation update done using Pootle. commit 78b844f23aeae0d32160ab269eb6edd0274c1902 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:58:27 2011 +0200 Translation update done using Pootle. commit f3875830acffd7a132a586f5408ff8e81d463348 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:58:13 2011 +0200 Translation update done using Pootle. commit 0afb96375de582c07a3049cac866c9ff1a29587f Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:57:49 2011 +0200 Translation update done using Pootle. commit 71ad77b1d8637bd15a3e8729edf2336cd1153fb8 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:57:44 2011 +0200 Translation update done using Pootle. commit 719cfb060d1e882a63710c9e3ef47206f1c9dd65 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:57:33 2011 +0200 Translation update done using Pootle. commit ab4d7b79f2b983a66de236ad19f124607e245867 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:57:14 2011 +0200 Translation update done using Pootle. commit 547106c9a341c12ae3e68c1f72f31240a1cc8c07 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jul 21 17:57:13 2011 +0200 Translation update done using Pootle. commit 7f127a29d37236de9d26ca5a22cd2e3f454264cf Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:57:06 2011 +0200 Translation update done using Pootle. commit b69bf2422fd4f295bfdfeb91a90cbb1565ded171 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:56:55 2011 +0200 Translation update done using Pootle. commit 9683da06335aae0d1426ac45bb0fc3512c8fb979 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:56:41 2011 +0200 Translation update done using Pootle. commit 01a013f7b7ff32f897a94607e052c8e0cde87c0d Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:55:50 2011 +0200 Translation update done using Pootle. commit 711a6a4068215f070b0037b25069d2f3d466011e Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:55:29 2011 +0200 Translation update done using Pootle. commit fc8edd52bfe51806cad438ab683415919eedb2f9 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:53:05 2011 +0200 Translation update done using Pootle. commit ec296c85003a0c663518de0911cb559f7b857d38 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:52:53 2011 +0200 Translation update done using Pootle. commit f5750cdaced6610a4b578f9a2e0374e49f444a77 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:52:35 2011 +0200 Translation update done using Pootle. commit 2fc06fac19976749658bf403f617df46d2f37a26 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:51:23 2011 +0200 Translation update done using Pootle. commit e5bfa46356bd01af129fa3360647e0d83fc87286 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:51:17 2011 +0200 Translation update done using Pootle. commit 2b48de8eb285f8b445c7a5bf062feecc2f4319a9 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:50:52 2011 +0200 Translation update done using Pootle. commit b35c3029fbf7db9ec0bfc0db3a04d8767f4a3087 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:50:45 2011 +0200 Translation update done using Pootle. commit e36b7e653f634f6eb51faa9a12f3f9b8ba514a0d Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:50:28 2011 +0200 Translation update done using Pootle. commit bef8f483ebe37ba3d007daca9fbe234cf94cacb6 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:50:09 2011 +0200 Translation update done using Pootle. commit 4f987af72b8a242ca5f8c285fc2d3a9bf8055deb Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jul 21 17:49:23 2011 +0200 Translation update done using Pootle. commit f40092c46c2c91f3afdc530bcc4956c1c71aafe4 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:49:20 2011 +0200 Translation update done using Pootle. commit 8e250398309b686546450e84e8d9ee86701c2e4f Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:48:42 2011 +0200 Translation update done using Pootle. commit 29944782ecf34c2d8f546793187107e2819161fd Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:47:59 2011 +0200 Translation update done using Pootle. commit 9c94eab446f43c52a7887ea733a672135e5c2ee3 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jul 21 17:47:58 2011 +0200 Translation update done using Pootle. commit dc36ca8add6898c117ecc5e3419c33e54ab567f1 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:47:54 2011 +0200 Translation update done using Pootle. commit 74deb265b5ec97c27edf91bd8b3f79b5e51f78de Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jul 21 17:47:49 2011 +0200 Translation update done using Pootle. commit 057039e6c1a954808a3c04b250d0341cb600aa49 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:46:52 2011 +0200 Translation update done using Pootle. commit 813262d8beb2a205b59d6430b0b5adeb40fb0d68 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:46:00 2011 +0200 Translation update done using Pootle. commit 9b975e8cc4a3ed8f7caae770cfeb371da7ec6c12 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:45:55 2011 +0200 Translation update done using Pootle. commit 48ad4d47b87599403763e91d5ae2735c1492d5cb Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:45:40 2011 +0200 Translation update done using Pootle. commit 5d0a05af7ca95d2483896f4bb6d9c8b49348d46e Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:45:05 2011 +0200 Translation update done using Pootle. commit d3bab9f885b4366e84a7b53fb99ad863e8cb78d7 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:44:59 2011 +0200 Translation update done using Pootle. commit 4dd0e64fcd400b8a028b71951e8d7af47c547930 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jul 21 17:44:58 2011 +0200 Translation update done using Pootle. commit 6205b0f0c10d983b72889530f52e81037cbe7707 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:44:41 2011 +0200 Translation update done using Pootle. commit 96d52af71caf023358b126a665d44715f949172b Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:44:32 2011 +0200 Translation update done using Pootle. commit 8bbd92e2c256888a71a5b22e1e405e3443359df5 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:44:25 2011 +0200 Translation update done using Pootle. commit f7f5c8af219cd1fbfea86ae58a2edd43128be5c8 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:43:39 2011 +0200 Translation update done using Pootle. commit 2618f396f0e1dca2498eb83d6b4da6b256783022 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:43:13 2011 +0200 Translation update done using Pootle. commit bbc79efccaab3e5f210117e4c7ccd017a9609760 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:42:59 2011 +0200 Translation update done using Pootle. commit c93455d4363461904f4afac5bb8615687808b3ef Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:41:17 2011 +0200 Translation update done using Pootle. commit 1d634f896b37c61501edf44ba85e7e0e99e632d6 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:41:04 2011 +0200 Translation update done using Pootle. commit 731521708b854d84d7a48a18b5c3d127af799764 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:41:02 2011 +0200 Translation update done using Pootle. commit ad0a3447c55583f600cb20a4f5a91b669e3b227f Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:40:38 2011 +0200 Translation update done using Pootle. commit a16e4b1f41e3659ec0ca81c6d24d73b9307266c3 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:40:00 2011 +0200 Translation update done using Pootle. commit 6745a0f0bd3f9b073f0653acbabbbfa5cf5f4f98 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:39:45 2011 +0200 Translation update done using Pootle. commit 1f418406efbceb768630748a8ad62d9bb58cb2a1 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jul 21 17:39:41 2011 +0200 Translation update done using Pootle. commit ba600eab547e2d1478fd74414be7c6c63803f415 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:39:04 2011 +0200 Translation update done using Pootle. commit 13acbb1a2ac553f1a86ba4acb92c1aadffdf96af Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:38:23 2011 +0200 Translation update done using Pootle. commit a7b1f51be1bd15685b7193e3be84b857089cc919 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:38:19 2011 +0200 Translation update done using Pootle. commit 3e8633dd102ca384daf0b3bea590583d26ce2559 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:37:56 2011 +0200 Translation update done using Pootle. commit 0a16250f2385c5886851de0e8719c67441d92d5c Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:37:24 2011 +0200 Translation update done using Pootle. commit e4a89276c3bec47432f3ce1af65b3e37cc9d21b7 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:33:59 2011 +0200 Translation update done using Pootle. commit 202082763679f699c5f87099b4149288a8f2890b Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:33:35 2011 +0200 Translation update done using Pootle. commit 94855e82e225212b127ab2fdf130e65449845eb8 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jul 21 17:33:31 2011 +0200 Translation update done using Pootle. commit 7f3df10199800b852c96c10e23170aa5d6e54f18 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jul 21 17:33:06 2011 +0200 Translation update done using Pootle. commit c28bdc00261c80fd7c8c6121a7078a7d99305fdf Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:32:42 2011 +0200 Translation update done using Pootle. commit 46ba2638e5eeadb0537aeeeda306dd96091599b1 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jul 21 17:32:04 2011 +0200 Translation update done using Pootle. commit d4eb139a0357b2f97c5332c4bb58fc45ab8627c6 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:31:56 2011 +0200 Translation update done using Pootle. commit cdafa4226248ab7844df1490cd45ca14f8abdd67 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:30:04 2011 +0200 Translation update done using Pootle. commit aab9f5b5d6aee48c95fee74557be9e1b5b52006b Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:29:42 2011 +0200 Translation update done using Pootle. commit 8f23e52a6a20a7cb0856520ad40f8f6e824166c1 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:28:55 2011 +0200 Translation update done using Pootle. commit 8d028ede6f12065afa97a8470d833af94e493233 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:28:49 2011 +0200 Translation update done using Pootle. commit 0fc5d1e110cbce8360f84fef775f8f09d55d36c1 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:28:19 2011 +0200 Translation update done using Pootle. commit 335c9da64cf885614fb4c936b26a4188e059a586 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:27:52 2011 +0200 Translation update done using Pootle. commit c885f46802ddde10a81a912a5970e97a721b150f Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:27:36 2011 +0200 Translation update done using Pootle. commit e4d01ae3bd81d410e7023cc754d32b40c42119ff Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:27:33 2011 +0200 Translation update done using Pootle. commit 7be50e05260f7179845033fe9774b22c5e9eb59e Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:27:27 2011 +0200 Translation update done using Pootle. commit 8be2f739175d0845c603eabaf741ae08c56feb33 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:27:22 2011 +0200 Translation update done using Pootle. commit 9798fcf1d67f7a72cd96f7154cb13926779b41df Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:27:00 2011 +0200 Translation update done using Pootle. commit 23e94878201d20ba6b3b29ac6844940fd883cee4 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:26:53 2011 +0200 Translation update done using Pootle. commit 901d8ffeb8dc9bbd1aee241347127bb6a5e6ea35 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:26:42 2011 +0200 Translation update done using Pootle. commit 1ecdb0147668fed7ce8216edc932423c025699a9 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:25:43 2011 +0200 Translation update done using Pootle. commit c735682b06918f5fe7b6089a22082a159d9f66cf Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:24:48 2011 +0200 Translation update done using Pootle. commit 211d44448afda9b8171ddd9ed36c08e4ed88e5b3 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:24:08 2011 +0200 Translation update done using Pootle. commit df5be06f2314919369fae4d80f1a0e47729d0275 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:23:51 2011 +0200 Translation update done using Pootle. commit 7cb9e047cdf41c12ee355ff0d18e22398b86d597 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:23:29 2011 +0200 Translation update done using Pootle. commit 0a8feaf83917139fd735607e82368a734dbbe2a1 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:22:47 2011 +0200 Translation update done using Pootle. commit 69987aa24bd93a32bca2f10f3d5fd1daebd0dd69 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:20:22 2011 +0200 Translation update done using Pootle. commit a3927eba05a986fafb7fd935e48df96726912678 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:19:35 2011 +0200 Translation update done using Pootle. commit 6d9494db226b1c5a65f4ccd6d22d2f4989222da1 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:18:48 2011 +0200 Translation update done using Pootle. commit 910235509fc54fb3fad3b8d00bb5ac354773bcb1 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jul 21 17:18:46 2011 +0200 Translation update done using Pootle. commit 4628ab162e46537f1c3b99c74ae9b016cf7a21b1 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jul 21 17:18:32 2011 +0200 Translation update done using Pootle. commit 1218d27a0f0a4cdba84aae469cc80026999ee447 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:18:22 2011 +0200 Translation update done using Pootle. commit 905beb5cd3087ea174ea5361c9ecf2ee20d5285e Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:16:54 2011 +0200 Translation update done using Pootle. commit 020c69ba4023b66fc7d2b63c9772416680c4c420 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:16:25 2011 +0200 Translation update done using Pootle. commit c6cdb6fe386232eff79ff29b87883450f0a7ddda Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:15:44 2011 +0200 Translation update done using Pootle. commit d268eaba82e7acedd8a8385718155c1905dc30da Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:14:24 2011 +0200 Translation update done using Pootle. commit 6ea1abe25c352c976749483f40303eb8f3968e5f Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:13:56 2011 +0200 Translation update done using Pootle. commit be1a2a75cb505bb7836e7876ddd1245c57220343 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:11:47 2011 +0200 Translation update done using Pootle. commit 569b8c1099f79a91799f08975ec85db35d550994 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 17:09:35 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/it.po | 510 ++++++++++++++++++++++++++++---------------------------------- po/sl.po | 38 +++-- po/tr.po | 76 +++++++--- 3 files changed, 308 insertions(+), 316 deletions(-) diff --git a/po/it.po b/po/it.po index e127f2a..1bbcd56 100644 --- a/po/it.po +++ b/po/it.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-21 14:00+0200\n" -"PO-Revision-Date: 2011-07-21 16:47+0200\n" +"PO-Revision-Date: 2011-07-21 19:12+0200\n" "Last-Translator: Rouslan Placella <rouslan(a)placella.com>\n" "Language-Team: italian <it(a)li.org>\n" "Language: it\n" @@ -1359,7 +1359,6 @@ msgid "From general log" msgstr "Dal general log" #: js/messages.php:145 -#, fuzzy msgid "Analysing & loading logs. This may take a while." msgstr "" "L'analisi e il caricamento dei log in corso. Questa operazione potrebbe " @@ -1371,6 +1370,9 @@ msgid "" "together. However only the SQL Text is being compared, thus the queries " "other attributes such as start time may differ." msgstr "" +"Questo campo mostra il numero di query identiche. Tuttavia solo il testo SQL " +"é confrontato, quindi gli altro attributi delle query, come lo 'start time' " +"potrebbero essere diversi." #: js/messages.php:147 msgid "" @@ -1492,7 +1494,7 @@ msgstr "Cancellazione" msgid "The definition of a stored function must contain a RETURN statement!" msgstr "" "La definizione delle funzioni memorizzate deve contenere un istruzione " -"RETURN." +"RETURN!" #: js/messages.php:191 msgid "" @@ -2056,6 +2058,7 @@ msgstr "La tabella %s è stata rinominata %s" #: libraries/Table.class.php:1274 msgid "Could not save table UI preferences" msgstr "" +"Impossibile salvare la tabella delle preferenze per l'interfaccia utente" #: libraries/Theme.class.php:143 #, php-format @@ -2183,10 +2186,9 @@ msgid "Wrong username/password. Access denied." msgstr "Nome utente o password errati. Accesso negato." #: libraries/auth/signon.auth.lib.php:87 -#, fuzzy #| msgid "Config authentication" msgid "Can not find signon authentication script:" -msgstr "Autenticazione via config" +msgstr "Impossibile ritrovare lo script per l'autenticazione signon:" #: libraries/auth/swekey/swekey.auth.lib.php:118 #, php-format @@ -2301,6 +2303,8 @@ msgid "" "This usually means there is a syntax error in it, please check any errors " "shown below." msgstr "" +"Questo di solito significa che vi è un errore di sintassi in esso, verifica " +"eventuali errori riportati in basso." #: libraries/common.inc.php:596 #, php-format @@ -2470,10 +2474,9 @@ msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s giorni, %s ore, %s minuti e %s secondi" #: libraries/common.lib.php:1876 -#, fuzzy #| msgid "Routines" msgid "Missing parameter:" -msgstr "Routines" +msgstr "Parametro mancante:" #: libraries/common.lib.php:2182 libraries/common.lib.php:2185 #: libraries/display_tbl.lib.php:299 @@ -2502,10 +2505,9 @@ msgid "The %s functionality is affected by a known bug, see %s" msgstr "La %s funzionalità è affetta da un bug noto, vedi %s" #: libraries/common.lib.php:2447 -#, fuzzy #| msgid "Click to select" msgid "Click to toggle" -msgstr "Clicca per selezionare" +msgstr "Clicca per alternare" #: libraries/common.lib.php:2718 libraries/common.lib.php:2725 #: libraries/common.lib.php:2914 libraries/config/setup.forms.php:296 @@ -2947,12 +2949,13 @@ msgid "" "Disable the table maintenance mass operations, like optimizing or repairing " "the selected tables of a database." msgstr "" +"Disabilita le operazioni di manutenzione delle tabelle, come " +"l'optimizzazione o la riparazione delle tabelle selezione nel database." #: libraries/config/messages.inc.php:61 -#, fuzzy #| msgid "Table maintenance" msgid "Disable multi table maintenance" -msgstr "Amministrazione tabella" +msgstr "Disabilita la manutenzione di meltiple tabelle" # ma come si dice "popup"? #: libraries/config/messages.inc.php:62 @@ -3722,10 +3725,11 @@ msgid "Enable highlighting" msgstr "Abilita evidenziamento" #: libraries/config/messages.inc.php:288 -#, fuzzy #| msgid "Maximum number of tables displayed in table list" msgid "Maximum number of recently used tables; set 0 to disable" -msgstr "Il massimo numero di tabelle da visualizzare nella lista di tabelle" +msgstr "" +"Il massimo numero di tabelle recenti da visualizzare; imposta 0 per " +"disabilitare" #: libraries/config/messages.inc.php:289 msgid "Recently used tables" @@ -4028,12 +4032,12 @@ msgstr "Motore di registrazione" #: libraries/config/messages.inc.php:350 msgid "When browsing tables, the sorting of each table is remembered" msgstr "" +"L'ordine delle tabelle é memorizzato durante la navigazione delle tabelle" #: libraries/config/messages.inc.php:351 -#, fuzzy #| msgid "Rename table to" msgid "Remember table's sorting" -msgstr "Rinomina la tabella in" +msgstr "Ricorda l'ordine delle tabelle" #: libraries/config/messages.inc.php:352 msgid "Repeat the headers every X cells, [kbd]0[/kbd] deactivates this feature" @@ -4299,9 +4303,8 @@ msgid "" "no support. Suggested: [kbd]phpmyadmin[/kbd]" msgstr "" "Database utilizzato per relazioni, segnalibri and funzionalitá PDF. Vedi " -"[a@http://wiki.phpmyadmin.net/pma/pmadb]pmadb[/a] per per tutti dettagli. " -"Lascia vuoto per disabilitarne il supporto. Consigliato: [kbd]phpmyadmin[/" -"kbd]" +"[a@http://wiki.phpmyadmin.net/pma/pmadb]pmadb[/a] per tutti dettagli. Lascia " +"vuoto per disabilitarne il supporto. Consigliato: [kbd]phpmyadmin[/kbd]" #: libraries/config/messages.inc.php:406 msgid "Database name" @@ -4317,7 +4320,6 @@ msgid "Server port" msgstr "Porta del server" #: libraries/config/messages.inc.php:409 -#, fuzzy #| msgid "" #| "Leave blank for no user preferences storage in database, suggested: [kbd]" #| "pma_config[/kbd]" @@ -4325,8 +4327,8 @@ msgid "" "Leave blank for no \"persistent\" recently used tables across sessions, " "suggested: [kbd]pma_recent[/kbd]" msgstr "" -"Lascia vuoto per disabilitare la memorizzazione delle preferenze degli " -"utenti nel database, consigliato: [kbd]pma_config[/kbd]" +"Lascia vuoto per disabilitare la memorizzazione delle tabelle recenti nel " +"database, consigliato: [kbd]pma_recent[/kbd]" #: libraries/config/messages.inc.php:410 msgid "Recently used table" @@ -4410,7 +4412,6 @@ msgid "Display columns table" msgstr "Visualizza i campi della tabella" #: libraries/config/messages.inc.php:426 -#, fuzzy #| msgid "" #| "Leave blank for no user preferences storage in database, suggested: [kbd]" #| "pma_config[/kbd]" @@ -4418,14 +4419,14 @@ msgid "" "Leave blank for no \"persistent\" tables'UI preferences across sessions, " "suggested: [kbd]pma_table_uiprefs[/kbd]" msgstr "" -"Lascia vuoto per disabilitare la memorizzazione delle preferenze degli " -"utenti nel database, consigliato: [kbd]pma_config[/kbd]" +"Lascia vuoto per disabilitare la memorizzazione delle preferenze " +"dell'interfaccia utenti nel database, consigliato: " +"[kbd]pma_table_uiprefs[/kbd]" #: libraries/config/messages.inc.php:427 -#, fuzzy #| msgid "User preferences storage table" msgid "UI preferences table" -msgstr "Tabella di memorizzazione delle preferenze degli utenti" +msgstr "Tabella di memorizzazione delle preferenze dell'interfaccia utente" #: libraries/config/messages.inc.php:428 msgid "" @@ -4570,12 +4571,14 @@ msgid "" "Defines whether or not type display direction option is shown when browsing " "a table" msgstr "" +"Definisce se mostrare l'opzione della direzione di visualizzazione durante " +"la navigazione delle tabelle" #: libraries/config/messages.inc.php:454 #, fuzzy #| msgid "Default display direction" msgid "Show display direction" -msgstr "Orientamento del display" +msgstr "Mostra la direzione della visualizzazione" #: libraries/config/messages.inc.php:455 msgid "" @@ -5360,28 +5363,28 @@ msgid "Language" msgstr "Lingua" #: libraries/display_tbl.lib.php:394 -#, fuzzy #| msgid "Textarea columns" msgid "Restore column order" -msgstr "Campi di aree di testo" +msgstr "Ripristina l'ordine dei campi" #: libraries/display_tbl.lib.php:414 msgid "Drag to reorder" -msgstr "" +msgstr "Trascina per riordinare" #: libraries/display_tbl.lib.php:415 -#, fuzzy #| msgid "Click to select" msgid "Click to sort" -msgstr "Clicca per selezionare" +msgstr "Clicca per ordinare" #: libraries/display_tbl.lib.php:416 msgid "Click to mark/unmark" -msgstr "" +msgstr "Clicca per selezionare/deselezionare" #: libraries/display_tbl.lib.php:417 msgid "Click the drop-down arrow<br />to toggle column's visibility" msgstr "" +"Clicca sulla freccia<br />per cambiare lo stato di visualizzazzione dei " +"campi" #: libraries/display_tbl.lib.php:428 #, php-format @@ -5389,22 +5392,19 @@ msgid "%d is not valid row number." msgstr "%d non è un numero valido di righe." #: libraries/display_tbl.lib.php:433 -#, fuzzy #| msgid "Textarea rows" msgid "Start row" -msgstr "Righe con aree di testo" +msgstr "Riga iniziale" #: libraries/display_tbl.lib.php:435 -#, fuzzy #| msgid "Number of rows:" msgid "Number of rows" -msgstr "Numero di righi:" +msgstr "Numero di righe" #: libraries/display_tbl.lib.php:440 -#, fuzzy #| msgid "More" msgid "Mode" -msgstr "Più" +msgstr "Modalitá" #: libraries/display_tbl.lib.php:442 msgid "horizontal" @@ -5421,7 +5421,7 @@ msgstr "verticale" #: libraries/display_tbl.lib.php:449 #, php-format msgid "Headers every %s rows" -msgstr "" +msgstr "Intestazioni ogni %s righe" #: libraries/display_tbl.lib.php:543 msgid "Sort by key" @@ -5477,15 +5477,17 @@ msgstr "Trasformazione del browser" #: libraries/display_tbl.lib.php:647 msgid "Geometry" -msgstr "" +msgstr "Geometria" #: libraries/display_tbl.lib.php:648 +#, fuzzy msgid "Well Known Text" -msgstr "" +msgstr "Well Known Text" #: libraries/display_tbl.lib.php:649 +#, fuzzy msgid "Well Known Binary" -msgstr "" +msgstr "Well Known Binary" #: libraries/display_tbl.lib.php:1300 msgid "Copy" @@ -5531,7 +5533,7 @@ msgstr "Mostra diagramma" #: libraries/display_tbl.lib.php:2506 msgid "Visualize GIS data" -msgstr "" +msgstr "Visualizzare dati GIS" #: libraries/display_tbl.lib.php:2526 msgid "Create view" @@ -6310,10 +6312,9 @@ msgid "Open new phpMyAdmin window" msgstr "Apri una nuova finestra di PhpMyAdmin" #: libraries/gis_visualization.lib.php:129 -#, fuzzy #| msgid "No data found for the chart." msgid "No data found for GIS visualization." -msgstr "Nessun tipo di dato trovato per il diagramma." +msgstr "Nessun data trovato per la visualizzazione GIS." #: libraries/header_printview.inc.php:49 libraries/header_printview.inc.php:54 msgid "SQL result" @@ -6746,7 +6747,7 @@ msgstr "Storico dell'SQL" #, fuzzy #| msgid "Persistent connections" msgid "Persistent recently used tables" -msgstr "Connessione persistente" +msgstr "Tabelle recenti persistenti" #: libraries/relation.lib.php:136 msgid "Persistent tables' UI preferences" @@ -6894,48 +6895,49 @@ msgstr "Genera Password" #: libraries/rte/rte_routines.lib.php:1242 #: libraries/rte/rte_triggers.lib.php:75 libraries/rte/rte_triggers.lib.php:80 #: libraries/rte/rte_triggers.lib.php:103 -#, fuzzy, php-format +#, php-format #| msgid "The following queries have been executed:" msgid "The following query has failed: \"%s\"" -msgstr "Le seguenti query sono state eseguite:" +msgstr "La seguente query é fallita: \"%s\"" #: libraries/rte/rte_events.lib.php:116 msgid "Sorry, we failed to restore the dropped event." msgstr "" +"Ci dispiace, non siamo riusciti a ripristinare l'evento che é stato rimosso." #: libraries/rte/rte_events.lib.php:117 libraries/rte/rte_routines.lib.php:269 #: libraries/rte/rte_triggers.lib.php:90 msgid "The backed up query was:" -msgstr "" +msgstr "La query di backup é:" #: libraries/rte/rte_events.lib.php:121 -#, fuzzy, php-format +#, php-format #| msgid "Column %s has been dropped" msgid "Event %1$s has been modified." -msgstr "Il campo %s è stato eliminato" +msgstr "L'evento %1$s é stato modificato." #: libraries/rte/rte_events.lib.php:133 -#, fuzzy, php-format +#, php-format #| msgid "Table %1$s has been created." msgid "Event %1$s has been created." -msgstr "La tabella %1$s è stata creata." +msgstr "L'evento %1$s é stato creato." #: libraries/rte/rte_events.lib.php:141 libraries/rte/rte_routines.lib.php:294 #: libraries/rte/rte_triggers.lib.php:114 msgid "<b>One or more errors have occured while processing your request:</b>" msgstr "" +"<b>Si sono verificati uno o piú errori durante l'esecuz\\ione della tua " +"richiesta:</b>" #: libraries/rte/rte_events.lib.php:181 -#, fuzzy #| msgid "Create view" msgid "Create event" -msgstr "Crea vista" +msgstr "Crea evento" #: libraries/rte/rte_events.lib.php:185 -#, fuzzy #| msgid "Edit server" msgid "Edit event" -msgstr "Modifica server" +msgstr "Modifica evento" #: libraries/rte/rte_events.lib.php:212 libraries/rte/rte_routines.lib.php:370 #: libraries/rte/rte_routines.lib.php:1264 @@ -6946,109 +6948,101 @@ msgstr "Errore nel processare la richiesta" #: libraries/rte/rte_events.lib.php:371 libraries/rte/rte_routines.lib.php:817 #: libraries/rte/rte_triggers.lib.php:298 -#, fuzzy #| msgid "Details..." msgid "Details" -msgstr "Dettagli..." +msgstr "Dettagli" #: libraries/rte/rte_events.lib.php:374 -#, fuzzy #| msgid "Event type" msgid "Event name" -msgstr "Tipo di evento" +msgstr "Nome dell'evento" #: libraries/rte/rte_events.lib.php:395 server_binlog.php:182 msgid "Event type" msgstr "Tipo di evento" #: libraries/rte/rte_events.lib.php:416 libraries/rte/rte_routines.lib.php:838 -#, fuzzy, php-format +#, php-format #| msgid "Change" msgid "Change to %s" -msgstr "Modifica" +msgstr "Cambia a %s" #: libraries/rte/rte_events.lib.php:422 -#, fuzzy #| msgid "Execute" msgid "Execute at" -msgstr "Esegui" +msgstr "Esegui il" #: libraries/rte/rte_events.lib.php:430 -#, fuzzy #| msgid "Execute" msgid "Execute every" -msgstr "Esegui" +msgstr "Esegui ogni" #: libraries/rte/rte_events.lib.php:449 -#, fuzzy #| msgid "Startup" msgid "Start" -msgstr "Avvio" +msgstr "Inizio" #: libraries/rte/rte_events.lib.php:465 libraries/rte/rte_routines.lib.php:912 #: libraries/rte/rte_triggers.lib.php:348 -#, fuzzy #| msgid "Description" msgid "Definition" -msgstr "Descrizione" +msgstr "Definizione" #: libraries/rte/rte_events.lib.php:471 -#, fuzzy #| msgid "complete inserts" msgid "On completion preserve" -msgstr "inserimenti completi" +msgstr "Conserva dopo il completamento" #: libraries/rte/rte_events.lib.php:475 libraries/rte/rte_routines.lib.php:922 #: libraries/rte/rte_triggers.lib.php:354 msgid "Definer" -msgstr "" +msgstr "Definer" #: libraries/rte/rte_events.lib.php:518 libraries/rte/rte_routines.lib.php:986 #: libraries/rte/rte_triggers.lib.php:392 msgid "The definer must be in the \"username@hostname\" format" -msgstr "" +msgstr "Il definer deve essere nel seguente formato: \"nomeutente@nomehost\"" #: libraries/rte/rte_events.lib.php:525 msgid "You must provide an event name" -msgstr "" +msgstr "È necessario fornire il nome dell'evento" #: libraries/rte/rte_events.lib.php:537 msgid "You must provide a valid interval value for the event." -msgstr "" +msgstr "È necessario fornire un intervallo valido per l'evento." #: libraries/rte/rte_events.lib.php:549 msgid "You must provide a valid execution time for the event." -msgstr "" +msgstr "È necessario fornire una data valida per l'esecuzione dell'evento." #: libraries/rte/rte_events.lib.php:553 msgid "You must provide a valid type for the event." -msgstr "" +msgstr "È necessario fornire un valido tipo per l'evento." #: libraries/rte/rte_events.lib.php:572 msgid "You must provide an event definition." -msgstr "" +msgstr "È necessario fornire una definizione per l'evento." #: libraries/rte/rte_footer.lib.php:29 msgid "New" -msgstr "" +msgstr "Nuovo" #: libraries/rte/rte_footer.lib.php:91 msgid "OFF" -msgstr "" +msgstr "Disattivato" #: libraries/rte/rte_footer.lib.php:96 msgid "ON" -msgstr "" +msgstr "Attivato" #: libraries/rte/rte_footer.lib.php:108 msgid "Event scheduler status" -msgstr "" +msgstr "Stato del pianificatore degli eventi" #: libraries/rte/rte_list.lib.php:52 -#, fuzzy #| msgid "Return type" msgid "Returns" -msgstr "Tipo di risultato" +msgstr "Ritorna" #: libraries/rte/rte_list.lib.php:58 libraries/rte/rte_triggers.lib.php:320 #: server_status.php:989 sql.php:943 @@ -7057,7 +7051,7 @@ msgstr "Tempo" #: libraries/rte/rte_list.lib.php:59 libraries/rte/rte_triggers.lib.php:334 msgid "Event" -msgstr "Eventi" +msgstr "Evento" #: libraries/rte/rte_routines.lib.php:64 msgid "" @@ -7065,112 +7059,109 @@ msgid "" "handling multi queries. <b>The execution of some stored routines may fail!</" "b> Please use the improved 'mysqli' extension to avoid any problems." msgstr "" +"Stai utilizzanto la vecchia estenzione 'mysql' di PHP che non é in grado di " +"eseguire multi query. <b>L'esecuzione di alcune routine memorizzate potrebbe " +"fallire!</b> É consigliato di utilizzare l'estensione 'mysqli' per evitare " +"eventuali problemi." #: libraries/rte/rte_routines.lib.php:247 #: libraries/rte/rte_routines.lib.php:994 -#, fuzzy, php-format +#, php-format #| msgid "Invalid server index: %s" msgid "Invalid routine type: \"%s\"" -msgstr "Indice server non valido: %s" +msgstr "Tipo di routine non valido: \"%s\"" #: libraries/rte/rte_routines.lib.php:268 msgid "Sorry, we failed to restore the dropped routine." msgstr "" +"Ci dispiace, non siamo riusciti a ripristinare la routine che é stata " +"rimossa." #: libraries/rte/rte_routines.lib.php:273 -#, fuzzy, php-format +#, php-format #| msgid "Column %s has been dropped" msgid "Routine %1$s has been modified." -msgstr "Il campo %s è stato eliminato" +msgstr "La routine %1$s é stata modificata." #: libraries/rte/rte_routines.lib.php:286 -#, fuzzy, php-format +#, php-format #| msgid "Table %1$s has been created." msgid "Routine %1$s has been created." -msgstr "La tabella %1$s è stata creata." +msgstr "La routine %1$s é stata creata." #: libraries/rte/rte_routines.lib.php:340 -#, fuzzy #| msgid "Create relation" msgid "Create routine" -msgstr "Crea relazioni" +msgstr "Crea routine" #: libraries/rte/rte_routines.lib.php:344 -#, fuzzy #| msgid "Edit mode" msgid "Edit routine" -msgstr "Modalitá di modifica" +msgstr "Modifica routine" #: libraries/rte/rte_routines.lib.php:820 -#, fuzzy #| msgid "Routines" msgid "Routine name" -msgstr "Routines" +msgstr "Nome della routine" #: libraries/rte/rte_routines.lib.php:843 msgid "Parameters" -msgstr "" +msgstr "Parametri" #: libraries/rte/rte_routines.lib.php:848 -#, fuzzy #| msgid "Direct links" msgid "Direction" -msgstr "Link diretti" +msgstr "Direzione" #: libraries/rte/rte_routines.lib.php:851 libraries/tbl_properties.inc.php:108 msgid "Length/Values" -msgstr "Lunghezza/Set*" +msgstr "Lunghezza/Valori" #: libraries/rte/rte_routines.lib.php:866 -#, fuzzy #| msgid "Add prefix" msgid "Add parameter" -msgstr "Aggiungi prefisso" +msgstr "Aggiungi parametro" #: libraries/rte/rte_routines.lib.php:870 -#, fuzzy #| msgid "Remove database" msgid "Remove last parameter" -msgstr "Rimuovi il database" +msgstr "Rimuovi l'ultimo parametro" #: libraries/rte/rte_routines.lib.php:875 msgid "Return type" msgstr "Tipo di risultato" #: libraries/rte/rte_routines.lib.php:881 -#, fuzzy #| msgid "Length/Values" msgid "Return length/values" -msgstr "Lunghezza/Set*" +msgstr "Lunghezza/valori del risultato" #: libraries/rte/rte_routines.lib.php:887 -#, fuzzy #| msgid "Table options" msgid "Return options" -msgstr "Opzioni della tabella" +msgstr "Opzioni del risultato" #: libraries/rte/rte_routines.lib.php:918 msgid "Is deterministic" msgstr "" #: libraries/rte/rte_routines.lib.php:927 -#, fuzzy #| msgid "Security" msgid "Security type" -msgstr "Sicurezza" +msgstr "Tipo di sicurezza" #: libraries/rte/rte_routines.lib.php:934 msgid "SQL data access" -msgstr "" +msgstr "Tipo di accesso dati SQL" #: libraries/rte/rte_routines.lib.php:999 msgid "You must provide a routine name" -msgstr "" +msgstr "È necessario fornire il nome della routine" #: libraries/rte/rte_routines.lib.php:1025 #, php-format msgid "Invalid direction \"%s\" given for parameter." -msgstr "" +msgstr "Direzione invalida \"%s\" é stata fornita per un parametro." #: libraries/rte/rte_routines.lib.php:1037 #: libraries/rte/rte_routines.lib.php:1075 @@ -7178,43 +7169,49 @@ msgid "" "You must provide length/values for routine parameters of type ENUM, SET, " "VARCHAR and VARBINARY." msgstr "" +"È necessario fornire lunghezza o valori per parameteri della routine del " +"tipo ENUM, SET, VARCHAR e VARBINARY." #: libraries/rte/rte_routines.lib.php:1055 msgid "You must provide a name and a type for each routine parameter." msgstr "" +"È necessario fornire un nome ed un tipo per ogni parametro della routine." #: libraries/rte/rte_routines.lib.php:1065 msgid "You must provide a valid return type for the routine." -msgstr "" +msgstr "È necessario fornire un valido tipo del risultato." #: libraries/rte/rte_routines.lib.php:1109 msgid "You must provide a routine definition." -msgstr "" +msgstr "È necessario fornire una definizione per la routine." #: libraries/rte/rte_routines.lib.php:1198 #, php-format msgid "%d row affected by the last statement inside the procedure" msgid_plural "%d rows affected by the last statement inside the procedure" msgstr[0] "" +"%d riga influenzata dall'ultima istruzione eseguita all'interno della " +"procedura" msgstr[1] "" +"%d righe influenzate dall'ultima istruzione eseguita all'interno della " +"procedura" #: libraries/rte/rte_routines.lib.php:1214 -#, fuzzy, php-format +#, php-format #| msgid "Allows executing stored routines." msgid "Execution results of routine %s" -msgstr "Permette l'esecuzione di routines memorizzate." +msgstr "Risultato di esecuzione della routine %s" #: libraries/rte/rte_routines.lib.php:1288 #: libraries/rte/rte_routines.lib.php:1294 msgid "Execute routine" -msgstr "" +msgstr "Esegui routine" #: libraries/rte/rte_routines.lib.php:1345 #: libraries/rte/rte_routines.lib.php:1348 -#, fuzzy #| msgid "Routines" msgid "Routine parameters" -msgstr "Routines" +msgstr "Parametri della routine" #: libraries/rte/rte_routines.lib.php:1355 tbl_change.php:287 #: tbl_change.php:325 @@ -7224,166 +7221,152 @@ msgstr "Funzione" #: libraries/rte/rte_triggers.lib.php:89 msgid "Sorry, we failed to restore the dropped trigger." msgstr "" +"Ci dispiace, non siamo riusciti a ripristinare il trigger che é stato " +"rimosso." #: libraries/rte/rte_triggers.lib.php:94 -#, fuzzy, php-format +#, php-format #| msgid "Column %s has been dropped" msgid "Trigger %1$s has been modified." -msgstr "Il campo %s è stato eliminato" +msgstr "Il trigger %1$s é stato modificato." #: libraries/rte/rte_triggers.lib.php:106 -#, fuzzy, php-format +#, php-format #| msgid "Table %1$s has been created." msgid "Trigger %1$s has been created." -msgstr "La tabella %1$s è stata creata." +msgstr "Il trigger %1$s é stato creato." #: libraries/rte/rte_triggers.lib.php:157 -#, fuzzy #| msgid "Create view" msgid "Create trigger" -msgstr "Crea vista" +msgstr "Crea trigger" #: libraries/rte/rte_triggers.lib.php:161 -#, fuzzy #| msgid "Add a new server" msgid "Edit trigger" -msgstr "Aggiungi un nuovo server" +msgstr "Modifica trigger" #: libraries/rte/rte_triggers.lib.php:301 -#, fuzzy #| msgid "Triggers" msgid "Trigger name" -msgstr "Triggers" +msgstr "Nome del trigger" #: libraries/rte/rte_triggers.lib.php:399 msgid "You must provide a trigger name" -msgstr "" +msgstr "È necessario fornire il nome del trigger" #: libraries/rte/rte_triggers.lib.php:404 msgid "You must provide a valid timing for the trigger" -msgstr "" +msgstr "È necessario fornire un timing valido per il trigger" #: libraries/rte/rte_triggers.lib.php:409 msgid "You must provide a valid event for the trigger" -msgstr "" +msgstr "È necessario fornire un valido evento per il trigger" #: libraries/rte/rte_triggers.lib.php:415 -#, fuzzy #| msgid "Invalid table name" msgid "You must provide a valid table name" -msgstr "Nome tabella non valido" +msgstr "È necessario fornire un valido nome di tabella" #: libraries/rte/rte_triggers.lib.php:421 msgid "You must provide a trigger definition." -msgstr "" +msgstr "È necessario fornire una definizione per il trigger." #: libraries/rte/rte_words.lib.php:18 -#, fuzzy #| msgid "Add index" msgid "Add routine" -msgstr "Aggiungi indice" +msgstr "Aggiungi una routine" #: libraries/rte/rte_words.lib.php:20 -#, fuzzy, php-format +#, php-format #| msgid "Export defaults" msgid "Export of routine %s" -msgstr "Esporta i predefiniti" +msgstr "Esportazione della routine %s" #: libraries/rte/rte_words.lib.php:21 -#, fuzzy #| msgid "Routines" msgid "routine" -msgstr "Routines" +msgstr "routine" #: libraries/rte/rte_words.lib.php:22 -#, fuzzy #| msgid "You don't have sufficient privileges to be here right now!" msgid "You do not have the necessary privileges to create a routine" -msgstr "Non hai i permessi per effettuare questa operazione!" +msgstr "Non hai i necessari privilegi per creare una routine" #: libraries/rte/rte_words.lib.php:23 -#, fuzzy, php-format +#, php-format #| msgid "No tables found in database" msgid "No routine with name %1$s found in database %2$s" -msgstr "Non ci sono tabelle nel database" +msgstr "Non é stata trovata alcuna routine con nome %1$s nel database %2$s" #: libraries/rte/rte_words.lib.php:24 -#, fuzzy #| msgid "There are no files to upload" msgid "There are no routines to display." -msgstr "Nessun file da caricare" +msgstr "Non ci sono routine da visualizzare." #: libraries/rte/rte_words.lib.php:30 -#, fuzzy #| msgid "Add a new server" msgid "Add trigger" -msgstr "Aggiungi un nuovo server" +msgstr "Aggiungi trigger" #: libraries/rte/rte_words.lib.php:32 -#, fuzzy, php-format +#, php-format #| msgid "Export contents" msgid "Export of trigger %s" -msgstr "Esporta contenuti" +msgstr "Esportazione del trigger %s" #: libraries/rte/rte_words.lib.php:33 -#, fuzzy #| msgid "Triggers" msgid "trigger" -msgstr "Triggers" +msgstr "trigger" #: libraries/rte/rte_words.lib.php:34 -#, fuzzy #| msgid "You don't have sufficient privileges to be here right now!" msgid "You do not have the necessary privileges to create a trigger" -msgstr "Non hai i permessi per effettuare questa operazione!" +msgstr "Non hai i necessari privilegi per creare un trigger" #: libraries/rte/rte_words.lib.php:35 -#, fuzzy, php-format +#, php-format #| msgid "No tables found in database" msgid "No trigger with name %1$s found in database %2$s" -msgstr "Non ci sono tabelle nel database" +msgstr "Non é stata trovato alcun trigger con nome %1$s nel database %2$s" #: libraries/rte/rte_words.lib.php:36 -#, fuzzy #| msgid "There are no files to upload" msgid "There are no triggers to display." -msgstr "Nessun file da caricare" +msgstr "Non ci sono trigger da visualizzare." #: libraries/rte/rte_words.lib.php:42 -#, fuzzy #| msgid "Add a new server" msgid "Add event" -msgstr "Aggiungi un nuovo server" +msgstr "Aggiungi evento" #: libraries/rte/rte_words.lib.php:44 -#, fuzzy, php-format +#, php-format #| msgid "Export contents" msgid "Export of event %s" -msgstr "Esporta contenuti" +msgstr "Esportazione dell'evento %s" #: libraries/rte/rte_words.lib.php:45 -#, fuzzy #| msgid "Event" msgid "event" -msgstr "Eventi" +msgstr "evento" #: libraries/rte/rte_words.lib.php:46 -#, fuzzy #| msgid "You don't have sufficient privileges to be here right now!" msgid "You do not have the necessary privileges to create an event" -msgstr "Non hai i permessi per effettuare questa operazione!" +msgstr "Non hai i necessari privilegi per creare un evento" #: libraries/rte/rte_words.lib.php:47 -#, fuzzy, php-format +#, php-format #| msgid "No tables found in database" msgid "No event with name %1$s found in database %2$s" -msgstr "Non ci sono tabelle nel database" +msgstr "Non é stata trovato alcun evento con nome %1$s nel database %2$s" #: libraries/rte/rte_words.lib.php:48 -#, fuzzy #| msgid "There are no files to upload" msgid "There are no events to display." -msgstr "Nessun file da caricare" +msgstr "Non ci sono eventi da visualizzare." #: libraries/schema/Dia_Relation_Schema.class.php:222 #: libraries/schema/Eps_Relation_Schema.class.php:395 @@ -7833,10 +7816,9 @@ msgid "PARTITION definition" msgstr "Definizione PARTITION" #: libraries/tbl_properties.inc.php:779 -#, fuzzy #| msgid "+ Add a new value" msgid "+ Add a value" -msgstr "+ Aggiungi un nuovo valore" +msgstr "+ Aggiungi un valore" #: libraries/transformations/application_octetstream__download.inc.php:9 msgid "" @@ -8990,10 +8972,9 @@ msgid "wildcard" msgstr "wildcard" #: server_privileges.php:2295 -#, fuzzy #| msgid "View %s has been dropped" msgid "User has been added." -msgstr "La vista %s è stata eliminata" +msgstr "L'utente é stato aggiunto." #: server_replication.php:49 msgid "Unknown error" @@ -9175,26 +9156,25 @@ msgstr "" "Vorresti <a href=\"%s\">configurarlo ora</a>?" #: server_status.php:27 -#, fuzzy #| msgid "Refresh" msgid "Refresh rate" -msgstr "Aggiorna" +msgstr "Ritmo di aggiornamenti" #: server_status.php:31 server_status.php:1460 -#, fuzzy, php-format +#, php-format #| msgid "Minute" msgid "%d minute" msgid_plural "%d minutes" -msgstr[0] "Minuto" -msgstr[1] "Minuto" +msgstr[0] "%d minuto" +msgstr[1] "%d minuti" #: server_status.php:33 server_status.php:1458 -#, fuzzy, php-format +#, php-format #| msgid "Second" msgid "%d second" msgid_plural "%d seconds" -msgstr[0] "Secondo" -msgstr[1] "Secondo" +msgstr[0] "%d secondo" +msgstr[1] "%d secondi" #: server_status.php:309 #, php-format @@ -9270,55 +9250,50 @@ msgid "Runtime Information" msgstr "Informazioni di Runtime" #: server_status.php:586 -#, fuzzy #| msgid "Server Choice" msgid "Server traffic" -msgstr "Scelta del server" +msgstr "Traffico del server" #: server_status.php:588 -#, fuzzy #| msgid "See slave status table" msgid "All status variables" -msgstr "Vedi la tabella di stato dello slave" +msgstr "Tutte le variabili di stato" #: server_status.php:589 msgid "Monitor" -msgstr "" +msgstr "Monitoraggio" #: server_status.php:599 server_status.php:621 -#, fuzzy #| msgid "Refresh" msgid "Refresh rate: " -msgstr "Aggiorna" +msgstr "Ritmo dell'aggiornamento: " #: server_status.php:642 -#, fuzzy #| msgid "Do not change the password" msgid "Containing the word:" -msgstr "Non cambiare la password" +msgstr "Contenente la parola:" #: server_status.php:647 #, fuzzy #| msgid "Show open tables" msgid "Show only alert values" -msgstr "Mostra le tabelle aperte" +msgstr "Mostra solo i valori di allarme" #: server_status.php:651 msgid "Filter by category..." -msgstr "" +msgstr "Filtra per categoria..." #: server_status.php:664 -#, fuzzy #| msgid "Related Links" msgid "Related links:" -msgstr "Collegamenti Associati" +msgstr "Collegamenti associati:" #. l10n: Questions is the name of a MySQL Status variable #: server_status.php:708 -#, fuzzy, php-format +#, php-format #| msgid "Customize startup page" msgid "Questions since startup: %s" -msgstr "Personalizza la pagina di avvio" +msgstr "Questions eseguiti dall'avvio: %s" #: server_status.php:714 server_status.php:749 server_status.php:865 #: server_status.php:910 @@ -9340,18 +9315,18 @@ msgstr "Istruzioni" #. l10n: # = Amount of queries #: server_status.php:747 msgid "#" -msgstr "" +msgstr "#" #: server_status.php:814 #, php-format msgid "Network traffic since startup: %s" -msgstr "" +msgstr "Traffico rete dall'avvio: %s" #: server_status.php:822 -#, fuzzy, php-format +#, php-format #| msgid "This MySQL server has been running for %s. It started up on %s." msgid "This MySQL server has been running for %1$s. It started up on %2$s." -msgstr "Questo server MySQL sta girando da %s. É stato avviato il %s." +msgstr "Questo server MySQL sta girando da %1$s. É stato avviato il %2$s." #: server_status.php:832 msgid "" @@ -9428,12 +9403,13 @@ msgid "" "The number of connections that were aborted because the client died without " "closing the connection properly." msgstr "" +"Il numero di connessioni fallite perché il cliente é morto senza chiudere la " +"connessione correttemente." #: server_status.php:1046 -#, fuzzy #| msgid "Could not connect to MySQL server" msgid "The number of failed attempts to connect to the MySQL server." -msgstr "Impossibile effettuare la connessione al server MySQL" +msgstr "Il numero di tentativi falliti di connettere al server MySQL." #: server_status.php:1047 msgid "" @@ -9454,6 +9430,8 @@ msgstr "" msgid "" "The number of connection attempts (successful or not) to the MySQL server." msgstr "" +"Il numero di tentativi di connesione al server MySQL (completati con " +"successo o no)." #: server_status.php:1050 msgid "" @@ -9889,6 +9867,8 @@ msgid "" "The maximum number of connections that have been in use simultaneously since " "the server started." msgstr "" +"Il massimo numero di connessioni che sono state utilizzate " +"contemporaneamente dall'avvio del server." #: server_status.php:1121 msgid "The number of rows waiting to be written in INSERT DELAYED queues." @@ -9922,6 +9902,9 @@ msgid "" "fragmentation issues, which may be solved by issuing a FLUSH QUERY CACHE " "statement." msgstr "" +"Il numero di blocchi di memoria liberi nell a query cache. Numeri alti " +"potrebbero indicare problemi di fragmentazione che possono essere risolti " +"con l'esecuzione dell'istruzione FLUSH QUERY CACHE." #: server_status.php:1127 msgid "The amount of free memory for query cache." @@ -10104,54 +10087,47 @@ msgid "The number of threads that are not sleeping." msgstr "Il numero di processi non in attesa." #: server_status.php:1290 -#, fuzzy #| msgid "Textarea rows" msgid "Start Monitor" -msgstr "Righe con aree di testo" +msgstr "Avvia monitoraggio" #: server_status.php:1298 -#, fuzzy #| msgid "Introduction" msgid "Instructions/Setup" -msgstr "Introduzione" +msgstr "Istruzioni/Configurazione" #: server_status.php:1302 msgid "Done rearranging/editing charts" -msgstr "" +msgstr "Ho finito di modificare/muovere i grafici" #: server_status.php:1309 -#, fuzzy #| msgid "Add prefix" msgid "Add chart" -msgstr "Aggiungi prefisso" +msgstr "Aggiungi grafico" #: server_status.php:1311 msgid "Rearrange/edit charts" -msgstr "" +msgstr "Muovi/modifica i grafici" #: server_status.php:1313 -#, fuzzy #| msgid "Refresh" msgid "Refresh rate:" -msgstr "Aggiorna" +msgstr "Ritmo di aggiornamenti:" #: server_status.php:1316 -#, fuzzy #| msgid "Textarea columns" msgid "Chart columns:" -msgstr "Campi di aree di testo" +msgstr "Campi del grafico:" #: server_status.php:1330 -#, fuzzy #| msgid "User for config auth" msgid "Clear monitor config" -msgstr "Utente per il config auth" +msgstr "Cancella la configurazione di monitoraggio" #: server_status.php:1333 -#, fuzzy #| msgid "Introduction" msgid "Monitor Instructions" -msgstr "Introduzione" +msgstr "Istruzioni per monitoraggio" #: server_status.php:1334 msgid "" @@ -10183,77 +10159,68 @@ msgid "" msgstr "" #: server_status.php:1361 -#, fuzzy #| msgid "Usage" msgid "CPU Usage" -msgstr "Utilizzo" +msgstr "Utilizzo della CPU" #: server_status.php:1364 -#, fuzzy msgid "Memory Usage" -msgstr "[2. Usage]" +msgstr "Utilizzo della memoria" #: server_status.php:1367 -#, fuzzy #| msgid "Usage" msgid "Swap Usage" -msgstr "Utilizzo" +msgstr "Utilizzo dello swap" #: server_status.php:1370 -#, fuzzy #| msgid "See slave status table" msgid "Status variable(s)" -msgstr "Vedi la tabella di stato dello slave" +msgstr "Variabili di stato" #: server_status.php:1372 -#, fuzzy #| msgid "Select Tables" msgid "Select series:" -msgstr "Seleziona Tables" +msgstr "Seleziona serie:" #: server_status.php:1374 msgid "Commonly monitored" -msgstr "" +msgstr "Monitorate di solito" #: server_status.php:1389 -#, fuzzy #| msgid "Invalid table name" msgid "or type variable name:" -msgstr "Nome tabella non valido" +msgstr "or scrivi il nome di una variabile:" #: server_status.php:1393 msgid "Display as differential value" -msgstr "" +msgstr "Visualizzare come valore differenziale" #: server_status.php:1395 msgid "Apply a divisor" -msgstr "" +msgstr "Applica un divisore" #: server_status.php:1402 msgid "Append unit to data values" -msgstr "" +msgstr "Aggiungi un unitá ai valori dei dati" #: server_status.php:1408 -#, fuzzy #| msgid "Add a new server" msgid "Add this series" -msgstr "Aggiungi un nuovo server" +msgstr "Aggiungi questa serie" #: server_status.php:1410 msgid "Clear series" -msgstr "" +msgstr "Cancella la serie" #: server_status.php:1413 -#, fuzzy #| msgid "SQL queries" msgid "Series in Chart:" -msgstr "Query SQL" +msgstr "Serie del grafico:" #: server_status.php:1421 -#, fuzzy #| msgid "Loading" msgid "Loading logs" -msgstr "Caricamento" +msgstr "Caricamento dei log in corso" #: server_status.php:1424 #, fuzzy @@ -10378,7 +10345,7 @@ msgstr "" #: server_variables.php:58 msgid "Setting variable failed" -msgstr "" +msgstr "L'impostazione della variablile é fallita" #: server_variables.php:77 msgid "Server variables and settings" @@ -10834,7 +10801,7 @@ msgstr "Linea" #, fuzzy #| msgid "Inline" msgid "Spline" -msgstr "Inline" +msgstr "Scanalatura" #: tbl_chart.php:89 msgid "Pie" @@ -10845,50 +10812,43 @@ msgid "Stacked" msgstr "Sovrapposti" #: tbl_chart.php:94 -#, fuzzy #| msgid "Report title:" msgid "Chart title" -msgstr "Titolo del report:" +msgstr "Titolo del grafico" #: tbl_chart.php:99 msgid "X-Axis:" -msgstr "" +msgstr "Asse X:" #: tbl_chart.php:113 -#, fuzzy #| msgid "SQL queries" msgid "Series:" -msgstr "Query SQL" +msgstr "Serie:" #: tbl_chart.php:115 -#, fuzzy #| msgid "Textarea columns" msgid "The remaining columns" -msgstr "Campi di aree di testo" +msgstr "I campi rimanenti" #: tbl_chart.php:128 -#, fuzzy #| msgid "X Axis label" msgid "X-Axis label:" -msgstr "Etichetta per l'asse X" +msgstr "Etichetta per l'asse X:" #: tbl_chart.php:128 -#, fuzzy #| msgid "Value" msgid "X Values" -msgstr "Valore" +msgstr "Valori per asse X" #: tbl_chart.php:129 -#, fuzzy #| msgid "Y Axis label" msgid "Y-Axis label:" -msgstr "Etichetta per l'asse X" +msgstr "Etichetta per l'asse Y:" #: tbl_chart.php:129 -#, fuzzy #| msgid "Value" msgid "Y Values" -msgstr "Valore" +msgstr "Valori per asse Y" #: tbl_create.php:30 #, php-format @@ -10905,10 +10865,9 @@ msgid "View dump (schema) of table" msgstr "Visualizza dump (schema) della tabella" #: tbl_gis_visualization.php:111 -#, fuzzy #| msgid "Display servers selection" msgid "Display GIS Visualization" -msgstr "Visalizza la selezione dei server" +msgstr "Mostra la visualizzazione GIS" #: tbl_gis_visualization.php:157 msgid "Width" @@ -10919,22 +10878,19 @@ msgid "Height" msgstr "Altezza" #: tbl_gis_visualization.php:165 -#, fuzzy #| msgid "Textarea columns" msgid "Label column" -msgstr "Campi di aree di testo" +msgstr "Etichetta del campo" #: tbl_gis_visualization.php:167 -#, fuzzy #| msgid "- none -" msgid "-- None --" -msgstr "- nessuno -" +msgstr "-- Nessuno --" #: tbl_gis_visualization.php:180 -#, fuzzy #| msgid "Log file count" msgid "Spatial column" -msgstr "Numero dei file di log" +msgstr "" #: tbl_gis_visualization.php:201 msgid "Use OpenStreetMaps as Base Layer" @@ -10945,16 +10901,14 @@ msgid "Redraw" msgstr "Ridisegna" #: tbl_gis_visualization.php:206 -#, fuzzy #| msgid "Save as file" msgid "Save to file" -msgstr "Salva con nome" +msgstr "Salva nel file" #: tbl_gis_visualization.php:207 -#, fuzzy #| msgid "Table name" msgid "File name" -msgstr "Nome tabella" +msgstr "Nome del file" #: tbl_indexes.php:66 msgid "The name of the primary key must be \"PRIMARY\"!" @@ -11216,7 +11170,7 @@ msgstr "Aggiungi un indice unico" #, fuzzy #| msgid "Add index" msgid "Add SPATIAL index" -msgstr "Aggiungi indice" +msgstr "Aggiungi indice SPATIAL" #: tbl_structure.php:178 tbl_structure.php:179 msgid "Add FULLTEXT index" diff --git a/po/sl.po b/po/sl.po index 6499aa7..7071d1f 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,15 +4,15 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-21 14:00+0200\n" -"PO-Revision-Date: 2011-07-19 23:21+0200\n" +"PO-Revision-Date: 2011-07-21 19:45+0200\n" "Last-Translator: Domen <dbc334(a)gmail.com>\n" "Language-Team: slovenian <sl(a)li.org>\n" "Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" -"%100==4 ? 2 : 3);\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || " +"n%100==4 ? 2 : 3);\n" "X-Generator: Pootle 2.0.5\n" #: browse_foreigners.php:35 browse_foreigners.php:53 @@ -1241,6 +1241,9 @@ msgid "" "than %d seconds. It is advisable to set this long_query_time 0-2 seconds, " "depending on your system." msgstr "" +"slow_query_log je omogočen, vendar strežnik zabeleži samo poizvedbe, ki " +"trajajo več kot %d sekund. Priporočljivo je, da nastavite long_query_time na " +"0–2 sekundi, odvisno od vašega sistema." #: js/messages.php:121 #, php-format @@ -1284,6 +1287,8 @@ msgid "" "You can't change these variables. Please log in as root or contact your " "database administrator." msgstr "" +"Teh spremenljivk ne morete spremeniti. Prosimo, prijavite se kot root ali " +"stopite v stik z upravljavcem vaše zbirke podatkov." #: js/messages.php:132 msgid "Change settings" @@ -1341,6 +1346,9 @@ msgid "" "together. However only the SQL Text is being compared, thus the queries " "other attributes such as start time may differ." msgstr "" +"Stolpec prikazuje število identičnih poizvedb, ki so zbrane skupaj. " +"Primerjano je samo besedilo SQL, zato se lahko drugi atributi poizvedb, npr. " +"začetni čas, razlikujejo." #: js/messages.php:147 msgid "" @@ -1348,6 +1356,8 @@ msgid "" "same table are also being grouped together, disregarding of the inserted " "data." msgstr "" +"Ker je izbrano zbiranje poizvedb INSERT, so poizvedbe INSERT iste tabele " +"prav tako zbrane skupaj, ne glede na vstavljene podatke." #: js/messages.php:148 msgid "Log data loaded. Queries executed in this time span:" @@ -1825,13 +1835,12 @@ msgstr "Velikost pisave" #: libraries/File.class.php:220 msgid "File was not an uploaded file." -msgstr "" +msgstr "Datoteka ni naložen datoteka." #: libraries/File.class.php:259 libraries/File.class.php:388 -#, fuzzy #| msgid "Unknown error in file upload." msgid "Unknown error while uploading." -msgstr "Neznana napaka pri nalaganju datoteke." +msgstr "Neznana napaka pri nalaganju." #: libraries/File.class.php:277 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini." @@ -1875,11 +1884,11 @@ msgstr "" #: libraries/File.class.php:507 msgid "Error while moving uploaded file." -msgstr "" +msgstr "Napaka pri premikanju naložene datoteke." #: libraries/File.class.php:515 msgid "Cannot read (moved) upload file." -msgstr "" +msgstr "Ne morem prebrati (premakniti) naložene datoteke." #: libraries/Index.class.php:418 tbl_relation.php:526 msgid "No index defined!" @@ -2433,10 +2442,9 @@ msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s dni, %s ur, %s minut in %s sekund" #: libraries/common.lib.php:1876 -#, fuzzy #| msgid "Routine parameters" msgid "Missing parameter:" -msgstr "Parametri rutine" +msgstr "Manjkajoč parameter:" #: libraries/common.lib.php:2182 libraries/common.lib.php:2185 #: libraries/display_tbl.lib.php:299 @@ -6865,10 +6873,9 @@ msgid "You must provide an event name" msgstr "Navesti morate ime dogodka" #: libraries/rte/rte_events.lib.php:537 -#, fuzzy #| msgid "You must provide a name and a type for each routine parameter." msgid "You must provide a valid interval value for the event." -msgstr "Navesti morate ine in vrsto vsakega parametra rutine." +msgstr "Navesti morateveljavno vrednost intervala dogodka." #: libraries/rte/rte_events.lib.php:549 msgid "You must provide a valid execution time for the event." @@ -7088,10 +7095,9 @@ msgid "You must provide a trigger name" msgstr "Navesti morate ime sprožilca" #: libraries/rte/rte_triggers.lib.php:404 -#, fuzzy #| msgid "You must provide a routine name" msgid "You must provide a valid timing for the trigger" -msgstr "Navesti morate ime rutine" +msgstr "Navesti morate veljavni časovni izbor sprožilca" #: libraries/rte/rte_triggers.lib.php:409 msgid "You must provide a valid event for the trigger" @@ -9889,6 +9895,10 @@ msgid "" " queries. For the latter you will need to set log_output to 'TABLE' " "and have either the slow_query_log or general_log enabled." msgstr "" +"Nadziranje phpMyAdmin vam lahko pomaga pri optimiziranju konfiguracije " +"strežnika in izsleditvi časovno zahtevnih\n" +" poizvedb. Za slednje morate nastaviti log_output na 'TABLE' in imeti " +"ali slow_query_log ali general_log omogočeno." #: server_status.php:1342 msgid "" diff --git a/po/tr.po b/po/tr.po index 3eef337..ecf52df 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-21 14:00+0200\n" -"PO-Revision-Date: 2011-07-19 20:23+0200\n" +"PO-Revision-Date: 2011-07-21 20:44+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: turkish <tr(a)li.org>\n" "Language: tr\n" @@ -1233,6 +1233,9 @@ msgid "" "than %d seconds. It is advisable to set this long_query_time 0-2 seconds, " "depending on your system." msgstr "" +"slow_query_log etkinleştirildi ama sunucu sadece %d saniyeden daha uzun " +"süren sorguları günlükler. Bu long_query_time'ın, sisteminize bağlı olarak " +"0-2 saniyeye ayarlanması tavsiye edilir." #: js/messages.php:121 #, php-format @@ -1276,6 +1279,8 @@ msgid "" "You can't change these variables. Please log in as root or contact your " "database administrator." msgstr "" +"Bu değişkenleri değiştiremezsiniz. Lütfen root olarak oturum açın veya " +"veritabanı yöneticinizle temasa geçin." #: js/messages.php:132 msgid "Change settings" @@ -1297,7 +1302,7 @@ msgstr "Ayırdedici" #: js/messages.php:138 #, php-format msgid "Divided by %s:" -msgstr "" +msgstr "Böleni %s:" #: js/messages.php:140 msgid "Selected time range:" @@ -1305,25 +1310,27 @@ msgstr "Seçili zaman aralığı:" #: js/messages.php:141 msgid "Group together INSERTs into same table" -msgstr "" +msgstr "Aynı tablo içinde INSERT'ler birlikte gruplanır" #: js/messages.php:142 msgid "" "<p>Choose from which log you want the statistics to be generated from.</p> " "Results are grouped by query text." msgstr "" +"<p>İstatistiklerin oluşturulmasını istediğinizden seçin.</p> Sonuçlar sorgu " +"metnine göre gruplandırılır." #: js/messages.php:143 msgid "From slow log" -msgstr "" +msgstr "Yavaş günlükten" #: js/messages.php:144 msgid "From general log" -msgstr "" +msgstr "Genel günlükten" #: js/messages.php:145 msgid "Analysing & loading logs. This may take a while." -msgstr "" +msgstr "Günlükler inceleniyor ve yükleniyor. Bu biraz zaman alabilir." #: js/messages.php:146 msgid "" @@ -1331,6 +1338,9 @@ msgid "" "together. However only the SQL Text is being compared, thus the queries " "other attributes such as start time may differ." msgstr "" +"Bu sütunlar birlikte gruplanmış özdeş sorguların miktarını gösterir. Ancak " +"sadece SQL Metin karşılaştırılır, böylece başlama zamanı gibi sorgular diğer " +"öznitelikler farklı olabilir." #: js/messages.php:147 msgid "" @@ -1338,10 +1348,13 @@ msgid "" "same table are also being grouped together, disregarding of the inserted " "data." msgstr "" +"INSERT'lerin gruplanmasından bu yana sorgular seçilir, aynı tablo içindeki " +"INSERT sorguları, eklenen verinin hiçe sayılması, aynı zamanda birlikte " +"gruplanır." #: js/messages.php:148 msgid "Log data loaded. Queries executed in this time span:" -msgstr "" +msgstr "Günlük verisi yüklendi. Sorgular bu zaman aralığında çalıştırıldı:" #: js/messages.php:150 msgid "Jump to Log table" @@ -1349,7 +1362,7 @@ msgstr "Günlük tablosuna atla" #: js/messages.php:151 msgid "Log analysed, but not data found in this time span." -msgstr "" +msgstr "Günlük incelendi, ama bu zaman aralığında bulunan veri yok." #: js/messages.php:155 libraries/tbl_properties.inc.php:780 #: pmd_general.php:388 pmd_general.php:425 pmd_general.php:545 @@ -1815,13 +1828,12 @@ msgstr "Yazı Tipi boyutu" #: libraries/File.class.php:220 msgid "File was not an uploaded file." -msgstr "" +msgstr "Dosya gönderilmiş bir dosya değil." #: libraries/File.class.php:259 libraries/File.class.php:388 -#, fuzzy #| msgid "Unknown error in file upload." msgid "Unknown error while uploading." -msgstr "Dosya göndermede bilinmeyen hata oldu." +msgstr "Gönderilirken bilinmeyen hata oldu." #: libraries/File.class.php:277 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini." @@ -1866,11 +1878,11 @@ msgstr "" #: libraries/File.class.php:507 msgid "Error while moving uploaded file." -msgstr "" +msgstr "Gönderilmiş dosya taşınırken hata oldu." #: libraries/File.class.php:515 msgid "Cannot read (moved) upload file." -msgstr "" +msgstr "Gönderilen dosya okunamıyor (taşınamadı)." #: libraries/Index.class.php:418 tbl_relation.php:526 msgid "No index defined!" @@ -2418,10 +2430,9 @@ msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s gün, %s saat, %s dakika ve %s saniye" #: libraries/common.lib.php:1876 -#, fuzzy #| msgid "Routine parameters" msgid "Missing parameter:" -msgstr "Yordam parametreleri" +msgstr "Eksik parametreler:" #: libraries/common.lib.php:2182 libraries/common.lib.php:2185 #: libraries/display_tbl.lib.php:299 @@ -9050,7 +9061,7 @@ msgstr "Tüm durum değişkenleri" #: server_status.php:589 msgid "Monitor" -msgstr "" +msgstr "İzleme" #: server_status.php:599 server_status.php:621 msgid "Refresh rate: " @@ -9183,6 +9194,8 @@ msgid "" "The number of connections that were aborted because the client died without " "closing the connection properly." msgstr "" +"Bağlantı uygun bir şekilde kapatılmadan sonlanmış istemcinin durdurulmuş " +"bağlantılarının sayısı." #: server_status.php:1046 msgid "The number of failed attempts to connect to the MySQL server." @@ -9853,7 +9866,7 @@ msgstr "Yönergeler/Ayarlama" #: server_status.php:1302 msgid "Done rearranging/editing charts" -msgstr "" +msgstr "Çizelgeleri düzenlemeyi/yeniden düzeltmeyi bitir" #: server_status.php:1309 msgid "Add chart" @@ -9861,7 +9874,7 @@ msgstr "Çizelge ekle" #: server_status.php:1311 msgid "Rearrange/edit charts" -msgstr "" +msgstr "Çizelgeleri düzenle/yeniden düzelt" #: server_status.php:1313 msgid "Refresh rate:" @@ -9886,7 +9899,22 @@ msgid "" " queries. For the latter you will need to set log_output to 'TABLE' " "and have either the slow_query_log or general_log enabled." msgstr "" - +"phpMyAdmin İzleyici sunucu yapılandırmasını uyarlamada ve yoğun sorgularda " +"iz sürme süresinde size yardımcı\n" +"olabilir. Sonrası için log_output'u 'TABLE'a ayarlamanız gerekecektir ve ya " +"slow_query_log ya da general_log etkinleştirilir." + +# <b>İzleyici kullanımı:</b><br/>\n +# Ok, you are good to go! Once you click 'Start monitor' your browser will refresh all displayed charts +# in a regular interval. You may add charts and change the refresh rate under 'Settings', or remove any chart +# using the cog icon on each respective chart. +# <p>When you get to see a sudden spike in activity, select the relevant time span on any chart by holding down the +# left mouse button and panning over the chart. This will load statistics from the logs helping you find what caused the +# activity spike.</p> +# <p><b>Please note:</b> +# Enabling the general_log may increase the server load by up to 5-15%. Also be aware that generating statistics out of the logs is a +# very load intensive task, thus it is advisable to select only a small time span. +# </p> #: server_status.php:1342 msgid "" "<b>Using the monitor:</b><br/>\n" @@ -9914,7 +9942,7 @@ msgstr "İşlemci Kullanımı" #: server_status.php:1364 msgid "Memory Usage" -msgstr "" +msgstr "Bellek Kullanımı" #: server_status.php:1367 msgid "Swap Usage" @@ -9930,7 +9958,7 @@ msgstr "Dizi seç:" #: server_status.php:1374 msgid "Commonly monitored" -msgstr "" +msgstr "Genellikle izlenen" #: server_status.php:1389 msgid "or type variable name:" @@ -9938,15 +9966,15 @@ msgstr "veya değişken adını yazın:" #: server_status.php:1393 msgid "Display as differential value" -msgstr "" +msgstr "Ayırtedici değer olarak görüntüle" #: server_status.php:1395 msgid "Apply a divisor" -msgstr "" +msgstr "Böleni uygula" #: server_status.php:1402 msgid "Append unit to data values" -msgstr "" +msgstr "Veri değerlerine birimi ekle" #: server_status.php:1408 msgid "Add this series" hooks/post-receive -- phpMyAdmin

1 0