diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php index 0045bfb7a9..27b6612c89 100644 --- a/libraries/DisplayResults.class.php +++ b/libraries/DisplayResults.class.php @@ -66,6 +66,12 @@ class PMA_DisplayResults const TABLE_TYPE_INNO_DB = 'InnoDB'; const ALL_ROWS = 'all'; const QUERY_TYPE_SELECT = 'SELECT'; + + const MYSQL_SCHEMA = 'mysql'; + const USER_FIELD = 'user'; + const HOST_FIELD = 'host'; + const USER_TABLE = 'user'; + const DB_TABLE = 'db'; // Declare global fields @@ -150,6 +156,25 @@ class PMA_DisplayResults /** array mime types information of fields */ '_mime_map' => null ); + + /** + * This global variable represent the columns which needs to be syntax + * highlighted in each database tables + * One element of this array represent all relavant columns in all tables in + * one specific database + */ + public $sytax_highlighting_column_info = array( + 'information_schema' => array( + 'processlist' => array( + 'info' => array( + 'libraries/plugins/transformations/Text_Plain_Formatted.class.php', + 'Text_Plain_Formatted', + 'Text_Plain' + ) + ) + ) + + ); /** @@ -1431,7 +1456,10 @@ class PMA_DisplayResults && ($direction != self::DISP_DIR_HORIZONTAL_FLIPPED) ) { $comments_map = array(); - if (isset($analyzed_sql[0]) && is_array($analyzed_sql[0]) && isset($analyzed_sql[0]['table_ref'])) { + if (isset($analyzed_sql[0]) + && is_array($analyzed_sql[0]) + && isset($analyzed_sql[0]['table_ref']) + ) { foreach ($analyzed_sql[0]['table_ref'] as $tbl) { $tb = $tbl['table_true_name']; $comments_map[$tb] = PMA_getComments($this->__get('_db'), $tb); @@ -2663,6 +2691,7 @@ class PMA_DisplayResults $fields_meta = $this->__get('_fields_meta'); $highlight_columns = $this->__get('_highlight_columns'); $mime_map = $this->__get('_mime_map'); + $host = ''; for ($j = 0; $j < $this->__get('_fields_cnt'); ++$j) { @@ -2759,8 +2788,89 @@ class PMA_DisplayResults $transform_options['wrapper_link'] = PMA_generate_common_url($_url_params); - $vertical_display = $this->__get('_vertical_display'); + $vertical_display = $this->__get('_vertical_display'); + + // Check whether the field needs to display with syntax highlighting + if ($this->_isNeedToSytaxHighlight($meta->name) + && (trim($row[$i]) != '') + ) { + + $parsed_sql = PMA_SQP_parse($row[$i]); + $row[$i] = PMA_CommonFunctions::getInstance()->formatSql($parsed_sql, $row[$i]); + include_once $this->sytax_highlighting_column_info[strtolower($this->__get('_db'))][strtolower($this->__get('_table'))][strtolower($meta->name)][0]; + $transformation_plugin = new $this->sytax_highlighting_column_info[strtolower($this->__get('_db'))][strtolower($this->__get('_table'))][strtolower($meta->name)][1](null); + + $transform_options = PMA_transformation_getOptions( + isset($mime_map[$meta->name] + ['transformation_options'] + ) + ? $mime_map[$meta->name] + ['transformation_options'] + : '' + ); + $meta->mimetype = str_replace( + '_', '/', + $this->sytax_highlighting_column_info[strtolower($this->__get('_db'))][strtolower($this->__get('_table'))][strtolower($meta->name)][2] + ); + + } + + // Check for the fields need to show as link in mysql schema + include_once 'libraries/mysql_schema_relation.lib.php'; + + // Host should initialize for create link to edit user privilages page + if ((strtolower($this->__get('_db')) == self::MYSQL_SCHEMA) + && (strtolower($meta->name) == self::HOST_FIELD) + ) { + $host = $row[$i]; + } + + if (isset($GLOBALS['mysql_schema_relation']) + && ($this->_isFieldNeedToLink(strtolower($meta->name))) + && (strtolower($this->__get('_db')) == self::MYSQL_SCHEMA) + ) { + + $linking_url_params = array(); + $link_relations = $GLOBALS['mysql_schema_relation'][strtolower($this->__get('_table'))][strtolower($meta->name)]; + + foreach ($link_relations['link_params'] as $link_param) { + + // If link param is an array, set the key and value + // from that array + if (is_array($link_param)) { + $linking_url_params[$link_param[0]] = $link_param[1]; + } else { + $linking_url_params[$link_param] = $row[$i]; + + // To create link to edit user privilages page + if ((strtolower($meta->name) == self::USER_FIELD) + && ((strtolower($this->__get('_table') == self::USER_TABLE)) + || (strtolower($this->__get('_table') == self::DB_TABLE))) + ) { + $linking_url_params['hostname'] = $host; + } + } + + } + + $linking_url = $link_relations['default_page'] + . PMA_generate_common_url($linking_url_params); + include_once "libraries/plugins/transformations/Text_Plain_Link.class.php"; + $transformation_plugin = new Text_Plain_Link(null); + + $transform_options = array( + 0 => $linking_url, + 2 => true + ); + + $meta->mimetype = str_replace( + '_', '/', + 'Text/Plain' + ); + + } + if ($meta->numeric == 1) { // n u m e r i c @@ -2951,6 +3061,36 @@ class PMA_DisplayResults } // end of the '_gatherLinksForLaterOutputs()' function + + /** + * Check whether any field is marked as need to syntax highlight + * + * @param string $field field to check + * + * @return boolean + */ + private function _isNeedToSytaxHighlight($field) { + if (! empty($this->sytax_highlighting_column_info[strtolower($this->__get('_db'))][strtolower($this->__get('_table'))][strtolower($field)])) { + return true; + } + return false; + } + + + /** + * Check whether the field needs to be link + * + * @param string $field field to check + * + * @return boolean + */ + private function _isFieldNeedToLink($field) { + if (! empty($GLOBALS['mysql_schema_relation'][strtolower($this->__get('_table'))][$field])) { + return true; + } + return false; + } + /** * Get url sql query without conditions to shorten URLs @@ -3457,6 +3597,7 @@ class PMA_DisplayResults // replacements will be made if ((PMA_strlen($column) > $GLOBALS['cfg']['LimitChars']) && ($_SESSION['tmp_user_values']['display_text'] == self::DISPLAY_PARTIAL_TEXT) + && ! $this->_isNeedToSytaxHighlight(strtolower($meta->name)) ) { $column = PMA_substr($column, 0, $GLOBALS['cfg']['LimitChars']) . '...'; @@ -3652,7 +3793,8 @@ class PMA_DisplayResults $is_analyse = $this->__get('_is_analyse'); $field_flags = PMA_DBI_field_flags($dt_result, $col_index); if (stristr($field_flags, self::BINARY_FIELD) - && $GLOBALS['cfg']['ProtectBinary'] === 'all' + && ($GLOBALS['cfg']['ProtectBinary'] == 'all' + || $GLOBALS['cfg']['ProtectBinary'] == 'noblob') ) { $class = str_replace('grid_edit', '', $class); } diff --git a/libraries/mysql_schema_relation.lib.php b/libraries/mysql_schema_relation.lib.php new file mode 100644 index 0000000000..3949e4ac8b --- /dev/null +++ b/libraries/mysql_schema_relation.lib.php @@ -0,0 +1,46 @@ + array( + 'db' => array( + 'link_params' => array('db'), + 'default_page' => 'index.php' + ), + 'user' => array( + 'link_params' => array('username'), + 'default_page' => 'server_privileges.php' + ) + + ), + 'proc' => array( + 'db' => array( + 'link_params' => array('db'), + 'default_page' => 'index.php' + ) + + ), + 'user' => array( + 'user' => array( + 'link_params' => array('username'), + 'default_page' => 'server_privileges.php' + ) + + ) +); + +?> diff --git a/libraries/plugins/ExportPlugin.class.php b/libraries/plugins/ExportPlugin.class.php index 5784229feb..cd5bc95fbe 100644 --- a/libraries/plugins/ExportPlugin.class.php +++ b/libraries/plugins/ExportPlugin.class.php @@ -29,56 +29,6 @@ abstract class ExportPlugin extends PluginObserver */ protected $properties; - /** - * Type of the newline character - * - * @var string - */ - private $_crlf; - - /** - * Database name - * - * @var string - */ - private $_db; - - /** - * Contains configuration settings - * - * @var array - */ - private $_cfg; - - - /** - * Relation configuration - * - * @var array - */ - private $_cfgRelation; - - /** - * The type of the export plugin - * - * @var string - */ - private $_what; - - /** - * Parameter to plugin by which it can decide whether it can work - * - * @var mixed - */ - private $_pluginParam; - - /** - * File Charset - * - * @var type String - */ - private $_charsetOfFile; - /** * Common methods, must be overwritten by all export plugins */ @@ -251,159 +201,5 @@ abstract class ExportPlugin extends PluginObserver * @return void */ abstract protected function setProperties(); - - /** - * Gets the type of the newline character - * - * @return string - */ - protected function getCrlf() - { - return $this->_crlf; - } - - /** - * Sets the type of the newline character - * - * @param String $crlf type of the newline character - * - * @return void - */ - protected function setCrlf($crlf) - { - $this->_crlf = $crlf; - } - - /** - * Gets the database name - * - * @return string - */ - protected function getDb() - { - return $this->_db; - } - - /** - * Sets the database name - * - * @param String $db database name - * - * @return void - */ - protected function setDb($db) - { - $this->_db = $db; - } - - /** - * Gets the configuration settings - * - * @return array - */ - protected function getCfg() - { - return $this->_cfg; - } - - /** - * Sets the configuration settings - * - * @param array $cfg array with configuration settings - * - * @return void - */ - protected function setCfg($cfg) - { - $this->_cfg = $cfg; - } - - /** - * Gets the relation configuration - * - * @return array - */ - protected function getCfgRelation() - { - return $this->_cfgRelation; - } - - /** - * Sets the relation configuration - * - * @param array $cfgRelation relation configuration - * - * @return array - */ - protected function setCfgRelation($cfgRelation) - { - $this->_cfgRelation = $cfgRelation; - } - - /** - * Gets the type of the export plugin - * - * @return string - */ - protected function getWhat() - { - return $this->_what; - } - - /** - * Sets the type of the export plugin - * - * @param string $what type of the export plugin - * - * @return void - */ - protected function setWhat($what) - { - $this->_what = $what; - } - - /** - * Gets the parameter to plugin by which it can decide whether it can work - * - * @return mixed - */ - protected function getPluginParam() - { - return $this->_pluginParam; - } - - /** - * Sets the parameter to plugin by which it can decide whether it can work - * - * @param mixed $pluginParam plugin parameter - * - * @return void - */ - protected function setPluginParam($pluginParam) - { - $this->_pluginParam = $pluginParam; - } - - /** - * Gets the file charset - * - * @return string - */ - protected function getCharsetOfFile() - { - return $this->_charsetOfFile; - } - - /** - * Sets the file charset - * - * @param string $charsetOfFile file charset - * - * @return void - */ - protected function setCharsetOfFile($charsetOfFile) - { - $this->_charsetOfFile = $charsetOfFile; - } } ?> \ No newline at end of file diff --git a/libraries/plugins/export/ExportCodegen.class.php b/libraries/plugins/export/ExportCodegen.class.php index 13f9d0004e..88b1fff1e8 100644 --- a/libraries/plugins/export/ExportCodegen.class.php +++ b/libraries/plugins/export/ExportCodegen.class.php @@ -76,11 +76,11 @@ class ExportCodegen extends ExportPlugin protected function setProperties() { $props = 'libraries/properties/'; - require_once "$props/plugins/ExportPluginProperties.class.php"; - require_once "$props/options/groups/OptionsPropertyRootGroup.class.php"; - require_once "$props/options/groups/OptionsPropertyMainGroup.class.php"; - require_once "$props/options/items/HiddenPropertyItem.class.php"; - require_once "$props/options/items/SelectPropertyItem.class.php"; + include_once "$props/plugins/ExportPluginProperties.class.php"; + include_once "$props/options/groups/OptionsPropertyRootGroup.class.php"; + include_once "$props/options/groups/OptionsPropertyMainGroup.class.php"; + include_once "$props/options/items/HiddenPropertyItem.class.php"; + include_once "$props/options/items/SelectPropertyItem.class.php"; $exportPluginProperties = new ExportPluginProperties(); $exportPluginProperties->setText('CodeGen'); diff --git a/libraries/plugins/export/ExportCsv.class.php b/libraries/plugins/export/ExportCsv.class.php index 0ffc3ea4a8..93505e0c1f 100644 --- a/libraries/plugins/export/ExportCsv.class.php +++ b/libraries/plugins/export/ExportCsv.class.php @@ -54,28 +54,9 @@ class ExportCsv extends ExportPlugin */ public function __construct() { - // initialize the specific export csv variables - $this->initSpecificVariables(); $this->setProperties(); } - /** - * Initialize the variables that are used for export CSV - * - * @return void - */ - protected function initSpecificVariables() - { - global $csv_terminated; - global $csv_separator; - global $csv_enclosed; - global $csv_escaped; - $this->setCsvTerminated($csv_terminated); - $this->setCsvSeparator($csv_separator); - $this->setCsvEnclosed($csv_enclosed); - $this->setCsvEscaped($csv_escaped); - } - /** * Sets the export CSV properties * @@ -84,12 +65,12 @@ class ExportCsv extends ExportPlugin protected function setProperties() { $props = 'libraries/properties/'; - require_once "$props/plugins/ExportPluginProperties.class.php"; - require_once "$props/options/groups/OptionsPropertyRootGroup.class.php"; - require_once "$props/options/groups/OptionsPropertyMainGroup.class.php"; - require_once "$props/options/items/TextPropertyItem.class.php"; - require_once "$props/options/items/BoolPropertyItem.class.php"; - require_once "$props/options/items/HiddenPropertyItem.class.php"; + include_once "$props/plugins/ExportPluginProperties.class.php"; + include_once "$props/options/groups/OptionsPropertyRootGroup.class.php"; + include_once "$props/options/groups/OptionsPropertyMainGroup.class.php"; + include_once "$props/options/items/TextPropertyItem.class.php"; + include_once "$props/options/items/BoolPropertyItem.class.php"; + include_once "$props/options/items/HiddenPropertyItem.class.php"; $exportPluginProperties = new ExportPluginProperties(); $exportPluginProperties->setText('CSV'); @@ -129,9 +110,9 @@ class ExportCsv extends ExportPlugin $generalOptions->addProperty($leaf); $leaf = new BoolPropertyItem(); $leaf->setName('removeCRLF'); - $leaf->setText(__( - 'Remove carriage return/line feed characters within columns' - )); + $leaf->setText( + __('Remove carriage return/line feed characters within columns') + ); $leaf = new BoolPropertyItem(); $leaf->setName('columns'); $leaf->setText(__('Put columns names in the first row')); @@ -167,16 +148,7 @@ class ExportCsv extends ExportPlugin */ public function exportHeader () { - // The type of the export plugin only has to be set once and then - // it will remain unchanged. This is the first time - global $what; - $this->setWhat($what); - - $csv_terminated = $this->getCsvTerminated(); - $csv_separator = $this->getCsvSeparator(); - $csv_enclosed = $this->getCsvEnclosed(); - $csv_escaped = $this->getCsvEscaped(); - + global $what, $csv_terminated, $csv_separator, $csv_enclosed, $csv_escaped; // Here we just prepare some values for export if ($what == 'excel') { @@ -209,12 +181,6 @@ class ExportCsv extends ExportPlugin $csv_separator = str_replace('\\t', "\011", $csv_separator); } - // remember the modifications - $this->setCsvTerminated($csv_terminated); - $this->setCsvSeparator($csv_separator); - $this->setCsvEnclosed($csv_enclosed); - $this->setCsvEscaped($csv_escaped); - return true; } @@ -277,11 +243,7 @@ class ExportCsv extends ExportPlugin */ public function exportData($db, $table, $crlf, $error_url, $sql_query) { - $what = $this->getWhat(); - $csv_terminated = $this->getCsvTerminated(); - $csv_separator = $this->getCsvSeparator(); - $csv_enclosed = $this->getCsvEnclosed(); - $csv_escaped = $this->getCsvEscaped(); + global $what, $csv_terminated, $csv_separator, $csv_enclosed, $csv_escaped; // Gets the data from the database $result = PMA_DBI_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED); @@ -378,97 +340,5 @@ class ExportCsv extends ExportPlugin return true; } - - - /* ~~~~~~~~~~~~~~~~~~~~ Getters and Setters ~~~~~~~~~~~~~~~~~~~~ */ - - - /** - * Gets the string used to terminate lines - * - * @return string - */ - protected function getCsvTerminated() - { - return $this->_csvTerminated; - } - - /** - * Sets the string used to terminate lines - * - * @param string $csvTerminated lines terminator - * - * @return void - */ - protected function setCsvTerminated($csvTerminated) - { - $this->_csvTerminated = $csvTerminated; - } - - /** - * Gets the string used to separate columns - * - * @return string - */ - protected function getCsvSeparator() - { - return $this->_csvSeparator; - } - - /** - * Sets the string used to separate columns - * - * @param string $csvSeparator columns separator - * - * @return void - */ - protected function setCsvSeparator($csvSeparator) - { - $this->_csvSeparator = $csvSeparator; - } - - /** - * Gets the string used to enclose columns - * - * @return string - */ - protected function getCsvEnclosed() - { - return $this->_csvEnclosed; - } - - /** - * Sets the string used to enclose columns - * - * @param string $csvEnclosed columns encloser - * - * @return void - */ - protected function setCsvEnclosed($csvEnclosed) - { - $this->_csvEnclosed = $csvEnclosed; - } - - /** - * Gets the string used to escape columns - * - * @return string - */ - protected function getCsvEscaped() - { - return $this->_csvEscaped; - } - - /** - * Sets the string used to escape columns - * - * @param string $csvEscaped columns escaper - * - * @return void - */ - protected function setCsvEscaped($csvEscaped) - { - $this->_csvEscaped = $csvEscaped; - } } ?> \ No newline at end of file diff --git a/libraries/plugins/export/ExportExcel.class.php b/libraries/plugins/export/ExportExcel.class.php index c77029dc2e..3ddf6b6110 100644 --- a/libraries/plugins/export/ExportExcel.class.php +++ b/libraries/plugins/export/ExportExcel.class.php @@ -28,13 +28,13 @@ class ExportExcel extends ExportCsv protected function setProperties() { $props = 'libraries/properties/'; - require_once "$props/plugins/ExportPluginProperties.class.php"; - require_once "$props/options/groups/OptionsPropertyRootGroup.class.php"; - require_once "$props/options/groups/OptionsPropertyMainGroup.class.php"; - require_once "$props/options/items/TextPropertyItem.class.php"; - require_once "$props/options/items/BoolPropertyItem.class.php"; - require_once "$props/options/items/SelectPropertyItem.class.php"; - require_once "$props/options/items/HiddenPropertyItem.class.php"; + include_once "$props/plugins/ExportPluginProperties.class.php"; + include_once "$props/options/groups/OptionsPropertyRootGroup.class.php"; + include_once "$props/options/groups/OptionsPropertyMainGroup.class.php"; + include_once "$props/options/items/TextPropertyItem.class.php"; + include_once "$props/options/items/BoolPropertyItem.class.php"; + include_once "$props/options/items/SelectPropertyItem.class.php"; + include_once "$props/options/items/HiddenPropertyItem.class.php"; $exportPluginProperties = new ExportPluginProperties(); $exportPluginProperties->setText('CSV for MS Excel'); @@ -58,20 +58,22 @@ class ExportExcel extends ExportCsv $generalOptions->addProperty($leaf); $leaf = new BoolPropertyItem(); $leaf->setName('removeCRLF'); - $leaf->setText(__( - 'Remove carriage return/line feed characters within columns' - )); + $leaf->setText( + __('Remove carriage return/line feed characters within columns') + ); $leaf = new BoolPropertyItem(); $leaf->setName('columns'); $leaf->setText(__('Put columns names in the first row')); $generalOptions->addProperty($leaf); $leaf = new SelectPropertyItem(); $leaf->setName('edition'); - $leaf->setValues(array( - 'win' => 'Windows', - 'mac_excel2003' => 'Excel 2003 / Macintosh', - 'mac_excel2008' => 'Excel 2008 / Macintosh' - )); + $leaf->setValues( + array( + 'win' => 'Windows', + 'mac_excel2003' => 'Excel 2003 / Macintosh', + 'mac_excel2008' => 'Excel 2008 / Macintosh' + ) + ); $leaf->setText(__('Excel edition:')); $generalOptions->addProperty($leaf); $leaf = new HiddenPropertyItem(); diff --git a/libraries/plugins/export/ExportHtmlword.class.php b/libraries/plugins/export/ExportHtmlword.class.php index 69268b5f03..bf1c0ed577 100644 --- a/libraries/plugins/export/ExportHtmlword.class.php +++ b/libraries/plugins/export/ExportHtmlword.class.php @@ -36,12 +36,12 @@ class ExportHtmlword extends ExportPlugin protected function setProperties() { $props = 'libraries/properties/'; - require_once "$props/plugins/ExportPluginProperties.class.php"; - require_once "$props/options/groups/OptionsPropertyRootGroup.class.php"; - require_once "$props/options/groups/OptionsPropertyMainGroup.class.php"; - require_once "$props/options/items/RadioPropertyItem.class.php"; - require_once "$props/options/items/TextPropertyItem.class.php"; - require_once "$props/options/items/BoolPropertyItem.class.php"; + include_once "$props/plugins/ExportPluginProperties.class.php"; + include_once "$props/options/groups/OptionsPropertyRootGroup.class.php"; + include_once "$props/options/groups/OptionsPropertyMainGroup.class.php"; + include_once "$props/options/items/RadioPropertyItem.class.php"; + include_once "$props/options/items/TextPropertyItem.class.php"; + include_once "$props/options/items/BoolPropertyItem.class.php"; $exportPluginProperties = new ExportPluginProperties(); $exportPluginProperties->setText('Microsoft Word 2000'); @@ -63,11 +63,13 @@ class ExportHtmlword extends ExportPlugin // create primary items and add them to the group $leaf = new RadioPropertyItem(); $leaf->setName("structure_or_data"); - $leaf->setValues(array( - 'structure' => __('structure'), - 'data' => __('data'), - 'structure_and_data' => __('structure and data') - )); + $leaf->setValues( + array( + 'structure' => __('structure'), + 'data' => __('data'), + 'structure_and_data' => __('structure and data') + ) + ); $dumpWhat->addProperty($leaf); // add the main group to the root group $exportSpecificOptions->addProperty($dumpWhat); @@ -115,7 +117,6 @@ class ExportHtmlword extends ExportPlugin public function exportHeader () { global $charset_of_file; - $this->setCharsetOfFile($charset_of_file); return PMA_exportOutputHandler( 'setWhat($what); if (! PMA_exportOutputHandler( '

' @@ -346,7 +346,6 @@ class ExportHtmlword extends ExportPlugin // set $cfgRelation here, because there is a chance that it's modified // since the class initialization global $cfgRelation; - $this->setCfgRelation($cfgRelation); $schema_insert = ''; @@ -466,7 +465,7 @@ class ExportHtmlword extends ExportPlugin $schema_insert .= ''; return $schema_insert; - } // end of the 'PMA_getTableDef()' function + } /** * Outputs triggers diff --git a/libraries/plugins/export/ExportJson.class.php b/libraries/plugins/export/ExportJson.class.php index a75e184afa..203ced9ac9 100644 --- a/libraries/plugins/export/ExportJson.class.php +++ b/libraries/plugins/export/ExportJson.class.php @@ -36,10 +36,10 @@ class ExportJson extends ExportPlugin protected function setProperties() { $props = 'libraries/properties/'; - require_once "$props/plugins/ExportPluginProperties.class.php"; - require_once "$props/options/groups/OptionsPropertyRootGroup.class.php"; - require_once "$props/options/groups/OptionsPropertyMainGroup.class.php"; - require_once "$props/options/items/HiddenPropertyItem.class.php"; + include_once "$props/plugins/ExportPluginProperties.class.php"; + include_once "$props/options/groups/OptionsPropertyRootGroup.class.php"; + include_once "$props/options/groups/OptionsPropertyMainGroup.class.php"; + include_once "$props/options/items/HiddenPropertyItem.class.php"; $exportPluginProperties = new ExportPluginProperties(); $exportPluginProperties->setText('JSON'); diff --git a/libraries/plugins/export/ExportLatex.class.php b/libraries/plugins/export/ExportLatex.class.php index 43c9677d4f..bcb6bf750e 100644 --- a/libraries/plugins/export/ExportLatex.class.php +++ b/libraries/plugins/export/ExportLatex.class.php @@ -51,7 +51,7 @@ class ExportLatex extends ExportPlugin */ protected function setProperties() { - $plugin_param = $this->getPluginParam(); + global $plugin_param; $hide_structure = false; if ($plugin_param['export_type'] == 'table' && ! $plugin_param['single_table'] @@ -60,12 +60,12 @@ class ExportLatex extends ExportPlugin } $props = 'libraries/properties/'; - require_once "$props/plugins/ExportPluginProperties.class.php"; - require_once "$props/options/groups/OptionsPropertyRootGroup.class.php"; - require_once "$props/options/groups/OptionsPropertyMainGroup.class.php"; - require_once "$props/options/items/BoolPropertyItem.class.php"; - require_once "$props/options/items/RadioPropertyItem.class.php"; - require_once "$props/options/items/TextPropertyItem.class.php"; + include_once "$props/plugins/ExportPluginProperties.class.php"; + include_once "$props/options/groups/OptionsPropertyRootGroup.class.php"; + include_once "$props/options/groups/OptionsPropertyMainGroup.class.php"; + include_once "$props/options/items/BoolPropertyItem.class.php"; + include_once "$props/options/items/RadioPropertyItem.class.php"; + include_once "$props/options/items/TextPropertyItem.class.php"; $exportPluginProperties = new ExportPluginProperties(); $exportPluginProperties->setText('LaTeX'); @@ -97,11 +97,13 @@ class ExportLatex extends ExportPlugin // create primary items and add them to the group $leaf = new RadioPropertyItem(); $leaf->setName("structure_or_data"); - $leaf->setValues(array( - 'structure' => __('structure'), - 'data' => __('data'), - 'structure_and_data' => __('structure and data') - )); + $leaf->setValues( + array( + 'structure' => __('structure'), + 'data' => __('data'), + 'structure_and_data' => __('structure and data') + ) + ); $dumpWhat->addProperty($leaf); // add the main group to the root group $exportSpecificOptions->addProperty($dumpWhat); @@ -207,8 +209,6 @@ class ExportLatex extends ExportPlugin { global $crlf; global $cfg; - $this->setCrlf($crlf); - $this->setCfg($cfg); $head = '% phpMyAdmin LaTeX Dump' . $crlf . '% version ' . PMA_VERSION . $crlf @@ -245,7 +245,7 @@ class ExportLatex extends ExportPlugin */ public function exportDBHeader ($db) { - $crlf = $this->getCrlf(); + global $crlf; $head = '% ' . $crlf . '% ' . __('Database') . ': ' . '\'' . $db . '\'' . $crlf . '% ' . $crlf; @@ -436,9 +436,7 @@ class ExportLatex extends ExportPlugin $dates = false ) { global $cfgRelation; - $common_functions = PMA_CommonFunctions::getInstance(); - $this->setCfgRelation($cfgRelation); /** * Get the unique keys in the table @@ -553,7 +551,9 @@ class ExportLatex extends ExportPlugin $fields = PMA_DBI_get_columns($db, $table); foreach ($fields as $row) { $extracted_columnspec - = PMA_CommonFunctions::getInstance()->extractColumnSpec($row['Type']); + = PMA_CommonFunctions::getInstance()->extractColumnSpec( + $row['Type'] + ); $type = $extracted_columnspec['print_type']; if (empty($type)) { $type = ' '; diff --git a/libraries/plugins/export/ExportMediawiki.class.php b/libraries/plugins/export/ExportMediawiki.class.php index 47388bfbc1..12f4c39308 100644 --- a/libraries/plugins/export/ExportMediawiki.class.php +++ b/libraries/plugins/export/ExportMediawiki.class.php @@ -36,13 +36,13 @@ class ExportMediawiki extends ExportPlugin protected function setProperties() { $props = 'libraries/properties/'; - require_once "$props/plugins/ExportPluginProperties.class.php"; - require_once "$props/options/groups/OptionsPropertyRootGroup.class.php"; - require_once "$props/options/groups/OptionsPropertyMainGroup.class.php"; - require_once "$props/options/groups/OptionsPropertySubgroup.class.php"; - require_once "$props/options/items/MessageOnlyPropertyItem.class.php"; - require_once "$props/options/items/RadioPropertyItem.class.php"; - require_once "$props/options/items/BoolPropertyItem.class.php"; + include_once "$props/plugins/ExportPluginProperties.class.php"; + include_once "$props/options/groups/OptionsPropertyRootGroup.class.php"; + include_once "$props/options/groups/OptionsPropertyMainGroup.class.php"; + include_once "$props/options/groups/OptionsPropertySubgroup.class.php"; + include_once "$props/options/items/MessageOnlyPropertyItem.class.php"; + include_once "$props/options/items/RadioPropertyItem.class.php"; + include_once "$props/options/items/BoolPropertyItem.class.php"; $exportPluginProperties = new ExportPluginProperties(); $exportPluginProperties->setText('MediaWiki Table'); @@ -67,11 +67,13 @@ class ExportMediawiki extends ExportPlugin $subgroup->setText("Dump table"); $leaf = new RadioPropertyItem(); $leaf->setName('structure_or_data'); - $leaf->setValues(array( - 'structure' => __('structure'), - 'data' => __('data'), - 'structure_and_data' => __('structure and data') - )); + $leaf->setValues( + array( + 'structure' => __('structure'), + 'data' => __('data'), + 'structure_and_data' => __('structure and data') + ) + ); $subgroup->setSubgroupHeader($leaf); $generalOptions->addProperty($subgroup); diff --git a/libraries/plugins/export/ExportOds.class.php b/libraries/plugins/export/ExportOds.class.php index f599d86431..3a0e603cca 100644 --- a/libraries/plugins/export/ExportOds.class.php +++ b/libraries/plugins/export/ExportOds.class.php @@ -39,17 +39,19 @@ class ExportOds extends ExportPlugin protected function setProperties() { $props = 'libraries/properties/'; - require_once "$props/plugins/ExportPluginProperties.class.php"; - require_once "$props/options/groups/OptionsPropertyRootGroup.class.php"; - require_once "$props/options/groups/OptionsPropertyMainGroup.class.php"; - require_once "$props/options/items/TextPropertyItem.class.php"; - require_once "$props/options/items/BoolPropertyItem.class.php"; - require_once "$props/options/items/HiddenPropertyItem.class.php"; + include_once "$props/plugins/ExportPluginProperties.class.php"; + include_once "$props/options/groups/OptionsPropertyRootGroup.class.php"; + include_once "$props/options/groups/OptionsPropertyMainGroup.class.php"; + include_once "$props/options/items/TextPropertyItem.class.php"; + include_once "$props/options/items/BoolPropertyItem.class.php"; + include_once "$props/options/items/HiddenPropertyItem.class.php"; $exportPluginProperties = new ExportPluginProperties(); $exportPluginProperties->setText('Open Document Spreadsheet'); $exportPluginProperties->setExtension('ods'); - $exportPluginProperties->setMimeType('application/vnd.oasis.opendocument.spreadsheet'); + $exportPluginProperties->setMimeType( + 'application/vnd.oasis.opendocument.spreadsheet' + ); $exportPluginProperties->setForceFile(true); $exportPluginProperties->setOptionsText(__('Options')); @@ -221,7 +223,6 @@ class ExportOds extends ExportPlugin public function exportData($db, $table, $crlf, $error_url, $sql_query) { global $what; - $this->setWhat($what); // Gets the data from the database $result = PMA_DBI_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED); diff --git a/libraries/plugins/export/ExportOdt.class.php b/libraries/plugins/export/ExportOdt.class.php index 2667c0b38c..2556514928 100644 --- a/libraries/plugins/export/ExportOdt.class.php +++ b/libraries/plugins/export/ExportOdt.class.php @@ -38,7 +38,7 @@ class ExportOdt extends ExportPlugin */ protected function setProperties() { - $plugin_param = $this->getPluginParam(); + global $plugin_param; $hide_structure = false; if ($plugin_param['export_type'] == 'table' && ! $plugin_param['single_table'] @@ -47,17 +47,19 @@ class ExportOdt extends ExportPlugin } $props = 'libraries/properties/'; - require_once "$props/plugins/ExportPluginProperties.class.php"; - require_once "$props/options/groups/OptionsPropertyRootGroup.class.php"; - require_once "$props/options/groups/OptionsPropertyMainGroup.class.php"; - require_once "$props/options/items/TextPropertyItem.class.php"; - require_once "$props/options/items/BoolPropertyItem.class.php"; - require_once "$props/options/items/HiddenPropertyItem.class.php"; + include_once "$props/plugins/ExportPluginProperties.class.php"; + include_once "$props/options/groups/OptionsPropertyRootGroup.class.php"; + include_once "$props/options/groups/OptionsPropertyMainGroup.class.php"; + include_once "$props/options/items/TextPropertyItem.class.php"; + include_once "$props/options/items/BoolPropertyItem.class.php"; + include_once "$props/options/items/HiddenPropertyItem.class.php"; $exportPluginProperties = new ExportPluginProperties(); $exportPluginProperties->setText('Open Document Text'); $exportPluginProperties->setExtension('odt'); - $exportPluginProperties->setMimeType('application/vnd.oasis.opendocument.text'); + $exportPluginProperties->setMimeType( + 'application/vnd.oasis.opendocument.text' + ); $exportPluginProperties->setForceFile(true); $exportPluginProperties->setOptionsText(__('Options')); @@ -74,11 +76,13 @@ class ExportOdt extends ExportPlugin // create primary items and add them to the group $leaf = new RadioPropertyItem(); $leaf->setName("structure_or_data"); - $leaf->setValues(array( - 'structure' => __('structure'), - 'data' => __('data'), - 'structure_and_data' => __('structure and data') - )); + $leaf->setValues( + array( + 'structure' => __('structure'), + 'data' => __('data'), + 'structure_and_data' => __('structure and data') + ) + ); $dumpWhat->addProperty($leaf); // add the main group to the root group $exportSpecificOptions->addProperty($dumpWhat); @@ -236,7 +240,6 @@ class ExportOdt extends ExportPlugin public function exportData($db, $table, $crlf, $error_url, $sql_query) { global $what; - $this->setWhat($what); // Gets the data from the database $result = PMA_DBI_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED); @@ -407,7 +410,6 @@ class ExportOdt extends ExportPlugin $view = false ) { global $cfgRelation; - $this->setCfgRelation($cfgRelation); /** * Gets fields properties diff --git a/libraries/plugins/export/ExportPdf.class.php b/libraries/plugins/export/ExportPdf.class.php index df3867f518..996de3c232 100644 --- a/libraries/plugins/export/ExportPdf.class.php +++ b/libraries/plugins/export/ExportPdf.class.php @@ -66,12 +66,12 @@ class ExportPdf extends ExportPlugin protected function setProperties() { $props = 'libraries/properties/'; - require_once "$props/plugins/ExportPluginProperties.class.php"; - require_once "$props/options/groups/OptionsPropertyRootGroup.class.php"; - require_once "$props/options/groups/OptionsPropertyMainGroup.class.php"; - require_once "$props/options/items/MessageOnlyPropertyItem.class.php"; - require_once "$props/options/items/TextPropertyItem.class.php"; - require_once "$props/options/items/HiddenPropertyItem.class.php"; + include_once "$props/plugins/ExportPluginProperties.class.php"; + include_once "$props/options/groups/OptionsPropertyRootGroup.class.php"; + include_once "$props/options/groups/OptionsPropertyMainGroup.class.php"; + include_once "$props/options/items/MessageOnlyPropertyItem.class.php"; + include_once "$props/options/items/TextPropertyItem.class.php"; + include_once "$props/options/items/HiddenPropertyItem.class.php"; $exportPluginProperties = new ExportPluginProperties(); $exportPluginProperties->setText('PDF'); @@ -92,9 +92,9 @@ class ExportPdf extends ExportPlugin // create primary items and add them to the group $leaf = new MessageOnlyPropertyItem(); $leaf->setName("explanation"); - $leaf->setText(__( - '(Generates a report containing the data of a single table)' - )); + $leaf->setText( + __('(Generates a report containing the data of a single table)') + ); $generalOptions->addProperty($leaf); $leaf = new TextPropertyItem(); $leaf->setName("report_title"); diff --git a/libraries/plugins/export/ExportPhparray.class.php b/libraries/plugins/export/ExportPhparray.class.php index c1116d3906..66bf43fd6b 100644 --- a/libraries/plugins/export/ExportPhparray.class.php +++ b/libraries/plugins/export/ExportPhparray.class.php @@ -36,10 +36,10 @@ class ExportPhparray extends ExportPlugin protected function setProperties() { $props = 'libraries/properties/'; - require_once "$props/plugins/ExportPluginProperties.class.php"; - require_once "$props/options/groups/OptionsPropertyRootGroup.class.php"; - require_once "$props/options/groups/OptionsPropertyMainGroup.class.php"; - require_once "$props/options/items/HiddenPropertyItem.class.php"; + include_once "$props/plugins/ExportPluginProperties.class.php"; + include_once "$props/options/groups/OptionsPropertyRootGroup.class.php"; + include_once "$props/options/groups/OptionsPropertyMainGroup.class.php"; + include_once "$props/options/items/HiddenPropertyItem.class.php"; $exportPluginProperties = new ExportPluginProperties(); $exportPluginProperties->setText('PHP array'); @@ -119,8 +119,8 @@ class ExportPhparray extends ExportPlugin { PMA_exportOutputHandler( '//' . $GLOBALS['crlf'] - . '// Database ' . PMA_CommonFunctions::getInstance()->backquote($db) . $GLOBALS['crlf'] - . '//' . $GLOBALS['crlf'] + . '// Database ' . PMA_CommonFunctions::getInstance()->backquote($db) + . $GLOBALS['crlf'] . '//' . $GLOBALS['crlf'] ); return true; } @@ -195,7 +195,8 @@ class ExportPhparray extends ExportPlugin // Output table name as comment if it's the first record of the table if ($record_cnt == 1) { - $buffer .= $crlf . '// '. PMA_CommonFunctions::getInstance()->backquote($db) . '.' + $buffer .= $crlf . '// ' + . PMA_CommonFunctions::getInstance()->backquote($db) . '.' . PMA_CommonFunctions::getInstance()->backquote($table) . $crlf; $buffer .= '$' . $tablefixed . ' = array(' . $crlf; $buffer .= ' array('; diff --git a/libraries/plugins/export/ExportSql.class.php b/libraries/plugins/export/ExportSql.class.php index 788b002f00..9a0a38add6 100644 --- a/libraries/plugins/export/ExportSql.class.php +++ b/libraries/plugins/export/ExportSql.class.php @@ -21,55 +21,6 @@ require_once "libraries/plugins/ExportPlugin.class.php"; */ class ExportSql extends ExportPlugin { - /** - * MySQL charset map - * - * @var array - */ - private $_mysqlCharsetMap; - - /** - * SQL for dropping a table - * - * @var string - */ - private $_sqlDropTable; - - /** - * SQL Backquotes - * - * @var bool - */ - private $_sqlBackquotes; - - /** - * SQL Constraints - * - * @var string - */ - private $_sqlConstraints; - - /** - * The text of the SQL query - * - * @var string - */ - private $_sqlConstraintsQuery; - - /** - * SQL for dropping foreign keys - * - * @var string - */ - private $_sqlDropForeignKeys; - - /** - * The number of the current row - * - * @var int - */ - private $_currentRow; - /** * Constructor */ @@ -83,33 +34,6 @@ class ExportSql extends ExportPlugin } } - /** - * Initialize the local variables that are used specific for export SQL - * - * @global array $mysql_charset_map - * @global string $sql_drop_table - * @global bool $sql_backquotes - * @global string $sql_constraints - * @global string $sql_constraints_query - * @global string $sql_drop_foreign_keys - * @global int $current_row - * - * @return void - */ - protected function initSpecificVariables() - { - global $sql_drop_table; - global $sql_backquotes; - global $sql_constraints; - global $sql_constraints_query; - global $sql_drop_foreign_keys; - $this->_setSqlDropTable($sql_drop_table); - $this->_setSqlBackquotes($sql_backquotes); - $this->_setSqlConstraints($sql_constraints); - $this->_setSqlConstraintsQuery($sql_constraints_query); - $this->_setSqlDropForeignKeys($sql_drop_foreign_keys); - } - /** * Sets the export SQL properties * @@ -118,7 +42,6 @@ class ExportSql extends ExportPlugin protected function setProperties() { global $plugin_param; - $this->setPluginParam($plugin_param); $hide_sql = false; $hide_structure = false; @@ -131,15 +54,15 @@ class ExportSql extends ExportPlugin if (! $hide_sql) { $props = 'libraries/properties/'; - require_once "$props/plugins/ExportPluginProperties.class.php"; - require_once "$props/options/groups/OptionsPropertyRootGroup.class.php"; - require_once "$props/options/groups/OptionsPropertyMainGroup.class.php"; - require_once "$props/options/groups/OptionsPropertySubgroup.class.php"; - require_once "$props/options/items/BoolPropertyItem.class.php"; - require_once "$props/options/items/MessageOnlyPropertyItem.class.php"; - require_once "$props/options/items/RadioPropertyItem.class.php"; - require_once "$props/options/items/SelectPropertyItem.class.php"; - require_once "$props/options/items/TextPropertyItem.class.php"; + include_once "$props/plugins/ExportPluginProperties.class.php"; + include_once "$props/options/groups/OptionsPropertyRootGroup.class.php"; + include_once "$props/options/groups/OptionsPropertyMainGroup.class.php"; + include_once "$props/options/groups/OptionsPropertySubgroup.class.php"; + include_once "$props/options/items/BoolPropertyItem.class.php"; + include_once "$props/options/items/MessageOnlyPropertyItem.class.php"; + include_once "$props/options/items/RadioPropertyItem.class.php"; + include_once "$props/options/items/SelectPropertyItem.class.php"; + include_once "$props/options/items/TextPropertyItem.class.php"; $exportPluginProperties = new ExportPluginProperties(); $exportPluginProperties->setText('SQL'); @@ -162,24 +85,28 @@ class ExportSql extends ExportPlugin $subgroup->setName("include_comments"); $leaf = new BoolPropertyItem(); $leaf->setName('include_comments'); - $leaf->setText(__( - 'Display comments (includes info such as export' - . ' timestamp, PHP version, and server version)' - )); + $leaf->setText( + __( + 'Display comments (includes info such as export' + . ' timestamp, PHP version, and server version)' + ) + ); $subgroup->setSubgroupHeader($leaf); $leaf = new TextPropertyItem(); $leaf->setName('header_comment'); - $leaf->setText(__( - 'Additional custom header comment (\n splits lines):' - )); + $leaf->setText( + __('Additional custom header comment (\n splits lines):') + ); $subgroup->addProperty($leaf); $leaf = new BoolPropertyItem(); $leaf->setName('dates'); - $leaf->setText(__( - 'Include a timestamp of when databases were created, last' - . ' updated, and last checked' - )); + $leaf->setText( + __( + 'Include a timestamp of when databases were created, last' + . ' updated, and last checked' + ) + ); $subgroup->addProperty($leaf); if (! empty($GLOBALS['cfgRelation']['relation'])) { $leaf = new BoolPropertyItem(); @@ -199,22 +126,26 @@ class ExportSql extends ExportPlugin $leaf = new BoolPropertyItem(); $leaf->setName("use_transaction"); $leaf->setText(__('Enclose export in a transaction')); - $leaf->setDoc(array( - 'programs', - 'mysqldump', - 'option_mysqldump_single-transaction' - )); + $leaf->setDoc( + array( + 'programs', + 'mysqldump', + 'option_mysqldump_single-transaction' + ) + ); $generalOptions->addProperty($leaf); // disable foreign key checks $leaf = new BoolPropertyItem(); $leaf->setName("disable_fk"); $leaf->setText(__('Disable foreign key checks')); - $leaf->setDoc(array( - 'manual_MySQL_Database_Administration', - 'server-system-variables', - 'sysvar_foreign_key_checks' - )); + $leaf->setDoc( + array( + 'manual_MySQL_Database_Administration', + 'server-system-variables', + 'sysvar_foreign_key_checks' + ) + ); $generalOptions->addProperty($leaf); // compatibility maximization @@ -227,15 +158,19 @@ class ExportSql extends ExportPlugin $leaf = new SelectPropertyItem(); $leaf->setName("compatibility"); - $leaf->setText(__( - 'Database system or older MySQL server to maximize output' - . ' compatibility with:' - )); + $leaf->setText( + __( + 'Database system or older MySQL server to maximize output' + . ' compatibility with:' + ) + ); $leaf->setValues($values); - $leaf->setDoc(array( - 'manual_MySQL_Database_Administration', - 'Server_SQL_mode' - )); + $leaf->setDoc( + array( + 'manual_MySQL_Database_Administration', + 'Server_SQL_mode' + ) + ); $generalOptions->addProperty($leaf); unset($values); @@ -245,9 +180,9 @@ class ExportSql extends ExportPlugin if ($plugin_param['export_type'] == 'server') { $leaf = new BoolPropertyItem(); $leaf->setName("drop_database"); - $leaf->setText(sprintf( - __('Add %s statement'), 'DROP DATABASE' - )); + $leaf->setText( + sprintf(__('Add %s statement'), 'DROP DATABASE') + ); $generalOptions->addProperty($leaf); } @@ -257,11 +192,13 @@ class ExportSql extends ExportPlugin $subgroup->setText("Dump table"); $leaf = new RadioPropertyItem(); $leaf->setName('structure_or_data'); - $leaf->setValues(array( - 'structure' => __('structure'), - 'data' => __('data'), - 'structure_and_data' => __('structure and data') - )); + $leaf->setValues( + array( + 'structure' => __('structure'), + 'data' => __('data'), + 'structure_and_data' => __('structure and data') + ) + ); $subgroup->setSubgroupHeader($leaf); $generalOptions->addProperty($subgroup); @@ -307,12 +244,14 @@ class ExportSql extends ExportPlugin if (! PMA_DRIZZLE) { $leaf = new BoolPropertyItem(); $leaf->setName('procedure_function'); - $leaf->setText(sprintf( - __('Add %s statement'), - 'CREATE PROCEDURE / FUNCTION' - . (PMA_MYSQL_INT_VERSION > 50100 - ? ' / EVENT' : '') - )); + $leaf->setText( + sprintf( + __('Add %s statement'), + 'CREATE PROCEDURE / FUNCTION' + . (PMA_MYSQL_INT_VERSION > 50100 + ? ' / EVENT' : '') + ) + ); $subgroup->addProperty($leaf); } @@ -335,11 +274,13 @@ class ExportSql extends ExportPlugin $leaf = new BoolPropertyItem(); $leaf->setName("backquotes"); - $leaf->setText(__( - 'Enclose table and column names with backquotes ' - . '(Protects column and table names formed with' - . ' special characters or keywords)' - )); + $leaf->setText( + __( + 'Enclose table and column names with backquotes ' + . '(Protects column and table names formed with' + . ' special characters or keywords)' + ) + ); $structureOptions->addProperty($leaf); @@ -368,19 +309,23 @@ class ExportSql extends ExportPlugin $leaf = new BoolPropertyItem(); $leaf->setName("delayed"); $leaf->setText(__('INSERT DELAYED statements')); - $leaf->setDoc(array( - 'manual_MySQL_Database_Administration', - 'insert_delayed' - )); + $leaf->setDoc( + array( + 'manual_MySQL_Database_Administration', + 'insert_delayed' + ) + ); $subgroup->addProperty($leaf); } $leaf = new BoolPropertyItem(); $leaf->setName("ignore"); $leaf->setText(__('INSERT IGNORE statements')); - $leaf->setDoc(array( - 'manual_MySQL_Database_Administration', - 'insert' - )); + $leaf->setDoc( + array( + 'manual_MySQL_Database_Administration', + 'insert' + ) + ); $subgroup->addProperty($leaf); $dataOptions->addProperty($subgroup); @@ -388,11 +333,13 @@ class ExportSql extends ExportPlugin $leaf = new SelectPropertyItem(); $leaf->setName("type"); $leaf->setText(__('Function to use when dumping data:')); - $leaf->setValues(array( - 'INSERT' => 'INSERT', - 'UPDATE' => 'UPDATE', - 'REPLACE' => 'REPLACE' - )); + $leaf->setValues( + array( + 'INSERT' => 'INSERT', + 'UPDATE' => 'UPDATE', + 'REPLACE' => 'REPLACE' + ) + ); $dataOptions->addProperty($leaf); /* Syntax to use when inserting data */ @@ -403,27 +350,29 @@ class ExportSql extends ExportPlugin $leaf = new RadioPropertyItem(); $leaf->setName("insert_syntax"); $leaf->setText(__('INSERT IGNORE statements')); - $leaf->setValues(array( - 'complete' => __( - 'include column names in every INSERT statement' - . '
      Example: INSERT INTO' - . ' tbl_name (col_A,col_B,col_C) VALUES (1,2,3)' - ), - 'extended' => __( - 'insert multiple rows in every INSERT statement' - . '
      Example: INSERT INTO' - . ' tbl_name VALUES (1,2,3), (4,5,6), (7,8,9)' - ), - 'both' => __( - 'both of the above
      Example:' - . ' INSERT INTO tbl_name (col_A,col_B) VALUES (1,2,3),' - . ' (4,5,6), (7,8,9)' - ), - 'none' => __( - 'neither of the above
      Example:' - . ' INSERT INTO tbl_name VALUES (1,2,3)' + $leaf->setValues( + array( + 'complete' => __( + 'include column names in every INSERT statement' + . '
      Example: INSERT INTO' + . ' tbl_name (col_A,col_B,col_C) VALUES (1,2,3)' + ), + 'extended' => __( + 'insert multiple rows in every INSERT statement' + . '
      Example: INSERT INTO' + . ' tbl_name VALUES (1,2,3), (4,5,6), (7,8,9)' + ), + 'both' => __( + 'both of the above
      Example:' + . ' INSERT INTO tbl_name (col_A,col_B) VALUES (1,2,3),' + . ' (4,5,6), (7,8,9)' + ), + 'none' => __( + 'neither of the above
      Example:' + . ' INSERT INTO tbl_name VALUES (1,2,3)' + ) ) - )); + ); $subgroup->addProperty($leaf); $dataOptions->addProperty($subgroup); @@ -436,10 +385,12 @@ class ExportSql extends ExportPlugin // Dump binary columns in hexadecimal $leaf = new BoolPropertyItem(); $leaf->setName("hex_for_blob"); - $leaf->setText(__( - 'Dump binary columns in hexadecimal notation' - . ' (for example, "abc" becomes 0x616263)' - )); + $leaf->setText( + __( + 'Dump binary columns in hexadecimal notation' + . ' (for example, "abc" becomes 0x616263)' + ) + ); $dataOptions->addProperty($leaf); // Drizzle works only with UTC timezone @@ -447,11 +398,13 @@ class ExportSql extends ExportPlugin // Dump time in UTC $leaf = new BoolPropertyItem(); $leaf->setName("utc_time"); - $leaf->setText(__( - 'Dump TIMESTAMP columns in UTC (enables TIMESTAMP columns' - . ' to be dumped and reloaded between servers in different' - . ' time zones)' - )); + $leaf->setText( + __( + 'Dump TIMESTAMP columns in UTC (enables TIMESTAMP columns' + . ' to be dumped and reloaded between servers in different' + . ' time zones)' + ) + ); $dataOptions->addProperty($leaf); } @@ -487,7 +440,6 @@ class ExportSql extends ExportPlugin public function exportRoutines($db) { global $crlf; - $this->setCrlf($crlf); $common_functions = PMA_CommonFunctions::getInstance(); $text = ''; @@ -588,9 +540,7 @@ class ExportSql extends ExportPlugin */ public function exportFooter() { - global $crlf; - $this->setCrlf($crlf); - $mysql_charset_map = $this->_getMysqlCharsetMap(); + global $crlf, $mysql_charset_map; $foot = ''; @@ -636,9 +586,6 @@ class ExportSql extends ExportPlugin { global $crlf, $cfg; global $mysql_charset_map; - $this->setCrlf($crlf); - $this->setCfg($cfg); - $this->_setMysqlCharsetMap($mysql_charset_map); if (isset($GLOBALS['sql_compatibility'])) { $tmp_compat = $GLOBALS['sql_compatibility']; @@ -746,7 +693,6 @@ class ExportSql extends ExportPlugin global $crlf; $common_functions = PMA_CommonFunctions::getInstance(); - $this->setCrlf($crlf); if (isset($GLOBALS['sql_drop_database'])) { if (! PMA_exportOutputHandler( @@ -759,7 +705,8 @@ class ExportSql extends ExportPlugin } } $create_query = 'CREATE DATABASE ' - . (isset($GLOBALS['sql_backquotes']) ? $common_functions->backquote($db) : $db); + . (isset($GLOBALS['sql_backquotes']) + ? $common_functions->backquote($db) : $db); $collation = PMA_getDbCollation($db); if (PMA_DRIZZLE) { $create_query .= ' COLLATE ' . $collation; @@ -804,7 +751,8 @@ class ExportSql extends ExportPlugin . $this->_exportComment( __('Database') . ': ' . (isset($GLOBALS['sql_backquotes']) - ? PMA_CommonFunctions::getInstance()->backquote($db) : '\'' . $db . '\'') + ? PMA_CommonFunctions::getInstance()->backquote($db) + : '\'' . $db . '\'') ) . $this->_exportComment(); return PMA_exportOutputHandler($head); @@ -820,7 +768,6 @@ class ExportSql extends ExportPlugin public function exportDBFooter($db) { global $crlf; - $this->setCrlf($crlf); $common_functions = PMA_CommonFunctions::getInstance(); $result = true; @@ -858,7 +805,8 @@ class ExportSql extends ExportPlugin foreach ($event_names as $event_name) { if (! empty($GLOBALS['sql_drop_table'])) { - $text .= 'DROP EVENT ' . $common_functions->backquote($event_name) + $text .= 'DROP EVENT ' + . $common_functions->backquote($event_name) . $delimiter . $crlf; } $text .= PMA_DBI_get_definition($db, 'EVENT', $event_name) @@ -890,7 +838,8 @@ class ExportSql extends ExportPlugin $common_functions = PMA_CommonFunctions::getInstance(); $create_query = ''; if (! empty($GLOBALS['sql_drop_table'])) { - $create_query .= 'DROP VIEW IF EXISTS ' . $common_functions->backquote($view) + $create_query .= 'DROP VIEW IF EXISTS ' + . $common_functions->backquote($view) . ';' . $crlf; } @@ -905,7 +854,8 @@ class ExportSql extends ExportPlugin $tmp = array(); $columns = PMA_DBI_get_columns_full($db, $view); foreach ($columns as $column_name => $definition) { - $tmp[] = $common_functions->backquote($column_name) . ' ' . $definition['Type'] . $crlf; + $tmp[] = $common_functions->backquote($column_name) . ' ' . + $definition['Type'] . $crlf; } $create_query .= implode(',', $tmp) . ');'; return($create_query); @@ -918,7 +868,8 @@ class ExportSql extends ExportPlugin * @param string $table the table name * @param string $crlf the end of line sequence * @param string $error_url the url to go back in case of error - * @param bool $show_dates whether to include creation/update/check dates + * @param bool $show_dates whether to include creation/update/check + * dates * @param bool $add_semicolon whether to add semicolon and end-of-line at * the end * @param bool $view whether we're handling a view @@ -934,13 +885,8 @@ class ExportSql extends ExportPlugin $add_semicolon = true, $view = false ) { - $this->initSpecificVariables(); - - $sql_drop_table = $this->_getSqlDropTable(); - $sql_backquotes = $this->_getSqlBackquotes(); - $sql_constraints = $this->_getSqlConstraints(); - $sql_constraints_query = $this->_getSqlConstraintsQuery(); - $sql_drop_foreign_keys = $this->_getSqlDropForeignKeys(); + global $sql_drop_table, $sql_backquotes, $sql_constraints, + $sql_constraints_query, $sql_drop_foreign_keys; $common_functions = PMA_CommonFunctions::getInstance(); $schema_create = ''; @@ -949,8 +895,8 @@ class ExportSql extends ExportPlugin // need to use PMA_DBI_QUERY_STORE with PMA_DBI_num_rows() in mysqli $result = PMA_DBI_query( - 'SHOW TABLE STATUS FROM ' . $common_functions->backquote($db) . ' LIKE \'' - . $common_functions->sqlAddSlashes($table, true) . '\'', + 'SHOW TABLE STATUS FROM ' . $common_functions->backquote($db) + . ' LIKE \'' . $common_functions->sqlAddSlashes($table, true) . '\'', null, PMA_DBI_QUERY_STORE ); @@ -964,8 +910,10 @@ class ExportSql extends ExportPlugin TABLE_CREATION_TIME AS Create_time, TABLE_UPDATE_TIME AS Update_time FROM data_dictionary.TABLES - WHERE TABLE_SCHEMA = '" . $common_functions->sqlAddSlashes($db) . "' - AND TABLE_NAME = '" . $common_functions->sqlAddSlashes($table) . "'"; + WHERE TABLE_SCHEMA = '" + . $common_functions->sqlAddSlashes($db) . "' + AND TABLE_NAME = '" + . $common_functions->sqlAddSlashes($table) . "'"; $tmpres = array_merge(PMA_DBI_fetch_single_row($sql), $tmpres); } // Here we optionally add the AUTO_INCREMENT next value, @@ -1027,7 +975,8 @@ class ExportSql extends ExportPlugin // no need to generate a DROP VIEW here, it was done earlier if (! empty($sql_drop_table) && ! PMA_Table::isView($db, $table)) { $schema_create .= 'DROP TABLE IF EXISTS ' - . $common_functions->backquote($table, $sql_backquotes) . ';' . $crlf; + . $common_functions->backquote($table, $sql_backquotes) . ';' + . $crlf; } // Complete table dump, @@ -1052,7 +1001,8 @@ class ExportSql extends ExportPlugin // produce a displayable result for the default value of a BIT // column, nor does the mysqldump command. See MySQL bug 35796 $result = PMA_DBI_try_query( - 'SHOW CREATE TABLE ' . $common_functions->backquote($db) . '.' . $common_functions->backquote($table) + 'SHOW CREATE TABLE ' . $common_functions->backquote($db) . '.' + . $common_functions->backquote($table) ); // an error can happen, for example the table is crashed $tmp_error = PMA_DBI_getError(); @@ -1264,12 +1214,9 @@ class ExportSql extends ExportPlugin $do_relation = false, $do_mime = false ) { - global $cfgRelation; + global $cfgRelation, $sql_backquotes; $common_functions = PMA_CommonFunctions::getInstance(); - $this->setCfgRelation($cfgRelation); - $sql_backquotes = $this->_getSqlBackquotes(); - $schema_create = ''; // Check if we can use Relations @@ -1309,7 +1256,10 @@ class ExportSql extends ExportPlugin ) . $this->_exportComment( ' ' - . $common_functions->backquote($mime['mimetype'], $sql_backquotes) + . $common_functions->backquote( + $mime['mimetype'], + $sql_backquotes + ) ); } $schema_create .= $this->_exportComment(); @@ -1331,9 +1281,15 @@ class ExportSql extends ExportPlugin ) . $this->_exportComment( ' ' - . $common_functions->backquote($rel['foreign_table'], $sql_backquotes) + . $common_functions->backquote( + $rel['foreign_table'], + $sql_backquotes + ) . ' -> ' - . $common_functions->backquote($rel['foreign_field'], $sql_backquotes) + . $common_functions->backquote( + $rel['foreign_field'], + $sql_backquotes + ) ); } $schema_create .= $this->_exportComment(); @@ -1354,11 +1310,12 @@ class ExportSql extends ExportPlugin * 'stand_in' * @param string $export_type 'server', 'database', 'table' * @param bool $relation whether to include relation comments - * @param bool $comments whether to include the pmadb-style column comments - * as comments in the structure; this is deprecated - * but the parameter is left here because export.php - * calls exportStructure() also for other export - * types which use this parameter + * @param bool $comments whether to include the pmadb-style column + * comments as comments in the structure; this is + * deprecated but the parameter is left here + * because export.php calls exportStructure() + * also for other export types which use this + * parameter * @param bool $mime whether to include mime comments * @param bool $dates whether to include creation/update/check dates * @@ -1461,9 +1418,7 @@ class ExportSql extends ExportPlugin */ public function exportData($db, $table, $crlf, $error_url, $sql_query) { - global $current_row; - $this->_setCurrentRow($current_row); - $sql_backquotes = $this->_getSqlBackquotes(); + global $current_row, $sql_backquotes; $common_functions = PMA_CommonFunctions::getInstance(); $formatted_table_name = (isset($GLOBALS['sql_backquotes'])) @@ -1535,7 +1490,10 @@ class ExportSql extends ExportPlugin $schema_insert .= 'IGNORE '; } // avoid EOL blank - $schema_insert .= $common_functions->backquote($table, $sql_backquotes) . ' SET'; + $schema_insert .= $common_functions->backquote( + $table, + $sql_backquotes + ) . ' SET'; } else { // insert or replace if (isset($GLOBALS['sql_type']) @@ -1566,7 +1524,10 @@ class ExportSql extends ExportPlugin && $sql_command == 'INSERT' ) { $truncate = 'TRUNCATE TABLE ' - . $common_functions->backquote($table, $sql_backquotes) . ";"; + . $common_functions->backquote( + $table, + $sql_backquotes + ) . ";"; $truncatehead = $this->_possibleCRLF() . $this->_exportComment() . $this->_exportComment( @@ -1669,7 +1630,8 @@ class ExportSql extends ExportPlugin // something else -> treat as a string $values[] = '\'' . str_replace( - $search, $replace, $common_functions->sqlAddSlashes($row[$j]) + $search, $replace, + $common_functions->sqlAddSlashes($row[$j]) ) . '\''; } // end if @@ -1755,161 +1717,4 @@ class ExportSql extends ExportPlugin return true; } // end of the 'exportData()' function - - - /* ~~~~~~~~~~~~~~~~~~~~ Getters and Setters ~~~~~~~~~~~~~~~~~~~~ */ - - /** - * Gets the MySQL charset map - * - * @return array - */ - private function _getMysqlCharsetMap() - { - return $this->_mysqlCharsetMap; - } - - /** - * Sets the MySQL charset map - * - * @param string $mysqlCharsetMap file charset - * - * @return void - */ - private function _setMysqlCharsetMap($mysqlCharsetMap) - { - $this->_mysqlCharsetMap = $mysqlCharsetMap; - } - - /** - * Gets the SQL for dropping a table - * - * @return string - */ - private function _getSqlDropTable() - { - return $this->_sqlDropTable; - } - - /** - * Sets the SQL for dropping a table - * - * @param string $sqlDropTable SQL for dropping a table - * - * @return void - */ - private function _setSqlDropTable($sqlDropTable) - { - $this->_sqlDropTable = $sqlDropTable; - } - - /** - * Gets the SQL Backquotes - * - * @return bool - */ - private function _getSqlBackquotes() - { - return $this->_sqlBackquotes; - } - - /** - * Sets the SQL Backquotes - * - * @param string $sqlBackquotes SQL Backquotes - * - * @return void - */ - private function _setSqlBackquotes($sqlBackquotes) - { - $this->_sqlBackquotes = $sqlBackquotes; - } - - /** - * Gets the SQL Constraints - * - * @return void - */ - private function _getSqlConstraints() - { - return $this->_sqlConstraints; - } - - /** - * Sets the SQL Constraints - * - * @param string $sqlConstraints SQL Constraints - * - * @return void - */ - private function _setSqlConstraints($sqlConstraints) - { - $this->_sqlConstraints = $sqlConstraints; - } - - /** - * Gets the text of the SQL constraints query - * - * @return void - */ - private function _getSqlConstraintsQuery() - { - return $this->_sqlConstraintsQuery; - } - - /** - * Sets the text of the SQL constraints query - * - * @param string $sqlConstraintsQuery text of the SQL constraints query - * - * @return void - */ - private function _setSqlConstraintsQuery($sqlConstraintsQuery) - { - $this->_sqlConstraintsQuery = $sqlConstraintsQuery; - } - - /** - * Gets the SQL for dropping foreign keys - * - * @return void - */ - private function _getSqlDropForeignKeys() - { - return $this->_sqlDropForeignKeys; - } - - /** - * Sets the SQL SQL for dropping foreign keys - * - * @param string $sqlDropForeignKeys SQL for dropping foreign keys - * - * @return void - */ - private function _setSqlDropForeignKeys($sqlDropForeignKeys) - { - $this->_sqlDropForeignKeys = $sqlDropForeignKeys; - } - - /** - * The number of the current row - * - * @return int - */ - private function _getCurrentRow() - { - return $this->_currentRow; - } - - /** - * Sets the number of the current row - * - * @param string $currentRow number of the current row - * - * @return void - */ - private function _setCurrentRow($currentRow) - { - $this->_currentRow = $currentRow; - } } \ No newline at end of file diff --git a/libraries/plugins/export/ExportTexytext.class.php b/libraries/plugins/export/ExportTexytext.class.php index be87426a02..4907b4e73b 100644 --- a/libraries/plugins/export/ExportTexytext.class.php +++ b/libraries/plugins/export/ExportTexytext.class.php @@ -36,12 +36,12 @@ class ExportTexytext extends ExportPlugin protected function setProperties() { $props = 'libraries/properties/'; - require_once "$props/plugins/ExportPluginProperties.class.php"; - require_once "$props/options/groups/OptionsPropertyRootGroup.class.php"; - require_once "$props/options/groups/OptionsPropertyMainGroup.class.php"; - require_once "$props/options/items/RadioPropertyItem.class.php"; - require_once "$props/options/items/BoolPropertyItem.class.php"; - require_once "$props/options/items/TextPropertyItem.class.php"; + include_once "$props/plugins/ExportPluginProperties.class.php"; + include_once "$props/options/groups/OptionsPropertyRootGroup.class.php"; + include_once "$props/options/groups/OptionsPropertyMainGroup.class.php"; + include_once "$props/options/items/RadioPropertyItem.class.php"; + include_once "$props/options/items/BoolPropertyItem.class.php"; + include_once "$props/options/items/TextPropertyItem.class.php"; $exportPluginProperties = new ExportPluginProperties(); $exportPluginProperties->setText('Texy! text'); @@ -62,11 +62,13 @@ class ExportTexytext extends ExportPlugin // create primary items and add them to the group $leaf = new RadioPropertyItem(); $leaf->setName("structure_or_data"); - $leaf->setValues(array( - 'structure' => __('structure'), - 'data' => __('data'), - 'structure_and_data' => __('structure and data') - )); + $leaf->setValues( + array( + 'structure' => __('structure'), + 'data' => __('data'), + 'structure_and_data' => __('structure and data') + ) + ); $dumpWhat->addProperty($leaf); // add the main group to the root group $exportSpecificOptions->addProperty($dumpWhat); @@ -177,7 +179,6 @@ class ExportTexytext extends ExportPlugin public function exportData($db, $table, $crlf, $error_url, $sql_query) { global $what; - $this->setWhat($what); if (! PMA_exportOutputHandler( '== ' . __('Dumping data for table') . ' ' . $table . "\n\n" @@ -314,7 +315,6 @@ class ExportTexytext extends ExportPlugin $view = false ) { global $cfgRelation; - $this->setCfgRelation($cfgRelation); $text_output = ''; diff --git a/libraries/plugins/export/ExportXml.class.php b/libraries/plugins/export/ExportXml.class.php index 3fb8452afd..7681d3fe2d 100644 --- a/libraries/plugins/export/ExportXml.class.php +++ b/libraries/plugins/export/ExportXml.class.php @@ -65,11 +65,11 @@ class ExportXml extends ExportPlugin protected function setProperties() { $props = 'libraries/properties/'; - require_once "$props/plugins/ExportPluginProperties.class.php"; - require_once "$props/options/groups/OptionsPropertyRootGroup.class.php"; - require_once "$props/options/groups/OptionsPropertyMainGroup.class.php"; - require_once "$props/options/items/HiddenPropertyItem.class.php"; - require_once "$props/options/items/BoolPropertyItem.class.php"; + include_once "$props/plugins/ExportPluginProperties.class.php"; + include_once "$props/options/groups/OptionsPropertyRootGroup.class.php"; + include_once "$props/options/groups/OptionsPropertyMainGroup.class.php"; + include_once "$props/options/items/HiddenPropertyItem.class.php"; + include_once "$props/options/items/BoolPropertyItem.class.php"; // create the export plugin property item $exportPluginProperties = new ExportPluginProperties(); @@ -164,9 +164,6 @@ class ExportXml extends ExportPlugin { $this->initSpecificVariables(); global $crlf, $cfg, $db; - $this->setCrlf($crlf); - $this->setCfg($cfg); - $this->setDb($db); $table = $this->_getTable(); $tables = $this->_getTables(); @@ -214,7 +211,8 @@ class ExportXml extends ExportPlugin 'utf8' AS DEFAULT_CHARACTER_SET_NAME, DEFAULT_COLLATION_NAME FROM data_dictionary.SCHEMAS - WHERE SCHEMA_NAME = '" . $common_functions->sqlAddSlashes($db) . "'" + WHERE SCHEMA_NAME = '" + . $common_functions->sqlAddSlashes($db) . "'" ); } else { $result = PMA_DBI_fetch_result( @@ -382,7 +380,7 @@ class ExportXml extends ExportPlugin */ public function exportDBHeader ($db) { - $crlf = $this->getCrlf(); + global $crlf; if (isset($GLOBALS['xml_export_contents']) && $GLOBALS['xml_export_contents'] @@ -407,7 +405,7 @@ class ExportXml extends ExportPlugin */ public function exportDBFooter ($db) { - $crlf = $this->getCrlf(); + global $crlf; if (isset($GLOBALS['xml_export_contents']) && $GLOBALS['xml_export_contents'] diff --git a/libraries/plugins/export/ExportYaml.class.php b/libraries/plugins/export/ExportYaml.class.php index 9c084e6b92..4b3dd3bc5f 100644 --- a/libraries/plugins/export/ExportYaml.class.php +++ b/libraries/plugins/export/ExportYaml.class.php @@ -36,10 +36,10 @@ class ExportYaml extends ExportPlugin protected function setProperties() { $props = 'libraries/properties/'; - require_once "$props/plugins/ExportPluginProperties.class.php"; - require_once "$props/options/groups/OptionsPropertyRootGroup.class.php"; - require_once "$props/options/groups/OptionsPropertyMainGroup.class.php"; - require_once "$props/options/items/HiddenPropertyItem.class.php"; + include_once "$props/plugins/ExportPluginProperties.class.php"; + include_once "$props/options/groups/OptionsPropertyRootGroup.class.php"; + include_once "$props/options/groups/OptionsPropertyMainGroup.class.php"; + include_once "$props/options/items/HiddenPropertyItem.class.php"; $exportPluginProperties = new ExportPluginProperties(); $exportPluginProperties->setText('YAML'); diff --git a/libraries/plugins/transformations/abstract/TextLinkTransformationsPlugin.class.php b/libraries/plugins/transformations/abstract/TextLinkTransformationsPlugin.class.php index 43bc65792d..64eec4206a 100644 --- a/libraries/plugins/transformations/abstract/TextLinkTransformationsPlugin.class.php +++ b/libraries/plugins/transformations/abstract/TextLinkTransformationsPlugin.class.php @@ -45,9 +45,12 @@ abstract class TextLinkTransformationsPlugin extends TransformationsPlugin */ public function applyTransformation($buffer, $options = array(), $meta = '') { + + $append_part = (isset($options[2]) && $options[2]) ? '' : $buffer; + $transform_options = array ( 'string' => '' . (isset($options[1]) ? $options[1] : $buffer) . '' ); diff --git a/pmd_pdf.php b/pmd_pdf.php index d5a1055261..69260da7cd 100644 --- a/pmd_pdf.php +++ b/pmd_pdf.php @@ -40,8 +40,10 @@ if (isset($mode)) { die(""); } - $pmd_table = $common_functions->backquote($GLOBALS['cfgRelation']['db']) . '.' . $common_functions->backquote($GLOBALS['cfgRelation']['designer_coords']); - $pma_table = $common_functions->backquote($GLOBALS['cfgRelation']['db']) . '.' . $common_functions->backquote($cfgRelation['table_coords']); + $pmd_table = $common_functions->backquote($GLOBALS['cfgRelation']['db']) . '.' + . $common_functions->backquote($GLOBALS['cfgRelation']['designer_coords']); + $pma_table = $common_functions->backquote($GLOBALS['cfgRelation']['db']) . '.' + . $common_functions->backquote($cfgRelation['table_coords']); $scale_q = $common_functions->sqlAddSlashes($scale); if ('create_export' == $mode) { @@ -57,7 +59,12 @@ if (isset($mode)) { $pdf_page_number_q = $common_functions->sqlAddSlashes($pdf_page_number); if ('export' == $mode) { - $sql = "REPLACE INTO " . $pma_table . " (db_name, table_name, pdf_page_number, x, y) SELECT db_name, table_name, " . $pdf_page_number_q . ", ROUND(x/" . $scale_q . ") , ROUND(y/" . $scale_q . ") y FROM " . $pmd_table . " WHERE db_name = '" . $common_functions->sqlAddSlashes($db) . "'"; + $sql = "REPLACE INTO " . $pma_table + . " (db_name, table_name, pdf_page_number, x, y)" + . " SELECT db_name, table_name, " . $pdf_page_number_q . "," + . " ROUND(x/" . $scale_q . ") , ROUND(y/" . $scale_q . ") y" + . " FROM " . $pmd_table + . " WHERE db_name = '" . $common_functions->sqlAddSlashes($db) . "'"; PMA_queryAsControlUser($sql, true, PMA_DBI_QUERY_STORE); } @@ -72,7 +79,7 @@ if (isset($mode)) { AND ' . $pmd_table . '.`table_name` = ' . $pma_table . '.`table_name` AND - ' . $pmd_table . '.`db_name`=\''. $common_functions->sqlAddSlashes($db) .'\' + ' . $pmd_table . '.`db_name`=\''. $common_functions->sqlAddSlashes($db) . '\' AND pdf_page_number = ' . $pdf_page_number_q . ';', true, PMA_DBI_QUERY_STORE ); diff --git a/pmd_relation_new.php b/pmd_relation_new.php index bb8cb8b1cd..d78a8eb77e 100644 --- a/pmd_relation_new.php +++ b/pmd_relation_new.php @@ -35,14 +35,14 @@ if ($common_functions->isForeignKeySupported($type_T1) ) { PMD_return_new(0, __('Error: relation already exists.')); } -// note: in InnoDB, the index does not requires to be on a PRIMARY -// or UNIQUE key -// improve: check all other requirements for InnoDB relations + // note: in InnoDB, the index does not requires to be on a PRIMARY + // or UNIQUE key + // improve: check all other requirements for InnoDB relations $result = PMA_DBI_query( 'SHOW INDEX FROM ' . $common_functions->backquote($db) . '.' . $common_functions->backquote($T1) . ';' ); - $index_array1 = array(); // will be use to emphasis prim. keys in the table view + $index_array1 = array(); // will be use to emphasis prim. keys in the table view while ($row = PMA_DBI_fetch_assoc($result)) { $index_array1[$row['Column_name']] = 1; } @@ -52,7 +52,7 @@ if ($common_functions->isForeignKeySupported($type_T1) 'SHOW INDEX FROM ' . $common_functions->backquote($db) . '.' . $common_functions->backquote($T2) . ';' ); - $index_array2 = array(); // will be used to emphasis prim. keys in the table view + $index_array2 = array(); // will be used to emphasis prim. keys in the table view while ($row = PMA_DBI_fetch_assoc($result)) { $index_array2[$row['Column_name']] = 1; } @@ -76,11 +76,9 @@ if ($common_functions->isForeignKeySupported($type_T1) } $upd_query .= ';'; PMA_DBI_try_query($upd_query) or PMD_return_new(0, __('Error: Relation not added.')); - PMD_return_new(1, __('FOREIGN KEY relation added')); + PMD_return_new(1, __('FOREIGN KEY relation added')); } - -// internal (pmadb) relation -} else { +} else { // internal (pmadb) relation if ($GLOBALS['cfgRelation']['relwork'] == false) { PMD_return_new(0, _('General relation features') . ':' . _('Disabled')); } else { @@ -102,7 +100,7 @@ if ($common_functions->isForeignKeySupported($type_T1) } else { PMD_return_new(0, __('Error: Relation not added.')); } - } + } } function PMD_return_new($b,$ret) diff --git a/pmd_save_pos.php b/pmd_save_pos.php index a0cfc944ea..a009ef146a 100644 --- a/pmd_save_pos.php +++ b/pmd_save_pos.php @@ -38,17 +38,20 @@ foreach ($post_params as $one_post_param) { } foreach ($t_x as $key => $value) { - $KEY = empty($IS_AJAX) ? urldecode($key) : $key; // table name decode (post PDF exp/imp) + // table name decode (post PDF exp/imp) + $KEY = empty($IS_AJAX) ? urldecode($key) : $key; list($DB,$TAB) = explode(".", $KEY); PMA_queryAsControlUser( - 'DELETE FROM ' . $common_functions->backquote($GLOBALS['cfgRelation']['db']) . '.' . $common_functions->backquote($GLOBALS['cfgRelation']['designer_coords']) + 'DELETE FROM ' . $common_functions->backquote($GLOBALS['cfgRelation']['db']) + . '.' . $common_functions->backquote($GLOBALS['cfgRelation']['designer_coords']) . ' WHERE `db_name` = \'' . $common_functions->sqlAddSlashes($DB) . '\'' . ' AND `table_name` = \'' . $common_functions->sqlAddSlashes($TAB) . '\'', true, PMA_DBI_QUERY_STORE ); PMA_queryAsControlUser( - 'INSERT INTO ' . $common_functions->backquote($GLOBALS['cfgRelation']['db']) . '.' . $common_functions->backquote($GLOBALS['cfgRelation']['designer_coords']) + 'INSERT INTO ' . $common_functions->backquote($GLOBALS['cfgRelation']['db']) + . '.' . $common_functions->backquote($GLOBALS['cfgRelation']['designer_coords']) . ' (db_name, table_name, x, y, v, h)' . ' VALUES (' . '\'' . $common_functions->sqlAddSlashes($DB) . '\', ' diff --git a/po/ca.po b/po/ca.po index 57576e0b8b..ec1419eda8 100644 --- a/po/ca.po +++ b/po/ca.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-07-27 10:40+0200\n" -"PO-Revision-Date: 2012-07-26 17:20+0200\n" +"PO-Revision-Date: 2012-07-30 17:15+0200\n" "Last-Translator: Xavier Navarro \n" "Language-Team: catalan \n" "Language: ca\n" @@ -3266,7 +3266,7 @@ msgstr "Ordre del llistat:" #: libraries/TableSearch.class.php:856 msgid "Use this column to label each point" -msgstr "" +msgstr "Utilitza aquesta columna per etiquetar cada punt" #: libraries/TableSearch.class.php:877 msgid "Maximum rows to plot" @@ -3293,7 +3293,7 @@ msgstr "Fer una \"petició segons exemple\" (comodí: \"%\")" #: libraries/TableSearch.class.php:1198 msgid "Browse/Edit the points" -msgstr "" +msgstr "Veure/editar els punts" #: libraries/TableSearch.class.php:1205 msgid "How to use" @@ -10474,6 +10474,8 @@ msgid "" "The Advisor system can provide recommendations on server variables by " "analyzing the server status variables." msgstr "" +"El sistema de consells pot proporcionar recomanacions sobre les variables " +"del servidor mitjançant l'anàlisi de les variables d'estat del servidor." #: server_status.php:930 msgid "" @@ -10481,6 +10483,9 @@ msgid "" "calculations and by rule of thumb which may not necessarily apply to your " "system." msgstr "" +"Tingues en compte però que aquest sistema ofereix recomanacions basades en " +"càlculs senzills i regles generals que no necessàriament s'apliquen al seu " +"sistema." #: server_status.php:932 msgid "" @@ -10488,6 +10493,10 @@ msgid "" "changing (by reading the documentation) and how to undo the change. Wrong " "tuning can have a very negative effect on performance." msgstr "" +"Abans de canviar qualsevol configuració, assegura't de saber què estàs " +"canviant (mitjançant la lectura de la documentació) i cóm desfer el canvi. " +"Establir ajustaments incorrectes pot tenir un efecte molt negatiu en el " +"rendiment." #: server_status.php:934 msgid "" @@ -10495,6 +10504,9 @@ msgid "" "time, observe or benchmark your database, and undo the change if there was " "no clearly measurable improvement." msgstr "" +"La millor manera d'ajustar el sistema seria canviar només una configuració " +"al mateix temps, observar o mesurar la teva base de dades, i desfer el canvi " +"si no hi ha una millora clarament mesurable." #. l10n: Questions is the name of a MySQL Status variable #: server_status.php:957 @@ -11345,6 +11357,11 @@ msgid "" "enabled. Note however, that the general_log produces a lot of data and " "increases server load by up to 15%" msgstr "" +"El monitor de phpMyAdmin pot ajudar a optimitzar la configuració del " +"servidor i localitzar a temps les consultes intensives. En aquest darrer cas " +"s'haurà d'establir log_output a 'TABLE' i tenir el slow_query_log o " +"general_log habilitat. Noteu però, que la general_log produeix una gran " +"quantitat de dades i augmenta la càrrega del servidor fins en un 15%" #: server_status.php:1689 msgid "" @@ -11353,10 +11370,15 @@ msgid "" "table is supported by MySQL 5.1.6 and onwards. You may still use the server " "charting features however." msgstr "" +"Lamentablement, el teu servidor de bases de dades no és compatible amb el " +"registre a la taula, que és un requisit per a l'anàlisi dels registres de " +"base de dades amb phpMyAdmin. El registre a la taula se suporta a partir de " +"MySQL 5.1.6 i següents. Pots seguir utilitzant però les funcions de gràfics " +"de servidor." #: server_status.php:1702 msgid "Using the monitor:" -msgstr "" +msgstr "Utilitzant el monitor:" #: server_status.php:1704 msgid "" @@ -11364,6 +11386,10 @@ msgid "" "may add charts and change the refresh rate under 'Settings', or remove any " "chart using the cog icon on each respective chart." msgstr "" +"El teu navegador actualitzarà tots els gràfics que es mostren en un interval " +"regular. Pots afegir gràfics i canviar la freqüència d'actualització a la " +"secció 'Configuració', o eliminar qualsevol gràfic amb la icona d'engranatge " +"en cada gràfic corresponent." #: server_status.php:1706 msgid "" @@ -11372,10 +11398,15 @@ msgid "" "confirmed, this will load a table of grouped queries, there you may click on " "any occuring SELECT statements to further analyze them." msgstr "" +"Per mostrar les consultes dels registres, selecciona l'interval de temps " +"rellevant en qualsevol gràfic mantenint premut el botó esquerre del ratolí i " +"arrosegant sobre el gràfic. Un cop confirmat, això carregarà una taula de " +"consultes agrupades, on podràs clicar en qualsevol de les instruccions " +"SELECT per analitzar-la amb més detall." #: server_status.php:1713 msgid "Please note:" -msgstr "" +msgstr "Tingueu en compte:" #: server_status.php:1715 msgid "" @@ -11384,6 +11415,11 @@ msgid "" "it is advisable to select only a small time span and to disable the " "general_log and empty its table once monitoring is not required any more." msgstr "" +"Activar el general_log pot augmentar la càrrega del servidor en un 5-15%. " +"També tingues en compte que la generació d'estadístiques dels registres és " +"una tasca de càrrega intensiva, pel que és aconsellable seleccionar només un " +"lapse de temps petit i per desactivar el general_log i buidar la taula una " +"vegada que el monitoratge no es requereixi més." #: server_status.php:1729 msgid "Preset chart" @@ -11399,7 +11435,7 @@ msgstr "Seleccionar series:" #: server_status.php:1737 msgid "Commonly monitored" -msgstr "" +msgstr "Comunment monitoritzat" #: server_status.php:1752 msgid "or type variable name:" @@ -11407,15 +11443,15 @@ msgstr "o escriu el nom de variable:" #: server_status.php:1756 msgid "Display as differential value" -msgstr "" +msgstr "Mostra com a valor diferencial" #: server_status.php:1758 msgid "Apply a divisor" -msgstr "" +msgstr "Aplicar un divisor" #: server_status.php:1765 msgid "Append unit to data values" -msgstr "" +msgstr "Afegir unitat als valors" #: server_status.php:1771 msgid "Add this series" @@ -11423,7 +11459,7 @@ msgstr "Afegir aquesta serie" #: server_status.php:1773 msgid "Clear series" -msgstr "" +msgstr "Buidar sèrie" #: server_status.php:1776 msgid "Series in Chart:" @@ -11439,19 +11475,21 @@ msgstr "Rang de temps seleccionat:" #: server_status.php:1797 msgid "Only retrieve SELECT,INSERT,UPDATE and DELETE Statements" -msgstr "" +msgstr "Només recuperar instruccions SELECT, INSERT, UPDATE i DELETE" #: server_status.php:1802 msgid "Remove variable data in INSERT statements for better grouping" msgstr "" +"Elimina dades variables en les instruccions INSERT per a una millor " +"agrupació" #: server_status.php:1807 msgid "Choose from which log you want the statistics to be generated from." -msgstr "" +msgstr "Tria de quin registre vols que es generin les estadístiques." #: server_status.php:1809 msgid "Results are grouped by query text." -msgstr "" +msgstr "Els resultats s'agrupen pel text de la consulta." #: server_status.php:1814 msgid "Query analyzer" @@ -11587,7 +11625,7 @@ msgstr "" #: server_variables.php:87 msgid "Setting variable failed" -msgstr "" +msgstr "Errada a la configuració de la variable" #: server_variables.php:100 msgid "Server variables and settings" @@ -11608,6 +11646,8 @@ msgstr "Descarrega" #: setup/frames/form.inc.php:25 msgid "Incorrect formset, check $formsets array in setup/frames/form.inc.php" msgstr "" +"Conjunt de formularis incorrecte, comprova l'array $formsets a l'arxiu " +"setup/frames/form.inc.php" #: setup/frames/index.inc.php:51 msgid "Cannot load or save configuration" @@ -11655,6 +11695,9 @@ msgid "" "Configuration saved to file config/config.inc.php in phpMyAdmin top level " "directory, copy it to top level one and delete directory config to use it." msgstr "" +"Configuració desada a l'arxiu config/config.inc.php dins el directori arrel " +"de phpMyAdmin, copia'l al nivell superior i elimina el directori de " +"configuració per utilitzar-lo." #: setup/frames/index.inc.php:107 setup/frames/menu.inc.php:16 msgid "Overview" @@ -11718,7 +11761,7 @@ msgstr "Afegir un nou servidor" #: setup/index.php:22 msgid "Wrong GET file attribute value" -msgstr "" +msgstr "Valor incorrecte d'atribut d'arxiu en GET" #: setup/lib/form_processing.lib.php:43 msgid "Warning" @@ -12016,7 +12059,7 @@ msgstr "Títol del gràfic" #: tbl_chart.php:106 msgid "X-Axis:" -msgstr "" +msgstr "Eix X:" #: tbl_chart.php:121 msgid "Series:" @@ -12278,7 +12321,7 @@ msgstr "Mida de fila" #: tbl_printview.php:406 tbl_structure.php:963 msgid "Next autoindex" -msgstr "" +msgstr "AUTOINDEX Següent" #: tbl_relation.php:281 #, php-format @@ -12304,7 +12347,7 @@ msgstr "Límit de clau externa" #: tbl_structure.php:154 tbl_structure.php:159 tbl_structure.php:601 msgid "Spatial" -msgstr "" +msgstr "Espacial" #: tbl_structure.php:161 tbl_structure.php:165 #, fuzzy @@ -12590,22 +12633,26 @@ msgstr "Reanomena la vista a" #: libraries/advisory_rules.txt:49 msgid "Uptime below one day" -msgstr "" +msgstr "Temps d'activitat per sota d'un dia" #: libraries/advisory_rules.txt:52 msgid "Uptime is less than 1 day, performance tuning may not be accurate." msgstr "" +"El temps d'activitat és inferior a 1 dia, l'optimització del rendiment pot " +"no ser exacta." #: libraries/advisory_rules.txt:53 msgid "" "To have more accurate averages it is recommended to let the server run for " "longer than a day before running this analyzer" msgstr "" +"Per tenir unes mitjanes més exactes, es recomana deixar que el servidor " +"funcioni durant més d'un dia abans d'executar aquest analitzador" #: libraries/advisory_rules.txt:54 #, php-format msgid "The uptime is only %s" -msgstr "" +msgstr "El temps d'activitat només és de %s" #: libraries/advisory_rules.txt:56 msgid "Questions below 1,000" @@ -12616,12 +12663,16 @@ msgid "" "Fewer than 1,000 questions have been run against this server. The " "recommendations may not be accurate." msgstr "" +"S'han fet menys de 1.000 consultes en aquest servidor. Les recomanacions " +"poden no ser exactes." #: libraries/advisory_rules.txt:60 msgid "" "Let the server run for a longer time until it has executed a greater amount " "of queries." msgstr "" +"Deixa que el servidor s'executi per més temps fins que s'hagi dut a terme " +"una major quantitat de consultes." #: libraries/advisory_rules.txt:61 #, php-format @@ -12636,17 +12687,22 @@ msgstr "Percentatge de consultes lentes" msgid "" "There is a lot of slow queries compared to the overall amount of Queries." msgstr "" +"Hi ha una gran quantitat de consultes lentes (slow-queries) en comparació " +"amb la quantitat total de consultes." #: libraries/advisory_rules.txt:67 libraries/advisory_rules.txt:74 msgid "" "You might want to increase {long_query_time} or optimize the queries listed " "in the slow query log" msgstr "" +"Podries augmentar la variable {long_query_time} o optimitzar les consultes " +"que figuren en el registre de consultes lentes" #: libraries/advisory_rules.txt:68 #, php-format msgid "The slow query rate should be below 5%%, your value is %s%%." msgstr "" +"La taxa de consultes lentes ha de ser inferior al 5%%, el teu valor és %s%%." #: libraries/advisory_rules.txt:70 msgid "Slow query rate" @@ -12656,6 +12712,8 @@ msgstr "Freqüència de consultes lentes" msgid "" "There is a high percentage of slow queries compared to the server uptime." msgstr "" +"Hi ha un alt percentatge de consultes lentes en comparació amb el temps " +"d'activitat del servidor." #: libraries/advisory_rules.txt:75 #, php-format @@ -12663,6 +12721,8 @@ msgid "" "You have a slow query rate of %s per hour, you should have less than 1%% per " "hour." msgstr "" +"Tens una taxa de consultes lentes de %s per hora, hauries de tenir menys de " +"l'1%% per hora." #: libraries/advisory_rules.txt:77 msgid "Long query time" @@ -12673,40 +12733,44 @@ msgid "" "long_query_time is set to 10 seconds or more, thus only slow queries that " "take above 10 seconds are logged." msgstr "" +"long_query_time s'estableix en 10 segons o més, per tant, només entrarà les " +"consultes lentes que triguin més de 10 segons." #: libraries/advisory_rules.txt:81 msgid "" "It is suggested to set {long_query_time} to a lower value, depending on your " "environment. Usually a value of 1-5 seconds is suggested." msgstr "" +"Es suggereix establir {long_query_time} a un valor inferior, depenent del " +"teu entorn. En general, es recomana un valor de 1-5 segons." #: libraries/advisory_rules.txt:82 -#, fuzzy, php-format +#, php-format #| msgid "long_query_time is set to %d second(s)." msgid "long_query_time is currently set to %ds." -msgstr "«long_query_time» està configurat a %d segon(s)." +msgstr "long_query_time està configurat a %ds." #: libraries/advisory_rules.txt:84 msgid "Slow query logging" msgstr "Registre de consultes lentes" #: libraries/advisory_rules.txt:87 -#, fuzzy #| msgid "slow_query_log is enabled." msgid "The slow query log is disabled." -msgstr "«slow_query_log» està actiu." +msgstr "El registre de consultes lentes està desactivat." #: libraries/advisory_rules.txt:88 msgid "" "Enable slow query logging by setting {log_slow_queries} to 'ON'. This will " "help troubleshooting badly performing queries." msgstr "" +"Habilita el registre de consultes lentes establint {log_slow_queries} a " +"'ON'. Això t'ajudarà a solucionar les consultes amb mal rendiment." #: libraries/advisory_rules.txt:89 -#, fuzzy #| msgid "long_query_time is set to %d second(s)." msgid "log_slow_queries is set to 'OFF'" -msgstr "«long_query_time» està configurat a %d segon(s)." +msgstr "log_slow_queries està a 'OFF'" #: libraries/advisory_rules.txt:93 msgid "Release Series" @@ -12714,13 +12778,15 @@ msgstr "Serie de versions" #: libraries/advisory_rules.txt:96 msgid "The MySQL server version less than 5.1." -msgstr "" +msgstr "La versió del servidor MySQL és inferior a 5.1." #: libraries/advisory_rules.txt:97 msgid "" "You should upgrade, as MySQL 5.1 has improved performance, and MySQL 5.5 " "even more so." msgstr "" +"Hauries d'actualitzar, ja que MySQL 5.1 té millor rendiment, i encara és " +"millor en MySQL 5.5." #: libraries/advisory_rules.txt:98 libraries/advisory_rules.txt:105 #: libraries/advisory_rules.txt:112 @@ -12734,17 +12800,19 @@ msgstr "Versió menor" #: libraries/advisory_rules.txt:103 msgid "Version less than 5.1.30 (the first GA release of 5.1)." -msgstr "" +msgstr "Versió inferior a 5.1.30 (la primera versió disponible pública de 5.1)." #: libraries/advisory_rules.txt:104 msgid "" "You should upgrade, as recent versions of MySQL 5.1 have improved " "performance and MySQL 5.5 even more so." msgstr "" +"Hauries d'actualitzar, ja que les darreres versions de MySQL 5.1 tenen " +"millor rendiment, i MySQL 5.05 encara més." #: libraries/advisory_rules.txt:110 msgid "Version less than 5.5.8 (the first GA release of 5.5)." -msgstr "" +msgstr "Versió inferior a 5.5.8 (la primera versió disponible pública de 5.5)." #: libraries/advisory_rules.txt:111 msgid "You should upgrade, to a stable version of MySQL 5.5" @@ -12757,7 +12825,7 @@ msgstr "Distribució" #: libraries/advisory_rules.txt:117 msgid "Version is compiled from source, not a MySQL official binary." -msgstr "" +msgstr "Versió compilada des del codi font, no és un binari oficial de MySQL." #: libraries/advisory_rules.txt:118 msgid "" @@ -12765,31 +12833,39 @@ msgid "" "distribution. The MySQL manual only is accurate for official MySQL binaries, " "not any package distributions (such as RedHat, Debian/Ubuntu etc)." msgstr "" +"Si no vas compilar des del codi font, potser estàs utilitzant un paquet " +"modificat per una distribució. El manual de MySQL només és exacte per als " +"binaris de MySQL oficials, no per els paquets de distribucions (com RedHat, " +"Debian/Ubuntu, etc)." #: libraries/advisory_rules.txt:119 msgid "'source' found in version_comment" msgstr "" +"S'ha trobat \"font\" (\"source\") en el comentari de la versió " +"(\"version_comment\")" #: libraries/advisory_rules.txt:124 libraries/advisory_rules.txt:131 msgid "The MySQL manual only is accurate for official MySQL binaries." -msgstr "" +msgstr "El manual de MySQL només és exacte per als binaris oficials de MySQL." #: libraries/advisory_rules.txt:125 msgid "Percona documentation is at http://www.percona.com/docs/wiki/" -msgstr "" +msgstr "La documentació de Percona es troba a http://www.percona.com/docs/wiki/" #: libraries/advisory_rules.txt:126 msgid "'percona' found in version_comment" -msgstr "" +msgstr "S'ha trobat 'percona' als comentaris de la versió (\"version_comment\")" #: libraries/advisory_rules.txt:132 msgid "Drizzle documentation is at http://docs.drizzle.org/" -msgstr "" +msgstr "La documentació de Drizzle es troba a http://docs.drizzle.org/" #: libraries/advisory_rules.txt:133 #, php-format msgid "Version string (%s) matches Drizzle versioning scheme" msgstr "" +"La cadena de la versió (%s) coincideix amb el sistema de control de versions " +"de Drizzle" #: libraries/advisory_rules.txt:135 msgid "MySQL Architecture" @@ -12797,7 +12873,7 @@ msgstr "Arquitectura MySQL" #: libraries/advisory_rules.txt:138 msgid "MySQL is not compiled as a 64-bit package." -msgstr "" +msgstr "MySQL no s'ha compilat com a paquet de 64 bits." #: libraries/advisory_rules.txt:139 msgid "" @@ -12805,11 +12881,15 @@ msgid "" "so MySQL might not be able to access all of your memory. You might want to " "consider installing the 64-bit version of MySQL." msgstr "" +"La teva capacitat de memòria és superior a 3 GiB (suposant que el servidor " +"està en localhost), de manera que MySQL no podria ser capaç d'accedir a la " +"totalitat de la seva memòria. És possible que vulgueu considerar la " +"instal·lació de la versió de 64 bits de MySQL." #: libraries/advisory_rules.txt:140 #, php-format msgid "Available memory on this host: %s" -msgstr "" +msgstr "Memòria disponible en aquest servidor: %s" #: libraries/advisory_rules.txt:146 msgid "Query cache disabled" @@ -12826,20 +12906,23 @@ msgid "" "and setting {query_cache_type} to 'ON'. Note: If you are using " "memcached, ignore this recommendation." msgstr "" +"Se sap que la memòria cau de consultes millora en gran mesura el rendiment " +"si s'ha configurat correctament. Activa'l mitjançant l'establiment de " +"{query_cache_size} a un valor MIB de 2 dígits i ajusta {query_cache_type} a " +"'ON'. Nota: Si utilitzes memcached, ignora aquesta recomanació." #: libraries/advisory_rules.txt:151 msgid "query_cache_size is set to 0 or query_cache_type is set to 'OFF'" -msgstr "" +msgstr "query_cache_size s'estableix a 0 o query_cache_type està a 'OFF'" #: libraries/advisory_rules.txt:153 msgid "Query caching method" msgstr "Mètode de cau de consultes" #: libraries/advisory_rules.txt:156 -#, fuzzy #| msgid "Query cache" msgid "Suboptimal caching method." -msgstr "Memòria cau de consultes" +msgstr "Mètode d'emmagatzematge en memòria cau subòptima." #: libraries/advisory_rules.txt:157 msgid "" @@ -12848,6 +12931,11 @@ msgid "" "refman/5.5/en/ha-memcached.html\">memcached instead of the MySQL Query " "cache, especially if you have multiple slaves." msgstr "" +"Estàs utilitzant la memòria cau de consultes de MySQL amb una base de dades " +"de força transit. Valdria la pena considerar l'ús memcached en lloc de la memòria cau de consultes de " +"MySQL, especialment si tens diversos servidors esclaus." #: libraries/advisory_rules.txt:158 #, php-format @@ -12855,6 +12943,8 @@ msgid "" "The query cache is enabled and the server receives %d queries per second. " "This rule fires if there is more than 100 queries per second." msgstr "" +"La memòria cau de consultes està activat i el servidor rep %d consultes per " +"segon. Aquesta regla es dispara si hi ha més de 100 consultes per segon." #: libraries/advisory_rules.txt:160 #, php-format @@ -12864,16 +12954,19 @@ msgstr "Eficiència del cau de consultes (%%)" #: libraries/advisory_rules.txt:163 msgid "Query cache not running efficiently, it has a low hit rate." msgstr "" +"La memòria cau de consulta no s'executa de manera eficient, té una taxa " +"d'èxit baixa." #: libraries/advisory_rules.txt:164 msgid "Consider increasing {query_cache_limit}." -msgstr "" +msgstr "Pensa en la possibilitat d'augmentar {query_cache_limit}." #: libraries/advisory_rules.txt:165 -#, fuzzy, php-format +#, php-format #| msgid "Sort buffer size" msgid "The current query cache hit rate of %s%% is below 20%%" -msgstr "Tamany de l'àrea de classificació" +msgstr "" +"L'actual taxa d'èxit de la memòria cau de consultes %s%% és inferior al 20%%" #: libraries/advisory_rules.txt:167 msgid "Query Cache usage" @@ -12882,13 +12975,15 @@ msgstr "Ús del cau de consultes" #: libraries/advisory_rules.txt:170 #, php-format msgid "Less than 80%% of the query cache is being utilized." -msgstr "" +msgstr "S'utilitza menys del 80%% de la memòria cau de consultes." #: libraries/advisory_rules.txt:171 msgid "" "This might be caused by {query_cache_limit} being too low. Flushing the " "query cache might help as well." msgstr "" +"Això pot ser causat perque el valor de {query_cache_limit} és massa baix. " +"Buidar la memòria cau de consulta també pot ajudar." #: libraries/advisory_rules.txt:172 #, php-format @@ -12896,16 +12991,17 @@ msgid "" "The current ratio of free query cache memory to total query cache size is %s" "%%. It should be above 80%%" msgstr "" +"La taxa actual de memòria lluire del cau de consultes respecte la mida total " +"és de %s%%. Hauria de estar per sobre de 80%%" #: libraries/advisory_rules.txt:174 msgid "Query cache fragmentation" msgstr "Fragmentació del cau de consultes" #: libraries/advisory_rules.txt:177 -#, fuzzy #| msgid "The server is not responding" msgid "The query cache is considerably fragmented." -msgstr "El servidor no respon" +msgstr "La memòria cau de consultes està bastant fragmentada." #: libraries/advisory_rules.txt:178 msgid "" @@ -12918,6 +13014,15 @@ msgid "" "using this formula: (query_cache_size - qcache_free_memory) / " "qcache_queries_in_cache" msgstr "" +"Una alta fragmentació és probable que augmenti (més) \"Qcache_lowmem_prunes\". " +"Això podria ser causat per moltes reduccions fetes a la memòria cau de " +"consultes per falta de memòria, pel fet que {query_cache_size} és massa " +"petit. Una solució immediata però a curt plaç és que pots buidar la memòria " +"cau de consultes (pot bloquejar la memòria cau de consultes durant molt de " +"temps). Ajustar acuradament {query_cache_min_res_unit} a un valor inferior " +"podria ajudar també, per exemple, pots configurar-lo a la mida mitjana de " +"les consultes en la memòria cau mitjançant la fórmula: (query_cache_size - " +"qcache_free_memory) / qcache_queries_in_cache" #: libraries/advisory_rules.txt:179 #, php-format @@ -12926,12 +13031,14 @@ msgid "" "that the query cache is an alternating pattern of free and used blocks. This " "value should be below 20%%." msgstr "" +"La memòria cau està %s%% fragmentada actualment. Una fragmentació del 100%% " +"significa que la memòria cau de consultes és un patró d'alternança de blocs " +"lliures i usats. Aquest valor ha de ser inferior al 20%%." #: libraries/advisory_rules.txt:181 -#, fuzzy #| msgid "Query cache used" msgid "Query cache low memory prunes" -msgstr "Memòria cau de consultes utilitzada" +msgstr "Reduccions a memòria cau per falta de memòria" #: libraries/advisory_rules.txt:184 msgid "" @@ -12947,6 +13054,10 @@ msgid "" "overhead of maintaining the cache is likely to increase with its size, so do " "this in small increments and monitor the results." msgstr "" +"És possible que vulguis augmentar {query_cache_size}, però tingues en compte " +"que la sobrecàrrega de mantenir la memòria cau és probable que augmenti amb " +"la seva grandària, així que es recomana fer això en petits increments i " +"supervisar els resultats." #: libraries/advisory_rules.txt:186 #, php-format @@ -12954,6 +13065,9 @@ msgid "" "The ratio of removed queries to inserted queries is %s%%. The lower this " "value is, the better (This rules firing limit: 0.1%%)" msgstr "" +"La proporció de consultes eliminades respecte a les inserides és %s%%. Com " +"més baix sigui aquest valor, millor (el límit d'activació de la regla és: " +"0,1%%)" #: libraries/advisory_rules.txt:188 msgid "Query cache max size" @@ -12964,18 +13078,22 @@ msgid "" "The query cache size is above 128 MiB. Big query caches may cause " "significant overhead that is required to maintain the cache." msgstr "" +"La mida de la memòria cau de consultes està per sobre de 128 MiB. Grans caus " +"de consultes poden causar una sobrecàrrega significativa per mantenir la " +"memòria cau." #: libraries/advisory_rules.txt:192 msgid "" "Depending on your environment, it might be performance increasing to reduce " "this value." msgstr "" +"Depenent del teu entorn, reduir aquest valor podria augmentar el rendiment." #: libraries/advisory_rules.txt:193 -#, fuzzy, php-format +#, php-format #| msgid "Current version: %s" msgid "Current query cache size: %s" -msgstr "Versió actual: %s" +msgstr "La mida actual de la memòria cau de consultes: %s" #: libraries/advisory_rules.txt:195 msgid "Query cache min result size" @@ -12985,6 +13103,8 @@ msgstr "Tamany minim de resultats del cau de consultes" msgid "" "The max size of the result set in the query cache is the default of 1 MiB." msgstr "" +"La mida màxima del conjunt de resultats en la memòria cau de consultes és el " +"valor predeterminat d'1 MiB." #: libraries/advisory_rules.txt:199 msgid "" @@ -12997,10 +13117,19 @@ msgid "" "(often invalidated due to table updates) increasing {query_cache_limit} " "might reduce efficiency." msgstr "" +"Canviant {query_cache_limit} (normalment mitjançant l'augment) pot augmentar " +"l'eficiència. Aquest paràmetre defineix la mida màxima que un resultat de " +"la consulta pot tenir per ser inserit en la memòria cau de consultes. Si hi " +"ha molts resultats de la consulta de més d'1 MIB que són candidats al cau " +"(moltes lectures, poques escritures), llavors augmentar {query_cache_limit} " +"incrementarà l'eficiència. Mentre que en el cas de molts resultats de la " +"consulta per sobre d'1 MIB que no són útils al cau (sovint invalidades a " +"causa de les actualitzacions de la taula) augmentat {query_cache_limit} " +"podria reduir l'eficiència." #: libraries/advisory_rules.txt:200 msgid "query_cache_limit is set to 1 MiB" -msgstr "" +msgstr "query_cache_limit establert en 1 MiB" #: libraries/advisory_rules.txt:204 msgid "Percentage of sorts that cause temporary tables" @@ -13015,6 +13144,8 @@ msgid "" "Consider increasing sort_buffer_size and/or read_rnd_buffer_size, depending " "on your system memory limits" msgstr "" +"Pensa en la possibilitat d'augmentar \"sort_buffer_size\" i/o " +"\"read_rnd_buffer_size\" en funció dels límits de memòria del sistema" #: libraries/advisory_rules.txt:209 #, php-format @@ -13022,17 +13153,21 @@ msgid "" "%s%% of all sorts cause temporary tables, this value should be lower than " "10%%." msgstr "" +"%s%% de totes les ordenacions causen taules temporals, aquest valor ha de " +"ser inferior al 10%%." #: libraries/advisory_rules.txt:211 msgid "Rate of sorts that cause temporary tables" msgstr "Rati de classificacions que provoquen taules temporals" #: libraries/advisory_rules.txt:216 -#, fuzzy, php-format +#, php-format #| msgid "Sort buffer size" msgid "" "Temporary tables average: %s, this value should be less than 1 per hour." -msgstr "Tamany de l'àrea de classificació" +msgstr "" +"Mitjana de taules temporals: %s, aquest valor ha de ser inferior a 1 per " +"hora." #: libraries/advisory_rules.txt:218 msgid "Sort rows" @@ -13040,7 +13175,7 @@ msgstr "Files classificades" #: libraries/advisory_rules.txt:221 msgid "There are lots of rows being sorted." -msgstr "" +msgstr "Hi ha massa files que s'estan ordenant." #: libraries/advisory_rules.txt:222 msgid "" @@ -13049,11 +13184,15 @@ msgid "" "indexed columns in the ORDER BY clause, as this will result in much faster " "sorting" msgstr "" +"Encara que no hi ha res dolent en ordenar una gran quantitat de files, " +"potser voldries assegurar-te que les consultes que requereixen una gran " +"quantitat d'ordenacions utilitzin columnes indexades a la clàusula ORDER BY, " +"ja que això donarà lloc a una ordenació més ràpida" #: libraries/advisory_rules.txt:223 #, php-format msgid "Sorted rows average: %s" -msgstr "" +msgstr "Mitjana de files ordenades: %s" #: libraries/advisory_rules.txt:226 msgid "Rate of joins without indexes" @@ -13068,24 +13207,26 @@ msgid "" "This means that joins are doing full table scans. Adding indexes for the " "columns being used in the join conditions will greatly speed up table joins" msgstr "" +"Això significa que les unions \"JOIN\" que estan fent consultes completes de " +"taula. Afegir índexs per a les columnes que s'utilitzen en les condicions de " +"combinació, accelerarà el procés d'unió" #: libraries/advisory_rules.txt:231 -#, fuzzy, php-format +#, php-format #| msgid "Sort buffer size" msgid "Table joins average: %s, this value should be less than 1 per hour" -msgstr "Tamany de l'àrea de classificació" +msgstr "" +"Mitjana dúnions \"JOIN\": %s, aquest valor ha de ser inferior a 1 per hora" #: libraries/advisory_rules.txt:233 -#, fuzzy #| msgid "There are no files to upload" msgid "Rate of reading first index entry" -msgstr "No hi ha cap arxiu per pujar" +msgstr "Taxa de lectura del primer índex" #: libraries/advisory_rules.txt:236 -#, fuzzy #| msgid "The number of pending log file fsyncs." msgid "The rate of reading the first index entry is high." -msgstr "El nombre d'operacions fsync pendents a l'arxiu de registre." +msgstr "La taxa de lectura del primer índex és alta." #: libraries/advisory_rules.txt:237 msgid "" @@ -13096,24 +13237,31 @@ msgid "" "scans. Other than that full index scans can only be reduced by rewriting " "queries." msgstr "" +"Això normalment significa freqüents exploracions d'índexs complets. " +"Escaneigs complets de l'índex són més ràpids que els recorreguts de taules, " +"però requereixen gran quantitat de cicles de CPU en taules grans, si les " +"taules que tenen o han tingut un gran volum d'actualitzacions i " +"eliminacions, executar \"Optimize TABLE\" pot reduir la quantitat i/o la " +"velocitat de l'examen complet de l'índex. A part que les exploracions " +"d'índexs complets només es pot reduir per la reescriptura de consultes." #: libraries/advisory_rules.txt:238 -#, fuzzy, php-format +#, php-format #| msgid "Sort buffer size" msgid "Index scans average: %s, this value should be less than 1 per hour" -msgstr "Tamany de l'àrea de classificació" +msgstr "" +"Mitjana de escaneigs d'Índex: %s, aquest valor ha de ser inferior a 1 per " +"hora" #: libraries/advisory_rules.txt:240 -#, fuzzy #| msgid "Format of imported file" msgid "Rate of reading fixed position" -msgstr "Format de l'arxiu importat" +msgstr "Taxa de lectura de posició fix" #: libraries/advisory_rules.txt:243 -#, fuzzy #| msgid "The number of pending log file fsyncs." msgid "The rate of reading data from a fixed position is high." -msgstr "El nombre d'operacions fsync pendents a l'arxiu de registre." +msgstr "La taxa de lectura de dades d'una posició fixa és alta." #: libraries/advisory_rules.txt:244 msgid "" @@ -13121,6 +13269,9 @@ msgid "" "scan, including join queries that do not use indexes. Add indexes where " "applicable." msgstr "" +"Això indica que moltes consultes necessiten ordenar resultats i/o fer un " +"escaneig complet de taula, incloent consultes amb unions \"JOIN\" que no " +"utilitzen índexs. Afegieix índexs ón calgui." #: libraries/advisory_rules.txt:245 #, php-format @@ -13128,39 +13279,43 @@ msgid "" "Rate of reading fixed position average: %s, this value should be less than 1 " "per hour" msgstr "" +"Taxa de lectura d'una posició fixa: %s, aquest valor ha de ser inferior a 1 " +"per hora" #: libraries/advisory_rules.txt:247 -#, fuzzy #| msgid "Create table" msgid "Rate of reading next table row" -msgstr "Crea una taula" +msgstr "Taxa de lectura de la següent fila d'una taula" #: libraries/advisory_rules.txt:250 -#, fuzzy #| msgid "The current number of pending writes." msgid "The rate of reading the next table row is high." -msgstr "El nombre actual d'escritures pendents." +msgstr "La taxa de lectura de la següent fila de la taula és alta." #: libraries/advisory_rules.txt:251 msgid "" "This indicates that many queries are doing full table scans. Add indexes " "where applicable." msgstr "" +"Això indica que les consultes que estan fent molts escanejos complets de la " +"taula. Afegeix índexs on calgui." #: libraries/advisory_rules.txt:252 -#, fuzzy, php-format +#, php-format #| msgid "Sort buffer size" msgid "" "Rate of reading next table row: %s, this value should be less than 1 per hour" -msgstr "Tamany de l'àrea de classificació" +msgstr "" +"Taxa de lectura de la següent fila d'una taula: %s, aquest valor ha de ser " +"inferior a 1 per hora" #: libraries/advisory_rules.txt:255 msgid "tmp_table_size vs. max_heap_table_size" -msgstr "" +msgstr "\"tmp_table_size\" vs. \"max_heap_table_size\"" #: libraries/advisory_rules.txt:258 msgid "tmp_table_size and max_heap_table_size are not the same." -msgstr "" +msgstr "\"tmp_table_size\" i \"max_heap_table_size\" no són iguals." #: libraries/advisory_rules.txt:259 msgid "" @@ -13169,23 +13324,27 @@ msgid "" "wish to increase the in-memory table limit you will have to increase the " "other value as well." msgstr "" +"Si has canviat deliberadament un d'aquests: El servidor utilitza el valor " +"més baix de qualsevol d'ells per determinar la mida màxima de les taules en " +"memòria. Així que si vols augmentar el límit de taules en memòria hauràs " +"d'augmentar l'altre valor també." #: libraries/advisory_rules.txt:260 #, php-format msgid "Current values are tmp_table_size: %s, max_heap_table_size: %s" -msgstr "" +msgstr "Els valors actuals són tmp_table_size: %s, max_heap_table_size: %s" #: libraries/advisory_rules.txt:262 -#, fuzzy #| msgid "Format of imported file" msgid "Percentage of temp tables on disk" -msgstr "Format de l'arxiu importat" +msgstr "Percentatge de taules temporals en el disc" #: libraries/advisory_rules.txt:265 libraries/advisory_rules.txt:272 msgid "" "Many temporary tables are being written to disk instead of being kept in " "memory." msgstr "" +"Masses taules temporals s'escriuen en el disc en lloc d'estar en memòria." #: libraries/advisory_rules.txt:266 msgid "" @@ -13197,6 +13356,14 @@ msgid "" "mentioned in the beginning of an Article by the Pythian Group" msgstr "" +"Augmentar {max_heap_table_size} i {tmp_table_size} podria ajudar. No obstant " +"això, algunes taules temporals s'escriuen sempre en disc, independent del " +"valor d'aquestes variables. Per eliminar-les hauràs de re-escriure les teves " +"consultes per evitar aquestes condicions (dins d'una taula temporal: La " +"presència d'una columna BLOB o TEXT o la presència d'una columna més gran " +"que 512 bytes) com s'esmenta al començament d'un Article de the Pythian " +"Group" #: libraries/advisory_rules.txt:267 #, php-format @@ -13204,6 +13371,8 @@ msgid "" "%s%% of all temporary tables are being written to disk, this value should be " "below 25%%" msgstr "" +"%s%% de totes les taules temporals s'escriuen en el disc, aquest valor ha de " +"ser inferior al 25%%" #: libraries/advisory_rules.txt:269 msgid "Temp disk rate" @@ -13219,6 +13388,14 @@ msgid "" "mentioned in the MySQL Documentation" msgstr "" +"Augmentar {max_heap_table_size} i {tmp_table_size} podria ajudar. No obstant " +"això, algunes taules temporals s'escriuen sempre en disc, independent del " +"valor d'aquestes variables. Per eliminar-les hauràs de re-escriure les teves " +"consultes per evitar aquestes condicions (dins d'una taula temporal: La " +"presència d'una columna BLOB o TEXT o la presència d'una columna més gran " +"que 512 bytes) tal com s'esmenta a la documentació de MySQL" #: libraries/advisory_rules.txt:274 #, php-format @@ -13226,6 +13403,8 @@ msgid "" "Rate of temporary tables being written to disk: %s, this value should be " "less than 1 per hour" msgstr "" +"Índex de taules temporals que s'escriuen en el disc: %s, aquest valor ha de " +"ser inferior a 1 per hora" #: libraries/advisory_rules.txt:289 msgid "MyISAM key buffer size" @@ -13234,18 +13413,21 @@ msgstr "Tamany de l'àrea de claus MyISAM" #: libraries/advisory_rules.txt:292 msgid "Key buffer is not initialized. No MyISAM indexes will be cached." msgstr "" +"El buffer de claus no s'ha inicialitzat. No s'utilitzarà una memòria cau de " +"claus MyISAM." #: libraries/advisory_rules.txt:293 msgid "" "Set {key_buffer_size} depending on the size of your MyISAM indexes. 64M is a " "good start." msgstr "" +"Defineix {key_buffer_size} en funció de la mida dels índexs MyISAM. 64M és " +"un bon començament." #: libraries/advisory_rules.txt:294 -#, fuzzy #| msgid "Sort buffer size" msgid "key_buffer_size is 0" -msgstr "Tamany de l'àrea de classificació" +msgstr "key_buffer_size és 0" #: libraries/advisory_rules.txt:296 #, php-format @@ -13263,6 +13445,9 @@ msgid "" "tables to see if indexes have been removed, or examine queries and " "expectations about what indexes are being used." msgstr "" +"Podries necessitar reduir la mida de {key_buffer_size}, revisa les taules " +"per veure si s'han eliminat índexs, o les consultes i les expectatives d'ús " +"dels índexs." #: libraries/advisory_rules.txt:301 #, php-format @@ -13277,31 +13462,35 @@ msgid "Percentage of MyISAM key buffer used" msgstr "Percentatge usat de l'àrea de claus MyISAM" #: libraries/advisory_rules.txt:309 -#, fuzzy, php-format +#, php-format #| msgid "Sort buffer size" msgid "%% MyISAM key buffer used: %s%%, this value should be above 95%%" -msgstr "Tamany de l'àrea de classificació" +msgstr "" +"%% utilitzat de memòria intermèdia de claus MyISAM : %s%%, aquest valor ha " +"d'estar per sobre del 95%%" #: libraries/advisory_rules.txt:311 -#, fuzzy #| msgid "Percentage of slow queries" msgid "Percentage of index reads from memory" -msgstr "Percentatge de consultes lentes" +msgstr "Percentatge d'índex llegits des de la memòria" #: libraries/advisory_rules.txt:314 #, php-format msgid "The %% of indexes that use the MyISAM key buffer is low." msgstr "" +"El %% dels índexs que utilitzen la memòria intermedia de claus de MyISAM és " +"baixa." #: libraries/advisory_rules.txt:315 msgid "You may need to increase {key_buffer_size}." -msgstr "" +msgstr "Potser hauries d'augmentar {key_buffer_size}." #: libraries/advisory_rules.txt:316 -#, fuzzy, php-format +#, php-format #| msgid "Sort buffer size" msgid "Index reads from memory: %s%%, this value should be above 95%%" -msgstr "Tamany de l'àrea de classificació" +msgstr "" +"Índex llegits de la memòria: %s%%, aquest valor ha de ser superior al 95%%" #: libraries/advisory_rules.txt:320 msgid "Rate of table open" @@ -13316,12 +13505,15 @@ msgid "" "Opening tables requires disk I/O which is costly. Increasing " "{table_open_cache} might avoid this." msgstr "" +"Obrir taules requereix operacions de E/S de disc, que és costós. L'augment " +"de {table_open_cache} pot evitar això." #: libraries/advisory_rules.txt:325 -#, fuzzy, php-format +#, php-format #| msgid "Sort buffer size" msgid "Opened table rate: %s, this value should be less than 10 per hour" -msgstr "Tamany de l'àrea de classificació" +msgstr "" +"Taxa d'apertura de taules: %s, aquest valor ha de ser inferior a 10 per hora" #: libraries/advisory_rules.txt:327 msgid "Percentage of used open files limit" @@ -13332,6 +13524,9 @@ msgid "" "The number of open files is approaching the max number of open files. You " "may get a \"Too many open files\" error." msgstr "" +"El nombre d'arxius oberts s'està acostant al nombre màxim d'arxius oberts. " +"Pots arribar a obtenir un avís d'error \"Massa arxius oberts\" (\"Too many open " +"files\")." #: libraries/advisory_rules.txt:331 libraries/advisory_rules.txt:338 msgid "" diff --git a/po/es.po b/po/es.po index 10421d71a3..9f8aed92e1 100644 --- a/po/es.po +++ b/po/es.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-07-27 10:40+0200\n" -"PO-Revision-Date: 2012-07-09 17:51+0200\n" +"PO-Revision-Date: 2012-07-27 18:07+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -7772,10 +7772,9 @@ msgstr "" "clave)" #: libraries/plugins/export/ExportSql.class.php:354 -#, fuzzy #| msgid "Object creation options" msgid "Data creation options" -msgstr "Opciones de creación de objetos" +msgstr "Opciones de creación de datos" #: libraries/plugins/export/ExportSql.class.php:358 #: libraries/plugins/export/ExportSql.class.php:1573 diff --git a/po/nb.po b/po/nb.po index 22997803bc..a2ffbb0d0e 100644 --- a/po/nb.po +++ b/po/nb.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-07-27 10:40+0200\n" -"PO-Revision-Date: 2012-07-09 16:04+0200\n" -"Last-Translator: Nicholas Arnesen \n" +"PO-Revision-Date: 2012-07-30 14:59+0200\n" +"Last-Translator: Stian Berg \n" "Language-Team: norwegian \n" "Language: nb\n" "MIME-Version: 1.0\n" @@ -288,16 +288,16 @@ msgid "The database name is empty!" msgstr "Databasen er uten navn!" #: db_operations.php:327 -#, fuzzy, php-format +#, php-format #| msgid "Database %s has been renamed to %s" msgid "Database %1$s has been renamed to %2$s" -msgstr "Databasen %s har endret navn til %s" +msgstr "Databasen %1$s har endret navn til %2$s" #: db_operations.php:331 -#, fuzzy, php-format +#, php-format #| msgid "Database %s has been copied to %s" msgid "Database %1$s has been copied to %2$s" -msgstr "Databasen %s har blitt kopiert til %s" +msgstr "Databasen %1$s har blitt kopiert til %2$s" #: db_operations.php:465 msgid "Rename database to" @@ -920,10 +920,10 @@ msgid "\"DROP DATABASE\" statements are disabled." msgstr "\"DROP DATABASE\"-uttrykk er avslått." #: js/messages.php:30 -#, fuzzy, php-format +#, php-format #| msgid "Do you really want to " msgid "Do you really want to execute \"%s\"?" -msgstr "Vil du virkelig " +msgstr "Vil du virkelig utføre \"%s\"?" #: js/messages.php:31 libraries/mult_submits.inc.php:307 sql.php:418 msgid "You are about to DESTROY a complete database!" @@ -1468,10 +1468,9 @@ msgid "Total time:" msgstr "Total tid:" #: js/messages.php:188 -#, fuzzy #| msgid "Profiling" msgid "Profiling results" -msgstr "Profiliserer resultater" +msgstr "Profileringsresultater" #: js/messages.php:189 msgctxt "Display format" @@ -1681,22 +1680,19 @@ msgid "Show indexes" msgstr "Vis indekser" #: js/messages.php:257 libraries/mult_submits.inc.php:317 -#, fuzzy #| msgid "Disable foreign key checks" msgid "Foreign key check:" -msgstr "Slå av kontroll av fremmednøkler" +msgstr "Kontroll av fremmednøkler:" #: js/messages.php:258 libraries/mult_submits.inc.php:321 -#, fuzzy #| msgid "Enabled" msgid "(Enabled)" -msgstr "Påslått" +msgstr "(Aktivert)" #: js/messages.php:259 libraries/mult_submits.inc.php:321 -#, fuzzy #| msgid "Disabled" msgid "(Disabled)" -msgstr "Avslått" +msgstr "(Deaktivert)" #: js/messages.php:262 msgid "Searching" @@ -1908,7 +1904,7 @@ msgstr "Klikk for å markere/ta vekk markering" #: js/messages.php:352 msgid "Double-click to copy column name" -msgstr "" +msgstr "Dobbelklikk for å kopiere kolonnenavn" #: js/messages.php:353 msgid "Click the drop-down arrow
to toggle column's visibility" @@ -1932,20 +1928,18 @@ msgid "Go to link" msgstr "Gå til link" #: js/messages.php:358 -#, fuzzy #| msgid "Column names" msgid "Copy column name" -msgstr "Kolonnenavn" +msgstr "Kopier kolonnenavn" #: js/messages.php:359 msgid "Right-click the column name to copy it to your clipboard." -msgstr "" +msgstr "Høyreklikk på kolonnenavnet for å kopiere det til utklippstavlen." #: js/messages.php:360 -#, fuzzy #| msgid "Update row(s)" msgid "Show data row(s)" -msgstr "Oppdater rad(er)" +msgstr "Vis datarad(er)" #: js/messages.php:363 msgid "Generate password" @@ -2239,7 +2233,7 @@ msgstr "Sekund" #: libraries/Advisor.class.php:67 #, php-format msgid "PHP threw following error: %s" -msgstr "" +msgstr "PHP kastet følgende feil: %s" #: libraries/Advisor.class.php:89 #, php-format @@ -2249,17 +2243,17 @@ msgstr "" #: libraries/Advisor.class.php:106 #, php-format msgid "Failed calculating value for rule '%s'" -msgstr "" +msgstr "Feil ved kalkulering av verdi for regel \"%s\"" #: libraries/Advisor.class.php:125 #, php-format msgid "Failed running test for rule '%s'" -msgstr "" +msgstr "Feil ved kjøring av test for regel \"%s\"" #: libraries/Advisor.class.php:207 #, php-format msgid "Failed formatting string for rule '%s'." -msgstr "" +msgstr "Feil ved formattering av streng for regel \"%s\"." #: libraries/Advisor.class.php:361 #, php-format @@ -2268,20 +2262,20 @@ msgid "" msgstr "" #: libraries/Advisor.class.php:378 -#, fuzzy, php-format +#, php-format #| msgid "Invalid format of CSV input on line %d." msgid "Invalid rule declaration on line %s" -msgstr "Ugyldig format i CSV importen i linje %d." +msgstr "Ugyldig deklarasjon av regel på linje %s" #: libraries/Advisor.class.php:386 #, php-format msgid "Unexpected characters on line %s" -msgstr "" +msgstr "Uventede karakterer på linje %s" #: libraries/Advisor.class.php:400 #, php-format msgid "Unexpected character on line %1$s. Expected tab, but found \"%2$s\"" -msgstr "" +msgstr "Uventet karakter på linje %1$s. Forventet \"tab\", men fant \"%2$s\"" #: libraries/Advisor.class.php:425 server_status.php:972 msgid "per second" @@ -2658,13 +2652,13 @@ msgstr[0] "Totalt: %s treff" msgstr[1] "Totalt: %s treff" #: libraries/DbSearch.class.php:351 -#, fuzzy, php-format +#, php-format #| msgid "%s match inside table %s" #| msgid_plural "%s matches inside table %s" msgid "%1$s match in %2$s" msgid_plural "%1$s matches in %2$s" -msgstr[0] "%s treff i tabell %s" -msgstr[1] "%s treff i tabell %s" +msgstr[0] "%1$s treff i %2$s" +msgstr[1] "%1$s treff i %2$s" #: libraries/DbSearch.class.php:373 #, php-format @@ -2708,34 +2702,29 @@ msgid "Inside column:" msgstr "I kolonne:" #: libraries/DisplayResults.class.php:683 -#, fuzzy #| msgid "Save directory" msgid "Save edited data" -msgstr "Lagringsmappe" +msgstr "Lagre redigerte data" #: libraries/DisplayResults.class.php:689 -#, fuzzy #| msgid "CHAR textarea columns" msgid "Restore column order" -msgstr "CHAR textarea kolonner" +msgstr "Tilbakestill kolonnerekkefølge" #: libraries/DisplayResults.class.php:889 -#, fuzzy #| msgid "CHAR textarea rows" msgid "Start row" -msgstr "CHAR textarea rader" +msgstr "Startrad" #: libraries/DisplayResults.class.php:893 -#, fuzzy #| msgid "Number of rows:" msgid "Number of rows" -msgstr "Antall rader:" +msgstr "Antall rader" #: libraries/DisplayResults.class.php:902 -#, fuzzy #| msgid "More" msgid "Mode" -msgstr "Mer" +msgstr "Modus" #: libraries/DisplayResults.class.php:904 msgid "horizontal" @@ -2752,7 +2741,7 @@ msgstr "loddrett" #: libraries/DisplayResults.class.php:918 #, php-format msgid "Headers every %s rows" -msgstr "" +msgstr "Topptekst hver %s. rad" #: libraries/DisplayResults.class.php:1214 msgid "Sort by key" @@ -2789,10 +2778,9 @@ msgstr "Innstillinger" #: libraries/DisplayResults.class.php:1567 #: libraries/DisplayResults.class.php:1673 -#, fuzzy #| msgid "Partial Texts" msgid "Partial texts" -msgstr "Delvis tekst" +msgstr "Delvise tekster" #: libraries/DisplayResults.class.php:1568 #: libraries/DisplayResults.class.php:1677 @@ -2826,15 +2814,15 @@ msgstr "Vis binært innhold som HEX" #, fuzzy #| msgid "Browser transformation" msgid "Hide browser transformation" -msgstr "Nettvisertransformasjon" +msgstr "Skjul nettlesertransformasjon" #: libraries/DisplayResults.class.php:1625 msgid "Well Known Text" -msgstr "" +msgstr "Velkjent Tekst" #: libraries/DisplayResults.class.php:1626 msgid "Well Known Binary" -msgstr "" +msgstr "Velkjent Binær" #: libraries/DisplayResults.class.php:3157 #: libraries/DisplayResults.class.php:3173 @@ -2878,20 +2866,18 @@ msgid "Print view (with full texts)" msgstr "Forhåndsvisning (med all tekst)" #: libraries/DisplayResults.class.php:5084 tbl_chart.php:80 -#, fuzzy #| msgid "Display PDF schema" msgid "Display chart" -msgstr "Vis PDF-skjema" +msgstr "Vis diagram" #: libraries/DisplayResults.class.php:5109 msgid "Visualize GIS data" -msgstr "" +msgstr "Visualiser GIS data" #: libraries/DisplayResults.class.php:5142 view_create.php:122 -#, fuzzy #| msgid "Create User" msgid "Create view" -msgstr "Opprett bruker" +msgstr "Opprett view" #: libraries/DisplayResults.class.php:5335 msgid "Link not found" @@ -2966,10 +2952,9 @@ msgstr "Cookies må være slått på forbi dette punkt." #: libraries/Header.class.php:500 #: libraries/plugins/auth/AuthenticationCookie.class.php:152 -#, fuzzy #| msgid "Cookies must be enabled past this point." msgid "Javascript must be enabled past this point" -msgstr "Cookies må være slått på forbi dette punkt." +msgstr "JavaScript må være slått på forbi dette punktet" #: libraries/Index.class.php:433 tbl_relation.php:540 msgid "No index defined!" @@ -3080,10 +3065,9 @@ msgid "Designer" msgstr "Designer" #: libraries/Menu.class.php:470 -#, fuzzy #| msgid "User" msgid "Users" -msgstr "Bruker" +msgstr "Brukere" #: libraries/Menu.class.php:491 server_synchronize.php:1320 #: server_synchronize.php:1327 @@ -3105,7 +3089,7 @@ msgstr "Tegnsett" #: libraries/Menu.class.php:516 server_plugins.php:33 server_plugins.php:66 msgid "Plugins" -msgstr "" +msgstr "Programtillegg" #: libraries/Menu.class.php:520 msgid "Engines" @@ -3174,16 +3158,16 @@ msgid "unknown table status: " msgstr "ukjent tabellstatus: " #: libraries/Table.class.php:757 -#, fuzzy, php-format +#, php-format #| msgid "Source database" msgid "Source database `%s` was not found!" -msgstr "Kildedatabase" +msgstr "Kildedatabasen \"%s\" ble ikke funnet!" #: libraries/Table.class.php:765 -#, fuzzy, php-format +#, php-format #| msgid "Theme %s not found!" msgid "Target database `%s` was not found!" -msgstr "Stilen %s ble ikke funnet!" +msgstr "Måldatabasen %s ble ikke funnet!" #: libraries/Table.class.php:1192 msgid "Invalid database" @@ -3199,14 +3183,14 @@ msgid "Error renaming table %1$s to %2$s" msgstr "Feil oppstond med endring av tabellnavn fra %1$s til %2$s" #: libraries/Table.class.php:1257 -#, fuzzy, php-format +#, php-format #| msgid "Table %s has been renamed to %s" msgid "Table %1$s has been renamed to %2$s." -msgstr "Tabellen %s har fått nytt navn %s" +msgstr "Tabellen %1$s har endret navn til %2$s." #: libraries/Table.class.php:1401 msgid "Could not save table UI preferences" -msgstr "" +msgstr "Kunne ikke lagre preferanser for tabellgrensesnitt" #: libraries/Table.class.php:1425 #, php-format @@ -3214,6 +3198,8 @@ msgid "" "Failed to cleanup table UI preferences (see $cfg['Servers'][$i]" "['MaxTableUiprefs'] %s)" msgstr "" +"Feil ved opprydning av preferansene for tabellgrensesnitt (se " +"$cfg['Servers'][$i]['MaxTableUiprefs'] %s)" #: libraries/Table.class.php:1563 #, php-format @@ -3243,16 +3229,14 @@ msgid "Value" msgstr "Verdi" #: libraries/TableSearch.class.php:218 -#, fuzzy #| msgid "Search" msgid "Table Search" -msgstr "Søk" +msgstr "Tabellsøk" #: libraries/TableSearch.class.php:247 libraries/insert_edit.lib.php:1373 -#, fuzzy #| msgid "Insert" msgid "Edit/Insert" -msgstr "Sett inn" +msgstr "Rediger/Sett inn" #: libraries/TableSearch.class.php:778 msgid "Select columns (at least one):" @@ -3286,16 +3270,16 @@ msgid "Browse foreign values" msgstr "Se de eksterne verdiene" #: libraries/TableSearch.class.php:994 -#, fuzzy #| msgid "Hide search criteria" msgid "Additional search criteria" -msgstr "Skjul søkekriterier" +msgstr "Ytterligere søkekriterier" #: libraries/TableSearch.class.php:1134 -#, fuzzy #| msgid "Do a \"query by example\" (wildcard: \"%\")" msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns" -msgstr "Utfør en \"spørring ved eksempel\" (jokertegn: \"%\")" +msgstr "" +"Utfør en \"spørring ved eksempel\" (jokertegn: \"%\") for to forskjellige " +"kolonner" #: libraries/TableSearch.class.php:1138 msgid "Do a \"query by example\" (wildcard: \"%\")" @@ -3306,16 +3290,14 @@ msgid "Browse/Edit the points" msgstr "" #: libraries/TableSearch.class.php:1205 -#, fuzzy #| msgid "Control user" msgid "How to use" -msgstr "Kontrollbruker" +msgstr "Bruksforklaring" #: libraries/TableSearch.class.php:1210 -#, fuzzy #| msgid "Reset" msgid "Reset zoom" -msgstr "Tilbakestill" +msgstr "Tilbakestill zoom" #: libraries/Theme.class.php:169 #, php-format @@ -3437,10 +3419,10 @@ msgid "" msgstr "" #: libraries/Types.class.php:325 libraries/Types.class.php:727 -#, fuzzy, php-format +#, php-format #| msgid "Error renaming table %1$s to %2$s" msgid "A time, range is %1$s to %2$s" -msgstr "Feil oppstond med endring av tabellnavn fra %1$s til %2$s" +msgstr "Et klokkeslett, rekkevidde er %1$s til %2$s" #: libraries/Types.class.php:327 msgid "" @@ -3545,14 +3527,13 @@ msgid "A curve with linear interpolation between points" msgstr "" #: libraries/Types.class.php:363 -#, fuzzy #| msgid "Add a polygon" msgid "A polygon" -msgstr "Legg til polygon" +msgstr "En polygon" #: libraries/Types.class.php:365 msgid "A collection of points" -msgstr "" +msgstr "En samling av punkter" #: libraries/Types.class.php:367 msgid "A collection of curves with linear interpolation between points" @@ -3560,23 +3541,22 @@ msgstr "" #: libraries/Types.class.php:369 msgid "A collection of polygons" -msgstr "" +msgstr "En samling av polygoner" #: libraries/Types.class.php:371 msgid "A collection of geometry objects of any type" -msgstr "" +msgstr "En samling av geometriobjekter av enhver type" #: libraries/Types.class.php:623 libraries/Types.class.php:973 msgctxt "numeric types" msgid "Numeric" -msgstr "" +msgstr "Numerisk" #: libraries/Types.class.php:642 libraries/Types.class.php:976 -#, fuzzy #| msgid "Create an index" msgctxt "date and time types" msgid "Date and time" -msgstr "Lag en ny indeks" +msgstr "Dato og tid" #: libraries/Types.class.php:651 libraries/Types.class.php:979 #, fuzzy @@ -3608,15 +3588,15 @@ msgstr "" #: libraries/Types.class.php:715 msgid "True or false" -msgstr "" +msgstr "True eller false" #: libraries/Types.class.php:717 msgid "An alias for BIGINT NOT NULL AUTO_INCREMENT UNIQUE" -msgstr "" +msgstr "Et alias for BIGINT NOT NULL AUTO_INCREMENT UNIQUE" #: libraries/Types.class.php:719 msgid "Stores a Universally Unique Identifier (UUID)" -msgstr "" +msgstr "Lagrer en Universally Unique Identifier (UUID)" #: libraries/Types.class.php:725 msgid "" @@ -3708,7 +3688,6 @@ msgid "Could not load default configuration from: %1$s" msgstr "Kunne ikke laste standard konfigurasjonsfil fra: %1$s" #: libraries/common.inc.php:588 -#, fuzzy #| msgid "" #| "The $cfg['PmaAbsoluteUri'] directive MUST be set in your " #| "configuration file!" @@ -3716,7 +3695,7 @@ msgid "" "The [code]$cfg['PmaAbsoluteUri'][/code] directive MUST be set in your " "configuration file!" msgstr "" -"$cfg['PmaAbsoluteUri'] variabelen MÅ være innstilt i din " +"[code]$cfg['PmaAbsoluteUri'][/code] variabelen MÅ være innstilt i din " "konfigurasjonsfil!" #: libraries/common.inc.php:621 @@ -3748,7 +3727,7 @@ msgstr "mulig sikkerhetshull" #: libraries/common.inc.php:1092 msgid "numeric key detected" -msgstr "" +msgstr "numerisk nøkkel oppdaget" #: libraries/config.values.php:53 libraries/config.values.php:60 #: libraries/config.values.php:68 @@ -4033,7 +4012,7 @@ msgstr "" #: libraries/config/messages.inc.php:35 msgid "Enable CodeMirror" -msgstr "" +msgstr "Aktiver CodeMirror" #: libraries/config/messages.inc.php:36 msgid "" @@ -4175,6 +4154,8 @@ msgid "" "Disable the table maintenance mass operations, like optimizing or repairing " "the selected tables of a database." msgstr "" +"Deaktiver masseoperasjoner for tabellvedlikehold, som optimalisering eller " +"reparasjon av de valgte tabellene til en database." #: libraries/config/messages.inc.php:67 msgid "Disable multi table maintenance" @@ -4635,7 +4616,6 @@ msgid "Configuration storage" msgstr "Konfigurasjonslager" #: libraries/config/messages.inc.php:209 -#, fuzzy #| msgid "" #| "ure phpMyAdmin database to gain access to additional features, see " #| "Documentation.html#linked-tables]linked-tables infrastructure[/a] " @@ -4645,22 +4625,22 @@ msgid "" "features, see [a@Documentation.html#linked-tables]phpMyAdmin configuration " "storage[/a] in documentation" msgstr "" -"Konfigurer phpMyAdmin databasen for å få tilgang til ekstra egenskaper, se " -"[a@../Documentation.html#linked-tables]lenkede-tabeller infrastruktur[/a] i " -"dokumentasjonen" +"Sett opp phpMyAdmin konfigurasjonslager for å få tilgang til ekstra " +"funksjonalitet, se [a@../Documentation.html#linked-tables]phpMyAdming " +"konfigurasjonslager[/a] i dokumentasjonen" #: libraries/config/messages.inc.php:210 msgid "Changes tracking" msgstr "Endringssporing" #: libraries/config/messages.inc.php:211 -#, fuzzy #| msgid "ng of changes made in database. Requires configured PMA database." msgid "" "Tracking of changes made in database. Requires the phpMyAdmin configuration " "storage." msgstr "" -"Sporing av endringer utført i databasen. PMA database må være konfigurert." +"Sporing av endringer utført i databasen. Krever at phpMyAdming " +"konfigurasjonslager er satt opp." #: libraries/config/messages.inc.php:212 msgid "Customize export options" @@ -4721,20 +4701,18 @@ msgid "Customize startup page" msgstr "Endre oppstartssiden" #: libraries/config/messages.inc.php:228 -#, fuzzy #| msgid "Database for user" msgid "Database structure" -msgstr "Brukerdatabase" +msgstr "Databasestruktur" #: libraries/config/messages.inc.php:229 msgid "Choose which details to show in the database structure (list of tables)" msgstr "" #: libraries/config/messages.inc.php:230 -#, fuzzy #| msgid "Database for user" msgid "Table structure" -msgstr "Brukerdatabase" +msgstr "Tabellstruktur" #: libraries/config/messages.inc.php:231 msgid "Settings for the table structure (list of columns)" @@ -4982,10 +4960,9 @@ msgid "Enable highlighting" msgstr "Aktiver utheving" #: libraries/config/messages.inc.php:297 -#, fuzzy #| msgid "Maximum number of tables displayed in table list" msgid "Maximum number of recently used tables; set 0 to disable" -msgstr "Maks antall tabeller vist i tabellista" +msgstr "Maksimalt antall nylig brukte tabeller; sett til 0 for å deaktivere" #: libraries/config/messages.inc.php:298 msgid "Recently used tables" @@ -5185,6 +5162,8 @@ msgid "" "Structure page if any of the required tables for the phpMyAdmin " "configuration storage could not be found" msgstr "" +"Deaktiver varselet som vises på databasedetaljsiden Struktur om det er noen " +"påkrevde tabeller for phpMyAdmins konfigurasjonslager som ikke ble funnet" #: libraries/config/messages.inc.php:338 msgid "Missing phpMyAdmin configuration storage tables" @@ -5240,10 +5219,9 @@ msgid "Query window height" msgstr "Høyde på spørringsvindu" #: libraries/config/messages.inc.php:352 -#, fuzzy #| msgid "Query window" msgid "Query window width (in pixels)" -msgstr "Spørringsvindu" +msgstr "Bredde på spørringsvindu (i piksler)" #: libraries/config/messages.inc.php:353 msgid "Query window width" @@ -5261,16 +5239,16 @@ msgstr "Rekodingsmotor" #: libraries/config/messages.inc.php:356 msgid "When browsing tables, the sorting of each table is remembered" msgstr "" +"Ved visning av tabeller vil sorteringen av hver enkelt tabell bli husket" #: libraries/config/messages.inc.php:357 -#, fuzzy #| msgid "Rename table to" msgid "Remember table's sorting" -msgstr "Endre tabellens navn" +msgstr "Husk tabellens sortering" #: libraries/config/messages.inc.php:358 msgid "Repeat the headers every X cells, [kbd]0[/kbd] deactivates this feature" -msgstr "" +msgstr "Gjenta topptekst hver n. rad; [kbd]0[/kbd] deaktiverer funksjonen" #: libraries/config/messages.inc.php:359 msgid "Repeat headers" @@ -5278,7 +5256,7 @@ msgstr "Gjenta topptekst" #: libraries/config/messages.inc.php:361 msgid "Save all edited cells at once" -msgstr "" +msgstr "Ikke lagre endrede celler umiddelbart" #: libraries/config/messages.inc.php:362 msgid "Directory where exports can be saved on server" @@ -5293,20 +5271,18 @@ msgid "Leave blank if not used" msgstr "La stå tom hvis ikke brukt" #: libraries/config/messages.inc.php:365 -#, fuzzy #| msgid "Host authentication order" msgid "Host authorization order" -msgstr "Rekkefølge for vertsautentisering" +msgstr "Rekkefølge for vertsautorisering" #: libraries/config/messages.inc.php:366 msgid "Leave blank for defaults" msgstr "La stå tom for standard" #: libraries/config/messages.inc.php:367 -#, fuzzy #| msgid "Host authentication rules" msgid "Host authorization rules" -msgstr "Vertsautentiseringsregler" +msgstr "Regler for vertsautorisering" #: libraries/config/messages.inc.php:368 msgid "Allow logins without a password" @@ -5407,6 +5383,8 @@ msgid "" "An alternate host to hold the configuration storage; leave blank to use the " "already defined host" msgstr "" +"En alternativ vert til å holde konfigurasjonslageret; la være tom for å " +"bruke den allerede definerte verten" #: libraries/config/messages.inc.php:388 #, fuzzy @@ -5574,10 +5552,9 @@ msgstr "" "La stå tom for ingen SQL spørringshistorie, anbefalt: [kbd]pma_tracking[/kbd]" #: libraries/config/messages.inc.php:419 -#, fuzzy #| msgid "Recall user name" msgid "Recently used table" -msgstr "Husk brukernavn" +msgstr "Nylig brukt tabell" #: libraries/config/messages.inc.php:420 msgid "" @@ -5858,10 +5835,9 @@ msgid "Whether to show hint or not" msgstr "" #: libraries/config/messages.inc.php:473 -#, fuzzy #| msgid "Show grid" msgid "Show hint" -msgstr "Vis rutenett" +msgstr "Vis hint" #: libraries/config/messages.inc.php:474 msgid "" @@ -6116,10 +6092,9 @@ msgid "Cookie authentication" msgstr "Autentisering informasjonskapsler" #: libraries/config/setup.forms.php:48 -#, fuzzy #| msgid "Host authentication order" msgid "HTTP authentication" -msgstr "Rekkefølge for vertsautentisering" +msgstr "HTTP autentisering" #: libraries/config/setup.forms.php:51 #, fuzzy @@ -6143,7 +6118,7 @@ msgstr "Open Document regneark" #: libraries/config/setup.forms.php:266 #: libraries/config/user_preferences.forms.php:168 msgid "Quick" -msgstr "" +msgstr "Rask" #: libraries/config/setup.forms.php:270 #: libraries/config/user_preferences.forms.php:172 @@ -6175,10 +6150,9 @@ msgid "Could not initialize Drizzle connection library" msgstr "" #: libraries/config/validate.lib.php:221 libraries/config/validate.lib.php:229 -#, fuzzy #| msgid "Could not connect to MySQL server" msgid "Could not connect to Drizzle server" -msgstr "Kunne ikke koble til MySQL tjener" +msgstr "Kunne ikke koble til Drizzle tjener" #: libraries/config/validate.lib.php:240 libraries/config/validate.lib.php:247 msgid "Could not connect to MySQL server" @@ -6225,18 +6199,18 @@ msgid "possible deep recursion attack" msgstr "" #: libraries/database_interface.lib.php:1989 -#, fuzzy #| msgid " the local MySQL server's socket is not correctly configured)" msgid "" "The server is not responding (or the local server's socket is not correctly " "configured)." -msgstr "(eller den lokale MySQL tjenerens sokkel er ikke korrekt konfigurert)" +msgstr "" +"Tjeneren svarer ikke (eller den lokale MySQL tjenerens sokkel er ikke " +"korrekt konfigurert)." #: libraries/database_interface.lib.php:1992 -#, fuzzy #| msgid "The server is not responding" msgid "The server is not responding." -msgstr "Tjeneren svarer ikke" +msgstr "Tjeneren svarer ikke." #: libraries/database_interface.lib.php:1997 msgid "Please check privileges of directory containing database." @@ -6280,7 +6254,6 @@ msgstr "MySQL 4.0 kompatibel" #: libraries/display_create_database.lib.php:21 #: libraries/display_create_database.lib.php:39 -#, fuzzy #| msgid "Create new database" msgid "Create database" msgstr "Opprett ny database" @@ -6375,7 +6348,7 @@ msgstr "Dump alle rader" #: libraries/display_export.lib.php:189 libraries/display_export.lib.php:210 msgid "Output:" -msgstr "" +msgstr "Utskrift:" #: libraries/display_export.lib.php:196 libraries/display_export.lib.php:222 #, php-format @@ -6435,10 +6408,9 @@ msgid "zipped" msgstr "Pakket (zip)" #: libraries/display_export.lib.php:337 -#, fuzzy #| msgid "\"gzipped\"" msgid "gzipped" -msgstr "Komprimert (gz)" +msgstr "gzippet" #: libraries/display_export.lib.php:339 #, fuzzy @@ -6447,17 +6419,15 @@ msgid "bzipped" msgstr "Komprimert (bz2)" #: libraries/display_export.lib.php:348 -#, fuzzy #| msgid "Save as file" msgid "View output as text" -msgstr "Lagre som fil" +msgstr "Vis utskrift som tekst" #: libraries/display_export.lib.php:353 libraries/display_import.lib.php:311 #: libraries/plugins/export/ExportCodegen.class.php:106 -#, fuzzy #| msgid "Format" msgid "Format:" -msgstr "Format" +msgstr "Format:" #: libraries/display_export.lib.php:358 msgid "Format-specific options:" @@ -6468,12 +6438,13 @@ msgid "" "Scroll down to fill in the options for the selected format and ignore the " "options for other formats." msgstr "" +"Bla ned for å fylle ut valgene for det valgte formatet og ignorere valgene " +"for andre formater." #: libraries/display_export.lib.php:367 libraries/display_import.lib.php:326 -#, fuzzy #| msgid "Encoding conversion" msgid "Encoding Conversion:" -msgstr "Kodingskonvertering" +msgstr "Kodingskonvertering:" #: libraries/display_git_revision.lib.php:59 #, php-format @@ -6579,10 +6550,9 @@ msgid "File uploads are not allowed on this server." msgstr "Filopplastinger er ikke tillatt på denne tjeneren." #: libraries/display_import.lib.php:275 -#, fuzzy #| msgid "Partial import" msgid "Partial Import:" -msgstr "Delvis importering" +msgstr "Delvis importering:" #: libraries/display_import.lib.php:281 #, php-format @@ -6613,7 +6583,7 @@ msgstr "Antall rader å hoppe over, fra første rad:" #: libraries/display_import.lib.php:317 msgid "Format-Specific Options:" -msgstr "" +msgstr "Format-spesifikke valg:" #: libraries/display_select_lang.lib.php:52 #: libraries/display_select_lang.lib.php:53 setup/frames/index.inc.php:75 @@ -12245,7 +12215,7 @@ msgstr "Navn" #: tbl_addfield.php:190 tbl_alter.php:216 tbl_indexes.php:107 #, php-format msgid "Table %1$s has been altered successfully" -msgstr "Tabellen %1$s har blitt endrett" +msgstr "Tabellen %1$s har blitt endret" #: tbl_alter.php:133 #, fuzzy diff --git a/po/ru.po b/po/ru.po index 1ccca8eb1f..152b316321 100644 --- a/po/ru.po +++ b/po/ru.po @@ -4,15 +4,15 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-07-27 10:40+0200\n" -"PO-Revision-Date: 2012-06-29 18:49+0200\n" +"PO-Revision-Date: 2012-07-27 17:27+0200\n" "Last-Translator: Victor Volkov \n" "Language-Team: russian \n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Weblate 1.1\n" #: browse_foreigners.php:36 browse_foreigners.php:60 js/messages.php:354 @@ -7711,10 +7711,9 @@ msgstr "" "и полей содержащих специальные символы или зарезервированные слова)" #: libraries/plugins/export/ExportSql.class.php:354 -#, fuzzy #| msgid "Object creation options" msgid "Data creation options" -msgstr "Параметры создания объектов" +msgstr "Параметры создания данных" #: libraries/plugins/export/ExportSql.class.php:358 #: libraries/plugins/export/ExportSql.class.php:1573 diff --git a/po/si.po b/po/si.po index d34418b682..3ca2b2505b 100644 --- a/po/si.po +++ b/po/si.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-07-27 10:40+0200\n" -"PO-Revision-Date: 2012-06-26 19:00+0200\n" +"PO-Revision-Date: 2012-07-28 18:20+0200\n" "Last-Translator: Madhura Jayaratne \n" "Language-Team: sinhala \n" "Language: si\n" @@ -12,7 +12,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Weblate 1.0\n" +"X-Generator: Weblate 1.1\n" #: browse_foreigners.php:36 browse_foreigners.php:60 js/messages.php:354 #: libraries/DisplayResults.class.php:794 @@ -815,7 +815,7 @@ msgid "" "Chose \"GeomFromText\" from the \"Function\" column and paste the below " "string into the \"Value\" field" msgstr "" -"\"Function\" තීරුවෙන් \"GeomFromText\" තෝරා පහත ඇති දේ \"Value\" ක්ෂේත්‍රයට පිටපත් " +"\"ශ්‍රිතය\" තීරුවෙන් \"GeomFromText\" තෝරා පහත ඇති දේ \"අගය\" ක්ෂේත්‍රයට පිටපත් " "කරන්න" #: import.php:94 diff --git a/po/sl.po b/po/sl.po index ac919a30e3..515f42f3f3 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,15 +4,15 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-07-27 10:40+0200\n" -"PO-Revision-Date: 2012-06-29 18:51+0200\n" +"PO-Revision-Date: 2012-07-27 12:49+0200\n" "Last-Translator: Domen \n" "Language-Team: slovenian \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: Weblate 1.1\n" #: browse_foreigners.php:36 browse_foreigners.php:60 js/messages.php:354 @@ -7662,10 +7662,9 @@ msgstr "" "tabel, tvorjenih s posebnimi znaki ali ključnimi besedami)" #: libraries/plugins/export/ExportSql.class.php:354 -#, fuzzy #| msgid "Object creation options" msgid "Data creation options" -msgstr "Možnosti ustvarjanja objektov" +msgstr "Možnosti ustvarjanja podatkov" #: libraries/plugins/export/ExportSql.class.php:358 #: libraries/plugins/export/ExportSql.class.php:1573 diff --git a/po/sv.po b/po/sv.po index 0fe9e12760..8ba351c3aa 100644 --- a/po/sv.po +++ b/po/sv.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-07-27 10:40+0200\n" -"PO-Revision-Date: 2012-07-01 18:04+0200\n" +"PO-Revision-Date: 2012-07-29 13:55+0200\n" "Last-Translator: ProUser \n" "Language-Team: swedish \n" "Language: sv\n" @@ -7627,10 +7627,9 @@ msgstr "" "tabellnamn skapade med specialtecken eller nyckelord)" #: libraries/plugins/export/ExportSql.class.php:354 -#, fuzzy #| msgid "Object creation options" msgid "Data creation options" -msgstr "Alternativ för skapande av objekt" +msgstr "Valmöjligheter vid skapande av data" #: libraries/plugins/export/ExportSql.class.php:358 #: libraries/plugins/export/ExportSql.class.php:1573 diff --git a/po/tr.po b/po/tr.po index 79179653d6..604788fa14 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-07-27 10:40+0200\n" -"PO-Revision-Date: 2012-07-26 02:11+0200\n" +"PO-Revision-Date: 2012-07-27 17:50+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -7680,10 +7680,9 @@ msgstr "" "kelimelerle şekillendirilmiş sütun ve tablo adlarını korur)" #: libraries/plugins/export/ExportSql.class.php:354 -#, fuzzy #| msgid "Object creation options" msgid "Data creation options" -msgstr "Nesne oluşturma seçenekleri" +msgstr "Veri oluşturma seçenekleri" #: libraries/plugins/export/ExportSql.class.php:358 #: libraries/plugins/export/ExportSql.class.php:1573 diff --git a/prefs_manage.php b/prefs_manage.php index c15311598e..6de37a9033 100644 --- a/prefs_manage.php +++ b/prefs_manage.php @@ -21,7 +21,9 @@ require 'libraries/config/user_preferences.forms.php'; PMA_userprefs_pageinit(); $error = ''; -if (isset($_POST['submit_export']) && filter_input(INPUT_POST, 'export_type') == 'text_file') { +if (isset($_POST['submit_export']) + && filter_input(INPUT_POST, 'export_type') == 'text_file' +) { // export to JSON file PMA_Response::getInstance()->disable(); $filename = 'phpMyAdmin-config-' . urlencode(PMA_getenv('HTTP_HOST')) . '.json'; @@ -78,7 +80,8 @@ if (isset($_POST['submit_export']) && filter_input(INPUT_POST, 'export_type') == if (! is_array($config)) { $error = __('Could not import configuration'); } else { - // sanitize input values: treat them as though they came from HTTP POST request + // sanitize input values: treat them as though + // they came from HTTP POST request $form_display = new FormDisplay(); foreach ($forms as $formset_id => $formset) { foreach ($formset as $form_name => $form) { @@ -192,7 +195,9 @@ if (isset($_POST['submit_export']) && filter_input(INPUT_POST, 'export_type') == if ($result === true) { $params = array(); if ($_SESSION['PMA_Theme_Manager']->theme->getId() != 'original') { - $GLOBALS['PMA_Config']->removeCookie($_SESSION['PMA_Theme_Manager']->getThemeCookieName()); + $GLOBALS['PMA_Config']->removeCookie( + $_SESSION['PMA_Theme_Manager']->getThemeCookieName() + ); unset($_SESSION['PMA_Theme_Manager']); unset($_SESSION['PMA_Theme']); $params['reload_left_frame'] = true; diff --git a/querywindow.php b/querywindow.php index 62d5854e9b..0f872994d7 100644 --- a/querywindow.php +++ b/querywindow.php @@ -124,14 +124,14 @@ $scripts->addFile('common.js'); $scripts->addFile('querywindow.js'); if (PMA_isValid($_REQUEST['auto_commit'], 'identical', 'true')) { - $scripts->addEvent('load','PMA_queryAutoCommit'); + $scripts->addEvent('load', 'PMA_queryAutoCommit'); } if (PMA_isValid($_REQUEST['init'])) { - $scripts->addEvent('load','PMA_querywindowResize'); + $scripts->addEvent('load', 'PMA_querywindowResize'); } // always set focus to the textarea if ($querydisplay_tab == 'sql' || $querydisplay_tab == 'full') { - $scripts->addEvent('load','PMA_querywindowSetFocus'); + $scripts->addEvent('load', 'PMA_querywindowSetFocus'); } echo '
'; diff --git a/schema_export.php b/schema_export.php index 26d2c6e6ae..ac399a2131 100644 --- a/schema_export.php +++ b/schema_export.php @@ -56,7 +56,11 @@ PMA_DBI_select_db($db); $path = PMA_securePath(ucfirst($export_type)); if (!file_exists('libraries/schema/' . $path . '_Relation_Schema.class.php')) { - PMA_Export_Relation_Schema::dieSchema($_POST['chpage'], $export_type, __('File doesn\'t exist')); + PMA_Export_Relation_Schema::dieSchema( + $_POST['chpage'], + $export_type, + __('File doesn\'t exist') + ); } require "libraries/schema/".$path."_Relation_Schema.class.php"; $obj_schema = eval("new PMA_".$path."_Relation_Schema();"); diff --git a/server_binlog.php b/server_binlog.php index ee616f35c3..e3d25dcd07 100644 --- a/server_binlog.php +++ b/server_binlog.php @@ -29,7 +29,9 @@ if (! isset($_REQUEST['pos'])) { $pos = (int) $_REQUEST['pos']; } -if (! isset($_REQUEST['log']) || ! array_key_exists($_REQUEST['log'], $binary_logs)) { +if (! isset($_REQUEST['log']) + || ! array_key_exists($_REQUEST['log'], $binary_logs) +) { $_REQUEST['log'] = ''; } else { $url_params['log'] = $_REQUEST['log']; diff --git a/tbl_get_field.php b/tbl_get_field.php index 8d6d80aa3c..76d75f7c4f 100644 --- a/tbl_get_field.php +++ b/tbl_get_field.php @@ -32,7 +32,9 @@ if (!PMA_DBI_get_columns($db, $table)) { } /* Grab data */ -$sql = 'SELECT ' . $common_functions->backquote($transform_key) . ' FROM ' . $common_functions->backquote($table) . ' WHERE ' . $where_clause . ';'; +$sql = 'SELECT ' . $common_functions->backquote($transform_key) + . ' FROM ' . $common_functions->backquote($table) + . ' WHERE ' . $where_clause . ';'; $result = PMA_DBI_fetch_value($sql); /* Check return code */ diff --git a/tbl_gis_visualization.php b/tbl_gis_visualization.php index 73ea8210ab..3f05989c77 100644 --- a/tbl_gis_visualization.php +++ b/tbl_gis_visualization.php @@ -90,11 +90,14 @@ if (isset($_REQUEST['saveToFile'])) { exit(); } -$svg_support = (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER <= 8) ? false : true; +$svg_support = (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER <= 8) + ? false : true; $format = $svg_support ? 'svg' : 'png'; // get the chart and settings after chart generation -$visualization = PMA_GIS_visualizationResults($data, $visualizationSettings, $format); +$visualization = PMA_GIS_visualizationResults( + $data, $visualizationSettings, $format +); /** * Displays the page diff --git a/tbl_indexes.php b/tbl_indexes.php index 2f5fd72fe2..d569f7443f 100644 --- a/tbl_indexes.php +++ b/tbl_indexes.php @@ -22,7 +22,7 @@ foreach (PMA_DBI_get_columns_full($db, $table) as $row) { $tmp[2] = substr( preg_replace('@([^,])\'\'@', '\\1\\\'', ',' . $tmp[2]), 1 ); - $fields[$row['Field']] = $tmp[1] . '(' + $fields[$row['Field']] = $tmp[1] . '(' . str_replace(',', ', ', $tmp[2]) . ')'; } else { $fields[$row['Field']] = $row['Type']; @@ -50,39 +50,41 @@ if (isset($_REQUEST['do_save_data'])) { $error = false; // $sql_query is the one displayed in the query box - $sql_query = 'ALTER TABLE ' . $common_functions->backquote($db) . '.' . $common_functions->backquote($table); + $sql_query = 'ALTER TABLE ' . $common_functions->backquote($db) + . '.' . $common_functions->backquote($table); // Drops the old index if (! empty($_REQUEST['old_index'])) { if ($_REQUEST['old_index'] == 'PRIMARY') { $sql_query .= ' DROP PRIMARY KEY,'; } else { - $sql_query .= ' DROP INDEX ' + $sql_query .= ' DROP INDEX ' . $common_functions->backquote($_REQUEST['old_index']) . ','; } } // end if // Builds the new one switch ($index->getType()) { - case 'PRIMARY': - if ($index->getName() == '') { - $index->setName('PRIMARY'); - } elseif ($index->getName() != 'PRIMARY') { - $error = PMA_Message::error(__( - 'The name of the primary key must be "PRIMARY"!')); - } - $sql_query .= ' ADD PRIMARY KEY'; - break; - case 'FULLTEXT': - case 'UNIQUE': - case 'INDEX': - case 'SPATIAL': - if ($index->getName() == 'PRIMARY') { - $error = PMA_Message::error(__('Can\'t rename index to PRIMARY!')); - } - $sql_query .= ' ADD ' . $index->getType() . ' ' - . ($index->getName() ? $common_functions->backquote($index->getName()) : ''); - break; + case 'PRIMARY': + if ($index->getName() == '') { + $index->setName('PRIMARY'); + } elseif ($index->getName() != 'PRIMARY') { + $error = PMA_Message::error( + __('The name of the primary key must be "PRIMARY"!') + ); + } + $sql_query .= ' ADD PRIMARY KEY'; + break; + case 'FULLTEXT': + case 'UNIQUE': + case 'INDEX': + case 'SPATIAL': + if ($index->getName() == 'PRIMARY') { + $error = PMA_Message::error(__('Can\'t rename index to PRIMARY!')); + } + $sql_query .= ' ADD ' . $index->getType() . ' ' + . ($index->getName() ? $common_functions->backquote($index->getName()) : ''); + break; } // end switch $index_fields = array(); @@ -103,8 +105,9 @@ if (isset($_REQUEST['do_save_data'])) { if (! $error) { PMA_DBI_query($sql_query); - $message = PMA_Message::success(__( - 'Table %1$s has been altered successfully')); + $message = PMA_Message::success( + __('Table %1$s has been altered successfully') + ); $message->addParam($table); if ($GLOBALS['is_ajax_request'] == true) { @@ -161,8 +164,8 @@ if (isset($_REQUEST['index']) && is_array($_REQUEST['index'])) { ?>
onsubmit="if (typeof(this.elements['index[Key_name]'].disabled) != 'undefined') { this.elements['index[Key_name]'].disabled = false}"> @@ -249,16 +252,16 @@ foreach ($index->getColumns() as $column) { $field_type) { - if (($index->getType() != 'FULLTEXT' + if (($index->getType() != 'FULLTEXT' || preg_match('/(char|text)/i', $field_type)) - && ($index->getType() != 'SPATIAL' + && ($index->getType() != 'SPATIAL' || in_array($field_type, $spatial_types)) ) { echo '' . "\n"; } @@ -285,7 +288,7 @@ for ($i = 0; $i < $add_fields; $i++) { $field_type) { echo '' . "\n"; } // end foreach $fields diff --git a/tbl_move_copy.php b/tbl_move_copy.php index 5309fa689d..1947144bf8 100644 --- a/tbl_move_copy.php +++ b/tbl_move_copy.php @@ -58,13 +58,17 @@ if (PMA_isValid($_REQUEST['new_name'])) { } else { $message = PMA_Message::success(__('Table %s has been copied to %s.')); } - $old = $common_functions->backquote($db) . '.' . $common_functions->backquote($table); + $old = $common_functions->backquote($db) . '.' + . $common_functions->backquote($table); $message->addParam($old); - $new = $common_functions->backquote($_REQUEST['target_db']) . '.' . $common_functions->backquote($_REQUEST['new_name']); + $new = $common_functions->backquote($_REQUEST['target_db']) . '.' + . $common_functions->backquote($_REQUEST['new_name']); $message->addParam($new); /* Check: Work on new table or on old table? */ - if (isset($_REQUEST['submit_move']) || PMA_isValid($_REQUEST['switch_to_new'])) { + if (isset($_REQUEST['submit_move']) + || PMA_isValid($_REQUEST['switch_to_new']) + ) { $db = $_REQUEST['target_db']; $table = $_REQUEST['new_name']; } diff --git a/tbl_relation.php b/tbl_relation.php index 96e7942a0e..21106a297a 100644 --- a/tbl_relation.php +++ b/tbl_relation.php @@ -5,11 +5,14 @@ * * includes phpMyAdmin relations and InnoDB relations * - * @todo fix name handling: currently names with dots (.) are not properly handled for internal relations (but foreign keys relations are correct) + * @todo fix name handling: currently names with dots (.) are not properly handled + * for internal relations (but foreign keys relations are correct) * @todo foreign key constraints require both fields being of equal type and size * @todo check foreign fields to be from same type and size, all other makes no sense - * @todo add an link to create an index required for constraints, or an option to do automatically - * @todo if above todos are fullfilled we can add all fields meet requirements in the select dropdown + * @todo add an link to create an index required for constraints, + * or an option to do automatically + * @todo if above todos are fullfilled we can add all fields meet requirements + * in the select dropdown * @package PhpMyAdmin */ @@ -108,7 +111,9 @@ function PMA_backquote_split($text) if (false === $first_backquote || false === $second_backquote) { break; } - $elements[] = substr($text, $first_backquote, $second_backquote - $first_backquote + 1); + $elements[] = substr( + $text, $first_backquote, $second_backquote - $first_backquote + 1 + ); $pos = $second_backquote + 1; } return($elements); @@ -361,15 +366,15 @@ if ($cfgRelation['relwork'] // same engine. if ($common_functions->isForeignKeySupported($tbl_storage_engine)) { - $tab_query = 'SHOW TABLE STATUS FROM ' . $common_functions->backquote($db); + $tab_query = 'SHOW TABLE STATUS FROM ' . $common_functions->backquote($db); // [0] of the row is the name // [1] is the type } else { - $tab_query = 'SHOW TABLES FROM ' . $common_functions->backquote($db); + $tab_query = 'SHOW TABLES FROM ' . $common_functions->backquote($db); // [0] of the row is the name } - $tab_rs = PMA_DBI_query($tab_query, null, PMA_DBI_QUERY_STORE); + $tab_rs = PMA_DBI_query($tab_query, null, PMA_DBI_QUERY_STORE); $selectboxall[] = ''; $selectboxall_foreign[] = ''; @@ -377,7 +382,10 @@ if ($cfgRelation['relwork'] $current_table = new PMA_Table($curr_table[0], $db); // explicitely ask for non-quoted list of indexed columns - $selectboxall = array_merge($selectboxall, $current_table->getUniqueColumns($backquoted = false)); + $selectboxall = array_merge( + $selectboxall, + $current_table->getUniqueColumns($backquoted = false) + ); // if foreign keys are supported, collect all keys from other // tables of the same engine @@ -387,7 +395,10 @@ if ($cfgRelation['relwork'] ) { // explicitely ask for non-quoted list of indexed columns // need to obtain backquoted values to support dots inside values - $selectboxall_foreign = array_merge($selectboxall_foreign, $current_table->getIndexedColumns($backquoted = true)); + $selectboxall_foreign = array_merge( + $selectboxall_foreign, + $current_table->getIndexedColumns($backquoted = true) + ); } } // end while over tables } // end if diff --git a/tbl_structure.php b/tbl_structure.php index 92ad9e1473..c84c9cf56a 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -65,7 +65,8 @@ if (! empty($submit_mult) && isset($_REQUEST['selected_fld'])) { // what is this htmlspecialchars() for?? //$sql_query .= ' FROM ' . backquote(htmlspecialchars($table)); - $sql_query .= ' FROM ' . $common_functions->backquote($db) . '.' . $common_functions->backquote($table); + $sql_query .= ' FROM ' . $common_functions->backquote($db) + . '.' . $common_functions->backquote($table); include 'sql.php'; exit; } else { @@ -733,7 +734,7 @@ if (! $tbl_is_view && 'ARCHIVE' != $tbl_storage_engine ) { echo $common_functions->getDivForSliderEffect('indexes', __('Indexes')); - + /** * Display indexes */ diff --git a/tbl_tracking.php b/tbl_tracking.php index 962ce22738..da28b99b7b 100644 --- a/tbl_tracking.php +++ b/tbl_tracking.php @@ -55,10 +55,10 @@ if (isset($_REQUEST['report_export'])) { /** * Filters tracking entries * - * @param array the entries to filter - * @param string "from" date - * @param string "to" date - * @param string users + * @param array $data the entries to filter + * @param string $filter_ts_from "from" date + * @param string $filter_ts_to "to" date + * @param string $filter_users users * * @return array filtered entries */