Git

git@phpmyadmin.net

38402 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7-21573-g999e85b
by Michal Čihař 25 Oct '11

25 Oct '11

The branch, master has been updated via 999e85b505b57c58e397ea967e4333f6fa38b57a (commit) from b7c1742809dd045a4475697ee45d78cb0392a8ec (commit) - Log ----------------------------------------------------------------- commit 999e85b505b57c58e397ea967e4333f6fa38b57a Author: Michal Čihař <mcihar(a)suse.cz> Date: Tue Oct 25 11:17:56 2011 +0200 Coding style, documentation ----------------------------------------------------------------------- Summary of changes: libraries/database_interface.lib.php | 32 ++++++++++++++++++++++++-------- 1 files changed, 24 insertions(+), 8 deletions(-) diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index 6b26f18..4fcdfcf 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -10,13 +10,20 @@ if (! defined('PHPMYADMIN')) { } /** - * + * Force STORE_RESULT method, ignored by classic MySQL. + */ +define('PMA_DBI_QUERY_STORE', 1); +/** + * Do not read whole query. + */ +define('PMA_DBI_QUERY_UNBUFFERED', 2); +/** + * Get session variable. */ -// PMA_DBI_try_query() -define('PMA_DBI_QUERY_STORE', 1); // Force STORE_RESULT method, ignored by classic MySQL. -define('PMA_DBI_QUERY_UNBUFFERED', 2); // Do not read whole query -// PMA_DBI_get_variable() define('PMA_DBI_GETVAR_SESSION', 1); +/** + * Get global variable. + */ define('PMA_DBI_GETVAR_GLOBAL', 2); /** @@ -48,7 +55,11 @@ if (! PMA_DBI_checkDbExtension($GLOBALS['cfg']['Server']['extension'])) { * @todo add different messages for alternative extension * and complete fail (no alternative extension too) */ - PMA_warnMissingExtension($GLOBALS['cfg']['Server']['extension'], false, PMA_showDocu('faqmysql')); + PMA_warnMissingExtension( + $GLOBALS['cfg']['Server']['extension'], + false, + PMA_showDocu('faqmysql') + ); if ($GLOBALS['cfg']['Server']['extension'] === 'mysql') { $alternativ_extension = 'mysqli'; @@ -58,7 +69,11 @@ if (! PMA_DBI_checkDbExtension($GLOBALS['cfg']['Server']['extension'])) { if (! PMA_DBI_checkDbExtension($alternativ_extension)) { // if alternative fails too ... - PMA_warnMissingExtension($GLOBALS['cfg']['Server']['extension'], true, PMA_showDocu('faqmysql')); + PMA_warnMissingExtension( + $GLOBALS['cfg']['Server']['extension'], + true, + PMA_showDocu('faqmysql') + ); } $GLOBALS['cfg']['Server']['extension'] = $alternativ_extension; @@ -68,7 +83,8 @@ if (! PMA_DBI_checkDbExtension($GLOBALS['cfg']['Server']['extension'])) { /** * Including The DBI Plugin */ -require_once './libraries/dbi/' . $GLOBALS['cfg']['Server']['extension'] . '.dbi.lib.php'; +require_once './libraries/dbi/' + . $GLOBALS['cfg']['Server']['extension'] . '.dbi.lib.php'; /** * runs a query hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7-21572-gb7c1742
by Michal Čihař 25 Oct '11

25 Oct '11

The branch, master has been updated via b7c1742809dd045a4475697ee45d78cb0392a8ec (commit) from e56949f160b9de33a8ca642e6d9d8efa81c112fe (commit) - Log ----------------------------------------------------------------- commit b7c1742809dd045a4475697ee45d78cb0392a8ec Author: Michal Čihař <mcihar(a)suse.cz> Date: Tue Oct 25 11:12:37 2011 +0200 Coding style improvements, mostly in docblocks ----------------------------------------------------------------------- Summary of changes: libraries/database_interface.lib.php | 237 ++++++++++++++++++++++------------ 1 files changed, 155 insertions(+), 82 deletions(-) diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index f77a682..6b26f18 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -603,14 +603,16 @@ function PMA_DBI_get_tables_full($database, $table = false, $tbl_is_group = fals * returns array with databases containing extended infos about them * * @todo move into PMA_List_Database? - * @param string $database database - * @param boolean $force_stats retrieve stats also for MySQL < 5 - * @param resource $link mysql link - * @param string $sort_by column to order by - * @param string $sort_order ASC or DESC - * @param integer $limit_offset starting offset for LIMIT - * @param bool|int $limit_count row count for LIMIT or true for $GLOBALS['cfg']['MaxDbList'] - * @return array $databases + * + * @param string $database database + * @param boolean $force_stats retrieve stats also for MySQL < 5 + * @param resource $link mysql link + * @param string $sort_by column to order by + * @param string $sort_order ASC or DESC + * @param integer $limit_offset starting offset for LIMIT + * @param bool|int $limit_count row count for LIMIT or true for $GLOBALS['cfg']['MaxDbList'] + * + * @return array $databases */ function PMA_DBI_get_databases_full($database = null, $force_stats = false, $link = null, $sort_by = 'SCHEMA_NAME', $sort_order = 'ASC', @@ -650,12 +652,14 @@ function PMA_DBI_get_databases_full($database = null, $force_stats = false, } if (PMA_DRIZZLE) { - // data_dictionary.table_cache may not contain any data for some tables, it's just a table cache + // data_dictionary.table_cache may not contain any data for some + // tables, it's just a table cache $sql = 'SELECT s.SCHEMA_NAME, s.DEFAULT_COLLATION_NAME'; if ($force_stats) { - // no TABLE_CACHE data, stable results are better than constantly changing + // no TABLE_CACHE data, stable results are better than + // constantly changing $sql .= ', COUNT(t.TABLE_SCHEMA) AS SCHEMA_TABLES, SUM(stat.NUM_ROWS) AS SCHEMA_TABLE_ROWS'; @@ -801,6 +805,7 @@ function PMA_DBI_get_databases_full($database = null, $force_stats = false, * @param string $table name of table to retrieve columns from * @param string $column name of specific column * @param mixed $link mysql link resource + * * @return array */ function PMA_DBI_get_columns_full($database = null, $table = null, @@ -907,34 +912,34 @@ function PMA_DBI_get_columns_full($database = null, $table = null, // MySQL forward compatibility // so pma could use this array as if every server is of version >5.0 - $columns[$column_name]['COLUMN_NAME'] =& $columns[$column_name]['Field']; - $columns[$column_name]['COLUMN_TYPE'] =& $columns[$column_name]['Type']; - $columns[$column_name]['COLLATION_NAME'] =& $columns[$column_name]['Collation']; - $columns[$column_name]['IS_NULLABLE'] =& $columns[$column_name]['Null']; - $columns[$column_name]['COLUMN_KEY'] =& $columns[$column_name]['Key']; - $columns[$column_name]['COLUMN_DEFAULT'] =& $columns[$column_name]['Default']; - $columns[$column_name]['EXTRA'] =& $columns[$column_name]['Extra']; - $columns[$column_name]['PRIVILEGES'] =& $columns[$column_name]['Privileges']; - $columns[$column_name]['COLUMN_COMMENT'] =& $columns[$column_name]['Comment']; - - $columns[$column_name]['TABLE_CATALOG'] = null; - $columns[$column_name]['TABLE_SCHEMA'] = $database; - $columns[$column_name]['TABLE_NAME'] = $table; - $columns[$column_name]['ORDINAL_POSITION'] = $ordinal_position; - $columns[$column_name]['DATA_TYPE'] = + $columns[$column_name]['COLUMN_NAME'] =& $columns[$column_name]['Field']; + $columns[$column_name]['COLUMN_TYPE'] =& $columns[$column_name]['Type']; + $columns[$column_name]['COLLATION_NAME'] =& $columns[$column_name]['Collation']; + $columns[$column_name]['IS_NULLABLE'] =& $columns[$column_name]['Null']; + $columns[$column_name]['COLUMN_KEY'] =& $columns[$column_name]['Key']; + $columns[$column_name]['COLUMN_DEFAULT'] =& $columns[$column_name]['Default']; + $columns[$column_name]['EXTRA'] =& $columns[$column_name]['Extra']; + $columns[$column_name]['PRIVILEGES'] =& $columns[$column_name]['Privileges']; + $columns[$column_name]['COLUMN_COMMENT'] =& $columns[$column_name]['Comment']; + + $columns[$column_name]['TABLE_CATALOG'] = null; + $columns[$column_name]['TABLE_SCHEMA'] = $database; + $columns[$column_name]['TABLE_NAME'] = $table; + $columns[$column_name]['ORDINAL_POSITION'] = $ordinal_position; + $columns[$column_name]['DATA_TYPE'] = substr($columns[$column_name]['COLUMN_TYPE'], 0, strpos($columns[$column_name]['COLUMN_TYPE'], '(')); /** * @todo guess CHARACTER_MAXIMUM_LENGTH from COLUMN_TYPE */ - $columns[$column_name]['CHARACTER_MAXIMUM_LENGTH'] = null; + $columns[$column_name]['CHARACTER_MAXIMUM_LENGTH'] = null; /** * @todo guess CHARACTER_OCTET_LENGTH from CHARACTER_MAXIMUM_LENGTH */ - $columns[$column_name]['CHARACTER_OCTET_LENGTH'] = null; - $columns[$column_name]['NUMERIC_PRECISION'] = null; - $columns[$column_name]['NUMERIC_SCALE'] = null; - $columns[$column_name]['CHARACTER_SET_NAME'] = + $columns[$column_name]['CHARACTER_OCTET_LENGTH'] = null; + $columns[$column_name]['NUMERIC_PRECISION'] = null; + $columns[$column_name]['NUMERIC_SCALE'] = null; + $columns[$column_name]['CHARACTER_SET_NAME'] = substr($columns[$column_name]['COLLATION_NAME'], 0, strpos($columns[$column_name]['COLLATION_NAME'], '_')); @@ -952,13 +957,15 @@ function PMA_DBI_get_columns_full($database = null, $table = null, /** * Returns SQL query for fetching columns for a table * - * The 'Key' column is not calculated properly, use PMA_DBI_get_columns() to get correct values. + * The 'Key' column is not calculated properly, use PMA_DBI_get_columns() to get + * correct values. * * @see PMA_DBI_get_columns() * @param string $database name of database * @param string $table name of table to retrieve columns from * @param string $column name of column, null to show all columns * @param boolean $full whether to return full info or only column names + * * @return string */ function PMA_DBI_get_columns_sql($database, $table, $column = null, $full = false) @@ -1155,22 +1162,40 @@ 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. + * Function called just after a connection to the MySQL database server has + * been established. It sets the connection collation, and determins the + * version of MySQL which is running. * - * @param mixed $link mysql link resource|object - * @param boolean $is_controluser + * @param mixed $link mysql link resource|object + * @param boolean $is_controluser whether link is for control user */ function PMA_DBI_postConnect($link, $is_controluser = false) { if (! defined('PMA_MYSQL_INT_VERSION')) { if (PMA_cacheExists('PMA_MYSQL_INT_VERSION', true)) { - define('PMA_MYSQL_INT_VERSION', PMA_cacheGet('PMA_MYSQL_INT_VERSION', true)); - define('PMA_MYSQL_MAJOR_VERSION', PMA_cacheGet('PMA_MYSQL_MAJOR_VERSION', true)); - define('PMA_MYSQL_STR_VERSION', PMA_cacheGet('PMA_MYSQL_STR_VERSION', true)); - define('PMA_MYSQL_VERSION_COMMENT', PMA_cacheGet('PMA_MYSQL_VERSION_COMMENT', true)); + define( + 'PMA_MYSQL_INT_VERSION', + PMA_cacheGet('PMA_MYSQL_INT_VERSION', true) + ); + define( + 'PMA_MYSQL_MAJOR_VERSION',\ + PMA_cacheGet('PMA_MYSQL_MAJOR_VERSION', true) + ); + define( + 'PMA_MYSQL_STR_VERSION', + PMA_cacheGet('PMA_MYSQL_STR_VERSION', true) + ); + define( + 'PMA_MYSQL_VERSION_COMMENT', + PMA_cacheGet('PMA_MYSQL_VERSION_COMMENT', true) + ); } else { - $version = PMA_DBI_fetch_single_row('SELECT @@version, @@version_comment', 'ASSOC', $link); + $version = PMA_DBI_fetch_single_row( + 'SELECT @@version, @@version_comment', + 'ASSOC', + $link + ); + if ($version) { $match = explode('.', $version['@@version']); define('PMA_MYSQL_MAJOR_VERSION', (int)$match[0]); @@ -1185,12 +1210,29 @@ function PMA_DBI_postConnect($link, $is_controluser = false) define('PMA_MYSQL_STR_VERSION', '5.00.15'); define('PMA_MYSQL_VERSION_COMMENT', ''); } - PMA_cacheSet('PMA_MYSQL_INT_VERSION', PMA_MYSQL_INT_VERSION, true); - PMA_cacheSet('PMA_MYSQL_MAJOR_VERSION', PMA_MYSQL_MAJOR_VERSION, true); - PMA_cacheSet('PMA_MYSQL_STR_VERSION', PMA_MYSQL_STR_VERSION, true); - PMA_cacheSet('PMA_MYSQL_VERSION_COMMENT', PMA_MYSQL_VERSION_COMMENT, true); + PMA_cacheSet( + 'PMA_MYSQL_INT_VERSION', + PMA_MYSQL_INT_VERSION, + true + ); + PMA_cacheSet( + 'PMA_MYSQL_MAJOR_VERSION', + PMA_MYSQL_MAJOR_VERSION, + true + ); + PMA_cacheSet( + 'PMA_MYSQL_STR_VERSION', + PMA_MYSQL_STR_VERSION, + true + ); + PMA_cacheSet( + 'PMA_MYSQL_VERSION_COMMENT', + PMA_MYSQL_VERSION_COMMENT, + true + ); } - // detect Drizzle by version number - <year>.<month>.<build number>(.<patch rev) + // detect Drizzle by version number: + // <year>.<month>.<build number>(.<patch rev) define('PMA_DRIZZLE', PMA_MYSQL_MAJOR_VERSION >= 2009); } @@ -1198,9 +1240,17 @@ function PMA_DBI_postConnect($link, $is_controluser = false) if (!PMA_DRIZZLE) { if (! empty($GLOBALS['collation_connection'])) { PMA_DBI_query("SET CHARACTER SET 'utf8';", $link, PMA_DBI_QUERY_STORE); - PMA_DBI_query("SET collation_connection = '" . PMA_sqlAddSlashes($GLOBALS['collation_connection']) . "';", $link, PMA_DBI_QUERY_STORE); + PMA_DBI_query( + "SET collation_connection = '" . PMA_sqlAddSlashes($GLOBALS['collation_connection']) . "';", + $link, + PMA_DBI_QUERY_STORE + ); } else { - PMA_DBI_query("SET NAMES 'utf8' COLLATE 'utf8_general_ci';", $link, PMA_DBI_QUERY_STORE); + PMA_DBI_query( + "SET NAMES 'utf8' COLLATE 'utf8_general_ci';", + $link, + PMA_DBI_QUERY_STORE + ); } } @@ -1286,11 +1336,12 @@ function PMA_DBI_fetch_value($result, $row_number = 0, $field = 0, $link = null) * * @param string|mysql_result $result query or mysql result * @param string $type NUM|ASSOC|BOTH - * returned array should either numeric - * associativ or booth + * returned array should either numeric + * associativ or booth * @param resource $link mysql link - * @return array|boolean first row from result - * or false if result is empty + * + * @return array|boolean first row from result + * or false if result is empty */ function PMA_DBI_fetch_single_row($result, $type = 'ASSOC', $link = null) { @@ -1365,12 +1416,13 @@ function PMA_DBI_fetch_single_row($result, $type = 'ASSOC', $link = null) * * @param string|mysql_result $result query or mysql result * @param string|integer $key field-name or offset - * used as key for array + * used as key for array * @param string|integer $value value-name or offset - * used as value for array + * used as value for array * @param resource $link mysql link * @param mixed $options - * @return array resultrows or values indexed by $key + * + * @return array resultrows or values indexed by $key */ function PMA_DBI_fetch_result($result, $key = null, $value = null, $link = null, $options = 0) @@ -1460,7 +1512,7 @@ function PMA_DBI_fetch_result($result, $key = null, $value = null, /** * Get supported SQL compatibility modes * - * @return array supported SQL compatibility modes + * @return array supported SQL compatibility modes */ function PMA_DBI_getCompatibilities() { @@ -1489,7 +1541,8 @@ function PMA_DBI_getCompatibilities() * returns warnings for last query * * @param resource $link mysql link resource - * @return array warnings + * + * @return array warnings */ function PMA_DBI_get_warnings($link = null) { @@ -1508,7 +1561,7 @@ function PMA_DBI_get_warnings($link = null) * returns true (int > 0) if current user is superuser * otherwise 0 * - * @return integer $is_superuser + * @return bool Whether use is a superuser */ function PMA_isSuperuser() { @@ -1519,13 +1572,19 @@ function PMA_isSuperuser() // when connection failed we don't have a $userlink if (isset($GLOBALS['userlink'])) { if (PMA_DRIZZLE) { - // Drizzle has no authorization by default, so when no plugin is enabled everyone is a superuser + // Drizzle has no authorization by default, so when no plugin is + // enabled everyone is a superuser // Known authorization libraries: regex_policy, simple_user_policy - // Plugins limit object visibility (dbs, tables, processes), we can safely assume we always deal with superuser + // Plugins limit object visibility (dbs, tables, processes), we can + // safely assume we always deal with superuser $r = true; } else { // check access to mysql.user table - $r = (bool) PMA_DBI_try_query('SELECT COUNT(*) FROM mysql.user', $GLOBALS['userlink'], PMA_DBI_QUERY_STORE); + $r = (bool) PMA_DBI_try_query( + 'SELECT COUNT(*) FROM mysql.user', + $GLOBALS['userlink'], + PMA_DBI_QUERY_STORE + ); } PMA_cacheSet('is_superuser', $r, true); } else { @@ -1538,11 +1597,11 @@ function PMA_isSuperuser() /** * returns an array of PROCEDURE or FUNCTION names for a db * - * @param string $db db name - * @param string $which PROCEDURE | FUNCTION - * @param resource $link mysql link + * @param string $db db name + * @param string $which PROCEDURE | FUNCTION + * @param resource $link mysql link * - * @return array the procedure names or function names + * @returnarray the procedure names or function names */ function PMA_DBI_get_procedures_or_functions($db, $which, $link = null) { @@ -1563,12 +1622,12 @@ function PMA_DBI_get_procedures_or_functions($db, $which, $link = null) /** * returns the definition of a specific PROCEDURE, FUNCTION, EVENT or VIEW * - * @param string $db db name - * @param string $which PROCEDURE | FUNCTION | EVENT | VIEW - * @param string $name the procedure|function|event|view name - * @param resource $link mysql link + * @param string $db db name + * @param string $which PROCEDURE | FUNCTION | EVENT | VIEW + * @param string $name the procedure|function|event|view name + * @param resource $link mysql link * - * @return string the definition + * @return string the definition */ function PMA_DBI_get_definition($db, $which, $name, $link = null) { @@ -1578,18 +1637,19 @@ function PMA_DBI_get_definition($db, $which, $name, $link = null) 'EVENT' => 'Create Event', 'VIEW' => 'Create View' ); - $query = 'SHOW CREATE ' . $which . ' ' . PMA_backquote($db) . '.' . PMA_backquote($name); + $query = 'SHOW CREATE ' . $which . ' ' + . PMA_backquote($db) . '.' . PMA_backquote($name); return(PMA_DBI_fetch_value($query, 0, $returned_field[$which])); } /** * returns details about the TRIGGERs for a specific table or database * - * @param string $db db name - * @param string $table table name - * @param string $delimiter the delimiter to use (may be empty) + * @param string $db db name + * @param string $table table name + * @param string $delimiter the delimiter to use (may be empty) * - * @return array information about triggers (may be empty) + * @return array information about triggers (may be empty) */ function PMA_DBI_get_triggers($db, $table = '', $delimiter = '//') { @@ -1603,7 +1663,12 @@ function PMA_DBI_get_triggers($db, $table = '', $delimiter = '//') // Note: in http://dev.mysql.com/doc/refman/5.0/en/faqs-triggers.html // their example uses WHERE TRIGGER_SCHEMA='dbname' so let's use this // instead of WHERE EVENT_OBJECT_SCHEMA='dbname' - $query = "SELECT TRIGGER_SCHEMA, TRIGGER_NAME, EVENT_MANIPULATION, EVENT_OBJECT_TABLE, ACTION_TIMING, ACTION_STATEMENT, EVENT_OBJECT_SCHEMA, EVENT_OBJECT_TABLE, DEFINER FROM information_schema.TRIGGERS WHERE TRIGGER_SCHEMA= '" . PMA_sqlAddSlashes($db) . "'"; + $query = 'SELECT TRIGGER_SCHEMA, TRIGGER_NAME, EVENT_MANIPULATION' + . ', EVENT_OBJECT_TABLE, ACTION_TIMING, ACTION_STATEMENT' + . ', EVENT_OBJECT_SCHEMA, EVENT_OBJECT_TABLE, DEFINER' + . ' FROM information_schema.TRIGGERS' + . ' WHERE TRIGGER_SCHEMA= \'' . PMA_sqlAddSlashes($db) . '\''; + if (! empty($table)) { $query .= " AND EVENT_OBJECT_TABLE = '" . PMA_sqlAddSlashes($table) . "';"; } @@ -1635,8 +1700,15 @@ function PMA_DBI_get_triggers($db, $table = '', $delimiter = '//') // do not prepend the schema name; this way, importing the // definition into another schema will work $one_result['full_trigger_name'] = PMA_backquote($trigger['TRIGGER_NAME']); - $one_result['drop'] = 'DROP TRIGGER IF EXISTS ' . $one_result['full_trigger_name']; - $one_result['create'] = 'CREATE TRIGGER ' . $one_result['full_trigger_name'] . ' ' . $trigger['ACTION_TIMING']. ' ' . $trigger['EVENT_MANIPULATION'] . ' ON ' . PMA_backquote($trigger['EVENT_OBJECT_TABLE']) . "\n" . ' FOR EACH ROW ' . $trigger['ACTION_STATEMENT'] . "\n" . $delimiter . "\n"; + $one_result['drop'] = 'DROP TRIGGER IF EXISTS ' + . $one_result['full_trigger_name']; + $one_result['create'] = 'CREATE TRIGGER ' + . $one_result['full_trigger_name'] . ' ' + . $trigger['ACTION_TIMING']. ' ' + . $trigger['EVENT_MANIPULATION'] + . ' ON ' . PMA_backquote($trigger['EVENT_OBJECT_TABLE']) + . "\n" . ' FOR EACH ROW ' + . $trigger['ACTION_STATEMENT'] . "\n" . $delimiter . "\n"; $result[] = $one_result; } @@ -1657,7 +1729,7 @@ function PMA_DBI_get_triggers($db, $table = '', $delimiter = '//') * This is needed because some errors messages cannot * be obtained by mysql_error(). * - * @param int $error_number Error code + * @param int $error_number Error code * @param string $error_message Error message as returned by server * * @return string HML text with error details @@ -1692,11 +1764,12 @@ function PMA_DBI_formatError($error_number, $error_message) } /** - * Checks whether given schema is a system schema: information_schema (MySQL and Drizzle) - * or data_dictionary (Drizzle) + * Checks whether given schema is a system schema: information_schema + * (MySQL and Drizzle) or data_dictionary (Drizzle) * - * @param string $schema_name - * @param bool $test_for_mysql_schema Whether 'mysql' schema should be treated the same as IS and DD + * @param string $schema_name Name of schema (database) to test + * @param bool $test_for_mysql_schema Whether 'mysql' schema should + * be treated the same as IS and DD * @return bool */ function PMA_is_system_schema($schema_name, $test_for_mysql_schema = false) hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7-21571-ge56949f
by Michal Čihař 25 Oct '11

25 Oct '11

The branch, master has been updated via e56949f160b9de33a8ca642e6d9d8efa81c112fe (commit) from dea67b9dfe435cea0e2919c173416a5d190429f5 (commit) - Log ----------------------------------------------------------------- commit e56949f160b9de33a8ca642e6d9d8efa81c112fe Author: Michal Čihař <mcihar(a)suse.cz> Date: Tue Oct 25 10:13:17 2011 +0200 Use package name PhpMyAdmin Needed to match phpdoc rules as package name must begin with upper case. ----------------------------------------------------------------------- Summary of changes: browse_foreigners.php | 2 +- changelog.php | 2 +- chk_rel.php | 2 +- config.sample.inc.php | 2 +- db_create.php | 2 +- db_datadict.php | 2 +- db_events.php | 2 +- db_export.php | 2 +- db_import.php | 2 +- db_operations.php | 2 +- db_printview.php | 2 +- db_qbe.php | 2 +- db_routines.php | 2 +- db_search.php | 2 +- db_sql.php | 2 +- db_structure.php | 2 +- db_tracking.php | 2 +- db_triggers.php | 2 +- enum_editor.php | 2 +- export.php | 2 +- file_echo.php | 2 +- import.php | 2 +- import_status.php | 2 +- index.php | 2 +- js/get_image.js.php | 2 +- js/messages.php | 2 +- js/pmd/ajax.js | 2 +- js/pmd/iecanvas.js | 2 +- js/pmd/move.js | 2 +- libraries/Advisor.class.php | 2 +- libraries/Config.class.php | 4 ++-- libraries/Error.class.php | 4 ++-- libraries/Error_Handler.class.php | 4 ++-- libraries/File.class.php | 4 ++-- libraries/Index.class.php | 6 +++--- libraries/List.class.php | 4 ++-- libraries/List_Database.class.php | 4 ++-- libraries/Message.class.php | 4 ++-- libraries/PMA.php | 4 ++-- libraries/Partition.class.php | 4 ++-- libraries/RecentTable.class.php | 4 ++-- libraries/StorageEngine.class.php | 4 ++-- libraries/Table.class.php | 4 ++-- libraries/Theme.class.php | 4 ++-- libraries/Theme_Manager.class.php | 4 ++-- libraries/Tracker.class.php | 4 ++-- libraries/auth/config.auth.lib.php | 2 +- libraries/auth/cookie.auth.lib.php | 2 +- libraries/auth/http.auth.lib.php | 2 +- libraries/auth/signon.auth.lib.php | 2 +- libraries/bookmark.lib.php | 2 +- libraries/build_html_for_db.lib.php | 2 +- libraries/charset_conversion.lib.php | 2 +- libraries/check_user_privileges.lib.php | 2 +- libraries/cleanup.lib.php | 2 +- libraries/common.inc.php | 2 +- libraries/common.lib.php | 2 +- libraries/config.default.php | 2 +- libraries/config.values.php | 2 +- libraries/config/ConfigFile.class.php | 2 +- libraries/config/Form.class.php | 2 +- libraries/config/FormDisplay.class.php | 2 +- libraries/config/FormDisplay.tpl.php | 2 +- libraries/config/config_functions.lib.php | 2 +- libraries/config/messages.inc.php | 2 +- libraries/config/setup.forms.php | 2 +- libraries/config/user_preferences.forms.php | 2 +- libraries/config/validate.lib.php | 2 +- libraries/core.lib.php | 2 +- libraries/data_dictionary_relations.lib.php | 2 +- libraries/data_drizzle.inc.php | 2 +- libraries/data_mysql.inc.php | 2 +- libraries/database_interface.lib.php | 2 +- libraries/db_common.inc.php | 2 +- libraries/db_info.inc.php | 2 +- libraries/db_links.inc.php | 2 +- libraries/db_structure.lib.php | 2 +- libraries/db_table_exists.lib.php | 2 +- libraries/dbi/drizzle-wrappers.lib.php | 2 +- libraries/dbi/drizzle.dbi.lib.php | 2 +- libraries/dbi/mysql.dbi.lib.php | 2 +- libraries/dbi/mysqli.dbi.lib.php | 2 +- libraries/display_change_password.lib.php | 2 +- libraries/display_create_database.lib.php | 2 +- libraries/display_create_table.lib.php | 2 +- libraries/display_export.lib.php | 2 +- libraries/display_import.lib.php | 2 +- libraries/display_import_ajax.lib.php | 2 +- libraries/display_select_lang.lib.php | 2 +- libraries/display_tbl.lib.php | 2 +- libraries/engines/bdb.lib.php | 4 ++-- libraries/engines/berkeleydb.lib.php | 4 ++-- libraries/engines/binlog.lib.php | 4 ++-- libraries/engines/innobase.lib.php | 4 ++-- libraries/engines/innodb.lib.php | 4 ++-- libraries/engines/memory.lib.php | 4 ++-- libraries/engines/merge.lib.php | 4 ++-- libraries/engines/mrg_myisam.lib.php | 4 ++-- libraries/engines/myisam.lib.php | 4 ++-- libraries/engines/ndbcluster.lib.php | 4 ++-- libraries/engines/pbms.lib.php | 4 ++-- libraries/engines/pbxt.lib.php | 4 ++-- libraries/error.inc.php | 2 +- libraries/export/codegen.php | 4 ++-- libraries/export/csv.php | 2 +- libraries/export/excel.php | 2 +- libraries/export/htmlword.php | 2 +- libraries/export/json.php | 2 +- libraries/export/latex.php | 2 +- libraries/export/mediawiki.php | 2 +- libraries/export/ods.php | 2 +- libraries/export/odt.php | 2 +- libraries/export/pdf.php | 4 ++-- libraries/export/php_array.php | 2 +- libraries/export/sql.php | 2 +- libraries/export/texytext.php | 2 +- libraries/export/xml.php | 2 +- libraries/export/yaml.php | 2 +- libraries/file_listing.php | 2 +- libraries/footer.inc.php | 2 +- libraries/gis/pma_gis_factory.php | 2 +- libraries/gis/pma_gis_geometry.php | 2 +- libraries/gis/pma_gis_geometrycollection.php | 2 +- libraries/gis/pma_gis_linestring.php | 2 +- libraries/gis/pma_gis_multilinestring.php | 2 +- libraries/gis/pma_gis_multipoint.php | 2 +- libraries/gis/pma_gis_multipolygon.php | 2 +- libraries/gis/pma_gis_point.php | 2 +- libraries/gis/pma_gis_polygon.php | 2 +- libraries/gis/pma_gis_visualization.php | 2 +- libraries/gis_visualization.lib.php | 2 +- libraries/grab_globals.lib.php | 2 +- libraries/header.inc.php | 2 +- libraries/header_http.inc.php | 2 +- libraries/header_meta_style.inc.php | 2 +- libraries/header_printview.inc.php | 2 +- libraries/header_scripts.inc.php | 2 +- libraries/iconv_wrapper.lib.php | 2 +- libraries/import.lib.php | 2 +- libraries/import/csv.php | 2 +- libraries/import/docsql.php | 2 +- libraries/import/ldi.php | 2 +- libraries/import/ods.php | 2 +- libraries/import/shp.php | 2 +- libraries/import/sql.php | 2 +- libraries/import/upload/apc.php | 2 +- libraries/import/upload/noplugin.php | 2 +- libraries/import/upload/uploadprogress.php | 2 +- libraries/import/xml.php | 2 +- libraries/information_schema_relations.lib.php | 2 +- libraries/ip_allow_deny.lib.php | 2 +- libraries/js_escape.lib.php | 2 +- libraries/kanji-encoding.lib.php | 2 +- libraries/logging.lib.php | 2 +- libraries/mime.lib.php | 2 +- libraries/mult_submits.inc.php | 2 +- libraries/mysql_charsets.lib.php | 2 +- libraries/navigation_header.inc.php | 2 +- libraries/ob.lib.php | 2 +- libraries/opendocument.lib.php | 2 +- libraries/parse_analyze.lib.php | 2 +- libraries/plugin_interface.lib.php | 2 +- libraries/pmd_common.php | 2 +- libraries/relation.lib.php | 2 +- libraries/relation_cleanup.lib.php | 2 +- libraries/replication.inc.php | 2 +- libraries/replication_gui.lib.php | 2 +- libraries/rte/rte_events.lib.php | 2 +- libraries/rte/rte_export.lib.php | 2 +- libraries/rte/rte_footer.lib.php | 2 +- libraries/rte/rte_list.lib.php | 2 +- libraries/rte/rte_main.inc.php | 2 +- libraries/rte/rte_routines.lib.php | 2 +- libraries/rte/rte_triggers.lib.php | 2 +- libraries/sanitizing.lib.php | 2 +- libraries/schema/Dia_Relation_Schema.class.php | 2 +- libraries/schema/Eps_Relation_Schema.class.php | 2 +- libraries/schema/Export_Relation_Schema.class.php | 2 +- libraries/schema/Pdf_Relation_Schema.class.php | 2 +- libraries/schema/Svg_Relation_Schema.class.php | 2 +- libraries/schema/User_Schema.class.php | 2 +- libraries/schema/Visio_Relation_Schema.class.php | 2 +- libraries/select_lang.lib.php | 2 +- libraries/select_server.lib.php | 2 +- libraries/server_common.inc.php | 2 +- libraries/server_links.inc.php | 2 +- libraries/server_synchronize.lib.php | 2 +- libraries/session.inc.php | 2 +- libraries/sql_query_form.lib.php | 2 +- libraries/sqlparser.data.php | 2 +- libraries/sqlparser.lib.php | 2 +- libraries/sqlvalidator.class.php | 4 ++-- libraries/sqlvalidator.lib.php | 2 +- libraries/string.lib.php | 2 +- libraries/string_mb.lib.php | 2 +- libraries/string_native.lib.php | 2 +- libraries/string_type_ctype.lib.php | 2 +- libraries/string_type_native.lib.php | 2 +- libraries/svg_plot/pma_scatter_plot.php | 2 +- libraries/svg_plot/pma_svg_data_element.php | 2 +- libraries/svg_plot/pma_svg_data_point.php | 2 +- libraries/sysinfo.lib.php | 2 +- libraries/tbl_common.php | 2 +- libraries/tbl_info.inc.php | 2 +- libraries/tbl_links.inc.php | 2 +- libraries/tbl_properties.inc.php | 2 +- libraries/tbl_replace_fields.inc.php | 2 +- libraries/tbl_select.lib.php | 2 +- libraries/transformations.lib.php | 2 +- .../application_octetstream__download.inc.php | 2 +- .../application_octetstream__hex.inc.php | 2 +- libraries/transformations/global.inc.php | 2 +- .../transformations/image_jpeg__inline.inc.php | 2 +- libraries/transformations/image_jpeg__link.inc.php | 2 +- .../transformations/image_png__inline.inc.php | 2 +- .../transformations/text_plain__dateformat.inc.php | 2 +- .../transformations/text_plain__external.inc.php | 2 +- .../transformations/text_plain__formatted.inc.php | 2 +- .../transformations/text_plain__imagelink.inc.php | 2 +- libraries/transformations/text_plain__link.inc.php | 2 +- .../transformations/text_plain__longToIpv4.inc.php | 2 +- libraries/transformations/text_plain__sql.inc.php | 2 +- .../transformations/text_plain__substr.inc.php | 2 +- libraries/url_generating.lib.php | 2 +- libraries/user_preferences.inc.php | 2 +- libraries/user_preferences.lib.php | 2 +- libraries/vendor_config.php | 2 +- libraries/zip.lib.php | 4 ++-- license.php | 2 +- main.php | 2 +- navigation.php | 2 +- phpinfo.php | 2 +- phpmyadmin.css.php | 2 +- pmd_display_field.php | 2 +- pmd_general.php | 2 +- pmd_pdf.php | 2 +- pmd_relation_new.php | 2 +- pmd_relation_upd.php | 2 +- pmd_save_pos.php | 2 +- prefs_forms.php | 2 +- prefs_manage.php | 2 +- querywindow.php | 2 +- schema_edit.php | 2 +- schema_export.php | 2 +- scripts/decode_bug.php | 2 +- scripts/openid.php | 2 +- scripts/signon-script.php | 2 +- scripts/signon.php | 2 +- server_binlog.php | 2 +- server_collations.php | 2 +- server_databases.php | 2 +- server_engines.php | 2 +- server_export.php | 2 +- server_import.php | 2 +- server_plugins.php | 2 +- server_privileges.php | 2 +- server_replication.php | 2 +- server_sql.php | 2 +- server_status.php | 2 +- server_synchronize.php | 2 +- server_variables.php | 2 +- setup/config.php | 2 +- setup/frames/config.inc.php | 2 +- setup/frames/form.inc.php | 2 +- setup/frames/index.inc.php | 2 +- setup/frames/menu.inc.php | 2 +- setup/frames/servers.inc.php | 2 +- setup/lib/ConfigGenerator.class.php | 4 ++-- setup/lib/common.inc.php | 2 +- setup/lib/form_processing.lib.php | 2 +- setup/lib/index.lib.php | 2 +- setup/validate.php | 2 +- show_config_errors.php | 2 +- sql.php | 2 +- tbl_addfield.php | 2 +- tbl_alter.php | 2 +- tbl_change.php | 2 +- tbl_chart.php | 2 +- tbl_create.php | 2 +- tbl_export.php | 2 +- tbl_get_field.php | 2 +- tbl_gis_visualization.php | 2 +- tbl_import.php | 2 +- tbl_indexes.php | 2 +- tbl_move_copy.php | 2 +- tbl_operations.php | 2 +- tbl_printview.php | 2 +- tbl_relation.php | 2 +- tbl_replace.php | 2 +- tbl_row_action.php | 2 +- tbl_select.php | 2 +- tbl_sql.php | 2 +- tbl_structure.php | 2 +- tbl_tracking.php | 2 +- tbl_triggers.php | 2 +- test/AllSeleniumTests.php | 2 +- test/AllTests.php | 2 +- test/Environment_test.php | 4 ++-- test/PMA_showHint_test.php | 2 +- test/classes/Advisor_test.php | 2 +- test/classes/PMA_Config_test.php | 2 +- test/classes/PMA_File_test.php | 2 +- test/classes/PMA_List_Database_test.php | 2 +- test/classes/PMA_Message_test.php | 2 +- test/classes/PMA_PDF_test.php | 2 +- test/classes/PMA_Theme_Manager_test.php | 2 +- test/classes/gis/PMA_GIS_Factory_test.php | 2 +- test/classes/gis/PMA_GIS_Geom_test.php | 2 +- test/classes/gis/PMA_GIS_Geometry_test.php | 2 +- test/classes/gis/PMA_GIS_Linestring_test.php | 2 +- test/classes/gis/PMA_GIS_Multilinestring_test.php | 2 +- test/classes/gis/PMA_GIS_Multipoint_test.php | 2 +- test/classes/gis/PMA_GIS_Multipolygon_test.php | 2 +- test/classes/gis/PMA_GIS_Point_test.php | 2 +- test/classes/gis/PMA_GIS_Polygon_test.php | 2 +- test/libraries/PMA_GIS_modifyQuery_test.php | 2 +- test/libraries/PMA_SQL_parser_data_test.php | 2 +- test/libraries/PMA_SQL_parser_test.php | 2 +- test/libraries/PMA_STR_sub_test.php | 2 +- test/libraries/PMA_blowfish_test.php | 2 +- test/libraries/PMA_escapeJsString_test.php | 2 +- test/libraries/PMA_generateCommonUrl_test.php | 2 +- test/libraries/PMA_sanitize_test.php | 2 +- .../PMA_transformation_getOptions_test.php | 2 +- test/libraries/common/PMA_ajaxResponse_test.php | 2 +- .../libraries/common/PMA_browseUploadFile_test.php | 2 +- .../common/PMA_buildActionTitles_test.php | 2 +- test/libraries/common/PMA_cache_test.php | 2 +- test/libraries/common/PMA_checkParameters_test.php | 2 +- .../PMA_contains_nonprintable_ascii_test.php | 2 +- .../common/PMA_convert_bit_default_value_test.php | 2 +- .../common/PMA_displayMaximumUploadSize_test.php | 2 +- .../common/PMA_display_html_checkbox_test.php | 2 +- .../common/PMA_display_html_radio_test.php | 2 +- .../common/PMA_escapeMySqlWildcards_test.php | 2 +- .../libraries/common/PMA_expandUserString_test.php | 2 +- .../libraries/common/PMA_extractFieldSpec_test.php | 2 +- .../PMA_extractValueFromFormattedSize_test.php | 2 +- .../common/PMA_foreignKeySupported_test.php | 2 +- .../common/PMA_formatNumberByteDown_test.php | 2 +- test/libraries/common/PMA_formatSql_test.php | 2 +- .../common/PMA_generateHiddenMaxFileSize_test.php | 2 +- .../common/PMA_generate_html_dropdown_test.php | 2 +- .../common/PMA_generate_slider_effect_test.php | 2 +- test/libraries/common/PMA_getDbLink_test.php | 2 +- test/libraries/common/PMA_getIcon_test.php | 2 +- .../common/PMA_getTitleForTarget_test.php | 2 +- .../common/PMA_localisedDateTimespan_test.php | 2 +- test/libraries/common/PMA_pow_test.php | 2 +- .../common/PMA_printableBitValue_test.php | 2 +- .../libraries/common/PMA_quoting_slashing_test.php | 2 +- test/libraries/common/PMA_showDocu_test.php | 2 +- .../common/PMA_showMessage_test_disabled.php | 2 +- test/libraries/common/PMA_showPHPDocu_test.php | 2 +- .../libraries/common/PMA_stringOperations_test.php | 2 +- .../common/PMA_unsupportedDatatypes_test.php | 2 +- test/libraries/common/PMA_whichCrlf_test.php | 2 +- test/libraries/core/PMA_array_test.php | 2 +- test/libraries/core/PMA_checkPageValidity_test.php | 2 +- test/libraries/core/PMA_fatalError_test.php | 2 +- test/libraries/core/PMA_getLinks_test.php | 2 +- test/libraries/core/PMA_getTableCount_test_dis.php | 2 +- test/libraries/core/PMA_get_real_size_test.php | 2 +- .../core/PMA_headerLocation_test_disabled.php | 4 ++-- test/libraries/core/PMA_ifSetOr_test.php | 2 +- test/libraries/core/PMA_isValid_test.php | 2 +- test/libraries/core/PMA_securePath_test.php | 2 +- .../core/PMA_warnMissingExtension_test.php | 2 +- test/libraries/js_escape_test.php | 2 +- test/libraries/php-gettext/Locales_test.php | 2 +- test/libraries/php-gettext/Parsing_test.php | 2 +- .../rte/PMA_EVN_getDataFromRequest_test.php | 2 +- test/libraries/rte/PMA_EVN_getEditorForm_test.php | 2 +- .../rte/PMA_EVN_getQueryFromRequest_test.php | 2 +- .../libraries/rte/PMA_RTN_ParameterParser_test.php | 2 +- .../rte/PMA_RTN_getDataFromRequest_test.php | 2 +- test/libraries/rte/PMA_RTN_getEditorForm_test.php | 2 +- test/libraries/rte/PMA_RTN_getExecuteForm_test.php | 2 +- .../rte/PMA_RTN_getQueryFromRequest_test.php | 2 +- .../rte/PMA_TRI_getDataFromRequest_test.php | 2 +- test/libraries/rte/PMA_TRI_getEditorForm_test.php | 2 +- .../rte/PMA_TRI_getQueryFromRequest_test.php | 2 +- .../libraries/select_lang/PMA_langDetails_test.php | 2 +- test/libraries/select_lang/PMA_langList_test.php | 2 +- test/libraries/select_lang/PMA_langName_test.php | 2 +- test/selenium/PmaSeleniumLoginTest.php | 2 +- test/selenium/PmaSeleniumPrivilegesTest.php | 2 +- test/selenium/PmaSeleniumTestCase.php | 2 +- test/selenium/PmaSeleniumXssTest.php | 2 +- test/theme.php | 2 +- test/wui.php | 2 +- themes.php | 2 +- themes/original/css/theme_left.css.php | 2 +- themes/original/css/theme_print.css.php | 2 +- themes/original/css/theme_right.css.php | 2 +- themes/original/info.inc.php | 2 +- themes/original/layout.inc.php | 2 +- themes/pmahomme/css/theme_left.css.php | 2 +- themes/pmahomme/css/theme_print.css.php | 2 +- themes/pmahomme/css/theme_right.css.php | 2 +- themes/pmahomme/info.inc.php | 2 +- themes/pmahomme/layout.inc.php | 2 +- themes/sprites.css.php | 2 +- themes/svg_gradient.php | 2 +- transformation_overview.php | 2 +- transformation_wrapper.php | 2 +- user_password.php | 2 +- view_create.php | 2 +- view_operations.php | 2 +- webapp.php | 2 +- 410 files changed, 446 insertions(+), 446 deletions(-) diff --git a/browse_foreigners.php b/browse_foreigners.php index 1a81504..ab5385c 100644 --- a/browse_foreigners.php +++ b/browse_foreigners.php @@ -3,7 +3,7 @@ /** * display selection for relational field values * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/changelog.php b/changelog.php index 9892638..8cc66e0 100644 --- a/changelog.php +++ b/changelog.php @@ -3,7 +3,7 @@ /** * Simple script to set correct charset for changelog * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/chk_rel.php b/chk_rel.php index d13f075..e838d2e 100644 --- a/chk_rel.php +++ b/chk_rel.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/config.sample.inc.php b/config.sample.inc.php index 70d2666..aa363d6 100644 --- a/config.sample.inc.php +++ b/config.sample.inc.php @@ -7,7 +7,7 @@ * All directives are explained in Documentation.html and on phpMyAdmin * wiki <http://wiki.phpmyadmin.net>. * - * @package phpMyAdmin + * @package PhpMyAdmin */ /* diff --git a/db_create.php b/db_create.php index fe86dc9..2402705 100644 --- a/db_create.php +++ b/db_create.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/db_datadict.php b/db_datadict.php index e99ccf5..1f62a09 100644 --- a/db_datadict.php +++ b/db_datadict.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/db_events.php b/db_events.php index 6d18641..7716fb0 100644 --- a/db_events.php +++ b/db_events.php @@ -3,7 +3,7 @@ /** * Events management. * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/db_export.php b/db_export.php index 5c880dd..326b73a 100644 --- a/db_export.php +++ b/db_export.php @@ -3,7 +3,7 @@ /** * dumps a database * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/db_import.php b/db_import.php index f39f7c8..fcf56b6 100644 --- a/db_import.php +++ b/db_import.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/db_operations.php b/db_operations.php index 6589587..4461d71 100644 --- a/db_operations.php +++ b/db_operations.php @@ -9,7 +9,7 @@ * - adding tables * - viewing PDF schemas * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/db_printview.php b/db_printview.php index a03b8b1..acd0d9f 100644 --- a/db_printview.php +++ b/db_printview.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/db_qbe.php b/db_qbe.php index de09953..b4249bf 100644 --- a/db_qbe.php +++ b/db_qbe.php @@ -3,7 +3,7 @@ /** * query by example the whole database * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/db_routines.php b/db_routines.php index 633a848..1d4ee0c 100644 --- a/db_routines.php +++ b/db_routines.php @@ -3,7 +3,7 @@ /** * Routines management. * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/db_search.php b/db_search.php index 88ae5d3..da4863f 100644 --- a/db_search.php +++ b/db_search.php @@ -5,7 +5,7 @@ * * @todo make use of UNION when searching multiple tables * @todo display executed query, optional? - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/db_sql.php b/db_sql.php index 2f495ac..9b4e74d 100644 --- a/db_sql.php +++ b/db_sql.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/db_structure.php b/db_structure.php index 326680b..16df6a7 100644 --- a/db_structure.php +++ b/db_structure.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/db_tracking.php b/db_tracking.php index d00d106..1078fa2 100644 --- a/db_tracking.php +++ b/db_tracking.php @@ -1,7 +1,7 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/db_triggers.php b/db_triggers.php index 66a1085..210dbfd 100644 --- a/db_triggers.php +++ b/db_triggers.php @@ -3,7 +3,7 @@ /** * Triggers management. * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/enum_editor.php b/enum_editor.php index 77bf097..e7bba62 100644 --- a/enum_editor.php +++ b/enum_editor.php @@ -5,7 +5,7 @@ * Displays a form for editing ENUM and SET values with more space (as an alternative to doing it in tbl_alter.php) * This form is only for users with JavaScript disabled -- users with JavaScript enabled will see a different form * defined in tbl_properties.inc.php - * @package phpMyAdmin + * @package PhpMyAdmin */ require_once './libraries/common.inc.php'; diff --git a/export.php b/export.php index ba3d883..d91c0eb 100644 --- a/export.php +++ b/export.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * Main export hanling code - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/file_echo.php b/file_echo.php index bdfc173..d3391fc 100644 --- a/file_echo.php +++ b/file_echo.php @@ -4,7 +4,7 @@ * "Echo" service to allow force downloading of exported charts (png or svg) * and server status monitor settings * - * @package phpMyAdmin + * @package PhpMyAdmin */ require_once './libraries/common.inc.php'; diff --git a/import.php b/import.php index fab1d3f..c6cec25 100644 --- a/import.php +++ b/import.php @@ -3,7 +3,7 @@ /** * Core script for import, this is just the glue around all other stuff * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/import_status.php b/import_status.php index 75a3361..ebe3a97 100644 --- a/import_status.php +++ b/import_status.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ require_once './libraries/common.inc.php'; diff --git a/index.php b/index.php index c8c7756..f94bdbf 100644 --- a/index.php +++ b/index.php @@ -4,7 +4,7 @@ * forms frameset * * or common.inc.php - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/js/get_image.js.php b/js/get_image.js.php index 6064731..b327844 100644 --- a/js/get_image.js.php +++ b/js/get_image.js.php @@ -4,7 +4,7 @@ * Provides the functionality for retreiving images * which may be actual images or an icon from a sprite * - * @package phpMyAdmin + * @package PhpMyAdmin */ chdir('..'); diff --git a/js/messages.php b/js/messages.php index 96f759b..e966f9b 100644 --- a/js/messages.php +++ b/js/messages.php @@ -3,7 +3,7 @@ /** * Exporting of translated messages from PHP to Javascript * - * @package phpMyAdmin + * @package PhpMyAdmin */ chdir('..'); diff --git a/js/pmd/ajax.js b/js/pmd/ajax.js index 7f48147..bd23dc5 100644 --- a/js/pmd/ajax.js +++ b/js/pmd/ajax.js @@ -1,7 +1,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin-Designer + * @package PhpMyAdmin-Designer */ /** diff --git a/js/pmd/iecanvas.js b/js/pmd/iecanvas.js index 5f304b5..60b2200 100644 --- a/js/pmd/iecanvas.js +++ b/js/pmd/iecanvas.js @@ -1,7 +1,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin-Designer + * @package PhpMyAdmin-Designer */ /** diff --git a/js/pmd/move.js b/js/pmd/move.js index 73d7c8f..6bb9717 100644 --- a/js/pmd/move.js +++ b/js/pmd/move.js @@ -1,6 +1,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * @package phpMyAdmin-Designer + * @package PhpMyAdmin-Designer */ /** diff --git a/libraries/Advisor.class.php b/libraries/Advisor.class.php index b43455c..f5ed188 100644 --- a/libraries/Advisor.class.php +++ b/libraries/Advisor.class.php @@ -4,7 +4,7 @@ * A simple rules engine, that parses and executes the rules in advisory_rules.txt. Adjusted to phpMyAdmin * * - * @package phpMyAdmin + * @package PhpMyAdmin */ class Advisor diff --git a/libraries/Config.class.php b/libraries/Config.class.php index e655d9b..a806dfa 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -3,7 +3,7 @@ /** * Configuration handling. * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** @@ -14,7 +14,7 @@ require './libraries/vendor_config.php'; /** * Configuration class * - * @package phpMyAdmin + * @package PhpMyAdmin */ class PMA_Config { diff --git a/libraries/Error.class.php b/libraries/Error.class.php index 1925a61..d332b06 100644 --- a/libraries/Error.class.php +++ b/libraries/Error.class.php @@ -3,7 +3,7 @@ /** * Holds class PMA_Error * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** @@ -14,7 +14,7 @@ require_once './libraries/Message.class.php'; /** * a single error * - * @package phpMyAdmin + * @package PhpMyAdmin */ class PMA_Error extends PMA_Message { diff --git a/libraries/Error_Handler.class.php b/libraries/Error_Handler.class.php index ac132fa..8f14c08 100644 --- a/libraries/Error_Handler.class.php +++ b/libraries/Error_Handler.class.php @@ -3,7 +3,7 @@ /** * Holds class PMA_Error_Handler * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** @@ -14,7 +14,7 @@ require_once './libraries/Error.class.php'; /** * handling errors * - * @package phpMyAdmin + * @package PhpMyAdmin */ class PMA_Error_Handler { diff --git a/libraries/File.class.php b/libraries/File.class.php index 592127b..3745866 100644 --- a/libraries/File.class.php +++ b/libraries/File.class.php @@ -3,14 +3,14 @@ /** * file upload functions * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** * * @todo when uploading a file into a blob field, should we also consider using * chunks like in import? UPDATE `table` SET `field` = `field` + [chunk] - * @package phpMyAdmin + * @package PhpMyAdmin */ class PMA_File { diff --git a/libraries/Index.class.php b/libraries/Index.class.php index 47c9950..d790df9 100644 --- a/libraries/Index.class.php +++ b/libraries/Index.class.php @@ -3,13 +3,13 @@ /** * holds the database index class * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** * @since phpMyAdmin 3.0.0 * - * @package phpMyAdmin + * @package PhpMyAdmin */ class PMA_Index { @@ -580,7 +580,7 @@ class PMA_Index } /** - * @package phpMyAdmin + * @package PhpMyAdmin */ class PMA_Index_Column { diff --git a/libraries/List.class.php b/libraries/List.class.php index 8303227..661073b 100644 --- a/libraries/List.class.php +++ b/libraries/List.class.php @@ -3,14 +3,14 @@ /** * hold the PMA_List base class * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** * @todo add caching * @since phpMyAdmin 2.9.10 * @abstract - * @package phpMyAdmin + * @package PhpMyAdmin */ abstract class PMA_List extends ArrayObject { diff --git a/libraries/List_Database.class.php b/libraries/List_Database.class.php index dd5593a..e528320 100644 --- a/libraries/List_Database.class.php +++ b/libraries/List_Database.class.php @@ -3,7 +3,7 @@ /** * holds the PMA_List_Database class * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** @@ -23,7 +23,7 @@ require_once './libraries/List.class.php'; * @todo ? support --skip-showdatabases and user has only global rights * @access public * @since phpMyAdmin 2.9.10 - * @package phpMyAdmin + * @package PhpMyAdmin */ /*public*/ class PMA_List_Database extends PMA_List { diff --git a/libraries/Message.class.php b/libraries/Message.class.php index 5a6afac..3cae14e 100644 --- a/libraries/Message.class.php +++ b/libraries/Message.class.php @@ -3,7 +3,7 @@ /** * Holds class PMA_Message * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** @@ -54,7 +54,7 @@ * // strSomeLocaleMessage 1 strSomeMoreLocale * // strSomeEvenMoreLocale - some final words * </code> - * @package phpMyAdmin + * @package PhpMyAdmin */ class PMA_Message { diff --git a/libraries/PMA.php b/libraries/PMA.php index ea2c27e..db13bab 100644 --- a/libraries/PMA.php +++ b/libraries/PMA.php @@ -1,7 +1,7 @@ <?php /** * Enter description here... - * @package phpMyAdmin + * @package PhpMyAdmin * */ @@ -15,7 +15,7 @@ require_once './libraries/List_Database.class.php'; * * * - * @package phpMyAdmin + * @package PhpMyAdmin */ class PMA { diff --git a/libraries/Partition.class.php b/libraries/Partition.class.php index 6c5f256..0fb68c4 100644 --- a/libraries/Partition.class.php +++ b/libraries/Partition.class.php @@ -3,13 +3,13 @@ /** * Library for extracting information about the partitions * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** * base Partition Class - * @package phpMyAdmin + * @package PhpMyAdmin */ class PMA_Partition { diff --git a/libraries/RecentTable.class.php b/libraries/RecentTable.class.php index def9c37..1e85899 100644 --- a/libraries/RecentTable.class.php +++ b/libraries/RecentTable.class.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ require_once './libraries/Message.class.php'; @@ -12,7 +12,7 @@ require_once './libraries/Message.class.php'; * * @TODO Change the release version in table pma_recent (#recent in Documentation.html) * - * @package phpMyAdmin + * @package PhpMyAdmin */ class PMA_RecentTable { diff --git a/libraries/StorageEngine.class.php b/libraries/StorageEngine.class.php index de30ad7..4f98a4a 100644 --- a/libraries/StorageEngine.class.php +++ b/libraries/StorageEngine.class.php @@ -3,7 +3,7 @@ /** * Library for extracting information about the available storage engines * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** @@ -21,7 +21,7 @@ define('PMA_ENGINE_DETAILS_TYPE_BOOLEAN', 3); // 'ON' or 'OFF' /** * base Storage Engine Class - * @package phpMyAdmin + * @package PhpMyAdmin */ class PMA_StorageEngine { diff --git a/libraries/Table.class.php b/libraries/Table.class.php index 7878b8e..0f91593 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -2,12 +2,12 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** * @todo make use of PMA_Message and PMA_Error - * @package phpMyAdmin + * @package PhpMyAdmin */ class PMA_Table { diff --git a/libraries/Theme.class.php b/libraries/Theme.class.php index bc5635d..11ebb0d 100644 --- a/libraries/Theme.class.php +++ b/libraries/Theme.class.php @@ -3,7 +3,7 @@ /** * hold PMA_Theme class * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** @@ -14,7 +14,7 @@ * @todo make css optionally replacing 'parent' css or extending it (by appending at the end) * @todo add an optional global css file - which will be used for both frames * - * @package phpMyAdmin + * @package PhpMyAdmin */ class PMA_Theme { diff --git a/libraries/Theme_Manager.class.php b/libraries/Theme_Manager.class.php index 840e611..68468e1 100644 --- a/libraries/Theme_Manager.class.php +++ b/libraries/Theme_Manager.class.php @@ -2,12 +2,12 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ class PMA_Theme_Manager { diff --git a/libraries/Tracker.class.php b/libraries/Tracker.class.php index 97f62f0..07d1768 100644 --- a/libraries/Tracker.class.php +++ b/libraries/Tracker.class.php @@ -2,14 +2,14 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** * This class tracks changes on databases, tables and views. * For more information please see phpMyAdmin/Documentation.html * - * @package phpMyAdmin + * @package PhpMyAdmin * * @todo use stristr instead of strstr */ diff --git a/libraries/auth/config.auth.lib.php b/libraries/auth/config.auth.lib.php index 573bede..3c1e527 100644 --- a/libraries/auth/config.auth.lib.php +++ b/libraries/auth/config.auth.lib.php @@ -3,7 +3,7 @@ /** * Set of functions used to run config authentication (ie no authentication). * - * @package phpMyAdmin-Auth-Config + * @package PhpMyAdmin-Auth-Config */ diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php index c50f2e3..c21dbd6 100644 --- a/libraries/auth/cookie.auth.lib.php +++ b/libraries/auth/cookie.auth.lib.php @@ -3,7 +3,7 @@ /** * Set of functions used to run cookie based authentication. * - * @package phpMyAdmin-Auth-Cookie + * @package PhpMyAdmin-Auth-Cookie */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/auth/http.auth.lib.php b/libraries/auth/http.auth.lib.php index b54cf34..147a507 100644 --- a/libraries/auth/http.auth.lib.php +++ b/libraries/auth/http.auth.lib.php @@ -4,7 +4,7 @@ * Set of functions used to run http authentication. * NOTE: Requires PHP loaded as a Apache module. * - * @package phpMyAdmin-Auth-HTTP + * @package PhpMyAdmin-Auth-HTTP */ diff --git a/libraries/auth/signon.auth.lib.php b/libraries/auth/signon.auth.lib.php index fb105c2..1363a9e 100644 --- a/libraries/auth/signon.auth.lib.php +++ b/libraries/auth/signon.auth.lib.php @@ -3,7 +3,7 @@ /** * Set of functions used to run single signon authentication. * - * @package phpMyAdmin-Auth-Signon + * @package PhpMyAdmin-Auth-Signon */ diff --git a/libraries/bookmark.lib.php b/libraries/bookmark.lib.php index 723b042..84b97f8 100644 --- a/libraries/bookmark.lib.php +++ b/libraries/bookmark.lib.php @@ -3,7 +3,7 @@ /** * Set of functions used with the bookmark feature * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/libraries/build_html_for_db.lib.php b/libraries/build_html_for_db.lib.php index 422beff..a6836c8 100644 --- a/libraries/build_html_for_db.lib.php +++ b/libraries/build_html_for_db.lib.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/charset_conversion.lib.php b/libraries/charset_conversion.lib.php index ecd71bc..7c1ac13 100644 --- a/libraries/charset_conversion.lib.php +++ b/libraries/charset_conversion.lib.php @@ -3,7 +3,7 @@ /** * Charset conversion functions. * - * @package phpMyAdmin + * @package PhpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/check_user_privileges.lib.php b/libraries/check_user_privileges.lib.php index 726b4a6..1de903e 100644 --- a/libraries/check_user_privileges.lib.php +++ b/libraries/check_user_privileges.lib.php @@ -3,7 +3,7 @@ /** * Get user's global privileges and some db-specific privileges * - * @package phpMyAdmin + * @package PhpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/cleanup.lib.php b/libraries/cleanup.lib.php index 26a559c..92b5c47 100644 --- a/libraries/cleanup.lib.php +++ b/libraries/cleanup.lib.php @@ -3,7 +3,7 @@ /** * Functions for cleanup of user input. * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/libraries/common.inc.php b/libraries/common.inc.php index 4a81f14..1c7e4d1 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -28,7 +28,7 @@ * - db connection * - authentication work * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 8c3f285..c1463bb 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -3,7 +3,7 @@ /** * Misc functions used all over the scripts. * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/libraries/config.default.php b/libraries/config.default.php index 1d54bdb..e91638d 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -16,7 +16,7 @@ * * All directives are explained in Documentation.html * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/libraries/config.values.php b/libraries/config.values.php index 0e7cd93..6abe3bf 100644 --- a/libraries/config.values.php +++ b/libraries/config.values.php @@ -4,7 +4,7 @@ * Database with allowed values for configuration stored in the $cfg array, * used by setup script and user preferences to generate forms. * - * @package phpMyAdmin + * @package PhpMyAdmin */ if (!defined('PHPMYADMIN')) { diff --git a/libraries/config/ConfigFile.class.php b/libraries/config/ConfigFile.class.php index c1b01ec..dfe2235 100644 --- a/libraries/config/ConfigFile.class.php +++ b/libraries/config/ConfigFile.class.php @@ -3,7 +3,7 @@ /** * Config file management * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/libraries/config/Form.class.php b/libraries/config/Form.class.php index 1ec8073..ffd58b9 100644 --- a/libraries/config/Form.class.php +++ b/libraries/config/Form.class.php @@ -3,7 +3,7 @@ /** * Form handling code. * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/libraries/config/FormDisplay.class.php b/libraries/config/FormDisplay.class.php index 3b217dd..26b3532 100644 --- a/libraries/config/FormDisplay.class.php +++ b/libraries/config/FormDisplay.class.php @@ -10,7 +10,7 @@ * o translated_path - work_path modified for HTML field name, a path with * slashes changed to hyphens, eg. Servers-4-verbose * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/libraries/config/FormDisplay.tpl.php b/libraries/config/FormDisplay.tpl.php index 58d6d3e..d874f87 100644 --- a/libraries/config/FormDisplay.tpl.php +++ b/libraries/config/FormDisplay.tpl.php @@ -3,7 +3,7 @@ /** * Form templates * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/libraries/config/config_functions.lib.php b/libraries/config/config_functions.lib.php index daa335f..5ac2176 100644 --- a/libraries/config/config_functions.lib.php +++ b/libraries/config/config_functions.lib.php @@ -3,7 +3,7 @@ /** * Common config manipulation functions * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php index d938197..f396550 100644 --- a/libraries/config/messages.inc.php +++ b/libraries/config/messages.inc.php @@ -7,7 +7,7 @@ * configuration subsystem, with $strConfig as a prefix, _desc or _name * as a suffix, and the directive name in between. * - * @package phpMyAdmin + * @package PhpMyAdmin */ if (!function_exists('__')) { diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php index 6160456..cddb88d 100644 --- a/libraries/config/setup.forms.php +++ b/libraries/config/setup.forms.php @@ -19,7 +19,7 @@ * End group blocks with: * ':group:end' * - * @package phpMyAdmin-setup + * @package PhpMyAdmin-setup */ $forms = array(); diff --git a/libraries/config/user_preferences.forms.php b/libraries/config/user_preferences.forms.php index 2b0d5e2..e0b2d18 100644 --- a/libraries/config/user_preferences.forms.php +++ b/libraries/config/user_preferences.forms.php @@ -17,7 +17,7 @@ * End group blocks with: * ':group:end' * - * @package phpMyAdmin + * @package PhpMyAdmin */ $forms = array(); diff --git a/libraries/config/validate.lib.php b/libraries/config/validate.lib.php index 989b324..e995c0e 100644 --- a/libraries/config/validate.lib.php +++ b/libraries/config/validate.lib.php @@ -12,7 +12,7 @@ * * Valdiation functions are assigned in $cfg_db['_validators'] (config.values.php). * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/libraries/core.lib.php b/libraries/core.lib.php index 209e4bf..a27bb17 100644 --- a/libraries/core.lib.php +++ b/libraries/core.lib.php @@ -5,7 +5,7 @@ * This script is distinct from libraries/common.inc.php because this * script is called from /test. * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/libraries/data_dictionary_relations.lib.php b/libraries/data_dictionary_relations.lib.php index 51e9dcc..168d715 100644 --- a/libraries/data_dictionary_relations.lib.php +++ b/libraries/data_dictionary_relations.lib.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/libraries/data_drizzle.inc.php b/libraries/data_drizzle.inc.php index 907aac7..7b06ee0 100644 --- a/libraries/data_drizzle.inc.php +++ b/libraries/data_drizzle.inc.php @@ -2,7 +2,7 @@ /** * Column types and functions supported by MySQL * - * @package phpMyAdmin + * @package PhpMyAdmin */ // VARCHAR, TINYINT, TEXT and DATE are listed first, based on estimated popularity diff --git a/libraries/data_mysql.inc.php b/libraries/data_mysql.inc.php index 2571475..9b1bd48 100644 --- a/libraries/data_mysql.inc.php +++ b/libraries/data_mysql.inc.php @@ -2,7 +2,7 @@ /** * Column types and functions supported by MySQL * - * @package phpMyAdmin + * @package PhpMyAdmin */ // VARCHAR, TINYINT, TEXT and DATE are listed first, based on estimated popularity diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index 76faffd..f77a682 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -3,7 +3,7 @@ /** * Common Option Constants For DBI Functions * - * @package phpMyAdmin + * @package PhpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/db_common.inc.php b/libraries/db_common.inc.php index 05ee295..5a3c4f7 100644 --- a/libraries/db_common.inc.php +++ b/libraries/db_common.inc.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/db_info.inc.php b/libraries/db_info.inc.php index 3e5f342..cb5bf4c 100644 --- a/libraries/db_info.inc.php +++ b/libraries/db_info.inc.php @@ -9,7 +9,7 @@ * * speedup view on locked tables * - * @package phpMyAdmin + * @package PhpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/db_links.inc.php b/libraries/db_links.inc.php index 8f49d3f..aa09d79 100644 --- a/libraries/db_links.inc.php +++ b/libraries/db_links.inc.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/db_structure.lib.php b/libraries/db_structure.lib.php index 961c64a..c70b6bf 100644 --- a/libraries/db_structure.lib.php +++ b/libraries/db_structure.lib.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/db_table_exists.lib.php b/libraries/db_table_exists.lib.php index cd74d78..b2f3446 100644 --- a/libraries/db_table_exists.lib.php +++ b/libraries/db_table_exists.lib.php @@ -4,7 +4,7 @@ * Ensure the database and the table exist (else move to the "parent" script) * and display headers * - * @package phpMyAdmin + * @package PhpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/dbi/drizzle-wrappers.lib.php b/libraries/dbi/drizzle-wrappers.lib.php index 14f46a3..8441285 100644 --- a/libraries/dbi/drizzle-wrappers.lib.php +++ b/libraries/dbi/drizzle-wrappers.lib.php @@ -7,7 +7,7 @@ * This wrapper is not complete and hides a lot of original functionality, but allows for easy usage * of the drizzle PHP extension. * - * @package phpMyAdmin-DBI-Drizzle + * @package PhpMyAdmin-DBI-Drizzle */ // TODO: drizzle module segfaults while freeing resources, often. This allows at least for some development diff --git a/libraries/dbi/drizzle.dbi.lib.php b/libraries/dbi/drizzle.dbi.lib.php index 668d0cb..4c32ae1 100644 --- a/libraries/dbi/drizzle.dbi.lib.php +++ b/libraries/dbi/drizzle.dbi.lib.php @@ -8,7 +8,7 @@ * TODO: This file and drizzle-wrappers.lib.php should be devoid of any segault related hacks. * TODO: Crashing versions of drizzle module and/or libdrizzle should be blacklisted * - * @package phpMyAdmin-DBI-Drizzle + * @package PhpMyAdmin-DBI-Drizzle */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php index 13a6136..4e41149 100644 --- a/libraries/dbi/mysql.dbi.lib.php +++ b/libraries/dbi/mysql.dbi.lib.php @@ -3,7 +3,7 @@ /** * Interface to the classic MySQL extension * - * @package phpMyAdmin-DBI-MySQL + * @package PhpMyAdmin-DBI-MySQL */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php index 0355961..3d8a2e2 100644 --- a/libraries/dbi/mysqli.dbi.lib.php +++ b/libraries/dbi/mysqli.dbi.lib.php @@ -3,7 +3,7 @@ /** * Interface to the improved MySQL extension (MySQLi) * - * @package phpMyAdmin-DBI-MySQLi + * @package PhpMyAdmin-DBI-MySQLi */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/display_change_password.lib.php b/libraries/display_change_password.lib.php index 48444a6..3397dd0 100644 --- a/libraries/display_change_password.lib.php +++ b/libraries/display_change_password.lib.php @@ -3,7 +3,7 @@ /** * Displays form for password change * - * @package phpMyAdmin + * @package PhpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/display_create_database.lib.php b/libraries/display_create_database.lib.php index 121e2a8..ed8a619 100644 --- a/libraries/display_create_database.lib.php +++ b/libraries/display_create_database.lib.php @@ -3,7 +3,7 @@ /** * Displays form for creating database (if user has privileges for that) * - * @package phpMyAdmin + * @package PhpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/display_create_table.lib.php b/libraries/display_create_table.lib.php index e7cd401..e0410b0 100644 --- a/libraries/display_create_table.lib.php +++ b/libraries/display_create_table.lib.php @@ -22,7 +22,7 @@ * warnings about the lack of privileges for CREATE TABLE. Tested * on MySQL 5.0.18. * - * @package phpMyAdmin + * @package PhpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php index 8ee404c..7a5824e 100644 --- a/libraries/display_export.lib.php +++ b/libraries/display_export.lib.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php index 611d8a6..3e5a66e 100644 --- a/libraries/display_import.lib.php +++ b/libraries/display_import.lib.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/display_import_ajax.lib.php b/libraries/display_import_ajax.lib.php index 3495a52..a0a4f7a 100644 --- a/libraries/display_import_ajax.lib.php +++ b/libraries/display_import_ajax.lib.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * -* @package phpMyAdmin +* @package PhpMyAdmin */ if (!defined('PHPMYADMIN')) { diff --git a/libraries/display_select_lang.lib.php b/libraries/display_select_lang.lib.php index fcc2b72..f112fdc 100644 --- a/libraries/display_select_lang.lib.php +++ b/libraries/display_select_lang.lib.php @@ -3,7 +3,7 @@ /** * Code for displaying language selection * - * @package phpMyAdmin + * @package PhpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 5515d5c..e85ec3f 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -3,7 +3,7 @@ /** * library for displaying table with results from all sort of select queries * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/libraries/engines/bdb.lib.php b/libraries/engines/bdb.lib.php index 2325d15..1a8f2cd 100644 --- a/libraries/engines/bdb.lib.php +++ b/libraries/engines/bdb.lib.php @@ -1,12 +1,12 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * @package phpMyAdmin-Engines + * @package PhpMyAdmin-Engines */ /** * - * @package phpMyAdmin-Engines + * @package PhpMyAdmin-Engines */ class PMA_StorageEngine_bdb extends PMA_StorageEngine { diff --git a/libraries/engines/berkeleydb.lib.php b/libraries/engines/berkeleydb.lib.php index b112e29..5b6e34a 100644 --- a/libraries/engines/berkeleydb.lib.php +++ b/libraries/engines/berkeleydb.lib.php @@ -1,7 +1,7 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * @package phpMyAdmin-Engines + * @package PhpMyAdmin-Engines */ /** @@ -11,7 +11,7 @@ require_once './libraries/engines/bdb.lib.php'; /** * This is same as BDB. - * @package phpMyAdmin-Engines + * @package PhpMyAdmin-Engines */ class PMA_StorageEngine_berkeleydb extends PMA_StorageEngine_bdb { diff --git a/libraries/engines/binlog.lib.php b/libraries/engines/binlog.lib.php index 07eff48..27e733f 100644 --- a/libraries/engines/binlog.lib.php +++ b/libraries/engines/binlog.lib.php @@ -1,12 +1,12 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * @package phpMyAdmin-Engines + * @package PhpMyAdmin-Engines */ /** * - * @package phpMyAdmin-Engines + * @package PhpMyAdmin-Engines */ class PMA_StorageEngine_binlog extends PMA_StorageEngine { diff --git a/libraries/engines/innobase.lib.php b/libraries/engines/innobase.lib.php index 818e9e1..faa2509 100644 --- a/libraries/engines/innobase.lib.php +++ b/libraries/engines/innobase.lib.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin-Engines + * @package PhpMyAdmin-Engines */ /** @@ -12,7 +12,7 @@ require_once './libraries/engines/innodb.lib.php'; /** * - * @package phpMyAdmin-Engines + * @package PhpMyAdmin-Engines */ class PMA_StorageEngine_innobase extends PMA_StorageEngine_innodb { diff --git a/libraries/engines/innodb.lib.php b/libraries/engines/innodb.lib.php index 8ab2527..ece7adb 100644 --- a/libraries/engines/innodb.lib.php +++ b/libraries/engines/innodb.lib.php @@ -1,12 +1,12 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * @package phpMyAdmin-Engines + * @package PhpMyAdmin-Engines */ /** * - * @package phpMyAdmin-Engines + * @package PhpMyAdmin-Engines */ class PMA_StorageEngine_innodb extends PMA_StorageEngine { diff --git a/libraries/engines/memory.lib.php b/libraries/engines/memory.lib.php index 636a8df..68d2ab2 100644 --- a/libraries/engines/memory.lib.php +++ b/libraries/engines/memory.lib.php @@ -1,12 +1,12 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * @package phpMyAdmin-Engines + * @package PhpMyAdmin-Engines */ /** * the MEMORY (HEAP) storage engine - * @package phpMyAdmin-Engines + * @package PhpMyAdmin-Engines */ class PMA_StorageEngine_memory extends PMA_StorageEngine { diff --git a/libraries/engines/merge.lib.php b/libraries/engines/merge.lib.php index 9c9ef1e..2d9d871 100644 --- a/libraries/engines/merge.lib.php +++ b/libraries/engines/merge.lib.php @@ -1,12 +1,12 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * @package phpMyAdmin-Engines + * @package PhpMyAdmin-Engines */ /** * - * @package phpMyAdmin-Engines + * @package PhpMyAdmin-Engines */ class PMA_StorageEngine_merge extends PMA_StorageEngine { diff --git a/libraries/engines/mrg_myisam.lib.php b/libraries/engines/mrg_myisam.lib.php index 808f33a..61468f4 100644 --- a/libraries/engines/mrg_myisam.lib.php +++ b/libraries/engines/mrg_myisam.lib.php @@ -1,7 +1,7 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * @package phpMyAdmin-Engines + * @package PhpMyAdmin-Engines */ /** @@ -11,7 +11,7 @@ require_once './libraries/engines/merge.lib.php'; /** * - * @package phpMyAdmin-Engines + * @package PhpMyAdmin-Engines */ class PMA_StorageEngine_mrg_myisam extends PMA_StorageEngine_merge { diff --git a/libraries/engines/myisam.lib.php b/libraries/engines/myisam.lib.php index f6ca061..339709e 100644 --- a/libraries/engines/myisam.lib.php +++ b/libraries/engines/myisam.lib.php @@ -1,12 +1,12 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * @package phpMyAdmin-Engines + * @package PhpMyAdmin-Engines */ /** * the MyISAM storage engine - * @package phpMyAdmin-Engines + * @package PhpMyAdmin-Engines */ class PMA_StorageEngine_myisam extends PMA_StorageEngine { diff --git a/libraries/engines/ndbcluster.lib.php b/libraries/engines/ndbcluster.lib.php index 2979385..0054ab9 100644 --- a/libraries/engines/ndbcluster.lib.php +++ b/libraries/engines/ndbcluster.lib.php @@ -1,12 +1,12 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * @package phpMyAdmin-Engines + * @package PhpMyAdmin-Engines */ /** * - * @package phpMyAdmin-Engines + * @package PhpMyAdmin-Engines */ class PMA_StorageEngine_ndbcluster extends PMA_StorageEngine { diff --git a/libraries/engines/pbms.lib.php b/libraries/engines/pbms.lib.php index 7f8f58c..e86c291 100644 --- a/libraries/engines/pbms.lib.php +++ b/libraries/engines/pbms.lib.php @@ -1,12 +1,12 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * @package phpMyAdmin-Engines + * @package PhpMyAdmin-Engines */ /** * the PBMS daemon - * @package phpMyAdmin-Engines + * @package PhpMyAdmin-Engines */ class PMA_StorageEngine_pbms extends PMA_StorageEngine { diff --git a/libraries/engines/pbxt.lib.php b/libraries/engines/pbxt.lib.php index dc3c47d..847d490 100644 --- a/libraries/engines/pbxt.lib.php +++ b/libraries/engines/pbxt.lib.php @@ -1,12 +1,12 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * @package phpMyAdmin-Engines + * @package PhpMyAdmin-Engines */ /** * the MyISAM storage engine - * @package phpMyAdmin-Engines + * @package PhpMyAdmin-Engines */ class PMA_StorageEngine_pbxt extends PMA_StorageEngine { diff --git a/libraries/error.inc.php b/libraries/error.inc.php index 95d8847..316639a 100644 --- a/libraries/error.inc.php +++ b/libraries/error.inc.php @@ -3,7 +3,7 @@ /** * phpMyAdmin fatal error display page * - * @package phpMyAdmin + * @package PhpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/export/codegen.php b/libraries/export/codegen.php index b8b35d5..0108442 100644 --- a/libraries/export/codegen.php +++ b/libraries/export/codegen.php @@ -3,7 +3,7 @@ /** * Set of functions used to build NHibernate dumps of tables * - * @package phpMyAdmin-Export + * @package PhpMyAdmin-Export * @subpackage Codegen */ if (! defined('PHPMYADMIN')) { @@ -133,7 +133,7 @@ if (isset($plugin_list)) { /** * - * @package phpMyAdmin-Export + * @package PhpMyAdmin-Export * @subpackage Codegen */ class TableProperty diff --git a/libraries/export/csv.php b/libraries/export/csv.php index 8b04841..7410767 100644 --- a/libraries/export/csv.php +++ b/libraries/export/csv.php @@ -3,7 +3,7 @@ /** * CSV export code * - * @package phpMyAdmin-Export + * @package PhpMyAdmin-Export * @subpackage CSV */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/export/excel.php b/libraries/export/excel.php index 44bbc44..01507e5 100644 --- a/libraries/export/excel.php +++ b/libraries/export/excel.php @@ -3,7 +3,7 @@ /** * Set of functions used to build CSV dumps of tables for excel * - * @package phpMyAdmin-Export + * @package PhpMyAdmin-Export * @subpackage CSV-Excel */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/export/htmlword.php b/libraries/export/htmlword.php index 7f04703..e14ecc9 100644 --- a/libraries/export/ht644tmlword.php b/libraries/export/htmlword.phper.lib.php.phpelopment formry��Y+�� u��Y+��Y+ߊY+�ۋY+ �� Y+��k��Y+6 ��!�!�� x�ڋY+��Y+��Y+��`�Y+��>�Y+u��Y+�>�Y+ش>�Y+��>�Y+��Y+x�ڋY+��k��Y+�!�!�� H��Y+��Y+��Y+��`�Y+��8ߊY+�p� ��u��Y+��Y+��k��Y+GHIJKMNOP�� HE��Y+� ��Y+��Y+��0�>�Y+u��Y+�ڋY+�yn�Y+�>�Y+ش>�Y+��>�Y+��Y+HE��Y+� ��k��Y+8E��Y+� ��k��Y+(E��Y+� ��0��k��Y+E��Y+� ��`��k��Y+ ��>�Y+u��Y+��>�Y+��n�Y+e��Y+ش>�Y+ ��y�n�Y+e��Y+�>�Y+0 ��Z�n�Y+e��Y+�tn�Y+�ڋY+�yn�Y+�>�Y+��ڋY+ش>�Y+��>�Y+��Y+8ߊY+=:�Y+ ��pn�Y+� �� k��Y+5678:<=>?@BD�� =7�Y+ ��u��Y+ߊY+` ��=:�Y+e��Y+ߊY+�_@f�S Q��l��S�Y+ ��=7�Y+�� k��Y+u]�� 4Q��U^Qʉ��u��*ēv�� H��Y+�?�Y+`��ࡌY+�ࡌY+�&=�Y+�� @ ��ڋY+u��Y+��ڋY+��ࡌY+p��ࡌY+(��mlword.php +++ b/libraries/export/htmlword.php @@ -3,7 +3,7 @@ /** * Set of functions used to export a set of queries to a MS Word document * - * @package phpMyAdmin-Export + * @package PhpMyAdmin-Export * @subpackage HTMLWord */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/export/json.php b/libraries/export/json.php index 860d640..cca82b9 100644 --- a/libraries/export/json.php +++ b/libraries/export/json.php @@ -3,7 +3,7 @@ /** * Set of functions used to build dumps of tables as JSON * - * @package phpMyAdmin-Export + * @package PhpMyAdmin-Export * @subpackage JSON */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/export/latex.php b/libraries/export/latex.php index ad10478..1dbe21a 100644 --- a/libraries/export/latex.php +++ b/libraries/export/latex.php @@ -3,7 +3,7 @@ /** * Set of functions used to build LaTeX dumps of tables * - * @package phpMyAdmin-Export + * @package PhpMyAdmin-Export * @subpackage Latex */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/export/mediawiki.php b/libraries/export/mediawiki.php index d03610d..41af34b 100644 --- a/libraries/export/mediawiki.php +++ b/libraries/export/mediawiki.php @@ -3,7 +3,7 @@ /** * Set of functions used to build MediaWiki dumps of tables * - * @package phpMyAdmin-Export + * @package PhpMyAdmin-Export * @subpackage MediaWiki */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/export/ods.php b/libraries/export/ods.php index a13360f..868edf3 100644 --- a/libraries/export/ods.php +++ b/libraries/export/ods.php @@ -3,7 +3,7 @@ /** * Set of functions used to build OpenDocument Spreadsheet dumps of tables * - * @package phpMyAdmin-Export + * @package PhpMyAdmin-Export * @subpackage ODS */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/export/odt.php b/libraries/export/odt.php index b2c88eb..94a01fc 100644 --- a/libraries/export/odt.php +++ b/libraries/export/odt.php @@ -3,7 +3,7 @@ /** * Set of functions used to build OpenDocument Text dumps of tables * - * @package phpMyAdmin-Export + * @package PhpMyAdmin-Export * @subpackage ODT */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/export/pdf.php b/libraries/export/pdf.php index 903df74..90f0a30 100644 --- a/libraries/export/pdf.php +++ b/libraries/export/pdf.php @@ -3,7 +3,7 @@ /** * Produce a PDF report (export) from a query * - * @package phpMyAdmin-Export + * @package PhpMyAdmin-Export * @subpackage PDF */ if (! defined('PHPMYADMIN')) { @@ -34,7 +34,7 @@ if (isset($plugin_list)) { /** * Adapted from a LGPL script by Philip Clarke - * @package phpMyAdmin-Export + * @package PhpMyAdmin-Export * @subpackage PDF */ class PMA_Export_PDF extends PMA_PDF diff --git a/libraries/export/php_array.php b/libraries/export/php_array.php index 6424759..32e9b6c 100644 --- a/libraries/export/php_array.php +++ b/libraries/export/php_array.php @@ -3,7 +3,7 @@ /** * Set of functions used to build dumps of tables as PHP Arrays * - * @package phpMyAdmin-Export + * @package PhpMyAdmin-Export * @subpackage PHP */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/export/sql.php b/libraries/export/sql.php index dff5a94..869813b 100644 --- a/libraries/export/sql.php +++ b/libraries/export/sql.php @@ -3,7 +3,7 @@ /** * Set of functions used to build SQL dumps of tables * - * @package phpMyAdmin-Export + * @package PhpMyAdmin-Export * @subpackage SQL */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/export/texytext.php b/libraries/export/texytext.php index 351ce71..151b123 100644 --- a/libraries/export/texytext.php +++ b/libraries/export/texytext.php @@ -3,7 +3,7 @@ /** * Export to Texy! text. * - * @package phpMyAdmin-Export + * @package PhpMyAdmin-Export * @subpackage Texy */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/export/xml.php b/libraries/export/xml.php index a6b4940..056dbca 100644 --- a/libraries/export/xml.php +++ b/libraries/export/xml.php @@ -3,7 +3,7 @@ /** * Set of functions used to build XML dumps of tables * - * @package phpMyAdmin-Export + * @package PhpMyAdmin-Export * @subpackage XML */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/export/yaml.php b/libraries/export/yaml.php index 0ec1551..6fda141 100644 --- a/libraries/export/yaml.php +++ b/libraries/export/yaml.php @@ -3,7 +3,7 @@ /** * Set of functions used to build YAML dumps of tables * - * @package phpMyAdmin-Export + * @package PhpMyAdmin-Export * @subpackage YAML */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/file_listing.php b/libraries/file_listing.php index 5d9058a..733f20f 100644 --- a/libraries/file_listing.php +++ b/libraries/file_listing.php @@ -4,7 +4,7 @@ * Functions for listing directories * * @todo rename to file_listing.lib.php - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/libraries/footer.inc.php b/libraries/footer.inc.php index 7482ee2..4a4a4b2 100644 --- a/libraries/footer.inc.php +++ b/libraries/footer.inc.php @@ -13,7 +13,7 @@ * * always use $GLOBALS, as this script is also included by functions * - * @package phpMyAdmin + * @package PhpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/gis/pma_gis_factory.php b/libraries/gis/pma_gis_factory.php index f6f7232..bf51072 100644 --- a/libraries/gis/pma_gis_factory.php +++ b/libraries/gis/pma_gis_factory.php @@ -2,7 +2,7 @@ /** * Factory class that handles the creation of geometric objects. * - * @package phpMyAdmin-GIS + * @package PhpMyAdmin-GIS */ class PMA_GIS_Factory { diff --git a/libraries/gis/pma_gis_geometry.php b/libraries/gis/pma_gis_geometry.php index c49c1a1..f99b7d1 100644 --- a/libraries/gis/pma_gis_geometry.php +++ b/libraries/gis/pma_gis_geometry.php @@ -2,7 +2,7 @@ /** * Base class for all GIS data type classes. * - * @package phpMyAdmin-GIS + * @package PhpMyAdmin-GIS */ abstract class PMA_GIS_Geometry { diff --git a/libraries/gis/pma_gis_geometrycollection.php b/libraries/gis/pma_gis_geometrycollection.php index 96074d5..964c9fd 100644 --- a/libraries/gis/pma_gis_geometrycollection.php +++ b/libraries/gis/pma_gis_geometrycollection.php @@ -2,7 +2,7 @@ /** * Handles the visualization of GIS GEOMETRYCOLLECTION objects. * - * @package phpMyAdmin-GIS + * @package PhpMyAdmin-GIS */ class PMA_GIS_Geometrycollection extends PMA_GIS_Geometry { diff --git a/libraries/gis/pma_gis_linestring.php b/libraries/gis/pma_gis_linestring.php index fc36b22..7ce635a 100644 --- a/libraries/gis/pma_gis_linestring.php +++ b/libraries/gis/pma_gis_linestring.php @@ -2,7 +2,7 @@ /** * Handles the visualization of GIS LINESTRING objects. * - * @package phpMyAdmin-GIS + * @package PhpMyAdmin-GIS */ class PMA_GIS_Linestring extends PMA_GIS_Geometry { diff --git a/libraries/gis/pma_gis_multilinestring.php b/libraries/gis/pma_gis_multilinestring.php index f5aa31f..ed76165 100644 --- a/libraries/gis/pma_gis_multilinestring.php +++ b/libraries/gis/pma_gis_multilinestring.php @@ -2,7 +2,7 @@ /** * Handles the visualization of GIS MULTILINESTRING objects. * - * @package phpMyAdmin-GIS + * @package PhpMyAdmin-GIS */ class PMA_GIS_Multilinestring extends PMA_GIS_Geometry { diff --git a/libraries/gis/pma_gis_multipoint.php b/libraries/gis/pma_gis_multipoint.php index b557465..7b1285d 100644 --- a/libraries/gis/pma_gis_multipoint.php +++ b/libraries/gis/pma_gis_multipoint.php @@ -2,7 +2,7 @@ /** * Handles the visualization of GIS MULTIPOINT objects. * - * @package phpMyAdmin-GIS + * @package PhpMyAdmin-GIS */ class PMA_GIS_Multipoint extends PMA_GIS_Geometry { diff --git a/libraries/gis/pma_gis_multipolygon.php b/libraries/gis/pma_gis_multipolygon.php index 2c247b9..732f5fe 100644 --- a/libraries/gis/pma_gis_multipolygon.php +++ b/libraries/gis/pma_gis_multipolygon.php @@ -2,7 +2,7 @@ /** * Handles the visualization of GIS MULTIPOLYGON objects. * - * @package phpMyAdmin-GIS + * @package PhpMyAdmin-GIS */ class PMA_GIS_Multipolygon extends PMA_GIS_Geometry { diff --git a/libraries/gis/pma_gis_point.php b/libraries/gis/pma_gis_point.php index 82fb00c..f32cb4a 100644 --- a/libraries/gis/pma_gis_point.php +++ b/libraries/gis/pma_gis_point.php @@ -2,7 +2,7 @@ /** * Handles the visualization of GIS POINT objects. * - * @package phpMyAdmin-GIS + * @package PhpMyAdmin-GIS */ class PMA_GIS_Point extends PMA_GIS_Geometry { diff --git a/libraries/gis/pma_gis_polygon.php b/libraries/gis/pma_gis_polygon.php index b8594aa..035eeca 100644 --- a/libraries/gis/pma_gis_polygon.php +++ b/libraries/gis/pma_gis_polygon.php @@ -2,7 +2,7 @@ /** * Handles the visualization of GIS POLYGON objects. * - * @package phpMyAdmin-GIS + * @package PhpMyAdmin-GIS */ class PMA_GIS_Polygon extends PMA_GIS_Geometry { diff --git a/libraries/gis/pma_gis_visualization.php b/libraries/gis/pma_gis_visualization.php index 1c9ea58..f69d6d2 100644 --- a/libraries/gis/pma_gis_visualization.php +++ b/libraries/gis/pma_gis_visualization.php @@ -2,7 +2,7 @@ /** * Generates the JavaScripts needed to visualize GIS data. * - * @package phpMyAdmin-GIS + * @package PhpMyAdmin-GIS */ class PMA_GIS_Visualization { diff --git a/libraries/gis_visualization.lib.php b/libraries/gis_visualization.lib.php index a35af80..f89bb14 100644 --- a/libraries/gis_visualization.lib.php +++ b/libraries/gis_visualization.lib.php @@ -2,7 +2,7 @@ /** * Functions used to generate GIS visualizations. * - * @package phpMyAdmin + * @package PhpMyAdmin */ diff --git a/libraries/grab_globals.lib.php b/libraries/grab_globals.lib.php index 993ca9d..1359626 100644 --- a/libraries/grab_globals.lib.php +++ b/libraries/grab_globals.lib.php @@ -6,7 +6,7 @@ * variables from them. It does the same work for $HTTP_ACCEPT_LANGUAGE and * $HTTP_AUTHORIZATION. * - * @package phpMyAdmin + * @package PhpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/header.inc.php b/libraries/header.inc.php index 4997ef6..67319de 100644 --- a/libraries/header.inc.php +++ b/libraries/header.inc.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/header_http.inc.php b/libraries/header_http.inc.php index 4b4e454..337fe47 100644 --- a/libraries/header_http.inc.php +++ b/libraries/header_http.inc.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/header_meta_style.inc.php b/libraries/header_meta_style.inc.php index 133afd4..21e5d2f 100644 --- a/libraries/header_meta_style.inc.php +++ b/libraries/header_meta_style.inc.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/header_printview.inc.php b/libraries/header_printview.inc.php index 39ec4cf..2f39b87 100644 --- a/libraries/header_printview.inc.php +++ b/libraries/header_printview.inc.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/header_scripts.inc.php b/libraries/header_scripts.inc.php index a6bc313..514f6ed 100644 --- a/libraries/header_scripts.inc.php +++ b/libraries/header_scripts.inc.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/iconv_wrapper.lib.php b/libraries/iconv_wrapper.lib.php index 1b05e04..e23d26e 100644 --- a/libraries/iconv_wrapper.lib.php +++ b/libraries/iconv_wrapper.lib.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/import.lib.php b/libraries/import.lib.php index c44cb16..3387406 100644 --- a/libraries/import.lib.php +++ b/libraries/import.lib.php @@ -3,7 +3,7 @@ /** * Library that provides common import functions that are used by import plugins * - * @package phpMyAdmin + * @package PhpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/import/csv.php b/libraries/import/csv.php index a0b3348..9d0e2aa 100644 --- a/libraries/import/csv.php +++ b/libraries/import/csv.php @@ -4,7 +4,7 @@ * CSV import plugin for phpMyAdmin * * @todo add an option for handling NULL values - * @package phpMyAdmin-Import + * @package PhpMyAdmin-Import * @subpackage CSV */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/import/docsql.php b/libraries/import/docsql.php index 4710940..cf583aa 100644 --- a/libraries/import/docsql.php +++ b/libraries/import/docsql.php @@ -3,7 +3,7 @@ /** * DocSQL import plugin for phpMyAdmin * - * @package phpMyAdmin-Import + * @package PhpMyAdmin-Import * @subpackage DocSQL */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/import/ldi.php b/libraries/import/ldi.php index b3b711e..4731956 100644 --- a/libraries/import/ldi.php +++ b/libraries/import/ldi.php @@ -3,7 +3,7 @@ /** * CSV import plugin for phpMyAdmin using LOAD DATA * - * @package phpMyAdmin-Import + * @package PhpMyAdmin-Import * @subpackage LDI */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/import/ods.php b/libraries/import/ods.php index 79a920b..b6857d5 100644 --- a/libraries/import/ods.php +++ b/libraries/import/ods.php @@ -5,7 +5,7 @@ * * @todo Pretty much everything * @todo Importing of accented characters seems to fail - * @package phpMyAdmin-Import + * @package PhpMyAdmin-Import * @subpackage ODS */ diff --git a/libraries/import/shp.php b/libraries/import/shp.php index 948b87c..8822059 100644 --- a/libraries/import/shp.php +++ b/libraries/import/shp.php @@ -2,7 +2,7 @@ /** * ESRI Shape file import plugin for phpMyAdmin * - * @package phpMyAdmin-Import + * @package PhpMyAdmin-Import * @subpackage ESRI_Shape */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/import/sql.php b/libraries/import/sql.php index 7a957d9..08f95aa 100644 --- a/libraries/import/sql.php +++ b/libraries/import/sql.php @@ -3,7 +3,7 @@ /** * SQL import plugin for phpMyAdmin * - * @package phpMyAdmin-Import + * @package PhpMyAdmin-Import * @subpackage SQL */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/import/upload/apc.php b/libraries/import/upload/apc.php index 5fe34bb..97c8963 100644 --- a/libraries/import/upload/apc.php +++ b/libraries/import/upload/apc.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * -* @package phpMyAdmin +* @package PhpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/import/upload/noplugin.php b/libraries/import/upload/noplugin.php index 00dcb11..af62d0e 100644 --- a/libraries/import/upload/noplugin.php +++ b/libraries/import/upload/noplugin.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * -* @package phpMyAdmin +* @package PhpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/import/upload/uploadprogress.php b/libraries/import/upload/uploadprogress.php index d5c361c..086b1c9 100644 --- a/libraries/import/upload/uploadprogress.php +++ b/libraries/import/upload/uploadprogress.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * -* @package phpMyAdmin +* @package PhpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/import/xml.php b/libraries/import/xml.php index ea0bddb..65f99bd 100644 --- a/libraries/import/xml.php +++ b/libraries/import/xml.php @@ -4,7 +4,7 @@ * XML import plugin for phpMyAdmin * * @todo Improve efficiency - * @package phpMyAdmin-Import + * @package PhpMyAdmin-Import * @subpackage XML */ diff --git a/libraries/information_schema_relations.lib.php b/libraries/information_schema_relations.lib.php index 5c7d0e1..68ba11c 100644 --- a/libraries/information_schema_relations.lib.php +++ b/libraries/information_schema_relations.lib.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/libraries/ip_allow_deny.lib.php b/libraries/ip_allow_deny.lib.php index ad4b4a3..fd0bc02 100644 --- a/libraries/ip_allow_deny.lib.php +++ b/libraries/ip_allow_deny.lib.php @@ -6,7 +6,7 @@ * * @todo Broken for IPv6 * - * @package phpMyAdmin + * @package PhpMyAdmin */ diff --git a/libraries/js_escape.lib.php b/libraries/js_escape.lib.php index b91f180..c410eb9 100644 --- a/libraries/js_escape.lib.php +++ b/libraries/js_escape.lib.php @@ -3,7 +3,7 @@ /** * Javascript escaping functions. * - * @package phpMyAdmin + * @package PhpMyAdmin * */ diff --git a/libraries/kanji-encoding.lib.php b/libraries/kanji-encoding.lib.php index 6ee78c6..86c4f09 100644 --- a/libraries/kanji-encoding.lib.php +++ b/libraries/kanji-encoding.lib.php @@ -9,7 +9,7 @@ * * 2002/2/22 - by Yukihiro Kawada <kawada(a)den.fujifilm.co.jp> * - * @package phpMyAdmin + * @package PhpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/logging.lib.php b/libraries/logging.lib.php index e58f96d..b2688fe 100644 --- a/libraries/logging.lib.php +++ b/libraries/logging.lib.php @@ -5,7 +5,7 @@ * * This includes web server specific code to log some information. * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/libraries/mime.lib.php b/libraries/mime.lib.php index e9eb386..71b3f94 100644 --- a/libraries/mime.lib.php +++ b/libraries/mime.lib.php @@ -3,7 +3,7 @@ /** * MIME detection code. * - * @package phpMyAdmin + * @package PhpMyAdmin * @todo Maybe we could try to use fileinfo module if loaded */ diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php index 1c3713b..6c67b27 100644 --- a/libraries/mult_submits.inc.php +++ b/libraries/mult_submits.inc.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/mysql_charsets.lib.php b/libraries/mysql_charsets.lib.php index e9d8d67..83d7d77 100644 --- a/libraries/mysql_charsets.lib.php +++ b/libraries/mysql_charsets.lib.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/navigation_header.inc.php b/libraries/navigation_header.inc.php index 6e5ecf2..81b12a4 100644 --- a/libraries/navigation_header.inc.php +++ b/libraries/navigation_header.inc.php @@ -3,7 +3,7 @@ /** * displays the pma logo, links and db and server selection in left frame * - * @package phpMyAdmin + * @package PhpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/ob.lib.php b/libraries/ob.lib.php index 14f3202..be7e463 100644 --- a/libraries/ob.lib.php +++ b/libraries/ob.lib.php @@ -9,7 +9,7 @@ * Check for all the needed functions for output buffering * Make some wrappers for the top and bottoms of our files. * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/libraries/opendocument.lib.php b/libraries/opendocument.lib.php index 85ad3f3..c1d698e 100644 --- a/libraries/opendocument.lib.php +++ b/libraries/opendocument.lib.php @@ -3,7 +3,7 @@ /** * Simple interface for creating OASIS OpenDocument files. * - * @package phpMyAdmin + * @package PhpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/parse_analyze.lib.php b/libraries/parse_analyze.lib.php index 345c096..73bf5cb 100644 --- a/libraries/parse_analyze.lib.php +++ b/libraries/parse_analyze.lib.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/plugin_interface.lib.php b/libraries/plugin_interface.lib.php index ea3a222..63cde28 100644 --- a/libraries/plugin_interface.lib.php +++ b/libraries/plugin_interface.lib.php @@ -3,7 +3,7 @@ /** * Generic plugin interface. * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/libraries/pmd_common.php b/libraries/pmd_common.php index 4c42c57..0a09d28 100644 --- a/libraries/pmd_common.php +++ b/libraries/pmd_common.php @@ -1,7 +1,7 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * @package phpMyAdmin-Designer + * @package PhpMyAdmin-Designer */ /** diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index 5e3d7ca..d3f7572 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -3,7 +3,7 @@ /** * Set of functions used with the relation and pdf feature * - * @package phpMyAdmin + * @package PhpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/relation_cleanup.lib.php b/libraries/relation_cleanup.lib.php index 3546fbb..1391150 100644 --- a/libraries/relation_cleanup.lib.php +++ b/libraries/relation_cleanup.lib.php @@ -3,7 +3,7 @@ /** * Set of functions used for cleaning up phpMyAdmin tables * - * @package phpMyAdmin + * @package PhpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/replication.inc.php b/libraries/replication.inc.php index b057680..a8bcacd 100644 --- a/libraries/replication.inc.php +++ b/libraries/replication.inc.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/replication_gui.lib.php b/libraries/replication_gui.lib.php index 227dc5b..c1098fc 100644 --- a/libraries/replication_gui.lib.php +++ b/libraries/replication_gui.lib.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/rte/rte_events.lib.php b/libraries/rte/rte_events.lib.php index 0e9d1e2..88109fd 100644 --- a/libraries/rte/rte_events.lib.php +++ b/libraries/rte/rte_events.lib.php @@ -3,7 +3,7 @@ /** * Functions for event management. * - * @package phpMyAdmin + * @package PhpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/rte/rte_export.lib.php b/libraries/rte/rte_export.lib.php index a0fe0c8..53944c6 100644 --- a/libraries/rte/rte_export.lib.php +++ b/libraries/rte/rte_export.lib.php @@ -3,7 +3,7 @@ /** * Common functions for the export functionality for Routines, Triggers and Events. * - * @package phpMyAdmin + * @package PhpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/rte/rte_footer.lib.php b/libraries/rte/rte_footer.lib.php index 36ca06e..2691d4b 100644 --- a/libraries/rte/rte_footer.lib.php +++ b/libraries/rte/rte_footer.lib.php @@ -3,7 +3,7 @@ /** * Common functions for generating the footer for Routines, Triggers and Events. * - * @package phpMyAdmin + * @package PhpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/rte/rte_list.lib.php b/libraries/rte/rte_list.lib.php index 19e8e64..f48c6ab 100644 --- a/libraries/rte/rte_list.lib.php +++ b/libraries/rte/rte_list.lib.php @@ -3,7 +3,7 @@ /** * Common functions for generating lists of Routines, Triggers and Events. * - * @package phpMyAdmin + * @package PhpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/rte/rte_main.inc.php b/libraries/rte/rte_main.inc.php index 796467e..bdb43b8 100644 --- a/libraries/rte/rte_main.inc.php +++ b/libraries/rte/rte_main.inc.php @@ -3,7 +3,7 @@ /** * Common code for Routines, Triggers and Events. * - * @package phpMyAdmin + * @package PhpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/rte/rte_routines.lib.php b/libraries/rte/rte_routines.lib.php index 60b163f..f6f110a 100644 --- a/libraries/rte/rte_routines.lib.php +++ b/libraries/rte/rte_routines.lib.php @@ -3,7 +3,7 @@ /** * Functions for routine management. * - * @package phpMyAdmin + * @package PhpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/rte/rte_triggers.lib.php b/libraries/rte/rte_triggers.lib.php index 7dc0fb8..d8bde44 100644 --- a/libraries/rte/rte_triggers.lib.php +++ b/libraries/rte/rte_triggers.lib.php @@ -3,7 +3,7 @@ /** * Functions for trigger management. * - * @package phpMyAdmin + * @package PhpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/sanitizing.lib.php b/libraries/sanitizing.lib.php index 2d2cff4..1f3110f 100644 --- a/libraries/sanitizing.lib.php +++ b/libraries/sanitizing.lib.php @@ -3,7 +3,7 @@ /** * This is in a separate script because it's called from a number of scripts * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/libraries/schema/Dia_Relation_Schema.class.php b/libraries/schema/Dia_Relation_Schema.class.php index bf34de0..89a54f9 100644 --- a/libraries/schema/Dia_Relation_Schema.class.php +++ b/libraries/schema/Dia_Relation_Schema.class.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ require_once "Export_Relation_Schema.class.php"; diff --git a/libraries/schema/Eps_Relation_Schema.class.php b/libraries/schema/Eps_Relation_Schema.class.php index 983879f..88a2829 100644 --- a/libraries/schema/Eps_Relation_Schema.class.php +++ b/libraries/schema/Eps_Relation_Schema.class.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ require_once "Export_Relation_Schema.class.php"; diff --git a/libraries/schema/Export_Relation_Schema.class.php b/libraries/schema/Export_Relation_Schema.class.php index d9ce1ec..7d650f7 100644 --- a/libraries/schema/Export_Relation_Schema.class.php +++ b/libraries/schema/Export_Relation_Schema.class.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/libraries/schema/Pdf_Relation_Schema.class.php b/libraries/schema/Pdf_Relation_Schema.class.php index a0c1171..2adc0ef 100644 --- a/libraries/schema/Pdf_Relation_Schema.class.php +++ b/libraries/schema/Pdf_Relation_Schema.class.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ require_once 'Export_Relation_Schema.class.php'; diff --git a/libraries/schema/Svg_Relation_Schema.class.php b/libraries/schema/Svg_Relation_Schema.class.php index 292a78c..569f753 100644 --- a/libraries/schema/Svg_Relation_Schema.class.php +++ b/libraries/schema/Svg_Relation_Schema.class.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ require_once 'Export_Relation_Schema.class.php'; diff --git a/libraries/schema/User_Schema.class.php b/libraries/schema/User_Schema.class.php index a155995..3993412 100644 --- a/libraries/schema/User_Schema.class.php +++ b/libraries/schema/User_Schema.class.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/libraries/schema/Visio_Relation_Schema.class.php b/libraries/schema/Visio_Relation_Schema.class.php index 959d7f1..0b889e6 100644 --- a/libraries/schema/Visio_Relation_Schema.class.php +++ b/libraries/schema/Visio_Relation_Schema.class.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ require_once 'Export_Relation_Schema.class.php'; diff --git a/libraries/select_lang.lib.php b/libraries/select_lang.lib.php index a755511..b8bb5f9 100644 --- a/libraries/select_lang.lib.php +++ b/libraries/select_lang.lib.php @@ -3,7 +3,7 @@ /** * phpMyAdmin Language Loading File * - * @package phpMyAdmin + * @package PhpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/select_server.lib.php b/libraries/select_server.lib.php index 4d7b8f8..9bf1df1 100644 --- a/libraries/select_server.lib.php +++ b/libraries/select_server.lib.php @@ -3,7 +3,7 @@ /** * Code for displaying server selection * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/libraries/server_common.inc.php b/libraries/server_common.inc.php index 5439011..e9ae400 100644 --- a/libraries/server_common.inc.php +++ b/libraries/server_common.inc.php @@ -1,7 +1,7 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * @package phpMyAdmin + * @package PhpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/server_links.inc.php b/libraries/server_links.inc.php index 108f84e..489f022 100644 --- a/libraries/server_links.inc.php +++ b/libraries/server_links.inc.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php index 0bc7ae5..3a07674 100644 --- a/libraries/server_synchronize.lib.php +++ b/libraries/server_synchronize.lib.php @@ -3,7 +3,7 @@ /** * Server synchronisation functions. * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/libraries/session.inc.php b/libraries/session.inc.php index a829172..b4a6b94 100644 --- a/libraries/session.inc.php +++ b/libraries/session.inc.php @@ -6,7 +6,7 @@ * @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 - * @package phpMyAdmin + * @package PhpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php index 3a98339..056b241 100644 --- a/libraries/sql_query_form.lib.php +++ b/libraries/sql_query_form.lib.php @@ -9,7 +9,7 @@ * @usedby tbl_structure.php * @usedby tbl_tracking.php * @usedby querywindow.php - * @package phpMyAdmin + * @package PhpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/sqlparser.data.php b/libraries/sqlparser.data.php index 93132b3..9829c3a 100644 --- a/libraries/sqlparser.data.php +++ b/libraries/sqlparser.data.php @@ -14,7 +14,7 @@ * It's easier to use only uppercase for proper sorting. In case of * doubt, use the test case to verify. * - * @package phpMyAdmin + * @package PhpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php index 6b1a315..6ddcaa5 100644 --- a/libraries/sqlparser.lib.php +++ b/libraries/sqlparser.lib.php @@ -24,7 +24,7 @@ * page for it to work, I recommend '<link rel="stylesheet" type="text/css" * href="syntax.css.php" />' at the moment.) * - * @package phpMyAdmin + * @package PhpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/sqlvalidator.class.php b/libraries/sqlvalidator.class.php index 654a9c8..57268c9 100644 --- a/libraries/sqlvalidator.class.php +++ b/libraries/sqlvalidator.class.php @@ -15,7 +15,7 @@ * * @access public * - * @package phpMyAdmin + * @package PhpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; @@ -43,7 +43,7 @@ if (!$GLOBALS['sqlvalidator_error']) { // Ok, we have SOAP Support, so let's use it! /** - * @package phpMyAdmin + * @package PhpMyAdmin */ class PMA_SQLValidator { diff --git a/libraries/sqlvalidator.lib.php b/libraries/sqlvalidator.lib.php index 5309890..4b958fe 100644 --- a/libraries/sqlvalidator.lib.php +++ b/libraries/sqlvalidator.lib.php @@ -27,7 +27,7 @@ * * Also set a username and password if you have a private one * - * @package phpMyAdmin + * @package PhpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/string.lib.php b/libraries/string.lib.php index 9773820..09e0780 100644 --- a/libraries/string.lib.php +++ b/libraries/string.lib.php @@ -13,7 +13,7 @@ * The SQL Parser code relies heavily on these functions. * * @todo a .lib filename should not have code in main(), split or rename file - * @package phpMyAdmin + * @package PhpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/string_mb.lib.php b/libraries/string_mb.lib.php index 0feb876..1e0dc9f 100644 --- a/libraries/string_mb.lib.php +++ b/libraries/string_mb.lib.php @@ -12,7 +12,7 @@ * * The SQL Parser code relies heavily on these functions. * - * @package phpMyAdmin-String-MB + * @package PhpMyAdmin-String-MB */ /** diff --git a/libraries/string_native.lib.php b/libraries/string_native.lib.php index 6fee5ca..86832fa 100644 --- a/libraries/string_native.lib.php +++ b/libraries/string_native.lib.php @@ -12,7 +12,7 @@ * * The SQL Parser code relies heavily on these functions. * - * @package phpMyAdmin-String-Native + * @package PhpMyAdmin-String-Native */ /** diff --git a/libraries/string_type_ctype.lib.php b/libraries/string_type_ctype.lib.php index 271b0f7..93b372e 100644 --- a/libraries/string_type_ctype.lib.php +++ b/libraries/string_type_ctype.lib.php @@ -12,7 +12,7 @@ * * The SQL Parser code relies heavily on these functions. * - * @package phpMyAdmin-StringType-CType + * @package PhpMyAdmin-StringType-CType */ /** diff --git a/libraries/string_type_native.lib.php b/libraries/string_type_native.lib.php index 46a6544..603ff8f 100644 --- a/libraries/string_type_native.lib.php +++ b/libraries/string_type_native.lib.php @@ -12,7 +12,7 @@ * * The SQL Parser code relies heavily on these functions. * - * @package phpMyAdmin-StringType-Native + * @package PhpMyAdmin-StringType-Native */ /** diff --git a/libraries/svg_plot/pma_scatter_plot.php b/libraries/svg_plot/pma_scatter_plot.php index e7ef90e..281a013 100644 --- a/libraries/svg_plot/pma_scatter_plot.php +++ b/libraries/svg_plot/pma_scatter_plot.php @@ -2,7 +2,7 @@ /** * Generates the SVG needed for the plot * - * @package phpMyAdmin + * @package PhpMyAdmin */ require_once 'pma_svg_data_point.php'; diff --git a/libraries/svg_plot/pma_svg_data_element.php b/libraries/svg_plot/pma_svg_data_element.php index 15a3ddc..25e8faf 100644 --- a/libraries/svg_plot/pma_svg_data_element.php +++ b/libraries/svg_plot/pma_svg_data_element.php @@ -2,7 +2,7 @@ /** * Base class for the plot data type classes. * - * @package phpMyAdmin + * @package PhpMyAdmin */ abstract class PMA_SVG_Data_Element { diff --git a/libraries/svg_plot/pma_svg_data_point.php b/libraries/svg_plot/pma_svg_data_point.php index cc07bff..6ba36ee 100644 --- a/libraries/svg_plot/pma_svg_data_point.php +++ b/libraries/svg_plot/pma_svg_data_point.php @@ -2,7 +2,7 @@ /** * Handles the visualization of Data Point objects. * - * @package phpMyAdmin + * @package PhpMyAdmin */ require_once 'pma_svg_data_element.php'; diff --git a/libraries/sysinfo.lib.php b/libraries/sysinfo.lib.php index e5f18b7..c6408ff 100644 --- a/libraries/sysinfo.lib.php +++ b/libraries/sysinfo.lib.php @@ -6,7 +6,7 @@ * * This code is based on the OS Classes from the phpsysinfo project (http://phpsysinfo.sourceforge.net/) * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/libraries/tbl_common.php b/libraries/tbl_common.php index a7ecf18..4b8172f 100644 --- a/libraries/tbl_common.php +++ b/libraries/tbl_common.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/tbl_info.inc.php b/libraries/tbl_info.inc.php index ac3a26f..4c12671 100644 --- a/libraries/tbl_info.inc.php +++ b/libraries/tbl_info.inc.php @@ -6,7 +6,7 @@ * @todo should be handled by class Table * @todo this should be recoded as functions, to avoid messing with global variables * - * @package phpMyAdmin + * @package PhpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/tbl_links.inc.php b/libraries/tbl_links.inc.php index 2cbf84e..e7e7152 100644 --- a/libraries/tbl_links.inc.php +++ b/libraries/tbl_links.inc.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/tbl_properties.inc.php b/libraries/tbl_properties.inc.php index 12576f4..c41146b 100644 --- a/libraries/tbl_properties.inc.php +++ b/libraries/tbl_properties.inc.php @@ -4,7 +4,7 @@ * Display form for changing/adding table fields/columns * * included by tbl_addfield.php, -_alter.php, -_create.php - * @package phpMyAdmin + * @package PhpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/tbl_replace_fields.inc.php b/libraries/tbl_replace_fields.inc.php index b408e6c..8e27290 100644 --- a/libraries/tbl_replace_fields.inc.php +++ b/libraries/tbl_replace_fields.inc.php @@ -18,7 +18,7 @@ * note: grab_globals has extracted the fields from _FILES or HTTP_POST_FILES * * - * @package phpMyAdmin + * @package PhpMyAdmin */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/tbl_select.lib.php b/libraries/tbl_select.lib.php index 2fa598b..27f643a 100644 --- a/libraries/tbl_select.lib.php +++ b/libraries/tbl_select.lib.php @@ -3,7 +3,7 @@ /** * Functions for the table-search page and zoom-search page * - * @package phpMyAdmin + * @package PhpMyAdmin */ require_once 'url_generating.lib.php'; diff --git a/libraries/transformations.lib.php b/libraries/transformations.lib.php index 51da6ce..7d16020 100644 --- a/libraries/transformations.lib.php +++ b/libraries/transformations.lib.php @@ -3,7 +3,7 @@ /** * Set of functions used with the relation and pdf feature * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/libraries/transformations/application_octetstream__download.inc.php b/libraries/transformations/application_octetstream__download.inc.php index 55fae19..0418d76 100644 --- a/libraries/transformations/application_octetstream__download.inc.php +++ b/libraries/transformations/application_octetstream__download.inc.php @@ -1,7 +1,7 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * @package phpMyAdmin-Transformation + * @package PhpMyAdmin-Transformation */ function PMA_transformation_application_octetstream__download_info() diff --git a/libraries/transformations/application_octetstream__hex.inc.php b/libraries/transformations/application_octetstream__hex.inc.php index 06eced4..c0cb6b2 100644 --- a/libraries/transformations/application_octetstream__hex.inc.php +++ b/libraries/transformations/application_octetstream__hex.inc.php @@ -1,7 +1,7 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * @package phpMyAdmin-Transformation + * @package PhpMyAdmin-Transformation */ function PMA_transformation_application_octetstream__hex_info() diff --git a/libraries/transformations/global.inc.php b/libraries/transformations/global.inc.php index 76ef2de..87c7c90 100644 --- a/libraries/transformations/global.inc.php +++ b/libraries/transformations/global.inc.php @@ -19,7 +19,7 @@ * * Please provide a comment for your function, what it does and what parameters are available. * - * @package phpMyAdmin-Transformation + * @package PhpMyAdmin-Transformation */ /** diff --git a/libraries/transformations/image_jpeg__inline.inc.php b/libraries/transformations/image_jpeg__inline.inc.php index 97e4baf..4bbf465 100644 --- a/libraries/transformations/image_jpeg__inline.inc.php +++ b/libraries/transformations/image_jpeg__inline.inc.php @@ -1,7 +1,7 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * @package phpMyAdmin-Transformation + * @package PhpMyAdmin-Transformation */ function PMA_transformation_image_jpeg__inline_info() diff --git a/libraries/transformations/image_jpeg__link.inc.php b/libraries/transformations/image_jpeg__link.inc.php index 82800c1..39b38f6 100644 --- a/libraries/transformations/image_jpeg__link.inc.php +++ b/libraries/transformations/image_jpeg__link.inc.php @@ -1,7 +1,7 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * @package phpMyAdmin-Transformation + * @package PhpMyAdmin-Transformation */ function PMA_transformation_image_jpeg__link_info() diff --git a/libraries/transformations/image_png__inline.inc.php b/libraries/transformations/image_png__inline.inc.php index 481af25..f96c9a0 100644 --- a/libraries/transformations/image_png__inline.inc.php +++ b/libraries/transformations/image_png__inline.inc.php @@ -1,7 +1,7 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * @package phpMyAdmin-Transformation + * @package PhpMyAdmin-Transformation */ function PMA_transformation_image_png__inline_info() diff --git a/libraries/transformations/text_plain__dateformat.inc.php b/libraries/transformations/text_plain__dateformat.inc.php index d7b7ab1..dcdcb8c 100644 --- a/libraries/transformations/text_plain__dateformat.inc.php +++ b/libraries/transformations/text_plain__dateformat.inc.php @@ -1,7 +1,7 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * @package phpMyAdmin-Transformation + * @package PhpMyAdmin-Transformation */ function PMA_transformation_text_plain__dateformat_info() diff --git a/libraries/transformations/text_plain__external.inc.php b/libraries/transformations/text_plain__external.inc.php index d60551c..eb71ef2 100644 --- a/libraries/transformations/text_plain__external.inc.php +++ b/libraries/transformations/text_plain__external.inc.php @@ -1,7 +1,7 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * @package phpMyAdmin-Transformation + * @package PhpMyAdmin-Transformation */ function PMA_transformation_text_plain__external_info() diff --git a/libraries/transformations/text_plain__formatted.inc.php b/libraries/transformations/text_plain__formatted.inc.php index 3b5e66b..a8f27ca 100644 --- a/libraries/transformations/text_plain__formatted.inc.php +++ b/libraries/transformations/text_plain__formatted.inc.php @@ -1,7 +1,7 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * @package phpMyAdmin-Transformation + * @package PhpMyAdmin-Transformation */ function PMA_transformation_text_plain__formatted_info() diff --git a/libraries/transformations/text_plain__imagelink.inc.php b/libraries/transformations/text_plain__imagelink.inc.php index 06fd97f..c02ff35 100644 --- a/libraries/transformations/text_plain__imagelink.inc.php +++ b/libraries/transformations/text_plain__imagelink.inc.php @@ -1,7 +1,7 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * @package phpMyAdmin-Transformation + * @package PhpMyAdmin-Transformation */ function PMA_transformation_text_plain__imagelink_info() diff --git a/libraries/transformations/text_plain__link.inc.php b/libraries/transformations/text_plain__link.inc.php index 4daa565..c08d34e 100644 --- a/libraries/transformations/text_plain__link.inc.php +++ b/libraries/transformations/text_plain__link.inc.php @@ -1,7 +1,7 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * @package phpMyAdmin-Transformation + * @package PhpMyAdmin-Transformation */ function PMA_transformation_text_plain__link_info() diff --git a/libraries/transformations/text_plain__longToIpv4.inc.php b/libraries/transformations/text_plain__longToIpv4.inc.php index 4c95997..762d523 100644 --- a/libraries/transformations/text_plain__longToIpv4.inc.php +++ b/libraries/transformations/text_plain__longToIpv4.inc.php @@ -1,7 +1,7 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * @package phpMyAdmin-Transformation + * @package PhpMyAdmin-Transformation */ function PMA_transformation_text_plain__longToIpv4_info() diff --git a/libraries/transformations/text_plain__sql.inc.php b/libraries/transformations/text_plain__sql.inc.php index 2db5ecc..d09a239 100644 --- a/libraries/transformations/text_plain__sql.inc.php +++ b/libraries/transformations/text_plain__sql.inc.php @@ -1,7 +1,7 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * @package phpMyAdmin-Transformation + * @package PhpMyAdmin-Transformation */ function PMA_transformation_text_plain__sql_info() diff --git a/libraries/transformations/text_plain__substr.inc.php b/libraries/transformations/text_plain__substr.inc.php index 0ca19e2..c220b06 100644 --- a/libraries/transformations/text_plain__substr.inc.php +++ b/libraries/transformations/text_plain__substr.inc.php @@ -1,7 +1,7 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * @package phpMyAdmin-Transformation + * @package PhpMyAdmin-Transformation */ function PMA_transformation_text_plain__substr_info() diff --git a/libraries/url_generating.lib.php b/libraries/url_generating.lib.php index 3884125..f36f8f8 100644 --- a/libraries/url_generating.lib.php +++ b/libraries/url_generating.lib.php @@ -3,7 +3,7 @@ /** * URL/hidden inputs generating. * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/libraries/user_preferences.inc.php b/libraries/user_preferences.inc.php index 22b3725..42deeb8 100644 --- a/libraries/user_preferences.inc.php +++ b/libraries/user_preferences.inc.php @@ -3,7 +3,7 @@ /** * Common header for user preferences pages * - * @package phpMyAdmin + * @package PhpMyAdmin */ if (!defined('PHPMYADMIN')) { exit; diff --git a/libraries/user_preferences.lib.php b/libraries/user_preferences.lib.php index 84ca5c4..497b28e 100644 --- a/libraries/user_preferences.lib.php +++ b/libraries/user_preferences.lib.php @@ -3,7 +3,7 @@ /** * Functions for displaying user preferences pages * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/libraries/vendor_config.php b/libraries/vendor_config.php index 41f7c23..ed2b410 100644 --- a/libraries/vendor_config.php +++ b/libraries/vendor_config.php @@ -7,7 +7,7 @@ * For changing this file you should know what you are doing. For this reason * options here are not part of normal configuration. * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/libraries/zip.lib.php b/libraries/zip.lib.php index f8b5878..7a0094f 100644 --- a/libraries/zip.lib.php +++ b/libraries/zip.lib.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** @@ -12,7 +12,7 @@ * @see Official ZIP file format: http://www.pkware.com/support/zip-app-note * * @access public - * @package phpMyAdmin + * @package PhpMyAdmin */ class zipfile { diff --git a/license.php b/license.php index 2a5dc97..b9a9ec8 100644 --- a/license.php +++ b/license.php @@ -6,7 +6,7 @@ * Note: please do not fold this script into a general script * that would read any file using a GET parameter, it would open a hole * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/main.php b/main.php index 30d9589..f0fd68f 100644 --- a/main.php +++ b/main.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/navigation.php b/navigation.php index dffa557..a93aae6 100644 --- a/navigation.php +++ b/navigation.php @@ -3,7 +3,7 @@ /** * the navigation frame - displays server, db and table selection tree * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/phpinfo.php b/phpinfo.php index 152c4b3..2d47abf 100644 --- a/phpinfo.php +++ b/phpinfo.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * phpinfo() wrapper to allow displaying only when configured to do so. - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/phpmyadmin.css.php b/phpmyadmin.css.php index b3cfecc..4fd7ce2 100644 --- a/phpmyadmin.css.php +++ b/phpmyadmin.css.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/pmd_display_field.php b/pmd_display_field.php index f7665b8..34c4d87 100644 --- a/pmd_display_field.php +++ b/pmd_display_field.php @@ -1,7 +1,7 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * @package phpMyAdmin-Designer + * @package PhpMyAdmin-Designer */ /** diff --git a/pmd_general.php b/pmd_general.php index 4a8c27a..21fffc9 100644 --- a/pmd_general.php +++ b/pmd_general.php @@ -1,7 +1,7 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * @package phpMyAdmin-Designer + * @package PhpMyAdmin-Designer */ /** diff --git a/pmd_pdf.php b/pmd_pdf.php index 95a412b..ced74f9 100644 --- a/pmd_pdf.php +++ b/pmd_pdf.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin-Designer + * @package PhpMyAdmin-Designer */ require_once './libraries/pmd_common.php'; diff --git a/pmd_relation_new.php b/pmd_relation_new.php index c0a6ad8..f0577ca 100644 --- a/pmd_relation_new.php +++ b/pmd_relation_new.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin-Designer + * @package PhpMyAdmin-Designer */ /** diff --git a/pmd_relation_upd.php b/pmd_relation_upd.php index d61d9d2..24ced45 100644 --- a/pmd_relation_upd.php +++ b/pmd_relation_upd.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin-Designer + * @package PhpMyAdmin-Designer */ /** diff --git a/pmd_save_pos.php b/pmd_save_pos.php index ac7d533..10a6e8a 100644 --- a/pmd_save_pos.php +++ b/pmd_save_pos.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin-Designer + * @package PhpMyAdmin-Designer */ /** diff --git a/prefs_forms.php b/prefs_forms.php index 4aaea9c..1f6fb79 100644 --- a/prefs_forms.php +++ b/prefs_forms.php @@ -3,7 +3,7 @@ /** * User preferences page * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/prefs_manage.php b/prefs_manage.php index 267eb43..c21aa55 100644 --- a/prefs_manage.php +++ b/prefs_manage.php @@ -3,7 +3,7 @@ /** * User preferences management page * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/querywindow.php b/querywindow.php index c18d2a6..2c28373 100644 --- a/querywindow.php +++ b/querywindow.php @@ -4,7 +4,7 @@ * this file is register_globals safe * * @todo move JavaScript out of here into .js files - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/schema_edit.php b/schema_edit.php index 85eeccc..b081648 100644 --- a/schema_edit.php +++ b/schema_edit.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/schema_export.php b/schema_export.php index d67bc85..1430e57 100644 --- a/schema_export.php +++ b/schema_export.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/scripts/decode_bug.php b/scripts/decode_bug.php index e376ef8..aff4d34 100644 --- a/scripts/decode_bug.php +++ b/scripts/decode_bug.php @@ -8,7 +8,7 @@ * * Copyright 2002 Robin Johnson <robbat2(a)users.sourceforge.net> * - * @package phpMyAdmin-debug + * @package PhpMyAdmin-debug */ /** diff --git a/scripts/openid.php b/scripts/openid.php index 911f69d..d57b83c 100644 --- a/scripts/openid.php +++ b/scripts/openid.php @@ -12,7 +12,7 @@ * User first authenticates using OpenID and based on content of $AUTH_MAP * the login information is passed to phpMyAdmin in session data. * - * @package phpMyAdmin + * @package PhpMyAdmin * @subpackage Example */ diff --git a/scripts/signon-script.php b/scripts/signon-script.php index 201d217..52777a0 100644 --- a/scripts/signon-script.php +++ b/scripts/signon-script.php @@ -7,7 +7,7 @@ * phpMyAdmin, it is not intended to be perfect code and look, only * shows how you can integrate this functionality in your application. * - * @package phpMyAdmin + * @package PhpMyAdmin * @subpackage Example */ diff --git a/scripts/signon.php b/scripts/signon.php index d80c1cf..0dfd356 100644 --- a/scripts/signon.php +++ b/scripts/signon.php @@ -7,7 +7,7 @@ * phpMyAdmin, it is not intended to be perfect code and look, only * shows how you can integrate this functionality in your application. * - * @package phpMyAdmin + * @package PhpMyAdmin * @subpackage Example */ diff --git a/server_binlog.php b/server_binlog.php index 8e7a316..89a424a 100644 --- a/server_binlog.php +++ b/server_binlog.php @@ -3,7 +3,7 @@ /** * display the binary logs and the content of the selected * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/server_collations.php b/server_collations.php index 0fc182c..b229b5c 100644 --- a/server_collations.php +++ b/server_collations.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/server_databases.php b/server_databases.php index e7519a5..9b6d5b0 100644 --- a/server_databases.php +++ b/server_databases.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/server_engines.php b/server_engines.php index afd6d50..9dcfc12 100644 --- a/server_engines.php +++ b/server_engines.php @@ -3,7 +3,7 @@ /** * display list of server engines and additonal information about them * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/server_export.php b/server_export.php index d6dd2cf..e80f2cd 100644 --- a/server_export.php +++ b/server_export.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/server_import.php b/server_import.php index e0eb684..ddc49e8 100644 --- a/server_import.php +++ b/server_import.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/server_plugins.php b/server_plugins.php index 93a5f63..7aa0516 100644 --- a/server_plugins.php +++ b/server_plugins.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/server_privileges.php b/server_privileges.php index dccc7af..cc17d40 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/server_replication.php b/server_replication.php index b070067..db48a79 100644 --- a/server_replication.php +++ b/server_replication.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/server_sql.php b/server_sql.php index ddf90ed..56aca7a 100644 --- a/server_sql.php +++ b/server_sql.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/server_status.php b/server_status.php index 02e3a7f..bfd641d 100644 --- a/server_status.php +++ b/server_status.php @@ -4,7 +4,7 @@ * displays status variables with descriptions and some hints an optmizing * + reset status variables * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/server_synchronize.php b/server_synchronize.php index 83acf6b..c37a9e0 100644 --- a/server_synchronize.php +++ b/server_synchronize.php @@ -3,7 +3,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/server_variables.php b/server_variables.php index 9c37864..35a3568 100644 --- a/server_variables.php +++ b/server_variables.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/setup/config.php b/setup/config.php index 89bcdc9..f105d34 100644 --- a/setup/config.php +++ b/setup/config.php @@ -3,7 +3,7 @@ /** * Front controller for config view / download and clear * - * @package phpMyAdmin-setup + * @package PhpMyAdmin-setup */ /** diff --git a/setup/frames/config.inc.php b/setup/frames/config.inc.php index e56898f..353145c 100644 --- a/setup/frames/config.inc.php +++ b/setup/frames/config.inc.php @@ -3,7 +3,7 @@ /** * Config file view and save screen * - * @package phpMyAdmin-setup + * @package PhpMyAdmin-setup */ if (!defined('PHPMYADMIN')) { diff --git a/setup/frames/form.inc.php b/setup/frames/form.inc.php index 5d34034..83cace3 100644 --- a/setup/frames/form.inc.php +++ b/setup/frames/form.inc.php @@ -3,7 +3,7 @@ /** * Form edit view * - * @package phpMyAdmin-setup + * @package PhpMyAdmin-setup */ if (!defined('PHPMYADMIN')) { diff --git a/setup/frames/index.inc.php b/setup/frames/index.inc.php index 3ad1cfc..bbd631b 100644 --- a/setup/frames/index.inc.php +++ b/setup/frames/index.inc.php @@ -2,7 +2,7 @@ /** * Overview (main page) * - * @package phpMyAdmin-setup + * @package PhpMyAdmin-setup */ if (!defined('PHPMYADMIN')) { diff --git a/setup/frames/menu.inc.php b/setup/frames/menu.inc.php index 978a47b..c0cb23f 100644 --- a/setup/frames/menu.inc.php +++ b/setup/frames/menu.inc.php @@ -2,7 +2,7 @@ /** * Menu items * - * @package phpMyAdmin-setup + * @package PhpMyAdmin-setup */ if (!defined('PHPMYADMIN')) { diff --git a/setup/frames/servers.inc.php b/setup/frames/servers.inc.php index 8d04966..d208c0d 100644 --- a/setup/frames/servers.inc.php +++ b/setup/frames/servers.inc.php @@ -2,7 +2,7 @@ /** * Server create and edit view * - * @package phpMyAdmin-setup + * @package PhpMyAdmin-setup */ if (!defined('PHPMYADMIN')) { diff --git a/setup/lib/ConfigGenerator.class.php b/setup/lib/ConfigGenerator.class.php index f3c6ed8..b4b49fe 100644 --- a/setup/lib/ConfigGenerator.class.php +++ b/setup/lib/ConfigGenerator.class.php @@ -3,13 +3,13 @@ /** * Config file generator * - * @package phpMyAdmin-setup + * @package PhpMyAdmin-setup */ /** * Config file generation class * - * @package phpMyAdmin + * @package PhpMyAdmin */ class ConfigGenerator { diff --git a/setup/lib/common.inc.php b/setup/lib/common.inc.php index 2965dec..227d394 100644 --- a/setup/lib/common.inc.php +++ b/setup/lib/common.inc.php @@ -3,7 +3,7 @@ /** * Loads libraries/common.inc.php and preforms some additional actions * - * @package phpMyAdmin-setup + * @package PhpMyAdmin-setup */ /** diff --git a/setup/lib/form_processing.lib.php b/setup/lib/form_processing.lib.php index 10c368c..9509587 100644 --- a/setup/lib/form_processing.lib.php +++ b/setup/lib/form_processing.lib.php @@ -3,7 +3,7 @@ /** * Formset processing library * - * @package phpMyAdmin-setup + * @package PhpMyAdmin-setup */ /** diff --git a/setup/lib/index.lib.php b/setup/lib/index.lib.php index 334953f..3e60019 100644 --- a/setup/lib/index.lib.php +++ b/setup/lib/index.lib.php @@ -6,7 +6,7 @@ * Security checks are the idea of Aung Khant <aungkhant[at]yehg.net>, http://yehg.net/lab * Version check taken from the old setup script by Michal Čihař <michal(a)cihar.com> * - * @package phpMyAdmin-setup + * @package PhpMyAdmin-setup */ if (!defined('PHPMYADMIN')) { diff --git a/setup/validate.php b/setup/validate.php index 22bdccb..32cac07 100644 --- a/setup/validate.php +++ b/setup/validate.php @@ -3,7 +3,7 @@ /** * Validation callback. * - * @package phpMyAdmin-setup + * @package PhpMyAdmin-setup */ /** diff --git a/show_config_errors.php b/show_config_errors.php index e163c42..d3f9dbe 100644 --- a/show_config_errors.php +++ b/show_config_errors.php @@ -3,7 +3,7 @@ /** * Simple wrapper just to enable error reporting and include config * - * @package phpMyAdmin + * @package PhpMyAdmin */ $GLOBALS['now'] = gmdate('D, d M Y H:i:s') . ' GMT'; diff --git a/sql.php b/sql.php index aa99c19..9100def 100644 --- a/sql.php +++ b/sql.php @@ -3,7 +3,7 @@ /** * @todo we must handle the case if sql.php is called directly with a query * that returns 0 rows - to prevent cyclic redirects or includes - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/tbl_addfield.php b/tbl_addfield.php index c2a2e96..69252e6 100644 --- a/tbl_addfield.php +++ b/tbl_addfield.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/tbl_alter.php b/tbl_alter.php index a268866..aace316 100644 --- a/tbl_alter.php +++ b/tbl_alter.php @@ -6,7 +6,7 @@ * linked from table_structure, uses libraries/tbl_properties.inc.php to display * form and handles this form data * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/tbl_change.php b/tbl_change.php index 004c30a..2dbbc5b 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -5,7 +5,7 @@ * * register_globals_save (mark this file save for disabling register globals) * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/tbl_chart.php b/tbl_chart.php index e396c53..ac52bd1 100644 --- a/tbl_chart.php +++ b/tbl_chart.php @@ -3,7 +3,7 @@ /** * handles creation of the chart * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/tbl_create.php b/tbl_create.php index cdad8ba..9397b87 100644 --- a/tbl_create.php +++ b/tbl_create.php @@ -1,7 +1,7 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/tbl_export.php b/tbl_export.php index 379d26c..312cfb8 100644 --- a/tbl_export.php +++ b/tbl_export.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/tbl_get_field.php b/tbl_get_field.php index b636c46..5c7d017 100644 --- a/tbl_get_field.php +++ b/tbl_get_field.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * Provides download to a given field defined in parameters. - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/tbl_gis_visualization.php b/tbl_gis_visualization.php index 31bcd81..16cc379 100644 --- a/tbl_gis_visualization.php +++ b/tbl_gis_visualization.php @@ -2,7 +2,7 @@ /** * handles creation of the GIS visualizations. * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/tbl_import.php b/tbl_import.php index ff99ca8..e5449b9 100644 --- a/tbl_import.php +++ b/tbl_import.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/tbl_indexes.php b/tbl_indexes.php index 1d678db..f06a751 100644 --- a/tbl_indexes.php +++ b/tbl_indexes.php @@ -3,7 +3,7 @@ /** * Displays index edit/creation form and handles it * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/tbl_move_copy.php b/tbl_move_copy.php index e25cf69..00a8a39 100644 --- a/tbl_move_copy.php +++ b/tbl_move_copy.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/tbl_operations.php b/tbl_operations.php index 1f44315..a09528b 100644 --- a/tbl_operations.php +++ b/tbl_operations.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/tbl_printview.php b/tbl_printview.php index b459d60..17c9b25 100644 --- a/tbl_printview.php +++ b/tbl_printview.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/tbl_relation.php b/tbl_relation.php index fc3d868..a5f6f17 100644 --- a/tbl_relation.php +++ b/tbl_relation.php @@ -10,7 +10,7 @@ * @todo check foreign fields to be from same type and size, all other makes no sense * @todo add an link to create an index required for constraints, or an option to do automatically * @todo if above todos are fullfilled we can add all fields meet requirements in the select dropdown - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/tbl_replace.php b/tbl_replace.php index 79c21c3..38319b2 100644 --- a/tbl_replace.php +++ b/tbl_replace.php @@ -8,7 +8,7 @@ * * @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 - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/tbl_row_action.php b/tbl_row_action.php index 298fe7a..537e4f2 100644 --- a/tbl_row_action.php +++ b/tbl_row_action.php @@ -3,7 +3,7 @@ /** * handle row specifc actions like edit, delete, export * - * @package phpMyAdmin + * @package PhpMyAdmin */ diff --git a/tbl_select.php b/tbl_select.php index 0762677..7103814 100644 --- a/tbl_select.php +++ b/tbl_select.php @@ -7,7 +7,7 @@ * and include sql.php to execute it * * @todo display search form again if no results from previous search - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/tbl_sql.php b/tbl_sql.php index 70f2177..2e4cde6 100644 --- a/tbl_sql.php +++ b/tbl_sql.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/tbl_structure.php b/tbl_structure.php index 0385b26..754dea1 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -3,7 +3,7 @@ /** * Displays table structure infos like fields/columns, indexes, size, rows * and allows manipulation of indexes and columns/fields - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/tbl_tracking.php b/tbl_tracking.php index 5099859..fecfa86 100644 --- a/tbl_tracking.php +++ b/tbl_tracking.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ // Run common work diff --git a/tbl_triggers.php b/tbl_triggers.php index f20eecb..9c87e67 100644 --- a/tbl_triggers.php +++ b/tbl_triggers.php @@ -3,7 +3,7 @@ /** * Triggers management. * - * @package phpMyAdmin + * @package PhpMyAdmin */ require_once './db_triggers.php'; diff --git a/test/AllSeleniumTests.php b/test/AllSeleniumTests.php index 5d9baed..0f4839e 100644 --- a/test/AllSeleniumTests.php +++ b/test/AllSeleniumTests.php @@ -3,7 +3,7 @@ /** * runs all defined Selenium tests * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test */ diff --git a/test/AllTests.php b/test/AllTests.php index 338f83d..c170a1c 100644 --- a/test/AllTests.php +++ b/test/AllTests.php @@ -3,7 +3,7 @@ /** * runs all defined tests * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test */ /** diff --git a/test/Environment_test.php b/test/Environment_test.php index 4cae38f..5a15519 100644 --- a/test/Environment_test.php +++ b/test/Environment_test.php @@ -3,7 +3,7 @@ /** * tests for environment like OS, PHP, modules, ... * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test */ /** @@ -12,7 +12,7 @@ require_once 'config.sample.inc.php'; /** - * @package phpMyAdmin-test + * @package PhpMyAdmin-test */ class Environment_test extends PHPUnit_Framework_TestCase { diff --git a/test/PMA_showHint_test.php b/test/PMA_showHint_test.php index 8370759..8a3da9f 100644 --- a/test/PMA_showHint_test.php +++ b/test/PMA_showHint_test.php @@ -3,7 +3,7 @@ /** * Test for PMA_showHint() function from common.lib.php * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test * @version $Id: PMA_showHint_test.php */ diff --git a/test/classes/Advisor_test.php b/test/classes/Advisor_test.php index 9a92fe5..1ef60b2 100644 --- a/test/classes/Advisor_test.php +++ b/test/classes/Advisor_test.php @@ -3,7 +3,7 @@ /** * tests for Advisor class * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test */ /* diff --git a/test/classes/PMA_Config_test.php b/test/classes/PMA_Config_test.php index edcc6aa..38d555f 100644 --- a/test/classes/PMA_Config_test.php +++ b/test/classes/PMA_Config_test.php @@ -4,7 +4,7 @@ * Test for PMA_Config class * * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test * @group current */ diff --git a/test/classes/PMA_File_test.php b/test/classes/PMA_File_test.php index 63bf80a..5115650 100644 --- a/test/classes/PMA_File_test.php +++ b/test/classes/PMA_File_test.php @@ -4,7 +4,7 @@ /** * tests for PMA_File class * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test */ /* diff --git a/test/classes/PMA_List_Database_test.php b/test/classes/PMA_List_Database_test.php index 6eb3e7e..24e7a11 100644 --- a/test/classes/PMA_List_Database_test.php +++ b/test/classes/PMA_List_Database_test.php @@ -3,7 +3,7 @@ /** * tests for PMA_List_Database class * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test */ /* diff --git a/test/classes/PMA_Message_test.php b/test/classes/PMA_Message_test.php index db8e385..5968594 100644 --- a/test/classes/PMA_Message_test.php +++ b/test/classes/PMA_Message_test.php @@ -3,7 +3,7 @@ /** * Test for PMA_Message class * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test */ /* diff --git a/test/classes/PMA_PDF_test.php b/test/classes/PMA_PDF_test.php index 1f7931c..eec134c 100644 --- a/test/classes/PMA_PDF_test.php +++ b/test/classes/PMA_PDF_test.php @@ -3,7 +3,7 @@ /** * tests 7 @@s/PMA_PDF_test.phpt.php b/test/classes/PMA_PDF_test.phpst.phpe_test.phpopdown__substr.inc.phpnc.phpex.inc.php.inc.php��Y+��Y+ߊY+�ۋY+ �� Y+��k��Y+6 ��!�!�� x�ڋY+��Y+��Y+��`�Y+��>�Y+u��Y+�>�Y+ش>�Y+��>�Y+��Y+x�ڋY+��k��Y+�!�!�� H��Y+��Y+��Y+��`�Y+��8ߊY+�p� ��u��Y+��Y+��k��Y+GHIJKMNOP�� HE��Y+� ��Y+��Y+��0�>�Y+u��Y+�ڋY+�yn�Y+�>�Y+ش>�Y+��>�Y+��Y+HE��Y+� ��k��Y+8E��Y+� ��k��Y+(E��Y+� ��0��k��Y+E��Y+� ��`��k��Y+ ��>�Y+u��Y+��>�Y+��n�Y+e��Y+ش>�Y+ ��y�n�Y+e��Y+�>�Y+0 ��Z�n�Y+e��Y+�tn�Y+�ڋY+�yn�Y+�>�Y+��ڋY+ش>�Y+��>�Y+��Y+8ߊY+=:�Y+ ��pn�Y+� �� k��Y+5678:<=>?@BD�� =7�Y+ ��u��Y+ߊY+` ��=:�Y+e��Y+ߊY+�_@f�S Q��l��S�Y+ ��=7�Y+�� k��Y+u]�� 4Q��U^Qʉ��u��*ēv�� H��Y+�?�Y+`��ࡌY+�ࡌY+�&=�Y+�� @ ��ڋY+u��Y+��ڋY+��ࡌY+p��ࡌY+(��for PMA_PDF class * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test */ /* diff --git a/test/classes/PMA_Theme_Manager_test.php b/test/classes/PMA_Theme_Manager_test.php index 361417b..02a2f1b 100644 --- a/test/classes/PMA_Theme_Manager_test.php +++ b/test/classes/PMA_Theme_Manager_test.php @@ -3,7 +3,7 @@ /** * tests for PMA_Theme_Manager class * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test */ /* diff --git a/test/classes/gis/PMA_GIS_Factory_test.php b/test/classes/gis/PMA_GIS_Factory_test.php index ea4e3be..10ba6b2 100644 --- a/test/classes/gis/PMA_GIS_Factory_test.php +++ b/test/classes/gis/PMA_GIS_Factory_test.php @@ -2,7 +2,7 @@ /** * Test for PMA_GIS_Factory * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test */ require_once 'libraries/gis/pma_gis_geometry.php'; require_once 'libraries/gis/pma_gis_linestring.php'; diff --git a/test/classes/gis/PMA_GIS_Geom_test.php b/test/classes/gis/PMA_GIS_Geom_test.php index 8176a92..6f61cf1 100644 --- a/test/classes/gis/PMA_GIS_Geom_test.php +++ b/test/classes/gis/PMA_GIS_Geom_test.php @@ -2,7 +2,7 @@ /** * Abstract parent class for all PMA_GIS_<Geom_type> test classes * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test */ require_once 'libraries/gis/pma_gis_geometry.php'; diff --git a/test/classes/gis/PMA_GIS_Geometry_test.php b/test/classes/gis/PMA_GIS_Geometry_test.php index b5d4732..8d561af 100644 --- a/test/classes/gis/PMA_GIS_Geometry_test.php +++ b/test/classes/gis/PMA_GIS_Geometry_test.php @@ -2,7 +2,7 @@ /** * Test for PMA_GIS_Geometry * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test */ require_once 'libraries/gis/pma_gis_geometry.php'; diff --git a/test/classes/gis/PMA_GIS_Linestring_test.php b/test/classes/gis/PMA_GIS_Linestring_test.php index 76bfe05..480e2d8 100644 --- a/test/classes/gis/PMA_GIS_Linestring_test.php +++ b/test/classes/gis/PMA_GIS_Linestring_test.php @@ -2,7 +2,7 @@ /** * Test for PMA_GIS_Linestring * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test */ require_once 'PMA_GIS_Geom_test.php'; diff --git a/test/classes/gis/PMA_GIS_Multilinestring_test.php b/test/classes/gis/PMA_GIS_Multilinestring_test.php index 636c028..bf7118e 100644 --- a/test/classes/gis/PMA_GIS_Multilinestring_test.php +++ b/test/classes/gis/PMA_GIS_Multilinestring_test.php @@ -2,7 +2,7 @@ /** * Test for PMA_GIS_Multilinestring * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test */ require_once 'PMA_GIS_Geom_test.php'; diff --git a/test/classes/gis/PMA_GIS_Multipoint_test.php b/test/classes/gis/PMA_GIS_Multipoint_test.php index 57b7594..9b1826a 100644 --- a/test/classes/gis/PMA_GIS_Multipoint_test.php +++ b/test/classes/gis/PMA_GIS_Multipoint_test.php @@ -2,7 +2,7 @@ /** * Test for PMA_GIS_Multipoint * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test */ require_once 'PMA_GIS_Geom_test.php'; diff --git a/test/classes/gis/PMA_GIS_Multipolygon_test.php b/test/classes/gis/PMA_GIS_Multipolygon_test.php index 19a09dc..bea856e 100644 --- a/test/classes/gis/PMA_GIS_Multipolygon_test.php +++ b/test/classes/gis/PMA_GIS_Multipolygon_test.php @@ -2,7 +2,7 @@ /** * Test for PMA_GIS_Multipolygon * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test */ require_once 'PMA_GIS_Geom_test.php'; diff --git a/test/classes/gis/PMA_GIS_Point_test.php b/test/classes/gis/PMA_GIS_Point_test.php index bca1e4c..af85daf 100644 --- a/test/classes/gis/PMA_GIS_Point_test.php +++ b/test/classes/gis/PMA_GIS_Point_test.php @@ -2,7 +2,7 @@ /** * Test for PMA_GIS_Point * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test */ require_once 'PMA_GIS_Geom_test.php'; diff --git a/test/classes/gis/PMA_GIS_Polygon_test.php b/test/classes/gis/PMA_GIS_Polygon_test.php index 0686295..9ce15c6 100644 --- a/test/classes/gis/PMA_GIS_Polygon_test.php +++ b/test/classes/gis/PMA_GIS_Polygon_test.php @@ -2,7 +2,7 @@ /** * Test for PMA_GIS_Polygon * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test */ require_once 'PMA_GIS_Geom_test.php'; diff --git a/test/libraries/PMA_GIS_modifyQuery_test.php b/test/libraries/PMA_GIS_modifyQuery_test.php index 04e9e1a..8894c2a 100644 --- a/test/libraries/PMA_GIS_modifyQuery_test.php +++ b/test/libraries/PMA_GIS_modifyQuery_test.php @@ -2,7 +2,7 @@ /** * Tests for PMA_GIS_modifyQuery method * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test */ require_once 'libraries/sqlparser.lib.php'; diff --git a/test/libraries/PMA_SQL_parser_data_test.php b/test/libraries/PMA_SQL_parser_data_test.php index 8c7bc04..e4e9e88 100644 --- a/test/libraries/PMA_SQL_parser_data_test.php +++ b/test/libraries/PMA_SQL_parser_data_test.php @@ -3,7 +3,7 @@ /** * tests for correctness of SQL parser data * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test */ /* diff --git a/test/libraries/PMA_SQL_parser_test.php b/test/libraries/PMA_SQL_parser_test.php index 155f439..e2eb362 100644 --- a/test/libraries/PMA_SQL_parser_test.php +++ b/test/libraries/PMA_SQL_parser_test.php @@ -3,7 +3,7 @@ /** * Tests for correctness of SQL parser * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test */ /* diff --git a/test/libraries/PMA_STR_sub_test.php b/test/libraries/PMA_STR_sub_test.php index e10ff39..1febef9 100644 --- a/test/libraries/PMA_STR_sub_test.php +++ b/test/libraries/PMA_STR_sub_test.php @@ -3,7 +3,7 @@ /** * tests for PMA_pow() * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test */ $match = array(); diff --git a/test/libraries/PMA_blowfish_test.php b/test/libraries/PMA_blowfish_test.php index d860bd0..989822a 100644 --- a/test/libraries/PMA_blowfish_test.php +++ b/test/libraries/PMA_blowfish_test.php @@ -3,7 +3,7 @@ /** * Test for blowfish encryption. * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test */ /* diff --git a/test/libraries/PMA_escapeJsString_test.php b/test/libraries/PMA_escapeJsString_test.php index 93afaef..c191717 100644 --- a/test/libraries/PMA_escapeJsString_test.php +++ b/test/libraries/PMA_escapeJsString_test.php @@ -3,7 +3,7 @@ /** * Test for javascript escaping. * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test */ /* diff --git a/test/libraries/PMA_generateCommonUrl_test.php b/test/libraries/PMA_generateCommonUrl_test.php index cc2aacf..5e8c604 100644 --- a/test/libraries/PMA_generateCommonUrl_test.php +++ b/test/libraries/PMA_generateCommonUrl_test.php @@ -3,7 +3,7 @@ /** * tests for PMA_generate_common_url() * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test */ /* diff --git a/test/libraries/PMA_sanitize_test.php b/test/libraries/PMA_sanitize_test.php index 3f0cbf1..23bf6de 100644 --- a/test/libraries/PMA_sanitize_test.php +++ b/test/libraries/PMA_sanitize_test.php @@ -3,7 +3,7 @@ /** * tests for PMA_sanitize() * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test */ /* diff --git a/test/libraries/PMA_transformation_getOptions_test.php b/test/libraries/PMA_transformation_getOptions_test.php index 99d0a10..03bc4be 100644 --- a/test/libraries/PMA_transformation_getOptions_test.php +++ b/test/libraries/PMA_transformation_getOptions_test.php @@ -3,7 +3,7 @@ /** * tests for PMA_sanitize() * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test */ /* diff --git a/test/libraries/common/PMA_ajaxResponse_test.php b/test/libraries/common/PMA_ajaxResponse_test.php index 7f8d69d..8c6b72d 100644 --- a/test/libraries/common/PMA_ajaxResponse_test.php +++ b/test/libraries/common/PMA_ajaxResponse_test.php @@ -3,7 +3,7 @@ /** * Test for PMA_ajaxResponse from common.lib.php * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test * @version $Id: PMA_ajaxResponse_test.php * @group common.lib-tests */ diff --git a/test/libraries/common/PMA_browseUploadFile_test.php b/test/libraries/common/PMA_browseUploadFile_test.php index a51a62c..4abc9cf 100644 --- a/test/libraries/common/PMA_browseUploadFile_test.php +++ b/test/libraries/common/PMA_browseUploadFile_test.php @@ -3,7 +3,7 @@ /** * Test for PMA_browseUploadFile from common.lib * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test * @version $Id: PMA_browseUploadFile_test.php * @group common.lib-tests */ diff --git a/test/libraries/common/PMA_buildActionTitles_test.php b/test/libraries/common/PMA_buildActionTitles_test.php index 88c54f3..8068cef 100644 --- a/test/libraries/common/PMA_buildActionTitles_test.php +++ b/test/libraries/common/PMA_buildActionTitles_test.php @@ -3,7 +3,7 @@ /** * Test for PMA_buildActionTitles from common.lib * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test * @version $Id: PMA_buildActionTitles_test.php * @group common.lib-tests */ diff --git a/test/libraries/common/PMA_cache_test.php b/test/libraries/common/PMA_cache_test.php index 2284078..2e22352 100644 --- a/test/libraries/common/PMA_cache_test.php +++ b/test/libraries/common/PMA_cache_test.php @@ -3,7 +3,7 @@ /** * Test for caching data in session * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test * @version $Id: PMA_cache_test.php * @group common.lib-tests */ diff --git a/test/libraries/common/PMA_checkParameters_test.php b/test/libraries/common/PMA_checkParameters_test.php index 3bf4ed8..7e1bd4f 100644 --- a/test/libraries/common/PMA_checkParameters_test.php +++ b/test/libraries/common/PMA_checkParameters_test.php @@ -3,7 +3,7 @@ /** * Test for PMA_checkParameters from common.lib.php * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test * @version $Id: PMA_checkParameters_test.php * @group common.lib-tests */ diff --git a/test/libraries/common/PMA_contains_nonprintable_ascii_test.php b/test/libraries/common/PMA_contains_nonprintable_ascii_test.php index f13154b..2804c88 100644 --- a/test/libraries/common/PMA_contains_nonprintable_ascii_test.php +++ b/test/libraries/common/PMA_contains_nonprintable_ascii_test.php @@ -3,7 +3,7 @@ /** * Test for PMA_contains_nonprintable_ascii from common.lib * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test * @version $Id: PMA_contains_nonprintable_ascii.php * @group common.lib-tests */ diff --git a/test/libraries/common/PMA_convert_bit_default_value_test.php b/test/libraries/common/PMA_convert_bit_default_value_test.php index 333ffac..6dd7b25 100644 --- a/test/libraries/common/PMA_convert_bit_default_value_test.php +++ b/test/libraries/common/PMA_convert_bit_default_value_test.php @@ -3,7 +3,7 @@ /** * Test for PMA_convert_bit_default_value from common.lib * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test * @version $Id: PMA_convert_bit_default_value_test.php * @group common.lib-tests */ diff --git a/test/libraries/common/PMA_displayMaximumUploadSize_test.php b/test/libraries/common/PMA_displayMaximumUploadSize_test.php index 57af208..9236c44 100644 --- a/test/libraries/common/PMA_displayMaximumUploadSize_test.php +++ b/test/libraries/common/PMA_displayMaximumUploadSize_test.php @@ -3,7 +3,7 @@ /** * Test for PMA_displayMaximumUploadSize from common.lib.php * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test * @version $Id: PMA_displayMaximumUploadSize_test.php * @group common.lib-tests */ diff --git a/test/libraries/common/PMA_display_html_checkbox_test.php b/test/libraries/common/PMA_display_html_checkbox_test.php index 4eca636..36fbafb 100644 --- a/test/libraries/common/PMA_display_html_checkbox_test.php +++ b/test/libraries/common/PMA_display_html_checkbox_test.php @@ -3,7 +3,7 @@ /** * Test for PMA_display_html_checkbox from common.lib.php * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test * @version $Id: PMA_display_html_checkbox_test.php * @group common.lib-tests */ diff --git a/test/libraries/common/PMA_display_html_radio_test.php b/test/libraries/common/PMA_display_html_radio_test.php index 6e7c014..6c7b96b 100644 --- a/test/libraries/common/PMA_display_html_radio_test.php +++ b/test/libraries/common/PMA_display_html_radio_test.php @@ -3,7 +3,7 @@ /** * Test for PMA_display_html_radio from common.lib.php * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test * @version $Id: PMA_display_html_radio_test.php * @group common.lib-tests */ diff --git a/test/libraries/common/PMA_escapeMySqlWildcards_test.php b/test/libraries/common/PMA_escapeMySqlWildcards_test.php index c77a841..de4d1a7 100644 --- a/test/libraries/common/PMA_escapeMySqlWildcards_test.php +++ b/test/libraries/common/PMA_escapeMySqlWildcards_test.php @@ -3,7 +3,7 @@ /** * Test for MySQL Wildcards escaping/unescaping * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test * @version $Id: PMA_escapeMySqlWildcards_test.php * @group common.lib-tests */ diff --git a/test/libraries/common/PMA_expandUserString_test.php b/test/libraries/common/PMA_expandUserString_test.php index 39cc664..e8c13c8 100644 --- a/test/libraries/common/PMA_expandUserString_test.php +++ b/test/libraries/common/PMA_expandUserString_test.php @@ -3,7 +3,7 @@ /** * Test for PMA_expandUserString from common.lib.php * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test * @group common.lib-tests */ diff --git a/test/libraries/common/PMA_extractFieldSpec_test.php b/test/libraries/common/PMA_extractFieldSpec_test.php index eeb79c4..c46b6e5 100644 --- a/test/libraries/common/PMA_extractFieldSpec_test.php +++ b/test/libraries/common/PMA_extractFieldSpec_test.php @@ -4,7 +4,7 @@ /** * Test for PMA_extractFieldSpec from common.lib.php * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test * @group common.lib-tests */ diff --git a/test/libraries/common/PMA_extractValueFromFormattedSize_test.php b/test/libraries/common/PMA_extractValueFromFormattedSize_test.php index d80c797..43ba342 100644 --- a/test/libraries/common/PMA_extractValueFromFormattedSize_test.php +++ b/test/libraries/common/PMA_extractValueFromFormattedSize_test.php @@ -3,7 +3,7 @@ /** * Test for PMA_extractValueFromFormattedSize from common.lib * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test * @version $Id: PMA_extractValueFromFormattedSize_test.php * @group common.lib-tests */ diff --git a/test/libraries/common/PMA_foreignKeySupported_test.php b/test/libraries/common/PMA_foreignKeySupported_test.php index f9c3049..ccea2a2 100644 --- a/test/libraries/common/PMA_foreignKeySupported_test.php +++ b/test/libraries/common/PMA_foreignKeySupported_test.php @@ -3,7 +3,7 @@ /** * Test for supporting foreign key * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test * @version $Id: PMA_foreignKeySupported_test.php * @group common.lib-tests */ diff --git a/test/libraries/common/PMA_formatNumberByteDown_test.php b/test/libraries/common/PMA_formatNumberByteDown_test.php index 18ab8ba..2cdf259 100644 --- a/test/libraries/common/PMA_formatNumberByteDown_test.php +++ b/test/libraries/common/PMA_formatNumberByteDown_test.php @@ -3,7 +3,7 @@ /** * Test for format number and byte * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test * @version $Id: PMA_formatNumberByteDown_test.php * @group common.lib-tests */ diff --git a/test/libraries/common/PMA_formatSql_test.php b/test/libraries/common/PMA_formatSql_test.php index e7a1c1f..ca1c567 100644 --- a/test/libraries/common/PMA_formatSql_test.php +++ b/test/libraries/common/PMA_formatSql_test.php @@ -3,7 +3,7 @@ /** * Test for PMA_formatSql from common.lib.php * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test * @version $Id: PMA_formatSql_test.php * @group common.lib-tests */ diff --git a/test/libraries/common/PMA_generateHiddenMaxFileSize_test.php b/test/libraries/common/PMA_generateHiddenMaxFileSize_test.php index b759f53..d546fd8 100644 --- a/test/libraries/common/PMA_generateHiddenMaxFileSize_test.php +++ b/test/libraries/common/PMA_generateHiddenMaxFileSize_test.php @@ -3,7 +3,7 @@ /** * Test for PMA_generateHiddenMaxFileSize from common.lib.php * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test * @version $Id: PMA_generateHiddenMaxFileSize_test.php * @group common.lib-tests */ diff --git a/test/libraries/common/PMA_generate_html_dropdown_test.php b/test/libraries/common/PMA_generate_html_dropdown_test.php index 0035646..0b45212 100644 --- a/test/libraries/common/PMA_generate_html_dropdown_test.php +++ b/test/libraries/common/PMA_generate_html_dropdown_test.php @@ -3,7 +3,7 @@ /** * Test for PMA_generate_html_dropdown_test from common.lib.php * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test * @version $Id: PMA_display_html_checkbox_test.php * @group common.lib-tests */ diff --git a/test/libraries/common/PMA_generate_slider_effect_test.php b/test/libraries/common/PMA_generate_slider_effect_test.php index 8012cef..5736d3e 100644 --- a/test/libraries/common/PMA_generate_slider_effect_test.php +++ b/test/libraries/common/PMA_generate_slider_effect_test.php @@ -3,7 +3,7 @@ /** * Test for PMA_generate_slider_effect from common.lib.php * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test * @version $Id: PMA_generate_slider_effect_test.php * @group common.lib-tests */ diff --git a/test/libraries/common/PMA_getDbLink_test.php b/test/libraries/common/PMA_getDbLink_test.php index 303ec38..eaf2ee5 100644 --- a/test/libraries/common/PMA_getDbLink_test.php +++ b/test/libraries/common/PMA_getDbLink_test.php @@ -3,7 +3,7 @@ /** * Test for PMA_getDbLink_test from common.lib.php * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test * @version $Id: PMA_getDbLink_test.php * @group common.lib-tests */ diff --git a/test/libraries/common/PMA_getIcon_test.php b/test/libraries/common/PMA_getIcon_test.php index 5c0f3e2..486dc31 100644 --- a/test/libraries/common/PMA_getIcon_test.php +++ b/test/libraries/common/PMA_getIcon_test.php @@ -3,7 +3,7 @@ /** * Test for PMA_getIcon() from common.lib.php * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test * @version $Id: PMA_getIcon_test.php * @group common.lib-tests */ diff --git a/test/libraries/common/PMA_getTitleForTarget_test.php b/test/libraries/common/PMA_getTitleForTarget_test.php index 478520d..77cdb6f 100644 --- a/test/libraries/common/PMA_getTitleForTarget_test.php +++ b/test/libraries/common/PMA_getTitleForTarget_test.php @@ -3,7 +3,7 @@ /** * Test for PMA_getTitleForTarget from common.lib * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test * @version $Id: PMA_getTitleForTarget_test.php * @group common.lib-tests */ diff --git a/test/libraries/common/PMA_localisedDateTimespan_test.php b/test/libraries/common/PMA_localisedDateTimespan_test.php index 4ed2909..b4ee1f7 100644 --- a/test/libraries/common/PMA_localisedDateTimespan_test.php +++ b/test/libraries/common/PMA_localisedDateTimespan_test.php @@ -3,7 +3,7 @@ /** * Test for generating localised date or timespan expression * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test * @version $Id: PMA_localisedDateTimespan_test.php * @group common.lib-tests */ diff --git a/test/libraries/common/PMA_pow_test.php b/test/libraries/common/PMA_pow_test.php index ff55e16..75cb255 100644 --- a/test/libraries/common/PMA_pow_test.php +++ b/test/libraries/common/PMA_pow_test.php @@ -3,7 +3,7 @@ /** * Tests for PMA_pow() function from common.lib.php * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test * @version $Id: PMA_pow_test.php * @group common.lib-tests */ diff --git a/test/libraries/common/PMA_printableBitValue_test.php b/test/libraries/common/PMA_printableBitValue_test.php index 20d4f4f..eea420d 100644 --- a/test/libraries/common/PMA_printableBitValue_test.php +++ b/test/libraries/common/PMA_printableBitValue_test.php @@ -3,7 +3,7 @@ /** * Test printableBitValue function * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test * @version $Id: PMA_printableBitValue_test.php * @group common.lib-tests */ diff --git a/test/libraries/common/PMA_quoting_slashing_test.php b/test/libraries/common/PMA_quoting_slashing_test.php index 3f27a8e..9f946f9 100644 --- a/test/libraries/common/PMA_quoting_slashing_test.php +++ b/test/libraries/common/PMA_quoting_slashing_test.php @@ -3,7 +3,7 @@ /** * Test for quoting, slashing/backslashing * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test * @version $Id: PMA_quoting_slashing_test.php * @group common.lib-tests */ diff --git a/test/libraries/common/PMA_showDocu_test.php b/test/libraries/common/PMA_showDocu_test.php index bd5c723..158fb86 100644 --- a/test/libraries/common/PMA_showDocu_test.php +++ b/test/libraries/common/PMA_showDocu_test.php @@ -3,7 +3,7 @@ /** * Test for PMA_showDocu from common.lib.php * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test * @version $Id: PMA_showDocu.php * @group common.lib-tests */ diff --git a/test/libraries/common/PMA_showMessage_test_disabled.php b/test/libraries/common/PMA_showMessage_test_disabled.php index daf855f..bf757e4 100644 --- a/test/libraries/common/PMA_showMessage_test_disabled.php +++ b/test/libraries/common/PMA_showMessage_test_disabled.php @@ -3,7 +3,7 @@ /** * Test for PMA_showMessage from common.lib * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test * @version $Id: PMA_showMessage_test.php * @group common.lib-tests */ diff --git a/test/libraries/common/PMA_showPHPDocu_test.php b/test/libraries/common/PMA_showPHPDocu_test.php index fe24855..6cc54ea 100644 --- a/test/libraries/common/PMA_showPHPDocu_test.php +++ b/test/libraries/common/PMA_showPHPDocu_test.php @@ -3,7 +3,7 @@ /** * Test for PMA_showPHPDocu from common.lib.php * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test * @version $Id: PMA_showPHPDocu_test.php * @group common.lib-tests */ diff --git a/test/libraries/common/PMA_stringOperations_test.php b/test/libraries/common/PMA_stringOperations_test.php index 3664b44..ef18dbe 100644 --- a/test/libraries/common/PMA_stringOperations_test.php +++ b/test/libraries/common/PMA_stringOperations_test.php @@ -3,7 +3,7 @@ /** * Test for several string operations * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test * @version $Id: PMA_stringOperations_test.php * @group common.lib-tests */ diff --git a/test/libraries/common/PMA_unsupportedDatatypes_test.php b/test/libraries/common/PMA_unsupportedDatatypes_test.php index 57c8c87..9e86f0a 100644 --- a/test/libraries/common/PMA_unsupportedDatatypes_test.php +++ b/test/libraries/common/PMA_unsupportedDatatypes_test.php @@ -3,7 +3,7 @@ /** * Test for PMA_unsupportedDatatypes from common.lib * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test * @version $Id: PMA_unsupportedDatatypes_test.php * @group common.lib-tests */ diff --git a/test/libraries/common/PMA_whichCrlf_test.php b/test/libraries/common/PMA_whichCrlf_test.php index 52d8323..ce12717 100644 --- a/test/libraries/common/PMA_whichCrlf_test.php +++ b/test/libraries/common/PMA_whichCrlf_test.php @@ -3,7 +3,7 @@ /** * Test whichCrlf function * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test * @version $Id: PMA_whichCrlf_test.php * @group common.lib-tests */ diff --git a/test/libraries/core/PMA_array_test.php b/test/libraries/core/PMA_array_test.php index 8fc63fb..181022a 100644 --- a/test/libraries/core/PMA_array_test.php +++ b/test/libraries/core/PMA_array_test.php @@ -4,7 +4,7 @@ * Test for PMA_array_read(), PMA_array_write(), PMA_array_remove(), PMA_array_merge_recursive(), * PMA_arrayWalkRecursive() from libraries/core.lib.php * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test */ /* diff --git a/test/libraries/core/PMA_checkPageValidity_test.php b/test/libraries/core/PMA_checkPageValidity_test.php index fe10ace..baaaeaf 100644 --- a/test/libraries/core/PMA_checkPageValidity_test.php +++ b/test/libraries/core/PMA_checkPageValidity_test.php @@ -3,7 +3,7 @@ /** * Tests for PMA_checkPageValidity() from libraries/core.lib.php * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test */ /* diff --git a/test/libraries/core/PMA_fatalError_test.php b/test/libraries/core/PMA_fatalError_test.php index 643c4d9..b89c544 100644 --- a/test/libraries/core/PMA_fatalError_test.php +++ b/test/libraries/core/PMA_fatalError_test.php @@ -6,7 +6,7 @@ * PMA_fatalError() displays the given error message on phpMyAdmin error page in foreign language * and ends script execution and closes session * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test */ /* diff --git a/test/libraries/core/PMA_getLinks_test.php b/test/libraries/core/PMA_getLinks_test.php index 2208bc6..eb32ad6 100644 --- a/test/libraries/core/PMA_getLinks_test.php +++ b/test/libraries/core/PMA_getLinks_test.php @@ -3,7 +3,7 @@ /** * Test for PMA_getPHPDocLink, PMA_linkURL, PMA_includeJS from libraries/core.lib.php * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test */ /* diff --git a/test/libraries/core/PMA_getTableCount_test_dis.php b/test/libraries/core/PMA_getTableCount_test_dis.php index 3c89b77..507afe0 100644 --- a/test/libraries/core/PMA_getTableCount_test_dis.php +++ b/test/libraries/core/PMA_getTableCount_test_dis.php @@ -4,7 +4,7 @@ * Test for PMA_getTableCount_test from core.lib.php * PMA_getTableCount_test returns count of tables in given db * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test */ /* diff --git a/test/libraries/core/PMA_get_real_size_test.php b/test/libraries/core/PMA_get_real_size_test.php index 894e22c..b6096d7 100644 --- a/test/libraries/core/PMA_get_real_size_test.php +++ b/test/libraries/core/PMA_get_real_size_test.php @@ -3,7 +3,7 @@ /** * Test for PMA_get_real_size() from libraries/core.lib.php * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test */ /* diff --git a/test/libraries/core/PMA_headerLocation_test_disabled.php b/test/libraries/core/PMA_headerLocation_test_disabled.php index 089064b..3ef82c9 100644 --- a/test/libraries/core/PMA_headerLocation_test_disabled.php +++ b/test/libraries/core/PMA_headerLocation_test_disabled.php @@ -3,7 +3,7 @@ /** * Test for PMA_sendHeaderLocation * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test */ /* @@ -24,7 +24,7 @@ require_once 'libraries/select_lang.lib.php'; * * <code>rename_function('headers_sent', 'headers_sent'.str_replace(array('.', ' '),array('', ''),microtime()));</code> * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test */ class PMA_headerLocation_test extends PHPUnit_Extensions_OutputTestCase diff --git a/test/libraries/core/PMA_ifSetOr_test.php b/test/libraries/core/PMA_ifSetOr_test.php index 35ffa96..d4579ca 100644 --- a/test/libraries/core/PMA_ifSetOr_test.php +++ b/test/libraries/core/PMA_ifSetOr_test.php @@ -3,7 +3,7 @@ /** * Tests for PMA_ifSetOr() from libraries/core.lib.php * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test */ /* diff --git a/test/libraries/core/PMA_isValid_test.php b/test/libraries/core/PMA_isValid_test.php index 5bd3367..0bb788a 100644 --- a/test/libraries/core/PMA_isValid_test.php +++ b/test/libraries/core/PMA_isValid_test.php @@ -3,7 +3,7 @@ /** * Tests for PMA_isValid() from libraries/core.lib.php * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test */ /* diff --git a/test/libraries/core/PMA_securePath_test.php b/test/libraries/core/PMA_securePath_test.php index 3b8575c..3dbd638 100644 --- a/test/libraries/core/PMA_securePath_test.php +++ b/test/libraries/core/PMA_securePath_test.php @@ -4,7 +4,7 @@ * Tests for PMA_securePath() from libraries/core.lib.php * PMA_securePath changes .. to . * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test */ require_once 'libraries/core.lib.php'; diff --git a/test/libraries/core/PMA_warnMissingExtension_test.php b/test/libraries/core/PMA_warnMissingExtension_test.php index 522453d..1e11c73 100644 --- a/test/libraries/core/PMA_warnMissingExtension_test.php +++ b/test/libraries/core/PMA_warnMissingExtension_test.php @@ -4,7 +4,7 @@ * Test for PMA_warnMissingExtension() from libraries/core.lib.php * PMA_warnMissingExtension warns or fails on missing extension. * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test */ /* diff --git a/test/libraries/js_escape_test.php b/test/libraries/js_escape_test.php index ff185ef..0bc904b 100644 --- a/test/libraries/js_escape_test.php +++ b/test/libraries/js_escape_test.php @@ -3,7 +3,7 @@ /** * tests for JS variable formatting * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test */ /* diff --git a/test/libraries/php-gettext/Locales_test.php b/test/libraries/php-gettext/Locales_test.php index d8a0981..b0a290d 100644 --- a/test/libraries/php-gettext/Locales_test.php +++ b/test/libraries/php-gettext/Locales_test.php @@ -3,7 +3,7 @@ /** * Test for gettext locales. * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test */ require_once('libraries/php-gettext/gettext.inc'); diff --git a/test/libraries/php-gettext/Parsing_test.php b/test/libraries/php-gettext/Parsing_test.php index c4fc461..d651d84 100644 --- a/test/libraries/php-gettext/Parsing_test.php +++ b/test/libraries/php-gettext/Parsing_test.php @@ -3,7 +3,7 @@ /** * Test for gettext parsing. * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test */ //require_once('gettext.php'); diff --git a/test/libraries/rte/PMA_EVN_getDataFromRequest_test.php b/test/libraries/rte/PMA_EVN_getDataFromRequest_test.php index 382ade5..90beb7d 100644 --- a/test/libraries/rte/PMA_EVN_getDataFromRequest_test.php +++ b/test/libraries/rte/PMA_EVN_getDataFromRequest_test.php @@ -3,7 +3,7 @@ /** * Test for fetching event data from HTTP request * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test */ /* diff --git a/test/libraries/rte/PMA_EVN_getEditorForm_test.php b/test/libraries/rte/PMA_EVN_getEditorForm_test.php index 4480f9e..b63d422 100644 --- a/test/libraries/rte/PMA_EVN_getEditorForm_test.php +++ b/test/libraries/rte/PMA_EVN_getEditorForm_test.php @@ -3,7 +3,7 @@ /** * Test for generating event editor * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test */ require_once 'libraries/php-gettext/gettext.inc'; require_once 'libraries/url_generating.lib.php'; diff --git a/test/libraries/rte/PMA_EVN_getQueryFromRequest_test.php b/test/libraries/rte/PMA_EVN_getQueryFromRequest_test.php index 5c6603d..3949c65 100644 --- a/test/libraries/rte/PMA_EVN_getQueryFromRequest_test.php +++ b/test/libraries/rte/PMA_EVN_getQueryFromRequest_test.php @@ -3,7 +3,7 @@ /** * Test for generating CREATE EVENT query from HTTP request * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test */ /* diff --git a/test/libraries/rte/PMA_RTN_ParameterParser_test.php b/test/libraries/rte/PMA_RTN_ParameterParser_test.php index fa80f8b..890604e 100644 --- a/test/libraries/rte/PMA_RTN_ParameterParser_test.php +++ b/test/libraries/rte/PMA_RTN_ParameterParser_test.php @@ -3,7 +3,7 @@ /** * Test for parsing of Routine parameters * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test */ /* diff --git a/test/libraries/rte/PMA_RTN_getDataFromRequest_test.php b/test/libraries/rte/PMA_RTN_getDataFromRequest_test.php index 112315d..f8e2804 100644 --- a/test/libraries/rte/PMA_RTN_getDataFromRequest_test.php +++ b/test/libraries/rte/PMA_RTN_getDataFromRequest_test.php @@ -3,7 +3,7 @@ /** * Test for fetching routine data from HTTP request * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test */ require_once 'libraries/common.lib.php'; diff --git a/test/libraries/rte/PMA_RTN_getEditorForm_test.php b/test/libraries/rte/PMA_RTN_getEditorForm_test.php index 2230ca9..b0674f4 100644 --- a/test/libraries/rte/PMA_RTN_getEditorForm_test.php +++ b/test/libraries/rte/PMA_RTN_getEditorForm_test.php @@ -3,7 +3,7 @@ /** * Test for generating routine editor * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test */ require_once 'libraries/common.lib.php'; require_once 'libraries/php-gettext/gettext.inc'; diff --git a/test/libraries/rte/PMA_RTN_getExecuteForm_test.php b/test/libraries/rte/PMA_RTN_getExecuteForm_test.php index 03fc82a..aeea93f 100644 --- a/test/libraries/rte/PMA_RTN_getExecuteForm_test.php +++ b/test/libraries/rte/PMA_RTN_getExecuteForm_test.php @@ -3,7 +3,7 @@ /** * Test for generating routine execution dialog * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test */ require_once 'libraries/common.lib.php'; require_once 'libraries/sqlparser.lib.php'; diff --git a/test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php b/test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php index 95473e3..2d2717e 100644 --- a/test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php +++ b/test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php @@ -3,7 +3,7 @@ /** * Test for generating CREATE [PROCEDURE|FUNCTION] query from HTTP request * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test */ /* diff --git a/test/libraries/rte/PMA_TRI_getDataFromRequest_test.php b/test/libraries/rte/PMA_TRI_getDataFromRequest_test.php index af10eaa..c9c1444 100644 --- a/test/libraries/rte/PMA_TRI_getDataFromRequest_test.php +++ b/test/libraries/rte/PMA_TRI_getDataFromRequest_test.php @@ -3,7 +3,7 @@ /** * Test for fetching trigger data from HTTP request * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test */ /* diff --git a/test/libraries/rte/PMA_TRI_getEditorForm_test.php b/test/libraries/rte/PMA_TRI_getEditorForm_test.php index 411a535..7b3d0ba 100644 --- a/test/libraries/rte/PMA_TRI_getEditorForm_test.php +++ b/test/libraries/rte/PMA_TRI_getEditorForm_test.php @@ -3,7 +3,7 @@ /** * Test for generating trigger editor * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test */ require_once 'libraries/php-gettext/gettext.inc'; require_once 'libraries/url_generating.lib.php'; diff --git a/test/libraries/rte/PMA_TRI_getQueryFromRequest_test.php b/test/libraries/rte/PMA_TRI_getQueryFromRequest_test.php index d6e18ad..492314e 100644 --- a/test/libraries/rte/PMA_TRI_getQueryFromRequest_test.php +++ b/test/libraries/rte/PMA_TRI_getQueryFromRequest_test.php @@ -3,7 +3,7 @@ /** * Test for generating CREATE TRIGGER query from HTTP request * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test */ /* diff --git a/test/libraries/select_lang/PMA_langDetails_test.php b/test/libraries/select_lang/PMA_langDetails_test.php index ca758ed..c60fd6f 100644 --- a/test/libraries/select_lang/PMA_langDetails_test.php +++ b/test/libraries/select_lang/PMA_langDetails_test.php @@ -3,7 +3,7 @@ /** * Test for PMA_langDetails from select_lang.lib.php * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test * @version $Id: PMA_langDetails_test.php * @group select_lang.lib-tests */ diff --git a/test/libraries/select_lang/PMA_langList_test.php b/test/libraries/select_lang/PMA_langList_test.php index 354668b..98a17ff 100644 --- a/test/libraries/select_lang/PMA_langList_test.php +++ b/test/libraries/select_lang/PMA_langList_test.php @@ -3,7 +3,7 @@ /** * Test for PMA_langList from select_lang.lib.php * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test * @version $Id: PMA_langList_test.php * @group select_lang.lib-tests */ diff --git a/test/libraries/select_lang/PMA_langName_test.php b/test/libraries/select_lang/PMA_langName_test.php index 892d114..69ba314 100644 --- a/test/libraries/select_lang/PMA_langName_test.php +++ b/test/libraries/select_lang/PMA_langName_test.php @@ -3,7 +3,7 @@ /** * Test for PMA_langName from select_lang.lib.php * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test * @version $Id: PMA_langName_test.php * @group select_lang.lib-tests */ diff --git a/test/selenium/PmaSeleniumLoginTest.php b/test/selenium/PmaSeleniumLoginTest.php index bde93bf..5e36564 100644 --- a/test/selenium/PmaSeleniumLoginTest.php +++ b/test/selenium/PmaSeleniumLoginTest.php @@ -3,7 +3,7 @@ /** * Selenium TestCase for login related tests * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test * @group Selenium */ diff --git a/test/selenium/PmaSeleniumPrivilegesTest.php b/test/selenium/PmaSeleniumPrivilegesTest.php index 0e3f4cf..9ef5cc6 100644 --- a/test/selenium/PmaSeleniumPrivilegesTest.php +++ b/test/selenium/PmaSeleniumPrivilegesTest.php @@ -3,7 +3,7 @@ /** * Selenium TestCase for privilege related tests * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test * @group Selenium */ diff --git a/test/selenium/PmaSeleniumTestCase.php b/test/selenium/PmaSeleniumTestCase.php index 1b33ff0..669dc8d 100644 --- a/test/selenium/PmaSeleniumTestCase.php +++ b/test/selenium/PmaSeleniumTestCase.php @@ -3,7 +3,7 @@ /** * Selenium parent class for TestCases * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test * @group Selenium */ diff --git a/test/selenium/PmaSeleniumXssTest.php b/test/selenium/PmaSeleniumXssTest.php index 0cba510..f0771a1 100644 --- a/test/selenium/PmaSeleniumXssTest.php +++ b/test/selenium/PmaSeleniumXssTest.php @@ -3,7 +3,7 @@ /** * Selenium TestCase for XSS related tests * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test * @group Selenium */ diff --git a/test/theme.php b/test/theme.php index cc491b5..7dc63e0 100644 --- a/test/theme.php +++ b/test/theme.php @@ -3,7 +3,7 @@ /** * theme test * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test */ chdir('..'); diff --git a/test/wui.php b/test/wui.php index c3b459d..f6fd819 100644 --- a/test/wui.php +++ b/test/wui.php @@ -3,7 +3,7 @@ /** * runs all defined tests * - * @package phpMyAdmin-test + * @package PhpMyAdmin-test */ /** diff --git a/themes.php b/themes.php index 1663334..e0347bd 100644 --- a/themes.php +++ b/themes.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/themes/original/css/theme_left.css.php b/themes/original/css/theme_left.css.php index b8a1409..31dd39a 100644 --- a/themes/original/css/theme_left.css.php +++ b/themes/original/css/theme_left.css.php @@ -3,7 +3,7 @@ /** * navigation css file from theme Original * - * @package phpMyAdmin-theme + * @package PhpMyAdmin-theme * @subpackage Original */ diff --git a/themes/original/css/theme_print.css.php b/themes/original/css/theme_print.css.php index 49a0d23..0804342 100644 --- a/themes/original/css/theme_print.css.php +++ b/themes/original/css/theme_print.css.php @@ -3,7 +3,7 @@ /** * print css file from theme Original * - * @package phpMyAdmin-theme + * @package PhpMyAdmin-theme * @subpackage Original */ ?> diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php index f59e286..635e81b 100644 --- a/themes/original/css/theme_right.css.php +++ b/themes/original/css/theme_right.css.php @@ -3,7 +3,7 @@ /** * main css file from theme Original * - * @package phpMyAdmin-theme + * @package PhpMyAdmin-theme * @subpackage Original */ diff --git a/themes/original/info.inc.php b/themes/original/info.inc.php index 5f7beba..635c3c6 100644 --- a/themes/original/info.inc.php +++ b/themes/original/info.inc.php @@ -3,7 +3,7 @@ /** * Theme information * - * @package phpMyAdmin-theme + * @package PhpMyAdmin-theme * @subpackage Original */ diff --git a/themes/original/layout.inc.php b/themes/original/layout.inc.php index 4c58d24..d2caeb5 100644 --- a/themes/original/layout.inc.php +++ b/themes/original/layout.inc.php @@ -4,7 +4,7 @@ * configures general layout * for detailed layout configuration please refer to the css files * - * @package phpMyAdmin-theme + * @package PhpMyAdmin-theme * @subpackage Original */ diff --git a/themes/pmahomme/css/theme_left.css.php b/themes/pmahomme/css/theme_left.css.php index ce2771b..c9f6132 100644 --- a/themes/pmahomme/css/theme_left.css.php +++ b/themes/pmahomme/css/theme_left.css.php @@ -3,7 +3,7 @@ /** * navigation css file from theme Original * - * @package phpMyAdmin-theme + * @package PhpMyAdmin-theme * @subpackage pmahomme */ diff --git a/themes/pmahomme/css/theme_print.css.php b/themes/pmahomme/css/theme_print.css.php index 35f28a4..ad5484a 100644 --- a/themes/pmahomme/css/theme_print.css.php +++ b/themes/pmahomme/css/theme_print.css.php @@ -3,7 +3,7 @@ /** * print css file from theme Original * - * @package phpMyAdmin-theme + * @package PhpMyAdmin-theme * @subpackage pmahomme */ ?> diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index 1f7b509..efc8fff 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -3,7 +3,7 @@ /** * main css file from theme Original * - * @package phpMyAdmin-theme + * @package PhpMyAdmin-theme * @subpackage pmahomme */ diff --git a/themes/pmahomme/info.inc.php b/themes/pmahomme/info.inc.php index a39a0fb..aa485d8 100644 --- a/themes/pmahomme/info.inc.php +++ b/themes/pmahomme/info.inc.php @@ -3,7 +3,7 @@ /** * Theme information * - * @package phpMyAdmin-theme + * @package PhpMyAdmin-theme * @subpackage pmahomme */ diff --git a/themes/pmahomme/layout.inc.php b/themes/pmahomme/layout.inc.php index ca71272..56aff20 100644 --- a/themes/pmahomme/layout.inc.php +++ b/themes/pmahomme/layout.inc.php @@ -4,7 +4,7 @@ * configures general layout * for detailed layout configuration please refer to the css files * - * @package phpMyAdmin-theme + * @package PhpMyAdmin-theme * @subpackage pmahomme */ diff --git a/themes/sprites.css.php b/themes/sprites.css.php index aa545a3..5156531 100644 --- a/themes/sprites.css.php +++ b/themes/sprites.css.php @@ -3,7 +3,7 @@ /** * This file generates the CSS code for the sprites of a theme * - * @package phpMyAdmin-theme + * @package PhpMyAdmin-theme */ // unplanned execution path diff --git a/themes/svg_gradient.php b/themes/svg_gradient.php index c8f9ae8..cb1211a 100644 --- a/themes/svg_gradient.php +++ b/themes/svg_gradient.php @@ -2,7 +2,7 @@ /** * Theme based generator for SVG gradient. * - * @package phpMyAdmin-theme + * @package PhpMyAdmin-theme */ header('Content-Type: image/svg+xml'); header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 3600) . ' GMT'); diff --git a/transformation_overview.php b/transformation_overview.php index 35d41c0..7e99163 100644 --- a/transformation_overview.php +++ b/transformation_overview.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/transformation_wrapper.php b/transformation_wrapper.php index 5d94c37..0b87b43 100644 --- a/transformation_wrapper.php +++ b/transformation_wrapper.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/user_password.php b/user_password.php index d5859b8..c4fdaab 100644 --- a/user_password.php +++ b/user_password.php @@ -4,7 +4,7 @@ * displays and handles the form where the user can change his password * linked from main.php * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/view_create.php b/view_create.php index 3571c82..3e36efb 100644 --- a/view_create.php +++ b/view_create.php @@ -5,7 +5,7 @@ * * @todo js error when view name is empty (strFormEmpty) * @todo (also validate if js is disabled, after form submission?) - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/view_operations.php b/view_operations.php index 4a315d0..66599ef 100644 --- a/view_operations.php +++ b/view_operations.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @package phpMyAdmin + * @package PhpMyAdmin */ /** diff --git a/webapp.php b/webapp.php index 63ca1bf..8affd5c 100644 --- a/webapp.php +++ b/webapp.php @@ -3,7 +3,7 @@ * generate an WebApp file for Prism / WebRunner * * @see http://wiki.mozilla.org/Prism - * @package phpMyAdmin + * @package PhpMyAdmin */ /** hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7-21570-gdea67b9
by Michal Čihař 25 Oct '11

25 Oct '11

The branch, master has been updated via dea67b9dfe435cea0e2919c173416a5d190429f5 (commit) from 79cf0067a9020e79d0b1ffb038f3786159520e97 (commit) - Log ----------------------------------------------------------------- commit dea67b9dfe435cea0e2919c173416a5d190429f5 Author: Michal Čihař <mcihar(a)suse.cz> Date: Tue Oct 25 10:05:50 2011 +0200 Wrap some long lines ----------------------------------------------------------------------- Summary of changes: test/theme.php | 48 ++++++++++++++++++++++++++++++++++++------------ 1 files changed, 36 insertions(+), 12 deletions(-) diff --git a/test/theme.php b/test/theme.php index 0edbc03..cc491b5 100644 --- a/test/theme.php +++ b/test/theme.php @@ -215,18 +215,42 @@ echo sprintf(__('Welcome to %s'), </div> <code class="sql"> -SELECT * -FROM `test` -LIMIT 0, 30; -SELECT * -FROM `test` -LIMIT 0, 30; -SELECT * -FROM `test` -LIMIT 0, 30; -SELECT * -FROM `test` -LIMIT 0, 30; +SELECT +* +FROM +`test` + +LIMIT +0 +, +30; +SELECT +* +FROM +`test` + +LIMIT +0 +, +30; +SELECT +* +FROM +`test` + +LIMIT +0 +, +30; +SELECT +* +FROM +`test` + +LIMIT +0 +, +30; </code> <div class="tools"> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7-21569-g79cf006
by Michal Čihař 25 Oct '11

25 Oct '11

The branch, master has been updated via 79cf0067a9020e79d0b1ffb038f3786159520e97 (commit) from 8e638c7ea69a4c27a1f3132428363240e23a072e (commit) - Log ----------------------------------------------------------------- commit 79cf0067a9020e79d0b1ffb038f3786159520e97 Author: Michal Čihař <mcihar(a)suse.cz> Date: Tue Oct 25 10:02:00 2011 +0200 Fix coding style ----------------------------------------------------------------------- Summary of changes: test/theme.php | 50 ++++++++++++++++++++++++++++---------------------- 1 files changed, 28 insertions(+), 22 deletions(-) diff --git a/test/theme.php b/test/theme.php index 1750b33..0edbc03 100644 --- a/test/theme.php +++ b/test/theme.php @@ -47,32 +47,38 @@ $item = '<a href="%1$s?%2$s" class="item">' .'%4$s: %3$s</a>' . "\n"; echo '<div id="serverinfo">' . "\n"; -printf($item, - $GLOBALS['cfg']['DefaultTabServer'], - PMA_generate_common_url(), - 'Server', - __('Server'), - 'ic_s_host'); +printf( + $item, + $GLOBALS['cfg']['DefaultTabServer'], + PMA_generate_common_url(), + 'Server', + __('Server'), + 'ic_s_host' + ); echo $separator; -printf($item, - $GLOBALS['cfg']['DefaultTabDatabase'], - '', - 'Database', - __('Database'), - 'ic_s_db'); +printf( + $item, + $GLOBALS['cfg']['DefaultTabDatabase'], + '', + 'Database', + __('Database'), + 'ic_s_db' + ); echo $separator; -printf($item, - $GLOBALS['cfg']['DefaultTabTable'], - '', - 'Table', - (isset($GLOBALS['tbl_is_view']) && $GLOBALS['tbl_is_view'] - ? __('View') - : __('Table')), - (isset($GLOBALS['tbl_is_view']) && $GLOBALS['tbl_is_view'] - ? 'ic_b_views' - : 'ic_s_tbl')); +printf( + $item, + $GLOBALS['cfg']['DefaultTabTable'], + '', + 'Table', + (isset($GLOBALS['tbl_is_view']) && $GLOBALS['tbl_is_view'] + ? __('View') + : __('Table')), + (isset($GLOBALS['tbl_is_view']) && $GLOBALS['tbl_is_view'] + ? 'ic_b_views' + : 'ic_s_tbl') + ); echo '' .'"Table comment&quot' . "\n"; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7-21568-g8e638c7
by Rouslan Placella 25 Oct '11

25 Oct '11

The branch, master has been updated via 8e638c7ea69a4c27a1f3132428363240e23a072e (commit) from 8589af99db440f92951502e6a83d3ff1b0c98bf7 (commit) - Log ----------------------------------------------------------------- commit 8e638c7ea69a4c27a1f3132428363240e23a072e Author: Rouslan Placella <rouslan(a)placella.com> Date: Mon Oct 24 23:07:55 2011 +0100 Fixed IE regression: The link to ENUM/SET editor was not showing up ----------------------------------------------------------------------- Summary of changes: js/functions.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/js/functions.js b/js/functions.js index 5aa776a..8eb0d62 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1482,7 +1482,7 @@ function PMA_showNoticeForEnum(selectElement) { var enum_notice_id = selectElement.attr("id").split("_")[1]; enum_notice_id += "_" + (parseInt(selectElement.attr("id").split("_")[2]) + 1); - var selectedType = selectElement.attr("value"); + var selectedType = selectElement.val(); if (selectedType == "ENUM" || selectedType == "SET") { $("p[id='enum_notice_" + enum_notice_id + "']").show(); } else { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7-21567-g8589af9
by Michal Čihař 24 Oct '11

24 Oct '11

The branch, master has been updated via 8589af99db440f92951502e6a83d3ff1b0c98bf7 (commit) from 6f183bee2cd6a00bf341d86a7903174c7e850f65 (commit) - Log ----------------------------------------------------------------- commit 8589af99db440f92951502e6a83d3ff1b0c98bf7 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Oct 24 18:30:44 2011 +0200 Cleanup po files ----------------------------------------------------------------------- Summary of changes: po/be.po | 1 - po/be(a)latin.po | 1 - po/bn.po | 1 - po/ca.po | 1 - po/et.po | 1 - po/fi.po | 1 - po/gl.po | 1 - po/hr.po | 1 - po/hu.po | 1 - po/id.po | 1 - po/it.po | 1 - po/ka.po | 1 - po/lt.po | 1 - po/mk.po | 1 - po/mn.po | 1 - po/nb.po | 1 - po/nl.po | 1 - po/pl.po | 1 - po/pt_BR.po | 1 - po/ro.po | 1 - po/si.po | 1 - po/sk.po | 1 - po/sr.po | 1 - po/sr(a)latin.po | 1 - po/tt.po | 1 - po/ug.po | 1 - po/uz.po | 1 - po/uz(a)latin.po | 1 - po/zh_CN.po | 1 - po/zh_TW.po | 1 - 30 files changed, 0 insertions(+), 30 deletions(-) diff --git a/po/be.po b/po/be.po index b586ac1..090d101 100644 --- a/po/be.po +++ b/po/be.po @@ -13408,7 +13408,6 @@ msgid "concurrent_insert is set to 0" msgstr "" #, fuzzy -#~| msgid "(or the local MySQL server's socket is not correctly configured)" #~ msgid "(or the local Drizzle server's socket is not correctly configured)" #~ msgstr "(або сокет лякальнага сэрвэра MySQL не сканфігураваны правільна)" diff --git a/po/be(a)latin.po b/po/be(a)latin.po index 58cb62b..7dc2b8f 100644 --- a/po/be(a)latin.po +++ b/po/be(a)latin.po @@ -13381,7 +13381,6 @@ msgid "concurrent_insert is set to 0" msgstr "" #, fuzzy -#~| msgid "(or the local MySQL server's socket is not correctly configured)" #~ msgid "(or the local Drizzle server's socket is not correctly configured)" #~ msgstr "(abo sokiet lakalnaha servera MySQL nie skanfihuravany pravilna)" diff --git a/po/bn.po b/po/bn.po index b795c20..4ae5524 100644 --- a/po/bn.po +++ b/po/bn.po @@ -13271,7 +13271,6 @@ msgid "concurrent_insert is set to 0" msgstr "" #, fuzzy -#~| msgid "(or the local MySQL server's socket is not correctly configured)" #~ msgid "(or the local Drizzle server's socket is not correctly configured)" #~ msgstr "(or the local MySQL server's socket is not correctly configured)" diff --git a/po/ca.po b/po/ca.po index 9abeb56..5dafe9d 100644 --- a/po/ca.po +++ b/po/ca.po @@ -13317,7 +13317,6 @@ msgid "concurrent_insert is set to 0" msgstr "" #, fuzzy -#~| msgid "(or the local MySQL server's socket is not correctly configured)" #~ msgid "(or the local Drizzle server's socket is not correctly configured)" #~ msgstr "" #~ "(o el sòcol del servidor local MySQL no està configurat correctament)" diff --git a/po/et.po b/po/et.po index e6db812..e1bf58f 100644 --- a/po/et.po +++ b/po/et.po @@ -13268,7 +13268,6 @@ msgid "concurrent_insert is set to 0" msgstr "" #, fuzzy -#~| msgid "(or the local MySQL server's socket is not correctly configured)" #~ msgid "(or the local Drizzle server's socket is not correctly configured)" #~ msgstr "(või kohaliku MySQL serveri soketid ei ole korrektselt seadistatud)" diff --git a/po/fi.po b/po/fi.po index e2cf53d..50add37 100644 --- a/po/fi.po +++ b/po/fi.po @@ -13649,7 +13649,6 @@ msgid "concurrent_insert is set to 0" msgstr "" #, fuzzy -#~| msgid "(or the local MySQL server's socket is not correctly configured)" #~ msgid "(or the local Drizzle server's socket is not correctly configured)" #~ msgstr "" #~ "(tai paikallisen MySQL-palvelimen pistokkeen asetuksia ei ole määritelty " diff --git a/po/gl.po b/po/gl.po index 6ad3ced..72ca5be 100644 --- a/po/gl.po +++ b/po/gl.po @@ -13854,7 +13854,6 @@ msgid "concurrent_insert is set to 0" msgstr "" #, fuzzy -#~| msgid "(or the local MySQL server's socket is not correctly configured)" #~ msgid "(or the local Drizzle server's socket is not correctly configured)" #~ msgstr "" #~ "(ou o socket local do servidor de MySQL non se configurou correctamente)" diff --git a/po/hr.po b/po/hr.po index 5c361c7..a2740d7 100644 --- a/po/hr.po +++ b/po/hr.po @@ -13364,7 +13364,6 @@ msgid "concurrent_insert is set to 0" msgstr "" #, fuzzy -#~| msgid "(or the local MySQL server's socket is not correctly configured)" #~ msgid "(or the local Drizzle server's socket is not correctly configured)" #~ msgstr "" #~ "(ili priključak lokalnog MySQL poslužitelja nije ispravno konfiguriran)" diff --git a/po/hu.po b/po/hu.po index 04f43e0..1cf81f4 100644 --- a/po/hu.po +++ b/po/hu.po @@ -13476,7 +13476,6 @@ msgid "concurrent_insert is set to 0" msgstr "" #, fuzzy -#~| msgid "(or the local MySQL server's socket is not correctly configured)" #~ msgid "(or the local Drizzle server's socket is not correctly configured)" #~ msgstr "" #~ "(vagy nem megfelelően állították be a helyi MySQL szerver " diff --git a/po/id.po b/po/id.po index 718c299..ae7d2b1 100644 --- a/po/id.po +++ b/po/id.po @@ -13017,7 +13017,6 @@ msgid "concurrent_insert is set to 0" msgstr "" #, fuzzy -#~| msgid "(or the local MySQL server's socket is not correctly configured)" #~ msgid "(or the local Drizzle server's socket is not correctly configured)" #~ msgstr "(atau konfigurasi socket dari server MySQL tidak benar)" diff --git a/po/it.po b/po/it.po index 804c7c3..01a7222 100644 --- a/po/it.po +++ b/po/it.po @@ -13180,7 +13180,6 @@ msgid "concurrent_insert is set to 0" msgstr "" #, fuzzy -#~| msgid "(or the local MySQL server's socket is not correctly configured)" #~ msgid "(or the local Drizzle server's socket is not correctly configured)" #~ msgstr "" #~ "(o il socket del server locale MySQL non è correttamente configurato)" diff --git a/po/ka.po b/po/ka.po index f3c5e7c..e588602 100644 --- a/po/ka.po +++ b/po/ka.po @@ -13713,7 +13713,6 @@ msgid "concurrent_insert is set to 0" msgstr "" #, fuzzy -#~| msgid "(or the local MySQL server's socket is not correctly configured)" #~ msgid "(or the local Drizzle server's socket is not correctly configured)" #~ msgstr "(or the local MySQL server's socket is not correctly configured)" diff --git a/po/lt.po b/po/lt.po index 770b4f8..9bc310c 100644 --- a/po/lt.po +++ b/po/lt.po @@ -12758,7 +12758,6 @@ msgid "concurrent_insert is set to 0" msgstr "" #, fuzzy -#~| msgid "(or the local MySQL server's socket is not correctly configured)" #~ msgid "(or the local Drizzle server's socket is not correctly configured)" #~ msgstr "(arba vietiniai MySQL serverio socketai yra blogai sukonfigūruoti)" diff --git a/po/mk.po b/po/mk.po index 7cf6142..75ff863 100644 --- a/po/mk.po +++ b/po/mk.po @@ -13061,7 +13061,6 @@ msgid "concurrent_insert is set to 0" msgstr "" #, fuzzy -#~| msgid "(or the local MySQL server's socket is not correctly configured)" #~ msgid "(or the local Drizzle server's socket is not correctly configured)" #~ msgstr "(или приклучокот со локалниот MySQL сервер не е исправно подесен)" diff --git a/po/mn.po b/po/mn.po index 9f718e9..eb77424 100644 --- a/po/mn.po +++ b/po/mn.po @@ -13093,7 +13093,6 @@ msgid "concurrent_insert is set to 0" msgstr "" #, fuzzy -#~| msgid "(or the local MySQL server's socket is not correctly configured)" #~ msgid "(or the local Drizzle server's socket is not correctly configured)" #~ msgstr "(эсвэл дотоод MySQL сервэрийн socket нь зөв тохируулагдаагүй)" diff --git a/po/nb.po b/po/nb.po index d72c20d..e8ac390 100644 --- a/po/nb.po +++ b/po/nb.po @@ -13392,7 +13392,6 @@ msgid "concurrent_insert is set to 0" msgstr "" #, fuzzy -#~| msgid "(or the local MySQL server's socket is not correctly configured)" #~ msgid "(or the local Drizzle server's socket is not correctly configured)" #~ msgstr "" #~ "(eller den lokale MySQL tjenerens sokkel er ikke korrekt konfigurert)" diff --git a/po/nl.po b/po/nl.po index 54d9d5b..2ff3a38 100644 --- a/po/nl.po +++ b/po/nl.po @@ -13320,7 +13320,6 @@ msgid "concurrent_insert is set to 0" msgstr "" #, fuzzy -#~| msgid "(or the local MySQL server's socket is not correctly configured)" #~ msgid "(or the local Drizzle server's socket is not correctly configured)" #~ msgstr "(of de MySQL-server heeft het socket niet juist ingesteld)" diff --git a/po/pl.po b/po/pl.po index 060d153..18f3d26 100644 --- a/po/pl.po +++ b/po/pl.po @@ -1356pl.po8f3d26 100644oeft het socket niet juist ingesteld)"red)" тохируулагдаагүй)"есен)"�@��u�;\�*��<\�*�\\�*��X]�*@��z]�*0��k�;\�*6 ��!�!Й�@��xTX]�*0��;\�*��;\�*Й�`�;\�*��O�]�*u�;\�*@�]�*�D�]�*�I�]�*��<\�*xTX]�*0��k�;\�*�!�!Й�@��H8]�*��;\�*��;\�*Й�`�;\�*��8�\\�*�p�@��u�;\�*��<\�*��k�;\�*GHIJKMNOPЙ�@��H�]�*��;\�*��;\�*Й�0O�]�*u�;\�*`X]�*� �\�*@�]�*�D�]�*�I�]�*��<\�*H�]�*��k�;\�*8�]�*�� k�;\�*(�]�*��P��k�;\�*�]�*��k�;\�* �N�]�*u�;\�*�I�]�*��X�\�*e�;\�*�D�]�* ��yX�\�*e�;\�*@�]�*P��ZX�\�*e�;\�*��\�*`X]�*� �\�*@�]�*�dX]�*�D�]�*�I�]�*��<\�*8�\\�*ͷ\�*@��p��\�*��В�k�;\�*5678:<=>?@BDЙ�@��ʹ\�*@��u�;\�*�\\�*��ͷ\�*e�;\�*�\\�*�_@f�S Q��l��\�*@��ʹ\�*��k�;\�*u]�� 4Q��U^Qʉ��u��*ēvЙ�@��H�\�*d�\�*��p^�*�p^�*��\�*��@��`��oX]�*u�;\�*�dX]�*��p^�*�� p^�*H��7,7 +13567,6 @@ msgid "concurrent_insert is set to 0" msgstr "concurrent_insert jest ustawione na 0" #, fuzzy -#~| msgid "(or the local MySQL server's socket is not correctly configured)" #~ msgid "(or the local Drizzle server's socket is not correctly configured)" #~ msgstr "" #~ "(lub gniazdo lokalnego serwera MySQL nie jest skonfigurowane poprawnie)" diff --git a/po/pt_BR.po b/po/pt_BR.po index 18b76f4..a5842a8 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -13037,7 +13037,6 @@ msgid "concurrent_insert is set to 0" msgstr "" #, fuzzy -#~| msgid "(or the local MySQL server's socket is not correctly configured)" #~ msgid "(or the local Drizzle server's socket is not correctly configured)" #~ msgstr "" #~ "(ou o soquete do servidor MySQL local não está configurado corretamente)" diff --git a/po/ro.po b/po/ro.po index 4e7a117..26d7d11 100644 --- a/po/ro.po +++ b/po/ro.po @@ -13383,7 +13383,6 @@ msgid "concurrent_insert is set to 0" msgstr "" #, fuzzy -#~| msgid "(or the local MySQL server's socket is not correctly configured)" #~ msgid "(or the local Drizzle server's socket is not correctly configured)" #~ msgstr "(sau soclul serverului MySQL local nu este configurat momentan)" diff --git a/po/si.po b/po/si.po index 3ea5fca..3147142 100644 --- a/po/si.po +++ b/po/si.po @@ -12846,7 +12846,6 @@ msgid "concurrent_insert is set to 0" msgstr "" #, fuzzy -#~| msgid "(or the local MySQL server's socket is not correctly configured)" #~ msgid "(or the local Drizzle server's socket is not correctly configured)" #~ msgstr "(or the local MySQL server's socket is not correctly configured)" diff --git a/po/sk.po b/po/sk.po index 9f25912..9dfb9eb 100644 --- a/po/sk.po +++ b/po/sk.po @@ -12977,7 +12977,6 @@ msgid "concurrent_insert is set to 0" msgstr "" #, fuzzy -#~| msgid "(or the local MySQL server's socket is not correctly configured)" #~ msgid "(or the local Drizzle server's socket is not correctly configured)" #~ msgstr "(alebo soket lokálneho MySQL servra nie je správne nastavený)" diff --git a/po/sr.po b/po/sr.po index 9754f6e..6f4a5a7 100644 --- a/po/sr.po +++ b/po/sr.po @@ -13282,7 +13282,6 @@ msgid "concurrent_insert is set to 0" msgstr "" #, fuzzy -#~| msgid "(or the local MySQL server's socket is not correctly configured)" #~ msgid "(or the local Drizzle server's socket is not correctly configured)" #~ msgstr "(или прикључак локалног MySQL сервера није исправно подешен)" diff --git a/po/sr(a)latin.po b/po/sr(a)latin.po index fb81ccf..d175ed1 100644 --- a/po/sr(a)latin.po +++ b/po/sr(a)latin.po @@ -13274,7 +13274,6 @@ msgid "concurrent_insert is set to 0" msgstr "" #, fuzzy -#~| msgid "(or the local MySQL server's socket is not correctly configured)" #~ msgid "(or the local Drizzle server's socket is not correctly configured)" #~ msgstr "(ili priključak lokalnog MySQL servera nije ispravno podešen)" diff --git a/po/tt.po b/po/tt.po index 79f8a98..448c491 100644 --- a/po/tt.po +++ b/po/tt.po @@ -13085,7 +13085,6 @@ msgid "concurrent_insert is set to 0" msgstr "" #, fuzzy -#~| msgid "(or the local MySQL server's socket is not correctly configured)" #~ msgid "(or the local Drizzle server's socket is not correctly configured)" #~ msgstr "(yä cirle MySQL-server soketı döres köylänmägän ide)" diff --git a/po/ug.po b/po/ug.po index 4f3a9ef..02b1966 100644 --- a/po/ug.po +++ b/po/ug.po @@ -12608,7 +12608,6 @@ msgid "concurrent_insert is set to 0" msgstr "" #, fuzzy -#~| msgid "(or the local MySQL server's socket is not correctly configured)" #~ msgid "(or the local Drizzle server's socket is not correctly configured)" #~ msgstr "(يەرلىك MySQL مۇلازىمىتېرى توغرا تەڭشەلمىگەن)" diff --git a/po/uz.po b/po/uz.po index a03d69c..357ef23 100644 --- a/po/uz.po +++ b/po/uz.po @@ -13905,7 +13905,6 @@ msgid "concurrent_insert is set to 0" msgstr "" #, fuzzy -#~| msgid "(or the local MySQL server's socket is not correctly configured)" #~ msgid "(or the local Drizzle server's socket is not correctly configured)" #~ msgstr "(ёки локал MySQL сервернинг сокети нотўғри созланган)" diff --git a/po/uz(a)latin.po b/po/uz(a)latin.po index faff714..ae25861 100644 --- a/po/uz(a)latin.po +++ b/po/uz(a)latin.po @@ -13968,7 +13968,6 @@ msgid "concurrent_insert is set to 0" msgstr "" #, fuzzy -#~| msgid "(or the local MySQL server's socket is not correctly configured)" #~ msgid "(or the local Drizzle server's socket is not correctly configured)" #~ msgstr "(yoki lokal MySQL serverning soketi noto‘g‘ri sozlangan)" diff --git a/po/zh_CN.po b/po/zh_CN.po index 49c2bfa..cc17529 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -12593,7 +12593,6 @@ msgid "concurrent_insert is set to 0" msgstr "" #, fuzzy -#~| msgid "(or the local MySQL server's socket is not correctly configured)" #~ msgid "(or the local Drizzle server's socket is not correctly configured)" #~ msgstr "(或者本地 MySQL 服务器的套接字没有正确配置)" diff --git a/po/zh_TW.po b/po/zh_TW.po index 5692a05..f172739 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -12805,7 +12805,6 @@ msgid "concurrent_insert is set to 0" msgstr "" #, fuzzy -#~| msgid "(or the local MySQL server's socket is not correctly configured)" #~ msgid "(or the local Drizzle server's socket is not correctly configured)" #~ msgstr "(或者本地 MySQL 伺服器的連線埠沒有正確設定)" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7-21564-g833cfec
by Michal Čihař 24 Oct '11

24 Oct '11

The branch, master has been updated via 833cfec332cae81bdd0bf38a84ada30170e94e83 (commit) from 6d1bd82939546f220bed6230b59db192c14441f6 (commit) - Log ----------------------------------------------------------------- commit 833cfec332cae81bdd0bf38a84ada30170e94e83 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Oct 24 17:43:17 2011 +0200 Avoid message concatenation in this case ----------------------------------------------------------------------- Summary of changes: libraries/database_interface.lib.php | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index 4462493..753299f 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -1673,7 +1673,7 @@ function PMA_DBI_formatError($error_number, $error_message) $error = '#' . ((string) $error_number); if ($error_number == 2002) { - $error .= ' - ' . __('The server is not responding') . ' ' . __('(or the local MySQL server\'s socket is not correctly configured)'); + $error .= ' - ' . __('The server is not responding (or the local MySQL server\'s socket is not correctly configured)'); } elseif ($error_number == 2003) { $error .= ' - ' . __('The server is not responding'); } elseif ($error_number == 1005) { @@ -1681,7 +1681,8 @@ function PMA_DBI_formatError($error_number, $error_message) * http://dev.mysql.com/doc/refman/5.0/en/innodb-foreign-key-constraints.html */ $error .= ' - ' . $error_message . - ' (<a href="server_engines.php' . PMA_generate_common_url(array('engine' => 'InnoDB', 'page' => 'Status')). + ' (<a href="server_engines.php' . + PMA_generate_common_url(array('engine' => 'InnoDB', 'page' => 'Status')) . '">' . __('Details...') . '</a>)'; } else { $error .= ' - ' . $error_message; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7-21563-g6d1bd82
by Michal Čihař 24 Oct '11

24 Oct '11

The branch, master has been updated via 6d1bd82939546f220bed6230b59db192c14441f6 (commit) via 017ca0c22d5169224b17bb94bbde7a655fbd8b88 (commit) via 97f89e63c4387029982977d8f2c1e59219eaf41c (commit) via bea61e9f480be039cb1c359e09f62d2021487b2f (commit) via 2c1970b48ba4f11790255c203d122c41783c9d01 (commit) via 2518085d237f55ccfd56dcd016dbc2c6d0cea1b6 (commit) via a521cded01be986063b7cd5dac86ea4120a0205a (commit) via 5674ac7c3eee58ab03c745e469451c67d21a780e (commit) from 31cf332809f43c2e14b6e5771b2050567607e456 (commit) - Log ----------------------------------------------------------------- commit 6d1bd82939546f220bed6230b59db192c14441f6 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Oct 24 17:42:07 2011 +0200 Factor out error message formatting commit 017ca0c22d5169224b17bb94bbde7a655fbd8b88 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Oct 24 17:37:30 2011 +0200 Coding style improvements commit 97f89e63c4387029982977d8f2c1e59219eaf41c Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Oct 24 17:34:52 2011 +0200 Coding style improvements commit bea61e9f480be039cb1c359e09f62d2021487b2f Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Oct 24 17:28:18 2011 +0200 Coding style commit 2c1970b48ba4f11790255c203d122c41783c9d01 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Oct 24 17:25:16 2011 +0200 Fix package commit 2518085d237f55ccfd56dcd016dbc2c6d0cea1b6 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Oct 24 17:25:12 2011 +0200 Wrap long line commit a521cded01be986063b7cd5dac86ea4120a0205a Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Oct 24 17:20:35 2011 +0200 Remove commented out code commit 5674ac7c3eee58ab03c745e469451c67d21a780e Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Oct 24 17:20:16 2011 +0200 Remove commented out code ----------------------------------------------------------------------- Summary of changes: libraries/config/FormDisplay.class.php | 24 +++++-- libraries/database_interface.lib.php | 38 +++++++++ libraries/dbi/drizzle.dbi.lib.php | 73 +++++++++++------- libraries/dbi/mysql.dbi.lib.php | 23 +------ libraries/dbi/mysqli.dbi.lib.php | 131 ++++++++++++++++++++++++-------- tbl_printview.php | 4 - themes/original/layout.inc.php | 3 +- themes/pmahomme/layout.inc.php | 3 +- 8 files changed, 203 insertions(+), 96 deletions(-) diff --git a/libraries/config/FormDisplay.class.php b/libraries/config/FormDisplay.class.php index e3010fc..3b217dd 100644 --- a/libraries/config/FormDisplay.class.php +++ b/libraries/config/FormDisplay.class.php @@ -5,7 +5,8 @@ * * Explanation of used terms: * o work_path - original field path, eg. Servers/4/verbose - * o system_path - work_path modified so that it points to the first server, eg. Servers/1/verbose + * o system_path - work_path modified so that it points to the first server, + * eg. Servers/1/verbose * o translated_path - work_path modified for HTML field name, a path with * slashes changed to hyphens, eg. Servers-4-verbose * @@ -21,7 +22,6 @@ require_once './libraries/js_escape.lib.php'; /** * Form management class, displays and processes forms - * @package phpMyAdmin-setup */ class FormDisplay { @@ -221,8 +221,12 @@ class FormDisplay : ''; $form_errors = isset($this->errors[$form->name]) ? $this->errors[$form->name] : null; - display_fieldset_top(PMA_lang("Form_$form->name"), - $form_desc, $form_errors, array('id' => $form->name)); + display_fieldset_top( + PMA_lang("Form_$form->name"), + $form_desc, + $form_errors, + array('id' => $form->name) + ); foreach ($form->fields as $field => $path) { $work_path = array_search($path, $this->system_paths); @@ -233,8 +237,16 @@ class FormDisplay ? !isset($this->userprefs_disallow[$path]) : null; // display input - $this->_displayFieldInput($form, $field, $path, $work_path, - $translated_path, $show_restore_default, $userprefs_allow, $js_default); + $this->_displayFieldInput( + $form, + $field, + $path, + $work_path, + $translated_path, + $show_restore_default, + $userprefs_allow, + $js_default + ); // register JS validators for this field if (isset($validators[$path])) { js_validate($translated_path, $validators[$path], $js); diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index 921ba90..4462493 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -1653,6 +1653,44 @@ function PMA_DBI_get_triggers($db, $table = '', $delimiter = '//') } /** + * Formats database error message in a friendly way. + * This is needed because some errors messages cannot + * be obtained by mysql_error(). + * + * @param int $error_number Error code + * @param string $error_message Error message as returned by server + * + * @return string HML text with error details + */ +function PMA_DBI_formatError($error_number, $error_message) +{ + if (! empty($error_message)) { + $error_message = PMA_DBI_convert_message($error_message); + } + + $error_message = htmlspecialchars($error_message); + + $error = '#' . ((string) $error_number); + + if ($error_number == 2002) { + $error .= ' - ' . __('The server is not responding') . ' ' . __('(or the local MySQL server\'s socket is not correctly configured)'); + } elseif ($error_number == 2003) { + $error .= ' - ' . __('The server is not responding'); + } elseif ($error_number == 1005) { + /* InnoDB contraints, see + * http://dev.mysql.com/doc/refman/5.0/en/innodb-foreign-key-constraints.html + */ + $error .= ' - ' . $error_message . + ' (<a href="server_engines.php' . PMA_generate_common_url(array('engine' => 'InnoDB', 'page' => 'Status')). + '">' . __('Details...') . '</a>)'; + } else { + $error .= ' - ' . $error_message; + } + + return $error; +} + +/** * Checks whether given schema is a system schema: information_schema (MySQL and Drizzle) * or data_dictionary (Drizzle) * diff --git a/libraries/dbi/drizzle.dbi.lib.php b/libraries/dbi/drizzle.dbi.lib.php index 153c64d..668d0cb 100644 --- a/libraries/dbi/drizzle.dbi.lib.php +++ b/libraries/dbi/drizzle.dbi.lib.php @@ -334,18 +334,7 @@ function PMA_DBI_getError($link = null) // keep the error number for further check after the call to PMA_DBI_getError() $GLOBALS['errno'] = $error_number; - if (! empty($error_message)) { - $error_message = PMA_DBI_convert_message($error_message); - } - - $error_message = htmlspecialchars($error_message); - - if ($error_number == 2002) { - $error = '#' . ((string) $error_number) . ' - ' . __('The server is not responding') . ' ' . __('(or the local Drizzle server\'s socket is not correctly configured)'); - } else { - $error = '#' . ((string) $error_number) . ' - ' . $error_message; - } - return $error; + return PMA_DBI_formatError($error_number, $error_message); } /** @@ -557,27 +546,57 @@ function PMA_DBI_field_flags($result, $i) $charsetnr = $f->charset(); $f = $f->flags(); $flags = ''; - if ($f & DRIZZLE_COLUMN_FLAGS_UNIQUE_KEY) { $flags .= 'unique '; } - if ($f & DRIZZLE_COLUMN_FLAGS_NUM) { $flags .= 'num '; } - if ($f & DRIZZLE_COLUMN_FLAGS_PART_KEY) { $flags .= 'part_key '; } - if ($f & DRIZZLE_COLUMN_FLAGS_SET) { $flags .= 'set '; } - if ($f & DRIZZLE_COLUMN_FLAGS_TIMESTAMP) { $flags .= 'timestamp '; } - if ($f & DRIZZLE_COLUMN_FLAGS_AUTO_INCREMENT) { $flags .= 'auto_increment '; } - if ($f & DRIZZLE_COLUMN_FLAGS_ENUM) { $flags .= 'enum '; } + if ($f & DRIZZLE_COLUMN_FLAGS_UNIQUE_KEY) { + $flags .= 'unique '; + } + if ($f & DRIZZLE_COLUMN_FLAGS_NUM) { + $flags .= 'num '; + } + if ($f & DRIZZLE_COLUMN_FLAGS_PART_KEY) { + $flags .= 'part_key '; + } + if ($f & DRIZZLE_COLUMN_FLAGS_SET) { + $flags .= 'set '; + } + if ($f & DRIZZLE_COLUMN_FLAGS_TIMESTAMP) { + $flags .= 'timestamp '; + } + if ($f & DRIZZLE_COLUMN_FLAGS_AUTO_INCREMENT) { + $flags .= 'auto_increment '; + } + if ($f & DRIZZLE_COLUMN_FLAGS_ENUM) { + $flags .= 'enum '; + } // See http://dev.mysql.com/doc/refman/6.0/en/c-api-datatypes.html: // to determine if a string is binary, we should not use MYSQLI_BINARY_FLAG // but instead the charsetnr member of the MYSQL_FIELD // structure. Watch out: some types like DATE returns 63 in charsetnr // so we have to check also the type. // Unfortunately there is no equivalent in the mysql extension. - if (($type == DRIZZLE_COLUMN_TYPE_DRIZZLE_BLOB || $type == DRIZZLE_COLUMN_TYPE_DRIZZLE_VARCHAR) && 63 == $charsetnr) { $flags .= 'binary ';} - if ($f & DRIZZLE_COLUMN_FLAGS_ZEROFILL) { $flags .= 'zerofill ';} - if ($f & DRIZZLE_COLUMN_FLAGS_UNSIGNED) { $flags .= 'unsigned ';} - if ($f & DRIZZLE_COLUMN_FLAGS_BLOB) { $flags .= 'blob ';} - if ($f & DRIZZLE_COLUMN_FLAGS_MULTIPLE_KEY) { $flags .= 'multiple_key ';} - if ($f & DRIZZLE_COLUMN_FLAGS_UNIQUE_KEY) { $flags .= 'unique_key ';} - if ($f & DRIZZLE_COLUMN_FLAGS_PRI_KEY) { $flags .= 'primary_key ';} - if ($f & DRIZZLE_COLUMN_FLAGS_NOT_NULL) { $flags .= 'not_null ';} + if (($type == DRIZZLE_COLUMN_TYPE_DRIZZLE_BLOB || $type == DRIZZLE_COLUMN_TYPE_DRIZZLE_VARCHAR) && 63 == $charsetnr) { + $flags .= 'binary '; + } + if ($f & DRIZZLE_COLUMN_FLAGS_ZEROFILL) { + $flags .= 'zerofill '; + } + if ($f & DRIZZLE_COLUMN_FLAGS_UNSIGNED) { + $flags .= 'unsigned '; + } + if ($f & DRIZZLE_COLUMN_FLAGS_BLOB) { + $flags .= 'blob '; + } + if ($f & DRIZZLE_COLUMN_FLAGS_MULTIPLE_KEY) { + $flags .= 'multiple_key '; + } + if ($f & DRIZZLE_COLUMN_FLAGS_UNIQUE_KEY) { + $flags .= 'unique_key '; + } + if ($f & DRIZZLE_COLUMN_FLAGS_PRI_KEY) { + $flags .= 'primary_key '; + } + if ($f & DRIZZLE_COLUMN_FLAGS_NOT_NULL) { + $flags .= 'not_null '; + } return trim($flags); } diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php index 57cb7ff..13a6136 100644 --- a/libraries/dbi/mysql.dbi.lib.php +++ b/libraries/dbi/mysql.dbi.lib.php @@ -340,28 +340,7 @@ function PMA_DBI_getError($link = null) // keep the error number for further check after the call to PMA_DBI_getError() $GLOBALS['errno'] = $error_number; - if (! empty($error_message)) { - $error_message = PMA_DBI_convert_message($error_message); - } - - $error_message = htmlspecialchars($error_message); - - // Some errors messages cannot be obtained by mysql_error() - if ($error_number == 2002) { - $error = '#' . ((string) $error_number) . ' - ' . __('The server is not responding') . ' ' . __('(or the local MySQL server\'s socket is not correctly configured)'); - } elseif ($error_number == 2003) { - $error = '#' . ((string) $error_number) . ' - ' . __('The server is not responding'); - } elseif ($error_number == 1005) { - /* InnoDB contraints, see - * http://dev.mysql.com/doc/refman/5.0/en/innodb-foreign-key-constraints.html - */ - $error = '#' . ((string) $error_number) . ' - ' . $error_message . - ' (<a href="server_engines.php' . PMA_generate_common_url(array('engine' => 'InnoDB', 'page' => 'Status')). - '">' . __('Details...') . '</a>)'; - } else { - $error = '#' . ((string) $error_number) . ' - ' . $error_message; - } - return $error; + return PMA_DBI_formatError($error_number, $error_message); } /** diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php index fa01497..0355961 100644 --- a/libraries/dbi/mysqli.dbi.lib.php +++ b/libraries/dbi/mysqli.dbi.lib.php @@ -70,9 +70,26 @@ function PMA_DBI_real_connect($link, $host, $user, $password, $dbname, $server_p $host = 'p:' . $host; } if ($client_flags === null) { - return @mysqli_real_connect($link, $host, $user, $password, $dbname, $server_port, $server_socket); + return @mysqli_real_connect( + $link, + $host, + $user, + $password, + $dbname, + $server_port, + $server_socket + ); } else { - return @mysqli_real_connect($link, $host, $user, $password, $dbname, $server_port, $server_socket, $client_flags); + return @mysqli_real_connect( + $link, + $host, + $user, + $password, + $dbname, + $server_port, + $server_socket, + $client_flags + ); } } @@ -128,18 +145,47 @@ function PMA_DBI_connect($user, $password, $is_controluser = false, $server = nu } if (!$server) { - $return_value = @PMA_DBI_real_connect($link, $cfg['Server']['host'], $user, $password, false, $server_port, $server_socket, $client_flags); + $return_value = @PMA_DBI_real_connect( + $link, + $cfg['Server']['host'], + $user, + $password, + false, + $server_port, + $server_socket, + $client_flags + ); // Retry with empty password if we're allowed to if ($return_value == false && isset($cfg['Server']['nopassword']) && $cfg['Server']['nopassword'] && !$is_controluser) { - $return_value = @PMA_DBI_real_connect($link, $cfg['Server']['host'], $user, '', false, $server_port, $server_socket, $client_flags); + $return_value = @PMA_DBI_real_connect( + $link, + $cfg['Server']['host'], + $user, + '', + false, + $server_port, + $server_socket, + $client_flags + ); } } else { - $return_value = @PMA_DBI_real_connect($link, $server['host'], $user, $password, false, $server_port, $server_socket); + $return_value = @PMA_DBI_real_connect( + $link, + $server['host'], + $user, + $password, + false, + $server_port, + $server_socket + ); } if ($return_value == false) { if ($is_controluser) { - trigger_error(__('Connection for controluser as defined in your configuration failed.'), E_USER_WARNING); + trigger_error( + __('Connection for controluser as defined in your configuration failed.'), + E_USER_WARNING + ); return false; } // we could be calling PMA_DBI_connect() to connect to another @@ -374,18 +420,7 @@ function PMA_DBI_getError($link = null) // keep the error number for further check after the call to PMA_DBI_getError() $GLOBALS['errno'] = $error_number; - if (! empty($error_message)) { - $error_message = PMA_DBI_convert_message($error_message); - } - - $error_message = htmlspecialchars($error_message); - - if ($error_number == 2002) { - $error = '#' . ((string) $error_number) . ' - ' . __('The server is not responding') . ' ' . __('(or the local MySQL server\'s socket is not correctly configured)'); - } else { - $error = '#' . ((string) $error_number) . ' - ' . $error_message; - } - return $error; + return PMA_DBI_formatError($error_number, $error_message); } /** @@ -584,27 +619,57 @@ function PMA_DBI_field_flags($result, $i) $charsetnr = $f->charsetnr; $f = $f->flags; $flags = ''; - if ($f & MYSQLI_UNIQUE_KEY_FLAG) { $flags .= 'unique ';} - if ($f & MYSQLI_NUM_FLAG) { $flags .= 'num ';} - if ($f & MYSQLI_PART_KEY_FLAG) { $flags .= 'part_key ';} - if ($f & MYSQLI_SET_FLAG) { $flags .= 'set ';} - if ($f & MYSQLI_TIMESTAMP_FLAG) { $flags .= 'timestamp ';} - if ($f & MYSQLI_AUTO_INCREMENT_FLAG) { $flags .= 'auto_increment ';} - if ($f & MYSQLI_ENUM_FLAG) { $flags .= 'enum ';} + if ($f & MYSQLI_UNIQUE_KEY_FLAG) { + $flags .= 'unique '; + } + if ($f & MYSQLI_NUM_FLAG) { + $flags .= 'num '; + } + if ($f & MYSQLI_PART_KEY_FLAG) { + $flags .= 'part_key '; + } + if ($f & MYSQLI_SET_FLAG) { + $flags .= 'set '; + } + if ($f & MYSQLI_TIMESTAMP_FLAG) { + $flags .= 'timestamp '; + } + if ($f & MYSQLI_AUTO_INCREMENT_FLAG) { + $flags .= 'auto_increment '; + } + if ($f & MYSQLI_ENUM_FLAG) { + $flags .= 'enum '; + } // See http://dev.mysql.com/doc/refman/6.0/en/c-api-datatypes.html: // to determine if a string is binary, we should not use MYSQLI_BINARY_FLAG // but instead the charsetnr member of the MYSQL_FIELD // structure. Watch out: some types like DATE returns 63 in charsetnr // so we have to check also the type. // Unfortunately there is no equivalent in the mysql extension. - if (($type == MYSQLI_TYPE_TINY_BLOB || $type == MYSQLI_TYPE_BLOB || $type == MYSQLI_TYPE_MEDIUM_BLOB || $type == MYSQLI_TYPE_LONG_BLOB || $type == MYSQLI_TYPE_VAR_STRING || $type == MYSQLI_TYPE_STRING) && 63 == $charsetnr) { $flags .= 'binary ';} - if ($f & MYSQLI_ZEROFILL_FLAG) { $flags .= 'zerofill ';} - if ($f & MYSQLI_UNSIGNED_FLAG) { $flags .= 'unsigned ';} - if ($f & MYSQLI_BLOB_FLAG) { $flags .= 'blob ';} - if ($f & MYSQLI_MULTIPLE_KEY_FLAG) { $flags .= 'multiple_key ';} - if ($f & MYSQLI_UNIQUE_KEY_FLAG) { $flags .= 'unique_key ';} - if ($f & MYSQLI_PRI_KEY_FLAG) { $flags .= 'primary_key ';} - if ($f & MYSQLI_NOT_NULL_FLAG) { $flags .= 'not_null ';} + if (($type == MYSQLI_TYPE_TINY_BLOB || $type == MYSQLI_TYPE_BLOB || $type == MYSQLI_TYPE_MEDIUM_BLOB || $type == MYSQLI_TYPE_LONG_BLOB || $type == MYSQLI_TYPE_VAR_STRING || $type == MYSQLI_TYPE_STRING) && 63 == $charsetnr) { + $flags .= 'binary '; + } + if ($f & MYSQLI_ZEROFILL_FLAG) { + $flags .= 'zerofill '; + } + if ($f & MYSQLI_UNSIGNED_FLAG) { + $flags .= 'unsigned '; + } + if ($f & MYSQLI_BLOB_FLAG) { + $flags .= 'blob '; + } + if ($f & MYSQLI_MULTIPLE_KEY_FLAG) { + $flags .= 'multiple_key '; + } + if ($f & MYSQLI_UNIQUE_KEY_FLAG) { + $flags .= 'unique_key '; + } + if ($f & MYSQLI_PRI_KEY_FLAG) { + $flags .= 'primary_key '; + } + if ($f & MYSQLI_NOT_NULL_FLAG) { + $flags .= 'not_null '; + } return trim($flags); } diff --git a/tbl_printview.php b/tbl_printview.php index d289d6b..b459d60 100644 --- a/tbl_printview.php +++ b/tbl_printview.php @@ -135,10 +135,8 @@ foreach ($the_tables as $key => $table) { <tr> <th><?php echo __('Column'); ?></th> <th><?php echo __('Type'); ?></th> -  <th><?php echo __('Null'); ?></th> <th><?php echo __('Default'); ?></th> -  <?php if ($have_rel) { echo '<th>' . __('Links to') . '</th>' . "\n"; @@ -189,10 +187,8 @@ foreach ($the_tables as $key => $table) { ?> </td> <td><?php echo $type; ?><bdo dir="ltr"></bdo></td> -  <td><?php echo (($row['Null'] == '' || $row['Null'] == 'NO') ? __('No') : __('Yes')); ?> </td> <td><?php if (isset($row['Default'])) { echo $row['Default']; } ?> </td> -  <?php if ($have_rel) { echo ' <td>'; diff --git a/themes/original/layout.inc.php b/themes/original/layout.inc.php index f22369e..4c58d24 100644 --- a/themes/original/layout.inc.php +++ b/themes/original/layout.inc.php @@ -33,7 +33,6 @@ $GLOBALS['cfg']['MainColor'] = '#000000'; // background for the main frame $GLOBALS['cfg']['MainBackground'] = '#F5F5F5'; -//$GLOBALS['cfg']['MainBackground'] = '#F5F5F5 url(' . $_SESSION['PMA_Theme']->getImgPath() . 'vertical_line.png) repeat-y'; // foreground (text) color of the pointer in browse mode $GLOBALS['cfg']['BrowsePointerColor'] = '#000000'; @@ -114,7 +113,7 @@ $GLOBALS['cfg']['SQP']['fmtColor'] = array( /** * Chart colors */ - + $GLOBALS['cfg']['chartColor'] = array( 'gradientIntensity' => 0, // The style of the chart title. diff --git a/themes/pmahomme/layout.inc.php b/themes/pmahomme/layout.inc.php index 8ff3ebc..ca71272 100644 --- a/themes/pmahomme/layout.inc.php +++ b/themes/pmahomme/layout.inc.php @@ -35,7 +35,6 @@ $GLOBALS['cfg']['MainColor'] = '#000000'; // background for the main frame $GLOBALS['cfg']['MainBackground'] = '#F5F5F5'; -//$GLOBALS['cfg']['MainBackground'] = '#F5F5F5 url(' . $_SESSION['PMA_Theme']->getImgPath() . 'vertical_line.png) repeat-y'; // foreground (text) color of the pointer in browse mode $GLOBALS['cfg']['BrowsePointerColor'] = '#000000'; @@ -116,7 +115,7 @@ $GLOBALS['cfg']['SQP']['fmtColor'] = array( /** * Chart colors */ - + $GLOBALS['cfg']['chartColor'] = array( 'gradientIntensity' => 50, // The style of the chart title. hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7-21555-g31cf332
by Michal Čihař 24 Oct '11

24 Oct '11

The branch, master has been updated via 31cf332809f43c2e14b6e5771b2050567607e456 (commit) via 16d714f6b3b03afa6887e7ae3ffe40d7a5198895 (commit) via aca5efb160b7155c25bfb5935f26cdc41e89342c (commit) from a4bf8a5263fc0f27acc482072fc37d73709256b1 (commit) - Log ----------------------------------------------------------------- commit 31cf332809f43c2e14b6e5771b2050567607e456 Author: Michal Čihař <michal(a)cihar.com> Date: Mon Oct 24 17:15:07 2011 +0200 Translation update done using Pootle. commit 16d714f6b3b03afa6887e7ae3ffe40d7a5198895 Author: Michal Čihař <michal(a)cihar.com> Date: Mon Oct 24 17:14:38 2011 +0200 Translation update done using Pootle. commit aca5efb160b7155c25bfb5935f26cdc41e89342c Author: Michal Čihař <michal(a)cihar.com> Date: Mon Oct 24 17:14:32 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/cs.po | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/po/cs.po b/po/cs.po index 3d24a73..7cf520b 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-10-24 09:52-0400\n" -"PO-Revision-Date: 2011-10-24 17:11+0200\n" +"PO-Revision-Date: 2011-10-24 17:15+0200\n" "Last-Translator: Michal Čihař <michal(a)cihar.com>\n" "Language-Team: czech <cs(a)li.org>\n" "Language: cs\n" @@ -7769,10 +7769,9 @@ msgid "Current Server" msgstr "Aktuální server" #: libraries/server_links.inc.php:60 -#, fuzzy #| msgid "User" msgid "Users" -msgstr "Uživatel" +msgstr "Uživatelé" #: libraries/server_links.inc.php:79 server_synchronize.php:1154 #: server_synchronize.php:1162 @@ -9100,7 +9099,6 @@ msgid "Any" msgstr "Jakýkoliv" #: server_privileges.php:1561 -#, fuzzy #| msgid "User overview" msgid "Users overview" msgstr "Přehled uživatelů" @@ -11311,10 +11309,9 @@ msgid "Check referential integrity:" msgstr "Zkontrolovat integritu odkazů:" #: tbl_printview.php:72 -#, fuzzy #| msgid "Show tables" msgid "Showing tables" -msgstr "Zobrazit tabulky" +msgstr "Zobrazuji tabulky" #: tbl_printview.php:273 tbl_structure.php:762 msgid "Space usage" hooks/post-receive -- phpMyAdmin

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git