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

patch #2007196, Typos in comments, thanks to knittl - knittl

Browse Source
This commit is contained in:
Marc Delisle
2008-07-01 19:21:28 +00:00
parent 71efad3fe7
commit 544831fda7
22 changed files with 56 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -61,6 +61,7 @@ danbarry
see http://store.swekey.com/index.php?promo=pma
(todo: Documentation.html, improve code formatting)
+ rfe #1962383 [designer] Option to create a PDF page
- patch #2007196, Typos in comments, thanks to knittl - knittl
2.11.8.0 (not yet released)
- patch #1987593 [interface] Table list pagination in navi,

10
libraries/Config.class.php
View File

@@ -55,7 +55,7 @@ class PMA_Config
var $default_server = array();
/**
* @var boolean wether init is done or mot
* @var boolean whether init is done or not
* set this to false to force some initial checks
* like checking for required functions
*/
@@ -74,7 +74,7 @@ class PMA_Config
// PMA_Config::load()
$this->load($source);
// other settings, independant from config file, comes in
// other settings, independent from config file, comes in
$this->checkSystem();
$this->checkIsHttps();
@@ -106,7 +106,7 @@ class PMA_Config
}
/**
* wether to use gzip output compression or not
* whether to use gzip output compression or not
*/
function checkOutputCompression()
{
@@ -453,7 +453,7 @@ class PMA_Config
/**
* check config source
*
* @return boolean wether source is valid or not
* @return boolean whether source is valid or not
*/
function checkConfigSource()
{
@@ -551,7 +551,7 @@ class PMA_Config
*/
function checkPmaAbsoluteUri()
{
// Setup a default value to let the people and lazy syadmins work anyway,
// Setup a default value to let the people and lazy sysadmins work anyway,
// they'll get an error if the autodetect code doesn't work
$pma_absolute_uri = $this->get('PmaAbsoluteUri');
$is_https = $this->get('is_https');

4
libraries/List_Database.class.php
View File

@@ -349,7 +349,7 @@ require_once './libraries/List.class.php';
foreach ($this->getGroupedDetails($offset, $count) as $group => $dbs) {
if (count($dbs) > 1) {
$return .= '<li>' . htmlspecialchars($group) . '<ul>' . "\n";
// wether display db_name cuted by the group part
// whether display db_name cut by the group part
$cut = true;
} else {
// .. or full
@@ -409,7 +409,7 @@ require_once './libraries/List.class.php';
if (count($dbs) > 1) {
$return .= '<optgroup label="' . htmlspecialchars($group)
. '">' . "\n";
// wether display db_name cuted by the group part
// whether display db_name cuted by the group part
$cut = true;
} else {
// .. or full

15
libraries/Table.class.php
View File

@@ -79,7 +79,7 @@ class PMA_Table
}
/**
* sets table anme
* sets table name
*
* @uses $this->name to set it
* @param string $table_name new table name
@@ -93,7 +93,7 @@ class PMA_Table
* returns table name
*
* @uses $this->name as return value
* @param boolean wether to quote name with backticks ``
* @param boolean whether to quote name with backticks ``
* @return string table name
*/
function getName($quoted = false)
@@ -119,7 +119,7 @@ class PMA_Table
* returns database name for this table
*
* @uses $this->db_name as return value
* @param boolean wether to quote name with backticks ``
* @param boolean whether to quote name with backticks ``
* @return string database name for this table
*/
function getDbName($quoted = false)
@@ -133,7 +133,7 @@ class PMA_Table
/**
* returns full name for table, including database name
*
* @param boolean wether to quote name with backticks ``
* @param boolean whether to quote name with backticks ``
*/
function getFullName($quoted = false)
{
@@ -396,7 +396,8 @@ class PMA_Table
* @param boolean whether to retain or to displays the result
* @param boolean whether to force an exact count
*
* @return mixed the number of records if retain is required, true else
* @return mixed the number of records if "retain" param is true,
* otherwise true
*
* @access public
*/
@@ -1106,7 +1107,7 @@ class PMA_Table
* - UNIQUE(x,y) // NONE
*
*
* @param boolean wether to quote name with backticks ``
* @param boolean whether to quote name with backticks ``
* @return array
*/
public function getUniqueColumns($quoted = true)
@@ -1132,7 +1133,7 @@ class PMA_Table
* first columns in an index
*
* f.e. index(col1, col2) would only return col1
* @param boolean wether to quote name with backticks ``
* @param boolean whether to quote name with backticks ``
* @return array
*/
public function getIndexedColumns($quoted = true)

8
libraries/Theme.class.php
View File

@@ -9,8 +9,8 @@
/**
* handles theme
*
* @todo add the possibility to make a theme depends on another theme and by default on original
* @todo make all components optional - taking missing components from 'parent' theme
* @todo add the possibility to make a theme depend on another theme and by default on original
* @todo make all components optional - get missing components from 'parent' theme
* @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
*
@@ -89,7 +89,7 @@ class PMA_Theme {
@include $this->getPath() . '/info.inc.php';
// did it set correctly?
// was it set correctly?
if (! isset($theme_name)) {
return false;
}
@@ -308,7 +308,7 @@ class PMA_Theme {
}
/**
* load css (send to stdout, normaly the browser)
* load css (send to stdout, normally the browser)
*
* @access public
* @uses PMA_Theme::getPath()

6
libraries/Theme_Manager.class.php
View File

@@ -273,9 +273,9 @@ class PMA_Theme_Manager
}
/**
* returns HTML selectbox, with or without form enclsoed
* returns HTML selectbox, with or without form enclosed
*
* @param boolean $form wether enclosed by from tags or not
* @param boolean $form whether enclosed by from tags or not
*/
function getHtmlSelectBox($form = true)
{
@@ -367,7 +367,7 @@ class PMA_Theme_Manager
return true;
}
// load css for this them failed, try default theme css
// if loading css for this theme failed, try default theme css
$fallback_theme = $this->getFallBackTheme();
if ($fallback_theme && $fallback_theme->loadCss($type)) {
return true;

4
libraries/auth/cookie.auth.lib.php
View File

@@ -568,7 +568,7 @@ function PMA_auth_set_user()
$_SESSION['last_access_time'] = time();
// Name and password cookies needs to be refreshed each time
// Name and password cookies need to be refreshed each time
// Duration = one month for username
PMA_setCookie('pmaUser-' . $GLOBALS['server'],
PMA_blowfish_encrypt($cfg['Server']['user'],
@@ -586,7 +586,7 @@ function PMA_auth_set_user()
if (! $GLOBALS['from_cookie']) {
if ($GLOBALS['cfg']['AllowArbitraryServer']) {
if (! empty($GLOBALS['pma_auth_server'])) {
// Duration = one month for serverrname
// Duration = one month for servername
PMA_setCookie('pmaServer-' . $GLOBALS['server'], $cfg['Server']['host']);
} else {
// Delete servername cookie

2
libraries/charset_conversion.lib.php
View File

@@ -66,7 +66,7 @@ if (!isset($cfg['IconvExtraParams'])) {
$cfg['IconvExtraParams'] = '';
}
// Finally detects which function will we use:
// Finally detect which function we will use:
if (isset($cfg['AllowAnywhereRecoding'])
&& $cfg['AllowAnywhereRecoding']
&& $allow_recoding) {

4
libraries/common.inc.php
View File

@@ -8,7 +8,7 @@
*
* Order of sections for common.inc.php:
*
* the authentication libraries must be before the connection to db
* the authentication libraries must be loaded before db connections
*
* ... so the required order is:
*
@@ -693,7 +693,7 @@ $GLOBALS['pmaThemeImage'] = $_SESSION['PMA_Theme']->getImgPath();
if (@file_exists($_SESSION['PMA_Theme']->getLayoutFile())) {
include $_SESSION['PMA_Theme']->getLayoutFile();
/**
* @todo remove if all themes are update use Navi instead of Left as frame name
* @todo remove if all themes are updated to use Navi instead of Left as frame name
*/
if (! isset($GLOBALS['cfg']['NaviWidth'])
&& isset($GLOBALS['cfg']['LeftWidth'])) {

4
libraries/common.lib.php
View File

@@ -1091,7 +1091,7 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice')
if (! empty($cfg['SQLQuery']['Explain']) && ! $query_too_big) {
$explain_params = $url_params;
// Detect if we are validating as well
// To preserve the validate uRL data
// To preserve the validate URL data
if (! empty($GLOBALS['validatequery'])) {
$explain_params['validatequery'] = 1;
}
@@ -1512,7 +1512,7 @@ function PMA_getTab($tab)
$tab = array_merge($defaults, $tab);
// determine additionnal style-class
// determine additional style-class
if (empty($tab['class'])) {
if ($tab['text'] == $GLOBALS['strEmpty']
|| $tab['text'] == $GLOBALS['strDrop']) {

6
libraries/core.lib.php
View File

@@ -514,9 +514,9 @@ function PMA_checkPageValidity(&$page, $whitelist)
}
/**
* trys to find the value for the given environment vriable name
* tries to find the value for the given environment variable name
*
* searchs in $_SERVER, $_ENV than trys getenv() and apache_getenv()
* searches in $_SERVER, $_ENV then tries getenv() and apache_getenv()
* in this order
*
* @uses $_SERVER
@@ -559,7 +559,7 @@ function PMA_removeCookie($cookie)
}
/**
* sets cookie if value is different from current cokkie value,
* sets cookie if value is different from current cookie value,
* or removes if value is equal to default
*
* @uses PMA_Config::isHttps()

6
libraries/database_interface.lib.php
View File

@@ -90,7 +90,7 @@ function PMA_DBI_query($query, $link = null, $options = 0) {
}
/**
* converts charset of a mysql message, usally coming from mysql_error(),
* converts charset of a mysql message, usually coming from mysql_error(),
* into PMA charset, usally UTF-8
* uses language to charset mapping from mysql/share/errmsg.txt
* and charset names to ISO charset from information_schema.CHARACTER_SETS
@@ -517,7 +517,7 @@ function PMA_DBI_get_databases_full($database = null, $force_stats = false,
$databases[$database_name]['DEFAULT_COLLATION_NAME']
= PMA_getDbCollation($database_name);
// get additonal info about tables
// get additional info about tables
$databases[$database_name]['SCHEMA_TABLES'] = 0;
$databases[$database_name]['SCHEMA_TABLE_ROWS'] = 0;
$databases[$database_name]['SCHEMA_DATA_LENGTH'] = 0;
@@ -738,7 +738,7 @@ function PMA_DBI_get_fields($database, $table, $link = null)
*
* @param string $database name of database
* @param string $table name of table to retrieve columns from
* @param boolean $full wether to return full info or only column names
* @param boolean $full whether to return full info or only column names
* @param mixed $link mysql link resource
* @return array column names
*/

2
libraries/dbg/setup.php
View File

@@ -8,7 +8,7 @@ if (! defined('PHPMYADMIN')) {
}
/**
* checks for DBG extension and trys to load if not loaded
* checks for DBG extension and tries to load if not loaded
*
* allways use $GLOBALS here, as this script is included by footer.inc.hp
* which can also be included from inside a function

4
libraries/export/pdf.php
View File

@@ -292,8 +292,8 @@ class PMA_PDF extends TCPDF
}
}
// loop through the data, any column whose contents is bigger
// than the col size is resized
// loop through the data; any column whose contents
// is greater than the column size is resized
/**
* @todo force here a LIMIT to avoid reading all rows
*/

2
libraries/footer.inc.php
View File

@@ -3,7 +3,7 @@
/**
* finishes HTML output
*
* updates javascript variables in index.php for coorect working with querywindow
* updates javascript variables in index.php for correct working with querywindow
* and navigation frame refreshing
*
* send buffered data if buffered

2
libraries/grab_globals.lib.php
View File

@@ -13,7 +13,7 @@ if (! defined('PHPMYADMIN')) {
}
/**
* copy values from one array to another, usally from a superglobal into $GLOBALS
* copy values from one array to another, usually from a superglobal into $GLOBALS
*
* @uses $GLOBALS['_import_blacklist']
* @uses preg_replace()

2
libraries/relation.lib.php
View File

@@ -1043,7 +1043,7 @@ function PMA_getForeignData($foreigners, $field, $override_total, $foreign_filte
* @uses $GLOBALS['controllink']
* @uses $GLOBALS['cfgRelation']
* @uses $GLOBALS['db']
* @param string wether to go from master to foreign or vice versa
* @param string whether to go from master to foreign or vice versa
* @return boolean always TRUE
* @global array $tab_left the list of tables that we still couldn't connect
* @global array $tab_know the list of allready connected tables

20
libraries/select_lang.lib.php
View File

@@ -165,23 +165,23 @@ function PMA_langList()
/**
* All the supported languages have to be listed in the array below.
* 1. The key must be the "official" ISO 639 language code and, if required,
* the dialect code. It can also contain some informations about the
* the dialect code. It can also contain some information about the
* charset (see the Russian case).
* 2. The first of the values associated to the key is used in a regular
* expression to find some keywords corresponding to the language inside two
* environment variables.
* These values contains:
* These values contain:
* - the "official" ISO language code and, if required, the dialect code
* also ('bu' for Bulgarian, 'fr([-_][[:alpha:]]{2})?' for all French
* too ('bu' for Bulgarian, 'fr([-_][[:alpha:]]{2})?' for all French
* dialects, 'zh[-_]tw' for Chinese traditional...), the dialect has to
* be specified as first;
* be specified first;
* - the '|' character (it means 'OR');
* - the full language name.
* 3. The second values associated to the key is the name of the file to load
* 3. The second value associated to the key is the name of the file to load
* without the 'inc.php' extension.
* 4. The third values associated to the key is the language code as defined by
* 4. The third value associated to the key is the language code as defined by
* the RFC1766.
* 5. The fourth value is native name in html entities.
* 5. The fourth value is its native name in html entities.
*
* Beware that the sorting order (first values associated to keys by
* alphabetical reverse order in the array) is important: 'zh-tw' (chinese
@@ -258,15 +258,15 @@ $GLOBALS['lang_path'] = './lang/';
*/
$GLOBALS['lang'] = 'en-utf-8';
/**
* @global boolean wether loading lang from cfg failed
* @global boolean whether loading lang from cfg failed
*/
$GLOBALS['lang_failed_cfg'] = false;
/**
* @global boolean wether loading lang from cookie failed
* @global boolean whether loading lang from cookie failed
*/
$GLOBALS['lang_failed_cookie'] = false;
/**
* @global boolean wether loading lang from user request failed
* @global boolean whether loading lang from user request failed
*/
$GLOBALS['lang_failed_request'] = false;
/**

2
libraries/sqlparser.lib.php
View File

@@ -833,7 +833,7 @@ if (! defined('PMA_MINIMUM_COMMON')) {
// for SELECT EXTRACT(YEAR_MONTH FROM CURDATE())
// we must not use CURDATE as a table_ref
// so we track wether we are in the EXTRACT()
// so we track whether we are in the EXTRACT()
$in_extract = FALSE;
// for GROUP_CONCAT(...)

2
navigation.php
View File

@@ -545,7 +545,7 @@ function PMA_displayDbList($ext_dblist, $offset, $count) {
* @global string html code for '+' image
* @global string html code for self link
* @param array $tables array of tables/tablegroups
* @param boolean $visible wether the list is visible or not
* @param boolean $visible whether the list is visible or not
* @param string $tab_group_full full tab group name
* @param string $table_db db of this table
*/

2
pdf_schema.php
View File

@@ -122,7 +122,7 @@ class PMA_PDF extends TCPDF {
* @param double $ The cell width
* @param double $ The cell height
* @param string $ The text to output
* @param mixed $ Wether to add borders or not
* @param mixed $ Whether to add borders or not
* @param integer $ Where to put the cursor once the output is done
* @param string $ Align mode
* @param integer $ Whether to fill the cell with a color or not