- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3RC1-6268-ga01662d
by Michal Čihař 27 Jun '11

27 Jun '11

The branch, master has been updated via a01662dd4ac363c6bb1663ac6b81d7e797114503 (commit) via 4af40a31d5cfa6250ec1500d476322d43cfe081d (commit) from e57f27e50ba565be52ed3d271d6c9076f2ae48fd (commit) - Log ----------------------------------------------------------------- commit a01662dd4ac363c6bb1663ac6b81d7e797114503 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Jun 27 11:22:10 2011 +0200 Revemo empty @license tags commit 4af40a31d5cfa6250ec1500d476322d43cfe081d Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Jun 27 11:21:54 2011 +0200 Remove empty @copyright tags ----------------------------------------------------------------------- Summary of changes: libraries/schema/Dia_Relation_Schema.class.php | 6 ------ libraries/schema/Eps_Relation_Schema.class.php | 6 ------ libraries/schema/Pdf_Relation_Schema.class.php | 6 ------ libraries/schema/Svg_Relation_Schema.class.php | 6 ------ libraries/schema/Visio_Relation_Schema.class.php | 2 -- 5 files changed, 0 insertions(+), 26 deletions(-) diff --git a/libraries/schema/Dia_Relation_Schema.class.php b/libraries/schema/Dia_Relation_Schema.class.php index f6050c7..e2f5236 100644 --- a/libraries/schema/Dia_Relation_Schema.class.php +++ b/libraries/schema/Dia_Relation_Schema.class.php @@ -184,8 +184,6 @@ class PMA_DIA extends XMLWriter * and helps in drawing/generating the Tables in dia XML document. * * @name Table_Stats - * @copyright - * @license * @see PMA_DIA */ class Table_Stats @@ -435,8 +433,6 @@ class Table_Stats * in dia XML document. * * @name Relation_Stats - * @copyright - * @license * @see PMA_DIA */ class Relation_Stats @@ -636,8 +632,6 @@ class Relation_Stats * to this class * * @name Dia_Relation_Schema - * @copyright - * @license */ class PMA_Dia_Relation_Schema extends PMA_Export_Relation_Schema { diff --git a/libraries/schema/Eps_Relation_Schema.class.php b/libraries/schema/Eps_Relation_Schema.class.php index ca8699a..7dbec6d 100644 --- a/libraries/schema/Eps_Relation_Schema.class.php +++ b/libraries/schema/Eps_Relation_Schema.class.php @@ -347,8 +347,6 @@ class PMA_EPS * and helps in drawing/generating the Tables in EPS. * * @name Table_Stats - * @copyright - * @license * @see PMA_EPS */ class Table_Stats @@ -550,8 +548,6 @@ class Table_Stats * in EPS document. * * @name Relation_Stats - * @copyright - * @license * @see PMA_EPS */ class Relation_Stats @@ -715,8 +711,6 @@ class Relation_Stats * to this class * * @name Eps_Relation_Schema - * @copyright - * @license */ class PMA_Eps_Relation_Schema extends PMA_Export_Relation_Schema { diff --git a/libraries/schema/Pdf_Relation_Schema.class.php b/libraries/schema/Pdf_Relation_Schema.class.php index 36edd2c..d6f212f 100644 --- a/libraries/schema/Pdf_Relation_Schema.class.php +++ b/libraries/schema/Pdf_Relation_Schema.class.php @@ -438,8 +438,6 @@ class PMA_PDF extends TCPDF * and helps in drawing/generating the Tables in PDF document. * * @name Table_Stats - * @copyright - * @license * @see PMA_PDF */ class Table_Stats @@ -652,8 +650,6 @@ class Table_Stats * in PDF document. * * @name Relation_Stats - * @copyright - * @license * @see PMA_PDF::SetDrawColor,PMA_PDF::PMA_PDF_setLineWidthScale,PMA_PDF::PMA_PDF_lineScale */ class Relation_Stats @@ -797,8 +793,6 @@ class Relation_Stats * to this class * * @name Pdf_Relation_Schema - * @copyright - * @license */ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema { diff --git a/libraries/schema/Svg_Relation_Schema.class.php b/libraries/schema/Svg_Relation_Schema.class.php index 03c8805..73d67e9 100644 --- a/libraries/schema/Svg_Relation_Schema.class.php +++ b/libraries/schema/Svg_Relation_Schema.class.php @@ -317,8 +317,6 @@ class PMA_SVG extends XMLWriter * and helps in drawing/generating the Tables in SVG XML document. * * @name Table_Stats - * @copyright - * @license * @see PMA_SVG */ class Table_Stats @@ -527,8 +525,6 @@ class Table_Stats * in SVG XML document. * * @name Relation_Stats - * @copyright - * @license * @see PMA_SVG::printElementLine */ class Relation_Stats @@ -691,8 +687,6 @@ class Relation_Stats * to this class * * @name Svg_Relation_Schema - * @copyright - * @license */ class PMA_Svg_Relation_Schema extends PMA_Export_Relation_Schema { diff --git a/libraries/schema/Visio_Relation_Schema.class.php b/libraries/schema/Visio_Relation_Schema.class.php index f8d17e8..663c7e8 100644 --- a/libraries/schema/Visio_Relation_Schema.class.php +++ b/libraries/schema/Visio_Relation_Schema.class.php @@ -469,8 +469,6 @@ class Relation_Stats * to this class * * @name Visio_Relation_Schema - * @copyright - * @license */ class PMA_Visio_Relation_Schema extends PMA_Export_Relation_Schema { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3RC1-6266-ge57f27e
by Michal Čihař 27 Jun '11

27 Jun '11

The branch, master has been updated via e57f27e50ba565be52ed3d271d6c9076f2ae48fd (commit) from 327b3d14560dd8aa68da071a7661e6c12d4b5c41 (commit) - Log ----------------------------------------------------------------- commit e57f27e50ba565be52ed3d271d6c9076f2ae48fd Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Jun 27 11:20:20 2011 +0200 Remove @uses tags from docblocks ----------------------------------------------------------------------- Summary of changes: db_export.php | 4 - db_search.php | 25 ------ import.php | 1 - index.php | 19 ----- libraries/Config.class.php | 44 ----------- libraries/Error.class.php | 55 -------------- libraries/Error_Handler.class.php | 62 --------------- libraries/File.class.php | 70 ----------------- libraries/Index.class.php | 19 ----- libraries/List.class.php | 11 --- libraries/List_Database.class.php | 49 ------------ libraries/Message.class.php | 87 --------------------- libraries/PMA.php | 4 - libraries/Partition.class.php | 2 - libraries/RecentTable.class.php | 7 -- libraries/StorageEngine.class.php | 39 ---------- libraries/Table.class.php | 14 ---- libraries/Theme.class.php | 44 ----------- libraries/Theme_Manager.class.php | 7 -- libraries/auth/cookie.auth.lib.php | 75 ------------------- libraries/blobstreaming.lib.php | 9 -- libraries/bookmark.lib.php | 22 ------ libraries/check_user_privileges.lib.php | 21 ----- libraries/common.lib.php | 121 ------------------------------ libraries/config/ConfigFile.class.php | 8 -- libraries/config/Form.class.php | 5 - libraries/config/FormDisplay.class.php | 40 ---------- libraries/config/FormDisplay.tpl.php | 10 --- libraries/config/validate.lib.php | 11 --- libraries/core.lib.php | 59 --------------- libraries/database_interface.lib.php | 68 ----------------- libraries/db_info.inc.php | 25 ------ libraries/db_routines.lib.php | 61 --------------- libraries/db_structure.lib.php | 5 - libraries/dbi/mysql.dbi.lib.php | 15 ---- libraries/dbi/mysqli.dbi.lib.php | 84 --------------------- libraries/display_tbl.lib.php | 69 ----------------- libraries/engines/innodb.lib.php | 14 ---- libraries/footer.inc.php | 25 ------ libraries/grab_globals.lib.php | 5 - libraries/header.inc.php | 2 - libraries/import.lib.php | 65 ---------------- libraries/js_escape.lib.php | 7 -- libraries/mysql_charsets.lib.php | 8 -- libraries/ob.lib.php | 12 --- libraries/plugin_interface.lib.php | 26 ------- libraries/relation.lib.php | 124 ------------------------------- libraries/relation_cleanup.lib.php | 12 --- libraries/replication_gui.lib.php | 1 - libraries/sanitizing.lib.php | 2 - libraries/select_lang.lib.php | 15 ---- libraries/select_server.lib.php | 6 -- libraries/server_common.inc.php | 6 -- libraries/server_synchronize.lib.php | 49 ------------ libraries/session.inc.php | 4 - libraries/sql_query_form.lib.php | 52 ------------- libraries/string.lib.php | 10 --- libraries/string_type_ctype.lib.php | 7 -- libraries/string_type_native.lib.php | 15 ---- libraries/tbl_replace_fields.inc.php | 9 -- libraries/transformations.lib.php | 29 ------- libraries/url_generating.lib.php | 17 ---- libraries/user_preferences.lib.php | 41 ---------- navigation.php | 55 -------------- pmd_common.php | 47 ------------ querywindow.php | 24 ------ server_binlog.php | 19 ----- tbl_create.php | 26 ------- tbl_replace.php | 27 ------- test/theme.php | 1 - user_password.php | 14 ---- 71 files changed, 0 insertions(+), 2047 deletions(-) diff --git a/db_export.php b/db_export.php index a24ed18..aab4c51 100644 --- a/db_export.php +++ b/db_export.php @@ -3,10 +3,6 @@ /** * dumps a database * - * @uses libraries/db_common.inc.php - * @uses libraries/db_info.inc.php - * @uses libraries/display_export.lib.php - * @uses $tables from libraries/db_info.inc.php * @package phpMyAdmin */ diff --git a/db_search.php b/db_search.php index 17a28d7..ea50569 100644 --- a/db_search.php +++ b/db_search.php @@ -5,30 +5,6 @@ * * @todo make use of UNION when searching multiple tables * @todo display executed query, optional? - * @uses $cfg['UseDbSearch'] - * @uses $GLOBALS['db'] - * @uses PMA_DBI_get_tables() - * @uses PMA_sqlAddslashes() - * @uses PMA_getSearchSqls() - * @uses PMA_DBI_fetch_value() - * @uses PMA_linkOrButton() - * @uses PMA_generate_common_url() - * @uses PMA_generate_common_hidden_inputs() - * @uses PMA_showMySQLDocu() - * @uses $_REQUEST['search_str'] - * @uses $_REQUEST['submit_search'] - * @uses $_REQUEST['search_option'] - * @uses $_REQUEST['table_select'] - * @uses $_REQUEST['unselectall'] - * @uses $_REQUEST['selectall'] - * @uses $_REQUEST['field_str'] - * @uses is_string() - * @uses htmlspecialchars() - * @uses array_key_exists() - * @uses is_array() - * @uses array_intersect() - * @uses sprintf() - * @uses in_array() * @package phpMyAdmin */ @@ -130,7 +106,6 @@ if (isset($_REQUEST['submit_search'])) { * Builds the SQL search query * * @todo can we make use of fulltextsearch IN BOOLEAN MODE for this? - * @uses PMA_DBI_query * PMA_backquote * PMA_DBI_free_result * PMA_DBI_fetch_assoc diff --git a/import.php b/import.php index fea35c5..6506dc8 100644 --- a/import.php +++ b/import.php @@ -3,7 +3,6 @@ /** * Core script for import, this is just the glue around all other stuff * - * @uses PMA_Bookmark_getList() * @package phpMyAdmin */ diff --git a/index.php b/index.php index 070099b..cb5eb63 100644 --- a/index.php +++ b/index.php @@ -3,26 +3,7 @@ /** * forms frameset * - * @uses $GLOBALS['cfg']['QueryHistoryDB'] - * @uses $GLOBALS['cfg']['Server']['user'] - * @uses $GLOBALS['cfg']['DefaultTabServer'] as src for the mainframe - * @uses $GLOBALS['cfg']['DefaultTabDatabase'] as src for the mainframe - * @uses $GLOBALS['cfg']['NaviWidth'] for navi frame width - * @uses $GLOBALS['collation_connection'] from $_REQUEST (grab_globals.lib.php) * or common.inc.php - * @uses $GLOBALS['available_languages'] from common.inc.php (select_lang.lib.php) - * @uses $GLOBALS['db'] - * @uses $GLOBALS['lang'] - * @uses $GLOBALS['text_dir'] - * @uses $_ENV['HTTP_HOST'] - * @uses PMA_getRelationsParam() - * @uses PMA_purgeHistory() - * @uses PMA_generate_common_url() - * @uses PMA_VERSION - * @uses session_write_close() - * @uses time() - * @uses PMA_getenv() - * @uses header() to send charset * @package phpMyAdmin */ diff --git a/libraries/Config.class.php b/libraries/Config.class.php index f71a4e9..9c7ab48 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -305,10 +305,6 @@ class PMA_Config /** * loads default values from default source * - * @uses file_exists() - * @uses $this->default_source - * @uses $this->error_config_default_file - * @uses $this->settings * @return boolean success */ function loadDefaults() @@ -418,16 +414,6 @@ class PMA_Config * Loads user preferences and merges them with current config * must be called after control connection has been estabilished * - * @uses $GLOBALS['cfg'] - * @uses $GLOBALS['collation_connection'] - * @uses $GLOBALS['lang'] - * @uses $_SESSION['cache']['server_$server']['config_mtime'] - * @uses $_SESSION['cache']['server_$server']['userprefs'] - * @uses $_SESSION['cache']['server_$server']['userprefs_mtime'] - * @uses $_SESSION['PMA_Theme_Manager'] - * @uses PMA_apply_userprefs() - * @uses PMA_array_merge_recursive() - * @uses PMA_load_userprefs() * @return boolean */ function loadUserPreferences() @@ -530,10 +516,6 @@ class PMA_Config * If user preferences are not yet initialized, option is applied to global config and * added to a update queue, which is processed by {@link loadUserPreferences()} * - * @uses $GLOBALS['cfg'] - * @uses PMA_array_read() - * @uses PMA_array_write() - * @uses PMA_persist_option() * @param string $cookie_name can be null * @param string $cfg_path * @param mixed $new_cfg_value @@ -672,7 +654,6 @@ class PMA_Config /** * sets configuration variable * - * @uses $this->settings * @param string $setting configuration option * @param string $value new value for configuration option */ @@ -890,14 +871,6 @@ class PMA_Config /** * checks for font size configuration, and sets font size as requested by user * - * @uses $_GET - * @uses $_POST - * @uses $_COOKIE - * @uses preg_match() - * @uses function_exists() - * @uses PMA_Config::set() - * @uses PMA_Config::get() - * @uses PMA_Config::setCookie() */ function checkFontsize() { @@ -1105,8 +1078,6 @@ class PMA_Config /** * returns options for font size selection * - * @uses preg_replace() - * @uses ksort() * @static * @param string $current_size current selected font size with unit * @return array selectable font sizes @@ -1167,9 +1138,6 @@ class PMA_Config /** * returns html selectbox for font sizes * - * @uses $GLOBALS['PMA_Config'] - * @uses PMA_Config::get() - * @uses PMA_Config::_getFontsizeOptions() * @static * @param string $current_size currently slected font size with unit * @return string html selectbox @@ -1204,8 +1172,6 @@ class PMA_Config /** * return complete font size selection form * - * @uses PMA_generate_common_hidden_inputs() - * @uses PMA_Config::_getFontsizeSelection() * @static * @param string $current_size currently slected font size with unit * @return string html selectbox @@ -1225,10 +1191,6 @@ class PMA_Config /** * removes cookie * - * @uses PMA_Config::isHttps() - * @uses PMA_Config::getCookiePath() - * @uses setcookie() - * @uses time() * @param string $cookie name of cookie to remove * @return boolean result of setcookie() */ @@ -1242,12 +1204,6 @@ class PMA_Config * sets cookie if value is different from current cokkie value, * or removes if value is equal to default * - * @uses PMA_Config::isHttps() - * @uses PMA_Config::getCookiePath() - * @uses $_COOKIE - * @uses PMA_Config::removeCookie() - * @uses setcookie() - * @uses time() * @param string $cookie name of cookie to remove * @param mixed $value new cookie value * @param string $default default value diff --git a/libraries/Error.class.php b/libraries/Error.class.php index 2cfd5fe..e5d105c 100644 --- a/libraries/Error.class.php +++ b/libraries/Error.class.php @@ -93,12 +93,6 @@ class PMA_Error extends PMA_Message /** * Constructor * - * @uses debug_backtrace() - * @uses PMA_Error::setNumber() - * @uses PMA_Error::setMessage() - * @uses PMA_Error::setFile() - * @uses PMA_Error::setLine() - * @uses PMA_Error::setBacktrace() * @param integer $errno * @param string $errstr * @param string $errfile @@ -122,7 +116,6 @@ class PMA_Error extends PMA_Message /** * sets PMA_Error::$_backtrace * - * @uses PMA_Error::$_backtrace to set it * @param array $backtrace */ public function setBacktrace($backtrace) @@ -133,7 +126,6 @@ class PMA_Error extends PMA_Message /** * sets PMA_Error::$_line * - * @uses PMA_Error::$_line to set it * @param integer $line */ public function setLine($line) @@ -144,8 +136,6 @@ class PMA_Error extends PMA_Message /** * sets PMA_Error::$_file * - * @uses PMA_Error::$_file to set it - * @uses PMA_Error::relPath() * @param string $file */ public function setFile($file) @@ -157,13 +147,6 @@ class PMA_Error extends PMA_Message /** * returns unique PMA_Error::$_hash, if not exists it will be created * - * @uses PMA_Error::$_hash as return value and to set it if required - * @uses PMA_Error::getNumber() - * @uses PMA_Error::getMessage() - * @uses PMA_Error::getFile() - * @uses PMA_Error::getLine() - * @uses PMA_Error::getBacktrace() - * @uses md5() * @param string $file * @return string PMA_Error::$_hash */ @@ -185,7 +168,6 @@ class PMA_Error extends PMA_Message /** * returns PMA_Error::$_backtrace * - * @uses PMA_Error::$_backtrace as return value * @return array PMA_Error::$_backtrace */ public function getBacktrace() @@ -196,7 +178,6 @@ class PMA_Error extends PMA_Message /** * returns PMA_Error::$_file * - * @uses PMA_Error::$_file as return value * @return string PMA_Error::$_file */ public function getFile() @@ -207,7 +188,6 @@ class PMA_Error extends PMA_Message /** * returns PMA_Error::$_line * - * @uses PMA_Error::$_line as return value * @return integer PMA_Error::$_line */ public function getLine() @@ -218,8 +198,6 @@ class PMA_Error extends PMA_Message /** * returns type of error * - * @uses PMA_Error::$errortype - * @uses PMA_Error::getNumber() * @return string type of error */ public function getType() @@ -230,8 +208,6 @@ class PMA_Error extends PMA_Message /** * returns level of error * - * @uses PMA_Error::$$errorlevel - * @uses PMA_Error::getNumber() * @return string level of error */ public function getLevel() @@ -242,9 +218,6 @@ class PMA_Error extends PMA_Message /** * returns title prepared for HTML Title-Tag * - * @uses PMA_Error::getTitle() - * @uses htmlspecialchars() - * @uses substr() * @return string HTML escaped and truncated title */ public function getHtmlTitle() @@ -255,8 +228,6 @@ class PMA_Error extends PMA_Message /** * returns title for error * - * @uses PMA_Error::getType() - * @uses PMA_Error::getMessage() * @return string */ public function getTitle() @@ -267,10 +238,6 @@ class PMA_Error extends PMA_Message /** * Display HTML backtrace * - * @uses PMA_Error::getBacktrace() - * @uses PMA_Error::relPath() - * @uses PMA_Error::displayArg() - * @uses count() */ public function displayBacktrace() { @@ -300,9 +267,6 @@ class PMA_Error extends PMA_Message * Display a single function argument * if $function is one of include/require the $arg is converted te relative path * - * @uses PMA_Error::relPath() - * @uses in_array() - * @uses gettype() * @param string $arg * @param string $function */ @@ -327,11 +291,6 @@ class PMA_Error extends PMA_Message /** * Displays the error in HTML * - * @uses PMA_Error::getLevel() - * @uses PMA_Error::getType() - * @uses PMA_Error::getMessage() - * @uses PMA_Error::displayBacktrace() - * @uses PMA_Error::isDisplayed() */ public function display() { @@ -356,10 +315,6 @@ class PMA_Error extends PMA_Message /** * whether this error is a user error * - * @uses E_USER_WARNING - * @uses E_USER_ERROR - * @uses E_USER_NOTICE - * @uses PMA_Error::getNumber() * @return boolean */ public function isUserError() @@ -374,16 +329,6 @@ class PMA_Error extends PMA_Message * and make users feel save to submit error reports * * @static - * @uses PHP_OS() - * @uses __FILE__() - * @uses realpath() - * @uses substr() - * @uses explode() - * @uses dirname() - * @uses implode() - * @uses count() - * @uses array_pop() - * @uses str_replace() * @param string $dest path to be shorten * @return string shortened path */ diff --git a/libraries/Error_Handler.class.php b/libraries/Error_Handler.class.php index 0b90898..f65dc4b 100644 --- a/libraries/Error_Handler.class.php +++ b/libraries/Error_Handler.class.php @@ -28,7 +28,6 @@ class PMA_Error_Handler /** * Constructor - set PHP error handler * - * @uses set_error_handler() */ public function __construct() { @@ -40,10 +39,6 @@ class PMA_Error_Handler * * stores errors in session * - * @uses $_SESSION['errors'] - * @uses array_merge() - * @uses PMA_Error_Handler::$_errors - * @uses PMA_Error::isDisplayed() */ public function __destruct() { @@ -69,8 +64,6 @@ class PMA_Error_Handler /** * returns array with all errors * - * @uses PMA_Error_Handler::$_errors as return value - * @uses PMA_Error_Handler::_checkSavedErrors() * @return array PMA_Error_Handler::$_errors */ protected function getErrors() @@ -90,24 +83,6 @@ class PMA_Error_Handler * Do not use the context parameter as we want to avoid storing the * complete $GLOBALS inside $_SESSION['errors'] * - * @uses E_USER_NOTICE - * @uses E_USER_WARNING - * @uses E_STRICT - * @uses E_NOTICE - * @uses E_WARNING - * @uses E_CORE_WARNING - * @uses E_COMPILE_WARNING - * @uses E_USER_ERROR - * @uses E_ERROR - * @uses E_PARSE - * @uses E_CORE_ERROR - * @uses E_COMPILE_ERROR - * @uses E_RECOVERABLE_ERROR - * @uses PMA_Error - * @uses PMA_Error_Handler::$_errors - * @uses PMA_Error_Handler::_dispFatalError() - * @uses PMA_Error::getHash() - * @uses PMA_Error::getNumber() * @param integer $errno * @param string $errstr * @param string $errfile @@ -151,8 +126,6 @@ class PMA_Error_Handler * log error to configured log facility * * @todo finish! - * @uses PMA_Error::getMessage() - * @uses error_log() * @param PMA_Error $error */ protected function _logError($error) @@ -163,7 +136,6 @@ class PMA_Error_Handler /** * trigger a custom error * - * @uses trigger_error() * @param string $errorInfo * @param integer $errorNumber * @param string $file @@ -178,10 +150,6 @@ class PMA_Error_Handler /** * display fatal error and exit * - * @uses headers_sent() - * @uses PMA_Error::display() - * @uses PMA_Error_Handler::_dispPageStart() - * @uses PMA_Error_Handler::_dispPageEnd() * @param PMA_Error $error */ protected function _dispFatalError($error) @@ -197,10 +165,6 @@ class PMA_Error_Handler /** * display the whole error page with all errors * - * @uses headers_sent() - * @uses PMA_Error_Handler::dispAllErrors() - * @uses PMA_Error_Handler::_dispPageStart() - * @uses PMA_Error_Handler::_dispPageEnd() */ public function dispErrorPage() { @@ -214,10 +178,6 @@ class PMA_Error_Handler /** * display user errors not displayed * - * @uses PMA_Error_Handler::getErrors() - * @uses PMA_Error::isDisplayed() - * @uses PMA_Error::isUserError() - * @uses PMA_Error::display() */ public function dispUserErrors() { @@ -231,7 +191,6 @@ class PMA_Error_Handler /** * display HTML header * - * @uses PMA_Error::getTitle() * @param PMA_error $error */ protected function _dispPageStart($error = null) @@ -257,8 +216,6 @@ class PMA_Error_Handler /** * display all errors regardless already displayed or user errors * - * @uses PMA_Error_Handler::getErrors() - * @uses PMA_Error::display() */ public function dispAllErrors() { @@ -270,11 +227,6 @@ class PMA_Error_Handler /** * display errors not displayed * - * @uses $cfg['Error_Handler']['display'] - * @uses PMA_Error_Handler::getErrors() - * @uses PMA_Error_Handler::dispUserErrors() - * @uses PMA_Error::isDisplayed() - * @uses PMA_Error::display() */ public function dispErrors() { @@ -296,9 +248,6 @@ class PMA_Error_Handler /** * look in session for saved errors * - * @uses $_SESSION['errors'] - * @uses PMA_Error_Handler::$_errors - * @uses array_merge() */ protected function _checkSavedErrors() { @@ -321,8 +270,6 @@ class PMA_Error_Handler /** * return count of errors * - * @uses PMA_Error_Handler::getErrors() - * @uses count() * @return integer number of errors occoured */ public function countErrors() @@ -333,9 +280,6 @@ class PMA_Error_Handler /** * return count of user errors * - * @uses PMA_Error_Handler::countErrors() - * @uses PMA_Error_Handler::getErrors() - * @uses PMA_Error::isUserError() * @return integer number of user errors occoured */ public function countUserErrors() @@ -355,7 +299,6 @@ class PMA_Error_Handler /** * whether use errors occured or not * - * @uses PMA_Error_Handler::countUserErrors() * @return boolean */ public function hasUserErrors() @@ -366,7 +309,6 @@ class PMA_Error_Handler /** * whether errors occured or not * - * @uses PMA_Error_Handler::countErrors() * @return boolean */ public function hasErrors() @@ -377,9 +319,6 @@ class PMA_Error_Handler /** * number of errors to be displayed * - * @uses $cfg['Error_Handler']['display'] - * @uses PMA_Error_Handler::countErrors() - * @uses PMA_Error_Handler::countUserErrors() * @return integer number of errors to be displayed */ public function countDisplayErrors() @@ -394,7 +333,6 @@ class PMA_Error_Handler /** * whether there are errors to display or not * - * @uses PMA_Error_Handler::countDisplayErrors() * @return boolean */ public function hasDisplayErrors() diff --git a/libraries/File.class.php b/libraries/File.class.php index 2a33bf3..c2d5dad 100644 --- a/libraries/File.class.php +++ b/libraries/File.class.php @@ -79,7 +79,6 @@ class PMA_File * constructor * * @access public - * @uses PMA_File::setName() * @param string $name file name */ function __construct($name = false) @@ -94,7 +93,6 @@ class PMA_File * * @see PMA_File::cleanUp() * @access public - * @uses PMA_File::cleanUp() */ function __destruct() { @@ -105,8 +103,6 @@ class PMA_File * deletes file if it is temporary, usally from a moved upload file * * @access public - * @uses PMA_File::delet() - * @uses PMA_File::isTemp() * @return boolean success */ function cleanUp() @@ -122,8 +118,6 @@ class PMA_File * deletes the file * * @access public - * @uses PMA_File::getName() - * @uses unlink() * @return boolean success */ function delete() @@ -136,7 +130,6 @@ class PMA_File * file objects with temp flags are deleted with object destruction * * @access public - * @uses PMA_File::$_is_temp to set and read it * @param boolean sets the temp flag * @return boolean PMA_File::$_is_temp */ @@ -153,7 +146,6 @@ class PMA_File * accessor * * @access public - * @uses PMA_File::$_name * @param string $name file name */ function setName($name) @@ -163,17 +155,6 @@ class PMA_File /** * @access public - * @uses PMA_File::getName() - * @uses PMA_File::isUploaded() - * @uses PMA_File::checkUploadedFile() - * @uses PMA_File::isReadable() - * @uses PMA_File::$_content - * @uses function_exists() - * @uses file_get_contents() - * @uses filesize() - * @uses fread() - * @uses fopen() - * @uses bin2hex() * @return string binary file content */ function getContent($as_binary = true, $offset = 0, $length = null) @@ -209,8 +190,6 @@ class PMA_File /** * @access public - * @uses PMA_File::getName() - * @uses is_uploaded_file() */ function isUploaded() { @@ -221,7 +200,6 @@ class PMA_File * accessor * * @access public - * @uses PMA_File::$name as return value * @return string PMA_File::$_name */ function getName() @@ -232,9 +210,6 @@ class PMA_File /** * @todo replace error message with localized string * @access public - * @uses PMA_File::isUploaded() - * @uses PMA_File::setName() - * @uses PMA_File::$_error_message * @param string name of file uploaded * @return boolean success */ @@ -253,12 +228,6 @@ class PMA_File /** * @access public - * @uses PMA_File::fetchUploadedFromTblChangeRequestMultiple() - * @uses PMA_File::setUploadedFile() - * @uses PMA_File::setRecentBLOBReference() - * @uses curl_setopt_array() - * @uses PMA_File::$_error_message - * @uses $_FILES * @param string $key the md5 hash of the column name * @param string $rownumber * @return boolean success @@ -375,9 +344,6 @@ class PMA_File * sets the name if the file to the one selected in the tbl_change form * * @access public - * @uses $_REQUEST - * @uses PMA_File::setLocalSelectedFile() - * @uses is_string() * @param string $key the md5 hash of the column name * @param string $rownumber * @return boolean success @@ -437,7 +403,6 @@ class PMA_File /** * @access public - * @uses PMA_File->$_error_message as return value * @return string error message */ function getError() @@ -447,7 +412,6 @@ class PMA_File /** * @access public - * @uses PMA_File->$_error_message to check it * @return boolean whether an error occured or not */ function isError() @@ -460,8 +424,6 @@ class PMA_File * and uses the submitted/selected file * * @access public - * @uses PMA_File::setUploadedFromTblChangeRequest() - * @uses PMA_File::setSelectedFromTblChangeRequest() * @param string $key the md5 hash of the column name * @param string $rownumber * @return boolean success @@ -485,10 +447,6 @@ class PMA_File /** * * @access public - * @uses PMA_File::setName() - * @uses PMA_securePath() - * @uses PMA_userDir() - * @uses $GLOBALS['cfg']['UploadDir'] * @param string $name * @return boolean success */ @@ -508,10 +466,6 @@ class PMA_File /** * @access public - * @uses PMA_File::getName() - * @uses is_readable() - * @uses ob_start() - * @uses ob_end_clean() * @return boolean whether the file is readable or not */ function isReadable() @@ -532,20 +486,6 @@ class PMA_File * @todo replace error message with localized string * @todo move check of $cfg['TempDir'] into PMA_Config? * @access public - * @uses $cfg['TempDir'] - * @uses PMA_File::isReadable() - * @uses PMA_File::getName() - * @uses PMA_File::setName() - * @uses PMA_File::isTemp() - * @uses PMA_File::$_error_message - * @uses is_dir() - * @uses mkdir() - * @uses chmod() - * @uses is_writable() - * @uses basename() - * @uses move_uploaded_file() - * @uses ob_start() - * @uses ob_end_clean() * @return boolean whether uploaded fiel is fine or not */ function checkUploadedFile() @@ -588,14 +528,6 @@ class PMA_File * * @todo move file read part into readChunk() or getChunk() * @todo add support for compression plugins - * @uses PMA_File::$_compression to set it - * @uses PMA_File::getName() - * @uses fopen() - * @uses fread() - * @uses strlen() - * @uses fclose() - * @uses chr() - * @uses substr() * @access protected * @return string MIME type of compression, none for none */ @@ -729,8 +661,6 @@ class PMA_File } /** - * @uses PMA_File::$_compression as return value - * @uses PMA_File::detectCompression() * @return string MIME type of compression, none for none * @access public */ diff --git a/libraries/Index.class.php b/libraries/Index.class.php index fb5cafe..9992e1c 100644 --- a/libraries/Index.class.php +++ b/libraries/Index.class.php @@ -86,7 +86,6 @@ class PMA_Index /** * Constructor * - * @uses $this->set() * @param array $params */ public function __construct($params = array()) @@ -112,8 +111,6 @@ class PMA_Index /** * returns an array with all indexes from the given table * - * @uses PMA_Index::_loadIndexes() - * @uses PMA_Index::$_registry * @param string $table * @param string $schema * @return array @@ -132,8 +129,6 @@ class PMA_Index /** * return primary if set, false otherwise * - * @uses PMA_Index::_loadIndexes() - * @uses PMA_Index::$_registry * @param string $table * @param string $schema * @return mixed primary index or false if no one exists @@ -152,11 +147,6 @@ class PMA_Index /** * Load index data for table * - * @uses PMA_Index::$_registry - * @uses PMA_DBI_fetch_result() - * @uses PMA_backquote() - * @uses PMA_Index - * @uses PMA_Index->addColumn() * @param string $table * @param string $schema * @return boolean @@ -186,8 +176,6 @@ class PMA_Index /** * Add column to index * - * @uses $this->_columns - * @uses PMA_Index_Column * @param array $params column params */ public function addColumn($params) @@ -227,7 +215,6 @@ class PMA_Index /** * Returns true if $column indexed in this index * - * @uses $this->_columns * @param string $column * @return boolean */ @@ -546,12 +533,6 @@ class PMA_Index /** * Function to check over array of indexes and look for common problems * - * @uses is_string() - * @uses is_array() - * @uses count() - * @uses array_pop() - * @uses reset() - * @uses current() * @access public * @param string name of table * @return string Output HTML diff --git a/libraries/List.class.php b/libraries/List.class.php index 65ac7fc..83a42c1 100644 --- a/libraries/List.class.php +++ b/libraries/List.class.php @@ -27,9 +27,6 @@ abstract class PMA_List extends ArrayObject /** * returns item only if there is only one in the list * - * @uses count() - * @uses reset() - * @uses PMA_List::getEmpty() to return it * @return single item */ public function getSingleItem() @@ -44,7 +41,6 @@ abstract class PMA_List extends ArrayObject /** * defines what is an empty item (0, '', false or null) * - * @uses PMA_List::$item_empty as return value * @return mixed an empty item */ public function getEmpty() @@ -56,9 +52,6 @@ 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 * - * @uses PMA_List::$items to check for existence of specific item - * @uses func_get_args() - * @uses in_array() to check if given arguments exists in PMA_List::$items * @param string $db_name,.. one or more mysql result resources * @return boolean true if all items exists, otheriwse false */ @@ -77,9 +70,6 @@ abstract class PMA_List extends ArrayObject /** * returns HTML <option>-tags to be used inside <select></select> * - * @uses PMA_List::$items to build up the option items - * @uses PMA_List::getDefault() to mark this as selected if requested - * @uses htmlspecialchars() to escape items * @param mixed $selected the selected db or true for selecting current db * @param boolean $include_information_schema * @return string HTML option tags @@ -108,7 +98,6 @@ abstract class PMA_List extends ArrayObject /** * returns default item * - * @uses PMA_List::getEmpty() as fallback * @return string default item */ public function getDefault() diff --git a/libraries/List_Database.class.php b/libraries/List_Database.class.php index 2663673..2349852 100644 --- a/libraries/List_Database.class.php +++ b/libraries/List_Database.class.php @@ -56,10 +56,6 @@ require_once './libraries/List.class.php'; /** * Constructor * - * @uses PMA_List_Database::$_db_link - * @uses PMA_List_Database::$_db_link_user - * @uses PMA_List_Database::$_db_link_control - * @uses PMA_List_Database::build() * @param mixed $db_link_user user database link resource|object * @param mixed $db_link_control control database link resource|object */ @@ -77,9 +73,6 @@ require_once './libraries/List.class.php'; * checks if the configuration wants to hide some databases * * @todo temporaly use this docblock to test how to doc $GLOBALS - * @uses PMA_List_Database::$items - * @uses preg_match() - * @uses $cfg['Server']['hide_db'] */ protected function _checkHideDatabase() { @@ -98,16 +91,6 @@ require_once './libraries/List.class.php'; * retrieves database list from server * * @todo we could also search mysql tables if all fail? - * @uses PMA_List_Database::$_show_databases_disabled for not retrying if SHOW DATABASES is disabled - * @uses PMA_List_Database::$_db_link - * @uses PMA_List_Database::$_db_link_control in case of SHOW DATABASES is disabled for userlink - * @uses PMA_DBI_fetch_result() - * @uses PMA_DBI_getError() - * @uses natsort() - * @uses sort() - * @uses $cfg['NaturalOrder'] - * @uses $GLOBALS['error_showdatabases'] - * @uses $GLOBALS['errno'] * @param string $like_db_name usally a db_name containing wildcards */ protected function _retrieve($like_db_name = null) @@ -160,11 +143,6 @@ require_once './libraries/List.class.php'; /** * builds up the list * - * @uses PMA_List_Database::$items to initialize it - * @uses PMA_List_Database::_checkOnlyDatabase() - * @uses PMA_List_Database::_retrieve() - * @uses PMA_List_Database::_checkHideDatabase() - * @uses exchangeArray() */ public function build() { @@ -179,17 +157,6 @@ require_once './libraries/List.class.php'; /** * checks the only_db configuration * - * @uses PMA_List_Database::$_show_databases_disabled - * @uses PMA_List_Database::$items - * @uses PMA_List_Database::_retrieve() - * @uses PMA_unescape_mysql_wildcards() - * @uses preg_match() - * @uses array_diff() - * @uses array_merge() - * @uses is_array() - * @uses strlen() - * @uses is_string() - * @uses $cfg['Server']['only_db'] * @return boolean false if there is no only_db, otherwise true */ protected function _checkOnlyDatabase() @@ -240,9 +207,6 @@ require_once './libraries/List.class.php'; /** * returns default item * - * @uses PMA_List::getEmpty() - * @uses $GLOBALS['db'] - * @uses strlen() * @return string default item */ public function getDefault() @@ -257,18 +221,6 @@ require_once './libraries/List.class.php'; /** * returns array with dbs grouped with extended infos * - * @uses $GLOBALS['PMA_List_Database'] - * @uses $GLOBALS['cfgRelation']['commwork'] - * @uses $cfg['ShowTooltip'] - * @uses $cfg['LeftFrameDBTree'] - * @uses $cfg['LeftFrameDBSeparator'] - * @uses $cfg['ShowTooltipAliasDB'] - * @uses PMA_getTableCount() - * @uses PMA_getDbComment() - * @uses is_array() - * @uses implode() - * @uses strstr() - * @uses explode() * @param integer $offset * @param integer $count * @return array db list @@ -347,7 +299,6 @@ require_once './libraries/List.class.php'; /** * returns a part of the items * - * @uses array_slice() * @param integer $offset * @param integer $count * @return array some items diff --git a/libraries/Message.class.php b/libraries/Message.class.php index 3b0d0c5..d5e7d07 100644 --- a/libraries/Message.class.php +++ b/libraries/Message.class.php @@ -137,13 +137,6 @@ class PMA_Message /** * Constructor * - * @uses PMA_Message::setNumber() - * @uses PMA_Message::setString() - * @uses PMA_Message::setParams() - * @uses PMA_Message::NOTICE - * @uses PMA_Message::SANITIZE_NONE - * @uses PMA_Message::SANITIZE_STRING - * @uses PMA_Message::SANITIZE_PARAMS * @param string $string * @param integer $number * @param array $params @@ -160,7 +153,6 @@ class PMA_Message /** * magic method: return string representation for this object * - * @uses PMA_Message::getMessage() * @return string */ public function __toString() @@ -174,8 +166,6 @@ class PMA_Message * shorthand for getting a simple success message * * @static - * @uses PMA_Message as returned object - * @uses PMA_Message::SUCCESS * @param string $string a localized string e.g. __('Your SQL query has been executed successfully') * @return PMA_Message */ @@ -194,8 +184,6 @@ class PMA_Message * shorthand for getting a simple error message * * @static - * @uses PMA_Message as returned object - * @uses PMA_Message::ERROR * @param string $string a localized string e.g. __('Error') * @return PMA_Message */ @@ -214,8 +202,6 @@ class PMA_Message * shorthand for getting a simple notice message * * @static - * @uses PMA_Message as returned object - * @uses PMA_Message::NOTICE * @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 */ @@ -230,8 +216,6 @@ class PMA_Message * shorthand for getting a customized message * * @static - * @uses PMA_Message as returned object - * @uses PMA_Message::setMessage() * @param string $message * @param integer $type * @return PMA_Message @@ -249,9 +233,6 @@ class PMA_Message * shorthand for getting a customized message * * @static - * @uses PMA_Message as returned object - * @uses PMA_Message::success() - * @uses PMA_Message::addParam() * @param integer $rows Number of rows * @return PMA_Message */ @@ -268,9 +249,6 @@ class PMA_Message * shorthand for getting a customized message * * @static - * @uses PMA_Message as returned object - * @uses PMA_Message::success() - * @uses PMA_Message::addParam() * @param integer $rows Number of rows * @return PMA_Message */ @@ -287,9 +265,6 @@ class PMA_Message * shorthand for getting a customized message * * @static - * @uses PMA_Message as returned object - * @uses PMA_Message::success() - * @uses PMA_Message::addParam() * @param integer $rows Number of rows * @return PMA_Message */ @@ -306,8 +281,6 @@ class PMA_Message * shorthand for getting a customized error message * * @static - * @uses PMA_Message::raw() - * @uses PMA_Message::ERROR * @param string $message * @return PMA_Message */ @@ -322,8 +295,6 @@ class PMA_Message * shorthand for getting a customized notice message * * @static - * @uses PMA_Message::raw() - * @uses PMA_Message::NOTICE * @param string $message * @return PMA_Message */ @@ -338,8 +309,6 @@ class PMA_Message * shorthand for getting a customized success message * * @static - * @uses PMA_Message::raw() - * @uses PMA_Message::SUCCESS * @param string $message * @return PMA_Message */ @@ -352,9 +321,6 @@ class PMA_Message * returns whether this message is a success message or not * and optionaly makes this message a success message * - * @uses PMA_Message::SUCCESS - * @uses PMA_Message::setNumber() - * @uses PMA_Message::getNumber() * @param boolean $set * @return boolean whether this is a success message or not */ @@ -371,9 +337,6 @@ class PMA_Message * returns whether this message is a notice message or not * and optionally makes this message a notice message * - * @uses PMA_Message::NOTICE - * @uses PMA_Message::setNumber() - * @uses PMA_Message::getNumber() * @param boolean $set * @return boolean whether this is a notice message or not */ @@ -390,9 +353,6 @@ class PMA_Message * returns whether this message is an error message or not * and optionally makes this message an error message * - * @uses PMA_Message::ERROR - * @uses PMA_Message::setNumber() - * @uses PMA_Message::getNumber() * @param boolean $set * @return boolean whether this is an error message or not */ @@ -408,8 +368,6 @@ class PMA_Message /** * set raw message (overrides string) * - * @uses PMA_Message::$_message to set it - * @uses PMA_Message::sanitize() * @param string $message * @param boolean $sanitize whether to sanitize $message or not */ @@ -424,8 +382,6 @@ class PMA_Message /** * set string (does not take effect if raw message is set) * - * @uses PMA_Message::$_string to set it - * @uses PMA_Message::sanitize() * @param string $_string * @param boolean $sanitize whether to sanitize $string or not */ @@ -440,7 +396,6 @@ class PMA_Message /** * set message type number * - * @uses PMA_Message::$_number to set it * @param integer $number */ public function setNumber($number) @@ -458,9 +413,6 @@ class PMA_Message * $message->addParam('<img src="img" />', false); * </code> * - * @uses htmlspecialchars() - * @uses PMA_Message::$_params to fill - * @uses PMA_Message::notice() * @param mixed $param * @param boolean $raw */ @@ -478,8 +430,6 @@ class PMA_Message /** * add another string to be concatenated on displaying * - * @uses PMA_Message::$_added_messages to fill - * @uses PMA_Message::notice() * @param string $string to be added * @param string $separator to use between this and previous string/message */ @@ -492,7 +442,6 @@ class PMA_Message /** * add a bunch of messages at once * - * @uses PMA_Message::addMessage() * @param array $messages to be added * @param string $separator to use between this and previous string/message */ @@ -506,8 +455,6 @@ class PMA_Message /** * add another raw message to be concatenated on displaying * - * @uses PMA_Message::$_added_messages to fill - * @uses PMA_Message::rawNotice() * @param mixed $message to be added * @param string $separator to use between this and previous string/message */ @@ -527,8 +474,6 @@ class PMA_Message /** * set all params at once, usually used in conjunction with string * - * @uses PMA_Message::sanitize() - * @uses PMA_Message::$_params to set * @param array $params * @param boolean $sanitize */ @@ -543,7 +488,6 @@ class PMA_Message /** * return all parameters * - * @uses PMA_Message::$_params as return value * @return array */ public function getParams() @@ -554,7 +498,6 @@ class PMA_Message /** * return all added messages * - * @uses PMA_Message::$_added_messages as return value * @return array */ public function getAddedMessages() @@ -566,9 +509,6 @@ class PMA_Message * Sanitizes $message * * @static - * @uses is_array() - * @uses htmlspecialchars() - * @uses PMA_Message::sanitize() recursive * @param mixed $message the message(s) * @return mixed the sanitized message(s) * @access public @@ -591,7 +531,6 @@ class PMA_Message * for formatting * * @static - * @uses PMA_sanitize * @param string $message the message * @return string the decoded message * @access public @@ -604,11 +543,6 @@ class PMA_Message /** * wrapper for sprintf() * - * @uses sprintf() - * @uses func_get_args() - * @uses is_array() - * @uses array_unshift() - * @uses call_user_func_array() * @return string formatted */ static public function format() @@ -625,11 +559,6 @@ class PMA_Message /** * returns unique PMA_Message::$_hash, if not exists it will be created * - * @uses PMA_Message::$_hash as return value and to set it if required - * @uses PMA_Message::getNumber() - * @uses PMA_Message::$_string - * @uses PMA_Message::$_message - * @uses md5() * @return string PMA_Message::$_hash */ public function getHash() @@ -648,13 +577,6 @@ class PMA_Message /** * returns compiled message * - * @uses PMA_Message::$_message as return value - * @uses PMA_Message::getString() - * @uses PMA_Message::getParams() - * @uses PMA_Message::format() - * @uses PMA_Message::decodeBB() - * @uses PMA_Message::getAddedMessages() - * @uses strlen() * @return string complete message */ public function getMessage() @@ -688,7 +610,6 @@ class PMA_Message /** * returns PMA_Message::$_string * - * @uses PMA_Message::$_string as return value * @return string PMA_Message::$_string */ public function getString() @@ -699,7 +620,6 @@ class PMA_Message /** * returns PMA_Message::$_number * - * @uses PMA_Message::$_number as return value * @return integer PMA_Message::$_number */ public function getNumber() @@ -710,8 +630,6 @@ class PMA_Message /** * returns level of message * - * @uses PMA_Message::$level - * @uses PMA_Message::getNumber() * @return string level of message */ public function getLevel() @@ -722,8 +640,6 @@ class PMA_Message /** * Displays the message in HTML * - * @uses PMA_Message::getDisplay() - * @uses PMA_Message::isDisplayed() */ public function display() { @@ -734,8 +650,6 @@ class PMA_Message /** * returns HTML code for displaying this message * - * @uses PMA_Message::getLevel() - * @uses PMA_Message::getMessage() * * @return string whole message box */ @@ -748,7 +662,6 @@ class PMA_Message /** * sets and returns whether the message was displayed or not * - * @uses PMA_Message::$_is_displayed to set it and/or return it * @param boolean $is_displayed * @return boolean PMA_Message::$_is_displayed */ diff --git a/libraries/PMA.php b/libraries/PMA.php index 4b391c2..4f148b7 100644 --- a/libraries/PMA.php +++ b/libraries/PMA.php @@ -82,10 +82,6 @@ class PMA /** * Accessor to PMA::$databases * - * @uses PMA::$databases - * @uses PMA::$userlink - * @uses PMA::$controllink - * @uses PMA_List_Database * @return PMA_List_Databases */ public function getDatabaseList() diff --git a/libraries/Partition.class.php b/libraries/Partition.class.php index c2b14a4..6c5f256 100644 --- a/libraries/Partition.class.php +++ b/libraries/Partition.class.php @@ -17,7 +17,6 @@ class PMA_Partition * returns array of partition names for a specific db/table * * @access public - * @uses PMA_DBI_fetch_result() * @return array of partition names */ static public function getPartitionNames($db, $table) @@ -36,7 +35,6 @@ class PMA_Partition * @staticvar boolean $have_partitioning * @staticvar boolean $already_checked * @access public - * @uses PMA_DBI_fetch_result() * @return boolean */ static public function havePartitioning() diff --git a/libraries/RecentTable.class.php b/libraries/RecentTable.class.php index 4e5bd27..5a53a41 100644 --- a/libraries/RecentTable.class.php +++ b/libraries/RecentTable.class.php @@ -70,10 +70,6 @@ class PMA_RecentTable /** * Returns recently used tables from phpMyAdmin database. * - * @uses $pma_table - * @uses PMA_query_as_controluser() - * @uses PMA_DBI_fetch_array() - * @uses json_decode() * * @return array */ @@ -95,9 +91,6 @@ class PMA_RecentTable /** * Save recent tables into phpMyAdmin database. * - * @uses PMA_DBI_try_query() - * @uses json_decode() - * @uses PMA_Message * * @return true|PMA_Message */ diff --git a/libraries/StorageEngine.class.php b/libraries/StorageEngine.class.php index bcb4f68..d3e1019 100644 --- a/libraries/StorageEngine.class.php +++ b/libraries/StorageEngine.class.php @@ -51,7 +51,6 @@ class PMA_StorageEngine * @static * @staticvar array $storage_engines storage engines * @access public - * @uses PMA_DBI_fetch_result() * @return array of storage engines */ static public function getStorageEngines() @@ -69,9 +68,6 @@ class PMA_StorageEngine * returns HTML code for storage engine select box * * @static - * @uses PMA_StorageEngine::getStorageEngines() - * @uses strtolower() - * @uses htmlspecialchars() * @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 @@ -110,9 +106,6 @@ class PMA_StorageEngine * * Loads the corresponding engine plugin, if available. * - * @uses str_replace() - * @uses file_exists() - * @uses PMA_StorageEngine * @param string $engine The engine ID * @return object The engine plugin */ @@ -134,7 +127,6 @@ class PMA_StorageEngine * return true if given engine name is supported/valid, otherwise false * * @static - * @uses PMA_StorageEngine::getStorageEngines() * @param string $engine name of engine * @return boolean whether $engine is valid or not */ @@ -150,13 +142,6 @@ class PMA_StorageEngine /** * returns as HTML table of the engine's server variables * - * @uses PMA_ENGINE_DETAILS_TYPE_SIZE - * @uses PMA_ENGINE_DETAILS_TYPE_NUMERIC - * @uses PMA_StorageEngine::getVariablesStatus() - * @uses PMA_showHint() - * @uses PMA_formatByteDown() - * @uses PMA_formatNumber() - * @uses htmlspecialchars() * @return string The table that was generated based on the retrieved information */ function getHtmlVariables() @@ -219,12 +204,6 @@ class PMA_StorageEngine /** * returns array with detailed info about engine specific server variables * - * @uses PMA_ENGINE_DETAILS_TYPE_PLAINTEXT - * @uses PMA_StorageEngine::getVariables() - * @uses PMA_StorageEngine::getVariablesLikePattern() - * @uses PMA_DBI_query() - * @uses PMA_DBI_fetch_assoc() - * @uses PMA_DBI_free_result() * @return array with detailed info about specific engine server variables */ function getVariablesStatus() @@ -269,15 +248,6 @@ class PMA_StorageEngine /** * Constructor * - * @uses PMA_StorageEngine::getStorageEngines() - * @uses PMA_ENGINE_SUPPORT_DEFAULT - * @uses PMA_ENGINE_SUPPORT_YES - * @uses PMA_ENGINE_SUPPORT_DISABLED - * @uses PMA_ENGINE_SUPPORT_NO - * @uses $this->engine - * @uses $this->title - * @uses $this->comment - * @uses $this->support * @param string $engine The engine ID */ function __construct($engine) @@ -313,7 +283,6 @@ class PMA_StorageEngine * public String getTitle() * * Reveals the engine's title - * @uses $this->title * @return string The title */ function getTitle() @@ -325,7 +294,6 @@ class PMA_StorageEngine * public String getComment() * * Fetches the server's comment about this engine - * @uses $this->comment * @return string The comment */ function getComment() @@ -336,13 +304,6 @@ class PMA_StorageEngine /** * public String getSupportInformationMessage() * - * @uses PMA_ENGINE_SUPPORT_DEFAULT - * @uses PMA_ENGINE_SUPPORT_YES - * @uses PMA_ENGINE_SUPPORT_DISABLED - * @uses PMA_ENGINE_SUPPORT_NO - * @uses $this->support - * @uses $this->title - * @uses sprintf * @return string The localized message. */ function getSupportInformationMessage() diff --git a/libraries/Table.class.php b/libraries/Table.class.php index fddf614..baa677f 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -92,7 +92,6 @@ class PMA_Table /** * sets table name * - * @uses $this->name to set it * @param string $table_name new table name */ function setName($table_name) @@ -103,7 +102,6 @@ class PMA_Table /** * returns table name * - * @uses $this->name as return value * @param boolean whether to quote name with backticks `` * @return string table name */ @@ -118,7 +116,6 @@ class PMA_Table /** * sets database name for this table * - * @uses $this->db_name to set it * @param string $db_name */ function setDbName($db_name) @@ -129,7 +126,6 @@ class PMA_Table /** * returns database name for this table * - * @uses $this->db_name as return value * @param boolean whether to quote name with backticks `` * @return string database name for this table */ @@ -167,7 +163,6 @@ class PMA_Table /** * sets given $value for given $param * - * @uses $this->settings to add or change value * @param string param name * @param mixed param value */ @@ -179,7 +174,6 @@ class PMA_Table /** * returns value for given setting/param * - * @uses $this->settings to return value * @param string name for value to return * @return mixed value for $param */ @@ -1220,9 +1214,6 @@ class PMA_Table /** * Return UI preferences for this table from phpMyAdmin database. * - * @uses PMA_query_as_controluser() - * @uses PMA_DBI_fetch_array() - * @uses json_decode() * * @return array */ @@ -1249,9 +1240,6 @@ class PMA_Table /** * Save this table's UI preferences into phpMyAdmin database. * - * @uses PMA_DBI_try_query() - * @uses json_decode() - * @uses PMA_Message * * @return true|PMA_Message */ @@ -1282,7 +1270,6 @@ class PMA_Table * If pmadb and table_uiprefs is set, it will load the UI preferences from * phpMyAdmin database. * - * @uses getUiPrefsFromDb() */ protected function loadUiPrefs() { @@ -1305,7 +1292,6 @@ class PMA_Table * - PROP_SORTED_COLUMN * - PROP_COLUMN_ORDER * - * @uses loadUiPrefs() * * @param string $property * @return mixed diff --git a/libraries/Theme.class.php b/libraries/Theme.class.php index 09f46e2..d1b79fd 100644 --- a/libraries/Theme.class.php +++ b/libraries/Theme.class.php @@ -69,13 +69,6 @@ class PMA_Theme { /** * @access public - * @uses PMA_Theme::getPath() - * @uses PMA_Theme::$mtime_info - * @uses PMA_Theme::setVersion() - * @uses PMA_Theme::setName() - * @uses filemtime() - * @uses filesize() - * @uses file_exists() * @return boolean whether loading them info was successful or not */ function loadInfo() @@ -114,10 +107,6 @@ class PMA_Theme { * * @static * @access public - * @uses PMA_Theme - * @uses PMA_Theme::setPath() - * @uses PMA_Theme::loadInfo() - * @uses PMA_Theme::checkImgPath() * @param string $folder path to theme * @return object PMA_Theme */ @@ -140,12 +129,6 @@ class PMA_Theme { * checks image path for existance - if not found use img from original theme * * @access public - * @uses PMA_Theme::getPath() - * @uses PMA_Theme::setImgPath() - * @uses PMA_Theme::getName() - * @uses $GLOBALS['cfg']['ThemePath'] - * @uses is_dir() - * @uses sprintf() */ function checkImgPath() { @@ -167,7 +150,6 @@ class PMA_Theme { * returns path to theme * * @access public - * @uses PMA_Theme::$path as return value * @return string $path path to theme */ function getPath() @@ -179,7 +161,6 @@ class PMA_Theme { * returns layout file * * @access public - * @uses PMA_Theme::getPath() * @return string layout file */ function getLayoutFile() @@ -191,7 +172,6 @@ class PMA_Theme { * set path to theme * * @access public - * @uses PMA_Theme::$path to set it * @param string $path path to theme */ function setPath($path) @@ -203,7 +183,6 @@ class PMA_Theme { * sets version * * @access public - * @uses PMA_Theme::$version * @param string new version */ function setVersion($version) @@ -215,7 +194,6 @@ class PMA_Theme { * returns version * * @access public - * @uses PMA_Theme::$version * @return string version */ function getVersion() @@ -228,8 +206,6 @@ class PMA_Theme { * returns true if theme version is equal or higher to $version * * @access public - * @uses version_compare() - * @uses PMA_Theme::getVersion() * @param string $version version to compare to * @return boolean */ @@ -242,8 +218,6 @@ class PMA_Theme { * sets name * * @access public - * @uses PMA_Theme::$name to set it - * @uses trim() * @param string $name new name */ function setName($name) @@ -255,7 +229,6 @@ class PMA_Theme { * returns name * * @access public - * @uses PMA_Theme::$name as return value * @return string name */ function getName() @@ -267,7 +240,6 @@ class PMA_Theme { * sets id * * @access public - * @uses PMA_Theme::$id to set it * @param string $id new id */ function setId($id) @@ -279,7 +251,6 @@ class PMA_Theme { * returns id * * @access public - * @uses PMA_Theme::$id as return value * @return string id */ function getId() @@ -289,7 +260,6 @@ class PMA_Theme { /** * @access public - * @uses PMA_Theme::$img_path to set it * @param string path to images for this theme */ function setImgPath($path) @@ -299,7 +269,6 @@ class PMA_Theme { /** * @access public - * @uses PMA_Theme::$img_path as retunr value * @return string image path for this theme */ function getImgPath() @@ -311,11 +280,6 @@ class PMA_Theme { * load css (send to stdout, normally the browser) * * @access public - * @uses PMA_Theme::getPath() - * @uses PMA_Theme::$types - * @uses PMA_SQP_buildCssData() - * @uses file_exists() - * @uses in_array() * @param string $type left, right or print */ function loadCss(&$type) @@ -351,14 +315,6 @@ class PMA_Theme { * prints out the preview for this theme * * @access public - * @uses PMA_Theme::getName() - * @uses PMA_Theme::getVersion() - * @uses PMA_Theme::getId() - * @uses PMA_Theme::getPath() - * @uses PMA_generate_common_url() - * @uses addslashes() - * @uses file_exists() - * @uses htmlspecialchars() */ function printPreview() { diff --git a/libraries/Theme_Manager.class.php b/libraries/Theme_Manager.class.php index 55cc32c..b179ccc 100644 --- a/libraries/Theme_Manager.class.php +++ b/libraries/Theme_Manager.class.php @@ -187,11 +187,6 @@ class PMA_Theme_Manager /** * save theme in cookie * - * @uses $GLOBALS['PMA_Config']->setCookie(); - * @uses PMA_Theme_Manager::getThemeCookieName() - * @uses PMA_Theme_Manager::$theme - * @uses PMA_Theme_Manager::$theme_default - * @uses PMA_Theme::getId() */ function setThemeCookie() { @@ -331,8 +326,6 @@ class PMA_Theme_Manager /** * prints out preview for every theme * - * @uses $this->themes - * @uses PMA_Theme::printPreview() */ function printPreviews() { diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php index 8660ff0..ff758b8 100644 --- a/libraries/auth/cookie.auth.lib.php +++ b/libraries/auth/cookie.auth.lib.php @@ -78,8 +78,6 @@ if (function_exists('mcrypt_encrypt')) { /** * Returns blowfish secret or generates one if needed. - * @uses $cfg['blowfish_secret'] - * @uses $_SESSION['auto_blowfish_secret'] * * @access public */ @@ -101,32 +99,6 @@ function PMA_get_blowfish_secret() { * * this function MUST exit/quit the application * - * @uses $GLOBALS['server'] - * @uses $GLOBALS['PHP_AUTH_USER'] - * @uses $GLOBALS['pma_auth_server'] - * @uses $GLOBALS['text_dir'] - * @uses $GLOBALS['pmaThemeImage'] - * @uses $GLOBALS['target'] - * @uses $GLOBALS['db'] - * @uses $GLOBALS['table'] - * @uses $GLOBALS['pmaThemeImage'] - * @uses $cfg['Servers'] - * @uses $cfg['LoginCookieRecall'] - * @uses $cfg['Lang'] - * @uses $cfg['Server'] - * @uses $cfg['ReplaceHelpImg'] - * @uses $cfg['blowfish_secret'] - * @uses $cfg['AllowArbitraryServer'] - * @uses $_COOKIE - * @uses $_REQUEST['old_usr'] - * @uses PMA_sendHeaderLocation() - * @uses PMA_select_language() - * @uses PMA_select_server() - * @uses file_exists() - * @uses sprintf() - * @uses count() - * @uses htmlspecialchars() - * @uses is_array() * @global string the last connection error * * @access public @@ -337,25 +309,6 @@ if (top != self) { * @todo AllowArbitraryServer on does not imply that the user wants an * arbitrary server, or? so we should also check if this is filled and * not only if allowed - * @uses $GLOBALS['PHP_AUTH_USER'] - * @uses $GLOBALS['PHP_AUTH_PW'] - * @uses $GLOBALS['no_activity'] - * @uses $GLOBALS['server'] - * @uses $GLOBALS['from_cookie'] - * @uses $GLOBALS['pma_auth_server'] - * @uses $cfg['AllowArbitraryServer'] - * @uses $cfg['LoginCookieValidity'] - * @uses $cfg['Servers'] - * @uses $_REQUEST['old_usr'] from logout link - * @uses $_REQUEST['pma_username'] from login form - * @uses $_REQUEST['pma_password'] from login form - * @uses $_REQUEST['pma_servername'] from login form - * @uses $_COOKIE - * @uses $_SESSION['last_access_time'] - * @uses $GLOBALS['PMA_Config']->removeCookie() - * @uses PMA_blowfish_decrypt() - * @uses PMA_auth_fails() - * @uses time() * * @return boolean whether we get authentication settings or not * @@ -480,23 +433,6 @@ function PMA_auth_check() /** * Set the user and password after last checkings if required * - * @uses $GLOBALS['PHP_AUTH_USER'] - * @uses $GLOBALS['PHP_AUTH_PW'] - * @uses $GLOBALS['server'] - * @uses $GLOBALS['from_cookie'] - * @uses $GLOBALS['pma_auth_server'] - * @uses $cfg['Server'] - * @uses $cfg['AllowArbitraryServer'] - * @uses $cfg['LoginCookieStore'] - * @uses $cfg['PmaAbsoluteUri'] - * @uses $_SESSION['last_access_time'] - * @uses PMA_COMING_FROM_COOKIE_LOGIN - * @uses $GLOBALS['PMA_Config']->setCookie() - * @uses PMA_blowfish_encrypt() - * @uses $GLOBALS['PMA_Config']->removeCookie() - * @uses PMA_sendHeaderLocation() - * @uses time() - * @uses define() * @return boolean always true * * @access public @@ -615,17 +551,6 @@ function PMA_auth_set_user() * this function MUST exit/quit the application, * currently doen by call to PMA_auth() * - * @uses $GLOBALS['server'] - * @uses $GLOBALS['allowDeny_forbidden'] - * @uses $GLOBALS['no_activity'] - * @uses $cfg['LoginCookieValidity'] - * @uses $GLOBALS['PMA_Config']->removeCookie() - * @uses PMA_getenv() - * @uses PMA_DBI_getError() - * @uses PMA_sanitize() - * @uses PMA_auth() - * @uses sprintf() - * @uses basename() * @access public */ function PMA_auth_fails() diff --git a/libraries/blobstreaming.lib.php b/libraries/blobstreaming.lib.php index ce1711c..fc5265b 100644 --- a/libraries/blobstreaming.lib.php +++ b/libraries/blobstreaming.lib.php @@ -43,12 +43,6 @@ function initPBMSDatabase() * checks whether the necessary plugins for BLOBStreaming exist * * @access public - * @uses PMA_Config::get() - * @uses PMA_Config::settings() - * @uses PMA_Config::set() - * @uses PMA_BS_GetVariables() - * @uses PMA_cacheSet() - * @uses PMA_cacheGet() * @return boolean */ function checkBLOBStreamingPlugins() @@ -205,9 +199,6 @@ function checkBLOBStreamingPlugins() * returns a list of BLOBStreaming variables used by MySQL * * @access public - * @uses PMA_Config::get() - * @uses PMA_DBI_query() - * @uses PMA_DBI_fetch_assoc() * @return array - list of BLOBStreaming variables */ function PMA_BS_GetVariables() diff --git a/libraries/bookmark.lib.php b/libraries/bookmark.lib.php index dfc1946..5492cbf 100644 --- a/libraries/bookmark.lib.php +++ b/libraries/bookmark.lib.php @@ -9,11 +9,6 @@ /** * Defines the bookmark parameters for the current user * - * @uses $GLOBALS['server'] - * @uses PMA_getRelationsParam() - * @uses $GLOBALS['cfg']['Server']['user'] - * @uses $GLOBALS['cfg']['Server']['pmadb'] - * @uses $GLOBALS['cfg']['Server']['bookmarktable'] * @return array the bookmark parameters for the current user * @access public */ @@ -44,11 +39,6 @@ function PMA_Bookmark_getParams() /** * Gets the list of bookmarks defined for the current database * - * @uses PMA_backquote() - * @uses PMA_sqlAddslashes() - * @uses PMA_DBI_fetch_result() - * @uses PMA_DBI_QUERY_STORE - * @uses PMA_Bookmark_getParams() * @global resource the controluser db connection handle * * @param string the current database name @@ -94,10 +84,6 @@ function PMA_Bookmark_getList($db) /** * Gets the sql command from a bookmark * - * @uses PMA_backquote() - * @uses PMA_sqlAddslashes() - * @uses PMA_sqlAddslashes()okmarketList($db)ndleser.lib.phphponorking with linked tables have been deactivated. To find out why click %shere%s.')�̐��(�S�+Ȥ�S�+�4�S�+��T�+�̐��0�T�+�̐��̐��=�S�+6 ��!�!@̐��̐�x��T�+�̐�"!�S�+>�S�+@̐�� S�+̐��/U�+�(�S�+�/U�+��/U�+��/U�+Ȥ�S�+x��T�+�̐��̐��=�S�+�!�!@̐��̐�ȝ�T�+� ̐�"!�S�+>�S�+@̐�� S�+̐�p̐�h̐�;�S�+�p��̐��(�S�+Ȥ�S�+� ̐�p̐��=�S�+GHIJKMNOP@̐��̐�HU�T�+@̐�"!�S�+>�S�+@̐�0�/U�+�(�S�+��T�+��_T�+�/U�+��/U�+��/U�+Ȥ�S�+HU�T�+@̐�� ̐��=�S�+8U�T�+@̐�� ̐��=�S�+(U�T�+@̐�� ̐��=�S�+U�T�+@̐� ̐��=�S�+ ��/U�+�(�S�+��/U�+�̐��_T�+�'�S�+��/U�+� ̐�y�_T�+�'�S�+�/U�+� ̐�Z�_T�+�'�S�+؄_T�+��T�+��_T�+�/U�+��T�+��/U�+��/U�+Ȥ�S�+��]T�+`̐�0̐��=�S�+#%')*-.035678:<=@̐��̐�p*T�+� ̐�"!�S�+8��T�+�(�S�+��T�+��T�+Ȥ�S�+cfM�S�+�̐�p*T�+� ̐�P̐��=�S�+�%��wq�-��s��,~9��u]�� 4Q��U^Qʉ��u��*ēv��S�+�̐�F�U�+F�U�+?5�S�+�̐�̐��̐�M�S�+�'�S�+�4�S�+0̐�B�U�+̐�̐��S�+�̐��B�U�+�̐��=�S PMA_DBI_fetch_value() - * @uses PMA_Bookmark_getParams() * @global resource the controluser db connection handle * * @param string the current database name @@ -139,10 +125,6 @@ function PMA_Bookmark_get($db, $id, $id_field = 'id', $action_bookmark_all = fal /** * Adds a bookmark * - * @uses PMA_backquote() - * @uses PMA_sqlAddslashes() - * @uses PMA_DBI_query() - * @uses PMA_Bookmark_getParams() * @global resource the controluser db connection handle * * @param array the properties of the bookmark to add; here, @@ -172,10 +154,6 @@ function PMA_Bookmark_save($fields, $all_users = false) /** * Deletes a bookmark * - * @uses PMA_backquote() - * @uses PMA_sqlAddslashes() - * @uses PMA_DBI_try_query() - * @uses PMA_Bookmark_getParams() * @global resource the controluser db connection handle * * @param string the current database name diff --git a/libraries/check_user_privileges.lib.php b/libraries/check_user_privileges.lib.php index fee3b62..376992c 100644 --- a/libraries/check_user_privileges.lib.php +++ b/libraries/check_user_privileges.lib.php @@ -30,27 +30,6 @@ $GLOBALS['is_superuser'] = PMA_isSuperuser(); * displayed. For example, if an anonymous account exists, the named account * might be able to use its privileges, but SHOW GRANTS will not display them. * - * @uses $_SESSION['is_create_db_priv'] for caching - * @uses $_SESSION['is_process_priv'] for caching - * @uses $_SESSION['is_reload_priv'] for caching - * @uses $_SESSION['db_to_create'] for caching - * @uses $_SESSION['dbs_where_create_table_allowed'] for caching - * @uses $GLOBALS['is_create_db_priv'] to set it - * @uses $GLOBALS['is_process_priv'] to set it - * @uses $GLOBALS['is_reload_priv'] to set it - * @uses $GLOBALS['db_to_create'] to set it - * @uses $GLOBALS['dbs_where_create_table_allowed'] to set it - * @uses $GLOBALS['server'] - * @uses PMA_DBI_try_query() - * @uses PMA_DBI_fetch_row() - * @uses PMA_DBI_free_result() - * @uses PMA_DBI_getError() - * @uses PMA_unQuote() - * @uses PMA_backquote() - * @uses preg_match() - * @uses preg_replace() - * @uses substr() - * @uses strpos() */ function PMA_analyseShowGrant() { diff --git a/libraries/common.lib.php b/libraries/common.lib.php index b6fb4a1..7dcbea0 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -62,8 +62,6 @@ function PMA_pow($base, $exp, $use_function = false) /** * string PMA_getIcon(string $icon) * - * @uses $GLOBALS['pmaThemeImage'] - * @uses $GLOBALS['cfg']['PropertiesIconic'] * @param string $icon name of icon file * @param string $alternate alternate text * @param boolean $container include in container @@ -120,7 +118,6 @@ function PMA_getIcon($icon, $alternate = '', $container = false, $force_text = f /** * Displays the maximum size for an upload * - * @uses PMA_formatByteDown() * @param integer $max_upload_size the size * @return string the message * @@ -260,9 +257,6 @@ function PMA_unQuote($quoted_string, $quote = null) * format sql strings * * @todo move into PMA_Sql - * @uses PMA_SQP_isError() - * @uses PMA_SQP_formatHtml() - * @uses PMA_SQP_formatNone() * @param mixed $parsed_sql pre-parsed SQL structure * @param string $unparsed_sql * @return string the formatted sql @@ -320,11 +314,6 @@ function PMA_formatSql($parsed_sql, $unparsed_sql = '') /** * Displays a link to the official MySQL documentation * - * @uses $cfg['MySQLManualType'] - * @uses $cfg['MySQLManualBase'] - * @uses $cfg['ReplaceHelpImg'] - * @uses $GLOBALS['pmaThemeImage'] - * @uses PMA_MYSQL_INT_VERSION * @param string $chapter chapter of "HTML, one page per chapter" documentation * @param string $link contains name of page/anchor that is being linked * @param bool $big_icon whether to use big icon (like in left frame) @@ -450,7 +439,6 @@ function PMA_showPHPDocu($target) { /** * returns HTML for a footnote marker and add the messsage to the footnotes * - * @uses $GLOBALS['footnotes'] * @param string $message the error message * @param bool $bbcode * @param string $type @@ -498,22 +486,6 @@ function PMA_showHint($message, $bbcode = false, $type = 'notice') /** * Displays a MySQL error message in the right frame. * - * @uses footer.inc.php - * @uses header.inc.php - * @uses $GLOBALS['sql_query'] - * @uses $GLOBALS['pmaThemeImage'] - * @uses $GLOBALS['cfg']['PropertiesIconic'] - * @uses $GLOBALS['cfg']['MaxCharactersInDisplayedSQL'] - * @uses PMA_backquote() - * @uses PMA_DBI_getError() - * @uses PMA_formatSql() - * @uses PMA_generate_common_hidden_inputs() - * @uses PMA_generate_common_url() - * @uses PMA_showMySQLDocu() - * @uses PMA_sqlAddslashes() - * @uses PMA_SQP_isError() - * @uses PMA_SQP_parse() - * @uses PMA_SQP_getErrorString() * @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 @@ -664,16 +636,6 @@ function PMA_mysqlDie($error_message = '', $the_query = '', /** * returns array with tables of given db with extended information and grouped * - * @uses $cfg['LeftFrameTableSeparator'] - * @uses $cfg['LeftFrameTableLevel'] - * @uses $cfg['ShowTooltipAliasTB'] - * @uses $cfg['NaturalOrder'] - * @uses PMA_backquote() - * @uses count() - * @uses array_merge - * @uses uksort() - * @uses strstr() - * @uses explode() * @param string $db name of db * @param string $tables name of tables * @param integer $limit_offset list offset @@ -804,10 +766,6 @@ function PMA_getTableList($db, $tables = null, $limit_offset = 0, $limit_count = * * </code> * - * @uses PMA_backquote() - * @uses is_array() - * @uses strlen() - * @uses str_replace() * @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 @@ -843,7 +801,6 @@ function PMA_backquote($a_name, $do_it = true) /** * Defines the <CR><LF> value depending on the user OS. * - * @uses PMA_USR_OS * @return string the <CR><LF> value to use * * @access public @@ -869,9 +826,6 @@ function PMA_whichCrlf() * Reloads navigation if needed. * * @param $jsonly prints out pure JavaScript - * @uses $GLOBALS['reload'] - * @uses $GLOBALS['db'] - * @uses PMA_generate_common_url() * @global array configuration * * @access public @@ -916,7 +870,6 @@ if (!$jsonly) * @param string $type the type (level) of the message * @param boolean $is_view is this a message after a VIEW operation? * @global array the configuration array - * @uses $cfg * @access public */ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view = false) @@ -1270,11 +1223,6 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view /** * Verifies if current MySQL server supports profiling * - * @uses $_SESSION['profiling_supported'] for caching - * @uses $GLOBALS['server'] - * @uses PMA_DBI_fetch_value() - * @uses PMA_MYSQL_INT_VERSION - * @uses defined() * @access public * @return boolean whether profiling is supported * @@ -1478,7 +1426,6 @@ 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) - * @uses PMA_pow() * @return integer The numerical part of the expression (for example 8) */ function PMA_extractValueFromFormattedSize($formatted_size) @@ -1567,19 +1514,6 @@ 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 * - * @uses $GLOBALS['PMA_PHP_SELF'] - * @uses $GLOBALS['active_page'] - * @uses $GLOBALS['url_query'] - * @uses $cfg['MainPageIconic'] - * @uses $GLOBALS['pmaThemeImage'] - * @uses PMA_generate_common_url() - * @uses E_USER_NOTICE - * @uses htmlentities() - * @uses urlencode() - * @uses sprintf() - * @uses trigger_error() - * @uses array_merge() - * @uses basename() * @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 @@ -1679,8 +1613,6 @@ function PMA_generate_html_tab($tab, $url_params = array()) /** * returns html-code for a tab navigation * - * @uses PMA_generate_html_tab() - * @uses htmlentities() * @param array $tabs one element per tab * @param string $url_params * @return string html-code for tab-navigation @@ -1844,8 +1776,6 @@ function PMA_linkOrButton($url, $message, $tag_params = array(), /** * Returns a given timespan value in a readable format. * - * @uses sprintf() - * @uses floor() * @param int $seconds the timespan * * @return string the formatted value @@ -1875,7 +1805,6 @@ 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() - * @uses strlen * @param string $string The string * @param string $Separator The Separator (defaults to "<br />\n") * @@ -1925,9 +1854,6 @@ function PMA_flipstring($string, $Separator = "<br />\n") * * @todo localize error message * @todo use PMA_fatalError() if $die === true? - * @uses PMA_getenv() - * @uses header_meta_style.inc.php - * @uses $GLOBALS['PMA_PHP_SELF'] * @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 @@ -1978,14 +1904,6 @@ function PMA_checkParameters($params, $die = true, $request = true) /** * Function to generate unique condition for specified row. * - * @uses $GLOBALS['analyzed_sql'][0] - * @uses PMA_DBI_field_flags() - * @uses PMA_backquote() - * @uses PMA_sqlAddslashes() - * @uses PMA_printable_bit_value() - * @uses stristr() - * @uses bin2hex() - * @uses preg_replace() * @param resource $handle current query result * @param integer $fields_cnt number of fields * @param array $fields_meta meta information about fields @@ -2109,9 +2027,6 @@ function PMA_getUniqueCondition($handle, $fields_cnt, $fields_meta, $row, $force /** * Generate a button or image tag * - * @uses PMA_USR_BROWSER_AGENT - * @uses $GLOBALS['pmaThemeImage'] - * @uses $GLOBALS['cfg']['PropertiesIconic'] * @param string $button_name name of button element * @param string $button_class class of button element * @param string $image_name name of image element @@ -2252,7 +2167,6 @@ function PMA_pageselector($rows, $pageNow = 1, $nbTotalPage = 1, * Generate navigation for a list * * @todo use $pos from $_url_params - * @uses range() * @param integer number of elements in the list * @param integer current position in the list * @param array url parameters @@ -2340,9 +2254,6 @@ function PMA_listNavigator($count, $pos, $_url_params, $script, $frame, $max_cou * $user_dir = PMA_userDir('/var/pma_tmp/%u/'); // '/var/pma_tmp/root/' * * </code> - * @uses $cfg['Server']['user'] - * @uses substr() - * @uses str_replace() * @param string $dir with wildcard for user * @return string per user directory */ @@ -2359,13 +2270,6 @@ function PMA_userDir($dir) /** * returns html code for db link to default db page * - * @uses $cfg['DefaultTabDatabase'] - * @uses $GLOBALS['db'] - * @uses PMA_generate_common_url() - * @uses PMA_unescape_mysql_wildcards() - * @uses strlen() - * @uses sprintf() - * @uses htmlspecialchars() * @param string $database * @return string html link to default db page */ @@ -2389,9 +2293,6 @@ function PMA_getDbLink($database = null) * Displays a lightbulb hint explaining a known external bug * that affects a functionality * - * @uses PMA_MYSQL_INT_VERSION - * @uses PMA_showHint() - * @uses sprintf() * @param string $functionality localized message explaining the func. * @param string $component 'mysql' (eventually, 'php') * @param string $minimum_version of this component @@ -2420,7 +2321,6 @@ function PMA_display_html_checkbox($html_field_name, $label, $checked, $onclick) /** * Generates and echoes a set of radio HTML fields * - * @uses htmlspecialchars() * @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 @@ -2453,7 +2353,6 @@ function PMA_display_html_radio($html_field_name, $choices, $checked_choice = '' /** * Generates and returns an HTML dropdown * - * @uses htmlspecialchars() * @param string $select_name * @param array $choices the choices values * @param string $active_choice the choice to select by default @@ -2481,7 +2380,6 @@ 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. * - * @uses $GLOBALS['cfg']['InitialSlidersState'] * @param string $id the id of the <div> on which to apply the effect * @param string $message the message to show as a link */ @@ -2579,11 +2477,6 @@ 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 * - * @uses ceil() - * @uses decbin() - * @uses ord() - * @uses substr() - * @uses sprintf() * @param numeric $value coming from a BIT field * @param integer $length * @return string the printable value @@ -2600,7 +2493,6 @@ function PMA_printable_bit_value($value, $length) { /** * Verifies whether the value contains a non-printable character * - * @uses preg_match() * @param string $value * @return boolean */ @@ -2612,7 +2504,6 @@ function PMA_contains_nonprintable_ascii($value) { * Converts a BIT type default value * for example, b'010' becomes 010 * - * @uses strtr() * @param string $bit_default_value * @return string the converted value */ @@ -2623,9 +2514,6 @@ function PMA_convert_bit_default_value($bit_default_value) { /** * Extracts the various parts from a field type spec * - * @uses strpos() - * @uses chop() - * @uses substr() * @param string $fieldspec * @return array associative array containing type, spec_in_brackets * and possibly enum_set_values (another array) @@ -2702,7 +2590,6 @@ function PMA_extractFieldSpec($fieldspec) { /** * Verifies if this table's engine supports foreign keys * - * @uses strtoupper() * @param string $engine * @return boolean */ @@ -2718,7 +2605,6 @@ function PMA_foreignkey_supported($engine) { /** * Replaces some characters by a displayable equivalent * - * @uses str_replace() * @param string $content * @return string the content with characters replaced */ @@ -2941,7 +2827,6 @@ function PMA_selectUploadFile($import_list, $uploaddir) { * Build titles and icons for action links * * @return array the action titles - * @uses PMA_getIcon() */ function PMA_buildActionTitles() { $titles = array(); @@ -2976,8 +2861,6 @@ function PMA_buildActionTitles() { * * @return mixed An HTML snippet or an array of datatypes. * - * @uses htmlspecialchars() - * @uses in_array() */ function PMA_getSupportedDatatypes($html = false, $selected = '') { @@ -3160,10 +3043,6 @@ function PMA_getFunctionsForField($field, $insert_mode) * // 'CREATE ROUTINE' privilege or, if not, checks if the * // user has this privilege on database 'mydb'. * - * @uses PMA_DBI_fetch_value() - * @uses explode() - * @uses str_replace() - * @uses sprintf() * * @param string $priv The privilege to check * @param mixed $db null, to only check global privileges diff --git a/libraries/config/ConfigFile.class.php b/libraries/config/ConfigFile.class.php index 20369f1..c1b4e77 100644 --- a/libraries/config/ConfigFile.class.php +++ b/libraries/config/ConfigFile.class.php @@ -72,7 +72,6 @@ class ConfigFile /** * Private constructor, use {@link getInstance()} * - * @uses PMA_array_write() */ private function __construct() { @@ -193,9 +192,6 @@ class ConfigFile /** * Sets config value * - * @uses PMA_array_read() - * @uses PMA_array_remove() - * @uses PMA_array_write() * @param string $path * @param mixed $value * @param string $canonical_path @@ -285,7 +281,6 @@ class ConfigFile /** * Returns config value or $default if it's not set * - * @uses PMA_array_read() * @param string $path * @param mixed $default * @return mixed @@ -300,7 +295,6 @@ class ConfigFile * exist in config.default.php ($cfg) and config.values.php * ($_cfg_db['_overrides']) * - * @uses PMA_array_read() * @param string $canonical_path * @param mixed $default * @return mixed @@ -314,7 +308,6 @@ class ConfigFile * Returns config value, if it's not set uses the default one; returns * $default if the path isn't set and doesn't contain a default value * - * @uses PMA_array_read() * @param string $path * @param mixed $default * @return mixed @@ -342,7 +335,6 @@ class ConfigFile /** * Returns config database entry for $path ($cfg_db in config_info.php) * - * @uses PMA_array_read() * @param string $path * @param mixed $default * @return mixed diff --git a/libraries/config/Form.class.php b/libraries/config/Form.class.php index 7aa8468..1ec8073 100644 --- a/libraries/config/Form.class.php +++ b/libraries/config/Form.class.php @@ -74,8 +74,6 @@ class Form /** * Returns allowed values for select fields * - * @uses ConfigFile::getDbEntry() - * @uses ConfigFile::getInstance() * @param string $option_path * @return array */ @@ -167,9 +165,6 @@ class Form /** * Reads fields' types to $this->fieldsTypes * - * @uses ConfigFile::getDbEntry() - * @uses ConfigFile::getDefault() - * @uses ConfigFile::getInstance() */ protected function readTypes() { diff --git a/libraries/config/FormDisplay.class.php b/libraries/config/FormDisplay.class.php index de49140..840d760 100644 --- a/libraries/config/FormDisplay.class.php +++ b/libraries/config/FormDisplay.class.php @@ -132,9 +132,6 @@ class FormDisplay /** * Runs validation for all registered forms * - * @uses ConfigFile::getInstance() - * @uses ConfigFile::getValue() - * @uses PMA_config_validate() */ private function _validate() { @@ -178,19 +175,6 @@ class FormDisplay /** * Outputs HTML for forms * - * @uses ConfigFile::getInstance() - * @uses ConfigFile::get() - * @uses display_fieldset_bottom() - * @uses display_fieldset_top() - * @uses display_form_bottom() - * @uses display_form_top() - * @uses display_js() - * @uses display_tabs_bottom() - * @uses display_tabs_top() - * @uses js_validate() - * @uses PMA_config_get_validators() - * @uses PMA_jsFormat() - * @uses PMA_lang() * @param bool $tabbed_form * @param bool $show_restore_default whether show "restore default" button besides the input field */ @@ -281,17 +265,6 @@ class FormDisplay /** * Prepares data for input field display and outputs HTML code * - * @uses ConfigFile::get() - * @uses ConfigFile::getDefault() - * @uses ConfigFile::getInstance() - * @uses display_group_footer() - * @uses display_group_header() - * @uses display_input() - * @uses Form::getOptionType() - * @uses Form::getOptionValueList() - * @uses PMA_escapeJsString() - * @uses PMA_lang_desc() - * @uses PMA_lang_name() * @param Form $form * @param string $field field name as it appears in $form * @param string $system_path field path, eg. Servers/1/verbose @@ -405,8 +378,6 @@ class FormDisplay /** * Displays errors * - * @uses display_errors() - * @uses PMA_lang_name() */ public function displayErrors() { @@ -429,9 +400,6 @@ class FormDisplay /** * Reverts erroneous fields to their default values * - * @uses ConfigFile::getDefault() - * @uses ConfigFile::getInstance() - * @uses ConfigFile::set() * */ public function fixErrors() @@ -481,13 +449,6 @@ class FormDisplay /** * Validates and saves form data to session * - * @uses ConfigFile::get() - * @uses ConfigFile::getInstance() - * @uses ConfigFile::getServerCount() - * @uses ConfigFile::set() - * @uses Form::getOptionType() - * @uses Form::getOptionValueList() - * @uses PMA_lang_name() * @param array|string $forms array of form names * @param bool $allow_partial_save allows for partial form saving on failed validation * @return boolean true on success (no errors and all saved) @@ -707,7 +668,6 @@ class FormDisplay /** * Fills out {@link userprefs_keys} and {@link userprefs_disallow} * - * @uses PMA_read_userprefs_fieldnames() */ private function _loadUserprefsInfo() { diff --git a/libraries/config/FormDisplay.tpl.php b/libraries/config/FormDisplay.tpl.php index 84c4ee2..c893654 100644 --- a/libraries/config/FormDisplay.tpl.php +++ b/libraries/config/FormDisplay.tpl.php @@ -9,8 +9,6 @@ /** * Displays top part of the form * - * @uses PMA_generate_common_hidden_inputs() - * @uses PMA_getHiddenFields() * @param string $action default: $_SERVER['REQUEST_URI'] * @param string $method 'post' or 'get' * @param array $hidden_fields array of form hidden fields (key: field name) @@ -115,10 +113,6 @@ function display_fieldset_top($title = '', $description = '', $errors = null, $a * o comment_warning - (bool) whether this comments warns about something * o wiki - (string) wiki link * - * @uses $GLOBALS['_FormDisplayGroup'] - * @uses $GLOBALS['cfg']['ThemePath'] - * @uses $_SESSION['PMA_Theme'] - * @uses display_group_footer() * @param string $path * @param string $name * @param string $description @@ -281,8 +275,6 @@ function display_input($path, $name, $description = '', $type, $value, $value_is /** * Display group header * - * @uses $GLOBALS['_FormDisplayGroup'] - * @uses display_group_footer() * @param string $header_text */ function display_group_header($header_text) @@ -308,7 +300,6 @@ function display_group_header($header_text) /** * Display group footer * - * @uses $GLOBALS['_FormDisplayGroup'] */ function display_group_footer() { @@ -370,7 +361,6 @@ function display_form_bottom() /** * Appends JS validation code to $js_array * - * @uses PMA_escapeJsString() * @param string $field_id * @param string|array $validator * @param array $js_array diff --git a/libraries/config/validate.lib.php b/libraries/config/validate.lib.php index 92e4d07..bcd62ae 100644 --- a/libraries/config/validate.lib.php +++ b/libraries/config/validate.lib.php @@ -18,8 +18,6 @@ /** * Returns validator list * - * @uses ConfigFile::getDbEntry() - * @uses ConfigFile::getInstance() * @return array */ function PMA_config_get_validators() @@ -65,9 +63,6 @@ function PMA_config_get_validators() * cleanup in HTML documen * o false - when no validators match name(s) given by $validator_id * - * @uses ConfigFile::getCanonicalPath() - * @uses ConfigFile::getInstance() - * @uses PMA_config_get_validators() * @param string|array $validator_id * @param array $values * @param bool $isPostSource tells whether $values are directly from POST request @@ -221,7 +216,6 @@ function test_db_connection($extension, $connect_type, $host, $port, $socket, $u /** * Validate server config * - * @uses test_db_connection() * @param string $path * @param array $values * @return array @@ -256,7 +250,6 @@ function validate_server($path, $values) /** * Validate pmadb config * - * @uses test_db_connection() * @param string $path * @param array $values * @return array @@ -295,7 +288,6 @@ function validate_pmadb($path, $values) /** * Validates regular expression * - * @uses test_php_errormsg() * @param string $path * @param array $values * @return array @@ -399,7 +391,6 @@ function test_number($path, $values, $allow_neg, $allow_zero, $max_value, $error /** * Validates port number * - * @uses test_number() * @param string $path * @param array $values * @return array @@ -412,7 +403,6 @@ function validate_port_number($path, $values) /** * Validates positive number * - * @uses test_number() * @param string $path * @param array $values * @return array @@ -425,7 +415,6 @@ function validate_positive_number($path, $values) /** * Validates non-negative number * - * @uses test_number() * @param string $path * @param array $values * @return array diff --git a/libraries/core.lib.php b/libraries/core.lib.php index 6494d49..e61c146 100644 --- a/libraries/core.lib.php +++ b/libraries/core.lib.php @@ -29,7 +29,6 @@ * echo PMA_ifSetOr($cfg['ForceSSL'], false, 'boolean'); // true * </code> * - * @uses PMA_isValid() * @see PMA_isValid() * @param mixed $var param to check * @param mixed $default default value @@ -80,12 +79,6 @@ function PMA_ifSetOr(&$var, $default = null, $type = 'similar') * * @todo create some testsuites * @todo add some more var types like hex, bin, ...? - * @uses is_scalar() - * @uses is_numeric() - * @uses is_array() - * @uses in_array() - * @uses gettype() - * @uses strtolower() * @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 @@ -199,21 +192,6 @@ function PMA_securePath($path) * loads language file if not loaded already * * @todo use detected argument separator (PMA_Config) - * @uses $GLOBALS['session_name'] - * @uses $GLOBALS['text_dir'] - * @uses $GLOBALS['available_languages'] - * @uses $GLOBALS['lang'] - * @uses $GLOBALS['PMA_Config']->removeCookie() - * @uses select_lang.lib.php - * @uses $_COOKIE - * @uses substr() - * @uses header() - * @uses http_build_query() - * @uses is_string() - * @uses sprintf() - * @uses vsprintf() - * @uses strtr() - * @uses defined() * @param string $error_message the error message or named error message * @param string|array $message_args arguments applied to $error_message * @return exit @@ -290,11 +268,6 @@ function PMA_warnMissingExtension($extension, $fatal = false, $extra = '') /** * returns count of tables in given db * - * @uses PMA_DBI_try_query() - * @uses PMA_backquote() - * @uses PMA_DBI_QUERY_STORE() - * @uses PMA_DBI_num_rows() - * @uses PMA_DBI_free_result() * @param string $db database to count tables for * @return integer count of tables in $db */ @@ -327,9 +300,6 @@ function PMA_getTableCount($db) * (renamed with PMA prefix to avoid double definition when embedded * in Moodle) * - * @uses each() - * @uses strlen() - * @uses substr() * @param string $size * @return integer $size */ @@ -365,10 +335,6 @@ function PMA_get_real_size($size = 0) * * @see http://php.net/array_merge * @see http://php.net/array_merge_recursive - * @uses func_num_args() - * @uses func_get_arg() - * @uses is_array() - * @uses call_user_func_array() * @param array array to merge * @param array array to merge * @param array ... @@ -424,9 +390,6 @@ 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 * - * @uses PMA_arrayWalkRecursive() - * @uses is_array() - * @uses is_string() * @param array $array array to walk * @param string $function function to call for every array element */ @@ -460,10 +423,6 @@ 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) * - * @uses in_array() - * @uses urldecode() - * @uses substr() - * @uses strpos() * @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) @@ -493,11 +452,6 @@ function PMA_checkPageValidity(&$page, $whitelist) * searchs in $_SERVER, $_ENV than trys getenv() and apache_getenv() * in this order * - * @uses $_SERVER - * @uses $_ENV - * @uses getenv() - * @uses function_exists() - * @uses apache_getenv() * @param string $var_name variable name * @return string value of $var or empty string */ @@ -519,19 +473,6 @@ function PMA_getenv($var_name) { /** * Send HTTP header, taking IIS limits into account (600 seems ok) * - * @uses PMA_IS_IIS - * @uses PMA_COMING_FROM_COOKIE_LOGIN - * @uses PMA_get_arg_separator() - * @uses SID - * @uses strlen() - * @uses strpos() - * @uses header() - * @uses session_write_close() - * @uses headers_sent() - * @uses function_exists() - * @uses debug_print_backtrace() - * @uses trigger_error() - * @uses defined() * @param string $uri the header to send * @return boolean always true */ diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index 326ab0c..2625fe9 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -145,15 +145,6 @@ 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 * - * @uses $GLOBALS['cfg']['IconvExtraParams'] - * @uses PMA_DBI_fetch_value() to get server_language - * @uses preg_match() to filter server_language - * @uses in_array() - * @uses function_exists() to check for a convert function - * @uses iconv() to convert message - * @uses libiconv() to convert message - * @uses recode_string() to convert message - * @uses mb_convert_encoding() to convert message * @param string $message * @return string $message */ @@ -284,9 +275,6 @@ function PMA_usort_comparison_callback($a, $b) * </code> * * @todo move into PMA_Table - * @uses PMA_DBI_fetch_result() - * @uses PMA_escape_mysql_wildcards() - * @uses PMA_backquote() * @param string $database database * @param string|false $table table * @param boolean|string $tbl_is_group $table is a table group @@ -966,29 +954,6 @@ 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. * - * @uses ./libraries/charset_conversion.lib.php - * @uses PMA_DBI_QUERY_STORE - * @uses PMA_MYSQL_INT_VERSION to set it - * @uses PMA_MYSQL_STR_VERSION to set it - * @uses $_SESSION['PMA_MYSQL_INT_VERSION'] for caching - * @uses $_SESSION['PMA_MYSQL_STR_VERSION'] for caching - * @uses PMA_DBI_GETVAR_SESSION - * @uses PMA_DBI_fetch_value() - * @uses PMA_DBI_query() - * @uses PMA_DBI_get_variable() - * @uses $GLOBALS['collation_connection'] - * @uses $GLOBALS['available_languages'] - * @uses $GLOBALS['mysql_charset_map'] - * @uses $GLOBALS['lang'] - * @uses $GLOBALS['cfg']['Lang'] - * @uses defined() - * @uses explode() - * @uses sprintf() - * @uses intval() - * @uses define() - * @uses defined() - * @uses substr() - * @uses count() * @param mixed $link mysql link resource|object * @param boolean $is_controluser */ @@ -1046,13 +1011,6 @@ function PMA_DBI_postConnect($link, $is_controluser = false) * // $user_name = 'John Doe' * </code> * - * @uses is_string() - * @uses is_int() - * @uses PMA_DBI_try_query() - * @uses PMA_DBI_num_rows() - * @uses PMA_DBI_fetch_row() - * @uses PMA_DBI_fetch_assoc() - * @uses PMA_DBI_free_result() * @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 @@ -1108,13 +1066,6 @@ function PMA_DBI_fetch_value($result, $row_number = 0, $field = 0, $link = null, * // $user = array('id' => 123, 'name' => 'John Doe') * </code> * - * @uses is_string() - * @uses PMA_DBI_try_query() - * @uses PMA_DBI_num_rows() - * @uses PMA_DBI_fetch_row() - * @uses PMA_DBI_fetch_assoc() - * @uses PMA_DBI_fetch_array() - * @uses PMA_DBI_free_result() * @param string|mysql_result $result query or mysql result * @param string $type NUM|ASSOC|BOTH * returned array should either numeric @@ -1194,14 +1145,6 @@ function PMA_DBI_fetch_single_row($result, $type = 'ASSOC', $link = null, $optio * // $users['admin']['John Doe'] = '123' * </code> * - * @uses is_string() - * @uses is_int() - * @uses PMA_DBI_try_query() - * @uses PMA_DBI_num_rows() - * @uses PMA_DBI_num_fields() - * @uses PMA_DBI_fetch_row() - * @uses PMA_DBI_fetch_assoc() - * @uses PMA_DBI_free_result() * @param string|mysql_result $result query or mysql result * @param string|integer $key field-name or offset * used as key for array @@ -1332,8 +1275,6 @@ function PMA_DBI_getCompatibilities() /** * returns warnings for last query * - * @uses $GLOBALS['userlink'] - * @uses PMA_DBI_fetch_result() * @param resource $link mysql link resource * @return array warnings */ @@ -1354,11 +1295,6 @@ function PMA_DBI_get_warnings($link = null) * returns true (int > 0) if current user is superuser * otherwise 0 * - * @uses $_SESSION['is_superuser'] for caching - * @uses $GLOBALS['userlink'] - * @uses $GLOBALS['server'] - * @uses PMA_DBI_try_query() - * @uses PMA_DBI_QUERY_STORE * @return integer $is_superuser */ function PMA_isSuperuser() @@ -1382,7 +1318,6 @@ function PMA_isSuperuser() /** * returns an array of PROCEDURE or FUNCTION names for a db * - * @uses PMA_DBI_free_result() * @param string $db db name * @param string $which PROCEDURE | FUNCTION * @param resource $link mysql link @@ -1404,7 +1339,6 @@ function PMA_DBI_get_procedures_or_functions($db, $which, $link = null) /** * returns the definition of a specific PROCEDURE, FUNCTION or EVENT * - * @uses PMA_DBI_fetch_value() * @param string $db db name * @param string $which PROCEDURE | FUNCTION | EVENT * @param string $name the procedure|function|event name @@ -1426,7 +1360,6 @@ function PMA_DBI_get_definition($db, $which, $name, $link = null) /** * returns details about the TRIGGERs for a specific table or database * - * @uses PMA_DBI_fetch_result() * @param string $db db name * @param string $table table name * @param string $delimiter the delimiter to use (may be empty) @@ -1481,7 +1414,6 @@ function PMA_DBI_get_triggers($db, $table = '', $delimiter = '//') /** * Returns true if $db.$view_name is a view, false if not * - * @uses PMA_DBI_fetch_result() * @param string $db database name * @param string $view_name view/table name * diff --git a/libraries/db_info.inc.php b/libraries/db_info.inc.php index b657c6a..9d6dcf6 100644 --- a/libraries/db_info.inc.php +++ b/libraries/db_info.inc.php @@ -9,28 +9,6 @@ * * speedup view on locked tables * - * @uses $cfg['ShowStats'] - * @uses $cfg['ShowTooltip'] - * @uses $cfg['ShowTooltipAliasTB'] - * @uses $cfg['SkipLockedTables'] - * @uses $GLOBALS['db'] - * @uses PMA_fillTooltip() - * @uses PMA_checkParameters() - * @uses PMA_escape_mysql_wildcards() - * @uses PMA_DBI_query() - * @uses PMA_backquote() - * @uses PMA_DBI_num_rows() - * @uses PMA_DBI_fetch_row() - * @uses PMA_DBI_fetch_assoc() - * @uses PMA_DBI_free_result() - * @uses PMA_DBI_get_tables_full() - * @uses PMA_isValid() - * @uses preg_match() - * @uses preg_quote() - * @uses uksort() - * @uses strnatcasecmp() - * @uses count() - * @uses PMA_sqlAddSlashes() * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { @@ -57,9 +35,6 @@ $pos = $_SESSION['tmp_user_values']['table_limit_offset']; /** * fills given tooltip arrays * - * @uses $cfg['ShowTooltipAliasTB'] - * @uses PMA_localisedDate() - * @uses strtotime() * @param array $tooltip_truename tooltip data * @param array $tooltip_aliasname tooltip data * @param array $table tabledata diff --git a/libraries/db_routines.lib.php b/libraries/db_routines.lib.php index 13859cf..dde8b79 100644 --- a/libraries/db_routines.lib.php +++ b/libraries/db_routines.lib.php @@ -16,13 +16,6 @@ if (! defined('PHPMYADMIN')) { * * @return array Parsed information about the input parameter * - * @uses PMA_SQP_parse() - * @uses PMA_unquote() - * @uses in_array() - * @uses strtoupper() - * @uses strtolower() - * @uses sort() - * @uses implode() */ function PMA_RTN_parseOneParameter($value) { @@ -83,7 +76,6 @@ function PMA_RTN_parseOneParameter($value) * * @return array Information about the parameteres of a routine. * - * @uses PMA_RTN_parseOneParameter() */ function PMA_RTN_parseAllParameters($parsed_query, $routine_type) { @@ -152,8 +144,6 @@ function PMA_RTN_parseAllParameters($parsed_query, $routine_type) * * @return string The definer of a routine. * - * @uses substr() - * @uses PMA_unQuote() */ function PMA_RTN_parseRoutineDefiner($parsed_query) { @@ -185,13 +175,6 @@ function PMA_RTN_parseRoutineDefiner($parsed_query) * * @return array Data necessary to create the routine editor. * - * @uses PMA_sqlAddslashes() - * @uses PMA_DBI_fetch_single_row() - * @uses PMA_SQP_parse() - * @uses PMA_DBI_get_definition() - * @uses PMA_RTN_parseAllParameters() - * @uses PMA_RTN_parseRoutineDefiner() - * @uses PMA_RTN_parseOneParameter() */ function PMA_RTN_getRoutineDataFromName($db, $name, $all = true) { @@ -310,11 +293,6 @@ function PMA_RTN_getRoutineDataFromName($db, $name, $all = true) * * @return array Data necessary to create the routine editor. * - * @uses isset() - * @uses is_array() - * @uses in_array() - * @uses strtolower() - * @uses PMA_getSupportedDatatypes() */ function PMA_RTN_getRoutineDataFromRequest() { @@ -480,8 +458,6 @@ function PMA_RTN_getRoutineDataFromRequest() * * @return string HTML code of one row of parameter table for the routine editor. * - * @uses PMA_getSupportedDatatypes() - * @uses PMA_getSupportedCharsets() */ function PMA_RTN_getParameterRow($routine = array(), $index = null, $class = '') { @@ -573,11 +549,6 @@ function PMA_RTN_getParameterRow($routine = array(), $index = null, $class = '') * * @return string HTML code for the routine editor. * - * @uses htmlentities() - * @uses PMA_generate_common_hidden_inputs() - * @uses strtoupper() - * @uses PMA_getSupportedDatatypes() - * @uses PMA_getSupportedCharsets() */ function PMA_RTN_getEditorForm($mode, $operation, $routine, $errors, $is_ajax) { global $db, $titles, $param_directions, $param_sqldataaccess, $param_opts_num; @@ -804,16 +775,6 @@ function PMA_RTN_getEditorForm($mode, $operation, $routine, $errors, $is_ajax) { * * @return string HTML code for the routine execution dialog. * - * @uses PMA_generate_common_hidden_inputs() - * @uses PMA_unsupportedDatatypes() - * @uses stristr() - * @uses in_array() - * @uses strtolower() - * @uses strtoupper() - * @uses isset() - * @uses PMA_SQP_parse() - * @uses htmlentities() - * @uses PMA_unquote() */ function PMA_RTN_getExecuteForm($routine, $is_ajax) { @@ -935,16 +896,6 @@ function PMA_RTN_getExecuteForm($routine, $is_ajax) * * @return string The CREATE [ROUTINE | PROCEDURE] query. * - * @uses explode() - * @uses strpos() - * @uses PMA_backquote() - * @uses sprintf() - * @uses htmlspecialchars() - * @uses is_array() - * @uses preg_match() - * @uses count() - * @uses strtoupper() - * @uses strtolower() */ function PMA_RTN_getQueryFromRequest() { global $_REQUEST, $cfg, $routine_errors, $param_sqldataaccess; @@ -1090,12 +1041,6 @@ function PMA_RTN_getQueryFromRequest() { * * @return string An HTML snippet containing a row for the routines list. * - * @uses sprintf() - * @uses PMA_currentUserHasPrivilege() - * @uses PMA_backquote - * @uses PMA_RTN_getRoutineDataFromName() - * @uses htmlspecialchars() - * @uses urlencode() */ function PMA_RTN_getRowForRoutinesList($routine, $ct = 0, $is_ajax = false) { global $titles, $db, $url_query, $ajax_class; @@ -1173,9 +1118,6 @@ function PMA_RTN_getRowForRoutinesList($routine, $ct = 0, $is_ajax = false) { * * @return string An HTML snippet with the list of routines. * - * @uses PMA_sqlAddslashes() - * @uses PMA_DBI_fetch_result() - * @uses PMA_RTN_getRowForRoutinesList() */ function PMA_RTN_getRoutinesList() { @@ -1235,9 +1177,6 @@ function PMA_RTN_getRoutinesList() * * @return string An HTML snippet with the link to add a new routine. * - * @uses PMA_currentUserHasPrivilege() - * @uses PMA_getIcon() - * @uses PMA_showMySQLDocu() */ function PMA_RTN_getAddRoutineLink() { diff --git a/libraries/db_structure.lib.php b/libraries/db_structure.lib.php index c288559..afb3ce5 100644 --- a/libraries/db_structure.lib.php +++ b/libraries/db_structure.lib.php @@ -13,11 +13,6 @@ if (! defined('PHPMYADMIN')) { * void PMA_TableHeader([bool $db_is_information_schema = false]) * display table header (<table><thead>...</thead><tbody>) * - * @uses PMA_showHint() - * @uses $GLOBALS['cfg']['PropertiesNumColumns'] - * @uses $GLOBALS['is_show_stats'] - * @uses $GLOBALS['colspan_for_structure'] - * @uses PMA_SortableTableHeader() * @param boolean $db_is_information_schema * @param boolean $replication */ diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php index 5cbb4fa..aa099eb 100644 --- a/libraries/dbi/mysql.dbi.lib.php +++ b/libraries/dbi/mysql.dbi.lib.php @@ -182,7 +182,6 @@ function PMA_DBI_fetch_row($result) /* * Adjusts the result pointer to an arbitrary row in the result * - * @uses mysql_data_seek() * @param $result * @param $offset * @return boolean true on success, false on failure @@ -235,8 +234,6 @@ function PMA_DBI_next_result() { /** * Returns a string representing the type of connection used - * @uses mysql_get_host_info() - * @uses $GLOBALS['userlink'] as default for $link * @param resource $link mysql link * @return string type of connection used */ @@ -254,8 +251,6 @@ function PMA_DBI_get_host_info($link = null) /** * Returns the version of the MySQL protocol used - * @uses mysql_get_proto_info() - * @uses $GLOBALS['userlink'] as default for $link * @param resource $link mysql link * @return integer version of the MySQL protocol used */ @@ -273,7 +268,6 @@ function PMA_DBI_get_proto_info($link = null) /** * returns a string that represents the client library version - * @uses mysql_get_client_info() * @return string MySQL client library version */ function PMA_DBI_get_client_info() @@ -284,13 +278,6 @@ function PMA_DBI_get_client_info() /** * returns last error message or false if no errors occured * - * @uses PMA_DBI_convert_message() - * @uses $GLOBALS['errno'] - * @uses $GLOBALS['userlink'] - * @uses mysql_errno() - * @uses mysql_error() - * @uses defined() - * @uses PMA_generate_common_url() * @param resource $link mysql link * @return string|boolean $error or false */ @@ -379,8 +366,6 @@ function PMA_DBI_insert_id($link = null) /** * returns the number of rows affected by last query * - * @uses $GLOBALS['userlink'] - * @uses mysql_affected_rows() * @param object mysql $link the mysql object * @param boolean $get_from_cache * @return string integer diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php index bee7430..0cd7c2f 100644 --- a/libraries/dbi/mysqli.dbi.lib.php +++ b/libraries/dbi/mysqli.dbi.lib.php @@ -46,16 +46,6 @@ if (! defined('MYSQLI_TYPE_BIT')) { /** * connects to the database server * - * @uses $GLOBALS['cfg']['Server'] - * @uses PMA_auth_fails() - * @uses PMA_DBI_postConnect() - * @uses MYSQLI_CLIENT_COMPRESS - * @uses MYSQLI_OPT_LOCAL_INFILE - * @uses strtolower() - * @uses mysqli_init() - * @uses mysqli_options() - * @uses mysqli_real_connect() - * @uses defined() * @param string $user mysql user name * @param string $password mysql user password * @param boolean $is_controluser @@ -141,8 +131,6 @@ function PMA_DBI_connect($user, $password, $is_controluser = false, $server = nu /** * selects given database * - * @uses $GLOBALS['userlink'] - * @uses mysqli_select_db() * @param string $dbname database name to select * @param object mysqli $link the mysqli object * @return boolean true or false @@ -162,11 +150,6 @@ function PMA_DBI_select_db($dbname, $link = null) /** * runs a query and returns the result * - * @uses PMA_DBI_QUERY_STORE - * @uses PMA_DBI_QUERY_UNBUFFERED - * @uses MYSQLI_STORE_RESULT - * @uses MYSQLI_USE_RESULT - * @uses mysqli_query() * @param string $query query to execute * @param object mysqli $link mysqli object * @param integer $options @@ -188,8 +171,6 @@ function PMA_DBI_real_query($query, $link, $options) /** * returns array of rows with associative and numeric keys from $result * - * @uses mysqli_fetch_array() - * @uses MYSQLI_BOTH * @param object mysqli result $result * @return array result rows */ @@ -201,8 +182,6 @@ function PMA_DBI_fetch_array($result) /** * returns array of rows with associative keys from $result * - * @uses mysqli_fetch_array() - * @uses MYSQLI_ASSOC * @param object mysqli result $result * @return array result rows */ @@ -214,8 +193,6 @@ function PMA_DBI_fetch_assoc($result) /** * returns array of rows with numeric keys from $result * - * @uses mysqli_fetch_array() - * @uses MYSQLI_NUM * @param object mysqli result $result * @return array result rows */ @@ -227,7 +204,6 @@ function PMA_DBI_fetch_row($result) /* * Adjusts the result pointer to an arbitrary row in the result * - * @uses mysqli_data_seek() * @param $result * @param $offset * @return boolean true on success, false on failure @@ -240,9 +216,6 @@ function PMA_DBI_data_seek($result, $offset) /** * Frees the memory associated with the results * - * @uses mysqli_result - * @uses func_get_args() - * @uses mysqli_free_result() * @param result $result,... one or more mysql result resources */ function PMA_DBI_free_result() @@ -257,8 +230,6 @@ function PMA_DBI_free_result() /** * Check if there are any more query results from a multi query * - * @uses $GLOBALS['userlink'] - * @uses mysqli_more_results() * @param object mysqli $link the mysqli object * @return boolean true or false */ @@ -276,8 +247,6 @@ function PMA_DBI_more_results($link = null) { /** * Prepare next result from multi_query * - * @uses $GLOBALS['userlink'] - * @uses mysqli_next_result() * @param object mysqli $link the mysqli object * @return boolean true or false */ @@ -294,8 +263,6 @@ function PMA_DBI_next_result($link = null) { /** * Returns a string representing the type of connection used - * @uses mysqli_get_host_info() - * @uses $GLOBALS['userlink'] as default for $link * @param resource $link mysql link * @return string type of connection used */ @@ -313,8 +280,6 @@ function PMA_DBI_get_host_info($link = null) /** * Returns the version of the MySQL protocol used - * @uses mysqli_get_proto_info() - * @uses $GLOBALS['userlink'] as default for $link * @param resource $link mysql link * @return integer version of the MySQL protocol used */ @@ -332,7 +297,6 @@ function PMA_DBI_get_proto_info($link = null) /** * returns a string that represents the client library version - * @uses mysqli_get_client_info() * @return string MySQL client library version */ function PMA_DBI_get_client_info() @@ -343,14 +307,6 @@ function PMA_DBI_get_client_info() /** * returns last error message or false if no errors occured * - * @uses PMA_DBI_convert_message() - * @uses $GLOBALS['errno'] - * @uses $GLOBALS['userlink'] - * @uses mysqli_errno() - * @uses mysqli_error() - * @uses mysqli_connect_errno() - * @uses mysqli_connect_error() - * @uses defined() * @param resource $link mysql link * @return string|boolean $error or false */ @@ -416,8 +372,6 @@ function PMA_DBI_num_rows($result) /** * returns last inserted auto_increment id for given $link or $GLOBALS['userlink'] * - * @uses $GLOBALS['userlink'] - * @uses mysqli_insert_id() * @param object mysqli $link the mysqli object * @return string ineteger */ @@ -442,8 +396,6 @@ function PMA_DBI_insert_id($link = '') /** * returns the number of rows affected by last query * - * @uses $GLOBALS['userlink'] - * @uses mysqli_affected_rows() * @param object mysqli $link the mysqli object * @param boolean $get_from_cache * @return string integer @@ -468,20 +420,6 @@ function PMA_DBI_affected_rows($link = null, $get_from_cache = true) * returns metainfo for fields in $result * * @todo preserve orignal flags value - * @uses PMA_DBI_field_flags() - * @uses MYSQLI_TYPE_* - * @uses MYSQLI_MULTIPLE_KEY_FLAG - * @uses MYSQLI_PRI_KEY_FLAG - * @uses MYSQLI_UNIQUE_KEY_FLAG - * @uses MYSQLI_NOT_NULL_FLAG - * @uses MYSQLI_UNSIGNED_FLAG - * @uses MYSQLI_ZEROFILL_FLAG - * @uses MYSQLI_NUM_FLAG - * @uses MYSQLI_TYPE_BLOB - * @uses MYSQLI_BLOB_FLAG - * @uses defined() - * @uses mysqli_fetch_fields() - * @uses is_array() * @param object mysqli result $result * @return array meta info for fields in $result */ @@ -572,7 +510,6 @@ function PMA_DBI_num_fields($result) /** * returns the length of the given field $i in $result * - * @uses mysqli_fetch_field_direct() * @param object mysqli result $result * @param integer $i field * @return integer length of field @@ -585,7 +522,6 @@ function PMA_DBI_field_len($result, $i) /** * returns name of $i. field in $result * - * @uses mysqli_fetch_field_direct() * @param object mysqli result $result * @param integer $i field * @return string name of $i. field in $result @@ -598,26 +534,6 @@ function PMA_DBI_field_name($result, $i) /** * returns concatenated string of human readable field flags * - * @uses MYSQLI_UNIQUE_KEY_FLAG - * @uses MYSQLI_NUM_FLAG - * @uses MYSQLI_PART_KEY_FLAG - * @uses MYSQLI_TYPE_SET - * @uses MYSQLI_TIMESTAMP_FLAG - * @uses MYSQLI_AUTO_INCREMENT_FLAG - * @uses MYSQLI_TYPE_ENUM - * @uses MYSQLI_ZEROFILL_FLAG - * @uses MYSQLI_UNSIGNED_FLAG - * @uses MYSQLI_BLOB_FLAG - * @uses MYSQLI_MULTIPLE_KEY_FLAG - * @uses MYSQLI_UNIQUE_KEY_FLAG - * @uses MYSQLI_PRI_KEY_FLAG - * @uses MYSQLI_NOT_NULL_FLAG - * @uses MYSQLI_TYPE_BLOB - * @uses MYSQLI_TYPE_MEDIUM_BLOB - * @uses MYSQLI_TYPE_LONG_BLOB - * @uses MYSQLI_TYPE_VAR_STRING - * @uses MYSQLI_TYPE_STRING - * @uses mysqli_fetch_field_direct() * @param object mysqli result $result * @param integer $i field * @return string field flags diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index cb37ee4..0b63a1e 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -206,8 +206,6 @@ function PMA_isSelect() /** * Displays a navigation button * - * @uses $GLOBALS['cfg']['NavigationBarIconic'] - * @uses PMA_generate_common_hidden_inputs() * * @param string iconic caption for button * @param string text for button @@ -256,10 +254,6 @@ function PMA_displayTableNavigationOneButton($caption, $title, $pos, $html_sql_q /** * Displays a navigation bar to browse among the results of a SQL query * - * @uses $_SESSION['tmp_user_values']['disp_direction'] - * @uses $_SESSION['tmp_user_values']['repeat_cells'] - * @uses $_SESSION['tmp_user_values']['max_rows'] - * @uses $_SESSION['tmp_user_values']['pos'] * @param integer the offset for the "next" page * @param integer the offset for the "previous" page * @param string the URL-encoded query @@ -452,12 +446,6 @@ onsubmit="return (checkFormElementInRange(this, 'session_max_rows', '<?php echo /** * Displays the headers of the results table * - * @uses $_SESSION['tmp_user_values']['disp_direction'] - * @uses $_SESSION['tmp_user_values']['repeat_cells'] - * @uses $_SESSION['tmp_user_values']['max_rows'] - * @uses $_SESSION['tmp_user_values']['display_text'] - * @uses $_SESSION['tmp_user_values']['display_binary'] - * @uses $_SESSION['tmp_user_values']['display_binary_as_hex'] * @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 @@ -1125,13 +1113,6 @@ function PMA_addClass($class, $condition_field, $meta, $nowrap, $is_field_trunca /** * Displays the body of the results table * - * @uses $_SESSION['tmp_user_values']['disp_direction'] - * @uses $_SESSION['tmp_user_values']['repeat_cells'] - * @uses $_SESSION['tmp_user_values']['max_rows'] - * @uses $_SESSION['tmp_user_values']['display_text'] - * @uses $_SESSION['tmp_user_values']['display_binary'] - * @uses $_SESSION['tmp_user_values']['display_binary_as_hex'] - * @uses $_SESSION['tmp_user_values']['display_blob'] * @param integer the link id associated to the query which results have * to be displayed * @param array which elements to display @@ -1702,7 +1683,6 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { * * @return boolean always true * - * @uses $_SESSION['tmp_user_values']['repeat_cells'] * @global array $vertical_display the information to display * * @access private @@ -1898,29 +1878,6 @@ function PMA_displayVerticalTable() /** * - * @uses $_SESSION['tmp_user_values']['disp_direction'] - * @uses $_REQUEST['disp_direction'] - * @uses $GLOBALS['cfg']['DefaultDisplay'] - * @uses $_SESSION['tmp_user_values']['repeat_cells'] - * @uses $_REQUEST['repeat_cells'] - * @uses $GLOBALS['cfg']['RepeatCells'] - * @uses $_SESSION['tmp_user_values']['max_rows'] - * @uses $_REQUEST['session_max_rows'] - * @uses $GLOBALS['cfg']['MaxRows'] - * @uses $_SESSION['tmp_user_values']['pos'] - * @uses $_REQUEST['pos'] - * @uses $_SESSION['tmp_user_values']['display_text'] - * @uses $_REQUEST['display_text'] - * @uses $_SESSION['tmp_user_values']['relational_display'] - * @uses $_REQUEST['relational_display'] - * @uses $_SESSION['tmp_user_values']['display_binary'] - * @uses $_REQUEST['display_binary'] - * @uses $_SESSION['tmp_user_values']['display_binary_as_hex'] - * @uses $_REQUEST['display_binary_as_hex'] - * @uses $_SESSION['tmp_user_values']['display_blob'] - * @uses $_REQUEST['display_blob'] - * @uses PMA_isValid() - * @uses $GLOBALS['sql_query'] * @todo make maximum remembered queries configurable * @todo move/split into SQL class!? * @todo currently this is called twice unnecessary @@ -2070,7 +2027,6 @@ function PMA_displayTable_checkConfigParams() * @param array the display mode * @param array the analyzed query * - * @uses $_SESSION['tmp_user_values']['pos'] * @global string $db the database name * @global string $table the table name * @global string $goto the URL to go back in case of errors @@ -2435,8 +2391,6 @@ function default_function($buffer) { * @param array the display mode * @param array the analyzed query * - * @uses $_SESSION['tmp_user_values']['pos'] - * @uses $_SESSION['tmp_user_values']['display_text'] * @global string $db the database name * @global string $table the table name * @global string $sql_query the current SQL query @@ -2577,12 +2531,6 @@ function PMA_displayResultsOperations($the_disp_mode, $analyzed_sql) { * Verifies what to do with non-printable contents (binary or BLOB) * in Browse mode. * - * @uses is_null() - * @uses isset() - * @uses strlen() - * @uses PMA_formatByteDown() - * @uses strpos() - * @uses str_replace() * @param string $category BLOB|BINARY|GEOMETRY * @param string $content the binary content * @param string $transform_function @@ -2628,15 +2576,6 @@ 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 * - * @uses is_array() - * @uses PMA_backquote() - * @uses PMA_DBI_try_query() - * @uses PMA_DBI_num_rows() - * @uses PMA_DBI_fetch_row() - * @uses PMA_DBI_free_result() - * @uses $GLOBALS['printview'] - * @uses htmlspecialchars() - * @uses PMA_generate_common_url() * @param string $class * @param string $condition_field * @param string $analyzed_sql @@ -2738,7 +2677,6 @@ function PMA_prepare_row_data($class, $condition_field, $analyzed_sql, $meta, $m /** * Generates a checkbox for multi-row submits * - * @uses htmlspecialchars * @param string $del_url * @param array $is_display * @param string $row_no @@ -2768,7 +2706,6 @@ function PMA_generateCheckboxForMulti($del_url, $is_display, $row_no, $where_cla /** * Generates an Edit link * - * @uses PMA_linkOrButton() * @param string $edit_url * @param string $class * @param string $edit_str @@ -2796,7 +2733,6 @@ function PMA_generateEditLink($edit_url, $class, $edit_str, $where_clause, $wher /** * Generates an Copy link * - * @uses PMA_linkOrButton() * @param string $copy_url * @param string $copy_str * @param string $where_clause @@ -2827,7 +2763,6 @@ function PMA_generateCopyLink($copy_url, $copy_str, $where_clause, $where_clause /** * Generates a Delete link * - * @uses PMA_linkOrButton() * @param string $del_url * @param string $del_str * @param string $js_conf @@ -2852,10 +2787,6 @@ 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) * - * @uses PMA_generateCheckboxForMulti() - * @uses PMA_generateEditLink() - * @uses PMA_generateDeleteLink() - * @uses PMA_generateCopyLink() * @param string $position * @param string $del_url * @param array $is_display diff --git a/libraries/engines/innodb.lib.php b/libraries/engines/innodb.lib.php index dfdc5da..ac7c361 100644 --- a/libraries/engines/innodb.lib.php +++ b/libraries/engines/innodb.lib.php @@ -11,8 +11,6 @@ class PMA_StorageEngine_innodb extends PMA_StorageEngine { /** - * @uses PMA_ENGINE_DETAILS_TYPE_NUMERIC - * @uses PMA_ENGINE_DETAILS_TYPE_SIZE * @return array */ function getVariables() @@ -121,8 +119,6 @@ class PMA_StorageEngine_innodb extends PMA_StorageEngine } /** - * @uses $this->support - * @uses PMA_ENGINE_SUPPORT_YES * @return array detail pages */ function getInfoPages() @@ -139,12 +135,6 @@ class PMA_StorageEngine_innodb extends PMA_StorageEngine /** * returns html tables with stats over inno db buffer pool * - * @uses PMA_DBI_fetch_result() - * @uses PMA_formatNumber() - * @uses PMA_formatByteDown() - * @uses join() - * @uses htmlspecialchars() - * @uses PMA_formatNumber() * @return string html table with stats */ function getPageBufferpool() @@ -272,8 +262,6 @@ class PMA_StorageEngine_innodb extends PMA_StorageEngine /** * returns InnoDB status * - * @uses htmlspecialchars() - * @uses PMA_DBI_fetch_value() * @return string result of SHOW INNODB STATUS inside pre tags */ function getPageStatus() @@ -286,8 +274,6 @@ class PMA_StorageEngine_innodb extends PMA_StorageEngine /** * returns content for page $id * - * @uses $this->getInfoPages() - * @uses array_key_exists() * @param string $id page id * @return string html output */ diff --git a/libraries/footer.inc.php b/libraries/footer.inc.php index 5a66351..c94c016 100644 --- a/libraries/footer.inc.php +++ b/libraries/footer.inc.php @@ -13,31 +13,6 @@ * * always use $GLOBALS, as this script is also included by functions * - * @uses $_REQUEST['no_history'] - * @uses $GLOBALS['lang'] - * @uses $GLOBALS['collation_connection'] - * @uses $GLOBALS['server'] - * @uses $GLOBALS['db'] - * @uses $GLOBALS['table'] - * @uses $GLOBALS['error_message'] - * @uses $GLOBALS['reload'] - * @uses $GLOBALS['sql_query'] - * @uses $GLOBALS['focus_querywindow'] - * @uses $GLOBALS['checked_special'] - * @uses $GLOBALS['pmaThemeImage'] - * @uses $GLOBALS['controllink'] to close it - * @uses $GLOBALS['userlink'] to close it - * @uses $cfg['Server']['user'] - * @uses $cfg['NavigationBarIconic'] - * @uses $cfg['MaxCharactersInDisplayedSQL'] - * @uses PMA_isValid() - * @uses PMA_setHistory() - * @uses PMA_ifSetOr() - * @uses PMA_escapeJsString() - * @uses PMA_getenv() - * @uses PMA_generate_common_url() - * @uses basename() - * @uses file_exists() * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/grab_globals.lib.php b/libraries/grab_globals.lib.php index cddaca2..d198855 100644 --- a/libraries/grab_globals.lib.php +++ b/libraries/grab_globals.lib.php @@ -15,11 +15,6 @@ if (! defined('PHPMYADMIN')) { /** * copy values from one array to another, usually from a superglobal into $GLOBALS * - * @uses $GLOBALS['_import_blacklist'] - * @uses preg_replace() - * @uses array_keys() - * @uses array_unique() - * @uses stripslashes() * @param array $array values from * @param array $target values to * @param boolean $sanitize prevent importing key names in $_import_blacklist diff --git a/libraries/header.inc.php b/libraries/header.inc.php index 5c07472..80763e7 100644 --- a/libraries/header.inc.php +++ b/libraries/header.inc.php @@ -154,8 +154,6 @@ if (isset($GLOBALS['is_ajax_request']) && !$GLOBALS['is_ajax_request']) { /** * Displays table comment - * @uses $show_comment from libraries/tbl_info.inc.php - * @uses $GLOBALS['avoid_show_comment'] from tbl_relation.php */ if (!empty($show_comment) && ! isset($GLOBALS['avoid_show_comment'])) { if (strstr($show_comment, '; InnoDB free')) { diff --git a/libraries/import.lib.php b/libraries/import.lib.php index 11ae523..75e65a0 100644 --- a/libraries/import.lib.php +++ b/libraries/import.lib.php @@ -73,7 +73,6 @@ 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. * - * @uses $GLOBALS['finished'] read and write * @param string query to run * @param string query to display, this might be commented * @param bool whether to use control user for queries @@ -228,11 +227,6 @@ function PMA_lookForUse($buffer, $db, $reload) /** * Returns next part of imported file/buffer * - * @uses $GLOBALS['offset'] read and write - * @uses $GLOBALS['import_file'] read only - * @uses $GLOBALS['import_text'] read and write - * @uses $GLOBALS['finished'] read and write - * @uses $GLOBALS['read_limit'] read only * @param integer size of buffer to read (this is maximal size * function will return) * @return string part of file/buffer @@ -338,7 +332,6 @@ function PMA_importGetNextChunk($size = 32768) * * @access public * - * @uses chr() * @param int $num * @return string The column's "Excel" name */ @@ -386,9 +379,6 @@ function PMA_getColumnAlphaName($num) * * @access public * - * @uses strtoupper() - * @uses strlen() - * @uses ord() * @param string $name (i.e. "A", or "BC", etc.) * @return int The column number */ @@ -449,8 +439,6 @@ define("SIZES", 1); * * @access public * - * @uses substr() - * @uses strpos() * @param string $last_cumulative_size * @return int Precision of the given decimal size notation */ @@ -464,9 +452,6 @@ function PMA_getM($last_cumulative_size) { * * @access public * - * @uses substr() - * @uses strpos() - * @uses strlen() * @param string $last_cumulative_size * @return int Scale of the given decimal size notation */ @@ -480,8 +465,6 @@ function PMA_getD($last_cumulative_size) { * * @access public * - * @uses strlen() - * @uses strpos() * @param string &$cell * @return array Contains the precision, scale, and full size representation of the given decimal cell */ @@ -504,19 +487,6 @@ function PMA_getDecimalSize(&$cell) { * * @access public * - * @uses M - * @uses D - * @uses FULL - * @uses VARCHAR - * @uses DECIMAL - * @uses BIGINT - * @uses INT - * @uses NONE - * @uses strcmp() - * @uses strlen() - * @uses PMA_getM() - * @uses PMA_getD() - * @uses PMA_getDecimalSize() * @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) @@ -729,15 +699,6 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type * * @access public * - * @uses DECIMAL - * @uses BIGINT - * @uses INT - * @uses VARCHAR - * @uses NONE - * @uses is_numeric() - * @uses strcmp() - * @uses strpos() - * @uses substr_count() * @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) @@ -779,18 +740,6 @@ function PMA_detectType($last_cumulative_type, &$cell) { * * @access public * - * @uses TBL_NAME - * @uses COL_NAMES - * @uses ROWS - * @uses VARCHAR - * @uses DECIMAL - * @uses BIGINT - * @uses INT - * @uses NONE - * @uses count() - * @uses is_array() - * @uses PMA_detectType() - * @uses PMA_detectSize() * @param &$table array(string $table_name, array $col_names, array $rows) * @return array array(array $types, array $sizes) */ @@ -885,20 +834,6 @@ $import_notice = NULL; * * @access public * - * @uses TBL_NAME - * @uses COL_NAMES - * @uses ROWS - * @uses TYPES - * @uses SIZES - * @uses strcmp() - * @uses count() - * @uses preg_match() - * @uses preg_replace() - * @uses PMA_isView() - * @uses PMA_backquote() - * @uses PMA_importRunQuery() - * @uses PMA_generate_common_url() - * @uses PMA_Message::notice() * @param string $db_name Name of the database * @param array &$tables Array of tables for the specified database * @param array &$analyses = NULL Analyses of the tables diff --git a/libraries/js_escape.lib.php b/libraries/js_escape.lib.php index 0773eec..f7e8fb3 100644 --- a/libraries/js_escape.lib.php +++ b/libraries/js_escape.lib.php @@ -13,11 +13,6 @@ * This function is used to displays a javascript confirmation box for * "DROP/DELETE/ALTER" queries. * - * @uses PMA_escapeJsString() - * @uses PMA_backquote() - * @uses is_string() - * @uses htmlspecialchars() - * @uses str_replace() * @param string $a_string the string to format * @param boolean $add_backquotes whether to add backquotes to the string or not * @@ -47,8 +42,6 @@ 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. * - * @uses strtr() - * @uses preg_replace() * @param string $string the string to be escaped * @return string the escaped string */ diff --git a/libraries/mysql_charsets.lib.php b/libraries/mysql_charsets.lib.php index c77aee0..53c309a 100644 --- a/libraries/mysql_charsets.lib.php +++ b/libraries/mysql_charsets.lib.php @@ -153,10 +153,6 @@ function PMA_generateCharsetQueryPart($collation) { /** * returns collation of given db * - * @uses PMA_DBI_fetch_value() - * @uses PMA_DBI_select_db() - * @uses PMA_sqlAddSlashes() - * @uses $GLOBALS['db'] * @param string $db name of db * @return string collation of $db */ @@ -183,7 +179,6 @@ function PMA_getDbCollation($db) { /** * returns default server collation from show variables * - * @uses PMA_DBI_fetch_value() * @return string $server_collation */ function PMA_getServerCollation() { @@ -194,9 +189,6 @@ function PMA_getServerCollation() { /** * returns description for given collation * - * @uses is_array() - * @uses explode() - * @uses count() * * @param string $collation MySQL collation string * @return string collation description diff --git a/libraries/ob.lib.php b/libraries/ob.lib.php index 780ee02..14f3202 100644 --- a/libraries/ob.lib.php +++ b/libraries/ob.lib.php @@ -17,10 +17,6 @@ * because both header and footer functions must know what each other is * doing. * - * @uses $cfg['OBGzip'] - * @uses function_exists() - * @uses ini_get() - * @uses ob_get_level() * @staticvar integer remember last calculated value * @return integer the output buffer mode */ @@ -66,11 +62,6 @@ function PMA_outBufferModeGet() * output buffering is turned on. It also needs to be passed $mode from * the PMA_outBufferModeGet() function or it will be useless. * - * @uses PMA_outBufferModeGet() - * @uses PMA_outBufferPost() to register it as shutdown function - * @uses ob_start() - * @uses header() to send X-ob_mode: - * @uses register_shutdown_function() to register PMA_outBufferPost() */ function PMA_outBufferPre() { @@ -89,9 +80,6 @@ function PMA_outBufferPre() * buffering is turned on. It also needs to be passed $mode from the * PMA_outBufferModeGet() function or it will be useless. * - * @uses PMA_outBufferModeGet() - * @uses ob_flush() - * @uses flush() */ function PMA_outBufferPost() { diff --git a/libraries/plugin_interface.lib.php b/libraries/plugin_interface.lib.php index edfd02a..74e72c3 100644 --- a/libraries/plugin_interface.lib.php +++ b/libraries/plugin_interface.lib.php @@ -11,11 +11,6 @@ * * Reads all plugin information from directory $plugins_dir. * - * @uses ksort() - * @uses opendir() - * @uses readdir() - * @uses is_file() - * @uses preg_match() * @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 @@ -45,7 +40,6 @@ function PMA_getPlugins($plugins_dir, $plugin_param) * * returns locale string for $name or $name if no locale is found * - * @uses $GLOBALS * @param string $name for local string * @return string locale string for $name */ @@ -59,10 +53,6 @@ function PMA_getString($name) * * returns html input tag option 'checked' if plugin $opt should be set by config or request * - * @uses $_REQUEST - * @uses $_GET - * @uses $GLOBALS['cfg'] - * @uses $GLOBALS['timeout_passed'] * @param string $section name of config section in * $GLOBALS['cfg'][$section] for plugin * @param string $opt name of option @@ -83,11 +73,6 @@ function PMA_pluginCheckboxCheck($section, $opt) * * returns default value for option $opt * - * @uses htmlspecialchars() - * @uses $_REQUEST - * @uses $_GET - * @uses $GLOBALS['cfg'] - * @uses $GLOBALS['timeout_passed'] * @param string $section name of config section in * $GLOBALS['cfg'][$section] for plugin * @param string $opt name of option @@ -122,9 +107,6 @@ function PMA_pluginGetDefault($section, $opt) * * returns html input tag option 'checked' if option $opt should be set by config or request * - * @uses $_REQUEST - * @uses $GLOBALS['cfg'] - * @uses $GLOBALS['timeout_passed'] * @param string $section name of config section in * $GLOBALS['cfg'][$section] for plugin * @param string $opt name of option @@ -149,8 +131,6 @@ 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 * - * @uses PMA_pluginGetDefault() - * @uses PMA_getString() * @param string $section name of config section in * $GLOBALS['cfg'][$section] for plugin * @param string $name name of select element @@ -193,9 +173,6 @@ function PMA_pluginGetChoice($section, $name, &$list, $cfgname = NULL) * * returns single option in a list element * - * @uses PMA_getString() - * @uses PMA_pluginCheckboxCheck() - * @uses PMA_pluginGetDefault() * @param string $section name of config section in * $GLOBALS['cfg'][$section] for plugin * @param string $plugin_name unique plugin name @@ -308,9 +285,6 @@ function PMA_pluginGetOneOption($section, $plugin_name, $id, &$opt) * * return html div with editable options for plugin * - * @uses PMA_getString() - * @uses PMA_pluginGetOneOption() - * @uses PMA_pluginGetDefault(); * @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 diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index 7075cc8..9ac5282 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -42,11 +42,6 @@ function PMA_query_as_controluser($sql, $show_error = true, $options = 0) } // end of the "PMA_query_as_controluser()" function /** - * @uses $_SESSION['relation'][$GLOBALS['server']] for caching - * @uses $GLOBALS['cfgRelation'] to set it - * @uses $GLOBALS['server'] to ensure we are using server-specific pmadb - * @uses PMA__getRelationsParam() - * @uses PMA_printRelationsParamDiagnostic() * @param bool $verbose whether to print diagnostic info * @return array $cfgRelation */ @@ -70,12 +65,6 @@ function PMA_getRelationsParam($verbose = false) /** * prints out diagnostic info for pma relation feature * - * @uses $GLOBALS['server'] - * @uses $GLOBALS['controllink'] - * @uses $cfg['Server']['pmadb'] - * @uses sprintf() - * @uses PMA_printDiagMessageForFeature() - * @uses PMA_printDiagMessageForParameter() * @param array $cfgRelation */ function PMA_printRelationsParamDiagnostic($cfgRelation) @@ -204,17 +193,6 @@ function PMA_printDiagMessageForParameter($parameter, $relation_parameter_set, $ * just a copy of the functions used for relations ;-) * but added some stuff to check what will work * - * @uses $cfg['Server']['user'] - * @uses $cfg['Server']['pmadb'] - * @uses $cfg['Server']['verbose_check'] - * @uses $GLOBALS['server'] - * @uses $GLOBALS['controllink'] - * @uses PMA_DBI_QUERY_STORE - * @uses PMA_DBI_select_db() - * @uses PMA_backquote() - * @uses PMA_query_as_controluser() - * @uses PMA_DBI_fetch_row() - * @uses PMA_DBI_free_result() * @access protected * @return array the relation parameters for the current user */ @@ -384,17 +362,6 @@ function PMA__getRelationsParam() * optionally a given column in a table * * @access public - * @uses $GLOBALS['controllink'] - * @uses $GLOBALS['information_schema_relations'] - * @uses PMA_getRelationsParam() - * @uses PMA_backquote() - * @uses PMA_sqlAddslashes() - * @uses PMA_DBI_fetch_result() - * @uses PMA_DBI_fetch_value() - * @uses PMA_SQP_analyze() - * @uses PMA_SQP_parse() - * @uses count() - * @uses strlen() * @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 @@ -491,12 +458,6 @@ function PMA_getForeigners($db, $table, $column = '', $source = 'both') * Gets the display field of a table * * @access public - * @uses $GLOBALS['controllink'] - * @uses PMA_getRelationsParam() - * @uses PMA_backquote() - * @uses PMA_sqlAddslashes() - * @uses PMA_DBI_fetch_single_row() - * @uses trim() * @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 @@ -542,8 +503,6 @@ function PMA_getDisplayField($db, $table) * Gets the comments for all rows of a table or the db itself * * @access public - * @uses PMA_DBI_get_columns() - * @uses PMA_getDbComment() * @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 @@ -573,15 +532,6 @@ function PMA_getComments($db, $table = '') * Gets the comment for a db * * @access public - * @uses PMA_DBI_QUERY_STORE - * @uses PMA_DBI_num_rows() - * @uses PMA_DBI_fetch_assoc() - * @uses PMA_DBI_free_result() - * @uses PMA_getRelationsParam() - * @uses PMA_backquote() - * @uses PMA_sqlAddslashes() - * @uses PMA_query_as_controluser() - * @uses strlen() * @param string the name of the db to check for * @return string comment */ @@ -614,15 +564,6 @@ function PMA_getDbComment($db) * Gets the comment for a db * * @access public - * @uses PMA_DBI_QUERY_STORE - * @uses PMA_DBI_num_rows() - * @uses PMA_DBI_fetch_assoc() - * @uses PMA_DBI_free_result() - * @uses PMA_getRelationsParam() - * @uses PMA_backquote() - * @uses PMA_sqlAddslashes() - * @uses PMA_query_as_controluser() - * @uses strlen() * @param string the name of the db to check for * @return string comment */ @@ -653,11 +594,6 @@ function PMA_getDbComments() /** * Set a database comment to a certain value. * - * @uses PMA_getRelationsParam() - * @uses PMA_backquote() - * @uses PMA_sqlAddslashes() - * @uses PMA_query_as_controluser() - * @uses strlen() * @access public * @param string $db the name of the db * @param string $comment the value of the column @@ -702,16 +638,6 @@ function PMA_setDbComment($db, $comment = '') /** * Set a SQL history entry * - * @uses $_SESSION['sql_history'] - * @uses $cfg['QueryHistoryDB'] - * @uses $cfg['QueryHistoryMax'] - * @uses PMA_getRelationsParam() - * @uses PMA_query_as_controluser() - * @uses PMA_backquote() - * @uses PMA_sqlAddslashes() - * @uses count() - * @uses md5() - * @uses array_shift() * @param string $db the name of the db * @param string $table the name of the table * @param string $username the username @@ -770,13 +696,6 @@ function PMA_setHistory($db, $table, $username, $sqlquery) /** * Gets a SQL history entry * - * @uses $_SESSION['sql_history'] - * @uses $GLOBALS['controllink'] - * @uses PMA_getRelationsParam() - * @uses PMA_backquote() - * @uses PMA_sqlAddslashes() - * @uses PMA_DBI_fetch_result() - * @uses array_reverse() * @param string $username the username * @return array list of history items * @access public @@ -806,13 +725,6 @@ function PMA_getHistory($username) * deletes entries that exceeds $cfg['QueryHistoryMax'], oldest first, for the * given user * - * @uses $cfg['QueryHistoryMax'] - * @uses $cfg['QueryHistoryDB'] - * @uses $GLOBALS['controllink'] - * @uses PMA_backquote() - * @uses PMA_sqlAddSlashes() - * @uses PMA_query_as_controluser() - * @uses PMA_DBI_fetch_value() * @param string $username the username * @access public */ @@ -846,15 +758,6 @@ function PMA_purgeHistory($username) /** * Prepares the dropdown for one mode * - * @uses $cfg['LimitChars'] - * @uses $cfg['NaturalOrder'] - * @uses PMA_strlen() - * @uses htmlspecialchars() - * @uses substr() - * @uses uksort() - * @uses ksort() - * @uses natcasesort() - * @uses asort() * @param array $foreign the keys and values for foreigns * @param string $data the current data of the dropdown * @param string $mode the needed mode @@ -918,11 +821,6 @@ function PMA__foreignDropdownBuild($foreign, $data, $mode) /** * Outputs dropdown with values of foreign fields * - * @uses $cfg['ForeignKeyMaxLimit'] - * @uses $cfg['ForeignKeyDropdownOrder'] - * @uses PMA__foreignDropdownBuild() - * @uses PMA_isValid() - * @uses implode() * @param array array of the displayed row * @param string the foreign field * @param string the foreign field to display @@ -995,15 +893,6 @@ function PMA_foreignDropdown($disp_row, $foreign_field, $foreign_display, $data, /** * Gets foreign keys in preparation for a drop-down selector * - * @uses PMA_Table::countRecords() - * @uses PMA_backquote() - * @uses PMA_getDisplayField() - * @uses PMA_sqlAddslashes() - * @uses PMA_DBI_fetch_value() - * @uses PMA_DBI_free_result() - * @uses PMA_DBI_query() - * @uses PMA_DBI_num_rows() - * @uses PMA_DBI_fetch_assoc() * @param array array of the foreign keys * @param string the foreign field name * @param bool whether to override the total @@ -1087,9 +976,6 @@ function PMA_getForeignData($foreigners, $field, $override_total, $foreign_filte /** * Finds all related tables * - * @uses $GLOBALS['controllink'] - * @uses $GLOBALS['cfgRelation'] - * @uses $GLOBALS['db'] * @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 @@ -1141,10 +1027,6 @@ function PMA_getRelatives($from) * * usually called after a field in a table was renamed in tbl_alter.php * - * @uses PMA_getRelationsParam() - * @uses PMA_backquote() - * @uses PMA_sqlAddslashes() - * @uses PMA_query_as_controluser(able was renamed in tbl_alter.phpconnectal, $foreign_filteIMAL or NONE)edn deactivated. To find out why click %shere%s.')�̐��(�S�+Ȥ�S�+�4�S�+��T�+�̐��0�T�+�̐��̐��=�S�+6 ��!�!@̐��̐�x��T�+�̐�"!�S�+>�S�+@̐�� S�+̐��/U�+�(�S�+�/U�+��/U�+��/U�+Ȥ�S�+x��T�+�̐��̐��=�S�+�!�!@̐��̐�ȝ�T�+� ̐�"!�S�+>�S�+@̐�� S�+̐�p̐�h̐�;�S�+�p��̐��(�S�+Ȥ�S�+� ̐�p̐��=�S�+GHIJKMNOP@̐��̐�HU�T�+@̐�"!�S�+>�S�+@̐�0�/U�+�(�S�+��T�+��_T�+�/U�+��/U�+��/U�+Ȥ�S�+HU�T�+@̐�� ̐��=�S�+8U�T�+@̐�� ̐��=�S�+(U�T�+@̐�� ̐��=�S�+U�T�+@̐� ̐��=�S�+ ��/U�+�(�S�+��/U�+�̐��_T�+�'�S�+��/U�+� ̐�y�_T�+�'�S�+�/U�+� ̐�Z�_T�+�'�S�+؄_T�+��T�+��_T�+�/U�+��T�+��/U�+��/U�+Ȥ�S�+��]T�+`̐�0̐��=�S�+#%')*-.035678:<=@̐��̐�p*T�+� ̐�"!�S�+8��T�+�(�S�+��T�+��T�+Ȥ�S�+cfM�S�+�̐�p*T�+� ̐�P̐��=�S�+�%��wq�-��s��,~9��u]�� 4Q��U^Qʉ��u��*ēv��S�+�̐�F�U�+F�U�+?5�S�+�̐�̐��̐�M�S�+�'�S�+�4�S�+0̐�B�U�+̐�̐��S�+�̐��B�U�+�̐��=�S) * @param string $db * @param string $table * @param string $field @@ -1183,12 +1065,6 @@ function PMA_REL_renameField($db, $table, $field, $new_name) /** * Create a PDF page * - * @uses PMA_backquote() - * @uses $GLOBALS['cfgRelation']['db'] - * @uses PMA_sqlAddslashes() - * @uses PMA_query_as_controluser() - * @uses PMA_DBI_insert_id() - * @uses $GLOBALS['controllink'] * @param string $newpage * @param array $cfgRelation * @param string $db diff --git a/libraries/relation_cleanup.lib.php b/libraries/relation_cleanup.lib.php index 476d46c..a03cf1f 100644 --- a/libraries/relation_cleanup.lib.php +++ b/libraries/relation_cleanup.lib.php @@ -12,10 +12,6 @@ if (! defined('PHPMYADMIN')) { /** * Cleanu column related relation stuff * - * @uses PMA_getRelationsParam() - * @uses PMA_backquote() - * @uses PMA_sqlAddslashes() - * @uses PMA_query_as_controluser() * @param string $db * @param string $table * @param string $column @@ -58,10 +54,6 @@ function PMA_relationsCleanupColumn($db, $table, $column) /** * Cleanup table related relation stuff * - * @uses PMA_getRelationsParam() - * @uses PMA_backquote() - * @uses PMA_sqlAddslashes() - * @uses PMA_query_as_controluser() * @param string $db * @param string $table */ @@ -113,10 +105,6 @@ function PMA_relationsCleanupTable($db, $table) /** * Cleanup database related relation stuff * - * @uses PMA_getRelationsParam() - * @uses PMA_backquote() - * @uses PMA_sqlAddslashes() - * @uses PMA_query_as_controluser() * @param string $db */ function PMA_relationsCleanupDatabase($db) diff --git a/libraries/replication_gui.lib.php b/libraries/replication_gui.lib.php index 1d99166..1c48982 100644 --- a/libraries/replication_gui.lib.php +++ b/libraries/replication_gui.lib.php @@ -199,7 +199,6 @@ function PMA_replication_print_slaves_table($hidden = false) { /** * get the correct username and hostname lengths for this MySQL server * - * @uses strtok() * @return array username length, hostname length */ diff --git a/libraries/sanitizing.lib.php b/libraries/sanitizing.lib.php index a362ebd..95a6ec0 100644 --- a/libraries/sanitizing.lib.php +++ b/libraries/sanitizing.lib.php @@ -18,8 +18,6 @@ * * <a title="<?php echo PMA_sanitize($foo, true); ?>">bar</a> * - * @uses preg_replace() - * @uses strtr() * @param string the message * @param boolean whether to escape html in result * diff --git a/libraries/select_lang.lib.php b/libraries/select_lang.lib.php index 85e1828..7d1de46 100644 --- a/libraries/select_lang.lib.php +++ b/libraries/select_lang.lib.php @@ -26,18 +26,6 @@ function PMA_langName($tmplang) { /** * tries to find the language to use * - * @uses $GLOBALS['cfg']['lang'] - * @uses $GLOBALS['cfg']['DefaultLang'] - * @uses $GLOBALS['lang_failed_cfg'] - * @uses $GLOBALS['lang_failed_cookie'] - * @uses $GLOBALS['lang_failed_request'] - * @uses $_REQUEST['lang'] - * @uses $_COOKIE['pma_lang'] - * @uses $_SERVER['HTTP_ACCEPT_LANGUAGE'] - * @uses $_SERVER['HTTP_USER_AGENT'] - * @uses PMA_langSet() - * @uses PMA_langDetect() - * @uses explode() * @return bool success if valid lang is found, otherwise false */ function PMA_langCheck() @@ -114,8 +102,6 @@ function PMA_langCheck() * checks given lang and sets it if valid * returns true on success, otherwise flase * - * @uses $GLOBALS['available_languages'] to check $lang - * @uses $GLOBALS['lang'] to set it * @param string $lang language to set * @return bool success */ @@ -140,7 +126,6 @@ function PMA_langSet(&$lang) * * @return bool true on success, otherwise false * - * @uses $GLOBALS['available_languages'] to check $lang * * @access private */ diff --git a/libraries/select_server.lib.php b/libraries/select_server.lib.php index f71f7cd..68541d8 100644 --- a/libraries/select_server.lib.php +++ b/libraries/select_server.lib.php @@ -9,12 +9,6 @@ /** * display server selection in list or selectbox form, or option tags only * - * @uses $GLOBALS['cfg']['DisplayServersList'] - * @uses $GLOBALS['cfg']['Servers'] - * @uses implode() - * @uses htmlspecialchars() - * @uses PMA_generate_common_hidden_inputs() - * @uses PMA_generate_common_url() * @param boolean $not_only_options whether to include form tags or not * @param boolean $ommit_fieldset whether to ommit fieldset tag or not */ diff --git a/libraries/server_common.inc.php b/libraries/server_common.inc.php index 56ab261..9d1e011 100644 --- a/libraries/server_common.inc.php +++ b/libraries/server_common.inc.php @@ -1,12 +1,6 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * @uses PMA_generate_common_url() - * @uses PMA_isSuperuser() - * @uses PMA_DBI_select_db() - * @uses PMA_DBI_fetch_result() - * @uses PMA_DBI_QUERY_STORE - * @uses $userlink * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php index aca007f..1d73f13 100644 --- a/libraries/server_synchronize.lib.php +++ b/libraries/server_synchronize.lib.php @@ -68,9 +68,6 @@ function PMA_getNonMatchingTargetTables($trg_tables, $matching_tables, &$uncommo * If update is required, it is placed in $update_array * Otherwise that entry is placed in the $insert_array. * - * @uses PMA_DBI_get_columns() - * @uses PMA_DBI_get_column_values() - * @uses PMA_DBI_fetch_result() * * @param $src_db name of source database * @param $trg_db name of target database @@ -297,9 +294,6 @@ function PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link, &$matching } /** * PMA_findDeleteRowsFromTargetTables finds the rows which are to be deleted from target table. -* @uses sizeof() -* @uses PMA_DBI_get_column_values() -* @uses in_array() * * @param $delete_array array containing rows that are to be deleted * @param $matching_table array containing matching table names @@ -376,7 +370,6 @@ function PMA_findDeleteRowsFromTargetTables(&$delete_array, $matching_table, $ma /** * PMA_dataDiffInUncommonTables() finds the data difference in $source_tables_uncommon -* @uses PMA_DBI_fetch_result() * * @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 @@ -395,8 +388,6 @@ 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] * -* @uses PMA_DBI_fetch_result() -* @uses PMA_backquote() * * @param $table Array containing matching tables' names * @param $update_array A three dimensional array containing field @@ -454,8 +445,6 @@ 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] * -* @uses PMA_DBI_fetch_result() -* @uses PMA_backquote() * * * @param $matching_table array containing matching table names @@ -597,9 +586,6 @@ function PMA_insertIntoTargetTable($matching_table, $src_db, $trg_db, $src_link, /** * PMA_createTargetTables() Create the missing table $uncommon_table in target database * -* @uses PMA_DBI_get_columns() -* @uses PMA_backquote() -* @uses PMA_DBI_fetch_result() * * @param $src_db name of source database * @param $trg_db name of target database @@ -652,10 +638,6 @@ function PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link, &$uncomm } /** * PMA_populateTargetTables() inserts data into uncommon tables after they have been created -* @uses PMA_DBI_fetch_result() -* @uses PMA_backquote() -* @uses sizeof() -* @uses PMA_DBI_try_query() * * @param $src_db name of source database * @param $trg_db name of target database @@ -695,9 +677,6 @@ function PMA_populateTargetTables($src_db, $trg_db, $src_link, $trg_link, $uncom } /** * PMA_deleteFromTargetTable() delete rows from target table -* @uses sizeof() -* @uses PMA_backquote() -* @uses PMA_DBI_try_query() * * * @param $trg_db name of target database @@ -755,8 +734,6 @@ 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. * -* @uses PMA_DBI_get_columns_full() -* @uses sizeof() * * @param $src_db name of source database * @param $trg_db name of target database @@ -820,13 +797,6 @@ 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 -* @uses sizeof() -* @uses in_array() -* @uses array_keys() -* @uses PMA_checkForeignKeys() -* @uses PMA_createTargetTables() -* @uses PMA_DBI_try_query() -* @uses PMA_DBI_fetch_result() * * @param $src_db name of source database * @param $trg_db name of target database @@ -924,10 +894,6 @@ function PMA_addColumnsInTargetTable($src_db, $trg_db, $src_link, $trg_link, $ma } /** * PMA_checkForeignKeys() checks if the referenced table have foreign keys. -* @uses sizeof() -* @uses in_array() -* @uses array_keys() -* @uses PMA_checkForeignKeys() * uses PMA_createTargetTables() * * @param $src_db name of source database @@ -959,11 +925,6 @@ function PMA_checkForeignKeys($src_db, $src_link, $trg_db, $trg_link ,$reference } /** * PMA_alterTargetTableStructure() alters structure of the target table using $alter_str_array -* @uses sizeof() -* @uses PMA_DBI_fetch_result() -* @uses is_string() -* @uses is_numeric() -* @uses PMA_DBI_try_query() * * * @param $trg_db name of target database @@ -1099,9 +1060,6 @@ 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. -* @uses sizeof() -* @uses PMA_DBI_try_query() -* @uses PMA_DBI_fetch_result() * * @param $trg_db name of target database * @param $trg_link connection established with target server @@ -1222,8 +1180,6 @@ function PMA_indexesDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matchi /** * PMA_applyIndexesDiff() create indexes, alters indexes and remove indexes. -* @uses sizeof() -* @uses PMA_DBI_try_query() * * @param $trg_db name of target database * @param $trg_link connection established with target server @@ -1311,7 +1267,6 @@ function PMA_applyIndexesDiff ($trg_db, $trg_link, $matching_tables, $source_ind /** * PMA_displayQuery() displays a query, taking the maximum display size * into account - * @uses $GLOBALS['cfg']['MaxCharactersInDisplayedSQL'] * * @param $query the query to display */ @@ -1324,8 +1279,6 @@ function PMA_displayQuery($query) { /** * PMA_syncDisplayHeaderSource() shows the header for source database - * @uses $_SESSION['src_type'] - * @uses $_SESSION['src_server']['host'] * * @param string $src_db source db name */ @@ -1347,8 +1300,6 @@ function PMA_syncDisplayHeaderSource($src_db) { /** * PMA_syncDisplayHeaderTargetAndMatchingTables() shows the header for target database and the matching tables - * @uses $_SESSION['trg_type'] - * @uses $_SESSION['trg_server']['host'] * * @param string $trg_db target db name * @param array $matching_tables diff --git a/libraries/session.inc.php b/libraries/session.inc.php index 465e3f0..a829172 100644 --- a/libraries/session.inc.php +++ b/libraries/session.inc.php @@ -6,9 +6,6 @@ * @todo add failover or warn if sessions are not configured properly * @todo add an option to use mm-module for session handler * @see http://www.php.net/session - * @uses session_name() - * @uses session_start() - * @uses ini_set() * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { @@ -104,7 +101,6 @@ if (! isset($_SESSION[' PMA_token '])) { * should be called before login and after successfull login * (only required if sensitive information stored in session) * - * @uses session_regenerate_id() to secure session from fixation */ function PMA_secureSession() { diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php index 5dd48d2..13d866e 100644 --- a/libraries/sql_query_form.lib.php +++ b/libraries/sql_query_form.lib.php @@ -30,32 +30,6 @@ require_once './libraries/bookmark.lib.php'; // used for file listing * @usedby tbl_structure.php * @usedby tbl_tracking.php * @usedby querywindow.php - * @uses $GLOBALS['table'] - * @uses $GLOBALS['db'] - * @uses $GLOBALS['server'] - * @uses $GLOBALS['goto'] - * @uses $GLOBALS['is_upload'] from common.inc.php - * @uses $GLOBALS['sql_query'] from grab_globals.lib.php - * @uses $GLOBALS['cfg']['DefaultQueryTable'] - * @uses $GLOBALS['cfg']['DefaultQueryDatabase'] - * @uses $GLOBALS['cfg']['Servers'] - * @uses $GLOBALS['cfg']['DefaultTabDatabase'] - * @uses $GLOBALS['cfg']['Bookmark'] - * @uses PMA_generate_common_url() - * @uses PMA_backquote() - * @uses PMA_DBI_fetch_result() - * @uses PMA_showMySQLDocu() - * @uses PMA_generate_common_hidden_inputs() - * @uses PMA_sqlQueryFormBookmark() - * @uses PMA_sqlQueryFormInsert() - * @uses PMA_sqlQueryFormUpload() - * @uses PMA_DBI_QUERY_STORE - * @uses PMA_set_enc_form() - * @uses sprintf() - * @uses htmlspecialchars() - * @uses str_replace() - * @uses md5() - * @uses function_exists() * @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 @@ -183,14 +157,6 @@ function PMA_sqlQueryForm($query = true, $display_tab = false, $delimiter = ';') * prints querybox fieldset * * @usedby PMA_sqlQueryForm() - * @uses $GLOBALS['text_dir'] - * @uses $GLOBALS['cfg']['TextareaAutoSelect'] - * @uses $GLOBALS['cfg']['TextareaCols'] - * @uses $GLOBALS['cfg']['TextareaRows'] - * @uses PMA_USR_OS - * @uses PMA_USR_BROWSER_AGENT - * @uses PMA_USR_BROWSER_VER - * @uses htmlspecialchars() * @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 @@ -391,12 +357,6 @@ function PMA_sqlQueryFormInsert($query = '', $is_querywindow = false, $delimiter * prints bookmark fieldset * * @usedby PMA_sqlQueryForm() - * @uses PMA_Bookmark_getList() - * @uses $GLOBALS['db'] - * @uses $GLOBALS['pmaThemeImage'] - * @uses $GLOBALS['cfg']['ReplaceHelpImg'] - * @uses count() - * @uses htmlspecialchars() */ function PMA_sqlQueryFormBookmark() { @@ -460,18 +420,6 @@ function PMA_sqlQueryFormBookmark() * prints bookmark fieldset * * @usedby PMA_sqlQueryForm() - * @uses $GLOBALS['cfg']['GZipDump'] - * @uses $GLOBALS['cfg']['BZipDump'] - * @uses $GLOBALS['cfg']['UploadDir'] - * @uses $GLOBALS['cfg']['AvailableCharsets'] - * @uses $GLOBALS['max_upload_size'] - * @uses PMA_supportedDecompressions() - * @uses PMA_getFileSelectOptions() - * @uses PMA_displayMaximumUploadSize() - * @uses PMA_generateCharsetDropdownBox() - * @uses PMA_generateHiddenMaxFileSize() - * @uses PMA_CSDROPDOWN_CHARSET - * @uses empty() */ function PMA_sqlQueryFormUpload(){ $errors = array (); diff --git a/libraries/string.lib.php b/libraries/string.lib.php index 6c45a22..6e2d26d 100644 --- a/libraries/string.lib.php +++ b/libraries/string.lib.php @@ -12,11 +12,6 @@ * * The SQL Parser code relies heavily on these functions. * - * @uses extension_loaded() - * @uses substr() - * @uses function_exists() - * @uses mb_internal_encoding() - * @uses defined() * @todo a .lib filename should not have code in main(), split or rename file * @package phpMyAdmin */ @@ -62,10 +57,6 @@ if ($GLOBALS['PMA_allow_ctype']) { /** * Checks if a given character position in the string is escaped or not * - * @uses PMA_strlen() - * @uses PMA_substr() - * @uses max() - * @uses intval() * @param string string to check for * @param integer the character to check for * @param integer starting position in the string @@ -110,7 +101,6 @@ function PMA_STR_numberInRangeInclusive($num, $lower, $upper) /** * Checks if a character is an SQL identifier * - * @uses PMA_STR_isAlnum() * @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 diff --git a/libraries/string_type_ctype.lib.php b/libraries/string_type_ctype.lib.php index b211dd5..590e59d 100644 --- a/libraries/string_type_ctype.lib.php +++ b/libraries/string_type_ctype.lib.php @@ -18,7 +18,6 @@ /** * Checks if a character is an alphanumeric one * - * @uses ctype_alnum() * @param string character to check for * @return boolean whether the character is an alphanumeric one or not */ @@ -30,7 +29,6 @@ function PMA_STR_isAlnum($c) /** * Checks if a character is an alphabetic one * - * @uses ctype_alpha() * @param string character to check for * @return boolean whether the character is an alphabetic one or not */ @@ -42,7 +40,6 @@ function PMA_STR_isAlpha($c) /** * Checks if a character is a digit * - * @uses ctype_digit() * @param string character to check for * @return boolean whether the character is a digit or not */ @@ -54,7 +51,6 @@ function PMA_STR_isDigit($c) /** * Checks if a character is an upper alphabetic one * - * @uses ctype_upper() * @param string character to check for * @return boolean whether the character is an upper alphabetic one or not */ @@ -67,7 +63,6 @@ function PMA_STR_isUpper($c) /** * Checks if a character is a lower alphabetic one * - * @uses ctype_lower() * @param string character to check for * @return boolean whether the character is a lower alphabetic one or not */ @@ -79,7 +74,6 @@ function PMA_STR_isLower($c) /** * Checks if a character is a space one * - * @uses ctype_space() * @param string character to check for * @return boolean whether the character is a space one or not */ @@ -91,7 +85,6 @@ function PMA_STR_isSpace($c) /** * Checks if a character is an hexadecimal digit * - * @uses ctype_xdigit() * @param string character to check for * @return boolean whether the character is an hexadecimal digit or not */ diff --git a/libraries/string_type_native.lib.php b/libraries/string_type_native.lib.php index a2c7f0e..0bcb08f 100644 --- a/libraries/string_type_native.lib.php +++ b/libraries/string_type_native.lib.php @@ -18,9 +18,6 @@ /** * Checks if a character is an alphanumeric one * - * @uses PMA_STR_isUpper() - * @uses PMA_STR_isLower() - * @uses PMA_STR_isDigit() * @param string character to check for * @return boolean whether the character is an alphanumeric one or not */ @@ -32,8 +29,6 @@ function PMA_STR_isAlnum($c) /** * Checks if a character is an alphabetic one * - * @uses PMA_STR_isUpper() - * @uses PMA_STR_isLower() * @param string character to check for * @return boolean whether the character is an alphabetic one or not */ @@ -45,8 +40,6 @@ function PMA_STR_isAlpha($c) /** * Checks if a character is a digit * - * @uses PMA_STR_numberInRangeInclusive() - * @uses ord() * @param string character to check for * @return boolean whether the character is a digit or not */ @@ -62,8 +55,6 @@ function PMA_STR_isDigit($c) /** * Checks if a character is an upper alphabetic one * - * @uses PMA_STR_numberInRangeInclusive() - * @uses ord() * @param string character to check for * @return boolean whether the character is an upper alphabetic one or not */ @@ -79,8 +70,6 @@ function PMA_STR_isUpper($c) /** * Checks if a character is a lower alphabetic one * - * @uses PMA_STR_numberInRangeInclusive() - * @uses ord() * @param string character to check for * @return boolean whether the character is a lower alphabetic one or not */ @@ -96,8 +85,6 @@ function PMA_STR_isLower($c) /** * Checks if a character is a space one * - * @uses PMA_STR_numberInRangeInclusive() - * @uses ord() * @param string character to check for * @return boolean whether the character is a space one or not */ @@ -117,8 +104,6 @@ function PMA_STR_isSpace($c) /** * Checks if a character is an hexadecimal digit * - * @uses PMA_STR_numberInRangeInclusive() - * @uses ord() * @param string character to check for * @return boolean whether the character is an hexadecimal digit or not */ diff --git a/libraries/tbl_replace_fields.inc.php b/libraries/tbl_replace_fields.inc.php index e1d98c8..71bbfbc 100644 --- a/libraries/tbl_replace_fields.inc.php +++ b/libraries/tbl_replace_fields.inc.php @@ -18,15 +18,6 @@ * note: grab_globals has extracted the fields from _FILES or HTTP_POST_FILES * * - * @uses $_REQUEST - * @uses defined() - * @uses define() - * @uses bin2hex() - * @uses strlen() - * @uses md5() - * @uses implode() - * @uses PMA_NO_VARIABLES_IMPORT - * @uses PMA_sqlAddslashes() * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/transformations.lib.php b/libraries/transformations.lib.php index 7148003..98d0b14 100644 --- a/libraries/transformations.lib.php +++ b/libraries/transformations.lib.php @@ -19,14 +19,6 @@ * // } * </code> * - * @uses preg_split() - * @uses array_shift() - * @uses trim() - * @uses rtrim() - * @uses ltrim() - * @uses strlen() - * @uses substr() - * @uses stripslashes() * @param string $option_string comma separated options * @return array options */ @@ -70,13 +62,6 @@ function PMA_transformation_getOptions($option_string) * Gets all available MIME-types * * @access public - * @uses opendir() - * @uses readdir() - * @uses closedir() - * @uses sort() - * @uses preg_match() - * @uses explode() - * @uses str_replace() * @staticvar array mimetypes * @return array array[mimetype], array[transformation] */ @@ -132,11 +117,6 @@ function PMA_getAvailableMIMEtypes() /** * Gets the mimetypes for all columns of a table * - * @uses $GLOBALS['controllink'] - * @uses PMA_getRelationsParam() - * @uses PMA_backquote() - * @uses PMA_sqlAddslashes() - * @uses PMA_DBI_fetch_result() * @access public * @param string $db the name of the db to check for * @param string $table the name of the table to check for @@ -168,15 +148,6 @@ function PMA_getMIME($db, $table, $strict = false) /** * Set a single mimetype to a certain value. * - * @uses PMA_DBI_QUERY_STORE - * @uses PMA_getRelationsParam() - * @uses PMA_backquote() - * @uses PMA_sqlAddslashes() - * @uses PMA_query_as_controluser() - * @uses PMA_DBI_num_rows() - * @uses PMA_DBI_fetch_assoc() - * @uses PMA_DBI_free_result() - * @uses strlen() * @access public * @param string $db the name of the db * @param string $table the name of the table diff --git a/libraries/url_generating.lib.php b/libraries/url_generating.lib.php index 069e4b4..c8b343b 100644 --- a/libraries/url_generating.lib.php +++ b/libraries/url_generating.lib.php @@ -10,7 +10,6 @@ * Generates text with hidden inputs. * * @see PMA_generate_common_url() - * @uses PMA_getHiddenFields * @param string optional database name * (can also be an array of parameters) * @param string optional table name @@ -161,19 +160,6 @@ function PMA_getHiddenFields($values, $pre = '') * // script.php?server=1&lang=en * </code> * - * @uses $GLOBALS['server'] - * @uses $GLOBALS['cfg']['ServerDefault'] - * @uses $_COOKIE['pma_lang'] - * @uses $GLOBALS['lang'] - * @uses $_COOKIE['pma_collation_connection'] - * @uses $GLOBALS['collation_connection'] - * @uses $_SESSION[' PMA_token '] - * @uses PMA_get_arg_separator() - * @uses is_array() - * @uses strlen() - * @uses htmlentities() - * @uses urlencode() - * @uses implode() * @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 * @@ -270,9 +256,6 @@ 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 & * - * @uses ini_get() - * @uses strpos() - * @uses strlen() * @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/user_preferences.lib.php b/libraries/user_preferences.lib.php index 3fb8c1b..632e3e2 100644 --- a/libraries/user_preferences.lib.php +++ b/libraries/user_preferences.lib.php @@ -9,12 +9,6 @@ /** * Common initialization for user preferences modification pages * - * @uses ConfigFile::getInstance() - * @uses ConfigFile::resetConfigData() - * @uses ConfigFile::setAllowedKeys() - * @uses ConfigFile::setCfgUpdateReadMapping() - * @uses ConfigFile::updateWithGlobalConfig() - * @uses PMA_read_userprefs_fieldnames() */ function PMA_userprefs_pageinit() { @@ -36,14 +30,6 @@ function PMA_userprefs_pageinit() * * mtime - last modification time * * type - 'db' (config read from pmadb) or 'session' (read from user session) * - * @uses $_SESSION['userconfig'] - * @uses $GLOBALS['controllink'] - * @uses PMA_array_merge_recursive - * @uses PMA_backquote() - * @uses PMA_DBI_fetch_single_row() - * @uses PMA_getRelationsParam() - * @uses PMA_sqlAddslashes() - * @uses $GLOBALS['controllink'] * @return array */ function PMA_load_userprefs() @@ -78,22 +64,6 @@ function PMA_load_userprefs() /** * Saves user preferences * - * @uses $_SESSION['cache'][...]['userprefs'] - * @uses $_SESSION['userconfig'] - * @uses $GLOBALS['cfg']['ServerDefault'] - * @uses $GLOBALS['controllink'] - * @uses $GLOBALS['server'] - * @uses ConfigFile::getConfigArray() - * @uses ConfigFile::getInstance() - * @uses PMA_backquote() - * @uses PMA_DBI_fetch_value - * @uses PMA_DBI_getError() - * @uses PMA_DBI_try_query() - * @uses PMA_Message::addMessage() - * @uses PMA_Message::error() - * @uses PMA_Message::rawError() - * @uses PMA_sqlAddslashes() - * @uses PMA_getRelationsParam() * @param array $config_data * @return true|PMA_Message */ @@ -151,8 +121,6 @@ function PMA_save_userprefs(array $config_array) * Returns a user preferences array filtered by $cfg['UserprefsDisallow'] * (blacklist) and keys from user preferences form (whitelist) * - * @uses PMA_array_write() - * @uses PMA_read_userprefs_fieldnames() * @param array $config_data path => value pairs * @return array */ @@ -217,8 +185,6 @@ function PMA_read_userprefs_fieldnames(array $forms = null) * * No validation is done! * - * @uses PMA_load_userprefs() - * @uses PMA_save_userprefs() * @param string $cfg_name * @param mixed $value * @return void @@ -241,10 +207,6 @@ function PMA_persist_option($path, $value, $default_value) /** * Redirects after saving new user preferences * - * @uses ConfigFile::getConfigArray() - * @uses ConfigFile::getInstance() - * @uses PMA_generate_common_url() - * @uses PMA_sendHeaderLocation() * @param array $forms * @param array $old_settings * @param string $file_name @@ -287,9 +249,6 @@ function PMA_userprefs_redirect(array $forms, array $old_settings, $file_name, $ /** * Shows form which allows to quickly load settings stored in browser's local storage * - * @uses $_REQUEST['prefs_autoload'] - * @uses $_SESSION['userprefs_autoload'] - * @uses PMA_generate_common_hidden_inputs() */ function PMA_userprefs_autoload_header() { diff --git a/navigation.php b/navigation.php index b63f775..8e42014 100644 --- a/navigation.php +++ b/navigation.php @@ -4,34 +4,6 @@ * the navigation frame - displays server, db and table selection tree * * @package phpMyAdmin - * @uses $GLOBALS['pma']->databases - * @uses $GLOBALS['server'] - * @uses $GLOBALS['db'] - * @uses $GLOBALS['table'] - * @uses $GLOBALS['available_languages'] - * @uses $GLOBALS['lang'] - * @uses $GLOBALS['text_dir'] - * @uses $GLOBALS['pmaThemeImage'] - * @uses $GLOBALS['cfg']['LeftFrameLight'] - * @uses $GLOBALS['cfg']['ShowTooltip'] - * @uses $GLOBALS['cfg']['ShowTooltipAliasDB'] - * @uses $GLOBALS['cfg']['DefaultTabDatabase'] - * @uses $GLOBALS['cfgRelation']['commwork']) { - * @uses PMA_List_Database::getSingleItem() - * @uses PMA_List_Database::getHtmlSelectGrouped() - * @uses PMA_List_Database::getGroupedDetails() - * @uses PMA_generate_common_url() - * @uses PMA_generate_common_hidden_inputs() - * @uses PMA_getDbComment(); - * @uses PMA_getTableCount() - * @uses PMA_getTableList() - * @uses PMA_getRelationsParam() - * @uses PMA_outBufferPre() - * @uses strlen() - * @uses session_write_close() - * @uses is_array() - * @uses implode() - * @uses htmlspecialchars() */ /** @@ -42,8 +14,6 @@ require_once './libraries/common.inc.php'; /** * finish and cleanup navigation.php script execution, only to be used in navigation.php * - * @uses $GLOBALS['controllink'] to close it - * @uses $GLOBALS['userlink'] to close it * @access private */ function PMA_exitNavigationFrame() @@ -354,15 +324,6 @@ if ($GLOBALS['cfg']['LeftFrameLight'] && strlen($GLOBALS['db'])) { /** * displays collapsable db list * - * @uses $_REQUEST['dbgroup'] - * @uses $GLOBALS['cfg']['DefaultTabDatabase'] - * @uses strpos() - * @uses urlencode() - * @uses printf() - * @uses htmlspecialchars() - * @uses PMA_generate_common_url() - * @uses PMA_getTableList() - * @uses PMA_displayTableList() * @global integer $element_counter * @global string $img_minus * @global string $img_plus @@ -532,22 +493,6 @@ function PMA_displayDbList($ext_dblist, $offset, $count) { * calls itself recursively if table in given list * is a list itself * - * @uses is_array() - * @uses count() - * @uses urlencode() - * @uses strpos() - * @uses printf() - * @uses htmlspecialchars() - * @uses strlen() - * @uses is_array() - * @uses PMA_displayTableList() - * @uses $_REQUEST['tbl_group'] - * @uses $GLOBALS['common_url_query'] - * @uses $GLOBALS['table'] - * @uses $GLOBALS['pmaThemeImage'] - * @uses $GLOBALS['cfg']['LeftFrameTableSeparator'] - * @uses $GLOBALS['cfg']['DefaultTabDatabase'] - * @uses $GLOBALS['cfg']['DefaultTabTable'] * @global integer the element counter * @global string html code for '-' image * @global string html code for '+' image diff --git a/pmd_common.php b/pmd_common.php index df8fdf2..cbe37ed 100644 --- a/pmd_common.php +++ b/pmd_common.php @@ -23,16 +23,6 @@ $GLOBALS['script_display_field'] = /** * retrieves table info and stores it in $GLOBALS['PMD'] * - * @uses $GLOBALS['script_display_field'] - * @uses $GLOBALS['PMD'] to fill it - * @uses $GLOBALS['db'] - * @uses PMA_DBI_get_tables_full() - * @uses PMA_DBI_select_db() - * @uses PMA_getDisplayField() - * @uses urlencode() - * @uses htmlspecialchars() - * @uses strtoupper() - * @uses urlencode() */ function get_tabs() { @@ -78,13 +68,6 @@ function get_tabs() /** * retrieves table column info * - * @uses $GLOBALS['db'] - * @uses PMA_DBI_QUERY_STORE - * @uses PMA_DBI_select_db() - * @uses PMA_DBI_query() - * @uses PMA_DBI_num_rows() - * @uses PMA_backquote() - * @uses count() * @return array table column nfo */ function get_tab_info() @@ -108,16 +91,6 @@ function get_tab_info() /** * returns JavaScript code for intializing vars * - * @uses $GLOBALS['db'] - * @uses PMA_DBI_QUERY_STORE - * @uses PMA_DBI_select_db() - * @uses PMA_DBI_query() - * @uses PMA_backquote() - * @uses PMA_DBI_fetch_row() - * @uses PMA_getForeigners() - * @uses urlencode() - * @uses count() - * @uses in_array() * @return string JavaScript code */ function get_script_contr() @@ -184,7 +157,6 @@ function get_script_contr() } /** - * @uses get_all_keys() * @return array unique or primary indizes */ function get_pk_or_unique_keys() @@ -195,10 +167,6 @@ function get_pk_or_unique_keys() /** * returns all indizes * - * @uses $GLOBALS['PMD'] - * @uses PMA_Index::getFromTable() - * @uses PMA_Index->isUnique() - * @uses PMA_Index->getColumns() * @param boolean whether to include ony unique ones * @return array indizes */ @@ -227,9 +195,6 @@ function get_all_keys($unique_only = false) /** * * - * @uses $GLOBALS['PMD'] - * @uses count() - * @uses in_array() * @return array ??? */ function get_script_tabs() @@ -251,15 +216,6 @@ function get_script_tabs() } /** - * @uses $GLOBALS['controllink'] - * @uses $cfgRelation['designerwork'] - * @uses $cfgRelation['db'] - * @uses $cfgRelation['designer_coords'] - * @uses PMA_DBI_QUERY_STORE - * @uses PMA_getRelationsParam() - * @uses PMA_backquote() - * @uses PMA_DBI_fetch_result() - * @uses count() * @return array table positions and sizes */ function get_tab_pos() @@ -284,9 +240,6 @@ function get_tab_pos() /** * returns distinct values from $GLOBALS['PMD']['OWNER'] * - * @uses array_values() - * @uses array_unique() - * @uses $GLOBALS['PMD']['OWNER'] * @return array owner */ function get_owners() diff --git a/querywindow.php b/querywindow.php index 0b92ad8..3e5207c 100644 --- a/querywindow.php +++ b/querywindow.php @@ -4,30 +4,6 @@ * this file is register_globals safe * * @todo move JavaScript out of here into .js files - * @uses $cfg['QueryWindowDefTab'] - * @uses $cfg['PropertiesIconic'] - * @uses $cfg['QueryHistoryDB'] - * @uses $cfg['Server']['user'] - * @uses $cfg['AllowUserDropDatabase'] - * @uses $cfg['Confirm'] - * @uses $GLOBALS['db'] - * @uses $GLOBALS['table'] - * @uses PMA_isSuperuser() - * @uses PMA_outBufferPre() - * @uses PMA_getRelationsParam() - * @uses PMA_isValid() - * @uses PMA_ifSetOr() - * @uses PMA_getHistory() - * @uses PMA_generate_common_url() - * @uses PMA_generate_common_hidden_inputs() - * @uses PMA_escapeJsString() - * @uses PMA_generate_html_tabs() - * @uses PMA_sqlQueryForm() - * @uses PMA_jsFormat() - * @uses in_array() - * @uses strlen() - * @uses preg_replace() - * @uses htmlspecialchars() * @package phpMyAdmin */ diff --git a/server_binlog.php b/server_binlog.php index b491565..02b0800 100644 --- a/server_binlog.php +++ b/server_binlog.php @@ -3,25 +3,6 @@ /** * display the binary logs and the content of the selected * - * @uses $cfg['MainPageIconic'] - * @uses $cfg['NavigationBarIconic'] - * @uses $cfg['MaxRows'] - * @uses $cfg['LimitChars'] - * @uses $pmaThemeImage - * @uses $binary_logs - * @uses PMA_generate_common_hidden_inputs() - * @uses PMA_generate_common_url() - * @uses PMA_formatByteDown() - * @uses PMA_DBI_fetch_assoc() - * @uses PMA_strlen() - * @uses PMA_substr() - * @uses $_REQUEST['pos'] - * @uses $_REQUEST['log'] - * @uses $_REQUEST['dontlimitchars'] - * @uses count() - * @uses array_key_exists() - * @uses implode() - * @uses htmlspecialchars() * @package phpMyAdmin */ diff --git a/tbl_create.php b/tbl_create.php index fd21c8b..b141fc1 100644 --- a/tbl_create.php +++ b/tbl_create.php @@ -1,32 +1,6 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * @uses $cfg['DefaultTabDatabase'] - * @uses $GLOBALS['table'] - * @uses $GLOBALS['db'] - * @uses PMA_Table::generateFieldSpec() - * @uses PMA_checkParameters() - * @uses PMA_generateCharsetQueryPart() - * @uses PMA_sqlAddslashes() - * @uses PMA_DBI_try_query() - * @uses PMA_getRelationsParam() - * @uses PMA_setMIME() - * @uses PMA_mysqlDie() - * @uses PMA_generate_common_url() - * @uses PMA_DBI_get_columns() - * @uses PMA_DBI_select_db() - * @uses PMA_backquote() - * @uses $_REQUEST['do_save_data'] - * @uses $_REQUEST['submit_num_fields'] - * @uses $_REQUEST['orig_num_fields'] - * @uses $_REQUEST['added_fields'] - * @uses $_REQUEST['num_fields'] - * @uses preg_replace() - * @uses count() - * @uses is_array() - * @uses strlen() - * @uses sprintf() - * @uses htmlspecialchars() * @package phpMyAdmin */ diff --git a/tbl_replace.php b/tbl_replace.php index e08dafb..2876b50 100644 --- a/tbl_replace.php +++ b/tbl_replace.php @@ -8,33 +8,6 @@ * * @todo 'edit_next' tends to not work as expected if used ... at least there is no order by * it needs the original query and the row number and than replace the LIMIT clause - * @uses PMA_checkParameters() - * @uses PMA_DBI_select_db() - * @uses PMA_DBI_query() - * @uses PMA_DBI_fetch_row() - * @uses PMA_DBI_get_fields_meta() - * @uses PMA_DBI_free_result() - * @uses PMA_DBI_try_query() - * @uses PMA_DBI_getError() - * @uses PMA_DBI_affected_rows() - * @uses PMA_DBI_insert_id() - * @uses PMA_backquote() - * @uses PMA_getUniqueCondition() - * @uses PMA_sqlAddslashes() - * @uses PMA_securePath() - * @uses PMA_sendHeaderLocation() - * @uses str_replace() - * @uses count() - * @uses file_exists() - * @uses strlen() - * @uses str_replace() - * @uses preg_replace() - * @uses is_array() - * @uses $GLOBALS['db'] - * @uses $GLOBALS['table'] - * @uses $GLOBALS['goto'] - * @uses $GLOBALS['sql_query'] - * @uses PMA_File::getRecentBLOBReference() * @package phpMyAdmin */ diff --git a/test/theme.php b/test/theme.php index 2ad12bb..0242e09 100644 --- a/test/theme.php +++ b/test/theme.php @@ -3,7 +3,6 @@ /** * theme test * - * @uses libraries/common.inc.php global fnctions * @package phpMyAdmin-test */ diff --git a/user_password.php b/user_password.php index 9787cc1..a8ff8da 100644 --- a/user_password.php +++ b/user_password.php @@ -4,20 +4,6 @@ * displays and handles the form where the user can change his password * linked from main.php * - * @uses $GLOBALS['js_include'] - * @uses $cfg['ShowChgPassword'] - * @uses $cfg['Server']['auth_type'] - * @uses PMA_DBI_select_db() - * @uses PMA_DBI_try_query() - * @uses PMA_DBI_getError() - * @uses PMA_sanitize() - * @uses PMA_generate_common_url() - * @uses PMA_isValid() - * @uses PMA_mysqlDie() - * @uses $GLOBALS['PMA_Config']->setCookie() - * @uses PMA_blowfish_encrypt() - * @uses PMA_showMessage() - * @uses define() * @package phpMyAdmin */ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3RC1-6265-g327b3d1
by Michal Čihař 27 Jun '11

27 Jun '11

The branch, master has been updated via 327b3d14560dd8aa68da071a7661e6c12d4b5c41 (commit) via c84b7789c9d0d120c74473bf173189cf43487fdb (commit) via 7e6cb4faa93218c299c7986066c8149c6c6ff8e5 (commit) via 2a3f386beeb1bf8e7154a906b9942eb29127b84d (commit) via 31a8d5ba8c032bd301780b2f40cf4a06dd7ade36 (commit) via 9948be66781fff68a4dfe046646d096a379f12bf (commit) via faa68e0bacb9c98181f4a5aa053fdcb0d4c55a64 (commit) via 88520d4612e70ed3cbb8d8b88084303b526dc7c5 (commit) via ae5936129f6cf76ba2ed84f2e467f468a4622d10 (commit) via 6b0862973a626c7b0b6faffba70e521d73e0cd02 (commit) via 91060a3400af84f243c6c3b42f65add56f2e7f84 (commit) via 31062d4c15f247b5bee1a1f1ddea73d9d8bb9704 (commit) via 54b7a1a7e99ae665b94bf853247e0f94d83f70c3 (commit) via 8ffcef91e2f8442e29d516d6e7e87e8690a6cdb7 (commit) via c5acdfe52f402b9a23e4133193de930fa02790a0 (commit) via e754eca28970fb94a971444375d27fc69db114bb (commit) via ca95939e3de8573ca97dca0c37ee0eb140cf0a5e (commit) via fe55d2fb8e366edc481bc2ad08857fb003c585c3 (commit) via 26a4c4fdf51fa670666acef2b1125cecf9a3761c (commit) via 96841ad30342d03b7ceb34ec4b765eb7160c9ab7 (commit) via 2f41a05b7f0cc77fe0ef7fdd2275a62b41ad30af (commit) via 19953e7995f51a7cfd859de82e57939f0f39f140 (commit) via b9c6a7d157aef26885634872a672fe06ceb6c935 (commit) via 24e9d4cabd6958858cf24287e68ff04d70b8223c (commit) via e388ab669aac736820eef6a87d67b79a7e22ab30 (commit) via 49a89913aabb31fd734a53fd2aadf963d5628b57 (commit) via 924d3104897a085284af5ac5215cbec9451107e4 (commit) via 40f998656c7b19375e621933cdbd77725474eecd (commit) via b7de81d6e5d4cc942df5700163e56a5e90a74628 (commit) from ce706e0b88cac465144660ce7568ffa805d50200 (commit) - Log ----------------------------------------------------------------- commit 327b3d14560dd8aa68da071a7661e6c12d4b5c41 Author: Michal Čihař <michal(a)cihar.com> Date: Mon Jun 27 11:02:07 2011 +0200 Translation update done using Pootle. commit c84b7789c9d0d120c74473bf173189cf43487fdb Author: Michal Čihař <michal(a)cihar.com> Date: Mon Jun 27 11:01:59 2011 +0200 Translation update done using Pootle. commit 7e6cb4faa93218c299c7986066c8149c6c6ff8e5 Author: Michal Čihař <michal(a)cihar.com> Date: Mon Jun 27 11:01:51 2011 +0200 Translation update done using Pootle. commit 2a3f386beeb1bf8e7154a906b9942eb29127b84d Author: Michal Čihař <michal(a)cihar.com> Date: Mon Jun 27 11:01:30 2011 +0200 Translation update done using Pootle. commit 31a8d5ba8c032bd301780b2f40cf4a06dd7ade36 Author: Michal Čihař <michal(a)cihar.com> Date: Mon Jun 27 11:00:23 2011 +0200 Translation update done using Pootle. commit 9948be66781fff68a4dfe046646d096a379f12bf Author: Michal Čihař <michal(a)cihar.com> Date: Mon Jun 27 10:58:24 2011 +0200 Translation update done using Pootle. commit faa68e0bacb9c98181f4a5aa053fdcb0d4c55a64 Author: Michal Čihař <michal(a)cihar.com> Date: Mon Jun 27 10:57:15 2011 +0200 Translation update done using Pootle. commit 88520d4612e70ed3cbb8d8b88084303b526dc7c5 Author: Michal Čihař <michal(a)cihar.com> Date: Mon Jun 27 10:55:56 2011 +0200 Translation update done using Pootle. commit ae5936129f6cf76ba2ed84f2e467f468a4622d10 Author: Michal Čihař <michal(a)cihar.com> Date: Mon Jun 27 10:55:49 2011 +0200 Translation update done using Pootle. commit 6b0862973a626c7b0b6faffba70e521d73e0cd02 Author: Michal Čihař <michal(a)cihar.com> Date: Mon Jun 27 10:55:42 2011 +0200 Translation update done using Pootle. commit 91060a3400af84f243c6c3b42f65add56f2e7f84 Author: Michal Čihař <michal(a)cihar.com> Date: Mon Jun 27 10:55:37 2011 +0200 Translation update done using Pootle. commit 31062d4c15f247b5bee1a1f1ddea73d9d8bb9704 Author: Michal Čihař <michal(a)cihar.com> Date: Mon Jun 27 10:55:31 2011 +0200 Translation update done using Pootle. commit 54b7a1a7e99ae665b94bf853247e0f94d83f70c3 Author: Michal Čihař <michal(a)cihar.com> Date: Mon Jun 27 10:55:20 2011 +0200 Translation update done using Pootle. commit 8ffcef91e2f8442e29d516d6e7e87e8690a6cdb7 Author: Michal Čihař <michal(a)cihar.com> Date: Mon Jun 27 10:55:02 2011 +0200 Translation update done using Pootle. commit c5acdfe52f402b9a23e4133193de930fa02790a0 Author: Michal Čihař <michal(a)cihar.com> Date: Mon Jun 27 10:54:54 2011 +0200 Translation update done using Pootle. commit e754eca28970fb94a971444375d27fc69db114bb Author: Michal Čihař <michal(a)cihar.com> Date: Mon Jun 27 10:54:38 2011 +0200 Translation update done using Pootle. commit ca95939e3de8573ca97dca0c37ee0eb140cf0a5e Author: Michal Čihař <michal(a)cihar.com> Date: Mon Jun 27 10:54:27 2011 +0200 Translation update done using Pootle. commit fe55d2fb8e366edc481bc2ad08857fb003c585c3 Author: Michal Čihař <michal(a)cihar.com> Date: Mon Jun 27 10:54:18 2011 +0200 Translation update done using Pootle. commit 26a4c4fdf51fa670666acef2b1125cecf9a3761c Author: Michal Čihař <michal(a)cihar.com> Date: Mon Jun 27 10:54:13 2011 +0200 Translation update done using Pootle. commit 96841ad30342d03b7ceb34ec4b765eb7160c9ab7 Author: Michal Čihař <michal(a)cihar.com> Date: Mon Jun 27 10:54:08 2011 +0200 Translation update done using Pootle. commit 2f41a05b7f0cc77fe0ef7fdd2275a62b41ad30af Author: Michal Čihař <michal(a)cihar.com> Date: Mon Jun 27 10:53:57 2011 +0200 Translation update done using Pootle. commit 19953e7995f51a7cfd859de82e57939f0f39f140 Author: Michal Čihař <michal(a)cihar.com> Date: Mon Jun 27 10:53:49 2011 +0200 Translation update done using Pootle. commit b9c6a7d157aef26885634872a672fe06ceb6c935 Author: Michal Čihař <michal(a)cihar.com> Date: Mon Jun 27 10:53:36 2011 +0200 Translation update done using Pootle. commit 24e9d4cabd6958858cf24287e68ff04d70b8223c Author: Michal Čihař <michal(a)cihar.com> Date: Mon Jun 27 10:53:17 2011 +0200 Translation update done using Pootle. commit e388ab669aac736820eef6a87d67b79a7e22ab30 Author: Michal Čihař <michal(a)cihar.com> Date: Mon Jun 27 10:52:52 2011 +0200 Translation update done using Pootle. commit 49a89913aabb31fd734a53fd2aadf963d5628b57 Author: Michal Čihař <michal(a)cihar.com> Date: Mon Jun 27 10:52:35 2011 +0200 Translation update done using Pootle. commit 924d3104897a085284af5ac5215cbec9451107e4 Author: Michal Čihař <michal(a)cihar.com> Date: Mon Jun 27 10:52:24 2011 +0200 Translation update done using Pootle. commit 40f998656c7b19375e621933cdbd77725474eecd Author: Michal Čihař <michal(a)cihar.com> Date: Mon Jun 27 10:52:08 2011 +0200 Translation update done using Pootle. commit b7de81d6e5d4cc942df5700163e56a5e90a74628 Author: Michal Čihař <michal(a)cihar.com> Date: Mon Jun 27 10:51:51 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/cs.po | 78 +++++++++++++++++++++++++++----------------------------------- 1 files changed, 34 insertions(+), 44 deletions(-) diff --git a/po/cs.po b/po/cs.po index 04dae59..f3d8ffb 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,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-06-27 10:29+0200\n" -"PO-Revision-Date: 2011-06-24 13:53+0200\n" +"PO-Revision-Date: 2011-06-27 11:02+0200\n" "Last-Translator: Michal Čihař <michal(a)cihar.com>\n" "Language-Team: czech <cs(a)li.org>\n" "Language: cs\n" @@ -597,6 +597,9 @@ 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 "" +"Používáte zastaralé rozšíření „mysql“, které neumí pracovat se složenými " +"dotazy.<b>Spouštění některých rutin může selhat!</b> Pokud se chcete těmto " +"problémům vyhnout, začněte, prosím, používat nové rozšíření „mysqli“." #: db_search.php:54 libraries/auth/config.auth.lib.php:83 #: libraries/auth/config.auth.lib.php:102 @@ -4737,10 +4740,9 @@ msgid "Turn it off" msgstr "Vypnout" #: libraries/db_events.inc.php:141 -#, fuzzy #| msgid "Add a new Event" msgid "Add an event" -msgstr "Přidat novou událost" +msgstr "Přidat událost" #: libraries/db_links.inc.php:42 libraries/db_links.inc.php:43 #: libraries/db_links.inc.php:44 @@ -4880,37 +4882,37 @@ msgstr "Musíte zadat jméno rutiny" #: libraries/db_routines.lib.php:984 #, php-format msgid "Invalid direction \"%s\" given for parameter." -msgstr "„%s“ je chybný směr parametru." +msgstr "„%s“ je chybný směr parametru." #: libraries/db_routines.lib.php:995 libraries/db_routines.lib.php:1036 msgid "" "You must provide length/values for routine parameters of type ENUM, SET, " "VARCHAR and VARBINARY." msgstr "" +"Musíte zadat parametr „Délka/Hodnoty“ pro parametry typu ENUM, SET, VARCHAR " +"nebo VARBINARY." #: libraries/db_routines.lib.php:1020 msgid "You must provide a name and a type for each routine parameter." -msgstr "" +msgstr "Pro každý parametr musíte zadat jeho jméno a typ." #: libraries/db_routines.lib.php:1077 msgid "You must provide a routine definition." -msgstr "" +msgstr "Musíte zadat definici rutiny." #: libraries/db_routines.lib.php:1209 -#, fuzzy #| msgid "There are no files to upload" msgid "There are no routines to display." -msgstr "Nebyl zvolen žádný soubor pro nahrání" +msgstr "Nebyly nalezeny žádné rutiny." #: libraries/db_routines.lib.php:1253 msgid "Add routine" msgstr "Přidat rutinu" #: libraries/db_routines.lib.php:1256 -#, fuzzy #| msgid "You don't have sufficient privileges to be here right now!" msgid "You do not have the necessary privileges to create a new routine" -msgstr "Nemáte dostatečná práva na provedení této akce!" +msgstr "Nemáte dostatečná práva pro vytvoření rutiny" #: libraries/db_structure.lib.php:48 libraries/display_tbl.lib.php:2121 msgid "" @@ -5314,11 +5316,11 @@ msgstr "Geometrie" #: libraries/display_tbl.lib.php:643 msgid "Well Known Text" -msgstr "" +msgstr "Text (WKT)" #: libraries/display_tbl.lib.php:644 msgid "Well Known Binary" -msgstr "" +msgstr "Binární (WKB)" #: libraries/display_tbl.lib.php:1288 msgid "Copy" @@ -5375,27 +5377,26 @@ msgid "Link not found" msgstr "Odkaz nenalezen" #: libraries/display_triggers.inc.php:35 -#, fuzzy, php-format +#, php-format #| msgid "Export contents" msgid "Export of trigger %s" -msgstr "Exportovat obsah" +msgstr "Exportovat spoušť %s" #: libraries/display_triggers.inc.php:39 #, php-format msgid "Export of trigger \"%s\"" -msgstr "" +msgstr "Export spouště „%s“" #: libraries/display_triggers.inc.php:47 -#, fuzzy, php-format +#, php-format #| msgid "No valid image path for theme %s found!" msgid "No trigger with name %s found" -msgstr "Nebyla nalezena platná cesta k obrázkům pro vzhled %s!" +msgstr "Spoušť se jménem %s nebyla nalezena" #: libraries/display_triggers.inc.php:64 libraries/display_triggers.inc.php:66 -#, fuzzy #| msgid "There are no files to upload" msgid "There are no triggers to display." -msgstr "Nebyl zvolen žádný soubor pro nahrání" +msgstr "Nebyly nalezeny žádné spouště." #: libraries/display_triggers.inc.php:77 server_status.php:800 sql.php:936 msgid "Time" @@ -5406,10 +5407,9 @@ msgid "Event" msgstr "Událost" #: libraries/display_triggers.inc.php:120 -#, fuzzy #| msgid "Add a new server" msgid "Add a trigger" -msgstr "Přidat nový server" +msgstr "Přidat spoušť" #: libraries/engines/bdb.lib.php:20 main.php:211 msgid "Version information" @@ -6160,10 +6160,9 @@ msgid "Open new phpMyAdmin window" msgstr "Otevřít nové okno phpMyAdmina" #: libraries/gis_visualization.lib.php:129 -#, fuzzy #| msgid "No data found for the chart." msgid "No data found for GIS visualization." -msgstr "Nebyla nalezena žádná data pro graf." +msgstr "Nebyla nalezena žádná data zobrazení GIS." #: libraries/header_printview.inc.php:49 libraries/header_printview.inc.php:54 msgid "SQL result" @@ -7171,10 +7170,9 @@ msgid "PARTITION definition" msgstr "Definice PARTITION" #: libraries/tbl_properties.inc.php:776 -#, fuzzy #| msgid "+ Add a new value" msgid "+ Add a value" -msgstr "+ Přidat novou hodnotu" +msgstr "+ Přidat hodnotu" #: libraries/transformations/application_octetstream__download.inc.php:9 msgid "" @@ -8588,10 +8586,9 @@ msgid "All status variables" msgstr "Všechny stavové proměnné" #: server_status.php:413 server_status.php:439 -#, fuzzy #| msgid "Refresh rate" msgid "Refresh rate:" -msgstr "Obnovovací frekvence" +msgstr "Obnovovací frekvence:" #: server_status.php:462 msgid "Containing the word:" @@ -9465,7 +9462,7 @@ msgstr "" #: server_variables.php:58 msgid "Setting variable failed" -msgstr "" +msgstr "Nastavení proměnné selhalo" #: server_variables.php:77 msgid "Server variables and settings" @@ -9969,10 +9966,9 @@ msgid "View dump (schema) of table" msgstr "Export tabulky" #: tbl_gis_visualization.php:111 -#, fuzzy #| msgid "Display servers selection" msgid "Display GIS Visualization" -msgstr "Zobrazit výběr serverů" +msgstr "Zobrazit GIS data" #: tbl_gis_visualization.php:157 msgid "Width" @@ -9983,42 +9979,37 @@ msgid "Height" msgstr "Výška" #: tbl_gis_visualization.php:165 -#, fuzzy #| msgid "Textarea columns" msgid "Label column" -msgstr "Sloupců v textové oblasti" +msgstr "Název sloupce" #: tbl_gis_visualization.php:167 -#, fuzzy #| msgid "- none -" msgid "-- None --" -msgstr "- žádný -" +msgstr "-- Žádný --" #: tbl_gis_visualization.php:180 -#, fuzzy #| msgid "Total count" msgid "Spatial column" -msgstr "Celkový počet" +msgstr "Prostorový sloupec" #: tbl_gis_visualization.php:201 msgid "Use OpenStreetMaps as Base Layer" -msgstr "" +msgstr "Použít OpenStreetMap jako základní vrstvu" #: tbl_gis_visualization.php:204 msgid "Redraw" msgstr "Znovu vykreslit" #: tbl_gis_visualization.php:206 -#, fuzzy #| msgid "Save as file" msgid "Save to file" -msgstr "Uložit jako soubor" +msgstr "Uložit do souboru" #: tbl_gis_visualization.php:207 -#, fuzzy #| msgid "Table name" msgid "File name" -msgstr "Jméno tabulky" +msgstr "Jméno souboru" #: tbl_indexes.php:66 msgid "The name of the primary key must be \"PRIMARY\"!" @@ -10260,7 +10251,7 @@ msgstr "Seřadit podle:" #: tbl_structure.php:158 tbl_structure.php:163 tbl_structure.php:611 msgid "Spatial" -msgstr "" +msgstr "Prostorový" #: tbl_structure.php:165 tbl_structure.php:169 msgid "Browse distinct values" @@ -10279,10 +10270,9 @@ msgid "Add unique index" msgstr "Přidat unikátní index" #: tbl_structure.php:176 tbl_structure.php:177 -#, fuzzy #| msgid "Add index" msgid "Add SPATIAL index" -msgstr "Přidat index" +msgstr "Přidat prostorový index" #: tbl_structure.php:178 tbl_structure.php:179 msgid "Add FULLTEXT index" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3RC1-6236-gce706e0
by Michal Čihař 27 Jun '11

27 Jun '11

The branch, master has been updated via ce706e0b88cac465144660ce7568ffa805d50200 (commit) via 86906773f1e4a006eac46958cd5f3d305eb63ca0 (commit) from 6512841e1df0053930e96f96b274bc21c00af1a3 (commit) - Log ----------------------------------------------------------------- commit ce706e0b88cac465144660ce7568ffa805d50200 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Jun 27 10:30:29 2011 +0200 Update po files commit 86906773f1e4a006eac46958cd5f3d305eb63ca0 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Jun 27 10:29:25 2011 +0200 LC_ALL is the right one to override ----------------------------------------------------------------------- Summary of changes: po/af.po | 2 +- po/ar.po | 25 ++----------------------- po/az.po | 2 +- po/be.po | 2 +- po/be(a)latin.po | 2 +- po/bg.po | 2 +- po/bn.po | 2 +- po/br.po | 12 +++++++----- po/bs.po | 2 +- po/ca.po | 2 +- po/cs.po | 2 +- po/cy.po | 2 +- po/da.po | 2 +- po/de.po | 2 +- po/el.po | 2 +- po/en_GB.po | 8 +------- po/es.po | 8 +------- po/et.po | 2 +- po/eu.po | 2 +- po/fa.po | 2 +- po/fi.po | 2 +- po/fr.po | 6 +----- po/gl.po | 2 +- po/he.po | 2 +- po/hi.po | 2 +- po/hr.po | 2 +- po/hu.po | 2 +- po/id.po | 2 +- po/it.po | 2 +- po/ja.po | 2 +- po/ka.po | 2 +- po/ko.po | 2 +- po/lt.po | 2 +- po/lv.po | 2 +- po/mk.po | 2 +- po/ml.po | 2 +- po/mn.po | 2 +- po/ms.po | 2 +- po/nb.po | 2 +- po/nl.po | 2 +- po/phpmyadmin.pot | 2 +- po/pl.po | 2 +- po/pt.po | 2 +- po/pt_BR.po | 2 +- po/ro.po | 2 +- po/ru.po | 17 +++-------------- po/si.po | 2 +- po/sk.po | 2 +- po/sl.po | 3 +-- po/sq.po | 2 +- po/sr.po | 2 +- po/sr(a)latin.po | 2 +- po/sv.po | 53 +---------------------------------------------------- po/ta.po | 2 +- po/te.po | 2 +- po/th.po | 2 +- po/tr.po | 3 +-- po/tt.po | 2 +- po/ug.po | 2 +- po/uk.po | 2 +- po/ur.po | 2 +- po/uz.po | 2 +- po/uz(a)latin.po | 2 +- po/zh_CN.po | 2 +- po/zh_TW.po | 2 +- scripts/update-po | 2 +- 66 files changed, 75 insertions(+), 174 deletions(-) diff --git a/po/af.po b/po/af.po index 327e88b..fe02e65 100644 --- a/po/af.po +++ b/po/af.po @@ -3,7 +3,7 @@ msgid "" 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-06-27 10:20+0200\n" +"POT-Creation-Date: 2011-06-27 10:29+0200\n" "PO-Revision-Date: 2010-03-30 23:04+0200\n" "Last-Translator: Michal <michal(a)cihar.com>\n" "Language-Team: afrikaans <af(a)li.org>\n" diff --git a/po/ar.po b/po/ar.po index 6ae2589..49c86e1 100644 --- a/po/ar.po +++ b/po/ar.po @@ -3,7 +3,7 @@ msgid "" 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-06-27 10:20+0200\n" +"POT-Creation-Date: 2011-06-27 10:29+0200\n" "PO-Revision-Date: 2011-06-27 03:38+0200\n" "Last-Translator: Abdullah Al-Saedi <abdullah.10(a)windowslive.com>\n" "Language-Team: arabic <ar(a)li.org>\n" @@ -2590,8 +2590,7 @@ msgid "" "kbd] - allows newlines in columns" msgstr "" "يعرف أي أدوات التعديل تستخدم مع الأعمدة CHAR و VARCHAR ,,[kbd]input[/kbd] - " -"تسمح بمدخل محدود الطول ,, [kbd]textarea[/kbd] - تسمح بتعدد الأسطر في " -"العمود. " +"تسمح بمدخل محدود الطول ,, [kbd]textarea[/kbd] - تسمح بتعدد الأسطر في العمود. " #: libraries/config/messages.inc.php:33 msgid "CHAR columns editing" @@ -2648,7 +2647,6 @@ msgid "Debug SQL" msgstr "تصحيح SQL" #: libraries/config/messages.inc.php:45 -#| msgid "Relational schema" msgid "Default display direction" msgstr "إتجاه العرض الإفتراضي" @@ -2719,7 +2717,6 @@ msgid "" msgstr "تعطيل عمليات الصيانة , مثل تحسين وإصلاح جداول قاعدة البيانات." #: libraries/config/messages.inc.php:61 -#| msgid "Table maintenance" msgid "Disable multi table maintenance" msgstr "تعطيل صيانة الجداول المتعددة " @@ -2728,17 +2725,14 @@ msgid "Edit SQL queries in popup window" msgstr "تعديل إستعلام SQL في نافذة منبثقة" #: libraries/config/messages.inc.php:63 -#| msgid "Edit next row" msgid "Edit in window" msgstr "تعديل في نافذة" #: libraries/config/messages.inc.php:64 -#| msgid "Display Features" msgid "Display errors" msgstr "عرض الأخطاء" #: libraries/config/messages.inc.php:65 -#| msgid "errors." msgid "Gather errors" msgstr "جمع الأخطاء" @@ -2747,7 +2741,6 @@ msgid "Show icons for warning, error and information messages" msgstr "عرض الأيقونات لرسائل التحذير, الخطأ والمعلومات" #: libraries/config/messages.inc.php:67 -#| msgid "errors." msgid "Iconic errors" msgstr "أيقونة أخطاء" @@ -2787,21 +2780,18 @@ msgstr "الضغط" #: libraries/export/latex.php:72 libraries/export/ods.php:25 #: libraries/export/odt.php:58 libraries/export/texytext.php:28 #: libraries/export/xls.php:25 libraries/export/xlsx.php:25 -#| msgid "Put fields names in the first row" msgid "Put columns names in the first row" msgstr "ضع أسماء الحقول في السطر الأول" #: libraries/config/messages.inc.php:75 libraries/config/messages.inc.php:241 #: libraries/config/messages.inc.php:248 libraries/import/csv.php:76 #: libraries/import/ldi.php:42 -#| msgid "Fields enclosed by" msgid "Columns enclosed by" msgstr "حقل مضمن بـ" #: libraries/config/messages.inc.php:76 libraries/config/messages.inc.php:242 #: libraries/config/messages.inc.php:249 libraries/import/csv.php:81 #: libraries/import/ldi.php:43 -#| msgid "Fields escaped by" msgid "Columns escaped by" msgstr "حقل متجاهل بـ" @@ -2820,7 +2810,6 @@ msgstr "حذف CRLF من الأعمدة" #: libraries/config/messages.inc.php:79 libraries/config/messages.inc.php:245 #: libraries/config/messages.inc.php:253 libraries/import/csv.php:63 #: libraries/import/ldi.php:41 -#| msgid "Lines terminated by" msgid "Columns terminated by" msgstr "خطوط تنتهي بـ" @@ -2830,7 +2819,6 @@ msgid "Lines terminated by" msgstr "أسطر تنتهي بـ" #: libraries/config/messages.inc.php:82 -#| msgid "Excel edition" msgid "Excel edition" msgstr "إصدارة إكسل" @@ -2851,7 +2839,6 @@ msgstr "إسم قالب الجدول" #: libraries/config/messages.inc.php:143 libraries/export/htmlword.php:24 #: libraries/export/latex.php:40 libraries/export/odt.php:32 #: libraries/export/sql.php:116 libraries/export/texytext.php:23 -#| msgid "%s table(s)" msgid "Dump table" msgstr "إفراغ الجدول" @@ -2885,7 +2872,6 @@ msgid "Relations" msgstr "العلاقات" #: libraries/config/messages.inc.php:105 -#| msgid "Export type" msgid "Export method" msgstr "نوع التصدير" @@ -2903,7 +2889,6 @@ msgid "Remember file name template" msgstr "تذكر إسم قالب الملف" #: libraries/config/messages.inc.php:120 -#| msgid "Enclose table and field names with backquotes" msgid "Enclose table and column names with backquotes" msgstr "حماية أسماء الجداول و الحقول ب \"`\" " @@ -2933,7 +2918,6 @@ msgid "Use hexadecimal for BLOB" msgstr "إستخدم النظام الست عشري لـ BLOB" #: libraries/config/messages.inc.php:130 -#| msgid "Use delayed inserts" msgid "Use ignore inserts" msgstr "إستخدم الإضافات المتجاهلة" @@ -2946,7 +2930,6 @@ msgid "Maximal length of created query" msgstr "أقصى طول للإستعلام المنشئ" #: libraries/config/messages.inc.php:138 -#| msgid "Export" msgid "Export type" msgstr "نوع التصدير" @@ -3037,7 +3020,6 @@ msgid "Features" msgstr "مميزات" #: libraries/config/messages.inc.php:168 -#| msgid "Generate" msgid "General" msgstr "عام" @@ -3105,7 +3087,6 @@ msgid "Microsoft Office" msgstr "مايكروسوفت أوفيس" #: libraries/config/messages.inc.php:188 -#| msgid "Documentation" msgid "Open Document" msgstr "مستند مفتوح" @@ -3118,7 +3099,6 @@ msgid "Settings that didn't fit enywhere else" msgstr "الإعدادات التي لاتناسب في أي مكان آخر" #: libraries/config/messages.inc.php:192 -#| msgid "Page number:" msgid "Page titles" msgstr "عناوين الصفحة" @@ -3156,7 +3136,6 @@ msgid "Basic settings" msgstr "الإعدادات الأساسية" #: libraries/config/messages.inc.php:199 -#| msgid "Documentation" msgid "Authentication" msgstr "المصادقة" diff --git a/po/az.po b/po/az.po index 98d6b4b..4bbf9b2 100644 --- a/po/az.po +++ b/po/az.po @@ -3,7 +3,7 @@ msgid "" 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-06-27 10:20+0200\n" +"POT-Creation-Date: 2011-06-27 10:29+0200\n" "PO-Revision-Date: 2010-03-12 09:11+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: azerbaijani <az(a)li.org>\n" diff --git a/po/be.po b/po/be.po index 8bdca5e..7fdd1da 100644 --- a/po/be.po +++ b/po/be.po @@ -3,7 +3,7 @@ msgid "" 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-06-27 10:20+0200\n" +"POT-Creation-Date: 2011-06-27 10:29+0200\n" "PO-Revision-Date: 2010-03-12 09:12+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: belarusian_cyrillic <be(a)li.org>\n" diff --git a/po/be(a)latin.po b/po/be(a)latin.po index 0d80183..2362ec9 100644 --- a/po/be(a)latin.po +++ b/po/be(a)latin.po @@ -3,7 +3,7 @@ msgid "" 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-06-27 10:20+0200\n" +"POT-Creation-Date: 2011-06-27 10:29+0200\n" "PO-Revision-Date: 2010-03-30 23:09+0200\n" "Last-Translator: Michal <michal(a)cihar.com>\n" "Language-Team: belarusian_latin <be@latin@li.org>\n" diff --git a/po/bg.po b/po/bg.po index 44c70d0..d019183 100644 --- a/po/bg.po +++ b/po/bg.po @@ -3,7 +3,7 @@ msgid "" 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-06-27 10:20+0200\n" +"POT-Creation-Date: 2011-06-27 10:29+0200\n" "PO-Revision-Date: 2011-06-23 14:27+0200\n" "Last-Translator: <stoyanster(a)gmail.com>\n" "Language-Team: bulgarian <bg(a)li.org>\n" diff --git a/po/bn.po b/po/bn.po index 6df5fa4..1acb4dc 100644 --- a/po/bn.po +++ b/po/bn.po @@ -3,7 +3,7 @@ msgid "" 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-06-27 10:20+0200\n" +"POT-Creation-Date: 2011-06-27 10:29+0200\n" "PO-Revision-Date: 2010-10-21 01:36+0200\n" "Last-Translator: Nobin নবীন <nobin(a)cyberbogra.com>\n" "Language-Team: bangla <bn(a)li.org>\n" diff --git a/po/br.po b/po/br.po index bede9a3..25fab6d 100644 --- a/po/br.po +++ b/po/br.po @@ -7,7 +7,7 @@ msgid "" 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-06-27 10:20+0200\n" +"POT-Creation-Date: 2011-06-27 10:29+0200\n" "PO-Revision-Date: 2011-06-26 20:07+0200\n" "Last-Translator: <fulup.jakez(a)ofis-bzh.org>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -1041,7 +1041,8 @@ msgstr "Distreiñ" #: index.php:183 msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser." -msgstr "Un tamm aesoc'h eo phpMyAdmin gant ur merdeer a <b>skor ar frammoù</b>." +msgstr "" +"Un tamm aesoc'h eo phpMyAdmin gant ur merdeer a <b>skor ar frammoù</b>." #: js/messages.php:25 server_synchronize.php:340 server_synchronize.php:352 #: server_synchronize.php:368 server_synchronize.php:375 @@ -1311,7 +1312,8 @@ msgstr "O tiverkañ" #: js/messages.php:122 msgid "The definition of a stored function must contain a RETURN statement!" -msgstr "Bez' e rank bezañ un embannadenn RETURN e termenadur un arc'hwel stoket" +msgstr "" +"Bez' e rank bezañ un embannadenn RETURN e termenadur un arc'hwel stoket" #: js/messages.php:123 msgid "Value too long in the form!" @@ -1722,8 +1724,8 @@ msgid "" "Error moving the uploaded file, see [a@./Documentation." "html#faq1_11@Documentation]FAQ 1.11[/a]" msgstr "" -"Fazi en ur zilec'hiañ ar restr pellgarget; gwelet " -"[a@./Documentation.html#faq1_11@Documentation]FAQ 1.11[/a]" +"Fazi en ur zilec'hiañ ar restr pellgarget; gwelet [a@./Documentation." +"html#faq1_11@Documentation]FAQ 1.11[/a]" #: libraries/Index.class.php:430 tbl_relation.php:526 msgid "No index defined!" diff --git a/po/bs.po b/po/bs.po index 383ee46..92c90b6 100644 --- a/po/bs.po +++ b/po/bs.po @@ -3,7 +3,7 @@ msgid "" 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-06-27 10:20+0200\n" +"POT-Creation-Date: 2011-06-27 10:29+0200\n" "PO-Revision-Date: 2010-03-12 09:12+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: bosnian <bs(a)li.org>\n" diff --git a/po/ca.po b/po/ca.po index c35e45c..2b373da 100644 --- a/po/ca.po +++ b/po/ca.po @@ -3,7 +3,7 @@ msgid "" 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-06-27 10:20+0200\n" +"POT-Creation-Date: 2011-06-27 10:29+0200\n" "PO-Revision-Date: 2011-02-23 09:57+0200\n" "Last-Translator: Xavier Navarro <xvnavarro(a)gmail.com>\n" "Language-Team: catalan <ca(a)li.org>\n" diff --git a/po/cs.po b/po/cs.po index 2053225..04dae59 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,7 +6,7 @@ msgid "" 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-06-27 10:20+0200\n" +"POT-Creation-Date: 2011-06-27 10:29+0200\n" "PO-Revision-Date: 2011-06-24 13:53+0200\n" "Last-Translator: Michal Čihař <michal(a)cihar.com>\n" "Language-Team: czech <cs(a)li.org>\n" diff --git a/po/cy.po b/po/cy.po index ece666e..d1d1af3 100644 --- a/po/cy.po +++ b/po/cy.po @@ -6,7 +6,7 @@ msgid "" 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-06-27 10:20+0200\n" +"POT-Creation-Date: 2011-06-27 10:29+0200\n" "PO-Revision-Date: 2011-05-19 21:21+0200\n" "Last-Translator: <ardavies(a)tiscali.co.uk>\n" "Language-Team: Welsh <cy(a)li.org>\n" diff --git a/po/da.po b/po/da.po index 00fe18c..6a50e1c 100644 --- a/po/da.po +++ b/po/da.po @@ -3,7 +3,7 @@ msgid "" 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-06-27 10:20+0200\n" +"POT-Creation-Date: 2011-06-27 10:29+0200\n" "PO-Revision-Date: 2011-03-07 01:17+0200\n" "Last-Translator: <hjortholm(a)gmail.com>\n" "Language-Team: danish <da(a)li.org>\n" diff --git a/po/de.po b/po/de.po index b861a00..c6e5454 100644 --- a/po/de.po +++ b/po/de.po @@ -3,7 +3,7 @@ msgid "" 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-06-27 10:20+0200\n" +"POT-Creation-Date: 2011-06-27 10:29+0200\n" "PO-Revision-Date: 2011-04-23 04:28+0200\n" "Last-Translator: Dominik Geyer <dominik.geyer(a)gmx.de>\n" "Language-Team: german <de(a)li.org>\n" diff --git a/po/el.po b/po/el.po index ab0f743..910018c 100644 --- a/po/el.po +++ b/po/el.po @@ -3,7 +3,7 @@ msgid "" 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-06-27 10:20+0200\n" +"POT-Creation-Date: 2011-06-27 10:29+0200\n" "PO-Revision-Date: 2011-06-23 10:24+0200\n" "Last-Translator: Panagiotis Papazoglou <papaz_p(a)yahoo.com>\n" "Language-Team: greek <el(a)li.org>\n" diff --git a/po/en_GB.po b/po/en_GB.po index fd703e6..32f2201 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -3,7 +3,7 @@ msgid "" 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-06-27 10:20+0200\n" +"POT-Creation-Date: 2011-06-27 10:29+0200\n" "PO-Revision-Date: 2011-06-26 13:27+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: english-gb <en_GB(a)li.org>\n" @@ -524,7 +524,6 @@ msgstr "MySQL returned an empty result set (i.e. zero rows)." #: db_routines.php:192 db_routines.php:297 db_routines.php:302 #: db_routines.php:326 #, php-format -#| msgid "The following queries have been executed:" msgid "The following query has failed: \"%s\"" msgstr "The following query has failed: \"%s\"" @@ -541,7 +540,6 @@ msgstr "Error in processing request" #: db_routines.php:211 db_routines.php:243 db_routines.php:271 #: db_routines.php:410 #, php-format -#| msgid "No routine with name %s found in database %s" msgid "No routine with name %1$s found in database %2$s" msgstr "No routine with name %1$s found in database %2$s" @@ -2082,14 +2080,10 @@ msgid "Check Privileges" msgstr "Check Privileges" #: libraries/common.inc.php:587 -#| msgid "Failed to to read configuration file" msgid "Failed to read configuration file" msgstr "Failed to read configuration file" #: libraries/common.inc.php:588 -#| msgid "" -#| "This usually means there is a syntax error in it, please check any errors " -#| "shown bellow." msgid "" "This usually means there is a syntax error in it, please check any errors " "shown below." diff --git a/po/es.po b/po/es.po index 65b81ba..b888b82 100644 --- a/po/es.po +++ b/po/es.po @@ -3,7 +3,7 @@ msgid "" 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-06-27 10:20+0200\n" +"POT-Creation-Date: 2011-06-27 10:29+0200\n" "PO-Revision-Date: 2011-06-24 23:09+0200\n" "Last-Translator: Matías Bellone <matiasbellone(a)gmail.com>\n" "Language-Team: spanish <es(a)li.org>\n" @@ -527,7 +527,6 @@ msgstr "" #: db_routines.php:192 db_routines.php:297 db_routines.php:302 #: db_routines.php:326 #, php-format -#| msgid "The following queries have been executed:" msgid "The following query has failed: \"%s\"" msgstr "Falló la siguiente consulta: \"%s\"" @@ -544,7 +543,6 @@ msgstr "Error al procesar la petición" #: db_routines.php:211 db_routines.php:243 db_routines.php:271 #: db_routines.php:410 #, php-format -#| msgid "No routine with name %s found in database %s" msgid "No routine with name %1$s found in database %2$s" msgstr "No se encontró rutina con nombre %1$s en la base de datos %2$s" @@ -2107,14 +2105,10 @@ msgid "Check Privileges" msgstr "Comprobar los privilegios" #: libraries/common.inc.php:587 -#| msgid "Failed to to read configuration file" msgid "Failed to read configuration file" msgstr "No se pudo leer el archivo de configuración" #: libraries/common.inc.php:588 -#| msgid "" -#| "This usually means there is a syntax error in it, please check any errors " -#| "shown bellow." msgid "" "This usually means there is a syntax error in it, please check any errors " "shown below." diff --git a/po/et.po b/po/et.po index 2906b36..e216391 100644 --- a/po/et.po +++ b/po/et.po @@ -3,7 +3,7 @@ msgid "" 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-06-27 10:20+0200\n" +"POT-Creation-Date: 2011-06-27 10:29+0200\n" "PO-Revision-Date: 2010-03-12 09:14+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: estonian <et(a)li.org>\n" diff --git a/po/eu.po b/po/eu.po index 07e09e8..51f6955 100644 --- a/po/eu.po +++ b/po/eu.po @@ -3,7 +3,7 @@ msgid "" 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-06-27 10:20+0200\n" +"POT-Creation-Date: 2011-06-27 10:29+0200\n" "PO-Revision-Date: 2010-07-21 14:53+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: basque <eu(a)li.org>\n" diff --git a/po/fa.po b/po/fa.po index 58d8215..eaff7fc 100644 --- a/po/fa.po +++ b/po/fa.po @@ -3,7 +3,7 @@ msgid "" 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-06-27 10:20+0200\n" +"POT-Creation-Date: 2011-06-27 10:29+0200\n" "PO-Revision-Date: 2010-05-19 03:54+0200\n" "Last-Translator: <ahmad_usa2007(a)yahoo.com>\n" "Language-Team: persian <fa(a)li.org>\n" diff --git a/po/fi.po b/po/fi.po index 4d5a527..64a3d31 100644 --- a/po/fi.po +++ b/po/fi.po @@ -3,7 +3,7 @@ msgid "" 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-06-27 10:20+0200\n" +"POT-Creation-Date: 2011-06-27 10:29+0200\n" "PO-Revision-Date: 2010-11-26 21:29+0200\n" "Last-Translator: <asdfsdf(a)asdfasdfasdf.com>\n" "Language-Team: finnish <fi(a)li.org>\n" diff --git a/po/fr.po b/po/fr.po index 2775672..a64cc20 100644 --- a/po/fr.po +++ b/po/fr.po @@ -3,7 +3,7 @@ msgid "" 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-06-27 10:20+0200\n" +"POT-Creation-Date: 2011-06-27 10:29+0200\n" "PO-Revision-Date: 2011-06-26 13:35+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: french <fr(a)li.org>\n" @@ -525,7 +525,6 @@ msgstr "MySQL a retourné un résultat vide (aucune ligne)." #: db_routines.php:192 db_routines.php:297 db_routines.php:302 #: db_routines.php:326 #, php-format -#| msgid "The following queries have been executed:" msgid "The following query has failed: \"%s\"" msgstr "La requête «%s» a échoué" @@ -4782,7 +4781,6 @@ msgid "Turn it off" msgstr "Le désactiver" #: libraries/db_events.inc.php:141 -#| msgid "Add a new server" msgid "Add an event" msgstr "Ajouter un évènement." @@ -5446,7 +5444,6 @@ msgid "Event" msgstr "Événement" #: libraries/display_triggers.inc.php:120 -#| msgid "Add a new server" msgid "Add a trigger" msgstr "Ajouter un déclencheur" @@ -10116,7 +10113,6 @@ msgid "Label column" msgstr "Colonne pour étiquette" #: tbl_gis_visualization.php:167 -#| msgid "- none -" msgid "-- None --" msgstr "-- Aucun --" diff --git a/po/gl.po b/po/gl.po index da03cfd..281b376 100644 --- a/po/gl.po +++ b/po/gl.po @@ -3,7 +3,7 @@ msgid "" 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-06-27 10:20+0200\n" +"POT-Creation-Date: 2011-06-27 10:29+0200\n" "PO-Revision-Date: 2010-07-21 14:50+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: galician <gl(a)li.org>\n" diff --git a/po/he.po b/po/he.po index dddff73..73ccc61 100644 --- a/po/he.po +++ b/po/he.po @@ -3,7 +3,7 @@ msgid "" 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-06-27 10:20+0200\n" +"POT-Creation-Date: 2011-06-27 10:29+0200\n" "PO-Revision-Date: 2011-03-02 20:17+0200\n" "Last-Translator: <zippoxer(a)gmail.com>\n" "Language-Team: hebrew <he(a)li.org>\n" diff --git a/po/hi.po b/po/hi.po index f9a0ecb..bcb38d9 100644 --- a/po/hi.po +++ b/po/hi.po @@ -3,7 +3,7 @@ msgid "" 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-06-27 10:20+0200\n" +"POT-Creation-Date: 2011-06-27 10:29+0200\n" "PO-Revision-Date: 2011-05-06 09:13+0200\n" "Last-Translator: <manojonemail(a)gmail.com>\n" "Language-Team: hindi <hi(a)li.org>\n" diff --git a/po/hr.po b/po/hr.po index d3afa8d..bc2561b 100644 --- a/po/hr.po +++ b/po/hr.po @@ -3,7 +3,7 @@ msgid "" 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-06-27 10:20+0200\n" +"POT-Creation-Date: 2011-06-27 10:29+0200\n" "PO-Revision-Date: 2010-07-21 14:54+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: croatian <hr(a)li.org>\n" diff --git a/po/hu.po b/po/hu.po index 05e02f7..1178ed6 100644 --- a/po/hu.po +++ b/po/hu.po @@ -3,7 +3,7 @@ msgid "" 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-06-27 10:20+0200\n" +"POT-Creation-Date: 2011-06-27 10:29+0200\n" "PO-Revision-Date: 2011-05-27 18:52+0200\n" "Last-Translator: <slygyor(a)gmail.com>\n" "Language-Team: hungarian <hu(a)li.org>\n" diff --git a/po/id.po b/po/id.po index f542a3f..1a3510f 100644 --- a/po/id.po +++ b/po/id.po @@ -3,7 +3,7 @@ msgid "" 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-06-27 10:20+0200\n" +"POT-Creation-Date: 2011-06-27 10:29+0200\n" "PO-Revision-Date: 2011-06-18 11:34+0200\n" "Last-Translator: <udin.mx(a)gmail.com>\n" "Language-Team: indonesian <id(a)li.org>\n" diff --git a/po/it.po b/po/it.po index 6204dc0..6f1eef1 100644 --- a/po/it.po +++ b/po/it.po @@ -3,7 +3,7 @@ msgid "" 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-06-27 10:20+0200\n" +"POT-Creation-Date: 2011-06-27 10:29+0200\n" "PO-Revision-Date: 2011-06-23 11:55+0200\n" "Last-Translator: Rouslan Placella <rouslan(a)placella.com>\n" "Language-Team: italian <it(a)li.org>\n" diff --git a/po/ja.po b/po/ja.po index e8080d6..7b1faa8 100644 --- a/po/ja.po +++ b/po/ja.po @@ -3,7 +3,7 @@ msgid "" 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-06-27 10:20+0200\n" +"POT-Creation-Date: 2011-06-27 10:29+0200\n" "PO-Revision-Date: 2011-06-23 12:13+0200\n" "Last-Translator: Yuichiro <yuichiro(a)pop07.odn.ne.jp>\n" "Language-Team: japanese <jp(a)li.org>\n" diff --git a/po/ka.po b/po/ka.po index b9b009f..c26f62c 100644 --- a/po/ka.po +++ b/po/ka.po @@ -3,7 +3,7 @@ msgid "" 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-06-27 10:20+0200\n" +"POT-Creation-Date: 2011-06-27 10:29+0200\n" "PO-Revision-Date: 2010-03-12 09:14+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: georgian <ka(a)li.org>\n" diff --git a/po/ko.po b/po/ko.po index 6a882ee..b016858 100644 --- a/po/ko.po +++ b/po/ko.po @@ -3,7 +3,7 @@ msgid "" 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-06-27 10:20+0200\n" +"POT-Creation-Date: 2011-06-27 10:29+0200\n" "PO-Revision-Date: 2010-06-16 18:18+0200\n" "Last-Translator: <cihar(a)nvyu.net>\n" "Language-Team: korean <ko(a)li.org>\n" diff --git a/po/lt.po b/po/lt.po index 50533c0..1b38a0a 100644 --- a/po/lt.po +++ b/po/lt.po @@ -3,7 +3,7 @@ msgid "" 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-06-27 10:20+0200\n" +"POT-Creation-Date: 2011-06-27 10:29+0200\n" "PO-Revision-Date: 2011-04-05 15:52+0200\n" "Last-Translator: Kęstutis <forkik(a)gmail.com>\n" "Language-Team: lithuanian <lt(a)li.org>\n" diff --git a/po/lv.po b/po/lv.po index 7d6b7ff..fb3f6a5 100644 --- a/po/lv.po +++ b/po/lv.po @@ -3,7 +3,7 @@ msgid "" 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-06-27 10:20+0200\n" +"POT-Creation-Date: 2011-06-27 10:29+0200\n" "PO-Revision-Date: 2010-03-12 09:16+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: latvian <lv(a)li.org>\n" diff --git a/po/mk.po b/po/mk.po index 61941d5..2213346 100644 --- a/po/mk.po +++ b/po/mk.po @@ -3,7 +3,7 @@ msgid "" 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-06-27 10:20+0200\n" +"POT-Creation-Date: 2011-06-27 10:29+0200\n" "PO-Revision-Date: 2011-05-19 17:04+0200\n" "Last-Translator: <sjanevski(a)gmail.com>\n" "Language-Team: macedonian_cyrillic <mk(a)li.org>\n" diff --git a/po/ml.po b/po/ml.po index 2e5090a..988b4c9 100644 --- a/po/ml.po +++ b/po/ml.po @@ -5,7 +5,7 @@ msgid "" 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-06-27 10:20+0200\n" +"POT-Creation-Date: 2011-06-27 10:29+0200\n" "PO-Revision-Date: 2011-02-10 14:03+0100\n" "Last-Translator: Michal Čihař <michal(a)cihar.com>\n" "Language-Team: Malayalam <ml(a)li.org>\n" diff --git a/po/mn.po b/po/mn.po index f18c3f0..d0de163 100644 --- a/po/mn.po +++ b/po/mn.po @@ -3,7 +3,7 @@ msgid "" 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-06-27 10:20+0200\n" +"POT-Creation-Date: 2011-06-27 10:29+0200\n" "PO-Revision-Date: 2010-03-12 09:17+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: mongolian <mn(a)li.org>\n" diff --git a/po/ms.po b/po/ms.po index 868eee1..555f608 100644 --- a/po/ms.po +++ b/po/ms.po @@ -3,7 +3,7 @@ msgid "" 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-06-27 10:20+0200\n" +"POT-Creation-Date: 2011-06-27 10:29+0200\n" "PO-Revision-Date: 2010-03-12 09:17+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: malay <ms(a)li.org>\n" diff --git a/po/nb.po b/po/nb.po index 6ad19c1..35f6586 100644 --- a/po/nb.po +++ b/po/nb.po @@ -3,7 +3,7 @@ msgid "" 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-06-27 10:20+0200\n" +"POT-Creation-Date: 2011-06-27 10:29+0200\n" "PO-Revision-Date: 2011-03-07 11:21+0200\n" "Last-Translator: Michal Čihař <michal(a)cihar.com>\n" "Language-Team: norwegian <no(a)li.org>\n" diff --git a/po/nl.po b/po/nl.po index a9c4448..f8bba31 100644 --- a/po/nl.po +++ b/po/nl.po @@ -3,7 +3,7 @@ msgid "" 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-06-27 10:20+0200\n" +"POT-Creation-Date: 2011-06-27 10:29+0200\n" "PO-Revision-Date: 2011-06-04 15:19+0200\n" "Last-Translator: Dieter Adriaenssens <ruleant(a)users.sourceforge.net>\n" "Language-Team: dutch <nl(a)li.org>\n" diff --git a/po/phpmyadmin.pot b/po/phpmyadmin.pot index d2f0d2b..f13801e 100644 --- a/po/phpmyadmin.pot +++ b/po/phpmyadmin.pot @@ -8,7 +8,7 @@ msgid "" 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-06-27 10:20+0200\n" +"POT-Creation-Date: 2011-06-27 10:29+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" diff --git a/po/pl.po b/po/pl.po index 6994153..00300c3 100644 --- a/po/pl.po +++ b/po/pl.po @@ -3,7 +3,7 @@ msgid "" 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-06-27 10:20+0200\n" +"POT-Creation-Date: 2011-06-27 10:29+0200\n" "PO-Revision-Date: 2011-02-24 16:21+0200\n" "Last-Translator: Michal Čihař <michal(a)cihar.com>\n" "Language-Team: polish <pl(a)li.org>\n" diff --git a/po/pt.po b/po/pt.po index c613b5f..ea3fcb0 100644 --- a/po/pt.po +++ b/po/pt.po @@ -3,7 +3,7 @@ msgid "" 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-06-27 10:20+0200\n" +"POT-Creation-Date: 2011-06-27 10:29+0200\n" "PO-Revision-Date: 2011-03-26 03:23+0200\n" "Last-Translator: <efgpinto(a)gmail.com>\n" "Language-Team: portuguese <pt(a)li.org>\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index ffbf533..3b28f6e 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -3,7 +3,7 @@ msgid "" 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-06-27 10:20+0200\n" +"POT-Creation-Date: 2011-06-27 10:29+0200\n" "PO-Revision-Date: 2011-06-15 13:55+0200\n" "Last-Translator: Jose Ivan Bezerra Vilarouca Filho <joseivan(a)lavid.ufpb.br>\n" "Language-Team: brazilian_portuguese <pt_BR(a)li.org>\n" diff --git a/po/ro.po b/po/ro.po index 6cd47e8..db1d88d 100644 --- a/po/ro.po +++ b/po/ro.po @@ -3,7 +3,7 @@ msgid "" 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-06-27 10:20+0200\n" +"POT-Creation-Date: 2011-06-27 10:29+0200\n" "PO-Revision-Date: 2010-07-22 02:28+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: romanian <ro(a)li.org>\n" diff --git a/po/ru.po b/po/ru.po index ef2375c..4da0b36 100644 --- a/po/ru.po +++ b/po/ru.po @@ -3,7 +3,7 @@ msgid "" 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-06-27 10:20+0200\n" +"POT-Creation-Date: 2011-06-27 10:29+0200\n" "PO-Revision-Date: 2011-06-24 21:23+0200\n" "Last-Translator: Victor Volkov <hanut(a)php-myadmin.ru>\n" "Language-Team: russian <ru(a)li.org>\n" @@ -11,8 +11,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" -"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Pootle 2.0.5\n" #: browse_foreigners.php:35 browse_foreigners.php:53 @@ -517,7 +517,6 @@ msgstr[2] "Последним выражением в процедуре был #: db_routines.php:167 #, php-format -#| msgid "Allows executing stored routines." msgid "Execution results of routine %s" msgstr "Результаты выполнения процедуры %s" @@ -529,7 +528,6 @@ msgstr "MySQL вернула пустой результат (т.е. ноль с #: db_routines.php:192 db_routines.php:297 db_routines.php:302 #: db_routines.php:326 #, php-format -#| msgid "The following queries have been executed:" msgid "The following query has failed: \"%s\"" msgstr "Данный запрос не был выполнен: \"%s\"" @@ -540,14 +538,12 @@ msgstr "Ответ MySQL: " #: db_routines.php:210 db_routines.php:242 db_routines.php:270 #: db_routines.php:409 -#| msgid "Error in Processing Request" msgid "Error in processing request" msgstr "Ошибка при обработке запроса" #: db_routines.php:211 db_routines.php:243 db_routines.php:271 #: db_routines.php:410 #, php-format -#| msgid "No tables found in database" msgid "No routine with name %1$s found in database %2$s" msgstr "В базе данных %2$s процедура с именем %1$s не найдена" @@ -557,13 +553,11 @@ msgstr "Выполнить процедуру" #: db_routines.php:261 db_routines.php:265 #, php-format -#| msgid "Export defaults" msgid "Export of routine %s" msgstr "Экспорт процедуры %s" #: db_routines.php:290 libraries/db_routines.lib.php:960 #, php-format -#| msgid "Invalid server index: %s" msgid "Invalid routine type: \"%s\"" msgstr "Ошибочный тип процедуры: \"%s\"" @@ -577,13 +571,11 @@ msgstr "Сохраненный запрос был:" #: db_routines.php:316 #, php-format -#| msgid "Column %s has been dropped" msgid "Routine %1$s has been modified." msgstr "Была изменена процедура %1$s." #: db_routines.php:329 #, php-format -#| msgid "Table %1$s has been created." msgid "Routine %1$s has been created." msgstr "Была создана процедура %1$s." @@ -592,12 +584,10 @@ msgid "<b>One or more errors have occured while processing your request:</b>" msgstr "<b>При обработке вашего запроса были об your request:</b>" البيانات.""�b�+��b�+�P��PQ��b�+Ȕ�b�+�$�b�+��c�+PQ�� d�+`F��0E��-�b�+6 ��!�!�P��PQ��x��c�+`G��"�b�+.�b�+�P��b�+Q��^d�+��b�+�^d�+ش^d�+��^d�+Ȕ�b�+x��c�+`G��0F��-�b�+�!�!�P��PQ��ȍ�c�+@H��"�b�+.�b�+�P��b�+Q��Q��Q��+�b�+�p�PQ��b�+Ȕ�b�+@H��G��-�b�+GHIJKMNOP�P��PQ��HE�c�+�I��"�b�+.�b�+�P��0�^d�+��b�+��c�+�y�c�+�^d�+ش^d�+��^d�+Ȕ�b�+HE�c�+�I�� H��-�b�+8E�c�+�I��PH��-�b�+(E�c�+�I��H��-�b�+E�c�+�I��H��-�b�+ ��^d�+��b�+��^d�+0C��Ȏc�+��b�+ش^d�+PI��yȎc�+��b�+�^d�+�I��ZȎc�+��b�+�t�c�+��c�+�y�c�+�^d�+��c�+ش^d�+��^d�+Ȕ�b�+ཌc�+K��I��-�b�+#%')*-.035678:<=�P��PQ��p�Xc�+ L��"�b�+8��c�+��b�+��c�+��c�+Ȕ�b�+cf=%c�+PQ��p�Xc�+ L��J��-�b�+�%��wq�-��s��,~9��u]�� 4Q��U^Qʉ��u��*ēv��*c�+�R��F��d�+F��d�+?%(c�+PR��I��pM��=%c�+��b�+�$�b�+�S��B��d�+�R��Q��b�+PQ��B��d�+XQ��-�bнаружены ошибки:</b>" #: db_routines.php:381 -#| msgid "Create relation" msgid "Create routine" msgstr "Создать процедуру" #: db_routines.php:385 -#| msgid "Edit mode" msgid "Edit routine" msgstr "Изменить процедуру" @@ -684,7 +674,6 @@ msgid "Search in database" msgstr "Поиск в базе данных" #: db_search.php:300 -#| msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgid "Words or values to search for (wildcard: \"%\"):" msgstr "Слова или значения для поиска (групповой символ: \"%\"):" diff --git a/po/si.po b/po/si.po index 7c5e0ac..916d88a 100644 --- a/po/si.po +++ b/po/si.po @@ -3,7 +3,7 @@ msgid "" 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-06-27 10:20+0200\n" +"POT-Creation-Date: 2011-06-27 10:29+0200\n" "PO-Revision-Date: 2011-06-04 15:35+0200\n" "Last-Translator: Madhura Jayaratne <madhura.cj(a)gmail.com>\n" "Language-Team: sinhala <si(a)li.org>\n" diff --git a/po/sk.po b/po/sk.po index e18de44..de9b0bd 100644 --- a/po/sk.po +++ b/po/sk.po @@ -3,7 +3,7 @@ msgid "" 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-06-27 10:20+0200\n" +"POT-Creation-Date: 2011-06-27 10:29+0200\n" "PO-Revision-Date: 2011-06-03 14:53+0200\n" "Last-Translator: Martin Lacina <martin(a)whistler.sk>\n" "Language-Team: slovak <sk(a)li.org>\n" diff --git a/po/sl.po b/po/sl.po index 9fc59bc..dd82dbd 100644 --- a/po/sl.po +++ b/po/sl.po @@ -3,7 +3,7 @@ msgid "" 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-06-27 10:20+0200\n" +"POT-Creation-Date: 2011-06-27 10:29+0200\n" "PO-Revision-Date: 2011-06-25 10:41+0200\n" "Last-Translator: Domen <dbc334(a)gmail.com>\n" "Language-Team: slovenian <sl(a)li.org>\n" @@ -528,7 +528,6 @@ msgstr "MySQL je vrnil kot rezultat prazno množico (npr. nič vrstic)." #: db_routines.php:192 db_routines.php:297 db_routines.php:302 #: db_routines.php:326 #, php-format -#| msgid "The following queries have been executed:" msgid "The following query has failed: \"%s\"" msgstr "Naslednja poizvedba je spodletela: \"%s\"" diff --git a/po/sq.po b/po/sq.po index f2227b6..6e35d1f 100644 --- a/po/sq.po +++ b/po/sq.po @@ -3,7 +3,7 @@ msgid "" 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-06-27 10:20+0200\n" +"POT-Creation-Date: 2011-06-27 10:29+0200\n" "PO-Revision-Date: 2010-07-21 14:51+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: albanian <sq(a)li.org>\n" diff --git a/po/sr.po b/po/sr.po index 3d5f075..53b7792 100644 --- a/po/sr.po +++ b/po/sr.po @@ -3,7 +3,7 @@ msgid "" 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-06-27 10:20+0200\n" +"POT-Creation-Date: 2011-06-27 10:29+0200\n" "PO-Revision-Date: 2011-04-06 18:43+0200\n" "Last-Translator: <theranchcowboy(a)googlemail.com>\n" "Language-Team: serbian_cyrillic <sr(a)li.org>\n" diff --git a/po/sr(a)latin.po b/po/sr(a)latin.po index d69009f..9e5f134 100644 --- a/po/sr(a)latin.po +++ b/po/sr(a)latin.po @@ -3,7 +3,7 @@ msgid "" 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-06-27 10:20+0200\n" +"POT-Creation-Date: 2011-06-27 10:29+0200\n" "PO-Revision-Date: 2010-12-02 14:49+0200\n" "Last-Translator: Sasa Kostic <sasha.kostic(a)gmail.com>\n" "Language-Team: serbian_latin <sr@latin@li.org>\n" diff --git a/po/sv.po b/po/sv.po index 808c989..63321b1 100644 --- a/po/sv.po +++ b/po/sv.po @@ -3,7 +3,7 @@ msgid "" 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-06-27 10:20+0200\n" +"POT-Creation-Date: 2011-06-27 10:29+0200\n" "PO-Revision-Date: 2011-06-25 01:19+0200\n" "Last-Translator: <stefan(a)inkopsforum.se>\n" "Language-Team: swedish <sv(a)li.org>\n" @@ -512,7 +512,6 @@ msgstr[1] "%d rader berörs av det sista uttrycket inom proceduren" #: db_routines.php:167 #, php-format -#| msgid "Allows executing stored routines." msgid "Execution results of routine %s" msgstr "Exekveringsresultat av rutin %s" @@ -524,7 +523,6 @@ msgstr "MySQL returnerade ett tomt resultat (dvs inga rader)." #: db_routines.php:192 db_routines.php:297 db_routines.php:302 #: db_routines.php:326 #, php-format -#| msgid "The following queries have been executed:" msgid "The following query has failed: \"%s\"" msgstr "Följande fråga har fallerat: \"%s\"" @@ -535,14 +533,12 @@ msgstr "MySQL sa: " #: db_routines.php:210 db_routines.php:242 db_routines.php:270 #: db_routines.php:409 -#| msgid "Error in Processing Request" msgid "Error in processing request" msgstr "Fel i utförandebegäran" #: db_routines.php:211 db_routines.php:243 db_routines.php:271 #: db_routines.php:410 #, php-format -#| msgid "No tables found in database" msgid "No routine with name %1$s found in database %2$s" msgstr "Ingen rutin med namnet %1$s finns i databasen %2$s" @@ -552,13 +548,11 @@ msgstr "Utför rutin" #: db_routines.php:261 db_routines.php:265 #, php-format -#| msgid "Export defaults" msgid "Export of routine %s" msgstr "Exportera rutin %s" #: db_routines.php:290 libraries/db_routines.lib.php:960 #, php-format -#| msgid "Invalid server index: %s" msgid "Invalid routine type: \"%s\"" msgstr "Ogiltig rutintyp: \"%s\"" @@ -572,13 +566,11 @@ msgstr "Den säkerhetskopierade frågan var:" #: db_routines.php:316 #, php-format -#| msgid "Column %s has been dropped" msgid "Routine %1$s has been modified." msgstr "Rutinen %1$s har modifierats." #: db_routines.php:329 #, php-format -#| msgid "Table %1$s has been created." msgid "Routine %1$s has been created." msgstr "Rutinen %1$s har skapats." @@ -588,12 +580,10 @@ msgstr "" "<b> Ett eller flera fel har inträffat under hanteringen av din begäran: </b>" #: db_routines.php:381 -#| msgid "Create relation" msgid "Create routine" msgstr "Skapa rutin" #: db_routines.php:385 -#| msgid "Edit mode" msgid "Edit routine" msgstr "Redigera rutin" @@ -678,7 +668,6 @@ msgid "Search in database" msgstr "Sök i databas" #: db_search.php:300 -#| msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgid "Words or values to search for (wildcard: \"%\"):" msgstr "Ord eller värden att söka efter (jokertecken: \"%\"):" @@ -691,7 +680,6 @@ msgid "Words are separated by a space character (\" \")." msgstr "Ord är separerade med mellanslag (\" \")." #: db_search.php:323 -#| msgid "Inside table(s):" msgid "Inside tables:" msgstr "Inuti tabeller:" @@ -1203,7 +1191,6 @@ msgid "KiB received since last refresh" msgstr "kb mottagna sedan den senaste uppdateringen" #: js/messages.php:80 -#| msgid "Server traffic" msgid "Server traffic (in KiB)" msgstr "Server trafik (i kb)" @@ -1216,7 +1203,6 @@ msgid "Processes" msgstr "Processer" #: js/messages.php:83 -#| msgid "Connections" msgid "Connections / Processes" msgstr "Förbindelser / Processer" @@ -1225,7 +1211,6 @@ msgid "Issued queries since last refresh" msgstr "Skapade frågor sedan föregående uppdateringen" #: js/messages.php:85 -#| msgid "SQL queries" msgid "Issued queries" msgstr "Skapade frågor" @@ -1320,7 +1305,6 @@ msgstr "" "Definitionen av en sparad funktion måste innehålla en RETURN-programsats!" #: js/messages.php:123 -#| msgid "Missing value in the form!" msgid "Value too long in the form!" msgstr "Värdet för långt i formuläret!" @@ -2098,7 +2082,6 @@ msgid "Check Privileges" msgstr "Kontrollera privilegier" #: libraries/common.inc.php:587 -#| msgid "Could not save configuration" msgid "Failed to read configuration file" msgstr "Kunde inte läsa konfigurationsfilen" @@ -4704,19 +4687,16 @@ msgstr "%s tillägg saknas. Vänligen kontrollera din PHP konfiguration." #: libraries/db_events.inc.php:30 #, php-format -#| msgid "Export contents" msgid "Export of event %s" msgstr "Exportera händelse %s" #: libraries/db_events.inc.php:34 #, php-format -#| msgid "Export contents" msgid "Export of event \"%s\"" msgstr "Exportera händelse \"%s\"" #: libraries/db_events.inc.php:40 #, php-format -#| msgid "No tables found in database" msgid "No event with name %s found in database %s" msgstr "Ingen händelse med namnet %s finns i databasen %s" @@ -4726,7 +4706,6 @@ msgid "Events" msgstr "Händelser" #: libraries/db_events.inc.php:58 libraries/db_events.inc.php:60 -#| msgid "There are no files to upload" msgid "There are no events to display." msgstr "Det finns inga händelser att visa." @@ -4755,7 +4734,6 @@ msgid "Turn it off" msgstr "Stäng av den" #: libraries/db_events.inc.php:141 -#| msgid "Add a new server" msgid "Add an event" msgstr "Lägg till en ny händelse" @@ -4793,18 +4771,15 @@ msgid "Triggers" msgstr "Trigger" #: libraries/db_routines.lib.php:659 -#| msgid "Details..." msgid "Details" msgstr "Detaljer" #: libraries/db_routines.lib.php:662 -#| msgid "Routines" msgid "Routine name" msgstr "Rutinnamn" #: libraries/db_routines.lib.php:679 #, php-format -#| msgid "Change" msgid "Change to %s" msgstr "Ändra till %s" @@ -4813,7 +4788,6 @@ msgid "Parameters" msgstr "Parametrar" #: libraries/db_routines.lib.php:689 -#| msgid "Direct links" msgid "Direction" msgstr "Riktning" @@ -4840,12 +4814,10 @@ msgid "Options" msgstr "Alternativ" #: libraries/db_routines.lib.php:707 -#| msgid "Add prefix" msgid "Add parameter" msgstr "Lägg till parameter" #: libraries/db_routines.lib.php:710 -#| msgid "Remove database" msgid "Remove last parameter" msgstr "Ta bort senaste parametern" @@ -4854,17 +4826,14 @@ msgid "Return type" msgstr "Returtyp" #: libraries/db_routines.lib.php:721 -#| msgid "Length/Values" msgid "Return length/values" msgstr "Returnera längd/värden" #: libraries/db_routines.lib.php:726 -#| msgid "Table options" msgid "Return options" msgstr "Return alternativ" #: libraries/db_routines.lib.php:745 -#| msgid "Description" msgid "Definition" msgstr "Definition" @@ -4877,7 +4846,6 @@ msgid "Definer" msgstr "Definierare" #: libraries/db_routines.lib.php:758 -#| msgid "Security" msgid "Security type" msgstr "Säkerhetstyp" @@ -4886,7 +4854,6 @@ msgid "SQL data access" msgstr "SQL dataaccess" #: libraries/db_routines.lib.php:839 libraries/db_routines.lib.php:842 -#| msgid "Routines" msgid "Routine parameters" msgstr "Rutinparametrar" @@ -4927,17 +4894,14 @@ msgid "You must provide a routine definition." msgstr "Du måste ange en rutindefinition." #: libraries/db_routines.lib.php:1209 -#| msgid "There are no files to upload" msgid "There are no routines to display." msgstr "Det finns inga rutiner att visa." #: libraries/db_routines.lib.php:1253 -#| msgid "Add index" msgid "Add routine" msgstr "Lägg till rutin." #: libraries/db_routines.lib.php:1256 -#| msgid "You don't have sufficient privileges to be here right now!" msgid "You do not have the necessary privileges to create a new routine" msgstr "Du har inte tillräcklig behörighet för att skapa en ny rutin" @@ -5402,7 +5366,6 @@ msgstr "Länken hittades inte" #: libraries/display_triggers.inc.php:35 #, php-format -#| msgid "Export contents" msgid "Export of trigger %s" msgstr "Exportera trigger %s" @@ -5413,12 +5376,10 @@ msgstr "Exportera trigger \"%s\"" #: libraries/display_triggers.inc.php:47 #, php-format -#| msgid "No valid image path for theme %s found!" msgid "No trigger with name %s found" msgstr "Ingen trigger med namn %s hittad" #: libraries/display_triggers.inc.php:64 libraries/display_triggers.inc.php:66 -#| msgid "There are no files to upload" msgid "There are no triggers to display." msgstr "Det finns inga triggers att visa" @@ -5431,7 +5392,6 @@ msgid "Event" msgstr "Händelse" #: libraries/display_triggers.inc.php:120 -#| msgid "Add a new server" msgid "Add a trigger" msgstr "Lägg till en ny Trigger" @@ -6186,7 +6146,6 @@ msgid "Open new phpMyAdmin window" msgstr "Öppna nytt phpMyAdmin-fönster" #: libraries/gis_visualization.lib.php:129 -#| msgid "No data found for the chart." msgid "No data found for GIS visualization." msgstr "Inga data finns för GIS visualisering." @@ -8528,7 +8487,6 @@ msgstr "Uppdateringsfrekvens" #: server_status.php:31 #, php-format -#| msgid "minutes" msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minut" @@ -8536,7 +8494,6 @@ msgstr[1] "%d minuter" #: server_status.php:33 #, php-format -#| msgid "second" msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d sekund" @@ -8623,7 +8580,6 @@ msgid "All status variables" msgstr "Alla statusvariabler" #: server_status.php:413 server_status.php:439 -#| msgid "Refresh rate" msgid "Refresh rate:" msgstr "Uppdateringsfrekvens:" @@ -10014,7 +9970,6 @@ msgid "View dump (schema) of table" msgstr "Visa SQL-satser för tabellen" #: tbl_gis_visualization.php:111 -#| msgid "Display servers selection" msgid "Display GIS Visualization" msgstr "Visa GIS Visualisering" @@ -10027,17 +9982,14 @@ msgid "Height" msgstr "Höjd" #: tbl_gis_visualization.php:165 -#| msgid "Textarea columns" msgid "Label column" msgstr "Etikett kolumn" #: tbl_gis_visualization.php:167 -#| msgid "- none -" msgid "-- None --" msgstr " - Inget -" #: tbl_gis_visualization.php:180 -#| msgid "Total count" msgid "Spatial column" msgstr "Spatial kolumn" @@ -10050,12 +10002,10 @@ msgid "Redraw" msgstr "Rita om" #: tbl_gis_visualization.php:206 -#| msgid "Save as file" msgid "Save to file" msgstr "Spara till fil" #: tbl_gis_visualization.php:207 -#| msgid "Table name" msgid "File name" msgstr "Filnamn" @@ -10321,7 +10271,6 @@ msgid "Add unique index" msgstr "Lägg till unikt index" #: tbl_structure.php:176 tbl_structure.php:177 -#| msgid "Add index" msgid "Add SPATIAL index" msgstr "Lägg till SPATIAL index" diff --git a/po/ta.po b/po/ta.po index 2aae4c5..3cb35a8 100644 --- a/po/ta.po +++ b/po/ta.po @@ -6,7 +6,7 @@ msgid "" 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-06-27 10:20+0200\n" +"POT-Creation-Date: 2011-06-27 10:29+0200\n" "PO-Revision-Date: 2010-04-16 10:43+0200\n" "Last-Translator: Sutharshan <sutharshan02(a)gmail.com>\n" "Language-Team: Tamil <ta(a)li.org>\n" diff --git a/po/te.po b/po/te.po index 7ca5a7d..781da0d 100644 --- a/po/te.po +++ b/po/te.po @@ -6,7 +6,7 @@ msgid "" 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-06-27 10:20+0200\n" +"POT-Creation-Date: 2011-06-27 10:29+0200\n" "PO-Revision-Date: 2011-04-07 17:06+0200\n" "Last-Translator: <veeven(a)gmail.com>\n" "Language-Team: Telugu <te(a)li.org>\n" diff --git a/po/th.po b/po/th.po index d4927bb..cd169e9 100644 --- a/po/th.po +++ b/po/th.po @@ -3,7 +3,7 @@ msgid "" 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-06-27 10:20+0200\n" +"POT-Creation-Date: 2011-06-27 10:29+0200\n" "PO-Revision-Date: 2010-03-12 09:19+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: thai <th(a)li.org>\n" diff --git a/po/tr.po b/po/tr.po index 5af42b7..920f7b3 100644 --- a/po/tr.po +++ b/po/tr.po @@ -3,7 +3,7 @@ msgid "" 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-06-27 10:20+0200\n" +"POT-Creation-Date: 2011-06-27 10:29+0200\n" "PO-Revision-Date: 2011-06-25 13:38+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: turkish <tr(a)li.org>\n" @@ -538,7 +538,6 @@ msgstr "İstek işlemede hata" #: db_routines.php:211 db_routines.php:243 db_routines.php:271 #: db_routines.php:410 #, php-format -#| msgid "No routine with name %s found in database %s" msgid "No routine with name %1$s found in database %2$s" msgstr "%1$s veritabanında %2$s adıyla yordam bulunamadı" diff --git a/po/tt.po b/po/tt.po index 86596ff..e2b4c84 100644 --- a/po/tt.po +++ b/po/tt.po @@ -3,7 +3,7 @@ msgid "" 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-06-27 10:20+0200\n" +"POT-Creation-Date: 2011-06-27 10:29+0200\n" "PO-Revision-Date: 2010-07-22 02:25+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: tatarish <tt(a)li.org>\n" diff --git a/po/ug.po b/po/ug.po index 7b003b2..f91fa93 100644 --- a/po/ug.po +++ b/po/ug.po @@ -6,7 +6,7 @@ msgid "" 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-06-27 10:20+0200\n" +"POT-Creation-Date: 2011-06-27 10:29+0200\n" "PO-Revision-Date: 2010-08-26 11:59+0200\n" "Last-Translator: <gheni(a)yahoo.cn>\n" "Language-Team: Uyghur <ug(a)li.org>\n" diff --git a/po/uk.po b/po/uk.po index 6723a35..f4dc958 100644 --- a/po/uk.po +++ b/po/uk.po @@ -3,7 +3,7 @@ msgid "" 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-06-27 10:20+0200\n" +"POT-Creation-Date: 2011-06-27 10:29+0200\n" "PO-Revision-Date: 2011-06-17 10:55+0200\n" "Last-Translator: Michal Čihař <michal(a)cihar.com>\n" "Language-Team: ukrainian <uk(a)li.org>\n" diff --git a/po/ur.po b/po/ur.po index 462eb57..d4f7932 100644 --- a/po/ur.po +++ b/po/ur.po @@ -6,7 +6,7 @@ msgid "" 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-06-27 10:20+0200\n" +"POT-Creation-Date: 2011-06-27 10:29+0200\n" "PO-Revision-Date: 2011-04-23 08:37+0200\n" "Last-Translator: Mehbooob Khan <mehboobbugti(a)gmail.com>\n" "Language-Team: Urdu <ur(a)li.org>\n" diff --git a/po/uz.po b/po/uz.po index 1809e4a..08d61fa 100644 --- a/po/uz.po +++ b/po/uz.po @@ -3,7 +3,7 @@ msgid "" 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-06-27 10:20+0200\n" +"POT-Creation-Date: 2011-06-27 10:29+0200\n" "PO-Revision-Date: 2010-07-22 02:31+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: uzbek_cyrillic <uz(a)li.org>\n" diff --git a/po/uz(a)latin.po b/po/uz(a)latin.po index bc10603..53c938c 100644 --- a/po/uz(a)latin.po +++ b/po/uz(a)latin.po @@ -3,7 +3,7 @@ msgid "" 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-06-27 10:20+0200\n" +"POT-Creation-Date: 2011-06-27 10:29+0200\n" "PO-Revision-Date: 2010-07-22 02:30+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: uzbek_latin <uz@latin@li.org>\n" diff --git a/po/zh_CN.po b/po/zh_CN.po index ac469e0..6065508 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -3,7 +3,7 @@ msgid "" 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-06-27 10:20+0200\n" +"POT-Creation-Date: 2011-06-27 10:29+0200\n" "PO-Revision-Date: 2011-06-08 05:00+0200\n" "Last-Translator: shanyan baishui <Siramizu(a)gmail.com>\n" "Language-Team: chinese_simplified <zh_CN(a)li.org>\n" diff --git a/po/zh_TW.po b/po/zh_TW.po index 7dc59bf..648203e 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -3,7 +3,7 @@ msgid "" 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-06-27 10:20+0200\n" +"POT-Creation-Date: 2011-06-27 10:29+0200\n" "PO-Revision-Date: 2011-06-19 09:59+0200\n" "Last-Translator: <star(a)origin.club.tw>\n" "Language-Team: chinese_traditional <zh_TW(a)li.org>\n" diff --git a/scripts/update-po b/scripts/update-po index 0475b6d..a12e598 100755 --- a/scripts/update-po +++ b/scripts/update-po @@ -1,6 +1,6 @@ #!/bin/sh # vim: expandtab sw=4 ts=4 sts=4: -export LANG=C +export LC_ALL=C LOCS=`ls po/*.po | sed 's@.*/$.*$\.po@\1@'` xgettext \ -d phpmyadmin \ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3RC1-5783-g3c55511
by Piotr Przybylski 26 Jun '11

26 Jun '11

The branch, master has been updated via 3c55511e5c81d479575f9527a0e5b2267440c872 (commit) from 7322e858f078860612422c25a907f46aecbd2ba8 (commit) - Log ----------------------------------------------------------------- commit 3c55511e5c81d479575f9527a0e5b2267440c872 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Sun Jun 26 18:27:27 2011 +0200 Use Create_time instead of CREATE_TIME ----------------------------------------------------------------------- Summary of changes: libraries/Table.class.php | 4 ++-- libraries/display_tbl.lib.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/Table.class.php b/libraries/Table.class.php index cec5b66..fddf614 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -1338,7 +1338,7 @@ class PMA_Table } else if ($property == self::PROP_COLUMN_ORDER) { if (isset($this->uiprefs[$property])) { // check if the table has not been modified - if (self::sGetStatusInfo($this->db_name, $this->name, 'CREATE_TIME') == + if (self::sGetStatusInfo($this->db_name, $this->name, 'Create_time') == $this->uiprefs['CREATE_TIME']) { return $this->uiprefs[$property]; } else { @@ -1374,7 +1374,7 @@ class PMA_Table } // we want to save the create time if the property is PROP_COLUMN_ORDER if ($property == self::PROP_COLUMN_ORDER) { - $curr_create_time = self::sGetStatusInfo($this->db_name, $this->name, 'CREATE_TIME'); + $curr_create_time = self::sGetStatusInfo($this->db_name, $this->name, 'Create_time'); if (isset($table_create_time) && $table_create_time == $curr_create_time) { $this->uiprefs['CREATE_TIME'] = $curr_create_time; diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 85eac32..cb37ee4 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -405,7 +405,7 @@ function PMA_displayTableNavigation($pos_next, $pos_prev, $sql_query, $id_for_di } // generate table create time echo '<input id="table_create_time" type="hidden" value="' . - PMA_Table::sGetStatusInfo($GLOBALS['db'], $GLOBALS['table'], 'CREATE_TIME') . '" />'; + PMA_Table::sGetStatusInfo($GLOBALS['db'], $GLOBALS['table'], 'Create_time') . '" />'; } // generate hints echo '<input id="col_order_hint" type="hidden" value="' . __('Drag to reorder') . '" />'; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3RC1-5782-g7322e85
by Marc Delisle 26 Jun '11

26 Jun '11

The branch, master has been updated via 7322e858f078860612422c25a907f46aecbd2ba8 (commit) from 02b1b32b7be9382b99eab72ad2670f39703da7d4 (commit) - Log ----------------------------------------------------------------- commit 7322e858f078860612422c25a907f46aecbd2ba8 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Jun 26 09:05:19 2011 -0400 Incorrect comment for return param ----------------------------------------------------------------------- Summary of changes: libraries/common.lib.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/common.lib.php b/libraries/common.lib.php index a9b87f9..b6fb4a1 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -1993,7 +1993,7 @@ function PMA_checkParameters($params, $die = true, $request = true) * @param boolean $force_unique generate condition only on pk or unique * * @access public - * @return string the calculated condition and whether condition is unique + * @return array the calculated condition and whether condition is unique */ function PMA_getUniqueCondition($handle, $fields_cnt, $fields_meta, $row, $force_unique=false) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3RC1-5781-g02b1b32
by Piotr Przybylski 26 Jun '11

26 Jun '11

The branch, master has been updated via 02b1b32b7be9382b99eab72ad2670f39703da7d4 (commit) from fda6706466e2995d87eeb5c59d5c5f47ddd3a96d (commit) - Log ----------------------------------------------------------------- commit 02b1b32b7be9382b99eab72ad2670f39703da7d4 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Sun Jun 26 13:37:46 2011 +0200 Fix formatting ----------------------------------------------------------------------- Summary of changes: db_operations.php | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/db_operations.php b/db_operations.php index c5c0fc2..dd6255c 100644 --- a/db_operations.php +++ b/db_operations.php @@ -243,9 +243,10 @@ if (strlen($db) && (! empty($db_rename) || ! empty($db_copy))) { PMA_DBI_query($tmp_query); } } - } - // go back to current db, just in case - PMA_DBI_select_db($db); + } + + // go back to current db, just in case + PMA_DBI_select_db($db); // Duplicate the bookmarks for this db (done once for each db) if (! $_error && $db != $newname) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3RC1-5779-ga04169f
by Marc Delisle 26 Jun '11

26 Jun '11

The branch, master has been updated via a04169f97d73d735cf9c9bff2d226b2c28c49498 (commit) from 5403fc13ced5e245632ba1b4f237ff5f1a52785f (commit) - Log ----------------------------------------------------------------- commit a04169f97d73d735cf9c9bff2d226b2c28c49498 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Jun 26 07:33:09 2011 -0400 "Add a new" is redundant" ----------------------------------------------------------------------- Summary of changes: libraries/db_events.inc.php | 2 +- libraries/display_triggers.inc.php | 2 +- libraries/tbl_properties.inc.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/db_events.inc.php b/libraries/db_events.inc.php index b4ca2e5..4aa68a8 100644 --- a/libraries/db_events.inc.php +++ b/libraries/db_events.inc.php @@ -138,7 +138,7 @@ if ($es_state === 'ON' || $es_state === 'OFF') { */ echo $tableStart . '<fieldset style="margin: 1em 0;">' . "\n" . ' <a href="db_events.php?' . $url_query . '&addevent=1" ' . $conditional_class_add . '>' . "\n" - . PMA_getIcon('b_event_add.png') . __('Add a new Event') . '</a>' . "\n" + . PMA_getIcon('b_event_add.png') . __('Add an event') . '</a>' . "\n" . '</fieldset>' . "\n"; /** diff --git a/libraries/display_triggers.inc.php b/libraries/display_triggers.inc.php index aa4583e..fcadfba 100644 --- a/libraries/display_triggers.inc.php +++ b/libraries/display_triggers.inc.php @@ -117,7 +117,7 @@ echo '</fieldset>'; */ echo '<fieldset>' . "\n" . ' <a href="tbl_triggers.php?' . $url_query . '&addtrigger=1" class="' . $conditional_class_add . '">' . "\n" - . PMA_getIcon('b_trigger_add.png') . __('Add a new Trigger') . '</a>' . "\n" + . PMA_getIcon('b_trigger_add.png') . __('Add a trigger') . '</a>' . "\n" . '</fieldset>' . "\n"; ?> diff --git a/libraries/tbl_properties.inc.php b/libraries/tbl_properties.inc.php index 8edc3ea..4cfd48a 100644 --- a/libraries/tbl_properties.inc.php +++ b/libraries/tbl_properties.inc.php @@ -773,7 +773,7 @@ if ($action == 'tbl_create.php') { <h3><?php printf(__('Values for the column "%s"'), isset($row['Field']) ? htmlspecialchars($row['Field']) : ""); ?></h3> <p><?php echo __('Enter each value in a separate field.'); ?></p> <div id="values"></div> -<p><a class="add_value"><?php echo __('+ Add a new value'); ?></a></p> +<p><a class="add_value"><?php echo __('+ Add a value'); ?></a></p> <input type="submit" value="<?php echo __('Go'); ?>" /> <a class="cancel_enum_editor"><?php echo __('Cancel'); ?></a> </div> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3RC1-5778-g5403fc1
by Piotr Przybylski 24 Jun '11

24 Jun '11

The branch, master has been updated via 5403fc13ced5e245632ba1b4f237ff5f1a52785f (commit) from 67224c407e95f5f1ba937d670f8e148da66afd39 (commit) - Log ----------------------------------------------------------------- commit 5403fc13ced5e245632ba1b4f237ff5f1a52785f Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Sat Jun 25 00:49:41 2011 +0200 PMA_MYSQL_INT_VERSION is at least 50001 (MySQL 5.0.1) ----------------------------------------------------------------------- Summary of changes: db_operations.php | 51 +++++++++++++++++++++++++-------------------------- 1 files changed, 25 insertions(+), 26 deletions(-) diff --git a/db_operations.php b/db_operations.php index 94f8575..c5c0fc2 100644 --- a/db_operations.php +++ b/db_operations.php @@ -69,37 +69,36 @@ if (strlen($db) && (! empty($db_rename) || ! empty($db_copy))) { $GLOBALS['pma']->databases->build(); } - if (PMA_MYSQL_INT_VERSION >= 50000) { - // here I don't use DELIMITER because it's not part of the - // language; I have to send each statement one by one - - // to avoid selecting alternatively the current and new db - // we would need to modify the CREATE definitions to qualify - // the db name - $procedure_names = PMA_DBI_get_procedures_or_functions($db, 'PROCEDURE'); - if ($procedure_names) { - foreach($procedure_names as $procedure_name) { - PMA_DBI_select_db($db); - $tmp_query = PMA_DBI_get_definition($db, 'PROCEDURE', $procedure_name); - // collect for later display - $GLOBALS['sql_query'] .= "\n" . $tmp_query; - PMA_DBI_select_db($newname); - PMA_DBI_query($tmp_query); - } + // here I don't use DELIMITER because it's not part of the + // language; I have to send each statement one by one + + // to avoid selecting alternatively the current and new db + // we would need to modify the CREATE definitions to qualify + // the db name + $procedure_names = PMA_DBI_get_procedures_or_functions($db, 'PROCEDURE'); + if ($procedure_names) { + foreach($procedure_names as $procedure_name) { + PMA_DBI_select_db($db); + $tmp_query = PMA_DBI_get_definition($db, 'PROCEDURE', $procedure_name); + // collect for later display + $GLOBALS['sql_query'] .= "\n" . $tmp_query; + PMA_DBI_select_db($newname); + PMA_DBI_query($tmp_query); } + } - $function_names = PMA_DBI_get_procedures_or_functions($db, 'FUNCTION'); - if ($function_names) { - foreach($function_names as $function_name) { - PMA_DBI_select_db($db); - $tmp_query = PMA_DBI_get_definition($db, 'FUNCTION', $function_name); - // collect for later display - $GLOBALS['sql_query'] .= "\n" . $tmp_query; - PMA_DBI_select_db($newname); - PMA_DBI_query($tmp_query); - } + $function_names = PMA_DBI_get_procedures_or_functions($db, 'FUNCTION'); + if ($function_names) { + foreach($function_names as $function_name) { + PMA_DBI_select_db($db); + $tmp_query = PMA_DBI_get_definition($db, 'FUNCTION', $function_name); + // collect for later display + $GLOBALS['sql_query'] .= "\n" . $tmp_query; + PMA_DBI_select_db($newname); + PMA_DBI_query($tmp_query); } } + // go back to current db, just in case PMA_DBI_select_db($db); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3RC1-5777-g67224c4
by Michal Čihař 24 Jun '11

24 Jun '11

The branch, master has been updated via 67224c407e95f5f1ba937d670f8e148da66afd39 (commit) via d12105d99f774ce56c2e094ded2c0caaa88cf70a (commit) via bf6971c15dfe9c9a0a3fe00ec6d88b93a0150e4c (commit) via 9b6406c00810ec046c037f4180c480e81b81a439 (commit) via a4259d0cba2c8b3bfb71998b012c21a541c94ba6 (commit) via acf8b3f005b971cad4876f00f9ac2b1d2d665d74 (commit) via 76bba21f9214696f2b7c90aa331d97ab66c7a470 (commit) via b791bd49aea2963b8b565d57f7c79cb84dd04c80 (commit) via 9792add6e833173fd6f6ba6d1303035f0aabfe4d (commit) via 88e089c00381639f47f78713e6357aabb1455ab7 (commit) via 6eca504d4781cf39c118b67421441d75ebe204f7 (commit) via 236e68407083a535bcf330e682c2c4484daa8dcd (commit) via b7cf2d898c802d27852be9f0d85146bbbe4a81bd (commit) via 9d000350d26b00a373299fa840c8853018ff32c4 (commit) via 66041493b08e411790fb04964a3b5e4904f9b81a (commit) via 57db795a8856ba590bf17da06c17f8295a928367 (commit) via 963d0d8373a0d048e5d43b2cfbdced0604088bc8 (commit) from 79b20e474af9a8e3d821b7cad31e4fb9d83ac82e (commit) - Log ----------------------------------------------------------------- commit 67224c407e95f5f1ba937d670f8e148da66afd39 Merge: 79b20e474af9a8e3d821b7cad31e4fb9d83ac82e d12105d99f774ce56c2e094ded2c0caaa88cf70a Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Jun 24 13:54:53 2011 +0200 Merge remote-tracking branch 'pootle/master' commit d12105d99f774ce56c2e094ded2c0caaa88cf70a Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 24 13:53:44 2011 +0200 Translation update done using Pootle. commit bf6971c15dfe9c9a0a3fe00ec6d88b93a0150e4c Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 24 13:53:22 2011 +0200 Translation update done using Pootle. commit 9b6406c00810ec046c037f4180c480e81b81a439 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 24 13:53:14 2011 +0200 Translation update done using Pootle. commit a4259d0cba2c8b3bfb71998b012c21a541c94ba6 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 24 13:52:54 2011 +0200 Translation update done using Pootle. commit acf8b3f005b971cad4876f00f9ac2b1d2d665d74 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 24 13:52:48 2011 +0200 Translation update done using Pootle. commit 76bba21f9214696f2b7c90aa331d97ab66c7a470 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 24 13:52:38 2011 +0200 Translation update done using Pootle. commit b791bd49aea2963b8b565d57f7c79cb84dd04c80 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 24 13:52:34 2011 +0200 Translation update done using Pootle. commit 9792add6e833173fd6f6ba6d1303035f0aabfe4d Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 24 13:52:28 2011 +0200 Translation update done using Pootle. commit 88e089c00381639f47f78713e6357aabb1455ab7 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 24 13:52:20 2011 +0200 Translation update done using Pootle. commit 6eca504d4781cf39c118b67421441d75ebe204f7 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 24 13:52:09 2011 +0200 Translation update done using Pootle. commit 236e68407083a535bcf330e682c2c4484daa8dcd Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 24 13:51:42 2011 +0200 Translation update done using Pootle. commit b7cf2d898c802d27852be9f0d85146bbbe4a81bd Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 24 13:51:28 2011 +0200 Translation update done using Pootle. commit 9d000350d26b00a373299fa840c8853018ff32c4 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 24 13:51:16 2011 +0200 Translation update done using Pootle. commit 66041493b08e411790fb04964a3b5e4904f9b81a Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 24 13:50:44 2011 +0200 Translation update done using Pootle. commit 57db795a8856ba590bf17da06c17f8295a928367 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 24 13:50:36 2011 +0200 Translation update done using Pootle. commit 963d0d8373a0d048e5d43b2cfbdced0604088bc8 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 24 13:49:53 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/cs.po | 46 ++++++++++++++++++++-------------------------- 1 files changed, 20 insertions(+), 26 deletions(-) diff --git a/po/cs.po b/po/cs.po index 9ed2010..85b17f5 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,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-06-24 12:07+0200\n" -"PO-Revision-Date: 2011-06-22 10:46+0200\n" +"PO-Revision-Date: 2011-06-24 13:53+0200\n" "Last-Translator: Michal Čihař <michal(a)cihar.com>\n" "Language-Team: czech <cs(a)li.org>\n" "Language: cs\n" @@ -516,10 +516,10 @@ msgstr[1] "Posledním příkazem v proceduře byly ovlivněny %d řádky" msgstr[2] "Posledním příkazem v proceduře bylo ovlivněno %d řádek" #: db_routines.php:165 -#, fuzzy, php-format +#, php-format #| msgid "Allows executing stored routines." msgid "Execution results of routine %s" -msgstr "Umožňuje spouštět uložené procedury." +msgstr "Výsledek spuštění rutiny %s" #: db_routines.php:185 libraries/import.lib.php:153 sql.php:678 #: tbl_change.php:180 tbl_get_field.php:34 @@ -528,10 +528,10 @@ msgstr "MySQL vrátil prázdný výsledek (tj. nulový počet řádků)." #: db_routines.php:190 db_routines.php:295 db_routines.php:300 #: db_routines.php:324 -#, fuzzy, php-format +#, php-format #| msgid "The following queries have been executed:" msgid "The following query has failed: \"%s\"" -msgstr "Byly provedeny následující dotazy:" +msgstr "Následující dotaz selhal: „%s“" #: db_routines.php:191 db_routines.php:296 db_routines.php:301 #: db_routines.php:311 db_routines.php:325 libraries/common.lib.php:609 @@ -540,33 +540,32 @@ msgstr "MySQL hlásí: " #: db_routines.php:208 db_routines.php:240 db_routines.php:268 #: db_routines.php:407 -#, fuzzy #| msgid "Error in Processing Request" msgid "Error in processing request" msgstr "Chyba při zpracování požadavku" #: db_routines.php:209 db_routines.php:241 db_routines.php:269 #: db_routines.php:408 -#, fuzzy, php-format +#, php-format #| msgid "No tables found in database" msgid "No routine with name %1$s found in database %2$s" -msgstr "V databázi nebyly nalezeny žádné tabulky" +msgstr "V databázi %2$s není žádná rutina se jménem %1$s" #: db_routines.php:230 db_routines.php:234 msgid "Execute routine" msgstr "Spustit rutinu" #: db_routines.php:259 db_routines.php:263 -#, fuzzy, php-format +#, php-format #| msgid "Export defaults" msgid "Export of routine %s" -msgstr "Výchozí nastavení exportu" +msgstr "Export rutiny %s" #: db_routines.php:288 libraries/db_routines.lib.php:960 -#, fuzzy, php-format +#, php-format #| msgid "Invalid server index: %s" msgid "Invalid routine type: \"%s\"" -msgstr "Chybný index serveru: „%s“" +msgstr "Chybný typ rutiny: „%s“" #: db_routines.php:309 msgid "Sorry, we failed to restore the dropped routine." @@ -577,32 +576,30 @@ msgid "The backed up query was:" msgstr "Záložní dotaz byl:" #: db_routines.php:314 -#, fuzzy, php-format +#, php-format #| msgid "Column %s has been dropped" msgid "Routine %1$s has been modified." -msgstr "Pole %s byla odstraněno" +msgstr "Byla změněna rutina %1$s." #: db_routines.php:327 -#, fuzzy, php-format +#, php-format #| msgid "Table %1$s has been created." msgid "Routine %1$s has been created." -msgstr "Byla vytvořena tabulka %1$s." +msgstr "Byla vytvořena rutina %1$s." #: db_routines.php:335 msgid "<b>One or more errors have occured while processing your request:</b>" msgstr "<b>Při zpracování požadavku došlo k několika chybám:</b>" #: db_routines.php:379 -#, fuzzy #| msgid "Create relation" msgid "Create routine" -msgstr "Vytvořit relaci" +msgstr "Vytvořit rutinu" #: db_routines.php:383 -#, fuzzy #| msgid "Edit mode" msgid "Edit routine" -msgstr "Režim úprav" +msgstr "Upravit rutinu" #: db_routines.php:434 msgid "" @@ -2100,13 +2097,11 @@ msgid "Check Privileges" msgstr "Zkontrolovat oprávnění" #: libraries/common.inc.php:587 -#, fuzzy #| msgid "Failed to to read configuration file" msgid "Failed to read configuration file" msgstr "Nepodařilo se načíst konfigurační soubor" #: libraries/common.inc.php:588 -#, fuzzy #| msgid "" #| "This usually means there is a syntax error in it, please check any errors " #| "shown bellow." @@ -4920,10 +4915,9 @@ msgid "There are no routines to display." msgstr "Nebyl zvolen žádný soubor pro nahrání" #: libraries/db_routines.lib.php:1253 -#, fuzzy #| msgid "Add index" msgid "Add routine" -msgstr "Přidat index" +msgstr "Přidat rutinu" #: libraries/db_routines.lib.php:1256 #, fuzzy @@ -5329,7 +5323,7 @@ msgstr "Transformace při prohlížení" #: libraries/display_tbl.lib.php:642 msgid "Geometry" -msgstr "" +msgstr "Geometrie" #: libraries/display_tbl.lib.php:643 msgid "Well Known Text" @@ -5383,7 +5377,7 @@ msgstr "Zobrazit graf" #: libraries/display_tbl.lib.php:2548 msgid "Visualize GIS data" -msgstr "" +msgstr "Zobrazit data GIS" #: libraries/display_tbl.lib.php:2568 msgid "Create view" hooks/post-receive -- phpMyAdmin

1 0