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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2013-11-29 19:17:05 +01:00
commit 2b6d6ffd3e
9 changed files with 61 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/Advisor.class.php
View File

@ -65,8 +65,8 @@ class Advisor
/**
* Stores current error in run results.
*
* @param string $description description of an error.
* @param object $exception exception raised
* @param string $description description of an error.
* @param Exception $exception exception raised
*
* @return void
*/

2
libraries/Index.class.php
View File

@ -508,7 +508,7 @@ class PMA_Index
/**
* Returns the columns of the index
*
* @return array the columns of the index
* @return PMA_Index_Column[] the columns of the index
*/
public function getColumns()
{

14
libraries/operations.lib.php
View File

@ -373,10 +373,10 @@ function PMA_getSqlQueryAndCreateDbBeforeCopy()
* remove all foreign key constraints and return
* sql constraints query for full database
*
* @param array $tables_full array of all tables in given db or dbs
* @param object $export_sql_plugin export plugin instance
* @param boolean $move whether database name is empty or not
* @param string $db database name
* @param array $tables_full array of all tables in given db or dbs
* @param ExportSql $export_sql_plugin export plugin instance
* @param boolean $move whether database name is empty or not
* @param string $db database name
*
* @return string sql constraints query for full databases
*/
@ -406,9 +406,9 @@ function PMA_getSqlConstraintsQueryForFullDb(
/**
* Get views as an array and create SQL view stand-in
*
* @param array $tables_full array of all tables in given db or dbs
* @param object $export_sql_plugin export plugin instance
* @param string $db database name
* @param array $tables_full array of all tables in given db or dbs
* @param ExportSql $export_sql_plugin export plugin instance
* @param string $db database name
*
* @return array $views
*/

10
libraries/server_status.lib.php
View File

@ -15,7 +15,7 @@ if (! defined('PHPMYADMIN')) {
/**
* Prints server status information: processes, connections and traffic
*
* @param Object $ServerStatusData An instance of the PMA_ServerStatusData class
* @param PMA_ServerStatusData $ServerStatusData Server status data
*
* @return string
*/
@ -39,7 +39,7 @@ function PMA_getHtmlForServerStatus($ServerStatusData)
/**
* Prints server state General information
*
* @param Object $ServerStatusData An instance of the PMA_ServerStatusData class
* @param PMA_ServerStatusData $ServerStatusData Server status data
*
* @return string
*/
@ -115,7 +115,7 @@ function PMA_getHtmlForServerStateGeneralInfo($ServerStatusData)
/**
* Prints server state traffic information
*
* @param Object $ServerStatusData An instance of the PMA_ServerStatusData class
* @param PMA_ServerStatusData $ServerStatusData Server status data
*
* @return string
*/
@ -207,7 +207,7 @@ function PMA_getHtmlForServerStateTraffic($ServerStatusData)
/**
* Prints server state connections information
*
* @param Object $ServerStatusData An instance of the PMA_ServerStatusData class
* @param PMA_ServerStatusData $ServerStatusData Server status data
*
* @return string
*/
@ -312,7 +312,7 @@ function PMA_getHtmlForServerStateConnections($ServerStatusData)
/**
* Prints Server Process list
*
* @param Object $ServerStatusData An instance of the PMA_ServerStatusData class
* @param PMA_ServerStatusData $ServerStatusData Server status data
*
* @return string
*/

4
libraries/server_status_monitor.lib.php
View File

@ -15,7 +15,7 @@ if (! defined('PHPMYADMIN')) {
/**
* Prints html with monitor
*
* @param object $ServerStatusData An instance of the PMA_ServerStatusData class
* @param PMA_ServerStatusData $ServerStatusData Server status data
*
* @return string
*/
@ -381,7 +381,7 @@ function PMA_getHtmlForSettingsDialog()
/**
* Define some data and links needed on the client side
*
* @param object $ServerStatusData An instance of the PMA_ServerStatusData class
* @param PMA_ServerStatusData $ServerStatusData Server status data
*
* @return string
*/

4
libraries/server_status_queries.lib.php
View File

@ -15,7 +15,7 @@ if (! defined('PHPMYADMIN')) {
/**
* Returns the html content for the query statistics
*
* @param object $ServerStatusData An instance of the PMA_ServerStatusData class
* @param PMA_ServerStatusData $ServerStatusData Server status data
*
* @return string
*/
@ -68,7 +68,7 @@ function PMA_getHtmlForQueryStatistics($ServerStatusData)
/**
* Returns the html content for the query details
*
* @param object $ServerStatusData An instance of the PMA_ServerStatusData class
* @param PMA_ServerStatusData $ServerStatusData Server status data
*
* @return string
*/

12
libraries/server_status_variables.lib.php
View File

@ -15,7 +15,7 @@ if (! defined('PHPMYADMIN')) {
/**
* Returns the html for the list filter
*
* @param Object $ServerStatusData An instance of the PMA_ServerStatusData class
* @param PMA_ServerStatusData $ServerStatusData Server status data
*
* @return string
*/
@ -87,7 +87,7 @@ function PMA_getHtmlForFilter($ServerStatusData)
/**
* Prints the suggestion links
*
* @param Object $ServerStatusData An instance of the PMA_ServerStatusData class
* @param PMA_ServerStatusData $ServerStatusData Server status data
*
* @return string
*/
@ -122,7 +122,7 @@ function PMA_getHtmlForLinkSuggestions($ServerStatusData)
/**
* Returns a table with variables information
*
* @param Object $ServerStatusData An instance of the PMA_ServerStatusData class
* @param PMA_ServerStatusData $ServerStatusData Server status data
*
* @return string
*/
@ -202,9 +202,9 @@ function PMA_getHtmlForVariablesList($ServerStatusData)
/**
* Returns HTML for render variables list
*
* @param Object $ServerStatusData An instance of the PMA_ServerStatusData class
* @param Array $alerts Alert Array
* @param Array $strShowStatus Status Array
* @param PMA_ServerStatusData $ServerStatusData Server status data
* @param Array $alerts Alert Array
* @param Array $strShowStatus Status Array
*
* @return string
*/

43
libraries/sqlvalidator.class.php
View File

@ -62,6 +62,9 @@ if (!$GLOBALS['sqlvalidator_error']) {
var $connection_technology_version;
var $interactive;
/**
* @var SOAPClient
*/
var $service_link = null;
var $session_data = null;
@ -75,7 +78,7 @@ if (!$GLOBALS['sqlvalidator_error']) {
*
* @param string $url URL of Mimer SQL Validator WSDL file
*
* @return object Object to use
* @return SOAPClient Object to use
*
* @access private
*/
@ -93,17 +96,17 @@ if (!$GLOBALS['sqlvalidator_error']) {
/**
* Service initializer to connect to server
*
* @param object $obj Service object
* @param string $username Username
* @param string $password Password
* @param string $calling_program Name of calling program
* @param string $calling_program_version Version of calling program
* @param string $target_dbms Target DBMS
* @param string $target_dbms_version Version of target DBMS
* @param string $connection_technology Connection Technology
* @param string $connection_technology_version Con. Technology version
* @param integer $interactive boolean 1/0 to specify if
* we are an interactive system
* @param SOAPClient $obj Service object
* @param string $username Username
* @param string $password Password
* @param string $calling_program Name of calling program
* @param string $calling_program_version Version of calling program
* @param string $target_dbms Target DBMS
* @param string $target_dbms_version Version of target DBMS
* @param string $con_technology Connection Technology
* @param string $con_technology_version Con. Technology version
* @param integer $interactive boolean 1/0 to specify if
* we are an interactive system
*
* @return object stdClass return object with data
*
@ -111,7 +114,7 @@ if (!$GLOBALS['sqlvalidator_error']) {
*/
function _openSession($obj, $username, $password, $calling_program,
$calling_program_version, $target_dbms, $target_dbms_version,
$connection_technology, $connection_technology_version, $interactive
$con_technology, $con_technology_version, $interactive
) {
$use_array = array(
"a_userName" => $username,
@ -120,8 +123,8 @@ if (!$GLOBALS['sqlvalidator_error']) {
"a_callingProgramVersion" => $calling_program_version,
"a_targetDbms" => $target_dbms,
"a_targetDbmsVersion" => $target_dbms_version,
"a_connectionTechnology" => $connection_technology,
"a_connectionTechnologyVersion" => $connection_technology_version,
"a_connectionTechnology" => $con_technology,
"a_connectionTechnologyVersion" => $con_technology_version,
"a_interactive" => $interactive,
);
@ -138,12 +141,12 @@ if (!$GLOBALS['sqlvalidator_error']) {
/**
* Validator sytem call
*
* @param object $obj Service object
* @param object $session Session object
* @param string $sql SQL Query to validate
* @param string $method Data return type
* @param SOAPClient $obj Service object
* @param object $session Session object
* @param string $sql SQL Query to validate
* @param string $method Data return type
*
* @return object stClass return with data
* @return object stClass return with data
*
* @access private
*/

25
libraries/tbl_indexes.lib.php
View File

@ -38,9 +38,9 @@ function PMA_getNameAndTypeOfTheColumns($db, $table)
/**
* Function to handle the creation or edit of an index
*
* @param string $db current db
* @param string $table current table
* @param Object $index current index
* @param string $db current db
* @param string $table current table
* @param PMA_Index $index current index
*
* @return void
*/
@ -81,10 +81,10 @@ function PMA_handleCreateOrEditIndex($db, $table, $index)
/**
* Function to get the sql query for index creation or edit
*
* @param string $db current db
* @param string $table current table
* @param Object $index current index
* @param bool &$error whether error occoured or not
* @param string $db current db
* @param string $table current table
* @param PMA_Index $index current index
* @param bool &$error whether error occoured or not
*
* @return string
*/
@ -179,7 +179,7 @@ function PMA_prepareFormValues($db, $table)
/**
* Function to get the number of fields for the form
*
* @param Object $index index
* @param PMA_Index $index index
*
* @return int
*/
@ -231,10 +231,10 @@ function PMA_getFormParameters($db, $table)
/**
* Function to get html for displaying the index form
*
* @param array $fields fields
* @param Object $index index
* @param array $form_params form parameters
* @param int $add_fields number of fields in the form
* @param array $fields fields
* @param PMA_Index $index index
* @param array $form_params form parameters
* @param int $add_fields number of fields in the form
*
* @return string
*/
@ -324,6 +324,7 @@ function PMA_getHtmlForIndexForm($fields, $index, $form_params, $add_fields)
'multilinestring', 'multipolygon', 'geomtrycollection'
);
$html .= '<tbody>';
/* @var $column PMA_Index_Column */
foreach ($index->getColumns() as $column) {
$html .= '<tr class="';
$html .= $odd_row ? 'odd' : 'even';