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

Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin

Browse Source
This commit is contained in:
Thilanka Kaushalya 2011-07-21 10:01:58 +05:30
commit 788fb45a1d
120 changed files with 6050 additions and 2369 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitignore vendored
View File

@ -20,6 +20,7 @@ phpmyadmin.wpj
.buildpath
.cache
.idea
.netbeans
*.sw[op]
# Locales
/locale/
@ -31,3 +32,8 @@ phpmyadmin.wpj
/apidoc/
# Demo server
revision-info.php
# PHPUnit
phpunit.xml
/test/bootstrap.php
# Jenkins
/build/

1
ChangeLog
View File

@ -52,6 +52,7 @@ phpMyAdmin - ChangeLog
- remove version number in /setup
- bug #3367993 [usability] Missing "Generate Password" button
- bug #3363221 [display] Missing Server Parameter on inline sql query
- bug #3367986 [navi] Drop field -> lost active table
3.4.3.1 (2011-07-02)
- [security] Fixed possible session manipulation in swekey authentication, see PMASA-2011-5

2
bs_disp_as_mime_type.php
View File

@ -13,7 +13,7 @@ require_once './libraries/common.inc.php';
PMA_checkParameters(array('reference', 'c_type'));
// Increase time limit, because fetching blob might take some time
set_time_limit(0);
@set_time_limit(0);
$reference = $_REQUEST['reference'];
/*

87
build.xml Normal file
View File

@ -0,0 +1,87 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="phpMyAdmin" default="build" basedir=".">
<property name="source" value="."/>
<property name="source_comma_sep" value="."/>
<target name="clean" description="Clean up and create artifact directories">
<delete dir="${basedir}/build/api"/>
<delete dir="${basedir}/build/code-browser"/>
<delete dir="${basedir}/build/coverage"/>
<delete dir="${basedir}/build/logs"/>
<delete dir="${basedir}/build/pdepend"/>
<mkdir dir="${basedir}/build/api"/>
<mkdir dir="${basedir}/build/code-browser"/>
<mkdir dir="${basedir}/build/coverage"/>
<mkdir dir="${basedir}/build/logs"/>
<mkdir dir="${basedir}/build/pdepend"/>
</target>
<target name="phpunit" description="Run unit tests using PHPUnit and generates junit.xml and clover.xml">
<exec executable="phpunit">
<arg line="--configuration phpunit.xml.dist"/>
</exec>
</target>
<target name="pdepend" description="Generate jdepend.xml and software metrics charts using PHP_Depend">
<exec executable="pdepend">
<arg line="--jdepend-xml=${basedir}/build/logs/jdepend.xml
--jdepend-chart=${basedir}/build/pdepend/dependencies.svg
--overview-pyramid=${basedir}/build/pdepend/overview-pyramid.svg
${source_comma_sep}" />
</exec>
</target>
<target name="phpmd" description="Generate pmd.xml using PHPMD">
<exec executable="phpmd">
<arg line="${source_comma_sep}
xml
codesize,design,naming,unusedcode
--reportfile ${basedir}/build/logs/pmd.xml" />
</exec>
</target>
<target name="phpcpd" description="Generate pmd-cpd.xml using PHPCPD">
<exec executable="phpcpd">
<arg line="--log-pmd ${basedir}/build/logs/pmd-cpd.xml
--exclude test
--exclude libraries/PHPExcel
--exclude libraries/tcpdf
${source}" />
</exec>
</target>
<target name="phploc" description="Generate phploc.csv">
<exec executable="phploc">
<arg line="--log-csv ${basedir}/build/logs/phploc.csv ${source}" />
</exec>
</target>
<target name="phpcs" description="Generate checkstyle.xml using PHP_CodeSniffer excluding test, PHPExcel, tcpdf directories">
<exec executable="phpcs">
<arg line="-v
--ignore=*/PHPExcel/*,*/php-gettext/*,*/tcpdf/*
--report=checkstyle
--report-file=${basedir}/build/logs/checkstyle.xml
--standard=PEAR
${source}" />
</exec>
</target>
<target name="phpdoc" description="Generate API documentation using PHPDocumentor">
<exec executable="phpdoc">
<arg line="-d ${source} -t ${basedir}/build/api" />
</exec>
</target>
<target name="phpcb" description="Aggregate tool output with PHP_CodeBrowser">
<exec executable="phpcb">
<arg line="--log ${basedir}/build/logs
--source ${source}
--output ${basedir}/build/code-browser" />
</exec>
</target>
<target name="build" depends="clean,phpunit,pdepend,phpmd,phpcpd,phpcs,phpdoc,phploc,phpcb"/>
</project>

2
db_events.php
View File

@ -19,6 +19,8 @@ $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js';
$GLOBALS['js_include'][] = 'jquery/timepicker.js';
$GLOBALS['js_include'][] = 'rte/common.js';
$GLOBALS['js_include'][] = 'rte/events.js';
$GLOBALS['js_include'][] = 'codemirror/lib/codemirror.js';
$GLOBALS['js_include'][] = 'codemirror/mode/mysql/mysql.js';
/**
* Include all other files

2
db_routines.php
View File

@ -21,6 +21,8 @@ $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js';
$GLOBALS['js_include'][] = 'jquery/timepicker.js';
$GLOBALS['js_include'][] = 'rte/common.js';
$GLOBALS['js_include'][] = 'rte/routines.js';
$GLOBALS['js_include'][] = 'codemirror/lib/codemirror.js';
$GLOBALS['js_include'][] = 'codemirror/mode/mysql/mysql.js';
/**
* Include all other files

2
db_sql.php
View File

@ -16,6 +16,8 @@ require_once './libraries/common.inc.php';
$GLOBALS['js_include'][] = 'functions.js';
$GLOBALS['js_include'][] = 'makegrid.js';
$GLOBALS['js_include'][] = 'sql.js';
$GLOBALS['js_include'][] = 'codemirror/lib/codemirror.js';
$GLOBALS['js_include'][] = 'codemirror/mode/mysql/mysql.js';
require './libraries/db_common.inc.php';
require_once './libraries/sql_query_form.lib.php';

2
db_triggers.php
View File

@ -18,6 +18,8 @@ require_once './libraries/common.lib.php';
$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js';
$GLOBALS['js_include'][] = 'rte/common.js';
$GLOBALS['js_include'][] = 'rte/triggers.js';
$GLOBALS['js_include'][] = 'codemirror/lib/codemirror.js';
$GLOBALS['js_include'][] = 'codemirror/mode/mysql/mysql.js';
/**
* Include all other files

4
js/messages.php
View File

@ -19,6 +19,8 @@ header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 3600) . ' GMT');
// non-js-compatible stuff like DOCTYPE
define('PMA_MINIMUM_COMMON', true);
require_once './libraries/common.inc.php';
// Close session early as we won't write anything there
session_write_close();
// But this one is needed for PMA_escapeJsString()
require_once './libraries/js_escape.lib.php';
@ -126,7 +128,7 @@ $js_messages['strEnableVar'] = __('Enable %s');
$js_messages['strDisableVar'] = __('Disable %s');
/* l10n: %d seconds */
$js_messages['setSetLongQueryTime'] = __('Set long_query_time to %ds');
$js_messages['strNoSuperUser'] = __('You don\'t have super user rights to change this variables. Please log in as root account or contact your database administrator.');
$js_messages['strNoSuperUser'] = __('You can\'t change these variables. Please log in as root or contact your database administrator.');
$js_messages['strChangeSettings'] = __('Change settings');
$js_messages['strCurrentSettings'] = __('Current settings');

18
js/sql.js
View File

@ -162,24 +162,6 @@ $(document).ready(function() {
$('#table_results').makegrid();
})
/**
* Attach the {@link refreshgrid} function to a custom event, which will be
* triggered manually everytime the table of results is manipulated (e.g., by inline edit)
* @memberOf jQuery
*/
$("#sqlqueryresults").live('refreshgrid', function() {
$('#table_results').refreshgrid();
})
/**
* Attach the {@link makegrid} function to a custom event, which will be
* triggered manually everytime the table of results is reloaded
* @memberOf jQuery
*/
$("#sqlqueryresults").live('makegrid', function() {
$('#table_results').makegrid();
})
/**
* Attach the {@link refreshgrid} function to a custom event, which will be
* triggered manually everytime the table of results is manipulated (e.g., by inline edit)

8
libraries/File.class.php
View File

@ -73,7 +73,7 @@ class PMA_File
/**
* @staticvar string most recent BLOB repository reference
*/
static $_recent_bs_reference = NULL;
static $_recent_bs_reference = null;
/**
* constructor
@ -254,7 +254,7 @@ class PMA_File
$tmp_file_type = $file['type'];
if (! $tmp_file_type) {
$tmp_file_type = NULL;
$tmp_file_type = null;
}
if (! $bs_db || ! $bs_table) {
@ -384,7 +384,7 @@ class PMA_File
}
if (! $tmp_file_type) {
$tmp_file_type = NULL;
$tmp_file_type = null;
}
if (! $bs_db || !$bs_table) {
@ -828,7 +828,7 @@ class PMA_File
static function getRecentBLOBReference()
{
$ref = PMA_File::$_recent_bs_reference;
PMA_File::$_recent_bs_reference = NULL;
PMA_File::$_recent_bs_reference = null;
return $ref;
}

2
libraries/Table.class.php
View File

@ -1370,7 +1370,7 @@ class PMA_Table
* @param string $table_create_time Needed for PROP_COLUMN_ORDER and PROP_COLUMN_VISIB
* @return boolean|PMA_Message
*/
public function setUiProp($property, $value, $table_create_time = NULL)
public function setUiProp($property, $value, $table_create_time = null)
{
if (! isset($this->uiprefs)) {
$this->loadUiPrefs();

2
libraries/blobstreaming.lib.php
View File

@ -179,7 +179,7 @@ function checkBLOBStreamingPlugins()
$PMA_Config->set('FILEINFO_EXISTS', false);
// check if PECL's fileinfo library exist
$finfo = NULL;
$finfo = null;
if (function_exists("finfo_open")) {
$finfo = finfo_open(FILEINFO_MIME);

4
libraries/common.lib.php
View File

@ -2841,7 +2841,9 @@ function PMA_ajaxResponse($message, $success = true, $extra_data = array())
header("Content-Type: application/json");
echo json_encode($response);
exit;
if(!defined('TESTSUITE'))
exit;
}
/**

6
libraries/core.lib.php
View File

@ -224,8 +224,10 @@ function PMA_fatalError($error_message, $message_args = null)
}
require('./libraries/error.inc.php');
exit;
if (!defined('TESTSUITE')) {
exit;
}
}
/**

2
libraries/database_interface.lib.php
View File

@ -472,7 +472,7 @@ function PMA_DBI_get_tables_full($database, $table = false, $tbl_is_group = fals
$each_tables[$table_name]['TABLE_COMMENT'] =& $each_tables[$table_name]['Comment'];
if (strtoupper($each_tables[$table_name]['Comment']) === 'VIEW'
&& $each_tables[$table_name]['Engine'] == NULL) {
&& $each_tables[$table_name]['Engine'] == null) {
$each_tables[$table_name]['TABLE_TYPE'] = 'VIEW';
} else {
/**

5
libraries/header.inc.php
View File

@ -138,10 +138,9 @@ if (isset($GLOBALS['is_ajax_request']) && !$GLOBALS['is_ajax_request']) {
htmlspecialchars($GLOBALS['db']),
__('Database'),
's_db.png');
// if the table is being dropped, $_REQUEST['purge'] is set
// (it always contains "1")
// if the table is being dropped, $_REQUEST['purge'] is set to '1'
// so do not display the table name in upper div
if (strlen($GLOBALS['table']) && ! (isset($_REQUEST['purge']))) {
if (strlen($GLOBALS['table']) && ! (isset($_REQUEST['purge']) && $_REQUEST['purge'] == '1')) {
require_once './libraries/tbl_info.inc.php';
echo $separator;

7
libraries/header_meta_style.inc.php
View File

@ -48,11 +48,4 @@ if ($GLOBALS['text_dir'] == 'ltr') {
<link rel="stylesheet" type="text/css" href="<?php echo defined('PMA_PATH_TO_BASEDIR') ? PMA_PATH_TO_BASEDIR : ''; ?>phpmyadmin.css.php<?php echo PMA_generate_common_url(array('server' => $GLOBALS['server'])); ?>&amp;js_frame=<?php echo isset($print_view) ? 'print' : 'right'; ?>&amp;nocache=<?php echo $GLOBALS['PMA_Config']->getThemeUniqueValue(); ?>" />
<link rel="stylesheet" type="text/css" href="<?php echo defined('PMA_PATH_TO_BASEDIR') ? PMA_PATH_TO_BASEDIR : ''; ?>print.css" media="print" />
<link rel="stylesheet" type="text/css" href="<?php echo $GLOBALS['pmaThemePath']; ?>/jquery/jquery-ui-1.8.custom.css" />
<?php
if (is_readable($GLOBALS['pmaThemePath'] . '/jquery/jquery-ui-1.8.override.css')) {
?>
<link rel="stylesheet" type="text/css" href="<?php echo $GLOBALS['pmaThemePath']; ?>/jquery/jquery-ui-1.8.override.css" />
<?php
}
?>
<meta name="robots" content="noindex,nofollow" />

2
libraries/header_scripts.inc.php
View File

@ -39,8 +39,6 @@ if (isset($GLOBALS['db'])) {
$params['db'] = $GLOBALS['db'];
}
$GLOBALS['js_include'][] = 'messages.php' . PMA_generate_common_url($params);
$GLOBALS['js_include'][] = 'codemirror/lib/codemirror.js';
$GLOBALS['js_include'][] = 'codemirror/mode/mysql/mysql.js';
/**
* Here we add a timestamp when loading the file, so that users who

50
libraries/import.lib.php
View File

@ -44,7 +44,7 @@ function PMA_checkTimeout()
/**
* Detects what compression filse uses
*
* @param string filename to check
* @param string $filepath filename to check
* @return string MIME type of compression, none for none
* @access public
*/
@ -73,9 +73,9 @@ function PMA_detectCompression($filepath)
* Runs query inside import buffer. This is needed to allow displaying
* of last SELECT, SHOW or HANDLER results and similar nice stuff.
*
* @param string query to run
* @param string query to display, this might be commented
* @param bool whether to use control user for queries
* @param string $sql query to run
* @param string $full query to display, this might be commented
* @param bool $controluser whether to use control user for queries
* @access public
*/
function PMA_importRunQuery($sql = '', $full = '', $controluser = false)
@ -207,17 +207,17 @@ function PMA_importRunQuery($sql = '', $full = '', $controluser = false)
/**
* Looks for the presence of USE to possibly change current db
*
* @param string buffer to examine
* @param string current db
* @param boolean reload
* @param string $buffer buffer to examine
* @param string $db current db
* @param bool $reload reload
* @return array (current or new db, whether to reload)
* @access public
*/
function PMA_lookForUse($buffer, $db, $reload)
{
if (preg_match('@^[\s]*USE[[:space:]]*([\S]+)@i', $buffer, $match)) {
if (preg_match('@^[\s]*USE[[:space:]]+([\S]+)@i', $buffer, $match)) {
$db = trim($match[1]);
$db = trim($db,';'); // for example, USE abc;
$db = trim($db, ';'); // for example, USE abc;
$reload = true;
}
return(array($db, $reload));
@ -227,8 +227,7 @@ function PMA_lookForUse($buffer, $db, $reload)
/**
* Returns next part of imported file/buffer
*
* @param integer size of buffer to read (this is maximal size
* function will return)
* @param int $size size of buffer to read (this is maximal size function will return)
* @return string part of file/buffer
* @access public
*/
@ -436,7 +435,6 @@ define("SIZES", 1);
/**
* Obtains the precision (total # of digits) from a size of type decimal
*
*
* @access public
*
* @param string $last_cumulative_size
@ -449,7 +447,6 @@ function PMA_getM($last_cumulative_size) {
/**
* Obtains the scale (# of digits to the right of the decimal point) from a size of type decimal
*
*
* @access public
*
* @param string $last_cumulative_size
@ -462,7 +459,6 @@ function PMA_getD($last_cumulative_size) {
/**
* Obtains the decimal size of a given cell
*
*
* @access public
*
* @param string &$cell
@ -482,7 +478,6 @@ function PMA_getDecimalSize(&$cell) {
/**
* Obtains the size of the given cell
*
*
* @todo Handle the error cases more elegantly
*
* @access public
@ -696,7 +691,6 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type
/**
* Determines what MySQL type a cell is
*
*
* @access public
*
* @param int $last_cumulative_type Last cumulative column type (VARCHAR or INT or BIGINT or DECIMAL or NONE)
@ -710,7 +704,7 @@ function PMA_detectType($last_cumulative_type, &$cell) {
*/
if (! strcmp('NULL', $cell)) {
if ($last_cumulative_type === NULL || $last_cumulative_type == NONE) {
if ($last_cumulative_type === null || $last_cumulative_type == NONE) {
return NONE;
} else {
return $last_cumulative_type;
@ -733,7 +727,6 @@ function PMA_detectType($last_cumulative_type, &$cell) {
/**
* Determines if the column types are int, decimal, or string
*
*
* @link http://wiki.phpmyadmin.net/pma/Import
*
* @todo Handle the error case more elegantly
@ -823,25 +816,24 @@ function PMA_analyzeTable(&$table) {
}
/* Needed to quell the beast that is PMA_Message */
$import_notice = NULL;
$import_notice = null;
/**
* Builds and executes SQL statements to create the database and tables
* as necessary, as well as insert all the data.
*
*
* @link http://wiki.phpmyadmin.net/pma/Import
*
* @access public
*
* @param string $db_name Name of the database
* @param array &$tables Array of tables for the specified database
* @param array &$analyses = NULL Analyses of the tables
* @param array &$additional_sql = NULL Additional SQL statements to be executed
* @param array $options = NULL Associative array of options
* @param string $db_name Name of the database
* @param array &$tables Array of tables for the specified database
* @param array &$analyses Analyses of the tables
* @param array &$additional_sql Additional SQL statements to be executed
* @param array $options Associative array of options
* @return void
*/
function PMA_buildSQL($db_name, &$tables, &$analyses = NULL, &$additional_sql = NULL, $options = NULL) {
function PMA_buildSQL($db_name, &$tables, &$analyses = null, &$additional_sql = null, $options = null) {
/* Take care of the options */
if (isset($options['db_collation'])&& ! is_null($options['db_collation'])) {
$collation = $options['db_collation'];
@ -884,7 +876,7 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = NULL, &$additional_sql =
unset($sql);
/* Run the $additional_sql statements supplied by the caller plug-in */
if ($additional_sql != NULL) {
if ($additional_sql != null) {
/* Clean the SQL first */
$additional_sql_len = count($additional_sql);
@ -910,7 +902,7 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = NULL, &$additional_sql =
}
}
if ($analyses != NULL) {
if ($analyses != null) {
$type_array = array(NONE => "NULL", VARCHAR => "varchar", INT => "int", DECIMAL => "decimal", BIGINT => "bigint");
/* TODO: Do more checking here to make sure they really are matched */
@ -975,7 +967,7 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = NULL, &$additional_sql =
$tempSQLStr .= "(";
for ($k = 0; $k < $num_cols; ++$k) {
if ($analyses != NULL) {
if ($analyses != null) {
$is_varchar = ($analyses[$i][TYPES][$col_count] === VARCHAR);
} else {
$is_varchar = !is_numeric($tables[$i][ROWS][$j][$k]);

6
libraries/import/csv.php
View File

@ -258,7 +258,7 @@ while (!($finished && $i >= $len) && !$error && !$timeout_passed) {
// Need to strip trailing enclosing char?
if ($need_end && $ch == $csv_enclosed) {
if ($finished && $i == $len - 1) {
$ch = NULL;
$ch = null;
} elseif ($i == $len - 1) {
$i = $fallbacki;
$ch = $buffer[$i];
@ -417,11 +417,11 @@ if ($analyze) {
$options = array('create_db' => false);
} else {
$db_name = 'CSV_DB';
$options = NULL;
$options = null;
}
/* Non-applicable parameters */
$create = NULL;
$create = null;
/* Created and execute necessary SQL statements from data */
PMA_buildSQL($db_name, $tables, $analyses, $create, $options);

8
libraries/import/ods.php
View File

@ -35,8 +35,8 @@ if (isset($plugin_list)) {
return;
}
ini_set('memory_limit', '128M');
set_time_limit(120);
@ini_set('memory_limit', '128M');
@set_time_limit(120);
$i = 0;
$len = 0;
@ -275,11 +275,11 @@ if (strlen($db)) {
$options = array('create_db' => false);
} else {
$db_name = 'ODS_DB';
$options = NULL;
$options = null;
}
/* Non-applicable parameters */
$create = NULL;
$create = null;
/* Created and execute necessary SQL statements from data */
PMA_buildSQL($db_name, $tables, $analyses, $create, $options);

8
libraries/import/xls.php
View File

@ -31,8 +31,8 @@ if (isset($plugin_list)) {
return;
}
ini_set('memory_limit', '256M');
set_time_limit(120);
@ini_set('memory_limit', '256M');
@set_time_limit(120);
/* Append the PHPExcel directory to the include path variable */
set_include_path(get_include_path() . PATH_SEPARATOR . getcwd() . '/libraries/PHPExcel/');
@ -130,11 +130,11 @@ if (strlen($db)) {
$options = array('create_db' => false);
} else {
$db_name = 'XLS_DB';
$options = NULL;
$options = null;
}
/* Non-applicable parameters */
$create = NULL;
$create = null;
/* Created and execute necessary SQL statements from data */
PMA_buildSQL($db_name, $tables, $analyses, $create, $options);

8
libraries/import/xlsx.php
View File

@ -31,8 +31,8 @@ if (isset($plugin_list)) {
return;
}
ini_set('memory_limit', '256M');
set_time_limit(120);
@ini_set('memory_limit', '256M');
@set_time_limit(120);
/* Append the PHPExcel directory to the include path variable */
set_include_path(get_include_path() . PATH_SEPARATOR . getcwd() . '/libraries/PHPExcel/');
@ -130,11 +130,11 @@ if (strlen($db)) {
$options = array('create_db' => false);
} else {
$db_name = 'XLSX_DB';
$options = NULL;
$options = null;
}
/* Non-applicable parameters */
$create = NULL;
$create = null;
/* Created and execute necessary SQL statements from data */
PMA_buildSQL($db_name, $tables, $analyses, $create, $options);

16
libraries/import/xml.php
View File

@ -28,8 +28,8 @@ if (isset($plugin_list)) {
return;
}
ini_set('memory_limit', '128M');
set_time_limit(120);
@ini_set('memory_limit', '128M');
@set_time_limit(120);
$i = 0;
$len = 0;
@ -119,14 +119,14 @@ if ($db_attr instanceof SimpleXMLElement) {
*/
$db_attr = $xml->children()->attributes();
$db_name = (string)$db_attr['name'];
$collation = NULL;
$charset = NULL;
$collation = null;
$charset = null;
}
/**
* The XML was malformed
*/
if ($db_name === NULL) {
if ($db_name === null) {
PMA_Message::error(__('The XML file specified was either malformed or incomplete. Please correct the issue and try again.'))->display();
unset($xml);
$GLOBALS['finished'] = false;
@ -259,9 +259,9 @@ if ($data_present) {
* to maintain PMA_buildSQL() call integrity
*/
if (! isset($analyses)) {
$analyses = NULL;
$analyses = null;
if (! $struct_present) {
$create = NULL;
$create = null;
}
}
}
@ -286,7 +286,7 @@ if (strlen($db)) {
$db_name = $db;
$options = array('create_db' => false);
} else {
if ($db_name === NULL) {
if ($db_name === null) {
$db_name = 'XML_DB';
}

2
libraries/plugin_interface.lib.php
View File

@ -138,7 +138,7 @@ function PMA_pluginIsActive($section, $opt, $val)
* @param string $cfgname name of config value, if none same as $name
* @return string html select tag
*/
function PMA_pluginGetChoice($section, $name, &$list, $cfgname = NULL)
function PMA_pluginGetChoice($section, $name, &$list, $cfgname = null)
{
if (! isset($cfgname)) {
$cfgname = $name;

53
phpunit.xml.dist Normal file
View File

@ -0,0 +1,53 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit bootstrap="test/bootstrap-dist.php"
backupGlobals="false"
backupStaticAttributes="false"
strict="true"
verbose="true">
<selenium>
<browser name="Firefox on localhost"
browser="*firefox"
host="127.0.0.1"
port="4444"
timeout="30000"/>
<browser name="Google Chrome on localhost"
browser="googlechrome"
host="127.0.0.1"
port="4444"
timeout="30000"/>
</selenium>
<php>
<const name="TESTSUITE_SERVER" value="localhost"/>
<const name="TESTSUITE_USER" value="root"/>
<const name="TESTSUITE_PASSWORD" value=""/>
<const name="TESTSUITE_DATABASE" value="test"/>
<const name="TESTSUITE_PHPMYADMIN_HOST" value="http://localhost" />
<const name="TESTSUITE_PHPMYADMIN_URL" value="/phpmyadmin" />
</php>
<testsuites>
<testsuite name="Classes">
<directory suffix="_test.php">test/classes</directory>
</testsuite>
<testsuite name="Unit">
<file>test/Environment_test.php</file>
<directory suffix="_test.php">test/libraries/core</directory>
<directory suffix="_test.php">test/libraries/common</directory>
<directory suffix="_test.php">test/libraries</directory>
</testsuite>
<!--<testsuite name="Selenium">-->
<!--<directory suffix="Test.php">test/selenium</directory>-->
<!--</testsuite>-->
</testsuites>
<logging>
<log type="coverage-html" target="build/coverage" title="phpMyAdmin"
charset="UTF-8" yui="true" highlight="true"
lowUpperBound="35" highLowerBound="70"/>
<log type="coverage-clover" target="build/logs/clover.xml"/>
<log type="junit" target="build/logs/junit.xml" logIncompleteSkipped="false"/>
</logging>
</phpunit>

6
po/bg.po
View File

@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-07-19 14:25+0200\n"
"PO-Revision-Date: 2011-07-19 09:34+0200\n"
"PO-Revision-Date: 2011-07-19 14:58+0200\n"
"Last-Translator: <stoyanster@gmail.com>\n"
"Language-Team: bulgarian <bg@li.org>\n"
"Language: bg\n"
@ -5207,7 +5207,7 @@ msgstr "Преглед за печат (с пълните текстове)"
#: libraries/display_tbl.lib.php:2494 tbl_chart.php:83
msgid "Display chart"
msgstr "Показване на диаграма"
msgstr "Диаграма"
#: libraries/display_tbl.lib.php:2509
msgid "Visualize GIS data"
@ -10009,7 +10009,7 @@ msgstr "Линия"
#: tbl_chart.php:88
msgid "Spline"
msgstr ""
msgstr "Сплайн"
#: tbl_chart.php:89
msgid "Pie"

1854
po/da.po
View File

File diff suppressed because it is too large Load Diff

218
po/de.po
View File

@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-07-19 14:25+0200\n"
"PO-Revision-Date: 2011-07-16 02:40+0200\n"
"PO-Revision-Date: 2011-07-20 00:23+0200\n"
"Last-Translator: <mrbendig@mrbendig.com>\n"
"Language-Team: german <de@li.org>\n"
"Language: de\n"
@ -1131,15 +1131,14 @@ msgstr "Verbindungen / Prozesse"
#. l10n: Questions is the name of a MySQL Status variable
#: js/messages.php:85
#, fuzzy
#| msgid "Connections since last refresh"
msgid "Questions since last refresh"
msgstr "Verbindungen seit der letzten Aktualisierung"
msgstr "Anfragen seit der letzten Aktualisierung"
#. l10n: Questions is the name of a MySQL Status variable
#: js/messages.php:87
msgid "Questions (executed statements by the server)"
msgstr ""
msgstr "Anfragen (Serverseitig ausgeführte SQL-Befehle)"
#: js/messages.php:89 server_status.php:574
msgid "Query statistics"
@ -1147,15 +1146,15 @@ msgstr "Abfrage-Statistiken"
#: js/messages.php:92
msgid "System CPU Usage"
msgstr ""
msgstr "CPU-Auslastung"
#: js/messages.php:93
msgid "System memory"
msgstr ""
msgstr "Arbeitsspeicher"
#: js/messages.php:94
msgid "System swap"
msgstr ""
msgstr "System-Swap"
#: js/messages.php:95 libraries/common.lib.php:1276 server_status.php:1385
msgid "MiB"
@ -1167,14 +1166,13 @@ msgstr "KiB"
#: js/messages.php:98
msgid "Average load"
msgstr ""
msgstr "Durchschnittliche Auslastung"
#. l10n: Questions is the name of a MySQL Status variable
#: js/messages.php:100
#, fuzzy
#| msgid "Versions"
msgid "Questions"
msgstr "Versionen"
msgstr "Anfragen"
#: js/messages.php:101 server_status.php:851
msgid "Traffic"
@ -1186,24 +1184,22 @@ msgid "Settings"
msgstr "Einstellungen"
#: js/messages.php:103
#, fuzzy
#| msgid "Remove database"
msgid "Remove chart"
msgstr "Datenbank entfernen"
msgstr "Skala entfernen"
#: js/messages.php:104
msgid "Edit labels and series"
msgstr ""
msgstr "Beschriftungen und Serien bearbeiten"
#: js/messages.php:105
#, fuzzy
#| msgid "Snap to grid"
msgid "Add chart to grid"
msgstr "Am Gitter anordnen"
msgstr "Skala dem Raster hinzufügen"
#: js/messages.php:107
msgid "Please add at least one variable to the series"
msgstr ""
msgstr "Bitte fügen Sie mindestens eine Variable der Serie hinzu"
#: js/messages.php:108 libraries/display_export.lib.php:306
#: libraries/display_tbl.lib.php:564 libraries/export/sql.php:1039
@ -1214,35 +1210,35 @@ msgstr "keine"
#: js/messages.php:109
msgid "Resume monitor"
msgstr ""
msgstr "Überwachung fortsetzen"
#: js/messages.php:110
msgid "Pause monitor"
msgstr ""
msgstr "Überwachung pausieren"
#: js/messages.php:112
msgid "general_log and slow_query_log is enabled."
msgstr ""
msgstr "general_log und slow_query_log sind aktiviert."
#: js/messages.php:113
msgid "general_log is enabled."
msgstr ""
msgstr "general_log ist aktiviert."
#: js/messages.php:114
msgid "slow_query_log is enabled."
msgstr ""
msgstr "slow_query_log ist aktiviert."
#: js/messages.php:115
msgid "slow_query_log and general_log is disabled."
msgstr ""
msgstr "slow_query_log und general_log sind deaktiviert."
#: js/messages.php:116
msgid "log_output is not set to TABLE."
msgstr ""
msgstr "log_output ist nicht auf TABLE eingestellt."
#: js/messages.php:117
msgid "log_output is set to TABLE."
msgstr ""
msgstr "log_output ist auf TABLE eingestellt."
#: js/messages.php:118
#, php-format
@ -1251,72 +1247,76 @@ msgid ""
"than %d seconds. It is advisable to set this long_query_time 0-2 seconds, "
"depending on your system."
msgstr ""
"slow_query_log ist aktiviert, aber der Server protokolliert nur Anfragen, "
"die länger als %d ausgeführt wurden. Es ist ratsam, den Wert long_query_time "
"auf 0-2 Sekunden einzustellen, abhängig vom System."
#: js/messages.php:119
#, php-format
msgid "long_query_time is set to %d second(s)."
msgstr ""
msgstr "long_query_time ist auf %d Sekunde(n) eingestellt."
#: js/messages.php:120
msgid ""
"Following settings will be applied globally and reset to default on server "
"restart:"
msgstr ""
"Die folgenden Einstellungen werden global übernommen, und auf ihre "
"Ursprungswerte zurückgesetzt bei einem Server Neustart."
#. l10n: %s is FILE or TABLE
#: js/messages.php:122
#, fuzzy, php-format
#, php-format
#| msgid "Save output to a file"
msgid "Set log_output to %s"
msgstr "Speichere Ausgabe in Datei"
msgstr "Setze log_output auf %s"
#. l10n: Enable in this context means setting a status variable to ON
#: js/messages.php:124
#, fuzzy, php-format
#, php-format
#| msgid "Enabled"
msgid "Enable %s"
msgstr "Aktiviert"
msgstr "Aktiviere %s"
#. l10n: Disable in this context means setting a status variable to OFF
#: js/messages.php:126
#, fuzzy, php-format
#, php-format
#| msgid "Disabled"
msgid "Disable %s"
msgstr "Deaktiviert"
msgstr "Deaktiviere %s"
#. l10n: %d seconds
#: js/messages.php:128
#, php-format
msgid "Set long_query_time to %ds"
msgstr ""
msgstr "Setze long_query_time auf %ds"
#: js/messages.php:129
msgid ""
"You don't have super user rights to change this variables. Please log in as "
"root account or contact your database administrator."
msgstr ""
"Sie haben keine super user Rechte um diese Variable zu ändern. Bitte melden "
"Sie sich mit einem Root-Benutzer ein, oder kontaktieren Sie Ihren Datenbank-"
"Administrator."
#: js/messages.php:130
#, fuzzy
#| msgid "Manage your settings"
msgid "Change settings"
msgstr "Deine Einstellungen verwalten"
msgstr "Einstellungen ändern"
#: js/messages.php:131
#, fuzzy
#| msgid "More settings"
msgid "Current settings"
msgstr "Weitere Einstellungen"
msgstr "Aktuelle Einstellungen"
#: js/messages.php:133 server_status.php:1345
#, fuzzy
#| msgid "Chart title"
msgid "Chart Title"
msgstr "Titel des Reports"
msgstr "Schaubild-Titel"
#. l10n: As in differential values
#: js/messages.php:135
#, fuzzy
#| msgid "Difference"
msgid "Differential"
msgstr "Unterschied"
@ -1324,35 +1324,37 @@ msgstr "Unterschied"
#: js/messages.php:136
#, php-format
msgid "Divided by %s:"
msgstr ""
msgstr "Geteilt durch %s:"
#: js/messages.php:138
#, fuzzy
#| msgid "Select page"
msgid "Selected time range:"
msgstr "Seite auswählen"
msgstr "Ausgewählte Zeit-Spanne:"
#: js/messages.php:139
msgid "Group together INSERTs into same table"
msgstr ""
msgstr "INSERTs in der selben Tabelle zusammenfassen"
#: js/messages.php:140
msgid ""
"<p>Choose from which log you want the statistics to be generated from.</p> "
"Results are grouped by query text."
msgstr ""
"<p>Bitte wählen Sie das log aus, von dem Statistiken generiert werden "
"sollen</p> Ergebnisse sind nach Abfrage-Text zusammengefasst."
# Eigenname der MySQL-Funktion
#: js/messages.php:141
msgid "From slow log"
msgstr ""
msgstr "Vom slow Log"
#: js/messages.php:142
msgid "From general log"
msgstr ""
msgstr "Vom allgemeinen Log"
#: js/messages.php:143
msgid "Analysing & loading logs. This may take a while."
msgstr ""
msgstr "Analysiere und Lade Protokolle. Dies kann eine Weile dauern."
#: js/messages.php:144
msgid ""
@ -1360,6 +1362,9 @@ msgid ""
"together. However only the SQL Text is being compared, thus the queries "
"other attributes such as start time may differ."
msgstr ""
"Diese Spalte zeigt die Anzahl der identischen Abfragen an, die gruppiert "
"wurden. Dennoch wird nur der SQL-Text verglichen, daher kann die Angabe von "
"anderen Werten der Abfrage, wie die Startzeit, unterschiedlich sein."
#: js/messages.php:145
msgid ""
@ -1367,20 +1372,25 @@ msgid ""
"same table are also being grouped together, disregarding of the inserted "
"data."
msgstr ""
"Da Gruppieren von INSERT-Abfragen ausgewählt wurde, werden auch INSERT "
"Befehle in die gleiche Tabelle zusammengefasst, unabhängig von den "
"eingefügten Daten."
#: js/messages.php:146
msgid "Log data loaded. Queries executed in this time span:"
msgstr ""
"Protokoll-Daten geladen. Innerhalb dieses Zeitaums ausgeführte Abfragen:"
#: js/messages.php:148
#, fuzzy
#| msgid "Jump to database"
msgid "Jump to Log table"
msgstr "Springe zu Datenbank"
msgstr "Springe zur Protokoll-Tabelle"
#: js/messages.php:149
msgid "Log analysed, but not data found in this time span."
msgstr ""
"Protokoll wurde analysiert, es wurden jedoch keine Daten im angegebenen "
"Zeitraum gefunden."
#: js/messages.php:153 libraries/tbl_properties.inc.php:780
#: pmd_general.php:388 pmd_general.php:425 pmd_general.php:545
@ -2586,11 +2596,11 @@ msgstr "Angepasst – Wie oben, aber ohne die Schnell-/Angepasst-Auswahl"
#: libraries/config.values.php:120
msgid "complete inserts"
msgstr "Vollständige 'INSERT's"
msgstr "Vollständige INSERTs"
#: libraries/config.values.php:121
msgid "extended inserts"
msgstr "Erweiterte 'INSERT's"
msgstr "Erweiterte INSERTs"
#: libraries/config.values.php:122
msgid "both of the above"
@ -6957,10 +6967,10 @@ msgid ""
"handling multi queries. <b>The execution of some stored routines may fail!</"
"b> Please use the improved 'mysqli' extension to avoid any problems."
msgstr ""
"Sie verwenden die von PHP als 'veraltet' gekennzeichnete 'mysql'-"
"Erweiterung, die nicht in der Lage ist, mehrere Abfragen zu verarbeiten. "
"<b>Die Ausführung von einigen gespeicherten Prozeduren könnte fehlschlagen!</"
"b> Bitte verwenden Sie die neuere 'mysqli'-Erweiterung um Probleme zu "
"Sie verwenden die von PHP als veraltet gekennzeichnete 'mysql'-Erweiterung, "
"die nicht in der Lage ist, mehrere Abfragen zu verarbeiten. <b>Die "
"Ausführung von einigen gespeicherten Prozeduren könnte fehlschlagen!</b> "
"Bitte verwenden Sie die neuere 'mysqli'-Erweiterung um Probleme zu "
"vermeiden."
#: libraries/rte/rte_routines.lib.php:247
@ -7769,7 +7779,7 @@ msgid ""
"htmlspecialchars(). That is, the column is assumed to contain valid HTML."
msgstr ""
"Stellt den Inhalt der Spalten in der ursprünglichen Formatierung dar, ohne "
"dass diese htmlspecialchars() durchläuft. Das heißt, es wird angenommen, "
"dass diese htmlspecialchars() durchläuft. Das heißt, es wird angenommen, "
"dass die Spalte gültiges HTML enthält."
#: libraries/transformations/text_plain__imagelink.inc.php:9
@ -8574,7 +8584,7 @@ msgstr "Gewährt Zugang zur vollständigen Datenbankliste."
#: server_privileges.php:62 server_privileges.php:214
#: server_privileges.php:216 server_privileges.php:533
msgid "Allows performing SHOW CREATE VIEW queries."
msgstr "Erlaubt das Ausführen von 'SHOW CREATE VIEW'."
msgstr "Erlaubt das Ausführen von SHOW CREATE VIEW."
#: server_privileges.php:63 server_privileges.php:197
#: server_privileges.php:560
@ -9126,10 +9136,9 @@ msgstr "Alle Status Variablen"
#: server_status.php:576
msgid "Monitor"
msgstr ""
msgstr "Überwachung"
#: server_status.php:586 server_status.php:608
#, fuzzy
#| msgid "Refresh rate:"
msgid "Refresh rate: "
msgstr "Aktualisierungs-Intervall:"
@ -9152,10 +9161,10 @@ msgstr "Verwandte Links:"
#. l10n: Questions is the name of a MySQL Status variable
#: server_status.php:695
#, fuzzy, php-format
#, php-format
#| msgid "Network traffic since startup: %s"
msgid "Questions since startup: %s"
msgstr "Netzwerk-Datenverkehr seit Start: %s"
msgstr "Verbindungen seit Start: %s"
#: server_status.php:701 server_status.php:736 server_status.php:852
#: server_status.php:897
@ -9185,10 +9194,10 @@ msgid "Network traffic since startup: %s"
msgstr "Netzwerk-Datenverkehr seit Start: %s"
#: server_status.php:809
#, fuzzy, php-format
#, php-format
#| msgid "This MySQL server has been running for %s. It started up on %s."
msgid "This MySQL server has been running for %1$s. It started up on %2$s."
msgstr "Dieser MySQL-Server läuft bereits %s. Er wurde am %s gestartet."
msgstr "Dieser MySQL-Server läuft bereits %1$s. Er wurde um %2$s gestartet."
#: server_status.php:819
msgid ""
@ -9263,6 +9272,8 @@ msgid ""
"The number of connections that were aborted because the client died without "
"closing the connection properly."
msgstr ""
"Die Anzahl der Verbindungen die aufgrund einer nicht richtig geschlossenen "
"Verbindung zu einem nicht mehr erreichbaren Client abgebrochen wurden."
#: server_status.php:1033
msgid "The number of failed attempts to connect to the MySQL server."
@ -9948,52 +9959,46 @@ msgid "The number of threads that are not sleeping."
msgstr "Anzahl der Prozesse, die nicht schlafen."
#: server_status.php:1277
#, fuzzy
#| msgid "Start row"
msgid "Start Monitor"
msgstr "Anfangs-Datensatz"
msgstr "Überwachung starten"
#: server_status.php:1285
#, fuzzy
#| msgid "Introduction"
msgid "Instructions/Setup"
msgstr "Einführung"
msgstr "Einführung/Einrichtung"
#: server_status.php:1289
msgid "Done rearranging/editing charts"
msgstr ""
msgstr "Umordnen/bearbeiten der Schaubilder beendet."
#: server_status.php:1296
#, fuzzy
#| msgid "Add parameter"
msgid "Add chart"
msgstr "Parameter hinzufügen"
msgstr "Schaubild hinzufügen"
#: server_status.php:1298
msgid "Rearrange/edit charts"
msgstr ""
msgstr "Schaubilder umordnen/bearbeiten"
#: server_status.php:1300
msgid "Refresh rate:"
msgstr "Aktualisierungs-Intervall:"
#: server_status.php:1303
#, fuzzy
#| msgid "Textarea columns"
msgid "Chart columns:"
msgstr "Textfeldspalten"
msgstr "Schaubild-Spalten"
#: server_status.php:1317
#, fuzzy
#| msgid "User for config auth"
msgid "Clear monitor config"
msgstr "Benutzername für config Authentifikation"
msgstr "Überwachungskonfiguration löschen"
#: server_status.php:1320
#, fuzzy
#| msgid "Introduction"
msgid "Monitor Instructions"
msgstr "Einführung"
msgstr "Einführung zur Überwachung"
#: server_status.php:1321
msgid ""
@ -10002,6 +10007,10 @@ msgid ""
" queries. For the latter you will need to log_output set to 'TABLE' "
"and have either the slow_query_log or general_log enabled."
msgstr ""
"Die phpMyAdmin-Überwachung kann Sie bei der Server-Konfiguration, und auch "
"beim Aufspühren von zeitintensiven Abfragen unterstützen. Für das Letztere "
"müssen Sie log_output auf 'TABLE' stellen, und entweder slow_query_log oder "
"general_log aktivieren."
#: server_status.php:1329
msgid ""
@ -10023,84 +10032,93 @@ msgid ""
"small time span.\n"
" </p>"
msgstr ""
"<b>Verwendung der Überwachung</b><br />\n"
"OK, Sie sind bereit zum Starten! Sobald Sie 'Überwachung starten' angeklickt "
"haben, wird ihr Browser in regelmäßigen Intervallen alle angezeigten "
"Schaubilder aktualisieren. Unter 'Einstellungen' können Sie Schaubilder "
"hinzufügen und den Aktualisierungs-Intervall ändern, oder beliebige "
"Schaubilder entfernen, wenn Sie das Zahnrad-Icon des entsprechenden "
"Schaubilds verwenden.\n"
"<p>Wenn Sie eine plötzliche Spitze in der Aktivität feststellen, wählen Sie "
"den entsprechenden Zeitraum in einem beliebigen Schaubild, in dem Sie die\n"
"linke Maustaste gedrückt halten und über das Schaubild ziehen. Dies wird "
"Statistiken aus den Protokollen laden um Sie bei der Auffindung der \n"
"Aktivitätsspitze zu unterstützen.</p>\n"
"<p><b>Bitte beachten Sie:</b>\n"
"Das aktivieren des general_log kann die Serverlast um 5-15% steigern. Seien "
"Sie es sich bewusst, dass das erzeigen von Statistiken aus den Logs ein \n"
"sehr Lasten-Intensiver prozess ist. Deshalb ist es ratsam, nur einen kleinen "
"Zeitraum auszuwählen.\n"
"</p> "
#: server_status.php:1348
#, fuzzy
#| msgid "Usage"
msgid "CPU Usage"
msgstr "Verbrauch"
msgstr "CPU-Auslastung"
#: server_status.php:1351
msgid "Memory Usage"
msgstr ""
msgstr "Speicher-Auslastung"
#: server_status.php:1354
#, fuzzy
#| msgid "Usage"
msgid "Swap Usage"
msgstr "Verbrauch"
msgstr "Auslagerungsdatei-Nutzung"
#: server_status.php:1357
#, fuzzy
#| msgid "All status variables"
msgid "Status variable(s)"
msgstr "Alle Status Variablen"
msgstr "Status Variable(n)"
#: server_status.php:1359
#, fuzzy
#| msgid "Select Tables"
msgid "Select series:"
msgstr "Tabellenauswahl"
msgstr "Serie auswählen:"
#: server_status.php:1361
msgid "Commonly monitored"
msgstr ""
msgstr "Allgemein-überwacht"
#: server_status.php:1376
#, fuzzy
#| msgid "You must provide a valid table name"
msgid "or type variable name:"
msgstr "Sie müssen einen gültigen Tabellen-Namen angeben"
msgstr "oder Variablen-Namen eingeben:"
#: server_status.php:1380
msgid "Display as differential value"
msgstr ""
msgstr "Den Wert als Unterschied zeigen"
#: server_status.php:1382
msgid "Apply a divisor"
msgstr ""
msgstr "Divisor hinzufügen"
#: server_status.php:1389
msgid "Append unit to data values"
msgstr ""
msgstr "Einheiten an Datenwerte anfügen."
#: server_status.php:1395
#, fuzzy
#| msgid "Add trigger"
msgid "Add this series"
msgstr "Einen Trigger hinzufügen"
msgstr "Diese Serie hinzufügen"
#: server_status.php:1397
msgid "Clear series"
msgstr ""
msgstr "Serien löschen"
#: server_status.php:1400
#, fuzzy
#| msgid "Series:"
msgid "Series in Chart:"
msgstr "Reihe:"
msgstr "Serien im Schaubild"
#: server_status.php:1408
#, fuzzy
#| msgid "Loading"
msgid "Loading logs"
msgstr "Laden"
msgstr "Lade Protokolle"
#: server_status.php:1411
#, fuzzy
#| msgid "Show statistics"
msgid "Log statistics"
msgstr "Zeige Statistik"
msgstr "Protokoll Statistik"
#: server_synchronize.php:92
msgid "Could not connect to the source"

350
po/el.po
View File

@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-07-19 14:25+0200\n"
"PO-Revision-Date: 2011-07-13 09:17+0200\n"
"PO-Revision-Date: 2011-07-20 11:01+0200\n"
"Last-Translator: Panagiotis Papazoglou <papaz_p@yahoo.com>\n"
"Language-Team: greek <el@li.org>\n"
"Language: el\n"
@ -1128,15 +1128,14 @@ msgstr "Συνδέσεις / Διεργασίες"
#. l10n: Questions is the name of a MySQL Status variable
#: js/messages.php:85
#, fuzzy
#| msgid "Connections since last refresh"
msgid "Questions since last refresh"
msgstr "Συνδέσεις από την τελευταία ανανέωση"
msgstr "Ερωτήσεις από την τελευταία ανανέωση"
#. l10n: Questions is the name of a MySQL Status variable
#: js/messages.php:87
msgid "Questions (executed statements by the server)"
msgstr ""
msgstr "Ερωτήσεις (εκτελεσμένες δηλώσεις από τον διακομιστή)"
#: js/messages.php:89 server_status.php:574
msgid "Query statistics"
@ -1144,15 +1143,15 @@ msgstr "Στατιστικά ερωτήματος"
#: js/messages.php:92
msgid "System CPU Usage"
msgstr ""
msgstr "Χρήση Επεξεργαστή Συστήματος"
#: js/messages.php:93
msgid "System memory"
msgstr ""
msgstr "Μνήμη συστήματος"
#: js/messages.php:94
msgid "System swap"
msgstr ""
msgstr "Αδράνεια συστήματος"
#: js/messages.php:95 libraries/common.lib.php:1276 server_status.php:1385
msgid "MiB"
@ -1164,14 +1163,13 @@ msgstr "KB"
#: js/messages.php:98
msgid "Average load"
msgstr ""
msgstr "Μέσο φορτίο"
#. l10n: Questions is the name of a MySQL Status variable
#: js/messages.php:100
#, fuzzy
#| msgid "Suggestions:"
msgid "Questions"
msgstr "Προτάσεις:"
msgstr "Ερωτήσεις:"
#: js/messages.php:101 server_status.php:851
msgid "Traffic"
@ -1183,24 +1181,22 @@ msgid "Settings"
msgstr "Ρυθμίσεις"
#: js/messages.php:103
#, fuzzy
#| msgid "Remove database"
msgid "Remove chart"
msgstr "Μετακίνηση βάσης δεδομένων σε"
msgstr "Απομάκρυνση διαγράμματος"
#: js/messages.php:104
msgid "Edit labels and series"
msgstr ""
msgstr "Επεξεργασία ετικετών και σειρών"
#: js/messages.php:105
#, fuzzy
#| msgid "Snap to grid"
msgid "Add chart to grid"
msgstr "Συγκράτηση στο πλέγμα"
msgstr "Προσθήκη διαγράμματος στο πλέγμα"
#: js/messages.php:107
msgid "Please add at least one variable to the series"
msgstr ""
msgstr "Εισάγετε τουλάχιστον μια μεταβλητή στις σειρές"
#: js/messages.php:108 libraries/display_export.lib.php:306
#: libraries/display_tbl.lib.php:564 libraries/export/sql.php:1039
@ -1211,35 +1207,35 @@ msgstr "Καμία"
#: js/messages.php:109
msgid "Resume monitor"
msgstr ""
msgstr "Επανεκίννηση εποπτείας"
#: js/messages.php:110
msgid "Pause monitor"
msgstr ""
msgstr "Παύση εποπτείας"
#: js/messages.php:112
msgid "general_log and slow_query_log is enabled."
msgstr ""
msgstr "Το general_log και το slow_query_log είναι ενεργοποιημένα."
#: js/messages.php:113
msgid "general_log is enabled."
msgstr ""
msgstr "Το general_log είναι ενεργοποιημένο."
#: js/messages.php:114
msgid "slow_query_log is enabled."
msgstr ""
msgstr "Το slow_query_log είναι ενεργοποιημένα."
#: js/messages.php:115
msgid "slow_query_log and general_log is disabled."
msgstr ""
msgstr "Το slow_query_log και το general_log είναι απενεργοποιημένα."
#: js/messages.php:116
msgid "log_output is not set to TABLE."
msgstr ""
msgstr "Το log_output δεν έχει οριστεί στο TABLE."
#: js/messages.php:117
msgid "log_output is set to TABLE."
msgstr ""
msgstr "Το log_output έχει οριστεί στο TABLE."
#: js/messages.php:118
#, php-format
@ -1248,108 +1244,114 @@ msgid ""
"than %d seconds. It is advisable to set this long_query_time 0-2 seconds, "
"depending on your system."
msgstr ""
"Το slow_query_log είναι ενεργοποιημένο ο διακομιστής καταγράφει μόνο "
"ερωτήματα που διαρκούν περισσότερα από %d δευτερόλεπτα. Σας προτείνεται να "
"ορίσετε το long_query_time μεταξύ 0-2 δευτερόλεπτα, κάτι που εξαρτάται από "
"το σύστημά σας."
#: js/messages.php:119
#, php-format
msgid "long_query_time is set to %d second(s)."
msgstr ""
msgstr "Το long_query_time έχει οριστεί στο(α) %d δευτερόλεπτο(α).."
#: js/messages.php:120
msgid ""
"Following settings will be applied globally and reset to default on server "
"restart:"
msgstr ""
"Οι ακόλουθες ρυθμίσεις θα εφαρμοστούν καθολικά και θα επανέλθουν στις "
"προεπιλογές με την επανεκκίνηση του διακομιστή:"
#. l10n: %s is FILE or TABLE
#: js/messages.php:122
#, fuzzy, php-format
#, php-format
#| msgid "Save output to a file"
msgid "Set log_output to %s"
msgstr "Αποθήκευση εξαγόμενου σε αρχείο"
msgstr "Ορισμός του log_output σε %s"
#. l10n: Enable in this context means setting a status variable to ON
#: js/messages.php:124
#, fuzzy, php-format
#, php-format
#| msgid "Enabled"
msgid "Enable %s"
msgstr "Ενεργοποιημένη"
msgstr "Ενεργοποίηση %s"
#. l10n: Disable in this context means setting a status variable to OFF
#: js/messages.php:126
#, fuzzy, php-format
#, php-format
#| msgid "Disabled"
msgid "Disable %s"
msgstr "Απενεργοποιημένη"
msgstr "Απενεργοποίηση %s"
#. l10n: %d seconds
#: js/messages.php:128
#, php-format
msgid "Set long_query_time to %ds"
msgstr ""
msgstr "Ορισμός του long_query_time σε %dδ"
#: js/messages.php:129
msgid ""
"You don't have super user rights to change this variables. Please log in as "
"root account or contact your database administrator."
msgstr ""
"Δεν έχετε δικαιώματα υπερχρήστη για να αλλάξετε αυτές τις μεταβλητές. "
"Συνδεθείτε ως λογαριασμός root ή επικοινωνήστε με τον διαχειριστή της βάσης "
"δεδομένων σας."
#: js/messages.php:130
#, fuzzy
#| msgid "Manage your settings"
msgid "Change settings"
msgstr "Διαχειριστείτε τις ρυθμίσεις σας"
msgstr "Αλλαγή ρυθμίσεων"
#: js/messages.php:131
#, fuzzy
#| msgid "More settings"
msgid "Current settings"
msgstr "Περισσότερες ρυθμίσεις"
msgstr "Τρέχουσες ρυθμίσεις"
#: js/messages.php:133 server_status.php:1345
#, fuzzy
#| msgid "Chart title"
msgid "Chart Title"
msgstr "Τίτλος διαγράμματος"
msgstr "Τίτλος Διαγράμματος"
#. l10n: As in differential values
#: js/messages.php:135
#, fuzzy
#| msgid "Difference"
msgid "Differential"
msgstr "Διαφορά"
msgstr "Διαφορικός"
#: js/messages.php:136
#, php-format
msgid "Divided by %s:"
msgstr ""
msgstr "Διαιρεμένος με %s:"
#: js/messages.php:138
#, fuzzy
#| msgid "Select page"
msgid "Selected time range:"
msgstr "Επιλογή σελίδας"
msgstr "Επιλεγμένο εύρος χρόνου:"
#: js/messages.php:139
msgid "Group together INSERTs into same table"
msgstr ""
msgstr "Ομαδοποίηση των εντολών INSERT μέσα στον ίδιο πίνακα"
#: js/messages.php:140
msgid ""
"<p>Choose from which log you want the statistics to be generated from.</p> "
"Results are grouped by query text."
msgstr ""
"<p>Επιλέξτε από ποια καταγραφή θέλετε να προκύψουν τα στατιστικά.</p> Τα "
"αποτελέσματα ομοδοποιούνται ανά κείμενο ερωτήματος."
#: js/messages.php:141
msgid "From slow log"
msgstr ""
msgstr "Από την αργή καταγραφή"
#: js/messages.php:142
msgid "From general log"
msgstr ""
msgstr "Από την γενική καταγραφή"
#: js/messages.php:143
msgid "Analysing & loading logs. This may take a while."
msgstr ""
msgstr "Ανάλυση & φόρτωση καταγραφών. Αυτό ίσως διαρκέσει λίγο."
#: js/messages.php:144
msgid ""
@ -1357,6 +1359,9 @@ msgid ""
"together. However only the SQL Text is being compared, thus the queries "
"other attributes such as start time may differ."
msgstr ""
"Αυτές οι στήλες δείχνουν τον αριθμό των μοναδικών ερωτημάτων που "
"ομαδοποιήθηκαν. Ωστόσο, μόνο το Κείμενο SQL συγκρίνεται έτσι οι ιδιότητες "
"των ερωτημάτων όπως ο χρόνο εκκίνησης μπορεί να διαφέρουν."
#: js/messages.php:145
msgid ""
@ -1364,20 +1369,25 @@ msgid ""
"same table are also being grouped together, disregarding of the inserted "
"data."
msgstr ""
"Αφού επιλέχθηκε η ομαδοποίηση των εντολών INSERT, τα ερωτήματα INSERT εντός "
"του ίδιου πίνακα επίσης ομαδοποιηούνται ανεξάρτητα από εισαγόμενα δεδομένα."
#: js/messages.php:146
msgid "Log data loaded. Queries executed in this time span:"
msgstr ""
"Τα δεδομένα καταγραφής φορτώθηκαν. Τα ερωτήματα που εκτελέστηκαν σε αυτή την "
"επέκταση χρόνου."
#: js/messages.php:148
#, fuzzy
#| msgid "Jump to database"
msgid "Jump to Log table"
msgstr "Μετάβαση στη βάση δεδομένων"
msgstr "Μετάβαση στον πίνακα Καταγραφής"
#: js/messages.php:149
msgid "Log analysed, but not data found in this time span."
msgstr ""
"Η καταγραφή αναλύθηκε αλλά δεν βρέθηκαν δεδομένα σε αυτή την επέκταση "
"χρόνου."
#: js/messages.php:153 libraries/tbl_properties.inc.php:780
#: pmd_general.php:388 pmd_general.php:425 pmd_general.php:545
@ -2461,10 +2471,9 @@ msgid "The %s functionality is affected by a known bug, see %s"
msgstr "Η λειτουργία %s έχει επηρρεαστεί από ένα γνωστό σφάλμα. Δείτε %s"
#: libraries/common.lib.php:2447
#, fuzzy
#| msgid "Click to select"
msgid "Click to toggle"
msgstr "Πατήστε για επιλογή"
msgstr "Πατήστε για εναλλαγή"
#: libraries/common.lib.php:2718 libraries/common.lib.php:2725
#: libraries/common.lib.php:2912 libraries/config/setup.forms.php:296
@ -6829,10 +6838,9 @@ msgid "The following query has failed: \"%s\""
msgstr "Το ακόλουθο ερώτημα έχει αποτύχει: «%s»"
#: libraries/rte/rte_events.lib.php:116
#, fuzzy
#| msgid "Sorry, we failed to restore the dropped routine."
msgid "Sorry, we failed to restore the dropped event."
msgstr "Συγνώμη, αποτύχαμε να επαναφέρουμε τη διαγραμμένη ρουτίνα."
msgstr "Συγνώμη, αποτύχαμε να επαναφέρουμε το συμβάν διαγραφής."
#: libraries/rte/rte_events.lib.php:117 libraries/rte/rte_routines.lib.php:269
#: libraries/rte/rte_triggers.lib.php:90
@ -6840,16 +6848,16 @@ msgid "The backed up query was:"
msgstr "Το εφεδρικό ερώτημα ήταν:"
#: libraries/rte/rte_events.lib.php:121
#, fuzzy, php-format
#, php-format
#| msgid "Routine %1$s has been modified."
msgid "Event %1$s has been modified."
msgstr "Η ρουτίνα %1$s έχει αλλαχτεί."
msgstr "Το συμβάν %1$s έχει αλλαχτεί."
#: libraries/rte/rte_events.lib.php:133
#, fuzzy, php-format
#, php-format
#| msgid "Table %1$s has been created."
msgid "Event %1$s has been created."
msgstr "Ο πίνακας %1$s έχει δημιουργηθεί."
msgstr "Το συμβάν %1$s έχει δημιουργηθεί."
#: libraries/rte/rte_events.lib.php:141 libraries/rte/rte_routines.lib.php:294
#: libraries/rte/rte_triggers.lib.php:114
@ -6859,16 +6867,14 @@ msgstr ""
"σας:</b>"
#: libraries/rte/rte_events.lib.php:181
#, fuzzy
#| msgid "Create view"
msgid "Create event"
msgstr "Δημιουργία προβολής"
msgstr "Δημιουργία συμβάντος"
#: libraries/rte/rte_events.lib.php:185
#, fuzzy
#| msgid "Edit server"
msgid "Edit event"
msgstr "Επεξεργασία διακομιστή"
msgstr "Επεξεργασία συμβάντος"
#: libraries/rte/rte_events.lib.php:212 libraries/rte/rte_routines.lib.php:370
#: libraries/rte/rte_routines.lib.php:1264
@ -6883,10 +6889,9 @@ msgid "Details"
msgstr "Λεπτομέρειες"
#: libraries/rte/rte_events.lib.php:374
#, fuzzy
#| msgid "Event type"
msgid "Event name"
msgstr "Τύπος συμβάντος"
msgstr "Όνομα συμβάντος"
#: libraries/rte/rte_events.lib.php:395 server_binlog.php:182
msgid "Event type"
@ -6898,22 +6903,19 @@ msgid "Change to %s"
msgstr "Αλλαγή σε %s"
#: libraries/rte/rte_events.lib.php:422
#, fuzzy
#| msgid "Execute"
msgid "Execute at"
msgstr "Εκτέλεση"
msgstr "Εκτέλεση σε"
#: libraries/rte/rte_events.lib.php:430
#, fuzzy
#| msgid "Execute"
msgid "Execute every"
msgstr "Εκτέλεση"
msgstr "Εκτέλεση κάθε"
#: libraries/rte/rte_events.lib.php:449
#, fuzzy
#| msgid "Startup"
msgid "Start"
msgstr "Εκκίνηση"
msgstr "Έναρξη"
#: libraries/rte/rte_events.lib.php:465 libraries/rte/rte_routines.lib.php:912
#: libraries/rte/rte_triggers.lib.php:348
@ -6921,10 +6923,9 @@ msgid "Definition"
msgstr "Προσδιορισμός"
#: libraries/rte/rte_events.lib.php:471
#, fuzzy
#| msgid "complete inserts"
msgid "On completion preserve"
msgstr "πλήρεις εντολές εισαγωγής (Insert)"
msgstr "Διατήρηση με την ολοκλήρωση"
#: libraries/rte/rte_events.lib.php:475 libraries/rte/rte_routines.lib.php:922
#: libraries/rte/rte_triggers.lib.php:354
@ -6934,63 +6935,54 @@ msgstr "Προσδιοριστής"
#: libraries/rte/rte_events.lib.php:518 libraries/rte/rte_routines.lib.php:986
#: libraries/rte/rte_triggers.lib.php:392
msgid "The definer must be in the \"username@hostname\" format"
msgstr ""
msgstr "Ο οριστής πρέπει να είναι της μορφής «username@hostname»"
#: libraries/rte/rte_events.lib.php:525
#, fuzzy
#| msgid "You must provide a routine name"
msgid "You must provide an event name"
msgstr "Πρέπει να δώσετε ένα όνομα στη ρουτίνα"
msgstr "Πρέπει να δώσετε ένα όνομα στο συμβάν"
#: libraries/rte/rte_events.lib.php:537
#, fuzzy
#| msgid "You must provide a name and a type for each routine parameter."
msgid "You must provide a valid interval value for the event."
msgstr ""
"Πρέπει να δώσετε ένα όνομα και ένα τύπο για κάθε παράμετρος της ρουτίνας."
msgstr "Πρέπει να δώσετε μια έγκυρη τιμή διαστήματος για το συμβάν."
#: libraries/rte/rte_events.lib.php:549
#, fuzzy
#| msgid "You must provide a routine definition."
msgid "You must provide a valid execution time for the event."
msgstr "Πρέπει να δώσετε ένα προσδιορισμό ρουτίνας."
msgstr "Πρέπει να δώσετε μια έγκυρη τιμή εκτέλεσης για το συμβάν."
#: libraries/rte/rte_events.lib.php:553
#, fuzzy
#| msgid "You must provide a name and a type for each routine parameter."
msgid "You must provide a valid type for the event."
msgstr ""
"Πρέπει να δώσετε ένα όνομα και ένα τύπο για κάθε παράμετρος της ρουτίνας."
msgstr "Πρέπει να δώσετε έναν έγκυρο τύπο συμβάντος."
#: libraries/rte/rte_events.lib.php:572
#, fuzzy
#| msgid "You must provide a routine definition."
msgid "You must provide an event definition."
msgstr "Πρέπει να δώσετε ένα προσδιορισμό ρουτίνας."
msgstr "Πρέπει να δώσετε έναν προσδιορισμό συμβάντος."
#: libraries/rte/rte_footer.lib.php:29
msgid "New"
msgstr ""
msgstr "Νέο"
#: libraries/rte/rte_footer.lib.php:91
msgid "OFF"
msgstr ""
msgstr "ΑΝΕΝΕΡΓΟ"
#: libraries/rte/rte_footer.lib.php:96
msgid "ON"
msgstr ""
msgstr "ΕΝΕΡΓΟ"
#: libraries/rte/rte_footer.lib.php:108
#, fuzzy
#| msgid "The event scheduler is enabled"
msgid "Event scheduler status"
msgstr "Ο προγραμματισμός συμβάντων είναι ενεργοποιημένος"
msgstr "Κατάσταση προγραμματισμού συμβάντων"
#: libraries/rte/rte_list.lib.php:52
#, fuzzy
#| msgid "Return type"
msgid "Returns"
msgstr "Τύπος επιστροφής"
msgstr "Επιστροφές"
#: libraries/rte/rte_list.lib.php:58 libraries/rte/rte_triggers.lib.php:320
#: server_status.php:976 sql.php:943
@ -7112,11 +7104,9 @@ msgstr ""
"Πρέπει να δώσετε ένα όνομα και ένα τύπο για κάθε παράμετρος της ρουτίνας."
#: libraries/rte/rte_routines.lib.php:1065
#, fuzzy
#| msgid "You must provide a name and a type for each routine parameter."
msgid "You must provide a valid return type for the routine."
msgstr ""
"Πρέπει να δώσετε ένα όνομα και ένα τύπο για κάθε παράμετρος της ρουτίνας."
msgstr "Πρέπει να δώσετε ένα έγκυρο τύπο επιστροφής για τη ρουτίνα."
#: libraries/rte/rte_routines.lib.php:1109
msgid "You must provide a routine definition."
@ -7152,71 +7142,61 @@ msgid "Function"
msgstr "Συνάρτηση"
#: libraries/rte/rte_triggers.lib.php:89
#, fuzzy
#| msgid "Sorry, we failed to restore the dropped routine."
msgid "Sorry, we failed to restore the dropped trigger."
msgstr "Συγνώμη, αποτύχαμε να επαναφέρουμε τη διαγραμμένη ρουτίνα."
msgstr "Συγνώμη, αποτύχαμε να επαναφέρουμε τη διαγραμμένη ενέργεια."
#: libraries/rte/rte_triggers.lib.php:94
#, fuzzy, php-format
#, php-format
#| msgid "Routine %1$s has been modified."
msgid "Trigger %1$s has been modified."
msgstr "Η ρουτίνα %1$s έχει αλλαχτεί."
msgstr "Η ενέργεια %1$s έχει αλλαχτεί."
#: libraries/rte/rte_triggers.lib.php:106
#, fuzzy, php-format
#, php-format
#| msgid "Table %1$s has been created."
msgid "Trigger %1$s has been created."
msgstr "Ο πίνακας %1$s έχει δημιουργηθεί."
msgstr "Η ενέργεια %1$s έχει δημιουργηθεί."
#: libraries/rte/rte_triggers.lib.php:157
#, fuzzy
#| msgid "Create view"
msgid "Create trigger"
msgstr "Δημιουργία προβολής"
msgstr "Δημιουργία ενέργειας"
#: libraries/rte/rte_triggers.lib.php:161
#, fuzzy
#| msgid "Add a trigger"
msgid "Edit trigger"
msgstr "Προσθήκη μιας ενέργειας"
msgstr "Επεξεργασία ενέργειας"
#: libraries/rte/rte_triggers.lib.php:301
#, fuzzy
#| msgid "Triggers"
msgid "Trigger name"
msgstr "Δείκτες"
msgstr "Όνομα ενέργειας"
#: libraries/rte/rte_triggers.lib.php:399
#, fuzzy
#| msgid "You must provide a routine name"
msgid "You must provide a trigger name"
msgstr "Πρέπει να δώσετε ένα όνομα στη ρουτίνα"
msgstr "Πρέπει να δώσετε ένα όνομα στην ενέργεια"
#: libraries/rte/rte_triggers.lib.php:404
#, fuzzy
#| msgid "You must provide a routine name"
msgid "You must provide a valid timing for the trigger"
msgstr "Πρέπει να δώσετε ένα όνομα στη ρουτίνα"
msgstr "Πρέπει να δώσετε ένα έγκυρο χρόνο για την ενέργεια"
#: libraries/rte/rte_triggers.lib.php:409
#, fuzzy
#| msgid "You must provide a name and a type for each routine parameter."
msgid "You must provide a valid event for the trigger"
msgstr ""
"Πρέπει να δώσετε ένα όνομα και ένα τύπο για κάθε παράμετρος της ρουτίνας."
msgstr "Πρέπει να δώσετε ένα έγκυρο συμβάν για την ενέργεια."
#: libraries/rte/rte_triggers.lib.php:415
#, fuzzy
#| msgid "You must provide a routine name"
msgid "You must provide a valid table name"
msgstr "Πρέπει να δώσετε ένα όνομα στη ρουτίνα"
msgstr "Πρέπει να δώσετε ένα έγκυρο όνομα πίνακα"
#: libraries/rte/rte_triggers.lib.php:421
#, fuzzy
#| msgid "You must provide a routine definition."
msgid "You must provide a trigger definition."
msgstr "Πρέπει να δώσετε ένα προσδιορισμό ρουτίνας."
msgstr "Πρέπει να δώσετε ένα προσδιορισμό ενέργειας."
#: libraries/rte/rte_words.lib.php:18
msgid "Add routine"
@ -7228,17 +7208,14 @@ msgid "Export of routine %s"
msgstr "Εξαγωγή της ρουτίνας %s"
#: libraries/rte/rte_words.lib.php:21
#, fuzzy
#| msgid "Routines"
msgid "routine"
msgstr "Εργασίες"
msgstr "ρουτίνα"
#: libraries/rte/rte_words.lib.php:22
#, fuzzy
#| msgid "You do not have the necessary privileges to create a new routine"
msgid "You do not have the necessary privileges to create a routine"
msgstr ""
"Δεν έχετε τα απαραίτητα δικαιώματα για να δημιουργήσετε μια νέα ρουτίνα"
msgstr "Δεν έχετε τα απαραίτητα δικαιώματα για να δημιουργήσετε μια ρουτίνα"
#: libraries/rte/rte_words.lib.php:23
#, php-format
@ -7250,10 +7227,9 @@ msgid "There are no routines to display."
msgstr "Δεν υπάρχουν ρουτίνες για εμφάνιση."
#: libraries/rte/rte_words.lib.php:30
#, fuzzy
#| msgid "Add a trigger"
msgid "Add trigger"
msgstr "Προσθήκη μιας ενέργειας"
msgstr "Προσθήκη ενέργειας"
#: libraries/rte/rte_words.lib.php:32
#, php-format
@ -7261,33 +7237,29 @@ msgid "Export of trigger %s"
msgstr "Εξαγωγή της ενέργειας %s"
#: libraries/rte/rte_words.lib.php:33
#, fuzzy
#| msgid "Triggers"
msgid "trigger"
msgstr "Δείκτες"
msgstr "ενέργεια"
#: libraries/rte/rte_words.lib.php:34
#, fuzzy
#| msgid "You do not have the necessary privileges to create a new routine"
msgid "You do not have the necessary privileges to create a trigger"
msgstr ""
"Δεν έχετε τα απαραίτητα δικαιώματα για να δημιουργήσετε μια νέα ρουτίνα"
msgstr "Δεν έχετε τα απαραίτητα δικαιώματα για να δημιουργήσετε μια ενέργεια"
#: libraries/rte/rte_words.lib.php:35
#, fuzzy, php-format
#, php-format
#| msgid "No routine with name %1$s found in database %2$s"
msgid "No trigger with name %1$s found in database %2$s"
msgstr "Καμιά ρουτίνα με την ονομασία %1$s δεν βρέθηκε στη βάση δεδομένων %2$s"
msgstr "Καμιά ενέργεια με την ονομασία %1$s δεν βρέθηκε στη βάση δεδομένων %2$s"
#: libraries/rte/rte_words.lib.php:36
msgid "There are no triggers to display."
msgstr "Δεν υπάρχουν ενέργειες για εμφάνιση"
#: libraries/rte/rte_words.lib.php:42
#, fuzzy
#| msgid "Add an event"
msgid "Add event"
msgstr "Προσθήκη ενός συμβάντος"
msgstr "Προσθήκη συμβάντος"
#: libraries/rte/rte_words.lib.php:44
#, php-format
@ -7295,23 +7267,20 @@ msgid "Export of event %s"
msgstr "Εξαγωγή του συμβάντος %s"
#: libraries/rte/rte_words.lib.php:45
#, fuzzy
#| msgid "Event"
msgid "event"
msgstr "Συμβάν"
msgstr "συμβάν"
#: libraries/rte/rte_words.lib.php:46
#, fuzzy
#| msgid "You do not have the necessary privileges to create a new routine"
msgid "You do not have the necessary privileges to create an event"
msgstr ""
"Δεν έχετε τα απαραίτητα δικαιώματα για να δημιουργήσετε μια νέα ρουτίνα"
msgstr "Δεν έχετε τα απαραίτητα δικαιώματα για να δημιουργήσετε ένα συμβάν"
#: libraries/rte/rte_words.lib.php:47
#, fuzzy, php-format
#, php-format
#| msgid "No event with name %s found in database %s"
msgid "No event with name %1$s found in database %2$s"
msgstr "Κανένα συμβάν με ονομασία %s δεν βρέθηκε στη βάση δεδομένων %s"
msgstr "Κανένα συμβάν με ονομασία %1$s δεν βρέθηκε στη βάση δεδομένων %2$s"
#: libraries/rte/rte_words.lib.php:48
msgid "There are no events to display."
@ -9212,13 +9181,12 @@ msgstr "Όλες οι μεταβλητές κατάστασης"
#: server_status.php:576
msgid "Monitor"
msgstr ""
msgstr "Εποπτεία"
#: server_status.php:586 server_status.php:608
#, fuzzy
#| msgid "Refresh rate:"
msgid "Refresh rate: "
msgstr "Ρυθμός ανανέωσης:"
msgstr "Ρυθμός ανανέωσης: "
#: server_status.php:629
msgid "Containing the word:"
@ -9238,10 +9206,10 @@ msgstr "Σχετικοί σύνδεσμοι:"
#. l10n: Questions is the name of a MySQL Status variable
#: server_status.php:695
#, fuzzy, php-format
#, php-format
#| msgid "Network traffic since startup: %s"
msgid "Questions since startup: %s"
msgstr "Κυκλοφορία δικτύου από την εκκίνηση: %s"
msgstr "Ερωτήσεις από την εκκίνηση: %s"
#: server_status.php:701 server_status.php:736 server_status.php:852
#: server_status.php:897
@ -9271,10 +9239,10 @@ msgid "Network traffic since startup: %s"
msgstr "Κυκλοφορία δικτύου από την εκκίνηση: %s"
#: server_status.php:809
#, fuzzy, php-format
#, php-format
#| msgid "This MySQL server has been running for %s. It started up on %s."
msgid "This MySQL server has been running for %1$s. It started up on %2$s."
msgstr "Αυτός ο διακομιστής MySQL λειτουργεί για %s. Ξεκίνησε στις %s."
msgstr "Αυτός ο διακομιστής MySQL λειτουργεί για %1$s. Ξεκίνησε στις %2$s."
#: server_status.php:819
msgid ""
@ -9350,6 +9318,8 @@ msgid ""
"The number of connections that were aborted because the client died without "
"closing the connection properly."
msgstr ""
"Ο αριθμός των συνδέσεων που διακόπηκαν επειδή ο πελάτης παρετήθηκε χωρίς να "
"κλείσει σωστά τη σύνδεση."
#: server_status.php:1033
msgid "The number of failed attempts to connect to the MySQL server."
@ -10051,52 +10021,46 @@ msgid "The number of threads that are not sleeping."
msgstr "Ο αριθμός των διεργασιών που δεν είναι σε νάρκη."
#: server_status.php:1277
#, fuzzy
#| msgid "Start row"
msgid "Start Monitor"
msgstr "Εγγραφή έναρξης"
msgstr "Έναρξη Εποπτείας"
#: server_status.php:1285
#, fuzzy
#| msgid "Introduction"
msgid "Instructions/Setup"
msgstr "Εισαγωγή"
msgstr "Οδηγίες/Εγκατάσταση"
#: server_status.php:1289
msgid "Done rearranging/editing charts"
msgstr ""
msgstr "Ολοκληρώθηκε η επανατοποθέτηση/επεξεργασία διαγραμμάτων"
#: server_status.php:1296
#, fuzzy
#| msgid "Add parameter"
msgid "Add chart"
msgstr "Προσθήκη παραμέτρου"
msgstr "Προσθήκη διαγράμματος"
#: server_status.php:1298
msgid "Rearrange/edit charts"
msgstr ""
msgstr "Επανατοποθέτηση/επεξεργασία διαγραμμάτων"
#: server_status.php:1300
msgid "Refresh rate:"
msgstr "Ρυθμός ανανέωσης:"
#: server_status.php:1303
#, fuzzy
#| msgid "Textarea columns"
msgid "Chart columns:"
msgstr "Στήλες περιοχής κειμένου (textarea)"
msgstr "Στήλες διαγράμματος:"
#: server_status.php:1317
#, fuzzy
#| msgid "User for config auth"
msgid "Clear monitor config"
msgstr "Χρήστης για ρυθμισμένη επικύρωση"
msgstr "Εκκαθάριση ρύθμισης εποπτείας"
#: server_status.php:1320
#, fuzzy
#| msgid "1. Introduction"
msgid "Monitor Instructions"
msgstr "1. Εισαγωγή"
msgstr "Οδηγίες Εποπτείας"
#: server_status.php:1321
msgid ""
@ -10105,6 +10069,10 @@ msgid ""
" queries. For the latter you will need to log_output set to 'TABLE' "
"and have either the slow_query_log or general_log enabled."
msgstr ""
"Η Εποπτεία phpMyAdmin μπορεί να σας βοηθήσει να βελτιστοποιήσετε τη ρύθμιση "
"του διακομιστή και να καταγράφει χρονοβόρα\n"
" ερωτήματα. Για το τελευταίο θα χρειαστείτε να ορίσετε το log_output "
"σε «TABLE» και να έχετε ενεργοποιήσει το slow_query_log ή το general_log."
#: server_status.php:1329
msgid ""
@ -10126,86 +10094,96 @@ msgid ""
"small time span.\n"
" </p>"
msgstr ""
"<b>Χρήση της εποπτείας:</b><br/>\n"
" Εντάξει, είστε έτοιμοι! Μόλις πατήσετε το «Έναρξη εποπτείας» ο "
"φυλλομετρητής σας θα ανανεώσει όλα τα εμφανιζόμενα διαγράμματα\n"
" ανά ένα τακτικό διάστημα. Μπορείτε να προσθέσετε διαγράμματα και να "
"αλλάξετε τον ρυθμό ανανέωσης από τις «Ρυθμίσεις», ή να απομακρύνετε κάποιο "
"διάγραμμα\n"
" χρησιμοποιώντας το εικονίδιο γρανάζι για κάθε διάγραμμα.\n"
" <p>Όταν δείτε ένα ξαφνικό μέγιστο, επιλέξτε την αντίστοιχη επέκταση "
"χρόνου σε οποιοδήποτε διάγραμμα έχοντας πατημένο το\n"
" αριστερό πλήκτρο του ποντικιού και μετακινηθείτε μέσα στο διάγραμμα. "
"Αυτό θα φορτώσει τα απαιτούμενα στατιστικά από τις καταγραφές βοηθόντας να "
"βρείτε τι προκάλεσε αυτή\n"
" την έντονη δραστηριότητα.</p>\n"
" <p><b>Σημειώστε:</b>\n"
" Ενεργοποιώντας το general_log ίσως αυξήσει τη φόρτωση του διακομιστή "
"μεταξύ 5-15%. Επίσης, έχετε υπόψη ότι η δημιουργία στατιστικών από τις "
"καταγραφές είναι μια \n"
" πολύ απαιτητική σε πόρους εργασία, έτσι σας προτείνουμε να επιλέξετε "
"μια μικρή επέκταση χρόνου.\n"
" </p>"
#: server_status.php:1348
#, fuzzy
#| msgid "Usage"
msgid "CPU Usage"
msgstr "Χρήση"
msgstr "Χρήση Επεξεργαστή"
#: server_status.php:1351
#, fuzzy
#| msgid "2. Usage"
msgid "Memory Usage"
msgstr "2. Χρήση"
msgstr "Χρήση Μνήμης"
#: server_status.php:1354
#, fuzzy
#| msgid "Usage"
msgid "Swap Usage"
msgstr "Χρήση"
msgstr "Χρήση Αδράνειας"
#: server_status.php:1357
#, fuzzy
#| msgid "All status variables"
msgid "Status variable(s)"
msgstr "Όλες οι μεταβλητές κατάστασης"
msgstr "Μεταβλητή(ές) κατάστασης"
#: server_status.php:1359
#, fuzzy
#| msgid "Select Tables"
msgid "Select series:"
msgstr "Επιλογή Πινάκων"
msgstr "Επιλογή σειρών:"
#: server_status.php:1361
msgid "Commonly monitored"
msgstr ""
msgstr "Συχνά εποπτευόμενα"
#: server_status.php:1376
#, fuzzy
#| msgid "You must provide a routine name"
msgid "or type variable name:"
msgstr "Πρέπει να δώσετε ένα όνομα στη ρουτίνα"
msgstr "ή όνομα τύπου μεταβλητής"
#: server_status.php:1380
msgid "Display as differential value"
msgstr ""
msgstr "Προβολή ως διαφορική τιμή"
#: server_status.php:1382
msgid "Apply a divisor"
msgstr ""
msgstr "Εφαρμογή διαιρέτη"
#: server_status.php:1389
msgid "Append unit to data values"
msgstr ""
msgstr "Προσάρτηση μονάδας στις τιμές δεδομένων"
#: server_status.php:1395
#, fuzzy
#| msgid "Add a trigger"
msgid "Add this series"
msgstr "Προσθήκη μιας ενέργειας"
msgstr "Προσθήκη αυτής της σειράς"
#: server_status.php:1397
msgid "Clear series"
msgstr ""
msgstr "Εκκαθάριση σειράς"
#: server_status.php:1400
#, fuzzy
#| msgid "Series:"
msgid "Series in Chart:"
msgstr "Σειρές:"
msgstr "Σειρά σε Διάγραμμα:"
#: server_status.php:1408
#, fuzzy
#| msgid "Loading"
msgid "Loading logs"
msgstr "Φόρτωση"
msgstr "Φόρτωση καταγραφών"
#: server_status.php:1411
#, fuzzy
#| msgid "Show statistics"
msgid "Log statistics"
msgstr "Εμφάνιση στατιστικών"
msgstr "Στατιστικά καταγραφών"
#: server_synchronize.php:92
msgid "Could not connect to the source"

200
po/es.po
View File

@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-07-19 14:25+0200\n"
"PO-Revision-Date: 2011-07-15 14:09+0200\n"
"PO-Revision-Date: 2011-07-19 22:29+0200\n"
"Last-Translator: Matías Bellone <matiasbellone@gmail.com>\n"
"Language-Team: spanish <es@li.org>\n"
"Language: es\n"
@ -1133,15 +1133,14 @@ msgstr "Conexiones / Procesos"
#. l10n: Questions is the name of a MySQL Status variable
#: js/messages.php:85
#, fuzzy
#| msgid "Connections since last refresh"
msgid "Questions since last refresh"
msgstr "Connexiones desde la última actualización"
msgstr "Preguntas desde la última actualización"
#. l10n: Questions is the name of a MySQL Status variable
#: js/messages.php:87
msgid "Questions (executed statements by the server)"
msgstr ""
msgstr "Preguntas (sentencias ejecutadas por el servidor)"
#: js/messages.php:89 server_status.php:574
msgid "Query statistics"
@ -1149,15 +1148,15 @@ msgstr "Estadísticas de Consulta"
#: js/messages.php:92
msgid "System CPU Usage"
msgstr ""
msgstr "Uso de CPU del sistema"
#: js/messages.php:93
msgid "System memory"
msgstr ""
msgstr "Memoria de sistema"
#: js/messages.php:94
msgid "System swap"
msgstr ""
msgstr "Intercambio de sistema"
#: js/messages.php:95 libraries/common.lib.php:1276 server_status.php:1385
msgid "MiB"
@ -1169,14 +1168,13 @@ msgstr "KB"
#: js/messages.php:98
msgid "Average load"
msgstr ""
msgstr "Carga promedio"
#. l10n: Questions is the name of a MySQL Status variable
#: js/messages.php:100
#, fuzzy
#| msgid "Suggestions:"
msgid "Questions"
msgstr "Sugerencias:"
msgstr "Preguntas"
#: js/messages.php:101 server_status.php:851
msgid "Traffic"
@ -1189,24 +1187,22 @@ msgid "Settings"
msgstr "Configuración"
#: js/messages.php:103
#, fuzzy
#| msgid "Remove database"
msgid "Remove chart"
msgstr "Eliminar base de datos"
msgstr "Eliminar gráfico"
#: js/messages.php:104
msgid "Edit labels and series"
msgstr ""
msgstr "Editar etiquetas y series"
#: js/messages.php:105
#, fuzzy
#| msgid "Snap to grid"
msgid "Add chart to grid"
msgstr "Cuadrícula magnética"
msgstr "Agregar gráfico a la grilla"
#: js/messages.php:107
msgid "Please add at least one variable to the series"
msgstr ""
msgstr "Por favor agregue al menos una variable a la serie"
#: js/messages.php:108 libraries/display_export.lib.php:306
#: libraries/display_tbl.lib.php:564 libraries/export/sql.php:1039
@ -1217,35 +1213,35 @@ msgstr "Ninguna"
#: js/messages.php:109
msgid "Resume monitor"
msgstr ""
msgstr "Reanudar monitorización"
#: js/messages.php:110
msgid "Pause monitor"
msgstr ""
msgstr "Pausar monitorización"
#: js/messages.php:112
msgid "general_log and slow_query_log is enabled."
msgstr ""
msgstr "«general_log» y «slow_query_log» activos."
#: js/messages.php:113
msgid "general_log is enabled."
msgstr ""
msgstr "«general_log» activo."
#: js/messages.php:114
msgid "slow_query_log is enabled."
msgstr ""
msgstr "«slow_query_log» activo."
#: js/messages.php:115
msgid "slow_query_log and general_log is disabled."
msgstr ""
msgstr "«slow_query_log» y «general_log» desactivados."
#: js/messages.php:116
msgid "log_output is not set to TABLE."
msgstr ""
msgstr "«log_output» no está definido como TABLE."
#: js/messages.php:117
msgid "log_output is set to TABLE."
msgstr ""
msgstr "«log_output» está definido como TABLE."
#: js/messages.php:118
#, php-format
@ -1254,108 +1250,113 @@ msgid ""
"than %d seconds. It is advisable to set this long_query_time 0-2 seconds, "
"depending on your system."
msgstr ""
"«slow_query_log» activo, pero el servidor sólo registra consultas que tardan "
"más de %d segundos. Es recomendable configurar «long_query_time» entre 0 y "
"2 segundos dependiendo del equipo."
#: js/messages.php:119
#, php-format
msgid "long_query_time is set to %d second(s)."
msgstr ""
msgstr "«long_query_time» está configurado a %d segundo(s)."
#: js/messages.php:120
msgid ""
"Following settings will be applied globally and reset to default on server "
"restart:"
msgstr ""
"Las siguientes configuraciones serán aplicadas globalmente y volverán a sus "
"valores predeterminados al reiniciar el servidor:"
#. l10n: %s is FILE or TABLE
#: js/messages.php:122
#, fuzzy, php-format
#, php-format
#| msgid "Save output to a file"
msgid "Set log_output to %s"
msgstr "Guardar salida a un archivo"
msgstr "Configurar «log_output» a %s"
#. l10n: Enable in this context means setting a status variable to ON
#: js/messages.php:124
#, fuzzy, php-format
#, php-format
#| msgid "Enabled"
msgid "Enable %s"
msgstr "Habilitado"
msgstr "Habilitar %s"
#. l10n: Disable in this context means setting a status variable to OFF
#: js/messages.php:126
#, fuzzy, php-format
#, php-format
#| msgid "Disabled"
msgid "Disable %s"
msgstr "Deshabilitado"
msgstr "Deshabilitar %s"
#. l10n: %d seconds
#: js/messages.php:128
#, php-format
msgid "Set long_query_time to %ds"
msgstr ""
msgstr "Definir «long_query_time» a %ds"
#: js/messages.php:129
msgid ""
"You don't have super user rights to change this variables. Please log in as "
"root account or contact your database administrator."
msgstr ""
"No posee permisos de superusuario para cambiar estas variables. Por favor "
"inicie sesión con la cuenta root o contacte a su administrador de base de "
"datos."
#: js/messages.php:130
#, fuzzy
#| msgid "Manage your settings"
msgid "Change settings"
msgstr "Administrar tu configuración"
msgstr "Cambiar configuraciones"
#: js/messages.php:131
#, fuzzy
#| msgid "More settings"
msgid "Current settings"
msgstr "Más configuraciones"
msgstr "Configuraciones actuales"
#: js/messages.php:133 server_status.php:1345
#, fuzzy
#| msgid "Chart title"
msgid "Chart Title"
msgstr "Título del gráfico"
#. l10n: As in differential values
#: js/messages.php:135
#, fuzzy
#| msgid "Difference"
msgid "Differential"
msgstr "Diferencia"
msgstr "Diferencial"
#: js/messages.php:136
#, php-format
msgid "Divided by %s:"
msgstr ""
msgstr "Dividido por %s:"
#: js/messages.php:138
#, fuzzy
#| msgid "Select page"
msgid "Selected time range:"
msgstr "Seleccionar página"
msgstr "Rango de tiempo seleccionado:"
#: js/messages.php:139
msgid "Group together INSERTs into same table"
msgstr ""
msgstr "Agrupar INSERTs en la misma tabla"
#: js/messages.php:140
msgid ""
"<p>Choose from which log you want the statistics to be generated from.</p> "
"Results are grouped by query text."
msgstr ""
"<p>Elegir el registro del que deseagenerar estadísticas.</p> Los resultados "
"se agruparán por el texto de la consulta."
#: js/messages.php:141
msgid "From slow log"
msgstr ""
msgstr "Del registro de consultas lentas"
#: js/messages.php:142
msgid "From general log"
msgstr ""
msgstr "Del registro general"
#: js/messages.php:143
msgid "Analysing & loading logs. This may take a while."
msgstr ""
msgstr "Analizando y cargando registros. Esto puede demorar."
#: js/messages.php:144
msgid ""
@ -1363,6 +1364,9 @@ msgid ""
"together. However only the SQL Text is being compared, thus the queries "
"other attributes such as start time may differ."
msgstr ""
"Esta columna muestra la cantidad de consultas idénticas que fueron "
"agrupadas. Sin embargo, sólo el texto SQL es comparado, por lo que los demás "
"atributos de las consultas como el tiempo de inicio podría diferir."
#: js/messages.php:145
msgid ""
@ -1370,20 +1374,25 @@ msgid ""
"same table are also being grouped together, disregarding of the inserted "
"data."
msgstr ""
"Dado que se eligió agrupar consultas INSERT, las consultas INSERT a la misma "
"tabla también fueron agrupadas sin importar los datos agregados."
#: js/messages.php:146
msgid "Log data loaded. Queries executed in this time span:"
msgstr ""
"Los datos del registros fueron cargados. Consultas ejecutadas en este "
"período de tiempo:"
#: js/messages.php:148
#, fuzzy
#| msgid "Jump to database"
msgid "Jump to Log table"
msgstr "Saltar a la base de datos"
msgstr "Saltar a la tabla de registros"
#: js/messages.php:149
msgid "Log analysed, but not data found in this time span."
msgstr ""
"Registros analizados, pero no se encontraron datos en este período de "
"tiempo."
#: js/messages.php:153 libraries/tbl_properties.inc.php:780
#: pmd_general.php:388 pmd_general.php:425 pmd_general.php:545
@ -9182,10 +9191,9 @@ msgstr "Todas las variables de estado"
#: server_status.php:576
msgid "Monitor"
msgstr ""
msgstr "Monitorizar"
#: server_status.php:586 server_status.php:608
#, fuzzy
#| msgid "Refresh rate:"
msgid "Refresh rate: "
msgstr "Velocidad de actualización:"
@ -9208,10 +9216,10 @@ msgstr "Enlaces relacionados:"
#. l10n: Questions is the name of a MySQL Status variable
#: server_status.php:695
#, fuzzy, php-format
#, php-format
#| msgid "Network traffic since startup: %s"
msgid "Questions since startup: %s"
msgstr "Tráfico de red desde el inicio: %s"
msgstr "Preguntas desde el inicio: %s"
#: server_status.php:701 server_status.php:736 server_status.php:852
#: server_status.php:897
@ -9241,10 +9249,10 @@ msgid "Network traffic since startup: %s"
msgstr "Tráfico de red desde el inicio: %s"
#: server_status.php:809
#, fuzzy, php-format
#, php-format
#| msgid "This MySQL server has been running for %s. It started up on %s."
msgid "This MySQL server has been running for %1$s. It started up on %2$s."
msgstr "Este servidor MySQL ha estado activo durante %s. Se inició en %s."
msgstr "Este servidor MySQL ha estado activo durante %1$s. Se inició en %2$s."
#: server_status.php:819
msgid ""
@ -9320,6 +9328,8 @@ msgid ""
"The number of connections that were aborted because the client died without "
"closing the connection properly."
msgstr ""
"La cantidad de conexiones que fueron abandonadas porque el cliente murió sin "
"cerrar la conexión apropiadamente."
#: server_status.php:1033
msgid "The number of failed attempts to connect to the MySQL server."
@ -10009,52 +10019,46 @@ msgid "The number of threads that are not sleeping."
msgstr "El número de procesos que no están en reposo."
#: server_status.php:1277
#, fuzzy
#| msgid "Start row"
msgid "Start Monitor"
msgstr "Fila de inicio"
msgstr "Iniciar monitorización"
#: server_status.php:1285
#, fuzzy
#| msgid "Introduction"
msgid "Instructions/Setup"
msgstr "Introducción"
msgstr "Instrucciones/Configuración"
#: server_status.php:1289
msgid "Done rearranging/editing charts"
msgstr ""
msgstr "Se finalizó la reorganización/edición de gráficos"
#: server_status.php:1296
#, fuzzy
#| msgid "Add parameter"
msgid "Add chart"
msgstr "Agregar parámetro"
msgstr "Agregar gráfico"
#: server_status.php:1298
msgid "Rearrange/edit charts"
msgstr ""
msgstr "Reorganizar/editar gráficos"
#: server_status.php:1300
msgid "Refresh rate:"
msgstr "Velocidad de actualización:"
#: server_status.php:1303
#, fuzzy
#| msgid "Textarea columns"
msgid "Chart columns:"
msgstr "Columnas para las áreas de texto"
msgstr "Columnas del gráfico:"
#: server_status.php:1317
#, fuzzy
#| msgid "User for config auth"
msgid "Clear monitor config"
msgstr "Usuario para config auth"
msgstr "Vaciar configuración de monitorización"
#: server_status.php:1320
#, fuzzy
#| msgid "Introduction"
msgid "Monitor Instructions"
msgstr "Introducción"
msgstr "Instrucciones de monitorización"
#: server_status.php:1321
msgid ""
@ -10063,6 +10067,10 @@ msgid ""
" queries. For the latter you will need to log_output set to 'TABLE' "
"and have either the slow_query_log or general_log enabled."
msgstr ""
"El monitorizador de phpMyAdmin puede asistir en la optimización de la "
"configuración del servidor y rastrear consultas que toman mucho tiempo. Para "
"esto último va a necesitar que «log_output» esté definido como 'TABLE' y "
"tener activado «slow_query_log» o «general_log»."
#: server_status.php:1329
msgid ""
@ -10084,86 +10092,92 @@ msgid ""
"small time span.\n"
" </p>"
msgstr ""
"<b>Utilizando el monitorizador:</b><br />\n"
"¡Ya estás listo! Una vez que pulses en 'Iniciar monitorización' el navegador "
"actualizará a intervalos regulares todos los gráficos mostrados. Podría "
"agregar gráficos y cambiar la velocidad de actualización en 'Configuración', "
"o eliminar cualquier gráfico utilizando el icono de rueda dentada en cada "
"gráfico.\n"
"<p>Cuando vea un pico repentino de actividad, seleccione el intervalo de "
"tiempo relevante en el gráfico manteniendo pulsado el botón izquierdo y "
"arrastrando sobre el gráfico. Esto cargará las estadísticas de los "
"registros, lo que lo ayudará a encontrar la causa del pico de actividad.</p>\n"
"<p><b>Notar que:</b>\n"
"Activar «general_log» puede aumentar la carga en el servidor hast un 5-15%. "
"También esté al tanto que generar estadísticas de los registros es una tarea "
"muy intensiva por lo que se recomienda seleccionar un período de tiempo lo "
"más pequeño posible.\n"
"</p>"
#: server_status.php:1348
#, fuzzy
#| msgid "Usage"
msgid "CPU Usage"
msgstr "Uso"
msgstr "Uso de CPU"
#: server_status.php:1351
#, fuzzy
#| msgid "2. Usage"
msgid "Memory Usage"
msgstr "2. Utilización"
msgstr "Uso de memoria"
#: server_status.php:1354
#, fuzzy
#| msgid "Usage"
msgid "Swap Usage"
msgstr "Uso"
msgstr "Uso del área de intercambio"
#: server_status.php:1357
#, fuzzy
#| msgid "All status variables"
msgid "Status variable(s)"
msgstr "Todas las variables de estado"
msgstr "Variable(s) de estado"
#: server_status.php:1359
#, fuzzy
#| msgid "Select Tables"
msgid "Select series:"
msgstr "Seleccionar tablas"
msgstr "Seleccionar serie:"
#: server_status.php:1361
msgid "Commonly monitored"
msgstr ""
msgstr "Monitorizaciones comunes"
#: server_status.php:1376
#, fuzzy
#| msgid "You must provide a valid table name"
msgid "or type variable name:"
msgstr "Debe proveer un nombre de tabla válido"
msgstr "o ingrese el nombre de variable:"
#: server_status.php:1380
msgid "Display as differential value"
msgstr ""
msgstr "Mostrar como un valor diferencial"
#: server_status.php:1382
msgid "Apply a divisor"
msgstr ""
msgstr "Aplicar una división"
#: server_status.php:1389
msgid "Append unit to data values"
msgstr ""
msgstr "Agregar unidad a los valores"
#: server_status.php:1395
#, fuzzy
#| msgid "Add trigger"
msgid "Add this series"
msgstr "Agregar disparador"
msgstr "Agregar esta serie"
#: server_status.php:1397
msgid "Clear series"
msgstr ""
msgstr "Vaciar serie"
#: server_status.php:1400
#, fuzzy
#| msgid "Series:"
msgid "Series in Chart:"
msgstr "Series:"
msgstr "Series en el gráfico:"
#: server_status.php:1408
#, fuzzy
#| msgid "Loading"
msgid "Loading logs"
msgstr "Cargando"
msgstr "Cargando registros"
#: server_status.php:1411
#, fuzzy
#| msgid "Show statistics"
msgid "Log statistics"
msgstr "Mostrar estadísticas"
msgstr "Estadísticas de registros"
#: server_synchronize.php:92
msgid "Could not connect to the source"

74
po/ja.po
View File

@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-07-19 14:25+0200\n"
"PO-Revision-Date: 2011-07-18 11:16+0200\n"
"PO-Revision-Date: 2011-07-20 12:03+0200\n"
"Last-Translator: Yuichiro <yuichiro@pop07.odn.ne.jp>\n"
"Language-Team: japanese <jp@li.org>\n"
"Language: ja\n"
@ -1138,15 +1138,15 @@ msgstr "クエリの統計"
#: js/messages.php:92
msgid "System CPU Usage"
msgstr ""
msgstr "システム CPU の使用状況"
#: js/messages.php:93
msgid "System memory"
msgstr ""
msgstr "システムメモリ"
#: js/messages.php:94
msgid "System swap"
msgstr ""
msgstr "システムスワップ"
#: js/messages.php:95 libraries/common.lib.php:1276 server_status.php:1385
msgid "MiB"
@ -1158,7 +1158,7 @@ msgstr "KiB"
#: js/messages.php:98
msgid "Average load"
msgstr ""
msgstr "平均負荷"
#. l10n: Questions is the name of a MySQL Status variable
#: js/messages.php:100
@ -1177,20 +1177,18 @@ msgid "Settings"
msgstr "設定"
#: js/messages.php:103
#, fuzzy
#| msgid "Remove database"
msgid "Remove chart"
msgstr "データベースの削除"
msgstr "グラフの削除"
#: js/messages.php:104
msgid "Edit labels and series"
msgstr ""
#: js/messages.php:105
#, fuzzy
#| msgid "Snap to grid"
msgid "Add chart to grid"
msgstr "グリッドにあわせる"
msgstr "モニタリンググラフを追加する"
#: js/messages.php:107
msgid "Please add at least one variable to the series"
@ -1205,11 +1203,11 @@ msgstr "なし"
#: js/messages.php:109
msgid "Resume monitor"
msgstr ""
msgstr "モニタ再開"
#: js/messages.php:110
msgid "Pause monitor"
msgstr ""
msgstr "モニタ一時中断"
#: js/messages.php:112
msgid "general_log and slow_query_log is enabled."
@ -1300,7 +1298,6 @@ msgid "Current settings"
msgstr "詳細設定"
#: js/messages.php:133 server_status.php:1345
#, fuzzy
#| msgid "Chart title"
msgid "Chart Title"
msgstr "グラフの題名"
@ -8996,10 +8993,9 @@ msgstr "全ての状態変数"
#: server_status.php:576
msgid "Monitor"
msgstr ""
msgstr "モニタ"
#: server_status.php:586 server_status.php:608
#, fuzzy
#| msgid "Refresh rate:"
msgid "Refresh rate: "
msgstr "再描画間隔："
@ -9134,7 +9130,7 @@ msgstr "ID"
msgid ""
"The number of connections that were aborted because the client died without "
"closing the connection properly."
msgstr ""
msgstr "クライアントが適切に接続を閉じなかったために中断された接続数。"
#: server_status.php:1033
msgid "The number of failed attempts to connect to the MySQL server."
@ -9773,10 +9769,9 @@ msgid "The number of threads that are not sleeping."
msgstr "スリープしていないスレッドの数"
#: server_status.php:1277
#, fuzzy
#| msgid "Start row"
msgid "Start Monitor"
msgstr "開始行"
msgstr "モニタ開始"
#: server_status.php:1285
#, fuzzy
@ -9786,33 +9781,30 @@ msgstr "はじめに"
#: server_status.php:1289
msgid "Done rearranging/editing charts"
msgstr ""
msgstr "グラフの再配置／変更完了"
#: server_status.php:1296
#, fuzzy
#| msgid "Add parameter"
msgid "Add chart"
msgstr "パラメータを追加する"
msgstr "グラフの追加"
#: server_status.php:1298
msgid "Rearrange/edit charts"
msgstr ""
msgstr "グラフの再配置／変更"
#: server_status.php:1300
msgid "Refresh rate:"
msgstr "再描画間隔："
#: server_status.php:1303
#, fuzzy
#| msgid "Textarea columns"
msgid "Chart columns:"
msgstr "textarea の 1 行の文字数"
msgstr "1 段のグラフ数"
#: server_status.php:1317
#, fuzzy
#| msgid "User for config auth"
msgid "Clear monitor config"
msgstr "config 認証用のユーザ"
msgstr "モニタ設定のクリア"
#: server_status.php:1320
#, fuzzy
@ -9850,34 +9842,29 @@ msgid ""
msgstr ""
#: server_status.php:1348
#, fuzzy
#| msgid "Usage"
msgid "CPU Usage"
msgstr "使用量"
msgstr "CPU 使用状況"
#: server_status.php:1351
#, fuzzy
#| msgid "2. Usage"
msgid "Memory Usage"
msgstr "2. 使い方"
msgstr "メモリ使用状況"
#: server_status.php:1354
#, fuzzy
#| msgid "Usage"
msgid "Swap Usage"
msgstr "使用量"
msgstr "スワップ状況"
#: server_status.php:1357
#, fuzzy
#| msgid "All status variables"
msgid "Status variable(s)"
msgstr "全ての状態変数"
msgstr "状態変数"
#: server_status.php:1359
#, fuzzy
#| msgid "Select Tables"
msgid "Select series:"
msgstr "テーブルを選択してください"
msgstr "系列の選択："
#: server_status.php:1361
msgid "Commonly monitored"
@ -9891,31 +9878,29 @@ msgstr "有効なテーブル名を指定してください"
#: server_status.php:1380
msgid "Display as differential value"
msgstr ""
msgstr "差分値として表示する"
#: server_status.php:1382
msgid "Apply a divisor"
msgstr ""
msgstr "除数を適用する"
#: server_status.php:1389
msgid "Append unit to data values"
msgstr ""
msgstr "データ値に単位を追加する"
#: server_status.php:1395
#, fuzzy
#| msgid "Add trigger"
msgid "Add this series"
msgstr "トリガを追加する"
msgstr "この系列を追加する"
#: server_status.php:1397
msgid "Clear series"
msgstr ""
msgstr "系列をクリアする"
#: server_status.php:1400
#, fuzzy
#| msgid "SQL queries"
msgid "Series in Chart:"
msgstr "SQL クエリ"
msgstr "グラフの系列"
#: server_status.php:1408
#, fuzzy
@ -10506,10 +10491,9 @@ msgid "X-Axis:"
msgstr "横軸："
#: tbl_chart.php:113
#, fuzzy
#| msgid "SQL queries"
msgid "Series:"
msgstr "SQL クエリ"
msgstr "系列："
#: tbl_chart.php:115
#, fuzzy

296
po/sl.po
View File

@ -4,15 +4,15 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-07-19 14:25+0200\n"
"PO-Revision-Date: 2011-07-11 21:13+0200\n"
"PO-Revision-Date: 2011-07-19 23:21+0200\n"
"Last-Translator: Domen <dbc334@gmail.com>\n"
"Language-Team: slovenian <sl@li.org>\n"
"Language: sl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
"%100==4 ? 2 : 3);\n"
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || "
"n%100==4 ? 2 : 3);\n"
"X-Generator: Pootle 2.0.5\n"
#: browse_foreigners.php:35 browse_foreigners.php:53
@ -1129,15 +1129,14 @@ msgstr "Povezave / Procesi"
#. l10n: Questions is the name of a MySQL Status variable
#: js/messages.php:85
#, fuzzy
#| msgid "Connections since last refresh"
msgid "Questions since last refresh"
msgstr "Povezav od zadnje osvežitve"
msgstr "Vprašanja od zadnje osvežitve"
#. l10n: Questions is the name of a MySQL Status variable
#: js/messages.php:87
msgid "Questions (executed statements by the server)"
msgstr ""
msgstr "Vprašanja (izvedene poizvedbe strežnika)"
#: js/messages.php:89 server_status.php:574
msgid "Query statistics"
@ -1145,15 +1144,15 @@ msgstr "Statistika poizvedb"
#: js/messages.php:92
msgid "System CPU Usage"
msgstr ""
msgstr "Uporaba sistemskega CPU"
#: js/messages.php:93
msgid "System memory"
msgstr ""
msgstr "Sistemski pomnilnik"
#: js/messages.php:94
msgid "System swap"
msgstr ""
msgstr "Sistemska izmenjava"
#: js/messages.php:95 libraries/common.lib.php:1276 server_status.php:1385
msgid "MiB"
@ -1165,14 +1164,13 @@ msgstr "KiB"
#: js/messages.php:98
msgid "Average load"
msgstr ""
msgstr "Povprečno nalaganje"
#. l10n: Questions is the name of a MySQL Status variable
#: js/messages.php:100
#, fuzzy
#| msgid "Versions"
msgid "Questions"
msgstr "Različice"
msgstr "Vprašanja"
#: js/messages.php:101 server_status.php:851
msgid "Traffic"
@ -1184,24 +1182,22 @@ msgid "Settings"
msgstr "Nastavitve"
#: js/messages.php:103
#, fuzzy
#| msgid "Remove database"
msgid "Remove chart"
msgstr "Odstrani zbirko podatkov"
msgstr "Odstrani grafikon"
#: js/messages.php:104
msgid "Edit labels and series"
msgstr ""
msgstr "Uredi oznake in serije"
#: js/messages.php:105
#, fuzzy
#| msgid "Snap to grid"
msgid "Add chart to grid"
msgstr "Pripni na mrežo"
msgstr "Dodaj grafikon na mrežo"
#: js/messages.php:107
msgid "Please add at least one variable to the series"
msgstr ""
msgstr "Prosimo, v serijo dodajte vsaj eno spremenljivko"
#: js/messages.php:108 libraries/display_export.lib.php:306
#: libraries/display_tbl.lib.php:564 libraries/export/sql.php:1039
@ -1212,35 +1208,35 @@ msgstr "Brez"
#: js/messages.php:109
msgid "Resume monitor"
msgstr ""
msgstr "Nadaljuj nadziranje"
#: js/messages.php:110
msgid "Pause monitor"
msgstr ""
msgstr "Postoj nadziranje"
#: js/messages.php:112
msgid "general_log and slow_query_log is enabled."
msgstr ""
msgstr "general_log in slow_query_log sta omogočena."
#: js/messages.php:113
msgid "general_log is enabled."
msgstr ""
msgstr "general_log je omogočen."
#: js/messages.php:114
msgid "slow_query_log is enabled."
msgstr ""
msgstr "slow_query_log je omogočen."
#: js/messages.php:115
msgid "slow_query_log and general_log is disabled."
msgstr ""
msgstr "slow_query_log in general_log sta onemogočena."
#: js/messages.php:116
msgid "log_output is not set to TABLE."
msgstr ""
msgstr "log_output ni nastavljen na TABLE."
#: js/messages.php:117
msgid "log_output is set to TABLE."
msgstr ""
msgstr "log_output je nastavljen na TABLE."
#: js/messages.php:118
#, php-format
@ -1253,40 +1249,42 @@ msgstr ""
#: js/messages.php:119
#, php-format
msgid "long_query_time is set to %d second(s)."
msgstr ""
msgstr "long_query_time je nastavljen na %d sekund(o)."
#: js/messages.php:120
msgid ""
"Following settings will be applied globally and reset to default on server "
"restart:"
msgstr ""
"Naslednje nastavitve bodo uveljavljene globalno in bodo ponastavljene na "
"privzeto vrednost ob ponovnem zagonu strežnika:"
#. l10n: %s is FILE or TABLE
#: js/messages.php:122
#, fuzzy, php-format
#, php-format
#| msgid "Save output to a file"
msgid "Set log_output to %s"
msgstr "Shrani izhod v datoteko"
msgstr "Nastavi log_output na %s"
#. l10n: Enable in this context means setting a status variable to ON
#: js/messages.php:124
#, fuzzy, php-format
#, php-format
#| msgid "Enabled"
msgid "Enable %s"
msgstr "Omogočeno"
msgstr "Omogoči %s"
#. l10n: Disable in this context means setting a status variable to OFF
#: js/messages.php:126
#, fuzzy, php-format
#, php-format
#| msgid "Disabled"
msgid "Disable %s"
msgstr "Onemogočeno"
msgstr "Onemogoči %s"
#. l10n: %d seconds
#: js/messages.php:128
#, php-format
msgid "Set long_query_time to %ds"
msgstr ""
msgstr "Nastavi long_query_time na %d s"
#: js/messages.php:129
msgid ""
@ -1295,26 +1293,22 @@ msgid ""
msgstr ""
#: js/messages.php:130
#, fuzzy
#| msgid "Manage your settings"
msgid "Change settings"
msgstr "Upravljajte svoje nastavitve"
msgstr "Spremeni nastavitve"
#: js/messages.php:131
#, fuzzy
#| msgid "More settings"
msgid "Current settings"
msgstr "Več nastavitev"
msgstr "Trenutne nastavitve"
#: js/messages.php:133 server_status.php:1345
#, fuzzy
#| msgid "Chart title"
msgid "Chart Title"
msgstr "Naslov grafikona"
#. l10n: As in differential values
#: js/messages.php:135
#, fuzzy
#| msgid "Difference"
msgid "Differential"
msgstr "Razlika"
@ -1322,35 +1316,36 @@ msgstr "Razlika"
#: js/messages.php:136
#, php-format
msgid "Divided by %s:"
msgstr ""
msgstr "Deljeno z %s:"
#: js/messages.php:138
#, fuzzy
#| msgid "Select page"
msgid "Selected time range:"
msgstr "Izberi stran"
msgstr "Izbrano časovno območje:"
#: js/messages.php:139
msgid "Group together INSERTs into same table"
msgstr ""
msgstr "Združi INSERT-e skupaj v eno tabelo"
#: js/messages.php:140
msgid ""
"<p>Choose from which log you want the statistics to be generated from.</p> "
"Results are grouped by query text."
msgstr ""
"<p>Izberite dnevnike, iz katerih želite ustvariti statistiko.</p> Rezultati "
"so zbrani po besedilu poizvedbe."
#: js/messages.php:141
msgid "From slow log"
msgstr ""
msgstr "Iz počasnega dnevnika"
#: js/messages.php:142
msgid "From general log"
msgstr ""
msgstr "Iz splošnega dnevnika"
#: js/messages.php:143
msgid "Analysing & loading logs. This may take a while."
msgstr ""
msgstr "Analiziranje in nalaganje dnevnikov. To lahko traja nekaj časa."
#: js/messages.php:144
msgid ""
@ -1369,16 +1364,17 @@ msgstr ""
#: js/messages.php:146
msgid "Log data loaded. Queries executed in this time span:"
msgstr ""
"Podatki dnevnika so naloženi. Poizvedbe, izvedene v tem časovnem razponu:"
#: js/messages.php:148
#, fuzzy
#| msgid "Jump to database"
msgid "Jump to Log table"
msgstr "Pojdi v zbirko podatkov"
msgstr "Pojdi v dnevniško tabelo"
#: js/messages.php:149
msgid "Log analysed, but not data found in this time span."
msgstr ""
"Dnevnik je analiziran, vendar v tem časovnem razponu nisem našel podatkov."
#: js/messages.php:153 libraries/tbl_properties.inc.php:780
#: pmd_general.php:388 pmd_general.php:425 pmd_general.php:545
@ -2458,10 +2454,9 @@ msgid "The %s functionality is affected by a known bug, see %s"
msgstr "Na funkcionalnost %s vpliva znan hrošč, glej %s"
#: libraries/common.lib.php:2447
#, fuzzy
#| msgid "Click to select"
msgid "Click to toggle"
msgstr "Kliknite za označitev"
msgstr "Kliknite za preklop"
#: libraries/common.lib.php:2718 libraries/common.lib.php:2725
#: libraries/common.lib.php:2912 libraries/config/setup.forms.php:296
@ -6768,10 +6763,9 @@ msgid "The following query has failed: \"%s\""
msgstr "Naslednja poizvedba je spodletela: \"%s\""
#: libraries/rte/rte_events.lib.php:116
#, fuzzy
#| msgid "Sorry, we failed to restore the dropped routine."
msgid "Sorry, we failed to restore the dropped event."
msgstr "Oprostite, zavržene rutine nam ni uspelo obnoviti."
msgstr "Oprostite, zavrženega dogodka nam ni uspelo obnoviti."
#: libraries/rte/rte_events.lib.php:117 libraries/rte/rte_routines.lib.php:269
#: libraries/rte/rte_triggers.lib.php:90
@ -6779,16 +6773,16 @@ msgid "The backed up query was:"
msgstr "Varnostno kopirana poizvedba je bila:"
#: libraries/rte/rte_events.lib.php:121
#, fuzzy, php-format
#, php-format
#| msgid "Routine %1$s has been modified."
msgid "Event %1$s has been modified."
msgstr "Rutina %1$s je bila spremenjena."
msgstr "Dogodek %1$s je bil spremenjen."
#: libraries/rte/rte_events.lib.php:133
#, fuzzy, php-format
#, php-format
#| msgid "Table %1$s has been created."
msgid "Event %1$s has been created."
msgstr "Tabela %1$s je ustvarjena."
msgstr "Dogodek %1$s je ustvarjen."
#: libraries/rte/rte_events.lib.php:141 libraries/rte/rte_routines.lib.php:294
#: libraries/rte/rte_triggers.lib.php:114
@ -6796,16 +6790,14 @@ msgid "<b>One or more errors have occured while processing your request:</b>"
msgstr "<b>Med obdelovanjem vaše zahteve je prišlo do ene ali več napak:</b>"
#: libraries/rte/rte_events.lib.php:181
#, fuzzy
#| msgid "Create view"
msgid "Create event"
msgstr "Ustvari pogled"
msgstr "Ustvari dogodek"
#: libraries/rte/rte_events.lib.php:185
#, fuzzy
#| msgid "Edit server"
msgid "Edit event"
msgstr "Uredi strežnik"
msgstr "Uredi dogodek"
#: libraries/rte/rte_events.lib.php:212 libraries/rte/rte_routines.lib.php:370
#: libraries/rte/rte_routines.lib.php:1264
@ -6820,10 +6812,9 @@ msgid "Details"
msgstr "Podrobnosti"
#: libraries/rte/rte_events.lib.php:374
#, fuzzy
#| msgid "Event type"
msgid "Event name"
msgstr "Vrsta dogodka"
msgstr "Ime dogodka"
#: libraries/rte/rte_events.lib.php:395 server_binlog.php:182
msgid "Event type"
@ -6835,22 +6826,19 @@ msgid "Change to %s"
msgstr "Spremeni v %s"
#: libraries/rte/rte_events.lib.php:422
#, fuzzy
#| msgid "Execute"
msgid "Execute at"
msgstr "Izvedi"
msgstr "Izvedi ob"
#: libraries/rte/rte_events.lib.php:430
#, fuzzy
#| msgid "Execute"
msgid "Execute every"
msgstr "Izvedi"
msgstr "Izvedi vsakih"
#: libraries/rte/rte_events.lib.php:449
#, fuzzy
#| msgid "Startup"
msgid "Start"
msgstr "Zagon"
msgstr "Začetek"
#: libraries/rte/rte_events.lib.php:465 libraries/rte/rte_routines.lib.php:912
#: libraries/rte/rte_triggers.lib.php:348
@ -6858,10 +6846,9 @@ msgid "Definition"
msgstr "Opredelitev"
#: libraries/rte/rte_events.lib.php:471
#, fuzzy
#| msgid "complete inserts"
msgid "On completion preserve"
msgstr "popolne poizvedbe insert"
msgstr "Ob dokončanju ohrani"
#: libraries/rte/rte_events.lib.php:475 libraries/rte/rte_routines.lib.php:922
#: libraries/rte/rte_triggers.lib.php:354
@ -6871,13 +6858,12 @@ msgstr "Opredeljevalec"
#: libraries/rte/rte_events.lib.php:518 libraries/rte/rte_routines.lib.php:986
#: libraries/rte/rte_triggers.lib.php:392
msgid "The definer must be in the \"username@hostname\" format"
msgstr ""
msgstr "Opredeljevalec mora biti oblike \"uporabniškoime@imegostitelja\""
#: libraries/rte/rte_events.lib.php:525
#, fuzzy
#| msgid "You must provide a routine name"
msgid "You must provide an event name"
msgstr "Navesti morate ime rutine"
msgstr "Navesti morate ime dogodka"
#: libraries/rte/rte_events.lib.php:537
#, fuzzy
@ -6886,46 +6872,41 @@ msgid "You must provide a valid interval value for the event."
msgstr "Navesti morate ine in vrsto vsakega parametra rutine."
#: libraries/rte/rte_events.lib.php:549
#, fuzzy
#| msgid "You must provide a routine definition."
msgid "You must provide a valid execution time for the event."
msgstr "Navesti morate opredelitev rutine."
msgstr "Navesti morate veljavni čas izvedbe dogodka."
#: libraries/rte/rte_events.lib.php:553
#, fuzzy
#| msgid "You must provide a name and a type for each routine parameter."
msgid "You must provide a valid type for the event."
msgstr "Navesti morate ine in vrsto vsakega parametra rutine."
msgstr "Navesti morate veljavno vrsto dogodka."
#: libraries/rte/rte_events.lib.php:572
#, fuzzy
#| msgid "You must provide a routine definition."
msgid "You must provide an event definition."
msgstr "Navesti morate opredelitev rutine."
msgstr "Navesti morate opredelitev dogodka."
#: libraries/rte/rte_footer.lib.php:29
msgid "New"
msgstr ""
msgstr "Novo"
#: libraries/rte/rte_footer.lib.php:91
msgid "OFF"
msgstr ""
msgstr "IZKL"
#: libraries/rte/rte_footer.lib.php:96
msgid "ON"
msgstr ""
msgstr "VKL"
#: libraries/rte/rte_footer.lib.php:108
#, fuzzy
#| msgid "The event scheduler is enabled"
msgid "Event scheduler status"
msgstr "Razporejevalnik dogodkov je omogočen"
msgstr "Stanje razporejevalnika dogodkov"
#: libraries/rte/rte_list.lib.php:52
#, fuzzy
#| msgid "Return type"
msgid "Returns"
msgstr "Vrnjena vrsta"
msgstr "Vrnjeno"
#: libraries/rte/rte_list.lib.php:58 libraries/rte/rte_triggers.lib.php:320
#: server_status.php:976 sql.php:943
@ -7043,13 +7024,12 @@ msgstr ""
#: libraries/rte/rte_routines.lib.php:1055
msgid "You must provide a name and a type for each routine parameter."
msgstr "Navesti morate ine in vrsto vsakega parametra rutine."
msgstr "Navesti morate ime in vrsto vsakega parametra rutine."
#: libraries/rte/rte_routines.lib.php:1065
#, fuzzy
#| msgid "You must provide a name and a type for each routine parameter."
msgid "You must provide a valid return type for the routine."
msgstr "Navesti morate ine in vrsto vsakega parametra rutine."
msgstr "Navesti morate veljavno vrsto vrnjene vrednosti dogodka."
#: libraries/rte/rte_routines.lib.php:1109
msgid "You must provide a routine definition."
@ -7085,46 +7065,41 @@ msgid "Function"
msgstr "Funkcija"
#: libraries/rte/rte_triggers.lib.php:89
#, fuzzy
#| msgid "Sorry, we failed to restore the dropped routine."
msgid "Sorry, we failed to restore the dropped trigger."
msgstr "Oprostite, zavržene rutine nam ni uspelo obnoviti."
msgstr "Oprostite, zavrženega sprožilca nam ni uspelo obnoviti."
#: libraries/rte/rte_triggers.lib.php:94
#, fuzzy, php-format
#, php-format
#| msgid "Routine %1$s has been modified."
msgid "Trigger %1$s has been modified."
msgstr "Rutina %1$s je bila spremenjena."
msgstr "Sprožilec %1$s je bil spremenjen."
#: libraries/rte/rte_triggers.lib.php:106
#, fuzzy, php-format
#, php-format
#| msgid "Table %1$s has been created."
msgid "Trigger %1$s has been created."
msgstr "Tabela %1$s je ustvarjena."
msgstr "Sprožilec %1$s je ustvarjen."
#: libraries/rte/rte_triggers.lib.php:157
#, fuzzy
#| msgid "Create view"
msgid "Create trigger"
msgstr "Ustvari pogled"
msgstr "Ustvari sprožilec"
#: libraries/rte/rte_triggers.lib.php:161
#, fuzzy
#| msgid "Add a trigger"
msgid "Edit trigger"
msgstr "Dodaj sprožilec"
msgstr "Uredi sprožilec"
#: libraries/rte/rte_triggers.lib.php:301
#, fuzzy
#| msgid "Triggers"
msgid "Trigger name"
msgstr "Sprožilci"
msgstr "Ime sprožilca"
#: libraries/rte/rte_triggers.lib.php:399
#, fuzzy
#| msgid "You must provide a routine name"
msgid "You must provide a trigger name"
msgstr "Navesti morate ime rutine"
msgstr "Navesti morate ime sprožilca"
#: libraries/rte/rte_triggers.lib.php:404
#, fuzzy
@ -7133,22 +7108,19 @@ msgid "You must provide a valid timing for the trigger"
msgstr "Navesti morate ime rutine"
#: libraries/rte/rte_triggers.lib.php:409
#, fuzzy
#| msgid "You must provide a name and a type for each routine parameter."
msgid "You must provide a valid event for the trigger"
msgstr "Navesti morate ine in vrsto vsakega parametra rutine."
msgstr "Navesti morate veljavni dogodek sprožilca"
#: libraries/rte/rte_triggers.lib.php:415
#, fuzzy
#| msgid "You must provide a routine name"
msgid "You must provide a valid table name"
msgstr "Navesti morate ime rutine"
msgstr "Navesti morate veljavno ime tabele"
#: libraries/rte/rte_triggers.lib.php:421
#, fuzzy
#| msgid "You must provide a routine definition."
msgid "You must provide a trigger definition."
msgstr "Navesti morate opredelitev rutine."
msgstr "Navesti morate opredelitev sprožilca."
#: libraries/rte/rte_words.lib.php:18
msgid "Add routine"
@ -7160,16 +7132,14 @@ msgid "Export of routine %s"
msgstr "Izvoz rutine %s"
#: libraries/rte/rte_words.lib.php:21
#, fuzzy
#| msgid "Routines"
msgid "routine"
msgstr "Rutina"
msgstr "rutina"
#: libraries/rte/rte_words.lib.php:22
#, fuzzy
#| msgid "You do not have the necessary privileges to create a new routine"
msgid "You do not have the necessary privileges to create a routine"
msgstr "Nimate zadostnih pravic za ustvarjanje nove rutine"
msgstr "Nimate zadostnih pravic za ustvarjanje rutine"
#: libraries/rte/rte_words.lib.php:23
#, php-format
@ -7181,7 +7151,6 @@ msgid "There are no routines to display."
msgstr "Ni rutin za prikaz."
#: libraries/rte/rte_words.lib.php:30
#, fuzzy
#| msgid "Add a trigger"
msgid "Add trigger"
msgstr "Dodaj sprožilec"
@ -7192,29 +7161,26 @@ msgid "Export of trigger %s"
msgstr "Izvoz sprožilca %s"
#: libraries/rte/rte_words.lib.php:33
#, fuzzy
#| msgid "Triggers"
msgid "trigger"
msgstr "Sprožilci"
msgstr "sprožilec"
#: libraries/rte/rte_words.lib.php:34
#, fuzzy
#| msgid "You do not have the necessary privileges to create a new routine"
msgid "You do not have the necessary privileges to create a trigger"
msgstr "Nimate zadostnih pravic za ustvarjanje nove rutine"
msgstr "Nimate zadostnih pravic za ustvarjanje sprožilca"
#: libraries/rte/rte_words.lib.php:35
#, fuzzy, php-format
#, php-format
#| msgid "No routine with name %1$s found in database %2$s"
msgid "No trigger with name %1$s found in database %2$s"
msgstr "Rutine imenovane %1$s ni mogoče najti v zbirki podatkov %2$s"
msgstr "Sprožilca imenovanega %1$s ni mogoče najti v zbirki podatkov %2$s"
#: libraries/rte/rte_words.lib.php:36
msgid "There are no triggers to display."
msgstr "Ni sprožilcev za prikaz."
#: libraries/rte/rte_words.lib.php:42
#, fuzzy
#| msgid "Add an event"
msgid "Add event"
msgstr "Dodaj dogodek"
@ -7225,22 +7191,20 @@ msgid "Export of event %s"
msgstr "Izvoz dogodka %s"
#: libraries/rte/rte_words.lib.php:45
#, fuzzy
#| msgid "Event"
msgid "event"
msgstr "Dogodek"
msgstr "dogodek"
#: libraries/rte/rte_words.lib.php:46
#, fuzzy
#| msgid "You do not have the necessary privileges to create a new routine"
msgid "You do not have the necessary privileges to create an event"
msgstr "Nimate zadostnih pravic za ustvarjanje nove rutine"
msgstr "Nimate zadostnih pravic za ustvarjanje dogodka"
#: libraries/rte/rte_words.lib.php:47
#, fuzzy, php-format
#, php-format
#| msgid "No event with name %s found in database %s"
msgid "No event with name %1$s found in database %2$s"
msgstr "Nobenega dogodka imenovanega %s ni mogoče najti v zbirki podatkov %s"
msgstr "Dogodka imenovanega %1$s ni mogoče najti v zbirki podatkov %2$s"
#: libraries/rte/rte_words.lib.php:48
msgid "There are no events to display."
@ -9118,13 +9082,12 @@ msgstr "Vse spremenljivke stanja"
#: server_status.php:576
msgid "Monitor"
msgstr ""
msgstr "Nadziranje"
#: server_status.php:586 server_status.php:608
#, fuzzy
#| msgid "Refresh rate:"
msgid "Refresh rate: "
msgstr "Hitrost osveževanja:"
msgstr "Hitrost osveževanja: "
#: server_status.php:629
msgid "Containing the word:"
@ -9144,10 +9107,10 @@ msgstr "Sorodne povezave:"
#. l10n: Questions is the name of a MySQL Status variable
#: server_status.php:695
#, fuzzy, php-format
#, php-format
#| msgid "Network traffic since startup: %s"
msgid "Questions since startup: %s"
msgstr "Promet omrežja od zagona: %s"
msgstr "Vprašanja od zagona: %s"
#: server_status.php:701 server_status.php:736 server_status.php:852
#: server_status.php:897
@ -9177,10 +9140,10 @@ msgid "Network traffic since startup: %s"
msgstr "Promet omrežja od zagona: %s"
#: server_status.php:809
#, fuzzy, php-format
#, php-format
#| msgid "This MySQL server has been running for %s. It started up on %s."
msgid "This MySQL server has been running for %1$s. It started up on %2$s."
msgstr "Strežnik MySQL deluje že %s. Zagnal se je %s."
msgstr "Strežnik MySQL deluje že %1$s. Zagnal se je %2$s."
#: server_status.php:819
msgid ""
@ -9254,6 +9217,8 @@ msgid ""
"The number of connections that were aborted because the client died without "
"closing the connection properly."
msgstr ""
"Število prekinjenih povezav zaradi izgube odjemalca, ki ni primerno prekinil "
"povezave."
#: server_status.php:1033
msgid "The number of failed attempts to connect to the MySQL server."
@ -9912,52 +9877,46 @@ msgid "The number of threads that are not sleeping."
msgstr "Število niti, ki ne spijo."
#: server_status.php:1277
#, fuzzy
#| msgid "Start row"
msgid "Start Monitor"
msgstr "Začetna vrstica"
msgstr "Začni nadziranje"
#: server_status.php:1285
#, fuzzy
#| msgid "Introduction"
msgid "Instructions/Setup"
msgstr "Uvod"
msgstr "Navodila/Namestitev"
#: server_status.php:1289
msgid "Done rearranging/editing charts"
msgstr ""
msgstr "Preurejanje/urejanje grafikonov je končano"
#: server_status.php:1296
#, fuzzy
#| msgid "Add parameter"
msgid "Add chart"
msgstr "Dodaj parameter"
msgstr "Dodaj grafikon"
#: server_status.php:1298
msgid "Rearrange/edit charts"
msgstr ""
msgstr "Preuredi/uredi grafikone"
#: server_status.php:1300
msgid "Refresh rate:"
msgstr "Hitrost osveževanja:"
#: server_status.php:1303
#, fuzzy
#| msgid "Textarea columns"
msgid "Chart columns:"
msgstr "Stolpcev besedilnega polja"
msgstr "Stolpci grafikona:"
#: server_status.php:1317
#, fuzzy
#| msgid "User for config auth"
msgid "Clear monitor config"
msgstr "Uporabnik za overovitev config"
msgstr "Počisti konfiguracijo nadziranja"
#: server_status.php:1320
#, fuzzy
#| msgid "Introduction"
msgid "Monitor Instructions"
msgstr "Uvod"
msgstr "Navodila nadziranja"
#: server_status.php:1321
msgid ""
@ -9989,82 +9948,73 @@ msgid ""
msgstr ""
#: server_status.php:1348
#, fuzzy
#| msgid "Usage"
msgid "CPU Usage"
msgstr "Uporaba"
msgstr "Uporaba CPU"
#: server_status.php:1351
msgid "Memory Usage"
msgstr ""
msgstr "Uporaba pomnilnika"
#: server_status.php:1354
#, fuzzy
#| msgid "Usage"
msgid "Swap Usage"
msgstr "Uporaba"
msgstr "Uporaba izmenjevanja"
#: server_status.php:1357
#, fuzzy
#| msgid "All status variables"
msgid "Status variable(s)"
msgstr "Vse spremenljivke stanja"
msgstr "Spremenljivke stanja"
#: server_status.php:1359
#, fuzzy
#| msgid "Select Tables"
msgid "Select series:"
msgstr "Izberi tabele"
msgstr "Izberite serije:"
#: server_status.php:1361
msgid "Commonly monitored"
msgstr ""
msgstr "Pogosto nadzirano"
#: server_status.php:1376
#, fuzzy
#| msgid "You must provide a routine name"
msgid "or type variable name:"
msgstr "Navesti morate ime rutine"
msgstr "ali vnesite ime spremenljivke:"
#: server_status.php:1380
msgid "Display as differential value"
msgstr ""
msgstr "Prikaži kot vrednost razlike"
#: server_status.php:1382
msgid "Apply a divisor"
msgstr ""
msgstr "Uporabi delitelja"
#: server_status.php:1389
msgid "Append unit to data values"
msgstr ""
msgstr "Pripni enoto k vrednostim podatkov"
#: server_status.php:1395
#, fuzzy
#| msgid "Add a trigger"
msgid "Add this series"
msgstr "Dodaj sprožilec"
msgstr "Dodaj serijo"
#: server_status.php:1397
msgid "Clear series"
msgstr ""
msgstr "Počisti serije"
#: server_status.php:1400
#, fuzzy
#| msgid "Series:"
msgid "Series in Chart:"
msgstr "Serije:"
msgstr "Serije v grafikonu:"
#: server_status.php:1408
#, fuzzy
#| msgid "Loading"
msgid "Loading logs"
msgstr "Nalaganje"
msgstr "Dnevniki nalaganja"
#: server_status.php:1411
#, fuzzy
#| msgid "Show statistics"
msgid "Log statistics"
msgstr "Pokaži statistiko"
msgstr "Statistika dnevnikov"
#: server_synchronize.php:92
msgid "Could not connect to the source"

138
po/tr.po
View File

@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-07-19 14:25+0200\n"
"PO-Revision-Date: 2011-07-16 12:12+0200\n"
"PO-Revision-Date: 2011-07-19 20:23+0200\n"
"Last-Translator: Burak Yavuz <hitowerdigit@hotmail.com>\n"
"Language-Team: turkish <tr@li.org>\n"
"Language: tr\n"
@ -1121,15 +1121,14 @@ msgstr "Bağlantılar / İşlemler"
#. l10n: Questions is the name of a MySQL Status variable
#: js/messages.php:85
#, fuzzy
#| msgid "Connections since last refresh"
msgid "Questions since last refresh"
msgstr "Son yenilemeden bu yana bağlantılar"
msgstr "Son yenilemeden bu yana sorular"
#. l10n: Questions is the name of a MySQL Status variable
#: js/messages.php:87
msgid "Questions (executed statements by the server)"
msgstr ""
msgstr "Sorular (sunucu tarafından çalıştırılan ifadeler)"
#: js/messages.php:89 server_status.php:574
msgid "Query statistics"
@ -1137,15 +1136,15 @@ msgstr "Sorgu istatistikleri"
#: js/messages.php:92
msgid "System CPU Usage"
msgstr ""
msgstr "Sistem İşlemcisi Kullanımı"
#: js/messages.php:93
msgid "System memory"
msgstr ""
msgstr "Sistem belleği"
#: js/messages.php:94
msgid "System swap"
msgstr ""
msgstr "Sistem takası"
#: js/messages.php:95 libraries/common.lib.php:1276 server_status.php:1385
msgid "MiB"
@ -1157,14 +1156,13 @@ msgstr "KiB"
#: js/messages.php:98
msgid "Average load"
msgstr ""
msgstr "Ortalama yükleme"
#. l10n: Questions is the name of a MySQL Status variable
#: js/messages.php:100
#, fuzzy
#| msgid "Versions"
msgid "Questions"
msgstr "Sürümler"
msgstr "Sorular"
#: js/messages.php:101 server_status.php:851
msgid "Traffic"
@ -1176,24 +1174,22 @@ msgid "Settings"
msgstr "Ayarlar"
#: js/messages.php:103
#, fuzzy
#| msgid "Remove database"
msgid "Remove chart"
msgstr "Veritabanını kaldır"
msgstr "Çizelgeyi kaldır"
#: js/messages.php:104
msgid "Edit labels and series"
msgstr ""
msgstr "Etiketleri ve diziyi düzenle"
#: js/messages.php:105
#, fuzzy
#| msgid "Snap to grid"
msgid "Add chart to grid"
msgstr "Kılavuza ayarla"
msgstr "Çizelgeyi ızgaraya ekle"
#: js/messages.php:107
msgid "Please add at least one variable to the series"
msgstr ""
msgstr "Lütfen diziye en az bir değişken ekleyin"
#: js/messages.php:108 libraries/display_export.lib.php:306
#: libraries/display_tbl.lib.php:564 libraries/export/sql.php:1039
@ -1204,35 +1200,35 @@ msgstr "Yok"
#: js/messages.php:109
msgid "Resume monitor"
msgstr ""
msgstr "İzlemeye devam et"
#: js/messages.php:110
msgid "Pause monitor"
msgstr ""
msgstr "İzlemeyi duraklat"
#: js/messages.php:112
msgid "general_log and slow_query_log is enabled."
msgstr ""
msgstr "general_log ve slow_query_log etkinleştirildi."
#: js/messages.php:113
msgid "general_log is enabled."
msgstr ""
msgstr "general_log etkinleştirildi."
#: js/messages.php:114
msgid "slow_query_log is enabled."
msgstr ""
msgstr "slow_query_log etkinleştirildi."
#: js/messages.php:115
msgid "slow_query_log and general_log is disabled."
msgstr ""
msgstr "slow_query_log ve general_log etkisizleştirildi."
#: js/messages.php:116
msgid "log_output is not set to TABLE."
msgstr ""
msgstr "log_output, TABLE olarak ayarlı değil."
#: js/messages.php:117
msgid "log_output is set to TABLE."
msgstr ""
msgstr "log_output, TABLE olarak ayarlı."
#: js/messages.php:118
#, php-format
@ -1245,40 +1241,42 @@ msgstr ""
#: js/messages.php:119
#, php-format
msgid "long_query_time is set to %d second(s)."
msgstr ""
msgstr "long_query_time %d saniyeye ayarlı."
#: js/messages.php:120
msgid ""
"Following settings will be applied globally and reset to default on server "
"restart:"
msgstr ""
"Aşağıdaki ayarlar genel olarak uygulanacak ve sunucu yeniden başlatıldığında "
"varsayılana sıfırlanacak:"
#. l10n: %s is FILE or TABLE
#: js/messages.php:122
#, fuzzy, php-format
#, php-format
#| msgid "Save output to a file"
msgid "Set log_output to %s"
msgstr "Çıktıyı dosyaya kaydet"
msgstr "log_output'u %s'a ayarla"
#. l10n: Enable in this context means setting a status variable to ON
#: js/messages.php:124
#, fuzzy, php-format
#, php-format
#| msgid "Enabled"
msgid "Enable %s"
msgstr "Etkin"
msgstr "%s etkin"
#. l10n: Disable in this context means setting a status variable to OFF
#: js/messages.php:126
#, fuzzy, php-format
#, php-format
#| msgid "Disabled"
msgid "Disable %s"
msgstr "Etkisiz"
msgstr "%s etkisiz"
#. l10n: %d seconds
#: js/messages.php:128
#, php-format
msgid "Set long_query_time to %ds"
msgstr ""
msgstr "long_query_time'ı %ds ayarla"
#: js/messages.php:129
msgid ""
@ -1287,29 +1285,25 @@ msgid ""
msgstr ""
#: js/messages.php:130
#, fuzzy
#| msgid "Manage your settings"
msgid "Change settings"
msgstr "Ayarlarınızı yönetin"
msgstr "Ayarları değiştir"
#: js/messages.php:131
#, fuzzy
#| msgid "More settings"
msgid "Current settings"
msgstr "Daha fazla ayarlar"
msgstr "Şu anki ayarlar"
#: js/messages.php:133 server_status.php:1345
#, fuzzy
#| msgid "Chart title"
msgid "Chart Title"
msgstr "Çizelge başlığı"
msgstr "Çizelge Başlığı"
#. l10n: As in differential values
#: js/messages.php:135
#, fuzzy
#| msgid "Difference"
msgid "Differential"
msgstr "Farkı"
msgstr "Ayırdedici"
#: js/messages.php:136
#, php-format
@ -1317,10 +1311,9 @@ msgid "Divided by %s:"
msgstr ""
#: js/messages.php:138
#, fuzzy
#| msgid "Select page"
msgid "Selected time range:"
msgstr "Sayfa seç"
msgstr "Seçili zaman aralığı:"
#: js/messages.php:139
msgid "Group together INSERTs into same table"
@ -1363,10 +1356,9 @@ msgid "Log data loaded. Queries executed in this time span:"
msgstr ""
#: js/messages.php:148
#, fuzzy
#| msgid "Jump to database"
msgid "Jump to Log table"
msgstr "Veritabanına git"
msgstr "Günlük tablosuna atla"
#: js/messages.php:149
msgid "Log analysed, but not data found in this time span."
@ -9050,10 +9042,9 @@ msgid "Monitor"
msgstr ""
#: server_status.php:586 server_status.php:608
#, fuzzy
#| msgid "Refresh rate:"
msgid "Refresh rate: "
msgstr "Yenileme oranı:"
msgstr "Yenileme oranı: "
#: server_status.php:629
msgid "Containing the word:"
@ -9073,10 +9064,10 @@ msgstr "İlgili bağlantılar:"
#. l10n: Questions is the name of a MySQL Status variable
#: server_status.php:695
#, fuzzy, php-format
#, php-format
#| msgid "Network traffic since startup: %s"
msgid "Questions since startup: %s"
msgstr "Başlangıçtan bu yana ağ trafiği: %s"
msgstr "Başlangıçtan bu yana sorular: %s"
#: server_status.php:701 server_status.php:736 server_status.php:852
#: server_status.php:897
@ -9106,10 +9097,10 @@ msgid "Network traffic since startup: %s"
msgstr "Başlangıçtan bu yana ağ trafiği: %s"
#: server_status.php:809
#, fuzzy, php-format
#, php-format
#| msgid "This MySQL server has been running for %s. It started up on %s."
msgid "This MySQL server has been running for %1$s. It started up on %2$s."
msgstr "Bu MySQL sunucusunun çalışma süresi: %s. Başlatıldığı zaman: %s."
msgstr "Bu MySQL sunucusunun çalışma süresi: %1$s. Başlatıldığı zaman: %2$s."
#: server_status.php:819
msgid ""
@ -9845,26 +9836,23 @@ msgid "The number of threads that are not sleeping."
msgstr "Hala faaliyette olan işlemler sayısıdır."
#: server_status.php:1277
#, fuzzy
#| msgid "Start row"
msgid "Start Monitor"
msgstr "Başlangıç satırı"
msgstr "Başlangıç İzleyici"
#: server_status.php:1285
#, fuzzy
#| msgid "Introduction"
msgid "Instructions/Setup"
msgstr "Başlangıç"
msgstr "Yönergeler/Ayarlama"
#: server_status.php:1289
msgid "Done rearranging/editing charts"
msgstr ""
#: server_status.php:1296
#, fuzzy
#| msgid "Add parameter"
msgid "Add chart"
msgstr "Parametre ekle"
msgstr "Çizelge ekle"
#: server_status.php:1298
msgid "Rearrange/edit charts"
@ -9875,22 +9863,19 @@ msgid "Refresh rate:"
msgstr "Yenileme oranı:"
#: server_status.php:1303
#, fuzzy
#| msgid "Textarea columns"
msgid "Chart columns:"
msgstr "Metin alanı sütunları"
msgstr "Çizelge sütunları:"
#: server_status.php:1317
#, fuzzy
#| msgid "User for config auth"
msgid "Clear monitor config"
msgstr "Yapılandırma kimlik den. için kullanıcı"
msgstr "İzleme yapılandırmasını temizle"
#: server_status.php:1320
#, fuzzy
#| msgid "Introduction"
msgid "Monitor Instructions"
msgstr "Başlangıç"
msgstr "İzleme Yönergeleri"
#: server_status.php:1321
msgid ""
@ -9922,42 +9907,37 @@ msgid ""
msgstr ""
#: server_status.php:1348
#, fuzzy
#| msgid "Usage"
msgid "CPU Usage"
msgstr "Kullanım"
msgstr "İşlemci Kullanımı"
#: server_status.php:1351
msgid "Memory Usage"
msgstr ""
#: server_status.php:1354
#, fuzzy
#| msgid "Usage"
msgid "Swap Usage"
msgstr "Kullanım"
msgstr "Takas Kullanımı"
#: server_status.php:1357
#, fuzzy
#| msgid "All status variables"
msgid "Status variable(s)"
msgstr "Tüm durum değişkenleri"
msgstr "Durum değişkeni(leri)"
#: server_status.php:1359
#, fuzzy
#| msgid "Select Tables"
msgid "Select series:"
msgstr "Tabloları seç"
msgstr "Dizi seç:"
#: server_status.php:1361
msgid "Commonly monitored"
msgstr ""
#: server_status.php:1376
#, fuzzy
#| msgid "You must provide a valid table name"
msgid "or type variable name:"
msgstr "Geçerli bir tablo adı vermek zorundasınız"
msgstr "veya değişken adını yazın:"
#: server_status.php:1380
msgid "Display as differential value"
@ -9972,32 +9952,28 @@ msgid "Append unit to data values"
msgstr ""
#: server_status.php:1395
#, fuzzy
#| msgid "Add trigger"
msgid "Add this series"
msgstr "Tetikleyici ekle"
msgstr "Bu diziyi ekle"
#: server_status.php:1397
msgid "Clear series"
msgstr ""
msgstr "Diziyi temizle"
#: server_status.php:1400
#, fuzzy
#| msgid "Series:"
msgid "Series in Chart:"
msgstr "Dizi:"
msgstr "Çizelgedeki Dizi:"
#: server_status.php:1408
#, fuzzy
#| msgid "Loading"
msgid "Loading logs"
msgstr "Yükleniyor"
msgstr "Günlükler yükleniyor"
#: server_status.php:1411
#, fuzzy
#| msgid "Show statistics"
msgid "Log statistics"
msgstr "İstatistikleri göster"
msgstr "Günlük istatistikleri"
#: server_synchronize.php:92
msgid "Could not connect to the source"

2
server_sql.php
View File

@ -16,6 +16,8 @@ require_once './libraries/common.inc.php';
$GLOBALS['js_include'][] = 'functions.js';
$GLOBALS['js_include'][] = 'makegrid.js';
$GLOBALS['js_include'][] = 'sql.js';
$GLOBALS['js_include'][] = 'codemirror/lib/codemirror.js';
$GLOBALS['js_include'][] = 'codemirror/mode/mysql/mysql.js';
require_once './libraries/server_common.inc.php';
require_once './libraries/sql_query_form.lib.php';

140
server_status.php
View File

@ -44,16 +44,18 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
header('Content-Type: text/html; charset=UTF-8');
if (isset($_REQUEST['logging_vars'])) {
if(isset($_REQUEST['varName']) && isset($_REQUEST['varValue'])) {
if (isset($_REQUEST['varName']) && isset($_REQUEST['varValue'])) {
$value = PMA_sqlAddslashes($_REQUEST['varValue']);
if(!is_numeric($value)) $value="'".$value."'";
if (!is_numeric($value)) $value="'".$value."'";
if(! preg_match("/[^a-zA-Z0-9_]+/",$_REQUEST['varName']))
PMA_DBI_query('SET GLOBAL '.$_REQUEST['varName'].' = '.$value);
if (!preg_match("/[^a-zA-Z0-9_]+/",$_REQUEST['varName']))
PMA_DBI_query('SET GLOBAL ' . $_REQUEST['varName'] . ' = '.$value);
}
$loggingVars = PMA_DBI_fetch_result('SHOW GLOBAL VARIABLES WHERE Variable_name IN ("general_log","slow_query_log","long_query_time","log_output")', 0, 1);
$loggingVars = PMA_DBI_fetch_result(
"SHOW GLOBAL VARIABLES WHERE Variable_name IN (
'general_log', 'slow_query_log', 'long_query_time', 'log_output')", 0, 1);
exit(json_encode($loggingVars));
}
@ -61,7 +63,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
if (isset($_REQUEST['chart_data'])) {
switch($_REQUEST['type']) {
case 'proc':
$c = PMA_DBI_fetch_result('SHOW GLOBAL STATUS WHERE Variable_name="Connections"', 0, 1);
$c = PMA_DBI_fetch_result("SHOW GLOBAL STATUS WHERE Variable_name = 'Connections'", 0, 1);
$result = PMA_DBI_query('SHOW PROCESSLIST');
$num_procs = PMA_DBI_num_rows($result);
@ -74,7 +76,10 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
exit(json_encode($ret));
case 'queries':
$queries = PMA_DBI_fetch_result('SHOW GLOBAL STATUS WHERE Variable_name LIKE "Com_%" OR Variable_name="Questions" AND Value>0', 0, 1);
$queries = PMA_DBI_fetch_result(
"SHOW GLOBAL STATUS
WHERE (Variable_name LIKE 'Com_%' OR Variable_name = 'Questions')
AND Value > 0'", 0, 1);
cleanDeprecated($queries);
// admin commands are not queries
unset($queries['Com_admin_commands']);
@ -91,7 +96,10 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
exit(json_encode($ret));
case 'traffic':
$traffic = PMA_DBI_fetch_result('SHOW GLOBAL STATUS WHERE Variable_name="Bytes_received" OR Variable_name="Bytes_sent"', 0, 1);
$traffic = PMA_DBI_fetch_result(
"SHOW GLOBAL STATUS
WHERE Variable_name = 'Bytes_received'
OR Variable_name = 'Bytes_sent'", 0, 1);
$ret = array(
'x' => microtime(true)*1000,
@ -102,16 +110,16 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
exit(json_encode($ret));
case 'chartgrid':
$ret = json_decode($_REQUEST['requiredData'],true);
$statusVars = Array();
$ret = json_decode($_REQUEST['requiredData'], true);
$statusVars = array();
$sysinfo = $cpuload = $memory = 0;
foreach($ret as $chart_id=>$chartNodes) {
foreach($chartNodes as $node_id=>$node) {
switch($node['dataType']) {
foreach ($ret as $chart_id => $chartNodes) {
foreach ($chartNodes as $node_id => $node) {
switch ($node['dataType']) {
case 'statusvar':
// Some white list filtering
if(! preg_match('/[^a-zA-Z_]+/',$node['name']))
if (!preg_match('/[^a-zA-Z_]+/',$node['name']))
$statusVars[] = $node['name'];
break;
@ -121,14 +129,14 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
break;
case 'cpu':
if(! $sysinfo) {
if (!$sysinfo) {
require_once('libraries/sysinfo.lib.php');
$sysinfo = getSysInfo();
}
if(! $cpuload)
if (!$cpuload)
$cpuload = $sysinfo->loadavg();
if(PHP_OS == 'Linux') {
if (PHP_OS == 'Linux') {
$ret[$chart_id][$node_id]['idle'] = $cpuload['idle'];
$ret[$chart_id][$node_id]['busy'] = $cpuload['busy'];
} else
@ -137,11 +145,11 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
break;
case 'memory':
if(! $sysinfo) {
if (!$sysinfo) {
require_once('libraries/sysinfo.lib.php');
$sysinfo = getSysInfo();
}
if(! $memory)
if (!$memory)
$memory = $sysinfo->memory();
$ret[$chart_id][$node_id]['y'] = $memory[$node['name']];
@ -150,11 +158,13 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
}
}
$vars = PMA_DBI_fetch_result('SHOW GLOBAL STATUS WHERE Variable_name="' . implode('" OR Variable_name="',$statusVars) . '"', 0, 1);
$vars = PMA_DBI_fetch_result(
"SHOW GLOBAL STATUS
WHERE Variable_name='" . implode("' OR Variable_name='", $statusVars) . "'", 0, 1);
foreach($ret as $chart_id=>$chartNodes) {
foreach($chartNodes as $node_id=>$node) {
if($node['dataType'] == 'statusvar')
foreach ($ret as $chart_id => $chartNodes) {
foreach ($chartNodes as $node_id => $node) {
if ($node['dataType'] == 'statusvar')
$ret[$chart_id][$node_id]['y'] = $vars[$node['name']];
}
}
@ -165,11 +175,11 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
}
}
if(isset($_REQUEST['log_data'])) {
if (isset($_REQUEST['log_data'])) {
$start = intval($_REQUEST['time_start']);
$end = intval($_REQUEST['time_end']);
if($_REQUEST['type'] == 'slow') {
if ($_REQUEST['type'] == 'slow') {
$q = 'SELECT SUM(query_time) AS TIME(query_time), SUM(lock_time) as lock_time, '.
'SUM(rows_sent) AS rows_sent, SUM(rows_examined) AS rows_examined, sql_text, COUNT(sql_text) AS \'#\' '.
'FROM `mysql`.`slow_log` WHERE event_time > FROM_UNIXTIME('.$start.') '.
@ -177,7 +187,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
$result = PMA_DBI_try_query($q);
$return = array( 'rows' => array(), 'sum' => array());
$return = array('rows' => array(), 'sum' => array());
$type = '';
while ($row = PMA_DBI_fetch_assoc($result)) {
@ -193,14 +203,14 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
exit(json_encode($return));
}
if($_REQUEST['type'] == 'general') {
if ($_REQUEST['type'] == 'general') {
$q = 'SELECT TIME(event_time) as event_time, user_host, thread_id, server_id, argument, count(argument) as \'#\' FROM `mysql`.`general_log` WHERE command_type=\'Query\' '.
'AND event_time > FROM_UNIXTIME('.$start.') AND event_time < FROM_UNIXTIME('.$end.') '.
'AND argument REGEXP \'^(INSERT|SELECT|UPDATE|DELETE)\' GROUP by argument'; // HAVING count > 1';
$result = PMA_DBI_try_query($q);
$return = array( 'rows' => array(), 'sum' => array());
$return = array('rows' => array(), 'sum' => array());
$type = '';
$insertTables = array();
$insertTablesFirst = -1;
@ -231,9 +241,10 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
}
// Cut off big selects, but append byte count therefor
if(strlen($row['argument']) > 180)
if (strlen($row['argument']) > 180) {
$row['argument'] = substr($row['argument'],0,160) . '... [' .
PMA_formatByteDown(strlen($row['argument']), 2).']';
}
}
$return['rows'][] = $row;
$i++;
@ -325,43 +336,44 @@ cleanDeprecated($server_status);
*/
// Key_buffer_fraction
if (isset($server_status['Key_blocks_unused'])
&& isset($server_variables['key_cache_block_size'])
&& isset($server_variables['key_buffer_size'])) {
&& isset($server_variables['key_cache_block_size'])
&& isset($server_variables['key_buffer_size'])) {
$server_status['Key_buffer_fraction_%'] =
100
- $server_status['Key_blocks_unused']
* $server_variables['key_cache_block_size']
/ $server_variables['key_buffer_size']
* 100;
} elseif (
isset($server_status['Key_blocks_used'])
&& isset($server_variables['key_buffer_size'])) {
- $server_status['Key_blocks_unused']
* $server_variables['key_cache_block_size']
/ $server_variables['key_buffer_size']
* 100;
} elseif (isset($server_status['Key_blocks_used'])
&& isset($server_variables['key_buffer_size'])) {
$server_status['Key_buffer_fraction_%'] =
$server_status['Key_blocks_used']
* 1024
/ $server_variables['key_buffer_size'];
* 1024
/ $server_variables['key_buffer_size'];
}
// Ratio for key read/write
if (isset($server_status['Key_writes'])
&& isset($server_status['Key_write_requests'])
&& $server_status['Key_write_requests'] > 0)
$server_status['Key_write_ratio_%'] = 100 * $server_status['Key_writes'] / $server_status['Key_write_requests'];
&& isset($server_status['Key_write_requests'])
&& $server_status['Key_write_requests'] > 0) {
$server_status['Key_write_ratio_%'] = 100 * $server_status['Key_writes'] / $server_status['Key_write_requests'];
}
if (isset($server_status['Key_reads'])
&& isset($server_status['Key_read_requests'])
&& $server_status['Key_read_requests'] > 0)
$server_status['Key_read_ratio_%'] = 100 * $server_status['Key_reads'] / $server_status['Key_read_requests'];
&& isset($server_status['Key_read_requests'])
&& $server_status['Key_read_requests'] > 0) {
$server_status['Key_read_ratio_%'] = 100 * $server_status['Key_reads'] / $server_status['Key_read_requests'];
}
// Threads_cache_hitrate
if (isset($server_status['Threads_created'])
&& isset($server_status['Connections'])
&& $server_status['Connections'] > 0) {
&& isset($server_status['Connections'])
&& $server_status['Connections'] > 0) {
$server_status['Threads_cache_hitrate_%'] =
100
- $server_status['Threads_created']
/ $server_status['Connections']
* 100;
- $server_status['Threads_created']
/ $server_status['Connections']
* 100;
}
// Format Uptime_since_flush_status : show as days, hours, minutes, seconds
@ -450,23 +462,23 @@ $links['table'][__('Flush (close) all tables')]
= $PMA_PHP_SELF . '?flush=TABLES&amp;' . PMA_generate_common_url();
$links['table'][__('Show open tables')]
= 'sql.php?sql_query=' . urlencode('SHOW OPEN TABLES') .
'&amp;goto=server_status.php&amp;' . PMA_generate_common_url();
'&amp;goto=server_status.php&amp;' . PMA_generate_common_url();
if ($server_master_status) {
$links['repl'][__('Show slave hosts')]
= 'sql.php?sql_query=' . urlencode('SHOW SLAVE HOSTS') .
'&amp;goto=server_status.php&amp;' . PMA_generate_common_url();
$links['repl'][__('Show master status')] = '#replication_master';
$links['repl'][__('Show slave hosts')]
= 'sql.php?sql_query=' . urlencode('SHOW SLAVE HOSTS') .
'&amp;goto=server_status.php&amp;' . PMA_generate_common_url();
$links['repl'][__('Show master status')] = '#replication_master';
}
if ($server_slave_status) {
$links['repl'][__('Show slave status')] = '#replication_slave';
$links['repl'][__('Show slave status')] = '#replication_slave';
}
$links['repl']['doc'] = 'replication';
$links['qcache'][__('Flush query cache')]
= $PMA_PHP_SELF . '?flush=' . urlencode('QUERY CACHE') . '&amp;' .
PMA_generate_common_url();
PMA_generate_common_url();
$links['qcache']['doc'] = 'query_cache';
//$links['threads'][__('Show processes')]
@ -483,7 +495,7 @@ $links['innodb'][__('Variables')]
= 'server_engines.php?engine=InnoDB&amp;' . PMA_generate_common_url();
$links['innodb'][__('InnoDB Status')]
= 'server_engines.php?engine=InnoDB&amp;page=Status&amp;' .
PMA_generate_common_url();
PMA_generate_common_url();
$links['innodb']['doc'] = 'innodb';
@ -545,7 +557,8 @@ $server = 1;
if(isset($_REQUEST['server']) && intval($_REQUEST['server'])) $server = intval($_REQUEST['server']);
$server_db_isLocal = strtolower($cfg['Servers'][$server]['host']) == 'localhost'
|| $cfg['Servers'][$server]['host'] == '127.0.0.1';
|| $cfg['Servers'][$server]['host'] == '127.0.0.1'
|| $cfg['Servers'][$server]['host'] == '::1';
?>
<script type="text/javascript">
@ -1319,7 +1332,7 @@ function printMonitor() {
<div id="monitorInstructionsDialog" title="<?php echo __('Monitor Instructions'); ?>" style="display:none;">
<?php echo __('The phpMyAdmin Monitor can assist you in optimizing the server configuration and track down time intensive
queries. For the latter you will need to log_output set to \'TABLE\' and have either the slow_query_log or general_log enabled.'); ?>
queries. For the latter you will need to set log_output to \'TABLE\' and have either the slow_query_log or general_log enabled.'); ?>
<p></p>
<img class="ajaxIcon" src="<?php echo $GLOBALS['pmaThemeImage']; ?>ajax_clock_small.gif" alt="Loading">
<div class="ajaxContent">
@ -1453,6 +1466,8 @@ function refreshList($name,$defaultRate=5, $refreshRates=Array(1, 2, 5, 10, 20,
/**
* cleanup of some deprecated values
*
* @param array &$server_status
*/
function cleanDeprecated(&$server_status) {
$deprecated = array(
@ -1462,8 +1477,7 @@ function cleanDeprecated(&$server_status) {
);
foreach ($deprecated as $old => $new) {
if (isset($server_status[$old])
&& isset($server_status[$new])) {
if (isset($server_status[$old]) && isset($server_status[$new])) {
unset($server_status[$old]);
}
}

2
sql.php
View File

@ -821,7 +821,7 @@ if (0 == $num_rows || $is_affected) {
$goto = PMA_securePath($goto);
// Checks for a valid target script
$is_db = $is_table = false;
if (isset($_REQUEST['purge'])) {
if (isset($_REQUEST['purge']) && $_REQUEST['purge'] == '1') {
$table = '';
unset($url_params['table']);
}

2
tbl_change.php
View File

@ -505,7 +505,7 @@ foreach ($rows as $row_id => $vrow) {
//when copying row, it is useful to empty auto-increment column to prevent duplicate key error
if (isset($default_action) && $default_action === 'insert') {
if ($field['Key'] === 'PRI' && strpos($field['Extra'], 'auto_increment') !== false) {
$data = $special_chars_encoded = $special_chars = NULL;
$data = $special_chars_encoded = $special_chars = null;
}
}
// If a timestamp field value is not included in an update

2
tbl_sql.php
View File

@ -16,6 +16,8 @@ require_once './libraries/common.inc.php';
$GLOBALS['js_include'][] = 'functions.js';
$GLOBALS['js_include'][] = 'makegrid.js';
$GLOBALS['js_include'][] = 'sql.js';
$GLOBALS['js_include'][] = 'codemirror/lib/codemirror.js';
$GLOBALS['js_include'][] = 'codemirror/mode/mysql/mysql.js';
require './libraries/tbl_common.php';
$url_query .= '&amp;goto=tbl_sql.php&amp;back=tbl_sql.php';

6
test/.htaccess Normal file
View File

@ -0,0 +1,6 @@
# This folder does NOT need to be accessible over HTTP
# In most cases the tests included here will be run from a command line interface.
# (the following directive denies access by default)
# For more information see: http://httpd.apache.org/docs/current/mod/mod_authz_host.html#allow
Order allow,deny

28
test/Environment_test.php
View File

@ -9,7 +9,7 @@
/**
*
*/
require_once 'PHPUnit/Framework.php';
require_once 'config.sample.inc.php';
/**
* @package phpMyAdmin-test
@ -24,12 +24,28 @@ class Environment_test extends PHPUnit_Framework_TestCase
public function testMySQL()
{
$this->markTestIncomplete();
try{
$pdo = new PDO("mysql:host=".TESTSUITE_SERVER.";dbname=".TESTSUITE_DATABASE, TESTSUITE_USER, TESTSUITE_PASSWORD);
$this->assertNull($pdo->errorCode(),"Error when trying to connect to database");
//$pdo->beginTransaction();
$test = $pdo->exec("SHOW TABLES;");
//$pdo->commit();
$this->assertEquals(0, $pdo->errorCode(), 'Error trying to show tables for database');
}
catch (Exception $e){
$this->fail("Error: ".$e->getMessage());
}
// Check id MySQL server is 5 version
preg_match("/^(\d+)?\.(\d+)?\.(\*|\d+)/", $pdo->getAttribute(constant("PDO::ATTR_SERVER_VERSION")), $version_parts);
$this->assertEquals(5, $version_parts[1]);
}
public function testSession()
{
$this->markTestIncomplete();
}
//TODO: Think about this test
// public function testSession()
// {
// $this->markTestIncomplete();
// }
}
?>

24
test/FailTest.php
View File

@ -1,24 +0,0 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* tests for PMA_get_real_size()
*
* @package phpMyAdmin-test
*/
/**
*
*/
require_once 'PHPUnit/Framework.php';
/**
* @package phpMyAdmin-test
*/
class FailTest extends PHPUnit_Framework_TestCase
{
public function testFail()
{
$this->assertEquals(0, 1);
}
}
?>

57
test/PMA_escapeJsString_test.php
View File

@ -1,57 +0,0 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Test for javascript escaping.
*
* @package phpMyAdmin-test
*/
/**
* Tests core.
*/
require_once 'PHPUnit/Framework.php';
/**
* Include to test.
*/
require_once './libraries/js_escape.lib.php';
/**
* Test java script escaping.
*
* @package phpMyAdmin-test
*/
class PMA_escapeJsString_test extends PHPUnit_Framework_TestCase
{
public function testEscape_1()
{
$this->assertEquals('\\\';', PMA_escapeJsString('\';'));
}
public function testEscape_2()
{
$this->assertEquals('\r\n\\\'<scrIpt></\' + \'script>', PMA_escapeJsString("\r\n'<scrIpt></sCRIPT>"));
}
public function testEscape_3()
{
$this->assertEquals('\\\';[XSS]', PMA_escapeJsString('\';[XSS]'));
}
public function testEscape_4()
{
$this->assertEquals('</\' + \'script></head><body>[HTML]', PMA_escapeJsString('</SCRIPT></head><body>[HTML]'));
}
public function testEscape_5()
{
$this->assertEquals('"\\\'\\\\\\\'"', PMA_escapeJsString('"\'\\\'"'));
}
public function testEscape_6()
{
$this->assertEquals("\\\\\'\'\'\'\'\'\'\'\'\'\'\'\\\\", PMA_escapeJsString("\\''''''''''''\\"));
}
}
?>

114
test/PMA_isValid_test.php
View File

@ -1,114 +0,0 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* tests for PMA_pow()
*
* @package phpMyAdmin-test
*/
/**
*
*/
require_once 'PHPUnit/Framework.php';
require_once './libraries/core.lib.php';
/**
* @package phpMyAdmin-test
*/
class PMA_isValid_test extends PHPUnit_Framework_TestCase
{
public function testVarNotSetAfterTest()
{
PMA_isValid($var);
$this->assertFalse(isset($var));
}
public function testNotSet()
{
$this->assertFalse(PMA_isValid($var));
}
public function testEmptyString()
{
$var = '';
$this->assertFalse(PMA_isValid($var));
}
public function testNotEmptyString()
{
$var = '0';
$this->assertTrue(PMA_isValid($var));
}
public function testZero()
{
$var = 0;
$this->assertTrue(PMA_isValid($var));
}
public function testNullFail()
{
$var = null;
$this->assertFalse(PMA_isValid($var));
}
public function testNotSetArray()
{
$this->assertFalse(PMA_isValid($array['x']));
}
public function testScalarString()
{
$var = 'string';
$this->assertTrue(PMA_isValid($var, 'scalar'));
}
public function testScalarInt()
{
$var = 1;
$this->assertTrue(PMA_isValid($var, 'scalar'));
}
public function testScalarFloat()
{
$var = 1.1;
$this->assertTrue(PMA_isValid($var, 'scalar'));
}
public function testScalarBool()
{
$var = true;
$this->assertTrue(PMA_isValid($var, 'scalar'));
}
public function testNotScalarArray()
{
$var = array('test');
$this->assertFalse(PMA_isValid($var, 'scalar'));
}
public function testNotScalarNull()
{
$var = null;
$this->assertFalse(PMA_isValid($var, 'scalar'));
}
public function testNumericInt()
{
$var = 1;
$this->assertTrue(PMA_isValid($var, 'numeric'));
}
public function testNumericFloat()
{
$var = 1.1;
$this->assertTrue(PMA_isValid($var, 'numeric'));
}
public function testNumericZero()
{
$var = 0;
$this->assertTrue(PMA_isValid($var, 'numeric'));
}
public function testNumericString()
{
$var = '+0.1';
$this->assertTrue(PMA_isValid($var, 'numeric'));
}
public function testValueInArray()
{
$var = 'a';
$this->assertTrue(PMA_isValid($var, array('a', 'b', )));
}
public function testValueNotInArray()
{
$var = 'c';
$this->assertFalse(PMA_isValid($var, array('a', 'b', )));
}
}
?>

14
test/PMA_showHint_test.php
View File

@ -1,26 +1,17 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Test for showHint function
* Test for PMA_showHint() function from common.lib.php
*
* @package phpMyAdmin-test
* @version $Id: PMA_showHint_test.php
*/
/**
* Tests core.
*/
require_once 'PHPUnit/Framework.php';
/**
* Include to test.
*/
require_once './libraries/common.lib.php';
require_once 'libraries/common.lib.php';
/**
* Test showHint function.
*
*/
class PMA_showHint_test extends PHPUnit_Framework_TestCase
{
@ -105,6 +96,7 @@ class PMA_showHint_test extends PHPUnit_Framework_TestCase
/**
* PMA_showHint with not defined GLOBALS formatted as BB
* @depends testShowHintSetting
*/
public function testShowHintSettingBbFormat()
{

20
test/PmaSeleniumLoginTest.php
View File

@ -1,20 +0,0 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Selenium TestCase for login related tests
*
* @package phpMyAdmin-test
*/
require_once('PmaSeleniumTestCase.php');
class PmaSeleniumLoginTest extends PmaSeleniumTestCase
{
public function testLogin()
{
$this->doLogin();
$this->assertRegExp("/phpMyAdmin .*-dev/", $this->getTitle());
}
}
?>

100
test/PmaSeleniumTestCase.php
View File

@ -1,100 +0,0 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Selenium parent class for TestCases
*
* @package phpMyAdmin-test
*/
// Optionally add the php-client-driver to your include path
set_include_path(get_include_path() . PATH_SEPARATOR . '/opt/selenium-remote-control-1.0.1/selenium-php-client-driver-1.0.1/PEAR/');
require_once 'PHPUnit/Framework/TestCase.php';
require_once 'PHPUnit/Extensions/SeleniumTestCase.php';
require_once 'Testing/Selenium.php';
// Include the main phpMyAdmin user config
// currently only $cfg['Test'] is used
require_once '../config.inc.php';
class PmaSeleniumTestCase extends PHPUnit_Extensions_SeleniumTestCase
{
protected $selenium;
protected $cfg;
// TODO: find a way to get this from config.inc.php???
// PHPUnit also has a way to use XML configuration... maybe we should use that
public static $browsers = array(
array(
'name' => 'Firefox on Windows XP',
'browser' => '*firefox',
'host' => 'my.windowsxp.box',
'port' => 4444,
'timeout' => 30000,
),
array(
'name' => 'Internet Explorer on Windows XP',
'browser' => '*iexplore',
'host' => 'my.windowsxp.box',
'port' => 4444,
'timeout' => 30000,
),
);
public function setUp()
{
global $cfg;
$this->cfg =& $cfg;
//PHPUnit_Extensions_SeleniumTestCase::$browsers = $this->cfg['Test']['broswers'];
// Check if the test configuration is available
if ( empty($cfg['Test']['pma_host'])
|| empty($cfg['Test']['pma_url'])
//|| empty($cfg['Test']['browsers'])
) {
$this->fail("Missing Selenium configuration in config.inc.php"); // TODO add doc ref?
}
$this->setBrowserUrl($cfg['Test']['pma_host'] . $cfg['Test']['pma_url']);
$this->start();
}
public function tearDown()
{
$this->stop();
}
/**
* perform a login
*/
public function doLogin()
{
$this->open($this->cfg['Test']['pma_url']);
// Somehow selenium does not like the language selection on the cookie login page, forced English in the config for now.
//$this->select("lang", "label=English");
$this->waitForPageToLoad("30000");
$this->type("input_username", $this->cfg['Test']['testuser']['username']);
$this->type("input_password", $this->cfg['Test']['testuser']['password']);
$this->click("input_go");
$this->waitForPageToLoad("30001");
}
/*
* Just a dummy to show some example statements
*
public function mockTest()
{
// Slow down the testing speed, ideal for debugging
//$this->setSpeed(4000);
}
*/
}
?>

11
test/README Normal file
View File

@ -0,0 +1,11 @@
PhpMyAdmin test suite
=====================
This directory is protected from web visitors by a .htaccess file.
For more information on allowing http access to this directory see:
http://httpd.apache.org/docs/current/mod/mod_authz_host.html#allow
Please visit the wiki for more information on unit testing:
https://wiki.phpmyadmin.net/pma/UnitTesting

14
test/bootstrap-dist.php Normal file
View File

@ -0,0 +1,14 @@
<?php
// Adding phpMyAdmin sources to include path
set_include_path(get_include_path() . PATH_SEPARATOR . dirname(realpath("../index.php")));
// Setting constants for testing
define('PHPMYADMIN', 1);
define('TESTSUITE', 1);
session_start();
// You can put some additional code that should run before tests here
?>

613
test/classes/PMA_Config_test.php Normal file
View File

@ -0,0 +1,613 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Test for PMA_Config class
*
*
* @package phpMyAdmin-test
* @group current
*/
/*
* Include to test.
*/
require_once 'libraries/Config.class.php';
require_once 'libraries/relation.lib.php';
class PMA_ConfigTest extends PHPUnit_Framework_TestCase
{
/**
* Turn off backup globals
*/
protected $backupGlobals = FALSE;
/**
* @var PMA_Config
*/
protected $object;
/**
* Sets up the fixture, for example, opens a network connection.
* This method is called before a test is executed.
*/
protected function setUp()
{
$this->object = new PMA_Config;
}
/**
* Tears down the fixture, for example, closes a network connection.
* This method is called after a test is executed.
*/
protected function tearDown()
{
}
public function testCheckSystem()
{
$this->object->checkSystem();
$this->assertNotNull($this->object->get('PMA_VERSION'));
$this->assertNotEmpty($this->object->get('PMA_THEME_VERSION'));
$this->assertNotEmpty($this->object->get('PMA_THEME_GENERATION'));
}
public function testCheckOutputCompression()
{
$this->object->set('OBGzip', 'auto');
$this->object->set('PMA_USR_BROWSER_AGENT', 'IE');
$this->object->set('PMA_USR_BROWSER_VER', 6);
$this->object->checkOutputCompression();
$this->assertFalse($this->object->get("OBGzip"));
$this->object->set('OBGzip', 'auto');
$this->object->set('PMA_USR_BROWSER_AGENT', 'MOZILLA');
$this->object->set('PMA_USR_BROWSER_VER', 5);
$this->object->checkOutputCompression();
$this->assertEquals('auto',$this->object->get("OBGzip"));
ini_set('zlib.output_compression', 'Off');
$this->object->checkOutputCompression();
$this->assertFalse($this->object->get("OBGzip"));
ini_set('zlib.output_compression', 'On');
}
public function testCheckClient()
{
$_SERVER['HTTP_USER_AGENT'] = 'Opera/9.80 (X11; Linux x86_64; U; pl) Presto/2.7.62 Version/11.00';
$this->object->checkClient();
$this->assertEquals("Linux", $this->object->get('PMA_USR_OS'), "User OS expected to be Linux");
$this->assertEquals("OPERA", $this->object->get('PMA_USR_BROWSER_AGENT'), "Browser expected to be Opera");
$this->assertEquals("9.80", $this->object->get('PMA_USR_BROWSER_VER'), "Browser ver expected to be 9.80");
$_SERVER['HTTP_USER_AGENT'] = 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en-US) AppleWebKit/528.16 OmniWeb/622.8.0.112941';
$this->object->checkClient();
$this->assertEquals("Mac", $this->object->get('PMA_USR_OS'), "User OS expected to be Mac");
$this->assertEquals("OMNIWEB", $this->object->get('PMA_USR_BROWSER_AGENT'), "Browser expected to be OmniWeb");
$_SERVER['HTTP_USER_AGENT'] = 'Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 5.1)';
$this->object->checkClient();
$this->assertEquals("Win", $this->object->get('PMA_USR_OS'), "User OS expected to be Windows");
$this->assertEquals("IE", $this->object->get('PMA_USR_BROWSER_AGENT'), "Browser expected to be IE");
$_SERVER['HTTP_USER_AGENT'] = 'Mozilla/5.0 (Unknown; U; Unix BSD/SYSV system; C -) AppleWebKit/527+ (KHTML, like Gecko, Safari/419.3) Arora/0.10.2';
$this->object->checkClient();
$this->assertEquals("Unix", $this->object->get('PMA_USR_OS'), "User OS expected to be Unix");
$_SERVER['HTTP_USER_AGENT'] = 'Mozilla/4.0 (compatible; OS/2 Webexplorer)';
$this->object->checkClient();
$this->assertEquals("OS/2", $this->object->get('PMA_USR_OS'), "User OS expected to be OS/2");
$_SERVER['HTTP_USER_AGENT'] = 'Mozilla/5.0 (Windows; U; Win95; en-US; rv:1.9b) Gecko/20031208';
$this->object->checkClient();
$this->assertEquals("GECKO", $this->object->get('PMA_USR_BROWSER_AGENT'), "Browser expected to be Gecko");
$_SERVER['HTTP_USER_AGENT'] = 'Mozilla/5.0 (compatible; Konqueror/4.5; NetBSD 5.0.2; X11; amd64; en_US) KHTML/4.5.4 (like Gecko)';
$this->object->checkClient();
$this->assertEquals("KONQUEROR", $this->object->get('PMA_USR_BROWSER_AGENT'), "Browser expected to be Konqueror");
$_SERVER['HTTP_USER_AGENT'] = 'Mozilla/5.0 (X11; Linux x86_64; rv:5.0) Gecko/20100101 Firefox/5.0';
$this->object->checkClient();
$this->assertEquals("MOZILLA", $this->object->get('PMA_USR_BROWSER_AGENT'), "Browser expected to be Mozilla");
$this->assertEquals("Linux", $this->object->get('PMA_USR_OS'), "User OS expected to be Linux");
}
public function testCheckGd2()
{
$prevIsGb2Val = $this->object->get('PMA_IS_GD2');
$this->object->set('GD2Available','yes');
$this->object->checkGd2();
$this->assertEquals(1, $this->object->get('PMA_IS_GD2'));
$this->object->set('GD2Available','no');
$this->object->checkGd2();
$this->assertEquals(0, $this->object->get('PMA_IS_GD2'));
$this->object->set('GD2Available',$prevIsGb2Val);
if (!@function_exists('imagecreatetruecolor'))
{
$this->object->checkGd2();
$this->assertEquals(0, $this->object->get('PMA_IS_GD2'), 'Function imagecreatetruecolor does not exist, PMA_IS_GD2 should be 0');
}
if (@function_exists('gd_info')) {
$this->object->checkGd2();
$gd_nfo = gd_info();
if (strstr($gd_nfo["GD Version"], '2.')) {
$this->assertEquals(1, $this->object->get('PMA_IS_GD2'), 'GD Version >= 2, PMA_IS_GD2 should be 1');
} else {
$this->assertEquals(0, $this->object->get('PMA_IS_GD2'), 'GD Version < 2, PMA_IS_GD2 should be 0');
}
}
/* Get GD version string from phpinfo output */
ob_start();
phpinfo(INFO_MODULES); /* Only modules */
$a = strip_tags(ob_get_contents());
ob_end_clean();
if (preg_match('@GD Version[[:space:]]*\(.*\)@', $a, $v)) {
if (strstr($v, '2.')) {
$this->assertEquals(1, $this->object->get('PMA_IS_GD2'), 'PMA_IS_GD2 should be 1');
} else {
$this->assertEquals(0, $this->object->get('PMA_IS_GD2'), 'PMA_IS_GD2 should be 0');
}
}
}
public function testCheckWebServer()
{
$_SERVER['SERVER_SOFTWARE'] = "Microsoft-IIS 7.0";
$this->object->checkWebServer();
$this->assertEquals(1, $this->object->get('PMA_IS_IIS'));
$_SERVER['SERVER_SOFTWARE'] = "Apache/2.2.17";
$this->object->checkWebServer();
$this->assertEquals(0, $this->object->get('PMA_IS_IIS'));
unset($_SERVER['SERVER_SOFTWARE']);
}
public function testCheckWebServerOs()
{
$this->object->checkWebServerOs();
if (defined('PHP_OS'))
{
switch (PHP_OS)
{
case stristr(PHP_OS,'win'):
$this->assertEquals(1, $this->object->get('PMA_IS_WINDOWS'), 'PHP_OS equals: ' . PHP_OS . ' PMA_IS_WINDOWS should be 1');
break;
case stristr(PHP_OS, 'OS/2'):
$this->assertEquals(1, $this->object->get('PMA_IS_WINDOWS'), 'PHP_OS is OS/2 PMA_IS_WINDOWS should be 1 (No file permissions like Windows)');
break;
case stristr(PHP_OS, 'Linux'):
$this->assertEquals(0, $this->object->get('PMA_IS_WINDOWS'));
break;
}
}
else
{
$this->assertEquals(0, $this->object->get('PMA_IS_WINDOWS'), 'PMA_IS_WINDOWS Default to Unix or Equiv');
define('PHP_OS','Windows');
$this->assertEquals(1, $this->object->get('PMA_IS_WINDOWS'), 'PMA_IS_WINDOWS must be 1');
}
}
public function testCheckPhpVersion()
{
$this->object->checkPhpVersion();
$php_int_ver = 0;
$php_str_ver = phpversion();
$match = array();
preg_match('@([0-9]{1,2}).([0-9]{1,2}).([0-9]{1,2})@', phpversion(), $match);
if (isset($match) && ! empty($match[1])) {
if (! isset($match[2])) {
$match[2] = 0;
}
if (! isset($match[3])) {
$match[3] = 0;
}
$php_int_ver = (int) sprintf('%d%02d%02d', $match[1], $match[2], $match[3]);
} else {
$php_int_ver = 0;
}
$this->assertEquals($php_str_ver, $this->object->get('PMA_PHP_STR_VERSION'));
$this->assertEquals($php_int_ver, $this->object->get('PMA_PHP_INT_VERSION'));
}
public function testLoadDefaults()
{
$prevDefaultSource = $this->object->default_source;
$this->object->default_source = 'unexisted.file.php';
$this->assertFalse($this->object->loadDefaults());
$this->object->default_source = $prevDefaultSource;
include $this->object->default_source;
$loadedConf = $cfg;
unset($cfg);
$this->assertTrue($this->object->loadDefaults());
$this->assertEquals($this->object->default_source_mtime, filemtime($prevDefaultSource));
$this->assertEquals($loadedConf['Servers'][1], $this->object->default_server);
unset($loadedConf['Servers']);
$this->assertEquals($loadedConf, $this->object->default);
$expectedSettings = PMA_array_merge_recursive($this->object->settings, $loadedConf);
$this->assertEquals($expectedSettings, $this->object->settings,'Settings loaded wrong');
$this->assertFalse($this->object->error_config_default_file);
}
public function testCheckConfigSource()
{
$this->object->setSource('unexisted.config.php');
$this->assertFalse($this->object->checkConfigSource());
$this->assertEquals(0, $this->object->source_mtime);
// if(! is_readable($this->object->getSource()))
// $this->markTestSkipped('Configuration file is read only');
$this->object->setSource('libraries/config.default.php');
$this->assertNotEmpty($this->object->getSource());
$this->assertTrue($this->object->checkConfigSource());
}
/**
* @covers PMA_Config::get
* @covers PMA_Config::set
* @return void
*/
public function testGetAndSet()
{
$this->assertNull($this->object->get("unresisting_setting"));
$this->object->set('test_setting', 'test_value');
$this->assertEquals('test_value', $this->object->get('test_setting'));
}
/**
* @covers PMA_Config::getSource
* @covers PMA_Config::setSource
*/
public function testGetSetSource()
{
echo $this->object->getSource();
$this->assertEmpty($this->object->getSource(), "Source is null by default");
$this->object->setSource("config.sample.inc.php");
$this->assertEquals("config.sample.inc.php", $this->object->getSource(), "Cant set new source");
}
public function testCheckPmaAbsoluteUriEmpty()
{
$this->object->set('PmaAbsoluteUri','');
$this->assertFalse($this->object->checkPmaAbsoluteUri(), 'PmaAbsoluteUri is not set and should be error');
$this->assertTrue($this->object->error_pma_uri, 'PmaAbsoluteUri is not set and should be error');
}
/**
* @depends testCheckPmaAbsoluteUriEmpty
*/
public function testCheckPmaAbsoluteUriNormal()
{
$this->object->set('PmaAbsoluteUri','http://localhost/phpmyadmin/');
$this->object->checkPmaAbsoluteUri();
$this->assertEquals("http://localhost/phpmyadmin/", $this->object->get('PmaAbsoluteUri'));
$this->object->set('PmaAbsoluteUri','http://localhost/phpmyadmin');
$this->object->checkPmaAbsoluteUri();
$this->assertEquals("http://localhost/phpmyadmin/", $this->object->get('PmaAbsoluteUri'), 'Expected trailing slash at the end of the phpMyAdmin uri');
}
/**
* @depends testCheckPmaAbsoluteUriNormal
*/
public function testCheckPmaAbsoluteUriScheme()
{
$_SERVER['HTTP_HOST'] = 'localhost';
$_SERVER['HTTP_SCHEME'] = 'http';
$_SERVER['HTTPS'] = 'off';
$GLOBALS['PMA_PHP_SELF'] = 'index.php';
$this->object->set('PmaAbsoluteUri','');
$this->object->checkPmaAbsoluteUri();
$this->assertEquals("http://localhost/", $this->object->get('PmaAbsoluteUri'));
}
/**
* @depends testCheckPmaAbsoluteUriScheme
*/
public function testCheckPmaAbsoluteUriUser()
{
$this->object->set('PmaAbsoluteUri','http://user:pwd@localhost/phpmyadmin/index.php');
$this->object->checkPmaAbsoluteUri();
$this->assertEquals("http://user:pwd@localhost/phpmyadmin/index.php/", $this->object->get('PmaAbsoluteUri'));
$this->object->set('PmaAbsoluteUri','https://user:pwd@localhost/phpmyadmin/index.php');
$this->object->checkPmaAbsoluteUri();
$this->assertEquals("https://user:pwd@localhost/phpmyadmin/index.php/", $this->object->get('PmaAbsoluteUri'));
}
public function testCheckCollationConnection()
{
$_REQUEST['collation_connection'] = 'utf-8';
$this->object->checkCollationConnection();
$this->assertEquals($_REQUEST['collation_connection'], $this->object->get('collation_connection'));
}
public function testIsHttps()
{
$this->object->set('PmaAbsoluteUri', 'http://some_host.com/phpMyAdmin');
$this->assertFalse($this->object->isHttps());
$this->object->set('PmaAbsoluteUri', 'https://some_host.com/phpMyAdmin');
$this->assertFalse($this->object->isHttps());
}
public function testDetectHttps()
{
unset($_SERVER['REQUEST_URI']);
unset($_SERVER['HTTP_SCHEME']);
unset($_SERVER['HTTPS']);
$this->assertFalse($this->object->detectHttps());
$_SERVER['REQUEST_URI'] = '/url:\this_is_not_url';
$this->assertFalse($this->object->detectHttps());
$_SERVER['REQUEST_URI'] = 'file://localhost/phpmyadmin/index.php';
$this->assertFalse($this->object->detectHttps());
$_ENV['REQUEST_URI'] = 'http://localhost/phpmyadmin/index.php';
$this->assertFalse($this->object->detectHttps());
$_SERVER['REQUEST_URI'] = 'https://localhost/phpmyadmin/index.php';
$this->assertTrue($this->object->detectHttps());
$_SERVER['REQUEST_URI'] = 'localhost/phpmyadmin/index.php';
$_SERVER['HTTP_SCHEME'] = 'https';
$_SERVER['HTTPS'] = 'on';
$this->assertTrue($this->object->detectHttps());
}
/**
* @depends testDetectHttps
*/
public function testCheckCookiePath()
{
$this->object->checkCookiePath();
echo $this->object->get('cookie_path');
$this->assertEquals('',$this->object->get('cookie_path'));
}
/**
* @depends testCheckSystem
* @depends testCheckWebServer
* @depends testLoadDefaults
* @depends testLoad
*/
public function testEnableBc()
{
$this->object->enableBc();
$defines = array(
'PMA_VERSION',
'PMA_THEME_VERSION',
'PMA_THEME_GENERATION',
'PMA_PHP_STR_VERSION',
'PMA_PHP_INT_VERSION',
'PMA_IS_WINDOWS',
'PMA_IS_IIS',
'PMA_IS_GD2',
'PMA_USR_OS',
'PMA_USR_BROWSER_VER',
'PMA_USR_BROWSER_AGENT'
);
foreach ($defines as $define)
{
$this->assertTrue(defined($define));
$this->assertEquals(constant($define), $this->object->get($define));
}
}
/**
* @todo Implement testSave().
*/
public function testSave()
{
// Remove the following lines when you implement this test.
$this->markTestIncomplete(
'This test has not been implemented yet.'
);
}
/**
* @todo Implement testGetFontsizeForm().
*/
public function testGetFontsizeForm()
{
// Remove the following lines when you implement this test.
$this->markTestIncomplete(
'This test has not been implemented yet.'
);
}
/**
* @todo Implement testRemoveCookie().
*/
public function testRemoveCookie()
{
// Remove the following lines when you implement this test.
$this->markTestIncomplete(
'This test has not been implemented yet.'
);
}
/**
* @todo Implement testCheckFontsize().
*/
public function testCheckFontsize()
{
// Remove the following lines when you implement this test.
$this->markTestIncomplete(
'This test has not been implemented yet.'
);
}
/**
* @todo Implement testCheckUpload().
*/
public function testCheckUpload()
{
// Remove the following lines when you implement this test.
$this->markTestIncomplete(
'This test has not been implemented yet.'
);
}
/**
* @todo Implement testCheckUploadSize().
*/
public function testCheckUploadSize()
{
// Remove the following lines when you implement this test.
$this->markTestIncomplete(
'This test has not been implemented yet.'
);
}
/**
* @todo Implement testCheckIsHttps().
*/
public function testCheckIsHttps()
{
// Remove the following lines when you implement this test.
$this->markTestIncomplete(
'This test has not been implemented yet.'
);
}
/**
* @todo Implement testGetCookiePath().
*/
public function testGetCookiePath()
{
// Remove the following lines when you implement this test.
$this->markTestIncomplete(
'This test has not been implemented yet.'
);
}
/**
* @todo finish implementing test + dependencies
*/
public function testLoad()
{
$this->assertFalse($this->object->load());
$this->assertTrue($this->object->load('./libraries/config.default.php'));
}
/**
* @todo Implement testLoadUserPreferences().
*/
public function testLoadUserPreferences()
{
$this->assertNull($this->object->loadUserPreferences());
// echo $GLOBALS['cfg']['ServerDefault'];
}
/**
* @todo Implement testSetUserValue().
*/
public function testSetUserValue()
{
$this->object->setUserValue(null, 'lang', $GLOBALS['lang'], 'en');
$this->object->setUserValue("TEST_COOKIE_USER_VAL",'','cfg_val_1');
// Remove the following lines when you implement this test.
// $this->markTestIncomplete(
// 'This test has not been implemented yet.'
// );
}
/**
* @todo Implement testGetUserValue().
*/
public function testGetUserValue()
{
// Remove the following lines when you implement this test.
$this->markTestIncomplete(
'This test has not been implemented yet.'
);
}
/**
* @todo Implement testGetThemeUniqueValue().
*/
public function testGetThemeUniqueValue()
{
// Remove the following lines when you implement this test.
$this->markTestIncomplete(
'This test has not been implemented yet.'
);
}
/**
* @todo Implement testCheckPermissions().
*/
public function testCheckPermissions()
{
// Remove the following lines when you implement this test.
$this->markTestIncomplete(
'This test has not been implemented yet.'
);
}
/**
* @todo Implement testSetCookie().
*/
public function testSetCookie()
{
$this->assertFalse($this->object->setCookie('TEST_DEF_COOKIE', 'test_def_123', 'test_def_123'));
$this->assertTrue($this->object->setCookie('TEST_CONFIG_COOKIE', 'test_val_123', null, 3600));
$this->assertTrue($this->object->setCookie('TEST_CONFIG_COOKIE', '', 'default_val'));
$_COOKIE['TEST_MANUAL_COOKIE'] = 'some_test_val';
$this->assertTrue($this->object->setCookie('TEST_MANUAL_COOKIE', 'other', 'other'));
}
}
?>

120
test/PMA_Message_test.php → test/classes/PMA_Message_test.php
View File

@ -3,24 +3,16 @@
/**
* Test for PMA_Message class
*
*/
/**
* Tests core.
*/
require_once 'PHPUnit/Framework.php';
require_once 'PHPUnit/Extensions/OutputTestCase.php';
/**
* Include to test.
*/
require_once './libraries/Message.class.php';
/**
* Test class PMA_Message.
*
* @package phpMyAdmin-test
*/
/*
* Include to test.
*/
require_once 'libraries/sanitizing.lib.php';
require_once 'libraries/core.lib.php';
require_once 'libraries/Message.class.php';
class PMA_Message_test extends PHPUnit_Extensions_OutputTestCase
{
/**
@ -99,17 +91,6 @@ class PMA_Message_test extends PHPUnit_Extensions_OutputTestCase
$this->assertEquals($this->object, PMA_Message::rawError('test<&>'));
}
/**
* test rawWarning method
*/
public function testRawWarning()
{
$this->object = new PMA_Message('', PMA_Message::WARNING);
$this->object->setMessage('test<&>');
$this->assertEquals($this->object, PMA_Message::rawWarning('test<&>'));
}
/**
* test rawNotice method
*/
@ -207,15 +188,6 @@ class PMA_Message_test extends PHPUnit_Extensions_OutputTestCase
$this->assertEquals(array('*', PMA_Message::notice('test'), '', PMA_Message::notice('test')), $this->object->getAddedMessages());
}
/**
* testing add messages method
*/
public function testAddMessages()
{
$this->object->addMessages(array('test', PMA_Message::rawWarning('test')), '&');
$this->assertEquals(array('&', PMA_Message::rawNotice('test'), '&', PMA_Message::rawWarning('test')), $this->object->getAddedMessages());
}
/**
* testing add message method
*/
@ -225,8 +197,20 @@ class PMA_Message_test extends PHPUnit_Extensions_OutputTestCase
$this->assertEquals(array(PMA_Message::rawNotice('test')), $this->object->getAddedMessages());
$this->object->addMessage('test');
$this->assertEquals(array(PMA_Message::rawNotice('test'), ' ', PMA_Message::rawNotice('test')), $this->object->getAddedMessages());
$this->object->addMessage(PMA_Message::rawWarning('test'), '&');
$this->assertEquals(array(PMA_Message::rawNotice('test'), ' ', PMA_Message::rawNotice('test'), '&', PMA_Message::rawWarning('test')), $this->object->getAddedMessages());
}
/**
* testing add messages method
*/
public function testAddMessages()
{
$messages = array();
$messages[] = "Test1";
$messages[] = new PMA_Message("PMA_Test2", PMA_Message::ERROR);
$messages[] = "Test3";
$this->object->addMessages($messages, '');
$this->assertEquals(array(PMA_Message::rawNotice('Test1'), PMA_Message::error("PMA_Test2"), PMA_Message::rawNotice('Test3')), $this->object->getAddedMessages());
}
/**
@ -384,5 +368,65 @@ class PMA_Message_test extends PHPUnit_Extensions_OutputTestCase
$this->assertTrue($this->object->isDisplayed(true));
$this->assertTrue($this->object->isDisplayed(false));
}
public function providerAffectedRows(){
return array(array(1, '<div class="notice"> 1 row affected.</div>'));
return array(array(2, '<div class="notice"> 2 rows affected.</div>'));
return array(array(50000000000000, '<div class="notice"> 50000000000000 rows affected.</div>'));
}
/**
* affected_rows test
*
* @dataProvider providerAffectedRows
*/
public function testAffectedRows($rows, $output)
{
$this->object = new PMA_Message();
$msg = $this->object->affected_rows($rows);
echo $this->object->addMessage($msg);
$this->expectOutputString($output);
$this->object->display();
}
public function providerInsertedRows(){
return array(array(1, '<div class="notice"> 1 row inserted.</div>'));
return array(array(2, '<div class="notice"> 2 rows inserted.</div>'));
return array(array(50000000000000, '<div class="notice"> 50000000000000 rows inserted.</div>'));
}
/**
* inserted_rows test
*
* @dataProvider providerInsertedRows
*/
public function testInsertedRows($rows, $output)
{
$this->object = new PMA_Message();
$msg = $this->object->inserted_rows($rows);
echo $this->object->addMessage($msg);
$this->expectOutputString($output);
$this->object->display();
}
public function providerDeletedRows(){
return array(array(1, '<div class="notice"> 1 row deleted.</div>'));
return array(array(2, '<div class="notice"> 2 rows deleted.</div>'));
return array(array(50000000000000, '<div class="notice"> 50000000000000 rows deleted.</div>'));
}
/**
* deleted_rows test
*
* @dataProvider providerDeletedRows
*/
public function testDeletedRows($rows, $output)
{
$this->object = new PMA_Message();
$msg = $this->object->deleted_rows($rows);
echo $this->object->addMessage($msg);
$this->expectOutputString($output);
$this->object->display();
}
}
?>

206
test/classes/PMA_Theme_test.php Normal file
View File

@ -0,0 +1,206 @@
<?php
require_once 'libraries/Theme.class.php';
/**
* Test class for PMA_Theme.
* Generated by PHPUnit on 2011-07-18 at 03:19:13.
*/
class PMA_ThemeTest extends PHPUnit_Extensions_OutputTestCase
{
/**
* @var PMA_Theme
*/
protected $object;
/**
* Sets up the fixture, for example, opens a network connection.
* This method is called before a test is executed.
*/
protected function setUp()
{
$this->object = new PMA_Theme;
}
/**
* Tears down the fixture, for example, closes a network connection.
* This method is called after a test is executed.
*/
protected function tearDown()
{
}
public function testCheckImgPathNotExisted()
{
$this->object->setPath('path/to/nowhere');
$this->assertFalse($this->object->loadInfo());
}
public function testCheckImgPathIncorrect()
{
$this->object->setPath('./test/classes/_data/incorrect_theme');
$this->assertFalse($this->object->loadInfo(), 'Theme name is not properly set');
}
public function testCheckImgPathFull()
{
$this->object->setPath('./test/classes/_data/gen_version_info');
$this->assertTrue($this->object->loadInfo());
$this->assertEquals('Test Theme', $this->object->getName());
$this->assertEquals('2.0.3', $this->object->getVersion());
}
public function testLoadInfo()
{
$this->object->setPath('./themes/original');
$this->assertTrue($this->object->loadInfo());
$this->assertEquals(filemtime($this->object->getPath().'/info.inc.php'), $this->object->mtime_info);
$this->object->setPath('./themes/original');
$this->object->mtime_info = filemtime($this->object->getPath().'/info.inc.php');
$this->assertTrue($this->object->loadInfo());
$this->assertEquals('Original', $this->object->getName());
}
public function testLoad()
{
$newTheme = PMA_Theme::load('./themes/original');
$this->assertNotNull($newTheme);
}
public function testLoadNotExisted()
{
$this->assertFalse(PMA_Theme::load('/path/to/nowhere'));
}
/**
* @expectedException PHPUnit_Framework_Error
*/
public function testCheckImgPathBad()
{
$prevConfPath = $GLOBALS['cfg']['ThemePath'];
$GLOBALS['cfg']['ThemePath'] = 'nowhere';
$this->object->setPath('path/to/nowhere');
$this->object->checkImgPath();
}
public function testCheckImgPath()
{
$this->object->setPath('./themes/original');
$this->assertTrue($this->object->checkImgPath());
}
public function testCheckImgPathGlobals()
{
$this->object->setPath('/this/is/wrong/path');
$GLOBALS['cfg']['ThemePath'] = 'themes';
$this->assertTrue($this->object->checkImgPath());
}
/**
* @expectedException PHPUnit_Framework_Error
*/
public function testCheckImgPathGlobalsWrongPath()
{
$prevThemePath = $GLOBALS['cfg']['ThemePath'];
$GLOBALS['cfg']['ThemePath'] = 'no_themes';
$this->object->setPath('/this/is/wrong/path');
$this->object->checkImgPath();
$GLOBALS['cfg']['ThemePath'] = $prevThemePath;
}
/**
* @covers PMA_Theme::setPath
* @covers PMA_Theme::getPath
*/
public function testGetSetPath()
{
$this->assertEmpty($this->object->getPath());
$this->object->setPath('./themes/original');
$this->assertEquals('./themes/original', $this->object->getPath());
}
public function testGetLayoutFile()
{
$this->assertContains('layout.inc.php', $this->object->getLayoutFile());
}
/**
* @depends testLoadInfo
*/
public function testGetSetCheckVersion()
{
$this->assertEquals('0.0.0.0', $this->object->getVersion(), 'Version 0.0.0.0 by default');
$this->object->setVersion("1.2.3.4");
$this->assertEquals('1.2.3.4', $this->object->getVersion());
$this->assertFalse($this->object->checkVersion("0.0.1.1"));
$this->assertTrue($this->object->checkVersion("2.0.1.1"));
}
/**
* @covers PMA_Theme::getName
* @covers PMA_Theme::setName
*/
public function testGetSetName()
{
$this->assertEmpty($this->object->getName(), 'Name is empty by default');
$this->object->setName('New Theme Name');
$this->assertEquals('New Theme Name', $this->object->getName());
}
/**
* @covers PMA_Theme::getId
* @covers PMA_Theme::setId
*/
public function testGetSetId()
{
$this->assertEmpty($this->object->getId(), 'ID is empty by default');
$this->object->setId('NewID');
$this->assertEquals('NewID', $this->object->getId());
}
/**
* @covers PMA_Theme::getImgPath
* @covers PMA_Theme::setImgPath
*/
public function testGetSetImgPath()
{
$this->assertEmpty($this->object->getImgPath(), 'ImgPath is empty by default');
$this->object->setImgPath('/new/path');
$this->assertEquals('/new/path', $this->object->getImgPath());
}
public function testLoadCssWrongType()
{
$type = 'middle';
$this->assertFalse($this->object->loadCss($type));
}
public function testLoadCssNotExisted()
{
$type = 'print';
$this->assertFalse($this->object->loadCss($type));
}
/**
* @todo Implement testPrintPreview().
*/
public function testPrintPreview()
{
// Remove the following lines when you implement this test.
$this->markTestIncomplete(
'This test has not been implemented yet.'
);
}
}
?>

7
test/classes/_data/gen_version_info/info.inc.php Normal file
View File

@ -0,0 +1,7 @@
<?php
/**
* Full infrmation about theme, including $theme_generation and $theme_version
*/
$theme_name = 'Test Theme';
$theme_generation = "2";
$theme_version = "0.3";

7
test/classes/_data/incorrect_theme/info.inc.php Normal file
View File

@ -0,0 +1,7 @@
<?php
/**
* Incorrect theme information file.
* Full name is not specified
*/
$theme_full_version = '1.0';

16
test/PMA_SQL_parser_data_test.php → test/libraries/PMA_SQL_parser_data_test.php
View File

@ -6,23 +6,11 @@
* @package phpMyAdmin-test
*/
/**
* Tests core.
*/
require_once 'PHPUnit/Framework.php';
define('PHPMYADMIN', 1);
/**
/*
* Include to test.
*/
require_once './libraries/sqlparser.data.php';
require_once 'libraries/sqlparser.data.php';
/**
* Test for sorting of the arrays
*
* @package phpMyAdmin-test
*/
class PMA_SQL_parser_data_test extends PHPUnit_Framework_TestCase
{
private function assertSorted($array)

24
test/PMA_SQL_parser_test.php → test/libraries/PMA_SQL_parser_test.php
View File

@ -1,33 +1,16 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* tests for correctness of SQL parser
* Tests for correctness of SQL parser
*
* @package phpMyAdmin-test
*/
/**
* Tests core.
*/
require_once 'PHPUnit/Framework.php';
define('PHPMYADMIN', 1);
define('TESTSUITE', 1);
function __($s) {
return $s;
}
/**
/*
* Include to test.
*/
require_once './libraries/sqlparser.lib.php';
require_once 'libraries/sqlparser.lib.php';
/**
* Test for SQL parser
*
* @package phpMyAdmin-test
*/
class PMA_SQL_parser_test extends PHPUnit_Framework_TestCase
{
private function assertParser($sql, $expected, $error = '')
@ -147,6 +130,7 @@ class PMA_SQL_parser_test extends PHPUnit_Framework_TestCase
public function testParse_4()
{
$GLOBALS['is_ajax_request'] = true;
$this->assertParser('SELECT * from `aaa;', array (
'raw' => 'SELECT * from `aaa`;',
0 =>

10
test/PMA_STR_sub_test.php → test/libraries/PMA_STR_sub_test.php
View File

@ -6,11 +6,6 @@
* @package phpMyAdmin-test
*/
/**
*
*/
require_once 'PHPUnit/Framework.php';
$match = array();
preg_match('@^([0-9]{1,2})(?:.([0-9]{1,2})(?:.([0-9]{1,2}))?)?@',
phpversion(), $match);
@ -33,11 +28,8 @@ if (isset($match) && ! empty($match[1])) {
define('PMA_PHP_INT_VERSION', 0);
}
require_once './libraries/string.lib.php';
require_once 'libraries/string.lib.php';
/**
* @package phpMyAdmin-test
*/
class PMA_STR_sub_test extends PHPUnit_Framework_TestCase
{
public function testMultiByte()

16
test/PMA_blowfish_test.php → test/libraries/PMA_blowfish_test.php
View File

@ -6,21 +6,11 @@
* @package phpMyAdmin-test
*/
/**
* Tests core.
*/
require_once 'PHPUnit/Framework.php';
/**
/*
* Include to test.
*/
require_once './libraries/blowfish.php';
require_once 'libraries/blowfish.php';
/**
* Test java script escaping.
*
* @package phpMyAdmin-test
*/
class PMA_blowfish_test extends PHPUnit_Framework_TestCase
{
public function testEncryptDecryptNumbers()
@ -39,6 +29,7 @@ class PMA_blowfish_test extends PHPUnit_Framework_TestCase
PMA_blowfish_decrypt(PMA_blowfish_encrypt($string, $secret), $secret));
}
/* Due to differences in the initialization factor, these tests are not portable between systems.
public function testEncrypt()
{
$secret = '$%ÄüfuDFRR';
@ -54,6 +45,7 @@ class PMA_blowfish_test extends PHPUnit_Framework_TestCase
$decrypted = '12345678';
$this->assertEquals($decrypted, PMA_blowfish_decrypt($encrypted, $secret));
}
*/
}
?>

36
test/libraries/PMA_escapeJsString_test.php Normal file
View File

@ -0,0 +1,36 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Test for javascript escaping.
*
* @package phpMyAdmin-test
*/
/*
* Include to test.
*/
require_once 'libraries/js_escape.lib.php';
class PMA_escapeJsString_test extends PHPUnit_Framework_TestCase
{
/**
* PMA_escapeJsString tests
* @dataProvider escapeDataProvider
*/
public function testEscape($target, $source)
{
$this->assertEquals($target, PMA_escapeJsString($source));
}
public function escapeDataProvider() {
return array(
array('\\\';', '\';'),
array('\r\n\\\'<scrIpt></\' + \'script>', "\r\n'<scrIpt></sCRIPT>"),
array('\\\';[XSS]', '\';[XSS]'),
array('</\' + \'script></head><body>[HTML]', '</SCRIPT></head><body>[HTML]'),
array('\"\\\'\\\\\\\'\"', '"\'\\\'"'),
array("\\\\\'\'\'\'\'\'\'\'\'\'\'\'\\\\", "\\''''''''''''\\")
);
}
}
?>

12
test/PMA_generateCommonUrl_test.php → test/libraries/PMA_generateCommonUrl_test.php
View File

@ -6,16 +6,12 @@
* @package phpMyAdmin-test
*/
/**
*
/*
* Include to test.
*/
require_once 'PHPUnit/Framework.php';
require_once './libraries/core.lib.php';
require_once './libraries/url_generating.lib.php';
require_once 'libraries/core.lib.php';
require_once 'libraries/url_generating.lib.php';
/**
* @package phpMyAdmin-test
*/
class PMA_generate_common_url_test extends PHPUnit_Framework_TestCase
{
public function setUp()

13
test/PMA_sanitize_test.php → test/libraries/PMA_sanitize_test.php
View File

@ -6,15 +6,12 @@
* @package phpMyAdmin-test
*/
/**
*
/*
* Include to test
*/
require_once 'PHPUnit/Framework.php';
require_once './libraries/sanitizing.lib.php';
require_once 'libraries/sanitizing.lib.php';
require_once 'libraries/core.lib.php';
/**
* @package phpMyAdmin-test
*/
class PMA_sanitize_test extends PHPUnit_Framework_TestCase
{
public function testXssInHref()
@ -23,11 +20,13 @@ class PMA_sanitize_test extends PHPUnit_Framework_TestCase
PMA_sanitize('[a@javascript:alert(\'XSS\');@target]link[/a]'));
}
/*
public function testLink()
{
$this->assertEquals('<a href="http://www.phpmyadmin.net/" target="target">link</a>',
PMA_sanitize('[a@http://www.phpmyadmin.net/@target]link[/a]'));
}
*/
public function testHtmlTags()
{

10
test/PMA_transformation_getOptions_test.php → test/libraries/PMA_transformation_getOptions_test.php
View File

@ -6,15 +6,11 @@
* @package phpMyAdmin-test
*/
/**
*
/*
* Include to test.
*/
require_once 'PHPUnit/Framework.php';
require_once './libraries/transformations.lib.php';
require_once 'libraries/transformations.lib.php';
/**
* @package phpMyAdmin-test
*/
class PMA_transformation_getOptions_test extends PHPUnit_Framework_TestCase
{
public function testDefault()

72
test/libraries/common/PMA_ajaxResponse_test.php Normal file
View File

@ -0,0 +1,72 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Test for PMA_ajaxResponse from common.lib.php
*
* @package phpMyAdmin-test
* @version $Id: PMA_ajaxResponse_test.php
* @group common.lib-tests
*/
/*
* Include to test.
*/
require_once 'libraries/common.lib.php';
require_once 'libraries/Message.class.php';
class PMA_ajaxResponse_test extends PHPUnit_Extensions_OutputTestCase
{
function testAjaxResponseText()
{
$message = 'text';
$this->expectOutputString('{"success":true,"message":"' . $message . '"}');
PMA_ajaxResponse($message);
}
function testAjaxResponseTextWithExtra()
{
$message = 'text';
$exra = array('str_val' => 'te\x/t"1', 'int_val' => 10);
$this->expectOutputString('{"success":true,"message":"' . $message . '","str_val":"te\\\\x\/t\"1","int_val":10}');
PMA_ajaxResponse($message, true, $exra);
}
function testAjaxResponseTextError()
{
$message = 'error_text';
$this->expectOutputString('{"success":false,"error":"' . $message . '"}');
PMA_ajaxResponse($message, false);
}
function testAjaxResponseMessage()
{
$message = new PMA_Message("Message Text", 1);
$this->expectOutputString('{"success":true,"message":"<div class=\"success\">Message Text<\/div>"}');
PMA_ajaxResponse($message);
}
function testAjaxResponseMessageWithExtra()
{
$message = new PMA_Message("Message Text", 1);
$exra = array('str_val' => 'te\x/t"1', 'int_val' => 10);
$this->expectOutputString('{"success":true,"message":"<div class=\"success\">Message Text<\/div>","str_val":"te\\\\x\/t\"1","int_val":10}');
PMA_ajaxResponse($message, true, $exra);
}
function testAjaxResponseMessageError()
{
$message = new PMA_Message("Error Message Text", 1);
// TODO: class for output div should be "error"
$this->expectOutputString('{"success":false,"error":"<div class=\"success\">Error Message Text<\/div>"}');
PMA_ajaxResponse($message, false);
}
}

48
test/libraries/common/PMA_browseUploadFile_test.php Normal file
View File

@ -0,0 +1,48 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Test for PMA_browseUploadFile from common.lib
*
* @package phpMyAdmin-test
* @version $Id: PMA_browseUploadFile_test.php
* @group common.lib-tests
*/
/*
* Include to test.
*/
require_once 'libraries/common.lib.php';
class PMA_browseUploadFile_test extends PHPUnit_Extensions_OutputTestCase{
/*
* Data provider for test
*/
public function dataProvider() {
return array(
array(10, __('B'), "10"),
array(100, __('B'), "100"),
array(1024, __('B'), "1,024"),
array(102400, __('KiB'), "100"),
array(10240000, __('MiB'), "10"),
array(2147483648, __('MiB'), "2,048"),
array(21474836480, __('GiB'), "20")
);
}
/**
* @dataProvider dataProvider
* @return void
*/
function testBrowseUploadFile($size, $unit, $res){
$this->expectOutputString('<label for="radio_import_file">' . __("Browse your computer:") . '</label>'
. '<div id="upload_form_status" style="display: none;"></div>'
. '<div id="upload_form_status_info" style="display: none;"></div>'
. '<input type="file" name="import_file" id="input_import_file" />'
. "(" . __('Max: '). $res . $unit .")" . "\n"
. '<input type="hidden" name="MAX_FILE_SIZE" value="' .$size . '" />' . "\n");
PMA_browseUploadFile($size);
}
}

42
test/libraries/common/PMA_buildActionTitles_test.php Normal file
View File

@ -0,0 +1,42 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Test for PMA_buildActionTitles from common.lib
*
* @package phpMyAdmin-test
* @version $Id: PMA_buildActionTitles_test.php
* @group common.lib-tests
*/
/*
* Include to test.
*/
require_once 'libraries/common.lib.php';
class PMA_buildActionTitles_test extends PHPUnit_Framework_TestCase{
function testBuildActionTitles(){
$titles = array();
$titles['Browse'] = PMA_getIcon('b_browse.png', __('Browse'), true);
$titles['NoBrowse'] = PMA_getIcon('bd_browse.png', __('Browse'), true);
$titles['Search'] = PMA_getIcon('b_select.png', __('Search'), true);
$titles['NoSearch'] = PMA_getIcon('bd_select.png', __('Search'), true);
$titles['Insert'] = PMA_getIcon('b_insrow.png', __('Insert'), true);
$titles['NoInsert'] = PMA_getIcon('bd_insrow.png', __('Insert'), true);
$titles['Structure'] = PMA_getIcon('b_props.png', __('Structure'), true);
$titles['Drop'] = PMA_getIcon('b_drop.png', __('Drop'), true);
$titles['NoDrop'] = PMA_getIcon('bd_drop.png', __('Drop'), true);
$titles['Empty'] = PMA_getIcon('b_empty.png', __('Empty'), true);
$titles['NoEmpty'] = PMA_getIcon('bd_empty.png', __('Empty'), true);
$titles['Edit'] = PMA_getIcon('b_edit.png', __('Edit'), true);
$titles['NoEdit'] = PMA_getIcon('bd_edit.png', __('Edit'), true);
$titles['Export'] = PMA_getIcon('b_export.png', __('Export'), true);
$titles['NoExport'] = PMA_getIcon('bd_export.png', __('Export'), true);
$titles['Execute'] = PMA_getIcon('b_nextpage.png', __('Execute'), true);
$titles['NoExecute'] = PMA_getIcon('bd_nextpage.png', __('Execute'), true);
$this->assertEquals($titles, PMA_buildActionTitles());
}
}

27
test/PMA_cache_test.php → test/libraries/common/PMA_cache_test.php
View File

@ -5,22 +5,14 @@
*
* @package phpMyAdmin-test
* @version $Id: PMA_cache_test.php
* @group common.lib-tests
*/
/**
* Tests core.
*/
require_once 'PHPUnit/Framework.php';
/**
/*
* Include to test.
*/
require_once './libraries/common.lib.php';
require_once 'libraries/common.lib.php';
/**
* Test cache.
*
*/
class PMA_cache_test extends PHPUnit_Framework_TestCase
{
@ -99,5 +91,18 @@ class PMA_cache_test extends PHPUnit_Framework_TestCase
PMA_cacheUnset('test_data_2', true);
$this->assertArrayNotHasKey('test_data_2', $_SESSION['cache']['server_server']);
}
/**
* Test clearing user cache
*/
public function testClearUserCache()
{
$GLOBALS['server'] = 'server';
PMA_cacheSet('is_superuser', 'yes', true);
$this->assertEquals('yes', $_SESSION['cache']['server_server']['is_superuser']);
PMA_clearUserCache();
$this->assertArrayNotHasKey('is_superuser', $_SESSION['cache']['server_server']);
}
}
?>

46
test/libraries/common/PMA_checkParameters_test.php Normal file
View File

@ -0,0 +1,46 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Test for PMA_checkParameters from common.lib.php
*
* @package phpMyAdmin-test
* @version $Id: PMA_checkParameters_test.php
* @group common.lib-tests
*/
/*
* Include to test.
*/
require_once 'libraries/common.lib.php';
require_once 'libraries/Theme.class.php';
class PMA_checkParameters_test extends PHPUnit_Extensions_OutputTestCase
{
function setup()
{
$GLOBALS['PMA_Config'] = new PMA_Config();
$_SESSION['PMA_Theme'] = new PMA_Theme();
}
function testCheckParameterMissing()
{
$GLOBALS['PMA_PHP_SELF'] = PMA_getenv('PHP_SELF');
$GLOBALS['pmaThemePath'] = $_SESSION['PMA_Theme']->getPath();
$this->expectOutputRegex("/Missing parameter: field/" );
PMA_checkParameters(array('db', 'table', 'field'), false);
}
function testCheckParameter()
{
$GLOBALS['PMA_PHP_SELF'] = PMA_getenv('PHP_SELF');
$GLOBALS['pmaThemePath'] = $_SESSION['PMA_Theme']->getPath();
$GLOBALS['table'] = "tblTable";
$GLOBALS['field'] = "test_field";
$GLOBALS['sql_query'] = "SELECT * FROM tblTable;";
$this->expectOutputString("");
PMA_checkParameters(array('db', 'table', 'field', 'sql_query'), false);
}
}

37
test/libraries/common/PMA_contains_nonprintable_ascii_test.php Normal file
View File

@ -0,0 +1,37 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Test for PMA_contains_nonprintable_ascii from common.lib
*
* @package phpMyAdmin-test
* @version $Id: PMA_contains_nonprintable_ascii.php
* @group common.lib-tests
*/
/*
* Include to test.
*/
require_once 'libraries/common.lib.php';
class PMA_contains_nonprintable_ascii extends PHPUnit_Framework_TestCase{
function dataProvider(){
return array(
array("normal string", 0),
array("new\nline", 1),
array("tab\tspace", 1),
array("escape" . chr(27) . "char", 1),
array("chars%$\r\n",1),
);
}
/**
* @dataProvider dataProvider
*/
function testContainsNonPrintableAscii($str, $res){
$this->assertEquals($res,PMA_contains_nonprintable_ascii($str));
}
}
// PMA_contains_nonprintable_ascii

33
test/libraries/common/PMA_convert_bit_default_value_test.php Normal file
View File

@ -0,0 +1,33 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Test for PMA_convert_bit_default_value from common.lib
*
* @package phpMyAdmin-test
* @version $Id: PMA_convert_bit_default_value_test.php
* @group common.lib-tests
*/
/*
* Include to test.
*/
require_once 'libraries/common.lib.php';
class PMA_convert_bit_default_value_test extends PHPUnit_Framework_TestCase{
function dataProvider(){
return array(
array("b'",""),
array("b'01'","01"),
array("b'010111010'","010111010")
);
}
/**
* @dataProvider dataProvider
*/
function testConvert_bit_default_value_test($bit, $val){
$this->assertEquals($val, PMA_convert_bit_default_value($bit));
}
}

41
test/libraries/common/PMA_displayMaximumUploadSize_test.php Normal file
View File

@ -0,0 +1,41 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Test for PMA_displayMaximumUploadSize from common.lib.php
*
* @package phpMyAdmin-test
* @version $Id: PMA_displayMaximumUploadSize_test.php
* @group common.lib-tests
*/
/*
* Include to test.
*/
require_once 'libraries/common.lib.php';
class PMA_displayMaximumUploadSize_test extends PHPUnit_Framework_TestCase{
/*
* Data provider for test
*/
public function dataProvider() {
return array(
array(10, __('B'), "10"),
array(100, __('B'), "100"),
array(1024, __('B'), "1,024"),
array(102400, __('KiB'), "100"),
array(10240000, __('MiB'), "10"),
array(2147483648, __('MiB'), "2,048"),
array(21474836480, __('GiB'), "20")
);
}
/**
* @dataProvider dataProvider
* @return void
*/
function testMaximumUploadSize($size, $unit, $res){
$this->assertEquals("(" . __('Max: '). $res . $unit .")", PMA_displayMaximumUploadSize($size));
}
}

55
test/libraries/common/PMA_display_html_checkbox_test.php Normal file
View File

@ -0,0 +1,55 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Test for PMA_display_html_checkbox from common.lib.php
*
* @package phpMyAdmin-test
* @version $Id: PMA_display_html_checkbox_test.php
* @group common.lib-tests
*/
/*
* Include to test.
*/
require_once 'libraries/common.lib.php';
class PMA_display_html_checkbox_test extends PHPUnit_Extensions_OutputTestCase
{
function testDisplayHtmlCheckbox()
{
$name = "test_display_html_checkbox";
$label = "text_label_for_checkbox";
$this->expectOutputString('<input type="checkbox" name="' . $name . '" id="' . $name . '" /><label for="' . $name . '">' . $label . '</label>');
PMA_display_html_checkbox($name,$label,false,false);
}
function testDisplayHtmlCheckboxChecked()
{
$name = "test_display_html_checkbox";
$label = "text_label_for_checkbox";
$this->expectOutputString('<input type="checkbox" name="' . $name . '" id="' . $name . '" checked="checked" /><label for="' . $name . '">' . $label . '</label>');
PMA_display_html_checkbox($name,$label,true,false);
}
function testDisplayHtmlCheckboxOnclick()
{
$name = "test_display_html_checkbox";
$label = "text_label_for_checkbox";
$this->expectOutputString('<input type="checkbox" name="' . $name . '" id="' . $name . '" onclick="this.form.submit();" /><label for="' . $name . '">' . $label . '</label>');
PMA_display_html_checkbox($name,$label,false,true);
}
function testDisplayHtmlCheckboxCheckedOnclick()
{
$name = "test_display_html_checkbox";
$label = "text_label_for_checkbox";
$this->expectOutputString('<input type="checkbox" name="' . $name . '" id="' . $name . '" checked="checked" onclick="this.form.submit();" /><label for="' . $name . '">' . $label . '</label>');
PMA_display_html_checkbox($name,$label,true,true);
}
}
//PMA_display_html_checkbox

188
test/libraries/common/PMA_display_html_radio_test.php Normal file
View File

@ -0,0 +1,188 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Test for PMA_display_html_radio from common.lib.php
*
* @package phpMyAdmin-test
* @version $Id: PMA_display_html_radio_test.php
* @group common.lib-tests
*/
/*
* Include to test.
*/
require_once 'libraries/common.lib.php';
class PMA_display_html_radio_test extends PHPUnit_Extensions_OutputTestCase
{
function testDisplayHtmlRadioEmpty()
{
$name = "test_display_radio";
$choices = array();
$this->expectOutputString("");
PMA_display_html_radio($name,$choices);
}
function testDisplayHtmlRadio()
{
$name = "test_display_radio";
$choices = array('value_1'=>'choice_1', 'value_2'=>'choice_2');
$out = "";
foreach ($choices as $choice_value => $choice_label) {
$html_field_id = $name . '_' . $choice_value;
$out .= '<input type="radio" name="' . $name . '" id="' . $html_field_id . '" value="' . htmlspecialchars($choice_value) . '"';
$out .= ' />' . "\n";
$out .= '<label for="' . $html_field_id . '">' . $choice_label . '</label>';
$out .= '<br />';
$out .= "\n";
}
$this->expectOutputString($out);
PMA_display_html_radio($name,$choices);
}
function testDisplayHtmlRadioWithChecked()
{
$name = "test_display_radio";
$choices = array('value_1'=>'choice_1', 'value_2'=>'choice_2');
$checked_choice = "value_2";
$out = "";
foreach ($choices as $choice_value => $choice_label) {
$html_field_id = $name . '_' . $choice_value;
$out .= '<input type="radio" name="' . $name . '" id="' . $html_field_id . '" value="' . htmlspecialchars($choice_value) . '"';
if ($choice_value == $checked_choice) {
$out .= ' checked="checked"';
}
$out .= ' />' . "\n";
$out .= '<label for="' . $html_field_id . '">' . $choice_label . '</label>';
$out .= '<br />';
$out .= "\n";
}
$this->expectOutputString($out);
PMA_display_html_radio($name,$choices,$checked_choice);
}
function testDisplayHtmlRadioWithCheckedWithClass()
{
$name = "test_display_radio";
$choices = array('value_1'=>'choice_1', 'value_2'=>'choice_2');
$checked_choice = "value_2";
$class = "test_class";
$out = "";
foreach ($choices as $choice_value => $choice_label) {
$html_field_id = $name . '_' . $choice_value;
$out .= '<div class="' . $class . '">';
$out .= '<input type="radio" name="' . $name . '" id="' . $html_field_id . '" value="' . htmlspecialchars($choice_value) . '"';
if ($choice_value == $checked_choice) {
$out .= ' checked="checked"';
}
$out .= ' />' . "\n";
$out .= '<label for="' . $html_field_id . '">' . $choice_label . '</label>';
$out .= '<br />';
$out .= '</div>';
$out .= "\n";
}
$this->expectOutputString($out);
PMA_display_html_radio($name,$choices,$checked_choice,true,false,$class);
}
function testDisplayHtmlRadioWithoutBR()
{
$name = "test_display_radio";
$choices = array('value_1'=>'choice_1', 'value&_&lt;2&gt;'=>'choice_2');
$checked_choice = "choice_2";
$out = "";
foreach ($choices as $choice_value => $choice_label) {
$html_field_id = $name . '_' . $choice_value;
$out .= '<input type="radio" name="' . $name . '" id="' . $html_field_id . '" value="' . htmlspecialchars($choice_value) . '"';
if ($choice_value == $checked_choice) {
$out .= ' checked="checked"';
}
$out .= ' />' . "\n";
$out .= '<label for="' . $html_field_id . '">' . $choice_label . '</label>';
$out .= "\n";
}
$this->expectOutputString($out);
PMA_display_html_radio($name,$choices,$checked_choice,false);
}
function testDisplayHtmlRadioEscapeLabelEscapeLabel()
{
$name = "test_display_radio";
$choices = array('value_1'=>'choice_1', 'value_&2'=>'choice&_&lt;2&gt;');
$checked_choice = "value_2";
$out = "";
foreach ($choices as $choice_value => $choice_label) {
$html_field_id = $name . '_' . $choice_value;
$out .= '<input type="radio" name="' . $name . '" id="' . $html_field_id . '" value="' . htmlspecialchars($choice_value) . '"';
if ($choice_value == $checked_choice) {
$out .= ' checked="checked"';
}
$out .= ' />' . "\n";
$out .= '<label for="' . $html_field_id . '">' . htmlspecialchars($choice_label) . '</label>';
$out .= '<br />';
$out .= "\n";
}
$this->expectOutputString($out);
PMA_display_html_radio($name,$choices,$checked_choice,true,true);
}
function testDisplayHtmlRadioEscapeLabelNotEscapeLabel()
{
$name = "test_display_radio";
$choices = array('value_1'=>'choice_1', 'value_&2'=>'choice&_&lt;2&gt;');
$checked_choice = "value_2";
$out = "";
foreach ($choices as $choice_value => $choice_label) {
$html_field_id = $name . '_' . $choice_value;
$out .= '<input type="radio" name="' . $name . '" id="' . $html_field_id . '" value="' . htmlspecialchars($choice_value) . '"';
if ($choice_value == $checked_choice) {
$out .= ' checked="checked"';
}
$out .= ' />' . "\n";
$out .= '<label for="' . $html_field_id . '">' . $choice_label . '</label>';
$out .= '<br />';
$out .= "\n";
}
$this->expectOutputString($out);
PMA_display_html_radio($name,$choices,$checked_choice,true,false);
}
function testDisplayHtmlRadioEscapeLabelEscapeLabelWithClass()
{
$name = "test_display_radio";
$choices = array('value_1'=>'choice_1', 'value_&2'=>'choice&_&lt;2&gt;');
$checked_choice = "value_2";
$class = "test_class";
$out = "";
foreach ($choices as $choice_value => $choice_label) {
$html_field_id = $name . '_' . $choice_value;
$out .= '<div class="' . $class . '">';
$out .= '<input type="radio" name="' . $name . '" id="' . $html_field_id . '" value="' . htmlspecialchars($choice_value) . '"';
if ($choice_value == $checked_choice) {
$out .= ' checked="checked"';
}
$out .= ' />' . "\n";
$out .= '<label for="' . $html_field_id . '">' . htmlspecialchars($choice_label) . '</label>';
$out .= '<br />';
$out .= '</div>';
$out .= "\n";
}
$this->expectOutputString($out);
PMA_display_html_radio($name,$choices,$checked_choice,true,true,$class);
}
}

15
test/PMA_escapeMySqlWildcards_test.php → test/libraries/common/PMA_escapeMySqlWildcards_test.php
View File

@ -4,22 +4,15 @@
* Test for MySQL Wildcards escaping/unescaping
*
* @package phpMyAdmin-test
* @version $Id: PMA_escapeMySqlWildcards_test.php
* @group common.lib-tests
*/
/**
* Tests core.
*/
require_once 'PHPUnit/Framework.php';
/**
/*
* Include to test.
*/
require_once './libraries/common.lib.php';
require_once 'libraries/common.lib.php';
/**
* Test MySQL escaping.
*
*/
class PMA_escapeMySqlWildcards_test extends PHPUnit_Framework_TestCase
{

37
test/libraries/common/PMA_extractValueFromFormattedSize_test.php Normal file
View File

@ -0,0 +1,37 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Test for PMA_extractValueFromFormattedSize from common.lib
*
* @package phpMyAdmin-test
* @version $Id: PMA_extractValueFromFormattedSize_test.php
* @group common.lib-tests
*/
/*
* Include to test.
*/
require_once 'libraries/common.lib.php';
class PMA_extractValueFromFormattedSize_test extends PHPUnit_Framework_TestCase{
function testExtractValueFromFormattedSizeNoFormat(){
$this->assertEquals(-1,PMA_extractValueFromFormattedSize(100));
}
function testExtractValueFromFormattedSizeGB(){
$this->assertEquals(10737418240,PMA_extractValueFromFormattedSize("10GB"));
}
function testExtractValueFromFormattedSizeMB(){
$this->assertEquals(15728640,PMA_extractValueFromFormattedSize("15MB"));
}
function testExtractValueFromFormattedSizeK(){
$this->assertEquals(262144,PMA_extractValueFromFormattedSize("256K"));
}
}

17
test/PMA_foreignKeySupported_test.php → test/libraries/common/PMA_foreignKeySupported_test.php
View File

@ -4,28 +4,20 @@
* Test for supporting foreign key
*
* @package phpMyAdmin-test
* @version $Id: PMA_foreignKeySupported_test.php
* @group common.lib-tests
*/
/**
* Tests core.
*/
require_once 'PHPUnit/Framework.php';
/**
/*
* Include to test.
*/
require_once './libraries/common.lib.php';
require_once 'libraries/common.lib.php';
/**
* Test supported foreign key.
*
*/
class PMA_foreignKeySupported_test extends PHPUnit_Framework_TestCase
{
/**
* data provider for foreign key supported test
*/
public function foreignkeySupportedDataProvider() {
return array(
array('MyISAM', false),
@ -38,7 +30,6 @@ class PMA_foreignKeySupported_test extends PHPUnit_Framework_TestCase
* foreign key supported test
* @dataProvider foreignkeySupportedDataProvider
*/
public function testForeignkeySupported($a, $e) {
$this->assertEquals($e, PMA_foreignkey_supported($a));
}

52
test/PMA_formatNumberByteDown_test.php → test/libraries/common/PMA_formatNumberByteDown_test.php
View File

@ -5,35 +5,24 @@
*
* @package phpMyAdmin-test
* @version $Id: PMA_formatNumberByteDown_test.php
* @group common.lib-tests
*/
/**
* Tests core.
*/
require_once 'PHPUnit/Framework.php';
/**
/*
* Include to test.
*/
require_once './libraries/common.lib.php';
require_once 'libraries/common.lib.php';
/**
* Test formating number and byte.
*
*/
class PMA_formatNumberByteDown_test extends PHPUnit_Framework_TestCase
{
/**
* temporary variable for globals array
*/
protected $tmpGlobals;
/**
* temporary variable for session array
*/
protected $tmpSession;
/**
@ -62,14 +51,14 @@ class PMA_formatNumberByteDown_test extends PHPUnit_Framework_TestCase
public function formatNumberDataProvider() {
return array(
array(10, 2, 2, '10,00 '),
array(10, 2, 2, '10 '),
array(100, 2, 0, '100 '),
array(100, 2, 2, '0,10 k'),
array(-1000.454, 4, 2, '-1 000,45 '),
array(0.00003, 3, 2, '0,03 m'),
array(0.003, 3, 3, '0,003 '),
array(-0.003, 6, 0, '-3 m'),
array(100.98, 0, 2, '100,98')
array(100, 2, 2, '100 '),
array(-1000.454, 4, 2, '-1,000.45 '),
array(0.00003, 3, 2, '30 &micro;'),
array(0.003, 3, 3, '3 m'),
array(-0.003, 6, 0, '-3,000 &micro;'),
array(100.98, 0, 2, '100.98')
);
}
@ -77,24 +66,22 @@ class PMA_formatNumberByteDown_test extends PHPUnit_Framework_TestCase
* format number test, globals are defined
* @dataProvider formatNumberDataProvider
*/
public function testFormatNumber($a, $b, $c, $e) {
$this->assertEquals($e, (string)PMA_formatNumber($a, $b, $c, false));
public function testFormatNumber($a, $b, $c, $d) {
$this->assertEquals($d, (string)PMA_formatNumber($a, $b, $c, false));
}
/**
* format byte down data provider
*/
public function formatByteDownDataProvider() {
return array(
array(10, 2, 2, array('10', 'B')),
array(100, 2, 0, array('0', 'KB')),
array(100, 3, 0, array('100', 'B')),
array(100, 2, 2, array('0,10', 'KB')),
array(1034, 3, 2, array('1,01', 'KB')),
array(100233, 3, 3, array('97,884', 'KB')),
array(2206451, 1, 2, array('2,10', 'MB'))
array(10, 2, 2, array('10', __('B'))),
array(100, 2, 0, array('0', __('KiB'))),
array(100, 3, 0, array('100', __('B'))),
array(100, 2, 2, array('0.10', __('KiB'))),
array(1034, 3, 2, array('1.01', __('KiB'))),
array(100233, 3, 3, array('97.884', __('KiB'))),
array(2206451, 1, 2, array('2.10', __('MiB')))
);
}
@ -102,7 +89,6 @@ class PMA_formatNumberByteDown_test extends PHPUnit_Framework_TestCase
* format byte test, globals are defined
* @dataProvider formatByteDownDataProvider
*/
public function testFormatByteDown($a, $b, $c, $e) {
$result = PMA_formatByteDown($a, $b, $c);
$result[0] = trim($result[0]);

744
test/libraries/common/PMA_formatSql_test.php Normal file
View File

@ -0,0 +1,744 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Test for PMA_formatSql from common.lib.php
*
* @package phpMyAdmin-test
* @version $Id: PMA_formatSql_test.php
* @group common.lib-tests
*/
/*
* Include to test.
*/
require_once 'libraries/common.lib.php';
require_once 'libraries/sqlparser.lib.php';
class PMA_formatSql_test extends PHPUnit_Framework_TestCase{
/**
* temporary variable for globals array
*/
protected $tmpCfg;
/**
* temporary variable for session array
*/
protected $tmpSession;
/**
* storing globals and session
*/
public function setUp() {
global $cfg;
$this->tmpCfg = $cfg;
}
/**
* recovering globals and session
*/
public function tearDown() {
global $cfg;
$cfg = $this->tmpCfg;
}
function testFormatSQLNotArray(){
global $cfg;
$cfg['SQP']['fmtType'] = 'html';
$sql = "SELECT * FROM tTable;";
$this->assertEquals("<pre>\n$sql\n</pre>",PMA_formatSql($sql));
}
function testFormatSQLfmTypeHtml_1(){
global $cfg;
$cfg['SQP']['fmtType'] = 'html';
$cfg['MySQLManualType'] = 'viewable';
$sql = array (
'raw' => 'SELECT 1;',
0 =>
array (
'type' => 'alpha_reservedWord',
'data' => 'SELECT',
'pos' => 6,
'forbidden' => true,
),
1 =>
array (
'type' => 'digit_integer',
'data' => '1',
'pos' => 8,
),
2 =>
array (
'type' => 'punct_queryend',
'data' => ';',
'pos' => 0,
),
'len' => 3,
);
$unparsed = "SELECT 1;";
$expected = '<span class="syntax"><span class="inner_sql"><span class="syntax_alpha syntax_alpha_reservedWord">SELECT</span></a> <span class="syntax_digit syntax_digit_integer">1</span> <span class="syntax_punct syntax_punct_queryend">;</span><br /><br /></span></span>';
$this->assertEquals($expected,PMA_formatSql($sql, $unparsed));
}
function testFormatSQLfmTypeHtml_2(){
global $cfg;
$cfg['SQP']['fmtType'] = 'html';
$cfg['MySQLManualType'] = 'viewable';
$unparsed = "SELECT * from `tTable`;";
$sql = array (
'raw' => $unparsed,
0 =>
array (
'type' => 'alpha_reservedWord',
'data' => 'SELECT',
'pos' => 6,
'forbidden' => true,
),
1 =>
array (
'type' => 'punct',
'data' => '*',
'pos' => 0,
),
2 =>
array (
'type' => 'alpha_reservedWord',
'data' => 'from',
'pos' => 13,
'forbidden' => true,
),
3 =>
array (
'type' => 'quote_backtick',
'data' => '`tTable`',
'pos' => 0,
),
4 =>
array (
'type' => 'punct_queryend',
'data' => ';',
'pos' => 0,
),
'len' => 5,
);
$expected = '<span class="syntax"><span class="inner_sql"><span class="syntax_alpha syntax_alpha_reservedWord">SELECT</span></a> <span class="syntax_punct">*</span> <br /><span class="syntax_alpha syntax_alpha_reservedWord">FROM</span> <span class="syntax_quote syntax_quote_backtick">`tTable`</span> <span class="syntax_punct syntax_punct_queryend">;</span><br /><br /></span></span>';
$this->assertEquals($expected,PMA_formatSql($sql, $unparsed));
}
function testFormatSQLfmTypeHtml_3(){
global $cfg;
$cfg['SQP']['fmtType'] = 'html';
$cfg['MySQLManualType'] = 'viewable';
$unparsed = 'SELECT * FROM `tTable_A` A INNER JOIN `tTable_B` B ON B.ID = A.ID;';
$sql = array (
'raw' => $unparsed,
0 =>
array (
'type' => 'alpha_reservedWord',
'data' => 'SELECT',
'pos' => 6,
'forbidden' => true,
),
1 =>
array (
'type' => 'punct',
'data' => '*',
'pos' => 0,
),
2 =>
array (
'type' => 'alpha_reservedWord',
'data' => 'FROM',
'pos' => 13,
'forbidden' => true,
),
3 =>
array (
'type' => 'quote_backtick',
'data' => '`tTable_A`',
'pos' => 0,
),
4 =>
array (
'type' => 'alpha_identifier',
'data' => 'A',
'pos' => 26,
'forbidden' => false,
),
5 =>
array (
'type' => 'alpha_reservedWord',
'data' => 'INNER',
'pos' => 32,
'forbidden' => true,
),
6 =>
array (
'type' => 'alpha_reservedWord',
'data' => 'JOIN',
'pos' => 37,
'forbidden' => true,
),
7 =>
array (
'type' => 'quote_backtick',
'data' => '`tTable_B`',
'pos' => 0,
),
8 =>
array (
'type' => 'alpha_identifier',
'data' => 'B',
'pos' => 50,
'forbidden' => false,
),
9 =>
array (
'type' => 'alpha_reservedWord',
'data' => 'ON',
'pos' => 53,
'forbidden' => true,
),
10 =>
array (
'type' => 'alpha_identifier',
'data' => 'B',
'pos' => 55,
'forbidden' => false,
),
11 =>
array (
'type' => 'punct_qualifier',
'data' => '.',
'pos' => 0,
),
12 =>
array (
'type' => 'alpha_identifier',
'data' => 'ID',
'pos' => 58,
'forbidden' => false,
),
13 =>
array (
'type' => 'punct',
'data' => '=',
'pos' => 0,
),
14 =>
array (
'type' => 'alpha_identifier',
'data' => 'A',
'pos' => 62,
'forbidden' => false,
),
15 =>
array (
'type' => 'punct_qualifier',
'data' => '.',
'pos' => 0,
),
16 =>
array (
'type' => 'alpha_identifier',
'data' => 'ID',
'pos' => 65,
'forbidden' => false,
),
17 =>
array (
'type' => 'punct_queryend',
'data' => ';',
'pos' => 0,
),
'len' => 18,
);
$expected = '<span class="syntax"><span class="inner_sql"><span class="syntax_alpha syntax_alpha_reservedWord">SELECT</span></a> <span class="syntax_punct">*</span> <br /><span class="syntax_alpha syntax_alpha_reservedWord">FROM</span> <span class="syntax_quote syntax_quote_backtick">`tTable_A`</span> <span class="syntax_alpha syntax_alpha_identifier">A</span><br /><span class="syntax_alpha syntax_alpha_reservedWord">INNER</span> <span class="syntax_alpha syntax_alpha_reservedWord">JOIN</span> <span class="syntax_quote syntax_quote_backtick">`tTable_B`</span> <span class="syntax_alpha syntax_alpha_identifier">B</span> <span class="syntax_alpha syntax_alpha_reservedWord">ON</span> <span class="syntax_alpha syntax_alpha_identifier">B</span><span class="syntax_punct syntax_punct_qualifier">.</span><span class="syntax_alpha syntax_alpha_identifier">ID</span> <span class="syntax_punct">=</span></a> <span class="syntax_alpha syntax_alpha_identifier">A</span><span class="syntax_punct syntax_punct_qualifier">.</span><span class="syntax_alpha syntax_alpha_identifier">ID</span><span class="syntax_punct syntax_punct_queryend">;</span><br /><br /></span></span>';
$this->assertEquals($expected,PMA_formatSql($sql, $unparsed));
}
function testFormatSQLfmTypeText_1(){
global $cfg;
$cfg['SQP']['fmtType'] = 'text';
$cfg['MySQLManualType'] = 'viewable';
$sql = array (
'raw' => 'SELECT 1;',
0 =>
array (
'type' => 'alpha_reservedWord',
'data' => 'SELECT',
'pos' => 6,
'forbidden' => true,
),
1 =>
array (
'type' => 'digit_integer',
'data' => '1',
'pos' => 8,
),
2 =>
array (
'type' => 'punct_queryend',
'data' => ';',
'pos' => 0,
),
'len' => 3,
);
$unparsed = "SELECT 1;";
$expected = '<span class="inner_sql">SELECT</a> 1 ;<br /><br /></span>';
$this->assertEquals($expected,PMA_formatSql($sql, $unparsed));
}
function testFormatSQLfmTypeText_2(){
global $cfg;
$cfg['SQP']['fmtType'] = 'text';
$cfg['MySQLManualType'] = 'viewable';
$unparsed = "SELECT * from `tTable`;";
$sql = array (
'raw' => $unparsed,
0 =>
array (
'type' => 'alpha_reservedWord',
'data' => 'SELECT',
'pos' => 6,
'forbidden' => true,
),
1 =>
array (
'type' => 'punct',
'data' => '*',
'pos' => 0,
),
2 =>
array (
'type' => 'alpha_reservedWord',
'data' => 'from',
'pos' => 13,
'forbidden' => true,
),
3 =>
array (
'type' => 'quote_backtick',
'data' => '`tTable`',
'pos' => 0,
),
4 =>
array (
'type' => 'punct_queryend',
'data' => ';',
'pos' => 0,
),
'len' => 5,
);
$expected = '<span class="inner_sql">SELECT</a> * <br />FROM `tTable` ;<br /><br /></span>';
$this->assertEquals($expected,PMA_formatSql($sql, $unparsed));
}
function testFormatSQLfmTypeText_3(){
global $cfg;
$cfg['SQP']['fmtType'] = 'text';
$cfg['MySQLManualType'] = 'viewable';
$unparsed = 'SELECT * FROM `tTable_A` A INNER JOIN `tTable_B` B ON B.ID = A.ID;';
$sql = array (
'raw' => $unparsed,
0 =>
array (
'type' => 'alpha_reservedWord',
'data' => 'SELECT',
'pos' => 6,
'forbidden' => true,
),
1 =>
array (
'type' => 'punct',
'data' => '*',
'pos' => 0,
),
2 =>
array (
'type' => 'alpha_reservedWord',
'data' => 'FROM',
'pos' => 13,
'forbidden' => true,
),
3 =>
array (
'type' => 'quote_backtick',
'data' => '`tTable_A`',
'pos' => 0,
),
4 =>
array (
'type' => 'alpha_identifier',
'data' => 'A',
'pos' => 26,
'forbidden' => false,
),
5 =>
array (
'type' => 'alpha_reservedWord',
'data' => 'INNER',
'pos' => 32,
'forbidden' => true,
),
6 =>
array (
'type' => 'alpha_reservedWord',
'data' => 'JOIN',
'pos' => 37,
'forbidden' => true,
),
7 =>
array (
'type' => 'quote_backtick',
'data' => '`tTable_B`',
'pos' => 0,
),
8 =>
array (
'type' => 'alpha_identifier',
'data' => 'B',
'pos' => 50,
'forbidden' => false,
),
9 =>
array (
'type' => 'alpha_reservedWord',
'data' => 'ON',
'pos' => 53,
'forbidden' => true,
),
10 =>
array (
'type' => 'alpha_identifier',
'data' => 'B',
'pos' => 55,
'forbidden' => false,
),
11 =>
array (
'type' => 'punct_qualifier',
'data' => '.',
'pos' => 0,
),
12 =>
array (
'type' => 'alpha_identifier',
'data' => 'ID',
'pos' => 58,
'forbidden' => false,
),
13 =>
array (
'type' => 'punct',
'data' => '=',
'pos' => 0,
),
14 =>
array (
'type' => 'alpha_identifier',
'data' => 'A',
'pos' => 62,
'forbidden' => false,
),
15 =>
array (
'type' => 'punct_qualifier',
'data' => '.',
'pos' => 0,
),
16 =>
array (
'type' => 'alpha_identifier',
'data' => 'ID',
'pos' => 65,
'forbidden' => false,
),
17 =>
array (
'type' => 'punct_queryend',
'data' => ';',
'pos' => 0,
),
'len' => 18,
);
$expected = '<span class="inner_sql">SELECT</a> * <br />FROM `tTable_A` A<br />INNER JOIN `tTable_B` B ON B.ID =</a> A.ID;<br /><br /></span>';
$this->assertEquals($expected,PMA_formatSql($sql, $unparsed));
}
function testFormatSQLfmTypeNone_1(){
global $cfg;
$cfg['SQP']['fmtType'] = 'none';
$cfg['MySQLManualType'] = 'viewable';
$sql = array (
'raw' => 'SELECT 1;',
0 =>
array (
'type' => 'alpha_reservedWord',
'data' => 'SELECT',
'pos' => 6,
'forbidden' => true,
),
1 =>
array (
'type' => 'digit_integer',
'data' => '1',
'pos' => 8,
),
2 =>
array (
'type' => 'punct_queryend',
'data' => ';',
'pos' => 0,
),
'len' => 3,
);
$unparsed = "SELECT 1;";
$expected = "<span class=\"inner_sql\"><pre>\nSELECT 1;\n</pre></span>";
$this->assertEquals($expected,PMA_formatSql($sql, $unparsed));
$expected = "SELECT 1;";
$this->assertEquals($expected,PMA_formatSql($sql));
}
function testFormatSQLfmTypeNone_2(){
global $cfg;
$cfg['SQP']['fmtType'] = 'none';
$cfg['MySQLManualType'] = 'viewable';
$unparsed = "SELECT * from `tTable`;";
$sql = array (
'raw' => $unparsed,
0 =>
array (
'type' => 'alpha_reservedWord',
'data' => 'SELECT',
'pos' => 6,
'forbidden' => true,
),
1 =>
array (
'type' => 'punct',
'data' => '*',
'pos' => 0,
),
2 =>
array (
'type' => 'alpha_reservedWord',
'data' => 'from',
'pos' => 13,
'forbidden' => true,
),
3 =>
array (
'type' => 'quote_backtick',
'data' => '`tTable`',
'pos' => 0,
),
4 =>
array (
'type' => 'punct_queryend',
'data' => ';',
'pos' => 0,
),
'len' => 5,
);
$expected = "<span class=\"inner_sql\"><pre>\nSELECT * from `tTable`;\n</pre></span>";
$this->assertEquals($expected,PMA_formatSql($sql, $unparsed));
$expected = "SELECT * from `tTable`;";
$this->assertEquals($expected,PMA_formatSql($sql));
}
function testFormatSQLfmTypeNone_3(){
global $cfg;
$cfg['SQP']['fmtType'] = 'none';
$cfg['MySQLManualType'] = 'viewable';
$unparsed = 'SELECT * FROM `tTable_A` A INNER JOIN `tTable_B` B ON B.ID = A.ID;';
$sql = array (
'raw' => $unparsed,
0 =>
array (
'type' => 'alpha_reservedWord',
'data' => 'SELECT',
'pos' => 6,
'forbidden' => true,
),
1 =>
array (
'type' => 'punct',
'data' => '*',
'pos' => 0,
),
2 =>
array (
'type' => 'alpha_reservedWord',
'data' => 'FROM',
'pos' => 13,
'forbidden' => true,
),
3 =>
array (
'type' => 'quote_backtick',
'data' => '`tTable_A`',
'pos' => 0,
),
4 =>
array (
'type' => 'alpha_identifier',
'data' => 'A',
'pos' => 26,
'forbidden' => false,
),
5 =>
array (
'type' => 'alpha_reservedWord',
'data' => 'INNER',
'pos' => 32,
'forbidden' => true,
),
6 =>
array (
'type' => 'alpha_reservedWord',
'data' => 'JOIN',
'pos' => 37,
'forbidden' => true,
),
7 =>
array (
'type' => 'quote_backtick',
'data' => '`tTable_B`',
'pos' => 0,
),
8 =>
array (
'type' => 'alpha_identifier',
'data' => 'B',
'pos' => 50,
'forbidden' => false,
),
9 =>
array (
'type' => 'alpha_reservedWord',
'data' => 'ON',
'pos' => 53,
'forbidden' => true,
),
10 =>
array (
'type' => 'alpha_identifier',
'data' => 'B',
'pos' => 55,
'forbidden' => false,
),
11 =>
array (
'type' => 'punct_qualifier',
'data' => '.',
'pos' => 0,
),
12 =>
array (
'type' => 'alpha_identifier',
'data' => 'ID',
'pos' => 58,
'forbidden' => false,
),
13 =>
array (
'type' => 'punct',
'data' => '=',
'pos' => 0,
),
14 =>
array (
'type' => 'alpha_identifier',
'data' => 'A',
'pos' => 62,
'forbidden' => false,
),
15 =>
array (
'type' => 'punct_qualifier',
'data' => '.',
'pos' => 0,
),
16 =>
array (
'type' => 'alpha_identifier',
'data' => 'ID',
'pos' => 65,
'forbidden' => false,
),
17 =>
array (
'type' => 'punct_queryend',
'data' => ';',
'pos' => 0,
),
'len' => 18,
);
$expected = "<span class=\"inner_sql\"><pre>\nSELECT * FROM `tTable_A` A INNER JOIN `tTable_B` B ON B.ID = A.ID;\n</pre></span>";
$this->assertEquals($expected,PMA_formatSql($sql, $unparsed));
$expected = 'SELECT * FROM `tTable_A` A INNER JOIN `tTable_B` B ON B.ID = A.ID;';
$this->assertEquals($expected,PMA_formatSql($sql));
}
function testFormatSQLWithoutType(){
global $cfg;
$cfg['SQP']['fmtType'] = '';
$cfg['MySQLManualType'] = 'viewable';
$sql = array (
'raw' => 'SELECT 1;',
0 =>
array (
'type' => 'alpha_reservedWord',
'data' => 'SELECT',
'pos' => 6,
'forbidden' => true,
),
1 =>
array (
'type' => 'digit_integer',
'data' => '1',
'pos' => 8,
),
2 =>
array (
'type' => 'punct_queryend',
'data' => ';',
'pos' => 0,
),
'len' => 3,
);
$this->assertEmpty(PMA_formatSql($sql));
}
function testFormatSQLError(){
global $SQP_errorString;
$SQP_errorString = true;
$sql = array("raw" => "& \" < >");
$this->assertEquals("&amp; &quot; &lt; &gt;",PMA_formatSql($sql));
$SQP_errorString = false;
}
}

40
test/libraries/common/PMA_generateHiddenMaxFileSize_test.php Normal file
View File

@ -0,0 +1,40 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Test for PMA_generateHiddenMaxFileSize from common.lib.php
*
* @package phpMyAdmin-test
* @version $Id: PMA_generateHiddenMaxFileSize_test.php
* @group common.lib-tests
*/
/*
* Include to test.
*/
require_once 'libraries/common.lib.php';
class PMA_generateHiddenMaxFileSize_test extends PHPUnit_Framework_TestCase{
/*
* Data provider for test
*/
public function dataProvider() {
return array(
array(10),
array("100"),
array(1024),
array("1024Mb"),
array(2147483648),
array("some_string")
);
}
/**
* @dataProvider dataProvider
* @return void
*/
function test_generateHiddenMaxFileSize($size){
$this->assertEquals(PMA_generateHiddenMaxFileSize($size),
'<input type="hidden" name="MAX_FILE_SIZE" value="' .$size . '" />');
}
}

69
test/libraries/common/PMA_generate_html_dropdown_test.php Normal file
View File

@ -0,0 +1,69 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Test for PMA_generate_html_dropdown_test from common.lib.php
*
* @package phpMyAdmin-test
* @version $Id: PMA_display_html_checkbox_test.php
* @group common.lib-tests
*/
/*
* Include to test.
*/
require_once 'libraries/common.lib.php';
class PMA_generate_html_dropdown_test extends PHPUnit_Framework_TestCase
{
function testGenerateHtmlDropdownEmpty()
{
$name = "test_dropdown_name";
$choices = array();
$active_choice = null;
$id = "test_&lt;dropdown&gt;_name";
$result = '<select name="' . htmlspecialchars($name) . '" id="' . htmlspecialchars($id) . '"></select>';
$this->assertEquals($result, PMA_generate_html_dropdown($name,$choices,$active_choice,$id));
}
function testGenerateHtmlDropdown()
{
$name = "&test_dropdown_name";
$choices = array("value_1" => "label_1", "value&_2\"" => "label_2");
$active_choice = null;
$id = "test_&lt;dropdown&gt;_name";
$result = '<select name="' . htmlspecialchars($name) . '" id="' . htmlspecialchars($id) . '">';
foreach ($choices as $one_choice_value => $one_choice_label) {
$result .= '<option value="' . htmlspecialchars($one_choice_value) . '"';
if ($one_choice_value == $active_choice) {
$result .= ' selected="selected"';
}
$result .= '>' . htmlspecialchars($one_choice_label) . '</option>';
}
$result .= '</select>';
$this->assertEquals($result, PMA_generate_html_dropdown($name,$choices,$active_choice,$id));
}
function testGenerateHtmlDropdownWithActive()
{
$name = "&test_dropdown_name";
$choices = array("value_1" => "label_1", "value&_2\"" => "label_2");
$active_choice = "value&_2\"";
$id = "test_&lt;dropdown&gt;_name";
$result = '<select name="' . htmlspecialchars($name) . '" id="' . htmlspecialchars($id) . '">';
foreach ($choices as $one_choice_value => $one_choice_label) {
$result .= '<option value="' . htmlspecialchars($one_choice_value) . '"';
if ($one_choice_value == $active_choice) {
$result .= ' selected="selected"';
}
$result .= '>' . htmlspecialchars($one_choice_label) . '</option>';
}
$result .= '</select>';
$this->assertEquals($result, PMA_generate_html_dropdown($name,$choices,$active_choice,$id));
}
}

53
test/libraries/common/PMA_generate_slider_effect_test.php Normal file
View File

@ -0,0 +1,53 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Test for PMA_generate_slider_effect from common.lib.php
*
* @package phpMyAdmin-test
* @version $Id: PMA_generate_slider_effect_test.php
* @group common.lib-tests
*/
/*
* Include to test.
*/
require_once 'libraries/common.lib.php';
class PMA_generate_slider_effect_test extends PHPUnit_Extensions_OutputTestCase
{
function testGenerateSliderEffectTest()
{
global $cfg;
$cfg['InitialSlidersState'] = 'undefined';
$id = "test_id";
$message = "test_message";
$this->expectOutputString('<div id="' . $id . '" class="pma_auto_slider" title="' . htmlspecialchars($message) . '">' . "\n" . ' ');
PMA_generate_slider_effect($id,$message);
}
function testGenerateSliderEffectTestClosed()
{
global $cfg;
$cfg['InitialSlidersState'] = 'closed';
$id = "test_id";
$message = "test_message";
$this->expectOutputString('<div id="' . $id . '" style="display: none; overflow:auto;" class="pma_auto_slider" title="' . htmlspecialchars($message) . '">' . "\n" . ' ');
PMA_generate_slider_effect($id,$message);
}
function testGenerateSliderEffectTestDisabled()
{
global $cfg;
$cfg['InitialSlidersState'] = 'disabled';
$id = "test_id";
$message = "test_message";
$this->expectOutputString('<div id="' . $id . '">');
PMA_generate_slider_effect($id,$message);
}
}

57
test/libraries/common/PMA_getDbLink_test.php Normal file
View File

@ -0,0 +1,57 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Test for PMA_getDbLink_test from common.lib.php
*
* @package phpMyAdmin-test
* @version $Id: PMA_getDbLink_test.php
* @group common.lib-tests
*/
/*
* Include to test.
*/
require_once 'libraries/common.lib.php';
class PMA_getDbLink_test extends PHPUnit_Framework_TestCase
{
function setUp()
{
global $cfg;
require 'libraries/config.default.php';
}
function testGetDbLinkEmpty()
{
$GLOBALS['db'] = null;
$this->assertEmpty(PMA_getDbLink());
}
function testGetDbLinkNull()
{
global $cfg;
$GLOBALS['db'] = 'test_db';
$database = $GLOBALS['db'];
$this->assertEquals('<a href="' . $cfg['DefaultTabDatabase'] . '?db=' . $database
. '&amp;server=server&amp;lang=en" title="Jump to database &quot;' . htmlspecialchars($database) . '&quot;.">'
. htmlspecialchars($database) . '</a>',PMA_getDbLink());
}
function testGetDbLink()
{
global $cfg;
$database = 'test_database';
$this->assertEquals('<a href="' . $cfg['DefaultTabDatabase'] . '?db=' . $database
. '&amp;server=server&amp;lang=en" title="Jump to database &quot;' . htmlspecialchars($database) . '&quot;.">'
. htmlspecialchars($database) . '</a>',PMA_getDbLink($database));
}
function testGetDbLinkWithSpecialChars()
{
global $cfg;
$database = 'test&data\'base';
$this->assertEquals('<a href="' . $cfg['DefaultTabDatabase'] . '?db=' . htmlspecialchars(urlencode($database))
. '&amp;server=server&amp;lang=en" title="Jump to database &quot;' . htmlspecialchars($database) . '&quot;.">'
. htmlspecialchars($database) . '</a>',PMA_getDbLink($database));
}
}

74
test/libraries/common/PMA_getIcon_test.php Normal file
View File

@ -0,0 +1,74 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Test for PMA_getIcon() from common.lib.php
*
* @package phpMyAdmin-test
* @version $Id: PMA_getIcon_test.php
* @group common.lib-tests
*/
/*
* Include to test.
*/
require_once 'libraries/common.lib.php';
class PMA_getIcon_test extends PHPUnit_Framework_TestCase{
function testGetIconWithoutPropertiesIconic(){
$GLOBALS['cfg']['PropertiesIconic'] = false;
$GLOBALS['pmaThemeImage'] = 'theme/';
$this->assertEquals('<span class="nowrap"></span>',
PMA_getIcon('b_comment.png') );
}
function testGetIconWithPropertiesIconic(){
$GLOBALS['cfg']['PropertiesIconic'] = true;
$GLOBALS['pmaThemeImage'] = 'theme/';
$this->assertEquals('<span class="nowrap"><img src="'.$GLOBALS['pmaThemeImage']
. 'b_comment.png" title="" alt="" class="icon" width="16" height="16" /></span>',
PMA_getIcon('b_comment.png') );
}
function testGetIconAlternate(){
$GLOBALS['cfg']['PropertiesIconic'] = true;
$GLOBALS['pmaThemeImage'] = 'theme/';
$alternate_text = 'alt_str';
$this->assertEquals('<span class="nowrap"><img src="'.$GLOBALS['pmaThemeImage']
.'b_comment.png" title="' . $alternate_text . '" alt="' . $alternate_text
. '" class="icon" width="16" height="16" /></span>',
PMA_getIcon('b_comment.png',$alternate_text) );
}
function testGetIconWithContainer(){
$GLOBALS['cfg']['PropertiesIconic'] = true;
$GLOBALS['pmaThemeImage'] = 'theme/';
$alternate_text = 'alt_str';
$this->assertEquals('<span class="nowrap"><img src="'.$GLOBALS['pmaThemeImage']
.'b_comment.png" title="' . $alternate_text . '" alt="' . $alternate_text
. '" class="icon" width="16" height="16" /></span>',
PMA_getIcon('b_comment.png',$alternate_text, true) );
}
function testGetIconWithContainerAndForceText(){
$GLOBALS['cfg']['PropertiesIconic'] = true;
$GLOBALS['pmaThemeImage'] = 'theme/';
$alternate_text = 'alt_str';
$this->assertEquals('<span class="nowrap"><img src="'.$GLOBALS['pmaThemeImage']
.'b_comment.png" title="' . $alternate_text . '" alt="' . $alternate_text
. '" class="icon" width="16" height="16" /> ' . $alternate_text . '</span>',
PMA_getIcon('b_comment.png',$alternate_text, true, true) );
}
}

43
test/libraries/common/PMA_getTitleForTarget_test.php Normal file
View File

@ -0,0 +1,43 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Test for PMA_getTitleForTarget from common.lib
*
* @package phpMyAdmin-test
* @version $Id: PMA_getTitleForTarget_test.php
* @group common.lib-tests
*/
/*
* Include to test.
*/
require_once 'libraries/common.lib.php';
class PMA_getTitleForTarget_test extends PHPUnit_Framework_TestCase{
function dataProvider(){
return array(
array('tbl_structure.php', __('Structure')),
array('tbl_sql.php', __('SQL'),),
array('tbl_select.php', __('Search'),),
array('tbl_change.php', __('Insert')),
array('sql.php', __('Browse')),
array('db_structure.php', __('Structure')),
array('db_sql.php', __('SQL')),
array('db_search.php', __('Search')),
array('db_operations.php', __('Operations')),
);
}
/**
* @dataProvider dataProvider
* @return void
*/
function testGetTitleForTarget($target, $result){
$this->assertEquals($result,PMA_getTitleForTarget($target));
}
}
//PMA_getTitleForTarget

21
test/PMA_localisedDateTimespan_test.php → test/libraries/common/PMA_localisedDateTimespan_test.php
View File

@ -5,41 +5,29 @@
*
* @package phpMyAdmin-test
* @version $Id: PMA_localisedDateTimespan_test.php
* @group common.lib-tests
*/
/**
* Tests core.
*/
require_once 'PHPUnit/Framework.php';
/**
/*
* Include to test.
*/
require_once './libraries/common.lib.php';
require_once 'libraries/common.lib.php';
/**
* Test localised date or timespan expression.
*
*/
class PMA_localisedDateTimespan_test extends PHPUnit_Framework_TestCase
{
/**
* temporary variable for globals array
*/
protected $tmpGlobals;
/**
* temporary variable for session array
*/
protected $tmpSession;
/**
* temporary variable for timezone info
*/
protected $tmpTimezone;
/**
@ -67,7 +55,6 @@ class PMA_localisedDateTimespan_test extends PHPUnit_Framework_TestCase
/**
* data provider for localised date test
*/
public function localisedDateDataProvider() {
return array(
array(1227455558, '', 'Nov 23, 2008 at 03:52 PM'),
@ -79,7 +66,6 @@ class PMA_localisedDateTimespan_test extends PHPUnit_Framework_TestCase
* localised date test, globals are defined
* @dataProvider localisedDateDataProvider
*/
public function testLocalisedDate($a, $b, $e) {
$this->assertEquals($e, PMA_localisedDate($a, $b));
}
@ -99,7 +85,6 @@ class PMA_localisedDateTimespan_test extends PHPUnit_Framework_TestCase
* localised timestamp test, globals are defined
* @dataProvider timespanFormatDataProvider
*/
public function testTimespanFormat($a, $e) {
$GLOBALS['timespanfmt'] = '%s days, %s hours, %s minutes and %s seconds';

14
test/PMA_pow_test.php → test/libraries/common/PMA_pow_test.php
View File

@ -1,20 +1,18 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* tests for PMA_pow()
* Tests for PMA_pow() function from common.lib.php
*
* @package phpMyAdmin-test
* @version $Id: PMA_pow_test.php
* @group common.lib-tests
*/
/**
*
/*
* Include to test.
*/
require_once 'PHPUnit/Framework.php';
require_once './libraries/common.lib.php';
require_once 'libraries/common.lib.php';
/**
* @package phpMyAdmin-test
*/
class PMA_pow_test extends PHPUnit_Framework_TestCase
{
public function testIntOverflow()

14
test/PMA_printableBitValue_test.php → test/libraries/common/PMA_printableBitValue_test.php
View File

@ -5,22 +5,14 @@
*
* @package phpMyAdmin-test
* @version $Id: PMA_printableBitValue_test.php
* @group common.lib-tests
*/
/**
* Tests core.
*/
require_once 'PHPUnit/Framework.php';
/**
/*
* Include to test.
*/
require_once './libraries/common.lib.php';
require_once 'libraries/common.lib.php';
/**
* Test printableBitValue function.
*
*/
class PMA_printableBitValue_test extends PHPUnit_Framework_TestCase
{

33
test/PMA_quoting_slashing_test.php → test/libraries/common/PMA_quoting_slashing_test.php
View File

@ -5,29 +5,21 @@
*
* @package phpMyAdmin-test
* @version $Id: PMA_quoting_slashing_test.php
* @group common.lib-tests
*/
/**
* Tests core.
*/
require_once 'PHPUnit/Framework.php';
/**
/*
* Include to test.
*/
require_once './libraries/common.lib.php';
require_once 'libraries/common.lib.php';
require_once 'libraries/sqlparser.data.php';
/**
* Test quoting, slashing, backslashing.
*
*/
class PMA_quoting_slashing_test extends PHPUnit_Framework_TestCase
{
/**
* sqlAddslashes test
*/
public function testAddSlashes() {
$string = "\'test''\''\'\r\t\n";
@ -44,7 +36,6 @@ class PMA_quoting_slashing_test extends PHPUnit_Framework_TestCase
/**
* data provider for unQuote test
*/
public function unQuoteProvider() {
return array(
array('"test\'"', "test'"),
@ -58,7 +49,6 @@ class PMA_quoting_slashing_test extends PHPUnit_Framework_TestCase
* unQuote test
* @dataProvider unQuoteProvider
*/
public function testUnQuote($param, $expected) {
$this->assertEquals($expected, PMA_unQuote($param));
}
@ -66,7 +56,6 @@ class PMA_quoting_slashing_test extends PHPUnit_Framework_TestCase
/**
* data provider for unQuote test with chosen quote
*/
public function unQuoteSelectedProvider() {
return array(
array('"test\'"', "test'"),
@ -80,7 +69,6 @@ class PMA_quoting_slashing_test extends PHPUnit_Framework_TestCase
* unQuote test with chosen quote
* @dataProvider unQuoteSelectedProvider
*/
public function testUnQuoteSelectedChar($param, $expected) {
$this->assertEquals($expected, PMA_unQuote($param, '"'));
}
@ -88,7 +76,6 @@ class PMA_quoting_slashing_test extends PHPUnit_Framework_TestCase
/**
* data provider for backquote test
*/
public function backquoteDataProvider() {
return array(
array('0', '`0`'),
@ -102,10 +89,20 @@ class PMA_quoting_slashing_test extends PHPUnit_Framework_TestCase
* backquote test with different param $do_it (true, false)
* @dataProvider backquoteDataProvider
*/
public function testBackquote($a, $b) {
// Test bypass quoting (used by dump functions)
$this->assertEquals($a, PMA_backquote($a, false));
// Test backquote
$this->assertEquals($b, PMA_backquote($a));
}
public function testBackquoteForbidenWords() {
global $PMA_SQPdata_forbidden_word;
foreach ($PMA_SQPdata_forbidden_word as $forbidden){
$this->assertEquals("`" . $forbidden . "`", PMA_backquote($forbidden, false));
}
}
}
?>

39
test/libraries/common/PMA_showDocu_test.php Normal file
View File

@ -0,0 +1,39 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Test for PMA_showDocu from common.lib.php
*
* @package phpMyAdmin-test
* @version $Id: PMA_showDocu.php
* @group common.lib-tests
*/
/*
* Include to test.
*/
require_once 'libraries/common.lib.php';
class PMA_showDocu_test extends PHPUnit_Framework_TestCase
{
function testShowDocuReplaceHelpImg()
{
$GLOBALS['cfg']['ReplaceHelpImg'] = true;
$anchor = "relation";
$expected = '<a href="Documentation.html#' . $anchor . '" target="documentation"><img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 'b_help.png" width="11" height="11" alt="' . __('Documentation') . '" title="' . __('Documentation') . '" /></a>';
$this->assertEquals($expected, PMA_showDocu($anchor));
}
function testShowDocuNotReplaceHelpImg()
{
$GLOBALS['cfg']['ReplaceHelpImg'] = false;
$anchor = "relation";
$expected = '[<a href="Documentation.html#' . $anchor . '" target="documentation">' . __('Documentation') . '</a>]';
$this->assertEquals($expected, PMA_showDocu($anchor));
}
}

67
test/libraries/common/PMA_showMessage_test_disabled.php Normal file
View File

@ -0,0 +1,67 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Test for PMA_showMessage from common.lib
*
* @package phpMyAdmin-test
* @version $Id: PMA_showMessage_test.php
* @group common.lib-tests
*/
const PMA_IS_WINDOWS = false;
/*
* Include to test.
*/
require_once 'libraries/common.lib.php';
require_once 'libraries/Table.class.php';
require_once 'libraries/database_interface.lib.php';
require_once 'libraries/js_escape.lib.php';
class PMA_showMessage_test extends PHPUnit_Extensions_OutputTestCase
{
function setUp()
{
global $cfg;
require 'libraries/config.default.php';
}
function testShowMessageNotAjax()
{
global $cfg;
$GLOBALS['is_ajax_request'] = true;
$cfg['Server']['DisableIS'] = false;
$GLOBALS['table'] = 'tbl';
$GLOBALS['db'] = 'db';
$_SESSION[' PMA_token '] = md5(uniqid(rand(), true));
$GLOBALS['sql_query'] = "SELECT * FROM tblPatient ";
$this->expectOutputString("<script type=\"text/javascript\">
//<![CDATA[
if (window.parent.updateTableTitle) window.parent.updateTableTitle('db.tbl', ' ()');
//]]>
</script>
<div id=\"result_query\" align=\"\">
<div class=\"notice\">msg</div><code class=\"sql\"><span class=\"syntax\"><span class=\"inner_sql\"><a href=\"./url.php?url=http%3A%2F%2Fdev.mysql.com%2Fdoc%2Frefman%2F5.0%2Fen%2Fselect.html&amp;server=server&amp;lang=en&amp;token=647a62ad301bf9025e3b13bc7caa02cb\" target=\"mysql_doc\"><span class=\"syntax_alpha syntax_alpha_reservedWord\">SELECT</span></a> <span class=\"syntax_punct\">*</span> <br /><span class=\"syntax_alpha syntax_alpha_reservedWord\">FROM</span> <span class=\"syntax_alpha syntax_alpha_identifier\">tblPatient</span></span></span></code><div class=\"tools\"><form action=\"sql.php\" method=\"post\"><input type=\"hidden\" name=\"db\" value=\"db\" /><input type=\"hidden\" name=\"table\" value=\"tbl\" /><input type=\"hidden\" name=\"server\" value=\"server\" /><input type=\"hidden\" name=\"lang\" value=\"en\" /><input type=\"hidden\" name=\"token\" value=\"647a62ad301bf9025e3b13bc7caa02cb\" /><input type=\"hidden\" name=\"sql_query\" value=\"SELECT * FROM tblPatient \" /></form><script type=\"text/javascript\">
//<![CDATA[
$('.tools form').last().after('[<a href=\"#\" title=\"Inline edit of this query\" class=\"inline_edit_sql\">Inline</a>]');
//]]>
</script> [
<a href=\"tbl_sql.php?db=db&amp;table=tbl&amp;sql_query=SELECT+%2A+FROM+tblPatient+&amp;show_query=1&amp;server=server&amp;lang=en&amp;token=647a62ad301bf9025e3b13bc7caa02cb#querybox\" onclick=\"window.parent.focus_querywindow('SELECT * FROM tblPatient '); return false;\">Edit</a>
] [
<a href=\"import.php?db=db&amp;table=tbl&amp;sql_query=EXPLAIN+SELECT+%2A+FROM+tblPatient+&amp;server=server&amp;lang=en&amp;token=647a62ad301bf9025e3b13bc7caa02cb\" >Explain SQL</a>
] [
<a href=\"import.php?db=db&amp;table=tbl&amp;sql_query=SELECT+%2A+FROM+tblPatient+&amp;show_query=1&amp;show_as_php=1&amp;server=server&amp;lang=en&amp;token=647a62ad301bf9025e3b13bc7caa02cb\" >Create PHP Code</a>
] [
<a href=\"import.php?db=db&amp;table=tbl&amp;sql_query=SELECT+%2A+FROM+tblPatient+&amp;show_query=1&amp;server=server&amp;lang=en&amp;token=647a62ad301bf9025e3b13bc7caa02cb\" >Refresh</a>
]</div></div>");
echo PMA_showMessage("msg");
//$this->assertEquals("",PMA_showMessage("msg"));
$this->assertTrue(true);
}
}

42
test/libraries/common/PMA_showPHPDocu_test.php Normal file
View File

@ -0,0 +1,42 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Test for PMA_showPHPDocu from common.lib.php
*
* @package phpMyAdmin-test
* @version $Id: PMA_showPHPDocu_test.php
* @group common.lib-tests
*/
/*
* Include to test.
*/
require_once 'libraries/common.lib.php';
class PMA_showPHPDocu_test extends PHPUnit_Framework_TestCase
{
function testShwoPHPDocuReplaceHelpImg()
{
$GLOBALS['cfg']['ReplaceHelpImg'] = true;
$target = "docu";
$lang = _pgettext('PHP documentation language', 'en');
$expected = '<a href="http://php.net/manual/' . $lang . '/' . $target . '" target="documentation"><img class="icon" src="'
. $GLOBALS['pmaThemeImage'] . 'b_help.png" width="11" height="11" alt="' . __('Documentation') . '" title="' . __('Documentation') . '" /></a>';
$this->assertEquals($expected, PMA_showPHPDocu($target));
}
function testShwoPHPDocuNotReplaceHelpImg()
{
$GLOBALS['cfg']['ReplaceHelpImg'] = false;
$target = "docu";
$lang = _pgettext('PHP documentation language', 'en');
$expected = '[<a href="http://php.net/manual/' . $lang . '/' . $target . '" target="documentation">' . __('Documentation') . '</a>]';
$this->assertEquals($expected, PMA_showPHPDocu($target));
}
}

16
test/PMA_stringOperations_test.php → test/libraries/common/PMA_stringOperations_test.php
View File

@ -3,23 +3,16 @@
/**
* Test for several string operations
*
* @package phpMyAdmin-test
* @version $Id: PMA_stringOperations_test.php
* @group common.lib-tests
*/
/**
* Tests core.
*/
require_once 'PHPUnit/Framework.php';
/**
/*
* Include to test.
*/
require_once './libraries/common.lib.php';
require_once 'libraries/common.lib.php';
/**
* Test string operations.
* @package phpMyAdmin-test
*/
class PMA_stringOperations_test extends PHPUnit_Framework_TestCase
{
@ -40,6 +33,7 @@ class PMA_stringOperations_test extends PHPUnit_Framework_TestCase
*/
public function setUp() {
global $GLOBALS, $_SESSION;
$this->tmpGlobals = $GLOBALS;
$this->tmpSession = $_SESSION;

32
test/libraries/common/PMA_unsupportedDatatypes_test.php Normal file
View File

@ -0,0 +1,32 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Test for PMA_unsupportedDatatypes from common.lib
*
* @package phpMyAdmin-test
* @version $Id: PMA_unsupportedDatatypes_test.php
* @group common.lib-tests
*/
/*
* Include to test.
*/
require_once 'libraries/common.lib.php';
class PMA_unsupportedDatatypes_test extends PHPUnit_Framework_TestCase
{
function testNotSupportedDataTypes()
{
$no_support_types = array('geometry',
'point',
'linestring',
'polygon',
'multipoint',
'multilinestring',
'multipolygon',
'geometrycollection'
);
$this->assertEquals($no_support_types, PMA_unsupportedDatatypes());
}
}

20
test/PMA_whichCrlf_test.php → test/libraries/common/PMA_whichCrlf_test.php
View File

@ -5,22 +5,14 @@
*
* @package phpMyAdmin-test
* @version $Id: PMA_whichCrlf_test.php
* @group common.lib-tests
*/
/**
* Tests core.
*/
require_once 'PHPUnit/Framework.php';
/**
/*
* Include to test.
*/
require_once './libraries/common.inc.php';
require_once 'libraries/common.lib.php';
/**
* Test whichCrlf function.
*
*/
class PMA_whichCrlf_test extends PHPUnit_Framework_TestCase
{
@ -29,7 +21,6 @@ class PMA_whichCrlf_test extends PHPUnit_Framework_TestCase
* if not define PMA_USR_OS, then define it as Win
* if installed runkit, then constant will not change
*/
public function testWhichCrlf()
{
$runkit = function_exists('runkit_constant_redefine');
@ -47,9 +38,10 @@ class PMA_whichCrlf_test extends PHPUnit_Framework_TestCase
} else {
if ($runkit)
if ($runkit) {
define('PMA_USR_OS', 'Linux');
$this->assertEquals("\n", PMA_whichCrlf());
$this->assertEquals("\n", PMA_whichCrlf());
}
if ($runkit)
runkit_constant_redefine('PMA_USR_OS', 'Win');

231
test/libraries/core/PMA_array_test.php Normal file
View File

@ -0,0 +1,231 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* 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
*/
/*
* Include to test.
*/
require_once 'libraries/core.lib.php';
class PMA_array_test extends PHPUnit_Framework_TestCase
{
function testPMA_array_read()
{
$arr = array(
"int" => 1,
"str" => "str_val",
"arr" => array('val1', 'val2', 'val3'),
"sarr" => array('arr1' => array(1, 2, 3), array(3, array('a', 'b', 'c'), 4))
);
$this->assertEquals(PMA_array_read('int', $arr), $arr['int']);
$this->assertEquals(PMA_array_read('str', $arr), $arr['str']);
$this->assertEquals(PMA_array_read('arr/0', $arr), $arr['arr'][0]);
$this->assertEquals(PMA_array_read('arr/1', $arr), $arr['arr'][1]);
$this->assertEquals(PMA_array_read('arr/2', $arr), $arr['arr'][2]);
$this->assertEquals(PMA_array_read('sarr/arr1/0', $arr), $arr['sarr']['arr1'][0]);
$this->assertEquals(PMA_array_read('sarr/arr1/1', $arr), $arr['sarr']['arr1'][1]);
$this->assertEquals(PMA_array_read('sarr/arr1/2', $arr), $arr['sarr']['arr1'][2]);
$this->assertEquals(PMA_array_read('sarr/0/0', $arr), $arr['sarr'][0][0]);
$this->assertEquals(PMA_array_read('sarr/0/1', $arr), $arr['sarr'][0][1]);
$this->assertEquals(PMA_array_read('sarr/0/1/2', $arr), $arr['sarr'][0][1][2]);
$this->assertEquals(PMA_array_read('sarr/not_exiting/1', $arr), null);
$this->assertEquals(PMA_array_read('sarr/not_exiting/1', $arr, 0), 0);
$this->assertEquals(PMA_array_read('sarr/not_exiting/1', $arr, 'defailt_val'), 'defailt_val');
}
function testPMA_array_write()
{
$arr = array(
"int" => 1,
"str" => "str_val",
"arr" => array('val1', 'val2', 'val3'),
"sarr" => array('arr1' => array(1, 2, 3), array(3, array('a', 'b', 'c'), 4))
);
PMA_array_write('int', $arr, 5);
$this->assertEquals($arr['int'], 5);
PMA_array_write('str', $arr, '_str');
$this->assertEquals($arr['str'], '_str');
PMA_array_write('arr/0', $arr, 'val_arr_0');
$this->assertEquals($arr['arr'][0], 'val_arr_0');
PMA_array_write('arr/1', $arr, 'val_arr_1');
$this->assertEquals($arr['arr'][1], 'val_arr_1');
PMA_array_write('arr/2', $arr, 'val_arr_2');
$this->assertEquals($arr['arr'][2], 'val_arr_2');
PMA_array_write('sarr/arr1/0', $arr, 'val_sarr_arr_0');
$this->assertEquals($arr['sarr']['arr1'][0], 'val_sarr_arr_0');
PMA_array_write('sarr/arr1/1', $arr, 'val_sarr_arr_1');
$this->assertEquals($arr['sarr']['arr1'][1], 'val_sarr_arr_1');
PMA_array_write('sarr/arr1/2', $arr, 'val_sarr_arr_2');
$this->assertEquals($arr['sarr']['arr1'][2], 'val_sarr_arr_2');
PMA_array_write('sarr/0/0', $arr, 5);
$this->assertEquals($arr['sarr'][0][0], 5);
PMA_array_write('sarr/0/1/0', $arr, 'e');
$this->assertEquals($arr['sarr'][0][1][0], 'e');
PMA_array_write('sarr/not_existing/1', $arr, 'some_val');
$this->assertEquals($arr['sarr']['not_existing'][1], 'some_val');
PMA_array_write('sarr/0/2', $arr, NULL);
$this->assertNull($arr['sarr'][0][2]);
}
function testPMA_array_remove()
{
$arr = array(
"int" => 1,
"str" => "str_val",
"arr" => array('val1', 'val2', 'val3'),
"sarr" => array('arr1' => array(1, 2, 3), array(3, array('a', 'b', 'c'), 4))
);
PMA_array_remove('int', $arr);
$this->assertArrayNotHasKey('int', $arr);
PMA_array_remove('str', $arr);
$this->assertArrayNotHasKey('str', $arr);
PMA_array_remove('arr/0', $arr);
$this->assertArrayNotHasKey(0, $arr['arr']);
PMA_array_remove('arr/1', $arr);
$this->assertArrayNotHasKey(1, $arr['arr']);
PMA_array_remove('arr/2', $arr);
$this->assertArrayNotHasKey('arr', $arr);
$tmp_arr = $arr;
PMA_array_remove('sarr/not_existing/1', $arr);
$this->assertEquals($tmp_arr, $arr);
PMA_array_remove('sarr/arr1/0', $arr);
$this->assertArrayNotHasKey(0, $arr['sarr']['arr1']);
PMA_array_remove('sarr/arr1/1', $arr);
$this->assertArrayNotHasKey(1, $arr['sarr']['arr1']);
PMA_array_remove('sarr/arr1/2', $arr);
$this->assertArrayNotHasKey('arr1', $arr['sarr']);
PMA_array_remove('sarr/0/0', $arr);
$this->assertArrayNotHasKey(0, $arr['sarr'][0]);
PMA_array_remove('sarr/0/1/0', $arr);
$this->assertArrayNotHasKey(0, $arr['sarr'][0][1]);
PMA_array_remove('sarr/0/1/1', $arr);
$this->assertArrayNotHasKey(1, $arr['sarr'][0][1]);
PMA_array_remove('sarr/0/1/2', $arr);
$this->assertArrayNotHasKey(1, $arr['sarr'][0]);
PMA_array_remove('sarr/0/2', $arr);
$this->assertEmpty($arr);
}
function testPMA_array_merge_recursive()
{
$arr1 = array('key1' => 1, 'key2' => 2.3, 'key3' => 'str3');
$arr2 = array('key1' => 4, 'key2' => 5, 'key3' => 6);
$arr3 = array('key4' => 7, 'key5' => 'str8', 'key6' => 9);
$arr4 = array(1, 2, 3);
$this->assertFalse(PMA_array_merge_recursive());
$this->assertEquals(PMA_array_merge_recursive($arr1), $arr1);
$this->assertEquals(PMA_array_merge_recursive($arr1, 'str'), 'str');
$this->assertEquals(PMA_array_merge_recursive('str1', $arr2), $arr2);
$this->assertEquals(PMA_array_merge_recursive($arr1, $arr2), array('key1' => 4, 'key2' => 5, 'key3' => 6));
$this->assertEquals(PMA_array_merge_recursive($arr1, $arr3), array('key1' => 1, 'key2' => 2.3, 'key3' => 'str3', 'key4' => 7, 'key5' => 'str8', 'key6' => 9));
$this->assertEquals(PMA_array_merge_recursive($arr2, $arr4), array(1, 2, 3));
$this->assertEquals(PMA_array_merge_recursive($arr1, $arr2, $arr3), array('key1' => 4, 'key2' => 5, 'key3' => 6, 'key4' => 7, 'key5' => 'str8', 'key6' => 9));
}
function testPMA_arrayWalkRecursive()
{
function fConcat($var)
{
return 'val: ' . $var . ' processed';
}
$arr = array(1, 2, 3, 4);
$target = array('val: 1 processed','val: 2 processed','val: 3 processed','val: 4 processed');
PMA_arrayWalkRecursive($arr, 'fConcat');
$this->assertEquals($arr, $target);
}
/**
* @depends testPMA_arrayWalkRecursive
*/
function testPMA_arrayWalkRecursiveNotProcessIntKeys()
{
function fAdd($var)
{
return ++$var;
}
$arr = array(1, 2, 3, 4);
$target = array(2, 3, 4, 5);
PMA_arrayWalkRecursive($arr, 'fAdd', true);
$this->assertEquals($arr, $target);
}
/**
* @depends testPMA_arrayWalkRecursiveNotProcessIntKeys
*/
function testPMA_arrayWalkRecursiveSubArray()
{
$arr = array("key1"=>'val1', 'key2'=>array('skey1'=>'sval1','skey2'=>'sval2'),'key3'=>'val3');
$target = array('key1'=>'val: val1 processed', 'key2'=> array('skey1'=>'val: sval1 processed', 'skey2'=>'val: sval2 processed'),'key3'=>'val: val3 processed');
PMA_arrayWalkRecursive($arr, 'fConcat');
$this->assertEquals($arr, $target);
}
function testPMA_arrayWalkRecursiveApplyToKeysStripSlashes()
{
$arr = array("key\\1"=>'v\\\\al1', 'k\\ey2'=>array('s\\\\key1'=>'sval\\1','s\\k\\ey2'=>'s\\v\\al2'),'key3'=>'val3');
$target = array("key1"=>'val1', 'key2'=>array('skey1'=>'sval1','skey2'=>'sval2'),'key3'=>'val3');
PMA_arrayWalkRecursive($arr, 'stripslashes',true);
$this->assertEquals($arr, $target);
}
}

66
test/libraries/core/PMA_checkPageValidity_test.php Normal file
View File

@ -0,0 +1,66 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Tests for PMA_checkPageValidity() from libraries/core.lib.php
*
* @package phpMyAdmin-test
*/
/*
* Include to test.
*/
require_once 'libraries/core.lib.php';
class PMA_checkPageValidity_test extends PHPUnit_Framework_TestCase{
protected $goto_whitelist = array(
'db_create.php',
'db_datadict.php',
'db_sql.php',
'db_export.php',
'db_search.php',
'export.php',
'import.php',
'main.php',
'pdf_pages.php',
'pdf_schema.php',
'querywindow.php',
'server_binlog.php',
'server_variables.php',
'sql.php',
'tbl_alter.php',
'tbl_select.php',
'transformation_overview.php',
'transformation_wrapper.php',
'user_password.php',
);
function testGotoNowhere(){
$page = null;
$this->assertFalse(PMA_checkPageValidity($page,null));
}
function testGotoWhitelist(){
$page = 'export.php';
$this->assertTrue(PMA_checkPageValidity($page,$this->goto_whitelist));
}
function testGotoNotInWhitelist(){
$page = 'shell.php';
$this->assertFalse(PMA_checkPageValidity($page,$this->goto_whitelist));
}
function testGotoWhitelistPage(){
$page = 'main.php?sql.php&test=true';
$this->assertTrue(PMA_checkPageValidity($page,$this->goto_whitelist));
}
function testGotoWhitelistEncodedPage(){
$page = 'main.php%3Fsql.php%26test%3Dtrue';
$this->assertTrue(PMA_checkPageValidity($page,$this->goto_whitelist));
}
}

43
test/libraries/core/PMA_fatalError_test.php Normal file
View File

@ -0,0 +1,43 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Test for PMA_fatalError() from libraries/core.lib.php
*
* PMA_fatalError() displays the given error message on phpMyAdmin error page in foreign language
* and ends script execution and closes session
*
* @package phpMyAdmin-test
*/
/*
* Include to test.
*/
require_once 'libraries/select_lang.lib.php';
require_once 'libraries/core.lib.php';
require_once 'libraries/sanitizing.lib.php';
require_once 'libraries/Config.class.php';
class PMA_fatalError_test extends PHPUnit_Extensions_OutputTestCase
{
public function testFatalErrorMessage()
{
$this->expectOutputRegex("/FatalError!/");
PMA_fatalError("FatalError!");
}
public function testFatalErrorMessageWithArgs()
{
$message = "Fatal error #%d in file %s.";
$params = array(1, 'error_file.php');
$this->expectOutputRegex("/Fatal error #1 in file error_file.php./", "Not EQ");
PMA_fatalError($message, $params);
$message = "Fatal error in file %s.";
$params = 'error_file.php';
$this->expectOutputRegex("/Fatal error in file error_file.php./");
PMA_fatalError($message, $params);
}
}

59
test/libraries/core/PMA_getLinks_test.php Normal file
View File

@ -0,0 +1,59 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Test for PMA_getPHPDocLink, PMA_linkURL, PMA_includeJS from libraries/core.lib.php
*
* @package phpMyAdmin-test
*/
/*
* Include to test.
*/
require_once 'libraries/core.lib.php';
require_once 'libraries/url_generating.lib.php';
class PMA_getLinks_test extends PHPUnit_Framework_TestCase
{
public function testPMA_getPHPDocLink()
{
$lang = _pgettext('PHP documentation language', 'en');
$this->assertEquals(PMA_getPHPDocLink('function'), 'http://php.net/manual/' . $lang . '/function');
}
public function providerLinkURL(){
return array(
array('http://wiki.phpmyadmin.net', './url.php?url=http%3A%2F%2Fwiki.phpmyadmin.net&amp;lang=en'),
array('https://wiki.phpmyadmin.net', './url.php?url=https%3A%2F%2Fwiki.phpmyadmin.net&amp;lang=en'),
array('wiki.phpmyadmin.net', 'wiki.phpmyadmin.net'),
array('index.php?db=phpmyadmin', 'index.php?db=phpmyadmin')
);
}
/**
* @dataProvider providerLinkURL
*/
public function testPMA_linkURL($link, $url){
$this->assertEquals(PMA_linkURL($link), $url);
}
public function testPMA_includeJS()
{
$filename = "common.js";
$mod = 0;
if (file_exists('./js/'.$filename)) {
$mod = filemtime('./js/'.$filename);
}
else{
$this->fail("JS file doesn't exists.");
}
$this->assertEquals(PMA_includeJS($filename), '<script src="./js/'.$filename.'?ts='.$mod.'" type="text/javascript"></script>'. "\n");
$filename = '?file.js';
//$this->assertEquals(PMA_includeJS($filename), '<script src="./js/?file.js" type="text/javascript"></script>\n');
$this->assertEquals(PMA_includeJS($filename), '<script src="./js/'.$filename.'" type="text/javascript"></script>'."\n");
//$this->assertFalse(PMA_includeJS(null));
}
}

37
test/libraries/core/PMA_getTableCount_test_dis.php Normal file
View File

@ -0,0 +1,37 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Test for PMA_getTableCount_test from core.lib.php
* PMA_getTableCount_test returns count of tables in given db
*
* @package phpMyAdmin-test
*/
/*
* Include to test.
*/
require_once 'libraries/core.lib.php';
require_once 'libraries/common.lib.php';
require_once 'libraries/config.default.php';
require_once 'libraries/Config.class.php';
require_once 'libraries/database_interface.lib.php';
require_once 'config.sample.inc.php';
class PMA_getTableCount_test extends PHPUnit_Framework_TestCase
{
public function setUp()
{
$GLOBALS['PMA_Config'] = new PMA_Config();
}
function testTableCount()
{
$GLOBALS['cfg']['Server']['extension'] = 'mysql';
$GLOBALS['cfg']['Server']['host'] = 'localhost';
$GLOBALS['cfg']['Server']['user'] = 'root';
$this->assertEquals(5,PMA_getTableCount('meddb'));
$this->assertTrue(true);
}
}

17
test/PMA_get_real_size_test.php → test/libraries/core/PMA_get_real_size_test.php
View File

@ -1,20 +1,16 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* tests for PMA_get_real_size()
* Test for PMA_get_real_size() from libraries/core.lib.php
*
* @package phpMyAdmin-test
*/
/**
*
/*
* Include to test.
*/
require_once 'PHPUnit/Framework.php';
require_once './libraries/core.lib.php';
require_once 'libraries/core.lib.php';
/**
* @package phpMyAdmin-test
*/
class PMA_get_real_size_test extends PHPUnit_Framework_TestCase
{
public function testNull()
@ -41,5 +37,10 @@ class PMA_get_real_size_test extends PHPUnit_Framework_TestCase
{
$this->assertEquals(12 * 1024 * 1024 * 1024, PMA_get_real_size('12gb'));
}
public function testUnspecified()
{
$this->assertEquals(1024, PMA_get_real_size('1024'));
}
}
?>

Some files were not shown because too many files have changed in this diff Show More