nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Comments formatting and PHPDoc fixes

Browse Source
This commit is contained in:
Piotr Przybylski
2011-05-02 20:50:16 +02:00
parent f25945b8be
commit 5c39c5511f
4 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libraries/Message.class.php
View File

@@ -151,8 +151,8 @@ class PMA_Message
* @uses PMA_Message::SANITIZE_PARAMS * @uses PMA_Message::SANITIZE_PARAMS
* @param string $string * @param string $string
* @param integer $number * @param integer $number
* @param array $$params * @param array $params
* @param boolean $sanitize * @param integer $sanitize
*/ */
public function __construct($string = '', $number = PMA_Message::NOTICE, public function __construct($string = '', $number = PMA_Message::NOTICE,
$params = array(), $sanitize = PMA_Message::SANITIZE_NONE) $params = array(), $sanitize = PMA_Message::SANITIZE_NONE)
@@ -624,9 +624,9 @@ class PMA_Message
* @static * @static
* @uses is_array() * @uses is_array()
* @uses htmlspecialchars() * @uses htmlspecialchars()
* @uses PMA_Message::sanitize() recursiv * @uses PMA_Message::sanitize() recursive
* @param mixed the message(s) * @param mixed $message the message(s)
* @return mixed the sanitized message(s) * @return mixed the sanitized message(s)
* @access public * @access public
*/ */
static public function sanitize($message) static public function sanitize($message)
@@ -686,7 +686,6 @@ class PMA_Message
* @uses PMA_Message::$_string * @uses PMA_Message::$_string
* @uses PMA_Message::$_message * @uses PMA_Message::$_message
* @uses md5() * @uses md5()
* @param string $file
* @return string PMA_Message::$_hash * @return string PMA_Message::$_hash
*/ */
public function getHash() public function getHash()

2
libraries/common.inc.php
View File

@@ -838,7 +838,7 @@ if (! defined('PMA_MINIMUM_COMMON')) {
// http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/aaa/mod_access.c?rev=1.37&content-type=text/vnd.viewcvs-markup // http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/aaa/mod_access.c?rev=1.37&content-type=text/vnd.viewcvs-markup
// Look at: "static int check_dir_access(request_rec *r)" // Look at: "static int check_dir_access(request_rec *r)"
if (isset($cfg['Server']['AllowDeny']) if (isset($cfg['Server']['AllowDeny'])
&& isset($cfg['Server']['AllowDeny']['order'])) { && isset($cfg['Server']['AllowDeny']['order'])) {
/** /**
* ip based access library * ip based access library

10
libraries/common.lib.php
View File

@@ -706,11 +706,11 @@ function PMA_mysqlDie($error_message = '', $the_query = '',
* @uses uksort() * @uses uksort()
* @uses strstr() * @uses strstr()
* @uses explode() * @uses explode()
* @param string $db name of db * @param string $db name of db
* @param string $tables name of tables * @param string $tables name of tables
* @param integer $limit_offset list offset * @param integer $limit_offset list offset
* @param integer $limit_count max tables to return * @param int|bool $limit_count max tables to return
* return array (recursive) grouped table list * @return array (recursive) grouped table list
*/ */
function PMA_getTableList($db, $tables = null, $limit_offset = 0, $limit_count = false) function PMA_getTableList($db, $tables = null, $limit_offset = 0, $limit_count = false)
{ {

19
libraries/database_interface.lib.php
View File

@@ -254,7 +254,7 @@ function PMA_DBI_get_tables_full($database, $table = false, $tbl_is_group = fals
$tables = array(); $tables = array();
if (! $GLOBALS['cfg']['Server']['DisableIS']) { if (! $GLOBALS['cfg']['Server']['DisableIS']) {
// get table information from information_schema // get table information from information_schema
if ($table) { if ($table) {
if (true === $tbl_is_group) { if (true === $tbl_is_group) {
$sql_where_table = 'AND `TABLE_NAME` LIKE \'' $sql_where_table = 'AND `TABLE_NAME` LIKE \''
@@ -269,13 +269,13 @@ function PMA_DBI_get_tables_full($database, $table = false, $tbl_is_group = fals
$sql_where_table = ''; $sql_where_table = '';
} }
// for PMA bc: // for PMA bc:
// `SCHEMA_FIELD_NAME` AS `SHOW_TABLE_STATUS_FIELD_NAME` // `SCHEMA_FIELD_NAME` AS `SHOW_TABLE_STATUS_FIELD_NAME`
// //
// on non-Windows servers, // on non-Windows servers,
// added BINARY in the WHERE clause to force a case sensitive // added BINARY in the WHERE clause to force a case sensitive
// comparison (if we are looking for the db Aa we don't want // comparison (if we are looking for the db Aa we don't want
// to find the db aa) // to find the db aa)
$this_databases = array_map('PMA_sqlAddslashes', $databases); $this_databases = array_map('PMA_sqlAddslashes', $databases);
$sql = ' $sql = '
@@ -945,7 +945,6 @@ function PMA_DBI_get_variable($var, $type = PMA_DBI_GETVAR_SESSION, $link = null
* @uses $GLOBALS['mysql_charset_map'] * @uses $GLOBALS['mysql_charset_map']
* @uses $GLOBALS['charset'] * @uses $GLOBALS['charset']
* @uses $GLOBALS['lang'] * @uses $GLOBALS['lang']
* @uses $GLOBALS['server']
* @uses $GLOBALS['cfg']['Lang'] * @uses $GLOBALS['cfg']['Lang']
* @uses defined() * @uses defined()
* @uses explode() * @uses explode()
@@ -989,7 +988,7 @@ function PMA_DBI_postConnect($link, $is_controluser = false)
define('PMA_DRIZZLE', PMA_MYSQL_MAJOR_VERSION >= 2009); define('PMA_DRIZZLE', PMA_MYSQL_MAJOR_VERSION >= 2009);
} }
/* Skip charsets for Drizzle */ // Skip charsets for Drizzle
if (!PMA_DRIZZLE) { if (!PMA_DRIZZLE) {
if (! empty($GLOBALS['collation_connection'])) { if (! empty($GLOBALS['collation_connection'])) {
PMA_DBI_query("SET CHARACTER SET 'utf8';", $link, PMA_DBI_QUERY_STORE); PMA_DBI_query("SET CHARACTER SET 'utf8';", $link, PMA_DBI_QUERY_STORE);