Fix typos.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
This commit is contained in:
parent
8f87009502
commit
fd7f02f929
@ -14,7 +14,7 @@ $scripts = $header->getScripts();
|
||||
$scripts->addFile('import.js');
|
||||
|
||||
/**
|
||||
* Gets tables informations and displays top links
|
||||
* Gets tables information and displays top links
|
||||
*/
|
||||
require 'libraries/db_common.inc.php';
|
||||
require 'libraries/db_info.inc.php';
|
||||
|
||||
@ -23,7 +23,7 @@ if (isset($_REQUEST['send_error_report'])
|
||||
) {
|
||||
if ($_REQUEST['exception_type'] == 'php') {
|
||||
/**
|
||||
* Prevent inifnite error submission.
|
||||
* Prevent infinite error submission.
|
||||
* Happens in case error submissions fails.
|
||||
* If reporting is done in some time interval,
|
||||
* just clear them & clear json data too.
|
||||
|
||||
@ -123,7 +123,7 @@ class PMA_Font
|
||||
case 'sans-serif':
|
||||
break;
|
||||
/*
|
||||
* .92 modifer for time, serif, brushscriptstd, and californian fb
|
||||
* .92 modifier for time, serif, brushscriptstd, and californian fb
|
||||
*/
|
||||
case 'times':
|
||||
case 'serif':
|
||||
|
||||
@ -428,7 +428,7 @@ class PMA_Index
|
||||
*
|
||||
* @param boolean $as_text whether to output should be in text
|
||||
*
|
||||
* @return mixed how index is paked
|
||||
* @return mixed how index is packed
|
||||
*/
|
||||
public function isPacked($as_text = false)
|
||||
{
|
||||
|
||||
@ -360,7 +360,7 @@ class PMA_StorageEngine
|
||||
}
|
||||
|
||||
/**
|
||||
* Information message on whether this storge engine is supported
|
||||
* Information message on whether this storage engine is supported
|
||||
*
|
||||
* @return string The localized message.
|
||||
*/
|
||||
|
||||
@ -126,7 +126,7 @@ class PMA_TableSearch
|
||||
$columns = $GLOBALS['dbi']->getColumns(
|
||||
$this->_db, $this->_table, null, true
|
||||
);
|
||||
// Get details about the geometry fucntions
|
||||
// Get details about the geometry functions
|
||||
$geom_types = PMA_Util::getGISDatatypes();
|
||||
|
||||
foreach ($columns as $row) {
|
||||
|
||||
@ -142,7 +142,7 @@ class PMA_Theme
|
||||
}
|
||||
|
||||
/**
|
||||
* checks image path for existance - if not found use img from fallback theme
|
||||
* checks image path for existence - if not found use img from fallback theme
|
||||
*
|
||||
* @access public
|
||||
* @return bool
|
||||
@ -235,7 +235,7 @@ class PMA_Theme
|
||||
}
|
||||
|
||||
/**
|
||||
* checks theme version agaisnt $version
|
||||
* checks theme version against $version
|
||||
* returns true if theme version is equal or higher to $version
|
||||
*
|
||||
* @param string $version version to compare to
|
||||
|
||||
@ -32,7 +32,7 @@ class PMA_Tracker
|
||||
static protected $pma_table;
|
||||
|
||||
/**
|
||||
* Defines the usage of DROP TABLE statment in SQL dumps.
|
||||
* Defines the usage of DROP TABLE statement in SQL dumps.
|
||||
*
|
||||
* @access protected
|
||||
* @var boolean
|
||||
@ -40,7 +40,7 @@ class PMA_Tracker
|
||||
static protected $add_drop_table;
|
||||
|
||||
/**
|
||||
* Defines the usage of DROP VIEW statment in SQL dumps.
|
||||
* Defines the usage of DROP VIEW statement in SQL dumps.
|
||||
*
|
||||
* @access protected
|
||||
* @var boolean
|
||||
@ -48,7 +48,7 @@ class PMA_Tracker
|
||||
static protected $add_drop_view;
|
||||
|
||||
/**
|
||||
* Defines the usage of DROP DATABASE statment in SQL dumps.
|
||||
* Defines the usage of DROP DATABASE statement in SQL dumps.
|
||||
*
|
||||
* @access protected
|
||||
* @var boolean
|
||||
|
||||
@ -2052,12 +2052,14 @@ class PMA_Util
|
||||
/**
|
||||
* Function to generate unique condition for specified row.
|
||||
*
|
||||
* @param resource $handle current query result
|
||||
* @param integer $fields_cnt number of fields
|
||||
* @param array $fields_meta meta information about fields
|
||||
* @param array $row current row
|
||||
* @param boolean $force_unique generate condition only on pk or unique
|
||||
* @param string $restrict_to_table restrict the unique condition to this table
|
||||
* @param resource $handle current query result
|
||||
* @param integer $fields_cnt number of fields
|
||||
* @param array $fields_meta meta information about fields
|
||||
* @param array $row current row
|
||||
* @param boolean $force_unique generate condition only on pk or
|
||||
* unique
|
||||
* @param string|boolean $restrict_to_table restrict the unique condition to
|
||||
* this table or false if none
|
||||
*
|
||||
* @access public
|
||||
*
|
||||
|
||||
@ -295,7 +295,7 @@ class FormDisplay
|
||||
}
|
||||
PMA_displayFormBottom();
|
||||
|
||||
// if not already done, send strings used for valdiation to JavaScript
|
||||
// if not already done, send strings used for validation to JavaScript
|
||||
if (! $js_lang_sent) {
|
||||
$js_lang_sent = true;
|
||||
$js_lang = array();
|
||||
|
||||
@ -21,7 +21,7 @@ require_once './libraries/DatabaseInterface.class.php';
|
||||
* assigned to a form element (formset name or field path). Even if there are
|
||||
* no errors, key must be set with an empty value.
|
||||
*
|
||||
* Valdiation functions are assigned in $cfg_db['_validators'] (config.values.php).
|
||||
* Validation functions are assigned in $cfg_db['_validators'] (config.values.php).
|
||||
*
|
||||
* @package PhpMyAdmin
|
||||
*/
|
||||
@ -80,7 +80,7 @@ class PMA_Validator
|
||||
* Return values:
|
||||
* o array, keys - field path or formset id, values - array of errors
|
||||
* when $isPostSource is true values is an empty array to allow for error list
|
||||
* cleanup in HTML documen
|
||||
* cleanup in HTML document
|
||||
* o false - when no validators match name(s) given by $validator_id
|
||||
*
|
||||
* @param ConfigFile $cf Config file instance
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
* List of avaible forms, each form is described as an array of fields to display.
|
||||
* List of available forms, each form is described as an array of fields to display.
|
||||
* Fields MUST have their counterparts in the $cfg array.
|
||||
*
|
||||
* There are two possible notations:
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
<?php
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
* List of avaible forms, each form is described as an array of fields to display.
|
||||
* List of available forms, each form is described as an array of fields to display.
|
||||
* Fields MUST have their counterparts in the $cfg array.
|
||||
*
|
||||
* To define form field, use the notatnion below:
|
||||
* To define form field, use the notation below:
|
||||
* $forms['Form group']['Form name'] = array('Option/path');
|
||||
*
|
||||
* You can assign default values set by special button ("set value: ..."), eg.:
|
||||
|
||||
@ -10,7 +10,7 @@ if (! defined('PHPMYADMIN')) {
|
||||
}
|
||||
|
||||
/**
|
||||
* constant for differenciating array in $_SESSION variable
|
||||
* constant for differentiating array in $_SESSION variable
|
||||
*/
|
||||
$SESSION_KEY = '__upload_status';
|
||||
|
||||
|
||||
@ -17,7 +17,7 @@ if (! defined('PHPMYADMIN')) {
|
||||
class PMA_StorageEngine_Ndbcluster extends PMA_StorageEngine
|
||||
{
|
||||
/**
|
||||
* Returns array with variable names realted to NDBCLUSTER storage engine
|
||||
* Returns array with variable names related to NDBCLUSTER storage engine
|
||||
*
|
||||
* @return array variable names
|
||||
*/
|
||||
|
||||
@ -251,7 +251,7 @@ function PMA_countLines($filename)
|
||||
}
|
||||
|
||||
/**
|
||||
* returns the translated linenumber and the file name from the cumulative line
|
||||
* returns the translated line number and the file name from the cumulative line
|
||||
* number and an array of files
|
||||
*
|
||||
* uses the $LINE_COUNT global array of file names and line numbers
|
||||
@ -260,7 +260,7 @@ function PMA_countLines($filename)
|
||||
* @param Integer $cumulative_number the cumulative line number in the
|
||||
* concatenated files
|
||||
*
|
||||
* @return Array the filename and linenumber
|
||||
* @return Array the filename and line number
|
||||
* Returns two variables in an array:
|
||||
* - A String $filename the filename where the requested cumulative number
|
||||
* exists
|
||||
@ -284,12 +284,12 @@ function PMA_getLineNumber($filenames, $cumulative_number)
|
||||
}
|
||||
|
||||
/**
|
||||
* translates the cumulative line numbers in the stactrace as well as sanitize
|
||||
* translates the cumulative line numbers in the stack trace as well as sanitize
|
||||
* urls and trim long lines in the context
|
||||
*
|
||||
* @param Array $stack the stacktrace
|
||||
* @param Array $stack the stack trace
|
||||
*
|
||||
* @return Array $stack the modified stacktrace
|
||||
* @return Array $stack the modified stack trace
|
||||
*/
|
||||
function PMA_translateStacktrace($stack)
|
||||
{
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
* This class is responsible for instanciating
|
||||
* This class is responsible for instantiating
|
||||
* the various components of the navigation panel
|
||||
*
|
||||
* @package PhpMyAdmin-navigation
|
||||
@ -142,13 +142,13 @@ class PMA_Navigation
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns HTML for the dialog to show hidden nativation items.
|
||||
* Returns HTML for the dialog to show hidden navigation items.
|
||||
*
|
||||
* @param string $dbName database name
|
||||
* @param string $itemType type of the items to include
|
||||
* @param string $tableName table name
|
||||
*
|
||||
* @return string HTML for the dialog to show hidden nativation items
|
||||
* @return string HTML for the dialog to show hidden navigation items
|
||||
*/
|
||||
public function getItemUnhideDialog($dbName, $itemType = null, $tableName = null)
|
||||
{
|
||||
|
||||
@ -11,7 +11,7 @@ if (! defined('PHPMYADMIN')) {
|
||||
|
||||
/**
|
||||
* This class renders the logo, links, server selection,
|
||||
* which are then displayed at the top of the naviagtion panel
|
||||
* which are then displayed at the top of the navigation panel
|
||||
*
|
||||
* @package PhpMyAdmin-Navigation
|
||||
*/
|
||||
|
||||
@ -12,7 +12,7 @@ if (! defined('PHPMYADMIN')) {
|
||||
require_once 'libraries/navigation/Nodes/Node.class.php';
|
||||
|
||||
/**
|
||||
* Node factory - instanciates Node objects or objects derived from the Node class
|
||||
* Node factory - instantiates Node objects or objects derived from the Node class
|
||||
*
|
||||
* @package PhpMyAdmin-Navigation
|
||||
*/
|
||||
@ -72,9 +72,9 @@ class PMA_NodeFactory
|
||||
return $class;
|
||||
}
|
||||
/**
|
||||
* Instanciates a Node object
|
||||
* Instantiates a Node object
|
||||
*
|
||||
* @param string $class The name of the class to instanciate
|
||||
* @param string $class The name of the class to instantiate
|
||||
* @param string $name An identifier for the new node
|
||||
* @param int $type Type of node, may be one of CONTAINER or OBJECT
|
||||
* @param bool $is_group Whether this object has been created
|
||||
|
||||
@ -193,7 +193,7 @@ class Node
|
||||
}
|
||||
|
||||
/**
|
||||
* Retreives the parents for a node
|
||||
* Retrieves the parents for a node
|
||||
*
|
||||
* @param bool $self Whether to include the Node itself in the results
|
||||
* @param bool $containers Whether to include nodes of type CONTAINER
|
||||
|
||||
@ -48,10 +48,12 @@ class Node_Database extends Node
|
||||
* Returns the number of children of type $type present inside this container
|
||||
* This method is overridden by the Node_Database and Node_Table classes
|
||||
*
|
||||
* @param string $type The type of item we are looking for
|
||||
* ('tables', 'views', etc)
|
||||
* @param string $searchClause A string used to filter the results of the query
|
||||
* @param string $singleItem Whether to get presence of a single known item
|
||||
* @param string $type The type of item we are looking for
|
||||
* ('tables', 'views', etc)
|
||||
* @param string $searchClause A string used to filter the results of
|
||||
* the query
|
||||
* @param boolean|string $singleItem Whether to get presence of a single known
|
||||
* item or false in none
|
||||
*
|
||||
* @return int
|
||||
*/
|
||||
|
||||
@ -43,7 +43,7 @@ abstract class Node_DatabaseChild extends Node
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the type of the item reprsented by the node.
|
||||
* Returns the type of the item represented by the node.
|
||||
*
|
||||
* @return string type of the item
|
||||
*/
|
||||
|
||||
@ -208,7 +208,7 @@ abstract class ExportPlugin
|
||||
/**
|
||||
* The following methods are implemented here so that they
|
||||
* can be used by all export plugin without overriding it.
|
||||
* Note: If you are creating a export plugin then dont include
|
||||
* Note: If you are creating a export plugin then don't include
|
||||
* below methods unless you want to override them.
|
||||
*/
|
||||
|
||||
|
||||
@ -46,7 +46,7 @@ abstract class SchemaPlugin
|
||||
protected abstract function setProperties();
|
||||
|
||||
/**
|
||||
* Exports the shcema into the specified format.
|
||||
* Exports the schema into the specified format.
|
||||
*
|
||||
* @param string $db database name
|
||||
*
|
||||
@ -57,20 +57,20 @@ abstract class SchemaPlugin
|
||||
/**
|
||||
* Adds export options common to all plugins.
|
||||
*
|
||||
* @param OptionsPropertyMainGroup $properyGroup property group
|
||||
* @param OptionsPropertyMainGroup $propertyGroup property group
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
protected function addCommonOptions(OptionsPropertyMainGroup $properyGroup)
|
||||
protected function addCommonOptions(OptionsPropertyMainGroup $propertyGroup)
|
||||
{
|
||||
$leaf = new BoolPropertyItem();
|
||||
$leaf->setName('show_color');
|
||||
$leaf->setText(__('Show color'));
|
||||
$properyGroup->addProperty($leaf);
|
||||
$propertyGroup->addProperty($leaf);
|
||||
$leaf = new BoolPropertyItem();
|
||||
$leaf->setName('show_keys');
|
||||
$leaf->setText(__('Only show keys'));
|
||||
$properyGroup->addProperty($leaf);
|
||||
$propertyGroup->addProperty($leaf);
|
||||
}
|
||||
}
|
||||
?>
|
||||
@ -314,7 +314,7 @@ class AuthenticationCookie extends AuthenticationPlugin
|
||||
*
|
||||
* it returns true if all seems ok which usually leads to auth_set_user()
|
||||
*
|
||||
* it directly switches to authFails() if user inactivity timout is reached
|
||||
* it directly switches to authFails() if user inactivity timeout is reached
|
||||
*
|
||||
* @return boolean whether we get authentication settings or not
|
||||
*/
|
||||
@ -677,7 +677,7 @@ class AuthenticationCookie extends AuthenticationPlugin
|
||||
* and the login form
|
||||
*
|
||||
* this function MUST exit/quit the application,
|
||||
* currently doen by call to auth()
|
||||
* currently done by call to auth()
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
|
||||
@ -435,7 +435,7 @@ class ImportMediawiki extends ImportPlugin
|
||||
$start_attribute_character = false;
|
||||
|
||||
// The full separator is "||";
|
||||
// This rembembers if the previous character was '|'
|
||||
// This remembers if the previous character was '|'
|
||||
$partial_separator = false;
|
||||
|
||||
// Parse text char by char
|
||||
|
||||
@ -225,7 +225,7 @@ class ImportSql extends ImportPlugin
|
||||
// Odd count means it was escaped
|
||||
$quoteEscaped = (((($posClosingString - 1) - $posEscape) % 2) === 1);
|
||||
|
||||
//Move after the escaped guote.
|
||||
//Move after the escaped quote.
|
||||
$this->_delimiterPosition = $posClosingString + 1;
|
||||
|
||||
if ($quoteEscaped) {
|
||||
|
||||
@ -36,7 +36,7 @@ class PMA_ShapeFile extends ShapeFile
|
||||
* Loads ESRI shape data from the imported file
|
||||
*
|
||||
* @param string $FileName not used, it's here only to match the method
|
||||
* signature of the method being overidden
|
||||
* signature of the method being overridden
|
||||
*
|
||||
* @return void
|
||||
* @see ShapeFile::loadFromFile()
|
||||
|
||||
@ -241,7 +241,7 @@ class PMA_Export_Relation_Schema
|
||||
{
|
||||
$tables = array();
|
||||
foreach ($_REQUEST['t_h'] as $key => $value) {
|
||||
list($db, $table) = explode(".", $key);
|
||||
list(, $table) = explode(".", $key);
|
||||
$tables[] = $table;
|
||||
}
|
||||
return $tables;
|
||||
@ -252,7 +252,7 @@ class PMA_Export_Relation_Schema
|
||||
*
|
||||
* @param integer $pageNumber ID of the chosen page
|
||||
* @param string $type Schema Type
|
||||
* @param string $error_message The error mesage
|
||||
* @param string $error_message The error message
|
||||
*
|
||||
* @access public
|
||||
*
|
||||
|
||||
@ -102,7 +102,7 @@ class SchemaDia extends SchemaPlugin
|
||||
|
||||
|
||||
/**
|
||||
* Exports the shcema into DIA format.
|
||||
* Exports the schema into DIA format.
|
||||
*
|
||||
* @param string $db database name
|
||||
*
|
||||
|
||||
@ -87,7 +87,7 @@ class SchemaEps extends SchemaPlugin
|
||||
}
|
||||
|
||||
/**
|
||||
* Exports the shcema into EPS format.
|
||||
* Exports the schema into EPS format.
|
||||
*
|
||||
* @param string $db database name
|
||||
*
|
||||
|
||||
@ -117,7 +117,7 @@ class SchemaPdf extends SchemaPlugin
|
||||
}
|
||||
|
||||
/**
|
||||
* Exports the shcema into PDF format.
|
||||
* Exports the schema into PDF format.
|
||||
*
|
||||
* @param string $db database name
|
||||
*
|
||||
|
||||
@ -75,7 +75,7 @@ class SchemaSvg extends SchemaPlugin
|
||||
}
|
||||
|
||||
/**
|
||||
* Exports the shcema into SVG format.
|
||||
* Exports the schema into SVG format.
|
||||
*
|
||||
* @param string $db database name
|
||||
*
|
||||
|
||||
@ -346,7 +346,7 @@ class PMA_Dia_Relation_Schema extends PMA_Export_Relation_Schema
|
||||
* Draws relation references
|
||||
*
|
||||
* connects master table's master field to
|
||||
* foreign table's forein field using Dia object
|
||||
* foreign table's foreign field using Dia object
|
||||
* type Database - Reference
|
||||
*
|
||||
* @return void
|
||||
|
||||
@ -90,10 +90,10 @@ class Relation_Stats_Dia
|
||||
* Draws relation references
|
||||
*
|
||||
* connects master table's master field to foreign table's
|
||||
* forein field using Dia object type Database - Reference
|
||||
* foreign field using Dia object type Database - Reference
|
||||
* Dia object is used to generate the XML of Dia Document.
|
||||
* Database reference Object and their attributes are involved
|
||||
* in the combination of displaing Database - reference on Dia Document.
|
||||
* in the combination of displaying Database - reference on Dia Document.
|
||||
*
|
||||
* @param boolean $showColor Whether to use one color per relation or not
|
||||
* if showColor is true then an array of $listOfColors will be used to choose
|
||||
|
||||
@ -480,7 +480,7 @@ class PMA_Eps_Relation_Schema extends PMA_Export_Relation_Schema
|
||||
|
||||
/**
|
||||
* Draws relation arrows and lines connects master table's master field to
|
||||
* foreign table's forein field
|
||||
* foreign table's foreign field
|
||||
*
|
||||
* @return void
|
||||
*
|
||||
|
||||
@ -121,7 +121,7 @@ class Table_Stats_Eps extends TableStats
|
||||
$this->width += PMA_Font::getStringWidth(' ', $font, $fontSize);
|
||||
/*
|
||||
* it is unknown what value must be added, because
|
||||
* table title is affected by the tabe width value
|
||||
* table title is affected by the table width value
|
||||
*/
|
||||
while ($this->width
|
||||
< PMA_Font::getStringWidth($this->getTitle(), $font, $fontSize)) {
|
||||
|
||||
@ -824,7 +824,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema
|
||||
}
|
||||
|
||||
/**
|
||||
* Ouputs the PDF document to a file
|
||||
* Outputs the PDF document to a file
|
||||
* or sends the output to browser
|
||||
*
|
||||
* @param integer $pageNumber page number
|
||||
@ -940,7 +940,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets table informations
|
||||
* Gets table information
|
||||
*/
|
||||
$showtable = PMA_Table::sGetStatusInfo($GLOBALS['db'], $table);
|
||||
$show_comment = isset($showtable['Comment'])
|
||||
@ -981,7 +981,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema
|
||||
$primary .= $row['Column_name'] . ', ';
|
||||
$pk_array[$row['Column_name']] = 1;
|
||||
}
|
||||
// Retains keys informations
|
||||
// Retains keys information
|
||||
if ($row['Key_name'] != $lastIndex) {
|
||||
$indexes[] = $row['Key_name'];
|
||||
$lastIndex = $row['Key_name'];
|
||||
|
||||
@ -139,8 +139,8 @@ class Table_Stats_Pdf extends TableStats
|
||||
$pdf->SetFont($this->_ff, 'B', $fontSize);
|
||||
/*
|
||||
* it is unknown what value must be added, because
|
||||
* table title is affected by the tabe width value
|
||||
*/
|
||||
* table title is affected by the table width value
|
||||
*/
|
||||
while ($this->width < $pdf->GetStringWidth($this->getTitle())) {
|
||||
$this->width += 5;
|
||||
}
|
||||
|
||||
@ -13,11 +13,11 @@ if (! defined('PHPMYADMIN')) {
|
||||
* Renders the server selection in list or selectbox form, or option tags only
|
||||
*
|
||||
* @param boolean $not_only_options whether to include form tags or not
|
||||
* @param boolean $ommit_fieldset whether to omit fieldset tag or not
|
||||
* @param boolean $omit_fieldset whether to omit fieldset tag or not
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
function PMA_selectServer($not_only_options, $ommit_fieldset)
|
||||
function PMA_selectServer($not_only_options, $omit_fieldset)
|
||||
{
|
||||
$retval = '';
|
||||
|
||||
@ -34,7 +34,7 @@ function PMA_selectServer($not_only_options, $ommit_fieldset)
|
||||
. $GLOBALS['cfg']['DefaultTabServer'] . '" class="disableAjax">';
|
||||
$retval .= PMA_URL_getHiddenInputs();
|
||||
|
||||
if (! $ommit_fieldset) {
|
||||
if (! $omit_fieldset) {
|
||||
$retval .= '<fieldset>';
|
||||
}
|
||||
$retval .= '<label for="select_server">'
|
||||
@ -98,7 +98,7 @@ function PMA_selectServer($not_only_options, $ommit_fieldset)
|
||||
|
||||
if ($not_only_options) {
|
||||
$retval .= '</select>';
|
||||
if (! $ommit_fieldset) {
|
||||
if (! $omit_fieldset) {
|
||||
$retval .= '</fieldset>';
|
||||
}
|
||||
$retval .= '</form>';
|
||||
|
||||
@ -109,7 +109,7 @@ function PMA_formatPrivilege($privilege, $html)
|
||||
}
|
||||
|
||||
/**
|
||||
* Parses priliveges into an array, it modifies the array
|
||||
* Parses privileges into an array, it modifies the array
|
||||
*
|
||||
* @param array &$row Results row from
|
||||
*
|
||||
@ -268,7 +268,7 @@ function PMA_getTableGrantsArray()
|
||||
|
||||
/**
|
||||
* Get the grants array which contains all the privilege types
|
||||
* and relevent grant messages
|
||||
* and relevant grant messages
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
@ -612,8 +612,8 @@ function PMA_setUserGroup($username, $userGroup)
|
||||
* @param string $table the table
|
||||
* @param boolean $submit whether to display the submit button or not
|
||||
*
|
||||
* @global array $cfg the phpMyAdmin configuration
|
||||
* @global ressource $user_link the database connection
|
||||
* @global array $cfg the phpMyAdmin configuration
|
||||
* @global resource $user_link the database connection
|
||||
*
|
||||
* @return string html snippet
|
||||
*/
|
||||
@ -1282,7 +1282,7 @@ function PMA_getHtmlForGlobalPrivTableWithCheckboxes(
|
||||
* changing one? (allowed values: 'new', 'change')
|
||||
*
|
||||
* @global array $cfg the phpMyAdmin configuration
|
||||
* @global ressource $user_link the database connection
|
||||
* @global resource $user_link the database connection
|
||||
*
|
||||
* @return string $html_output a HTML snippet
|
||||
*/
|
||||
|
||||
@ -79,7 +79,7 @@ $header_cells = PMA_getHeaderCells(
|
||||
);
|
||||
|
||||
// workaround for field_fulltext, because its submitted indices contain
|
||||
// the index as a value, not a key. Inserted here for easier maintaineance
|
||||
// the index as a value, not a key. Inserted here for easier maintenance
|
||||
// and less code to change in existing files.
|
||||
if (isset($field_fulltext) && is_array($field_fulltext)) {
|
||||
foreach ($field_fulltext as $fulltext_nr => $fulltext_indexkey) {
|
||||
|
||||
@ -51,7 +51,7 @@ function PMA_GIS_modifyQuery($sql_query, $visualizationSettings)
|
||||
*
|
||||
* @param array $data Data for the status chart
|
||||
* @param array &$visualizationSettings Settings used to generate the chart
|
||||
* @param string $format Format of the visulaization
|
||||
* @param string $format Format of the visualization
|
||||
*
|
||||
* @return string|void HTML and JS code for the GIS visualization
|
||||
*/
|
||||
@ -88,7 +88,7 @@ function PMA_GIS_visualizationResults($data, &$visualizationSettings, $format)
|
||||
*
|
||||
* @param array $data data for the status chart
|
||||
* @param array $visualizationSettings settings used to generate the chart
|
||||
* @param string $format format of the visulaization
|
||||
* @param string $format format of the visualization
|
||||
* @param string $fileName file name
|
||||
*
|
||||
* @return file File containing the visualization
|
||||
@ -112,7 +112,7 @@ function PMA_GIS_saveToFile($data, $visualizationSettings, $format, $fileName)
|
||||
}
|
||||
|
||||
/**
|
||||
* Function to get html for the lebel column and spatial column
|
||||
* Function to get html for the label column and spatial column
|
||||
*
|
||||
* @param string $column the column type. i.e either "labelColumn"
|
||||
* or "spatialColumn"
|
||||
|
||||
@ -22,7 +22,7 @@ global $showtable, $tbl_is_view, $tbl_storage_engine, $show_comment, $tbl_collat
|
||||
$table_info_num_rows, $auto_increment;
|
||||
|
||||
/**
|
||||
* Gets table informations
|
||||
* Gets table information
|
||||
*/
|
||||
// Seems we need to do this in MySQL 5.0.2,
|
||||
// otherwise error #1046, no database selected
|
||||
|
||||
@ -60,7 +60,7 @@ function PMA_getColumnMap($sql_query, $view_columns)
|
||||
|
||||
|
||||
/**
|
||||
* Get existing data on tranformations applyed for
|
||||
* Get existing data on tranformations applied for
|
||||
* columns in a particular table
|
||||
*
|
||||
* @param string $db Database name looking for
|
||||
|
||||
@ -144,7 +144,7 @@ function PMA_getHtmlForDataDefinitionAndManipulationStatements($url_query,
|
||||
/**
|
||||
* Function to get html for activate/deactivate tracking
|
||||
*
|
||||
* @param string $action activate|deactivate
|
||||
* @param string $action activate|deactivate
|
||||
* @param string $url_query url query
|
||||
* @param int $last_version last version
|
||||
*
|
||||
@ -913,7 +913,7 @@ function PMA_getHtmlForField($field, $style)
|
||||
}
|
||||
|
||||
/**
|
||||
* Fuunction to get html for the indexes in schema snapshot
|
||||
* Function to get html for the indexes in schema snapshot
|
||||
*
|
||||
* @param array $indexes indexes
|
||||
*
|
||||
@ -952,7 +952,7 @@ function PMA_getHtmlForIndexes($indexes)
|
||||
}
|
||||
|
||||
/**
|
||||
* Funtion to get html for an index in schema snapshot
|
||||
* Function to get html for an index in schema snapshot
|
||||
*
|
||||
* @param array $index index
|
||||
* @param string $style style
|
||||
@ -1329,11 +1329,11 @@ function PMA_getEntries($data, $filter_ts_from, $filter_ts_to, $filter_users)
|
||||
}
|
||||
|
||||
/**
|
||||
* Function to get version status
|
||||
* Function to get version status
|
||||
*
|
||||
* @param array $version version info
|
||||
* @param array $version version info
|
||||
*
|
||||
* @return string $version_status The status message
|
||||
* @return string $version_status The status message
|
||||
*/
|
||||
function PMA_getVersionStatus($version)
|
||||
{
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
/**
|
||||
* Set of functions used with the relation and pdf feature
|
||||
*
|
||||
* This file also provides basic functions to use in other plungins!
|
||||
* This file also provides basic functions to use in other plugins!
|
||||
* These are declared in the 'GLOBAL Plugin functions' section
|
||||
*
|
||||
* Please use short and expressive names.
|
||||
|
||||
@ -108,6 +108,11 @@ class PMA_Gettext_Test extends PHPUnit_Framework_TestCase
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Data provider for testFind_string
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
public function providerForTestFind_string()
|
||||
{
|
||||
return array(
|
||||
@ -139,8 +144,11 @@ class PMA_Gettext_Test extends PHPUnit_Framework_TestCase
|
||||
|
||||
/**
|
||||
* Test for sanitize_plural_expression
|
||||
* @param $expr string
|
||||
* @param $output
|
||||
*
|
||||
* @param string $expr Expression to sanitize
|
||||
* @param string $output Expected output
|
||||
*
|
||||
* @return void
|
||||
*
|
||||
* @dataProvider providerForTestSanitize_plural_expression
|
||||
*/
|
||||
@ -152,6 +160,11 @@ class PMA_Gettext_Test extends PHPUnit_Framework_TestCase
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Data provider for testSanitize_plural_expression
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
public function providerForTestSanitize_plural_expression()
|
||||
{
|
||||
return array(
|
||||
@ -168,6 +181,8 @@ class PMA_Gettext_Test extends PHPUnit_Framework_TestCase
|
||||
|
||||
/**
|
||||
* Test for extract_plural_forms_header_from_po_header
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function testExtract_plural_forms_header_from_po_header()
|
||||
{
|
||||
|
||||
@ -9,6 +9,11 @@ require_once 'libraries/php-gettext/gettext.php';
|
||||
|
||||
class ParsingTest extends PHPUnit_Framework_TestCase
|
||||
{
|
||||
/**
|
||||
* Test for extract_plural_forms_header_from_po_header
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function test_extract_plural_forms_header_from_po_header()
|
||||
{
|
||||
$parser = new gettext_reader(null);
|
||||
@ -48,11 +53,18 @@ class ParsingTest extends PHPUnit_Framework_TestCase
|
||||
}
|
||||
|
||||
/**
|
||||
* Test for npgettext
|
||||
*
|
||||
* @param int $number Number
|
||||
* @param string $expected Expected output
|
||||
*
|
||||
* @return void
|
||||
*
|
||||
* @dataProvider data_provider_test_npgettext
|
||||
*/
|
||||
public function test_npgettext($number, $expected)
|
||||
{
|
||||
$parser = new gettext_reader(NULL);
|
||||
$parser = new gettext_reader(null);
|
||||
$result = $parser->npgettext(
|
||||
"context",
|
||||
"%d pig went to the market\n",
|
||||
@ -62,6 +74,11 @@ class ParsingTest extends PHPUnit_Framework_TestCase
|
||||
$this->assertSame($expected, $result);
|
||||
}
|
||||
|
||||
/**
|
||||
* Data provider for test_npgettext
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
public static function data_provider_test_npgettext()
|
||||
{
|
||||
return array(
|
||||
|
||||
Loading…
Reference in New Issue
Block a user