[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11676-g219ec73
by Michal Čihař 22 Jul '11
by Michal Čihař 22 Jul '11
22 Jul '11
The branch, master has been updated
via 219ec73d69a0bee94ac3bf98757db25360862b39 (commit)
from 36298932e2a80bbd207b3b86475033f8b728a0b4 (commit)
- Log -----------------------------------------------------------------
commit 219ec73d69a0bee94ac3bf98757db25360862b39
Author: Michal Čihař <mcihar(a)suse.cz>
Date: Fri Jul 22 09:10:37 2011 +0200
Spacing around if
-----------------------------------------------------------------------
Summary of changes:
chart_export.php | 8 +++---
db_create.php | 4 +-
db_export.php | 6 ++--
db_operations.php | 2 +-
db_search.php | 4 +-
db_structure.php | 2 +-
db_tracking.php | 4 +-
enum_editor.php | 4 +-
libraries/common.inc.php | 2 +-
libraries/common.lib.php | 30 ++++++++++++++--------------
libraries/db_common.inc.php | 2 +-
libraries/db_info.inc.php | 2 +-
libraries/db_links.inc.php | 2 +-
libraries/db_structure.lib.php | 8 +++---
libraries/display_export.lib.php | 36 +++++++++++++++++-----------------
libraries/display_import.lib.php | 6 ++--
libraries/display_tbl.lib.php | 22 ++++++++++----------
libraries/header.inc.php | 2 +-
libraries/mult_submits.inc.php | 2 +-
libraries/plugin_interface.lib.php | 12 +++++-----
libraries/server_links.inc.php | 2 +-
libraries/server_synchronize.lib.php | 20 +++++++++---------
libraries/sql_query_form.lib.php | 2 +-
libraries/sysinfo.lib.php | 2 +-
libraries/tbl_links.inc.php | 4 +-
main.php | 2 +-
navigation.php | 2 +-
pmd_general.php | 14 ++++++------
pmd_save_pos.php | 2 +-
schema_edit.php | 2 +-
server_databases.php | 2 +-
server_export.php | 6 ++--
server_privileges.php | 18 ++++++++--------
server_status.php | 20 +++++++++---------
server_synchronize.php | 4 +-
server_variables.php | 8 +++---
tbl_alter.php | 2 +-
tbl_chart.php | 4 +-
tbl_create.php | 8 +++---
tbl_indexes.php | 4 +-
tbl_operations.php | 4 +-
tbl_replace.php | 4 +-
tbl_structure.php | 26 ++++++++++++------------
tbl_tracking.php | 10 ++++----
user_password.php | 4 +-
45 files changed, 168 insertions(+), 168 deletions(-)
diff --git a/chart_export.php b/chart_export.php
index e3a02f0..c05332a 100644
--- a/chart_export.php
+++ b/chart_export.php
@@ -11,12 +11,12 @@ define('PMA_MINIMUM_COMMON', true);
require_once './libraries/common.inc.php';
-if(isset($_REQUEST['filename']) && isset($_REQUEST['image'])) {
+if (isset($_REQUEST['filename']) && isset($_REQUEST['image'])) {
$allowed = Array( 'image/png'=>'png', 'image/svg+xml'=>'svg');
- if(! isset($allowed[$_REQUEST['type']])) exit('Invalid export type');
+ if (! isset($allowed[$_REQUEST['type']])) exit('Invalid export type');
- if(! preg_match("/(".implode("|",$allowed).")$/i", $_REQUEST['filename']))
+ if (! preg_match("/(".implode("|",$allowed).")$/i", $_REQUEST['filename']))
$_REQUEST['filename'] .= '.' . $allowed[$_REQUEST['type']];
header("Cache-Control: public");
@@ -25,7 +25,7 @@ if(isset($_REQUEST['filename']) && isset($_REQUEST['image'])) {
header("Content-Type: ".$_REQUEST['type']);
header("Content-Transfer-Encoding: binary");
- if($allowed[$_REQUEST['type']] != 'svg')
+ if ($allowed[$_REQUEST['type']] != 'svg')
echo base64_decode(substr($_REQUEST['image'], strpos($_REQUEST['image'],',') + 1));
else
echo $_REQUEST['image'];
diff --git a/db_create.php b/db_create.php
index 502ac7f..2d7877a 100644
--- a/db_create.php
+++ b/db_create.php
@@ -48,7 +48,7 @@ if (! $result) {
/**
* If in an Ajax request, just display the message with {@link PMA_ajaxResponse}
*/
- if($GLOBALS['is_ajax_request'] == true) {
+ if ($GLOBALS['is_ajax_request'] == true) {
PMA_ajaxResponse($message, false);
}
@@ -62,7 +62,7 @@ if (! $result) {
/**
* If in an Ajax request, build the output and send it
*/
- if($GLOBALS['is_ajax_request'] == true) {
+ if ($GLOBALS['is_ajax_request'] == true) {
/**
* String containing the SQL Query formatted in pretty HTML
diff --git a/db_export.php b/db_export.php
index aab4c51..f8a4762 100644
--- a/db_export.php
+++ b/db_export.php
@@ -49,14 +49,14 @@ if (!empty($selected_tbl) && empty($table_select)) {
}
// Check if the selected tables are defined in $_GET (from clicking Back button on export.php)
-if(isset($_GET['table_select'])) {
+if (isset($_GET['table_select'])) {
$_GET['table_select'] = urldecode($_GET['table_select']);
$_GET['table_select'] = explode(",", $_GET['table_select']);
}
foreach ($tables as $each_table) {
- if(isset($_GET['table_select'])) {
- if(in_array($each_table['Name'], $_GET['table_select'])) {
+ if (isset($_GET['table_select'])) {
+ if (in_array($each_table['Name'], $_GET['table_select'])) {
$is_selected = ' selected="selected"';
} else {
$is_selected = '';
diff --git a/db_operations.php b/db_operations.php
index e2d1e2b..2382389 100644
--- a/db_operations.php
+++ b/db_operations.php
@@ -300,7 +300,7 @@ if (strlen($db) && (! empty($db_rename) || ! empty($db_copy))) {
* Database has been successfully renamed/moved. If in an Ajax request,
* generate the output with {@link PMA_ajaxResponse} and exit
*/
- if( $GLOBALS['is_ajax_request'] == true) {
+ if ( $GLOBALS['is_ajax_request'] == true) {
$extra_data['newname'] = $newname;
$extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query);
PMA_ajaxResponse($message, $message->isSuccess(), $extra_data);
diff --git a/db_search.php b/db_search.php
index 69350cd..6191b14 100644
--- a/db_search.php
+++ b/db_search.php
@@ -92,7 +92,7 @@ if (empty($_REQUEST['field_str']) || ! is_string($_REQUEST['field_str'])) {
*/
$sub_part = '';
-if( $GLOBALS['is_ajax_request'] != true) {
+if ( $GLOBALS['is_ajax_request'] != true) {
require './libraries/db_info.inc.php';
echo '<div id="searchresults">';
}
@@ -254,7 +254,7 @@ if (isset($_REQUEST['submit_search'])) {
/**
* If we are in an Ajax request, we need to exit after displaying all the HTML
*/
-if($GLOBALS['is_ajax_request'] == true) {
+if ($GLOBALS['is_ajax_request'] == true) {
exit;
}
else {
diff --git a/db_structure.php b/db_structure.php
index d1ffdc3..6dc82bf 100644
--- a/db_structure.php
+++ b/db_structure.php
@@ -372,7 +372,7 @@ foreach ($tables as $keyname => $each_table) {
$sum_row_count_pre = '~';
$show_superscript = PMA_showHint(PMA_sanitize(sprintf(__('This view has at least this number of rows. Please refer to %sdocumentation%s.'), '[a@./Documentation.html#cfg_MaxExactCountViews@_blank]', '[/a]')));
}
- } elseif($each_table['ENGINE'] == 'InnoDB' && (! $each_table['COUNTED'])) {
+ } elseif ($each_table['ENGINE'] == 'InnoDB' && (! $each_table['COUNTED'])) {
// InnoDB table: we did not get an accurate row count
$row_count_pre = '~';
$sum_row_count_pre = '~';
diff --git a/db_tracking.php b/db_tracking.php
index 38a231d..df1106e 100644
--- a/db_tracking.php
+++ b/db_tracking.php
@@ -16,7 +16,7 @@ $GLOBALS['js_include'][] = 'db_structure.js';
/**
* If we are not in an Ajax request, then do the common work and show the links etc.
*/
-if($GLOBALS['is_ajax_request'] != true) {
+if ($GLOBALS['is_ajax_request'] != true) {
require './libraries/db_common.inc.php';
}
$url_query .= '&goto=tbl_tracking.php&back=db_tracking.php';
@@ -34,7 +34,7 @@ if (isset($_REQUEST['delete_tracking']) && isset($_REQUEST['table'])) {
* If in an Ajax request, generate the success message and use
* {@link PMA_ajaxResponse()} to send the output
*/
- if($GLOBALS['is_ajax_request'] == true) {
+ if ($GLOBALS['is_ajax_request'] == true) {
$message = PMA_Message::success();
PMA_ajaxResponse($message, true);
}
diff --git a/enum_editor.php b/enum_editor.php
index 5fe962f..9287bb3 100644
--- a/enum_editor.php
+++ b/enum_editor.php
@@ -33,7 +33,7 @@ require_once './libraries/header_meta_style.inc.php';
// Display the values in text fields, excluding empty strings
$field_counter = 0;
foreach ($values as $value) {
- if(trim($value) != "") {
+ if (trim($value) != "") {
$field_counter++;
echo sprintf('<input type="text" size="30" value="%s" name="field' . $field_counter . '" />', htmlspecialchars(str_replace(array("''", '\\\\', "\\'"), array("'", '\\', "'"), substr($value, 1, -1))));
}
@@ -41,7 +41,7 @@ require_once './libraries/header_meta_style.inc.php';
$total_fields = $field_counter;
// If extra empty fields are added, display them
- if(isset($_GET['extra_fields'])) {
+ if (isset($_GET['extra_fields'])) {
$total_fields += $_GET['extra_fields'];
for($i = $field_counter+1; $i <= $total_fields; $i++) {
echo '<input type="text" size="30" name="field' . $i . '"/>';
diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index ed32fab..daf1173 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -1008,7 +1008,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
* Set to true if this is a request made during an inline edit process. This
* request is made to retrieve the non-truncated/transformed values.
*/
-if(isset($_REQUEST['inline_edit']) && $_REQUEST['inline_edit'] == true) {
+if (isset($_REQUEST['inline_edit']) && $_REQUEST['inline_edit'] == true) {
$GLOBALS['inline_edit'] = true;
}
else {
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index f710b80..fd0701b 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -600,7 +600,7 @@ function PMA_mysqlDie($error_message = '', $the_query = '',
* - avoid displaying a Back link
* - use PMA_ajaxResponse() to transmit the message and exit
*/
- if($GLOBALS['is_ajax_request'] == true) {
+ if ($GLOBALS['is_ajax_request'] == true) {
PMA_ajaxResponse($error_msg_output, false);
}
if (! empty($back_url)) {
@@ -779,7 +779,7 @@ function PMA_backquote($a_name, $do_it = true)
if (! $do_it) {
global $PMA_SQPdata_forbidden_word;
- if(! in_array(strtoupper($a_name), $PMA_SQPdata_forbidden_word)) {
+ if (! in_array(strtoupper($a_name), $PMA_SQPdata_forbidden_word)) {
return $a_name;
}
}
@@ -869,7 +869,7 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view
* in a string. In some special cases on sql.php, buffering has to be disabled
* and hence we check with $GLOBALS['buffer_message']
*/
- if( $GLOBALS['is_ajax_request'] == true && ! isset($GLOBALS['buffer_message']) ) {
+ if ( $GLOBALS['is_ajax_request'] == true && ! isset($GLOBALS['buffer_message']) ) {
ob_start();
}
global $cfg;
@@ -1202,7 +1202,7 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view
// If we are in an Ajax request, we have most probably been called in
// PMA_ajaxResponse(). Hence, collect the buffer contents and return it
// to PMA_ajaxResponse(), which will encode it for JSON.
- if( $GLOBALS['is_ajax_request'] == true && ! isset($GLOBALS['buffer_message']) ) {
+ if ( $GLOBALS['is_ajax_request'] == true && ! isset($GLOBALS['buffer_message']) ) {
$buffer_contents = ob_get_contents();
ob_end_clean();
return $buffer_contents;
@@ -1341,13 +1341,13 @@ function PMA_localizeNumber($value)
*/
function PMA_formatNumber($value, $digits_left = 3, $digits_right = 0, $only_down = false, $noTrailingZero = true)
{
- if($value==0) return '0';
+ if ($value==0) return '0';
$originalValue = $value;
//number_format is not multibyte safe, str_replace is safe
if ($digits_left === 0) {
$value = number_format($value, $digits_right);
- if($originalValue!=0 && floatval($value) == 0) $value = ' <'.(1/PMA_pow(10,$digits_right));
+ if ($originalValue!=0 && floatval($value) == 0) $value = ' <'.(1/PMA_pow(10,$digits_right));
return PMA_localizeNumber($value);
}
@@ -1388,22 +1388,22 @@ function PMA_formatNumber($value, $digits_left = 3, $digits_right = 0, $only_dow
// Lowering the SI prefix by 1 gives us an additional 3 zeros
// So if we have 3,6,9,12.. free digits ($digits_left - $cur_digits) to use, then lower the SI prefix
$cur_digits = floor(log10($value / PMA_pow(1000, $d, 'pow'))+1);
- if($digits_left > $cur_digits) {
+ if ($digits_left > $cur_digits) {
$d-= floor(($digits_left - $cur_digits)/3);
}
- if($d<0 && $only_down) $d=0;
+ if ($d<0 && $only_down) $d=0;
$value = round($value / (PMA_pow(1000, $d, 'pow') / $dh)) /$dh;
$unit = $units[$d];
// If we dont want any zeros after the comma just add the thousand seperator
- if($noTrailingZero)
+ if ($noTrailingZero)
$value = PMA_localizeNumber(preg_replace("/(?<=\d)(?=(\d{3})+(?!\d))/",",",$value));
else
$value = PMA_localizeNumber(number_format($value, $digits_right)); //number_format is not multibyte safe, str_replace is safe
- if($originalValue!=0 && floatval($value) == 0) return ' <'.(1/PMA_pow(10,$digits_right)).' '.$unit;
+ if ($originalValue!=0 && floatval($value) == 0) return ' <'.(1/PMA_pow(10,$digits_right)).' '.$unit;
return $sign . $value . ' ' . $unit;
} // end of the 'PMA_formatNumber' function
@@ -1541,7 +1541,7 @@ function PMA_generate_html_tab($tab, $url_params = array(), $base_dir='')
}
// If there are any tab specific URL parameters, merge those with the general URL parameters
- if(! empty($tab['url_params']) && is_array($tab['url_params'])) {
+ if (! empty($tab['url_params']) && is_array($tab['url_params'])) {
$url_params = array_merge($url_params, $tab['url_params']);
}
@@ -2806,7 +2806,7 @@ function PMA_expandUserString($string, $escape = null, $updates = array()) {
function PMA_ajaxResponse($message, $success = true, $extra_data = array())
{
$response = array();
- if( $success == true ) {
+ if ( $success == true ) {
$response['success'] = true;
if ($message instanceof PMA_Message) {
$response['message'] = $message->getDisplay();
@@ -2817,7 +2817,7 @@ function PMA_ajaxResponse($message, $success = true, $extra_data = array())
}
else {
$response['success'] = false;
- if($message instanceof PMA_Message) {
+ if ($message instanceof PMA_Message) {
$response['error'] = $message->getDisplay();
}
else {
@@ -2826,7 +2826,7 @@ function PMA_ajaxResponse($message, $success = true, $extra_data = array())
}
// If extra_data has been provided, append it to the response array
- if( ! empty($extra_data) && count($extra_data) > 0 ) {
+ if ( ! empty($extra_data) && count($extra_data) > 0 ) {
$response = array_merge($response, $extra_data);
}
@@ -2841,7 +2841,7 @@ function PMA_ajaxResponse($message, $success = true, $extra_data = array())
echo json_encode($response);
- if(!defined('TESTSUITE'))
+ if (!defined('TESTSUITE'))
exit;
}
diff --git a/libraries/db_common.inc.php b/libraries/db_common.inc.php
index 4682122..290bcd1 100644
--- a/libraries/db_common.inc.php
+++ b/libraries/db_common.inc.php
@@ -69,7 +69,7 @@ if (isset($submitcollation) && !empty($db_collation)) {
* db charset change action on db_operations.php. If this causes a bug on
* other pages, we might have to move this to a different location.
*/
- if( $GLOBALS['is_ajax_request'] == true) {
+ if ( $GLOBALS['is_ajax_request'] == true) {
PMA_ajaxResponse($message, $message->isSuccess());
};
}
diff --git a/libraries/db_info.inc.php b/libraries/db_info.inc.php
index eebad23..de56e83 100644
--- a/libraries/db_info.inc.php
+++ b/libraries/db_info.inc.php
@@ -247,7 +247,7 @@ unset($each_table, $tbl_group_sql, $db_info_result);
* Displays top menu links
* If in an Ajax request, we do not need to show this
*/
-if($GLOBALS['is_ajax_request'] != true) {
+if ($GLOBALS['is_ajax_request'] != true) {
require './libraries/db_links.inc.php';
}
?>
diff --git a/libraries/db_links.inc.php b/libraries/db_links.inc.php
index 5a95622..2210899 100644
--- a/libraries/db_links.inc.php
+++ b/libraries/db_links.inc.php
@@ -61,7 +61,7 @@ $tab_search['text'] = __('Search');
$tab_search['icon'] = 'ic_b_search';
$tab_search['link'] = 'db_search.php';
-if(PMA_Tracker::isActive())
+if (PMA_Tracker::isActive())
{
$tab_tracking['text'] = __('Tracking');
$tab_tracking['icon'] = 'ic_eye';
diff --git a/libraries/db_structure.lib.php b/libraries/db_structure.lib.php
index 68e4b9d..82a3f58 100644
--- a/libraries/db_structure.lib.php
+++ b/libraries/db_structure.lib.php
@@ -96,17 +96,17 @@ function PMA_SortableTableHeader($title, $sort, $initial_sort_order = 'ASC')
// current sort order is ASC
$order_img = ' <img class="icon ic_s_asc" src="themes/dot.gif" alt="'. __('Ascending') . '" title="'. __('Ascending') . '" id="sort_arrow" />';
// but on mouse over, show the reverse order (DESC)
- $order_link_params['onmouseover'] = 'if($(\'#sort_arrow\').length > 0) { $(\'#sort_arrow\').attr(\'class\',\'icon ic_s_desc\'); }';
+ $order_link_params['onmouseover'] = 'if ($(\'#sort_arrow\').length > 0) { $(\'#sort_arrow\').attr(\'class\',\'icon ic_s_desc\'); }';
// on mouse out, show current sort order (ASC)
- $order_link_params['onmouseout'] = 'if($(\'#sort_arrow\').length > 0) { $(\'#sort_arrow\').attr(\'class\',\'icon ic_s_asc\'); }';
+ $order_link_params['onmouseout'] = 'if ($(\'#sort_arrow\').length > 0) { $(\'#sort_arrow\').attr(\'class\',\'icon ic_s_asc\'); }';
} else {
$future_sort_order = 'ASC';
// current sort order is DESC
$order_img = ' <img class="icon ic_s_desc" src="themes/dot.gif" alt="'. __('Descending') . '" title="'. __('Descending') . '" id="sort_arrow" />';
// but on mouse over, show the reverse order (ASC)
- $order_link_params['onmouseover'] = 'if($(\'#sort_arrow\').length > 0) { $(\'#sort_arrow\').attr(\'class\',\'icon ic_s_asc\'); }';
+ $order_link_params['onmouseover'] = 'if ($(\'#sort_arrow\').length > 0) { $(\'#sort_arrow\').attr(\'class\',\'icon ic_s_asc\'); }';
// on mouse out, show current sort order (DESC)
- $order_link_params['onmouseout'] = 'if($(\'#sort_arrow\').length > 0) { $(\'#sort_arrow\').attr(\'class\',\'icon ic_s_desc\'); }';
+ $order_link_params['onmouseout'] = 'if ($(\'#sort_arrow\').length > 0) { $(\'#sort_arrow\').attr(\'class\',\'icon ic_s_desc\'); }';
}
}
diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php
index 28e0bf2..75ec919 100644
--- a/libraries/display_export.lib.php
+++ b/libraries/display_export.lib.php
@@ -56,16 +56,16 @@ if (isset($single_table)) {
echo '<input type="hidden" name="export_type" value="' . $export_type . '" />' . "\n";
// If the export method was not set, the default is quick
-if(isset($_GET['export_method'])) {
+if (isset($_GET['export_method'])) {
$cfg['Export']['method'] = $_GET['export_method'];
-} elseif(! isset($cfg['Export']['method'])) {
+} elseif (! isset($cfg['Export']['method'])) {
$cfg['Export']['method'] = 'quick';
}
// The export method (quick, custom or custom-no-form)
echo '<input type="hidden" name="export_method" value="' . htmlspecialchars($cfg['Export']['method']) . '" />';
-if(isset($_GET['sql_query'])) {
+if (isset($_GET['sql_query'])) {
echo '<input type="hidden" name="sql_query" value="' . htmlspecialchars($_GET['sql_query']) . '" />' . "\n";
} elseif (! empty($sql_query)) {
echo '<input type="hidden" name="sql_query" value="' . htmlspecialchars($sql_query) . '" />' . "\n";
@@ -76,9 +76,9 @@ if(isset($_GET['sql_query'])) {
<h2>
<img class="icon ic_b_export" src="themes/dot.gif" alt="export" />
<?php
- if($export_type == 'server') {
+ if ($export_type == 'server') {
echo __('Exporting databases from the current server');
- } elseif($export_type == 'database') {
+ } elseif ($export_type == 'database') {
printf(__('Exporting tables from "%s" database'), htmlspecialchars($db));
} else {
printf(__('Exporting rows from "%s" table'), htmlspecialchars($table));
@@ -91,14 +91,14 @@ if(isset($_GET['sql_query'])) {
<ul>
<li>
<?php echo '<input type="radio" name="quick_or_custom" value="quick" id="radio_quick_export"';
- if(isset($_GET['quick_or_custom'])) {
+ if (isset($_GET['quick_or_custom'])) {
$export_method = $_GET['quick_or_custom'];
- if($export_method == 'custom' || $export_method == 'custom_no_form') {
+ if ($export_method == 'custom' || $export_method == 'custom_no_form') {
echo ' />';
} else {
echo ' checked="checked" />';
}
- } elseif($cfg['Export']['method'] == 'custom' || $cfg['Export']['method'] == 'custom-no-form') {
+ } elseif ($cfg['Export']['method'] == 'custom' || $cfg['Export']['method'] == 'custom-no-form') {
echo ' />';
} else {
echo ' checked="checked" />';
@@ -107,14 +107,14 @@ if(isset($_GET['sql_query'])) {
</li>
<li>
<?php echo '<input type="radio" name="quick_or_custom" value="custom" id="radio_custom_export"';
- if(isset($_GET['quick_or_custom'])) {
+ if (isset($_GET['quick_or_custom'])) {
$export_method = $_GET['quick_or_custom'];
- if($export_method == 'custom' || $export_method == 'custom_no_form') {
+ if ($export_method == 'custom' || $export_method == 'custom_no_form') {
echo ' checked="checked" />';
} else {
echo ' />';
}
- } elseif($cfg['Export']['method'] == 'custom' || $cfg['Export']['method'] == 'custom-no-form') {
+ } elseif ($cfg['Export']['method'] == 'custom' || $cfg['Export']['method'] == 'custom-no-form') {
echo ' checked="checked" />';
} else {
echo ' />';
@@ -126,9 +126,9 @@ if(isset($_GET['sql_query'])) {
<div class="exportoptions" id="databases_and_tables">
<?php
- if($export_type == 'server') {
+ if ($export_type == 'server') {
echo '<h3>' . __('Database(s):') . '</h3>';
- } else if($export_type == 'database') {
+ } else if ($export_type == 'database') {
echo '<h3>' . __('Table(s):') . '</h3>';
}
if (! empty($multi_values)) {
@@ -142,7 +142,7 @@ if(isset($_GET['sql_query'])) {
<h3><?php echo __('Rows:'); ?></h3>
<ul>
<li>
- <?php if(isset($_GET['allrows']) && $_GET['allrows'] == 1) {
+ <?php if (isset($_GET['allrows']) && $_GET['allrows'] == 1) {
echo '<input type="radio" name="allrows" value="0" id="radio_allrows_0" />';
} else {
echo '<input type="radio" name="allrows" value="0" id="radio_allrows_0" checked="checked" />';
@@ -158,7 +158,7 @@ if(isset($_GET['sql_query'])) {
</ul>
</li>
<li>
- <?php if(isset($_GET['allrows']) && $_GET['allrows'] == 0) {
+ <?php if (isset($_GET['allrows']) && $_GET['allrows'] == 0) {
echo '<input type="radio" name="allrows" value="1" id="radio_allrows_1" />';
} else {
echo '<input type="radio" name="allrows" value="1" id="radio_allrows_1" checked="checked" />';
@@ -241,7 +241,7 @@ if(isset($_GET['sql_query'])) {
<input type="text" name="filename_template" id="filename_template"
<?php
echo ' value="';
- if(isset($_GET['filename_template'])) {
+ if (isset($_GET['filename_template'])) {
echo $_GET['filename_template'];
} else {
if ($export_type == 'database') {
@@ -276,7 +276,7 @@ if(isset($_GET['sql_query'])) {
echo '<select id="select_charset_of_file" name="charset_of_file" size="1">';
foreach ($cfg['AvailableCharsets'] as $temp_charset) {
echo '<option value="' . $temp_charset . '"';
- if(isset($_GET['charset_of_file']) && ($_GET['charset_of_file'] != $temp_charset)) {
+ if (isset($_GET['charset_of_file']) && ($_GET['charset_of_file'] != $temp_charset)) {
echo '';
} elseif ((empty($cfg['Export']['charset']) && $temp_charset == 'utf-8')
|| $temp_charset == $cfg['Export']['charset']) {
@@ -288,7 +288,7 @@ if(isset($_GET['sql_query'])) {
} // end if
?>
<?php
- if(isset($_GET['compression'])) {
+ if (isset($_GET['compression'])) {
$selected_compression = $_GET['compression'];
} elseif (isset($cfg['Export']['compression'])) {
$selected_compression = $cfg['Export']['compression'];
diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php
index 119ccd1..052a023 100644
--- a/libraries/display_import.lib.php
+++ b/libraries/display_import.lib.php
@@ -125,9 +125,9 @@ if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") {
<h2>
<img class="icon ic_b_import" src="themes/dot.gif" alt="import" />
<?php
- if($import_type == 'server') {
+ if ($import_type == 'server') {
echo __('Importing into the current server');
- } elseif($import_type == 'database') {
+ } elseif ($import_type == 'database') {
printf(__('Importing into the database "%s"'), htmlspecialchars($db));
} else {
printf(__('Importing into the table "%s"'), htmlspecialchars($table));
@@ -160,7 +160,7 @@ if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") {
}?>
<div class="formelementrow" id="upload_form">
- <?php if($GLOBALS['is_upload'] && !empty($cfg['UploadDir'])) { ?>
+ <?php if ($GLOBALS['is_upload'] && !empty($cfg['UploadDir'])) { ?>
<ul>
<li>
<input type="radio" name="file_location" id="radio_import_file" />
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index 8bf4f3c..adaa407 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -913,11 +913,11 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
$order_link_params = array();
if (isset($order_img) && $order_img!='') {
if (strstr($order_img, 'asc')) {
- $order_link_params['onmouseover'] = 'if($(\'#soimg' . $i . '\').length > 0) { $(\'#soimg' . $i . '\').attr(\'class\', \'icon ic_s_desc\'); }';
- $order_link_params['onmouseout'] = 'if($(\'#soimg' . $i . '\').length > 0) { $(\'#soimg' . $i . '\').attr(\'class\', \'icon ic_s_asc\'); }';
+ $order_link_params['onmouseover'] = 'if ($(\'#soimg' . $i . '\').length > 0) { $(\'#soimg' . $i . '\').attr(\'class\', \'icon ic_s_desc\'); }';
+ $order_link_params['onmouseout'] = 'if ($(\'#soimg' . $i . '\').length > 0) { $(\'#soimg' . $i . '\').attr(\'class\', \'icon ic_s_asc\'); }';
} elseif (strstr($order_img, 'desc')) {
- $order_link_params['onmouseover'] = 'if($(\'#soimg' . $i . '\').length > 0) { $(\'#soimg' . $i . '\').attr(\'class\', \'icon ic_s_asc\'); }';
- $order_link_params['onmouseout'] = 'if($(\'#soimg' . $i . '\').length > 0) { $(\'#soimg' . $i . '\').attr(\'class\', \'icon ic_s_desc\'); }';
+ $order_link_params['onmouseover'] = 'if ($(\'#soimg' . $i . '\').length > 0) { $(\'#soimg' . $i . '\').attr(\'class\', \'icon ic_s_asc\'); }';
+ $order_link_params['onmouseout'] = 'if ($(\'#soimg' . $i . '\').length > 0) { $(\'#soimg' . $i . '\').attr(\'class\', \'icon ic_s_desc\'); }';
}
}
if ($GLOBALS['cfg']['HeaderFlipType'] == 'auto') {
@@ -1113,22 +1113,22 @@ function PMA_buildEmptyDisplay($class, $condition_field, $meta, $align = '') {
function PMA_addClass($class, $condition_field, $meta, $nowrap, $is_field_truncated = false, $transform_function = '', $default_function = '') {
// Define classes to be added to this data field based on the type of data
$enum_class = '';
- if(strpos($meta->flags, 'enum') !== false) {
+ if (strpos($meta->flags, 'enum') !== false) {
$enum_class = ' enum';
}
$set_class = '';
- if(strpos($meta->flags, 'set') !== false) {
+ if (strpos($meta->flags, 'set') !== false) {
$set_class = ' set';
}
$bit_class = '';
- if(strpos($meta->type, 'bit') !== false) {
+ if (strpos($meta->type, 'bit') !== false) {
$bit_class = ' bit';
}
$mime_type_class = '';
- if(isset($meta->mimetype)) {
+ if (isset($meta->mimetype)) {
$mime_type_class = ' ' . preg_replace('/\//', '_', $meta->mimetype);
}
@@ -1301,7 +1301,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
// Class definitions required for inline editing jQuery scripts
$edit_anchor_class = "edit_row_anchor";
- if( $clause_is_unique == 0) {
+ if ( $clause_is_unique == 0) {
$edit_anchor_class .= ' nonunique';
}
} // end if (1.2.1)
@@ -2726,7 +2726,7 @@ function PMA_generateEditLink($edit_url, $class, $edit_str, $where_clause, $wher
* Where clause for selecting this row uniquely is provided as
* a hidden input. Used by jQuery scripts for handling inline editing
*/
- if(! empty($where_clause)) {
+ if (! empty($where_clause)) {
$ret .= '<input type="hidden" class="where_clause" value ="' . $where_clause_html . '" />';
}
$ret .= '</span></td>';
@@ -2756,7 +2756,7 @@ function PMA_generateCopyLink($copy_url, $copy_str, $where_clause, $where_clause
* Where clause for selecting this row uniquely is provided as
* a hidden input. Used by jQuery scripts for handling inline editing
*/
- if(! empty($where_clause)) {
+ if (! empty($where_clause)) {
$ret .= '<input type="hidden" class="where_clause" value ="' . $where_clause_html . '" />';
}
$ret .= '</span></td>';
diff --git a/libraries/header.inc.php b/libraries/header.inc.php
index 5700047..a6ed8ed 100644
--- a/libraries/header.inc.php
+++ b/libraries/header.inc.php
@@ -198,7 +198,7 @@ if (isset($GLOBALS['is_ajax_request']) && !$GLOBALS['is_ajax_request']) {
* Sets a variable to remember headers have been sent
*/
$GLOBALS['is_header_sent'] = true;
-} //end if(!$GLOBALS['is_ajax_request'])
+} //end if (!$GLOBALS['is_ajax_request'])
else {
if (empty($GLOBALS['is_header_sent'])) {
require_once './libraries/header_http.inc.php';
diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php
index 46a89fc..0f7e218 100644
--- a/libraries/mult_submits.inc.php
+++ b/libraries/mult_submits.inc.php
@@ -263,7 +263,7 @@ if (!empty($submit_mult) && !empty($what)) {
</fieldset>
<?php
}
- elseif($what == 'add_prefix_tbl'){ ?>
+ elseif ($what == 'add_prefix_tbl'){ ?>
<fieldset class = "input">
<legend><?php echo __('Add table prefix') ?>:</legend>
<table>
diff --git a/libraries/plugin_interface.lib.php b/libraries/plugin_interface.lib.php
index ed2f4f9..703215f 100644
--- a/libraries/plugin_interface.lib.php
+++ b/libraries/plugin_interface.lib.php
@@ -80,7 +80,7 @@ function PMA_pluginCheckboxCheck($section, $opt)
*/
function PMA_pluginGetDefault($section, $opt)
{
- if(isset($_GET[$opt])) { // If the form is being repopulated using $_GET data, that is priority
+ if (isset($_GET[$opt])) { // If the form is being repopulated using $_GET data, that is priority
return htmlspecialchars($_GET[$opt]);
} elseif (isset($GLOBALS['timeout_passed']) && $GLOBALS['timeout_passed'] && isset($_REQUEST[$opt])) {
return htmlspecialchars($_REQUEST[$opt]);
@@ -148,7 +148,7 @@ function PMA_pluginGetChoice($section, $name, &$list, $cfgname = null)
foreach ($list as $plugin_name => $val) {
$ret .= '<option';
// If the form is being repopulated using $_GET data, that is priority
- if(isset($_GET[$name]) && $plugin_name == $_GET[$name] || ! isset($_GET[$name]) && $plugin_name == $default) {
+ if (isset($_GET[$name]) && $plugin_name == $_GET[$name] || ! isset($_GET[$name]) && $plugin_name == $default) {
$ret .= ' selected="selected"';
}
$ret .= ' value="' . $plugin_name . '">' . PMA_getString($val['text']) . '</option>' . "\n";
@@ -158,7 +158,7 @@ function PMA_pluginGetChoice($section, $name, &$list, $cfgname = null)
// Whether each plugin has to be saved as a file
foreach ($list as $plugin_name => $val) {
$ret .= '<input type="hidden" id="force_file_' . $plugin_name . '" value="';
- if(isset($val['force_file'])) {
+ if (isset($val['force_file'])) {
$ret .= 'true';
} else {
$ret .= 'false';
@@ -230,7 +230,7 @@ function PMA_pluginGetOneOption($section, $plugin_name, $id, &$opt)
foreach ($opt['values'] as $key => $val) {
$ret .= '<li><input type="radio" name="' . $plugin_name . '_' . $opt['name'] . '" value="' . $key
. '" id="radio_' . $plugin_name . '_' . $opt['name'] . '_' . $key . '"';
- if($key == $default) {
+ if ($key == $default) {
$ret .= 'checked="checked"';
}
$ret .= ' />' . '<label for="radio_' . $plugin_name . '_' . $opt['name'] . '_' . $key . '">'
@@ -250,7 +250,7 @@ function PMA_pluginGetOneOption($section, $plugin_name, $id, &$opt)
} elseif ($opt['type'] == 'begin_subgroup') {
/* each subgroup can have a header, which may also be a form element */
$ret .= PMA_pluginGetOneOption($section, $plugin_name, $id, $opt['subgroup_header']) . '<li class="subgroup"><ul';
- if(isset($opt['subgroup_header']['name'])) {
+ if (isset($opt['subgroup_header']['name'])) {
$ret .= ' id="ul_' . $opt['subgroup_header']['name'] . '">';
} else {
$ret .= '>';
@@ -273,7 +273,7 @@ function PMA_pluginGetOneOption($section, $plugin_name, $id, &$opt)
}
// Close the list element after $opt['doc'] link is displayed
- if($opt['type'] == 'bool' || $opt['type'] == 'text' || $opt['type'] == 'message_only' || $opt['type'] == 'select') {
+ if ($opt['type'] == 'bool' || $opt['type'] == 'text' || $opt['type'] == 'message_only' || $opt['type'] == 'select') {
$ret .= '</li>';
}
$ret .= "\n";
diff --git a/libraries/server_links.inc.php b/libraries/server_links.inc.php
index 4b7198e..19ee5d7 100644
--- a/libraries/server_links.inc.php
+++ b/libraries/server_links.inc.php
@@ -114,5 +114,5 @@ if (!$GLOBALS['is_ajax_request']) {
PMA_showMessage($message);
unset($message);
}
-}// end if($GLOBALS['is_ajax_request'] == true)
+}// end if ($GLOBALS['is_ajax_request'] == true)
?>
diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php
index c32ac4d..2c7e69c 100644
--- a/libraries/server_synchronize.lib.php
+++ b/libraries/server_synchronize.lib.php
@@ -477,7 +477,7 @@ function PMA_insertIntoTargetTable($matching_table, $src_db, $trg_db, $src_link,
$matching_tables_keys, $source_columns, &$add_column_array, $criteria, $target_tables_keys, $uncommon_tables, &$uncommon_tables_fields,$uncommon_cols,
&$alter_str_array,&$source_indexes, &$target_indexes, &$add_indexes_array, &$alter_indexes_array, &$delete_array, &$update_array, $display)
{
- if(isset($array_insert[$matching_table_index])) {
+ if (isset($array_insert[$matching_table_index])) {
if (sizeof($array_insert[$matching_table_index])) {
for ($insert_row = 0; $insert_row< sizeof($array_insert[$matching_table_index]); $insert_row++) {
if (isset($array_insert[$matching_table_index][$insert_row][$matching_tables_keys[$matching_table_index][0]])) {
@@ -828,7 +828,7 @@ function PMA_addColumnsInTargetTable($src_db, $trg_db, $src_link, $trg_link, $ma
$query = "ALTER TABLE " . PMA_backquote($trg_db) . '.' . PMA_backquote($matching_tables[$table_counter]). " ADD COLUMN " .
$add_column_array[$table_counter][$matching_tables_fields[$table_counter][$i]] . " " . $source_columns[$table_counter][$matching_tables_fields[$table_counter][$i]]['Type'];
- if($source_columns[$table_counter][$matching_tables_fields[$table_counter][$i]]['Null'] == 'NO') {
+ if ($source_columns[$table_counter][$matching_tables_fields[$table_counter][$i]]['Null'] == 'NO') {
$query .= ' Not Null ';
} elseif ($source_columns[$table_counter][$matching_tables_fields[$table_counter][$i]]['Null'] == 'YES') {
$query .= ' Null ';
@@ -1004,23 +1004,23 @@ function PMA_alterTargetTableStructure($trg_db, $trg_link, $matching_tables, &$s
$sql_query .= " Null " ;
}
if ($criteria[$i] == 'Collation') {
- if( !(isset($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[2]]))) {
+ if ( !(isset($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[2]]))) {
$sql_query .= " Not Null " ;
}
$sql_query .= " COLLATE " . $alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[$i]] ;
}
if (($criteria[$i] == 'Default') && ($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[$i]] == 'None')) {
- if( !(isset($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[2]]))) {
+ if ( !(isset($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[2]]))) {
$sql_query .= " Not Null " ;
}
- } elseif($criteria[$i] == 'Default') {
- if(! (isset($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[2]]))) {
+ } elseif ($criteria[$i] == 'Default') {
+ if (! (isset($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[2]]))) {
$sql_query .= " Not Null " ;
}
if (is_string($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[$i]])) {
if ($source_columns[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]]['Type'] != 'timestamp') {
$sql_query .= " DEFAULT '" . $alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[$i]] . "'";
- } elseif($source_columns[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]]['Type'] == 'timestamp') {
+ } elseif ($source_columns[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]]['Type'] == 'timestamp') {
$sql_query .= " DEFAULT " . $alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[$i]];
}
} elseif (is_numeric($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[$i]])) {
@@ -1028,7 +1028,7 @@ function PMA_alterTargetTableStructure($trg_db, $trg_link, $matching_tables, &$s
}
}
if ($criteria[$i] == 'Comment') {
- if( !(isset($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[2]]))) {
+ if ( !(isset($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[2]]))) {
$sql_query .= " Not Null " ;
}
$sql_query .= " COMMENT '" . $alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[$i]] . "'" ;
@@ -1162,7 +1162,7 @@ function PMA_indexesDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matchi
$z++;
}
if ($found === false) {
- if(! ($source_indexes[$table_counter][$a]['Key_name'] == 'PRIMARY')) {
+ if (! ($source_indexes[$table_counter][$a]['Key_name'] == 'PRIMARY')) {
$add_indexes_array [$table_counter][] = $source_indexes[$table_counter][$a]['Column_name'];
}
}
@@ -1364,7 +1364,7 @@ function PMA_get_column_values($database, $table, $column, $link = null)
for ($i=0; $i< sizeof($column); $i++)
{
$query.= PMA_backquote($column[$i]);
- if($i < (sizeof($column)-1))
+ if ($i < (sizeof($column)-1))
{
$query.= ', ';
}
diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php
index 1a3fd92..5a0f364 100644
--- a/libraries/sql_query_form.lib.php
+++ b/libraries/sql_query_form.lib.php
@@ -252,7 +252,7 @@ function PMA_sqlQueryFormInsert($query = '', $is_querywindow = false, $delimiter
.' dir="' . $GLOBALS['text_dir'] . '"'
.$auto_sel . $locking . '>' . htmlspecialchars($query) . '</textarea>' . "\n";
// Add buttons to generate query easily for select all,single select,insert,update and delete
- if(count($fields_list)) {
+ if (count($fields_list)) {
echo '<input type="button" value="SELECT *" id="selectall" class="sqlbutton" />';
echo '<input type="button" value="SELECT" id="select" class="sqlbutton" />';
echo '<input type="button" value="INSERT" id="insert" class="sqlbutton" />';
diff --git a/libraries/sysinfo.lib.php b/libraries/sysinfo.lib.php
index e996db6..9bcc2dd 100644
--- a/libraries/sysinfo.lib.php
+++ b/libraries/sysinfo.lib.php
@@ -14,7 +14,7 @@ function getSysInfo() {
$sysinfo = array();
- if(in_array(PHP_OS, $supported)) {
+ if (in_array(PHP_OS, $supported)) {
return eval("return new ".PHP_OS."();");
}
diff --git a/libraries/tbl_links.inc.php b/libraries/tbl_links.inc.php
index ac5bfb3..3de9ed2 100644
--- a/libraries/tbl_links.inc.php
+++ b/libraries/tbl_links.inc.php
@@ -92,7 +92,7 @@ if (! $tbl_is_view && !$db_is_information_schema) {
$tabs['operation']['link'] = 'tbl_operations.php';
$tabs['operation']['text'] = __('Operations');
}
-if(PMA_Tracker::isActive()) {
+if (PMA_Tracker::isActive()) {
$tabs['tracking']['icon'] = 'ic_eye';
$tabs['tracking']['text'] = __('Tracking');
$tabs['tracking']['link'] = 'tbl_tracking.php';
@@ -122,7 +122,7 @@ if ($table_info_num_rows == 0 && !$tbl_is_view) {
echo PMA_generate_html_tabs($tabs, $url_params);
unset($tabs);
-if(PMA_Tracker::isActive() and PMA_Tracker::isTracked($GLOBALS["db"], $GLOBALS["table"]))
+if (PMA_Tracker::isActive() and PMA_Tracker::isTracked($GLOBALS["db"], $GLOBALS["table"]))
{
$msg = PMA_Message::notice('<a href="tbl_tracking.php?'.$url_query.'">'.sprintf(__('Tracking of %s.%s is activated.'), htmlspecialchars($GLOBALS["db"]), htmlspecialchars($GLOBALS["table"])).'</a>');
$msg->display();
diff --git a/main.php b/main.php
index f340e80..e1eec63 100644
--- a/main.php
+++ b/main.php
@@ -295,7 +295,7 @@ if (file_exists('./config')) {
*/
if ($server > 0) {
$cfgRelation = PMA_getRelationsParam();
- if(! $cfgRelation['allworks'] && $cfg['PmaNoRelation_DisableWarning'] == false) {
+ if (! $cfgRelation['allworks'] && $cfg['PmaNoRelation_DisableWarning'] == false) {
$message = PMA_Message::notice(__('The phpMyAdmin configuration storage is not completely configured, some extended features have been deactivated. To find out why click %shere%s.'));
$message->addParam('<a href="' . $cfg['PmaAbsoluteUri'] . 'chk_rel.php?' . $common_url_query . '">', false);
$message->addParam('</a>', false);
diff --git a/navigation.php b/navigation.php
index 27859fe..e473dd8 100644
--- a/navigation.php
+++ b/navigation.php
@@ -576,7 +576,7 @@ function PMA_displayTableList($tables, $visible = false,
while (isset($table['is' . $sep . 'group'])) {
// get the array with the actual table information
foreach ($table as $value) {
- if(is_array($value)) {
+ if (is_array($value)) {
$table = $value;
}
}
diff --git a/pmd_general.php b/pmd_general.php
index 1307571..10a862c 100644
--- a/pmd_general.php
+++ b/pmd_general.php
@@ -42,7 +42,7 @@ echo '
var db = "' . PMA_escapeJsString($db) . '";
var token = "' . PMA_escapeJsString($token) . '";';
echo "\n";
- if($_REQUEST['query']) {
+ if ($_REQUEST['query']) {
echo '
$(document).ready(function(){
$(".trigger").click(function(){
@@ -113,7 +113,7 @@ echo $script_tabs . $script_contr . $script_display_field;
><img src="pmd/images/pdf.png" alt="key" width="20" height="20"
title="<?php echo __('Import/Export coordinates for PDF schema'); ?>" /></a
>
- <?php if($_REQUEST['query']){
+ <?php if ($_REQUEST['query']){
echo '<a href="#" onClick="build_query(\'SQL Query on Database\', 0)" onmousedown="return false;"
class="M_butt" target="_self">';
echo '<img src="pmd/images/query_builder.png" alt="key" width="20" height="20" title="';
@@ -205,7 +205,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
<thead>
<tr>
<?php
- if(isset($_REQUEST['query'])) {
+ if (isset($_REQUEST['query'])) {
echo '<td class="select_all">';
echo '<input type="checkbox" value="select_all_'.htmlspecialchars($t_n_url).'" style="margin: 0px;" ';
echo 'id="select_all_'.htmlspecialchars($t_n_url).'" title="select all" ';
@@ -238,7 +238,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
echo $GLOBALS['PMD_OUT']["TABLE_NAME_SMALL"][$i];
?></td>
<?php
- if(isset($_REQUEST['query'])) {
+ if (isset($_REQUEST['query'])) {
echo '<td class="tab_zag" onmouseover="Table_onover(\''.htmlspecialchars($t_n_url).'\',0,1)" id="id_zag_'.htmlspecialchars($t_n_url).'_2"';
echo 'onmousedown="cur_click=document.getElementById(\''.htmlspecialchars($t_n_url).'\');"';
echo 'onmouseout="Table_onover(\''.htmlspecialchars($t_n_url).'\',1,1)">';
@@ -274,7 +274,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
}
?>)">
<?php
- if(isset($_REQUEST['query'])) {
+ if (isset($_REQUEST['query'])) {
echo '<td class="select_all">';
echo '<input value="'.htmlspecialchars($t_n_url).urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]).'"';
echo 'type="checkbox" id="select_'.htmlspecialchars($t_n_url).'._'.urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]).'" ';
@@ -315,7 +315,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
</div>
</td>
<?php
- if(isset($_REQUEST['query'])) {
+ if (isset($_REQUEST['query'])) {
//$temp = $GLOBALS['PMD_OUT']["OWNER"][$i].'.'.$GLOBALS['PMD_OUT']["TABLE_NAME_SMALL"][$i];
echo '<td class="small_tab_pref" onmouseover="this.className=\'small_tab_pref2\';"';
echo 'onmouseout="this.className=\'small_tab_pref\';"';
@@ -801,7 +801,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
</table>
<?php
-if($_REQUEST['query']) {
+if ($_REQUEST['query']) {
echo '<div class="panel">';
echo '<div style="clear:both;"></div>';
echo '<div id="ab"></div>';
diff --git a/pmd_save_pos.php b/pmd_save_pos.php
index 6fefe63..b95b20f 100644
--- a/pmd_save_pos.php
+++ b/pmd_save_pos.php
@@ -45,7 +45,7 @@ function PMD_err_sav() {
}
}
-if(! empty($die_save_pos)) {
+if (! empty($die_save_pos)) {
header("Content-Type: text/xml; charset=utf-8");
header("Cache-Control: no-cache");
?>
diff --git a/schema_edit.php b/schema_edit.php
index 9b71500..1545d8f 100644
--- a/schema_edit.php
+++ b/schema_edit.php
@@ -83,7 +83,7 @@ if ($cfgRelation['pdfwork']) {
* @param string $do It tells what the Schema is supposed to do
* create and select a page, generate schema etc
*/
- if(isset($_REQUEST['do'])){
+ if (isset($_REQUEST['do'])){
$user_schema->setAction($_REQUEST['do']);
$user_schema->processUserChoice();
}
diff --git a/server_databases.php b/server_databases.php
index fb9d1d6..544db90 100644
--- a/server_databases.php
+++ b/server_databases.php
@@ -180,7 +180,7 @@ if ($databases_count > 0) {
{
if ($type=="master")
$name = __('Master replication');
- elseif($type == "slave")
+ elseif ($type == "slave")
$name = __('Slave replication');
if (${"server_{$type}_status"})
echo ' <th>'. $name .'</th>' . "\n";
diff --git a/server_export.php b/server_export.php
index b5a4ca6..d6dd2cf 100644
--- a/server_export.php
+++ b/server_export.php
@@ -31,14 +31,14 @@ $multi_values .= '<select name="db_select[]" id="db_select" size="10" multiple="
$multi_values .= "\n";
// Check if the selected databases are defined in $_GET (from clicking Back button on export.php)
-if(isset($_GET['db_select'])) {
+if (isset($_GET['db_select'])) {
$_GET['db_select'] = urldecode($_GET['db_select']);
$_GET['db_select'] = explode(",", $_GET['db_select']);
}
foreach ($GLOBALS['pma']->databases as $current_db) {
- if(isset($_GET['db_select'])) {
- if(in_array($current_db, $_GET['db_select'])) {
+ if (isset($_GET['db_select'])) {
+ if (in_array($current_db, $_GET['db_select'])) {
$is_selected = ' selected="selected"';
} else {
$is_selected = '';
diff --git a/server_privileges.php b/server_privileges.php
index e2f19a9..ecd1fa6 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -1046,7 +1046,7 @@ if (isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) {
/**
* If we are not in an Ajax request, we can't reload navigation now
*/
- if($GLOBALS['is_ajax_request'] != true) {
+ if ($GLOBALS['is_ajax_request'] != true) {
// this is needed in case tracking is on:
$GLOBALS['db'] = $username;
$GLOBALS['reload'] = true;
@@ -1346,7 +1346,7 @@ if (isset($_REQUEST['delete']) || (isset($_REQUEST['change_copy']) && $_REQUEST[
$queries[] = 'DROP DATABASE IF EXISTS ' . PMA_backquote($this_user) . ';';
$GLOBALS['reload'] = true;
- if($GLOBALS['is_ajax_request'] != true) {
+ if ($GLOBALS['is_ajax_request'] != true) {
PMA_reloadNavigation();
}
}
@@ -1446,11 +1446,11 @@ $link_export = '<a class="export_user_anchor ' . $conditional_class . '" href="s
*/
if ($GLOBALS['is_ajax_request'] && ! isset($_REQUEST['export']) && (! isset($_REQUEST['adduser']) || $_add_user_error) && ! isset($_REQUEST['initial']) && ! isset($_REQUEST['showall']) && ! isset($_REQUEST['edit_user_dialog']) && ! isset($_REQUEST['db_specific'])) {
- if(isset($sql_query)) {
+ if (isset($sql_query)) {
$extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query);
}
- if(isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) {
+ if (isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) {
/**
* generate html on the fly for the new user that was just created.
*/
@@ -1460,7 +1460,7 @@ if ($GLOBALS['is_ajax_request'] && ! isset($_REQUEST['export']) && (! isset($_RE
.'<td>' . htmlspecialchars($hostname) . '</td>' . "\n";
$new_user_string .= '<td>';
- if(!empty($password) || isset($pma_pw)) {
+ if (!empty($password) || isset($pma_pw)) {
$new_user_string .= __('Yes');
}
else {
@@ -1471,7 +1471,7 @@ if ($GLOBALS['is_ajax_request'] && ! isset($_REQUEST['export']) && (! isset($_RE
$new_user_string .= '<td><tt>' . join(', ', PMA_extractPrivInfo('', true)) . '</tt></td>'; //Fill in privileges here
$new_user_string .= '<td>';
- if((isset($Grant_priv) && $Grant_priv == 'Y')) {
+ if ((isset($Grant_priv) && $Grant_priv == 'Y')) {
$new_user_string .= __('Yes');
}
else {
@@ -1498,7 +1498,7 @@ if ($GLOBALS['is_ajax_request'] && ! isset($_REQUEST['export']) && (! isset($_RE
$extra_data['new_user_initial_string'] = $new_user_initial_string;
}
- if(isset($update_privs)) {
+ if (isset($update_privs)) {
$extra_data['db_specific_privs'] = false;
if (isset($dbname_is_wildcard)) {
$extra_data['db_specific_privs'] = !$dbname_is_wildcard;
@@ -1806,7 +1806,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
// A user was selected -> display the user's properties
// In an Ajax request, prevent cached values from showing
- if($GLOBALS['is_ajax_request'] == true) {
+ if ($GLOBALS['is_ajax_request'] == true) {
header('Cache-Control: no-cache');
}
@@ -2376,7 +2376,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
$user_form .= '</tbody>' . "\n"
. '</table></form>' . "\n";
- if($GLOBALS['is_ajax_request'] == true){
+ if ($GLOBALS['is_ajax_request'] == true){
$extra_data['user_form'] = $user_form;
$message = PMA_Message::success(__('User has been added.'));
PMA_ajaxResponse($message, $message->isSuccess(), $extra_data);
diff --git a/server_status.php b/server_status.php
index cf02da7..c88ccdd 100644
--- a/server_status.php
+++ b/server_status.php
@@ -222,15 +222,15 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
// Ignore undefined index warning, just increase counter by one
@$return['sum'][$type] += $row['#'];
- if($type=='insert' || $type=='update') {
+ if ($type=='insert' || $type=='update') {
// Group inserts if selected
- if($type=='insert' && isset($_REQUEST['groupInserts']) && $_REQUEST['groupInserts'] && preg_match('/^INSERT INTO (`|\'|"|)([^\s\\1]+)\\1/i',$row['argument'],$matches)) {
+ if ($type=='insert' && isset($_REQUEST['groupInserts']) && $_REQUEST['groupInserts'] && preg_match('/^INSERT INTO (`|\'|"|)([^\s\\1]+)\\1/i',$row['argument'],$matches)) {
$insertTables[$matches[2]]++;
if ($insertTables[$matches[2]] > 1) {
$return['rows'][$insertTablesFirst]['#'] = $insertTables[$matches[2]];
// Add a ... to the end of this query to indicate that there's been other queries
- if($return['rows'][$insertTablesFirst]['argument'][strlen($return['rows'][$insertTablesFirst]['argument'])-1] != '.')
+ if ($return['rows'][$insertTablesFirst]['argument'][strlen($return['rows'][$insertTablesFirst]['argument'])-1] != '.')
$return['rows'][$insertTablesFirst]['argument'] .= '<br/>...';
// Group this value, thus do not add to the result list
@@ -557,7 +557,7 @@ require './libraries/server_common.inc.php';
require './libraries/server_links.inc.php';
$server = 1;
-if(isset($_REQUEST['server']) && intval($_REQUEST['server'])) $server = intval($_REQUEST['server']);
+if (isset($_REQUEST['server']) && intval($_REQUEST['server'])) $server = intval($_REQUEST['server']);
$server_db_isLocal = strtolower($cfg['Servers'][$server]['host']) == 'localhost'
|| $cfg['Servers'][$server]['host'] == '127.0.0.1'
@@ -722,7 +722,7 @@ function printQueryStatistics() {
echo PMA_formatNumber( $total_queries * 60 / $server_status['Uptime'], 0);
echo '<br>';
- if($total_queries / $server_status['Uptime'] >= 1) {
+ if ($total_queries / $server_status['Uptime'] >= 1) {
echo 'ø '.__('per second').': ';
echo PMA_formatNumber( $total_queries / $server_status['Uptime'], 0);
}
@@ -768,7 +768,7 @@ function printQueryStatistics() {
$name = str_replace(array('Com_', '_'), array('', ' '), $name);
// Group together values that make out less than 2% into "Other", but only if we have more than 6 fractions already
- if($value < $query_sum * 0.02 && count($chart_json)>6)
+ if ($value < $query_sum * 0.02 && count($chart_json)>6)
$other_sum += $value;
else $chart_json[$name] = $value;
?>
@@ -1364,7 +1364,7 @@ function printMonitor() {
<div id="addChartDialog" title="Add chart" style="display:none;">
<div id="tabGridVariables">
<p><input type="text" name="chartTitle" value="<?php echo __('Chart Title'); ?>" /></p>
- <?php if($server_db_isLocal) { ?>
+ <?php if ($server_db_isLocal) { ?>
<input type="radio" name="chartType" value="cpu" id="chartCPU">
<label for="chartCPU"><?php echo __('CPU Usage'); ?></label><br/>
@@ -1444,8 +1444,8 @@ function printMonitor() {
variableNames = [ <?php
$i=0;
foreach ($server_status as $name=>$value) {
- if(is_numeric($value)) {
- if($i++ > 0) echo ", ";
+ if (is_numeric($value)) {
+ if ($i++ > 0) echo ", ";
echo "'".$name."'";
}
}
@@ -1462,7 +1462,7 @@ function refreshList($name,$defaultRate=5, $refreshRates=Array(1, 2, 5, 10, 20,
foreach ($refreshRates as $rate) {
$selected = ($rate == $defaultRate)?' selected="selected"':'';
- if($rate<60)
+ if ($rate<60)
echo '<option value="'.$rate.'"'.$selected.'>'.sprintf(_ngettext('%d second', '%d seconds', $rate), $rate).'</option>';
else
echo '<option value="'.$rate.'"'.$selected.'>'.sprintf(_ngettext('%d minute', '%d minutes', $rate/60), $rate/60).'</option>';
diff --git a/server_synchronize.php b/server_synchronize.php
index 2cb6898..3412336 100644
--- a/server_synchronize.php
+++ b/server_synchronize.php
@@ -88,10 +88,10 @@ if ((isset($_REQUEST['submit_connect']))) {
*/
echo '<div class="error">';
- if(! $src_connection && $src_type != 'cur') {
+ if (! $src_connection && $src_type != 'cur') {
echo __('Could not connect to the source') . '<br />';
}
- if(! $trg_connection && $trg_type != 'cur'){
+ if (! $trg_connection && $trg_type != 'cur'){
echo __('Could not connect to the target');
}
echo '</div>';
diff --git a/server_variables.php b/server_variables.php
index fbe7094..dcbe192 100644
--- a/server_variables.php
+++ b/server_variables.php
@@ -34,7 +34,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
// Send with correct charset
header('Content-Type: text/html; charset=UTF-8');
- if(isset($_REQUEST['type'])) {
+ if (isset($_REQUEST['type'])) {
switch($_REQUEST['type']) {
case 'getval':
$varValue = PMA_DBI_fetch_single_row('SHOW GLOBAL VARIABLES WHERE Variable_name="'.PMA_sqlAddslashes($_REQUEST['varName']).'";','NUM');
@@ -42,9 +42,9 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
break;
case 'setval':
$value = PMA_sqlAddslashes($_REQUEST['varValue']);
- if(!is_numeric($value)) $value="'".$value."'";
+ if (!is_numeric($value)) $value="'".$value."'";
- if(! preg_match("/[^a-zA-Z0-9_]+/",$_REQUEST['varName']) && PMA_DBI_query('SET GLOBAL '.$_REQUEST['varName'].' = '.$value))
+ if (! preg_match("/[^a-zA-Z0-9_]+/",$_REQUEST['varName']) && PMA_DBI_query('SET GLOBAL '.$_REQUEST['varName'].' = '.$value))
// Some values are rounded down etc.
$varValue = PMA_DBI_fetch_single_row('SHOW GLOBAL VARIABLES WHERE Variable_name="'.PMA_sqlAddslashes($_REQUEST['varName']).'";','NUM');
@@ -153,7 +153,7 @@ function formatVariable($name,$value) {
global $VARIABLE_DOC_LINKS;
if (is_numeric($value)) {
- if(isset($VARIABLE_DOC_LINKS[$name][3]) && $VARIABLE_DOC_LINKS[$name][3]=='byte')
+ if (isset($VARIABLE_DOC_LINKS[$name][3]) && $VARIABLE_DOC_LINKS[$name][3]=='byte')
return '<abbr title="'.PMA_formatNumber($value, 0).'">'.implode(' ',PMA_formatByteDown($value,3,3)).'</abbr>';
else return PMA_formatNumber($value, 0);
}
diff --git a/tbl_alter.php b/tbl_alter.php
index 316c48e..807a39e 100644
--- a/tbl_alter.php
+++ b/tbl_alter.php
@@ -130,7 +130,7 @@ if (isset($_REQUEST['do_save_data'])) {
}
}
- if( $GLOBALS['is_ajax_request'] == true) {
+ if ( $GLOBALS['is_ajax_request'] == true) {
$extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query);
PMA_ajaxResponse($message, $message->isSuccess(),$extra_data);
}
diff --git a/tbl_chart.php b/tbl_chart.php
index 96befa7..b3589e3 100644
--- a/tbl_chart.php
+++ b/tbl_chart.php
@@ -94,13 +94,13 @@ url_query = '<?php echo $url_query;?>';
<input type="text" name="chartTitle" value="<?php echo __('Chart title'); ?>">
<?php $keys = array_keys($data[0]);
$yaxis=-1;
- if(count($keys)>1) {
+ if (count($keys)>1) {
echo '<br>';
echo __('X-Axis:'); ?> <select name="chartXAxis">
<?php
foreach ($keys as $idx=>$key) {
- if($yaxis==-1 && ($idx==count($data[0])-1 || preg_match("/(date|time)/i",$key))) {
+ if ($yaxis==-1 && ($idx==count($data[0])-1 || preg_match("/(date|time)/i",$key))) {
echo '<option value="'.$idx.'" selected>'.$key.'</option>';
$yaxis=$idx;
} else {
diff --git a/tbl_create.php b/tbl_create.php
index 5259374..fb9c72f 100644
--- a/tbl_create.php
+++ b/tbl_create.php
@@ -216,7 +216,7 @@ if (isset($_REQUEST['do_save_data'])) {
$message = PMA_Message::success(__('Table %1$s has been created.'));
$message->addParam(PMA_backquote($db) . '.' . PMA_backquote($table));
- if($GLOBALS['is_ajax_request'] == true) {
+ if ($GLOBALS['is_ajax_request'] == true) {
/**
* construct the html for the newly created table's row to be appended
@@ -296,7 +296,7 @@ if (isset($_REQUEST['do_save_data'])) {
$new_table_string .= '<td> <dfn title="' . PMA_getCollationDescr($tbl_stats['Collation']) . '">'. $tbl_stats['Collation'] .'</dfn></td>' . "\n";
- if($is_show_stats) {
+ if ($is_show_stats) {
$new_table_string .= '<td class="value"> <a href="tbl_structure.php' . PMA_generate_common_url($tbl_url_params) . '#showusage" >' . $formatted_size . ' ' . $unit . '</a> </td>' . "\n" ;
$new_table_string .= '<td class="value">' . $overhead . '</td>' . "\n" ;
}
@@ -342,7 +342,7 @@ if (isset($_REQUEST['do_save_data'])) {
*/
// This div is used to show the content(eg: create table form with more columns) fetched with AJAX subsequently.
-if($GLOBALS['is_ajax_request'] != true) {
+if ($GLOBALS['is_ajax_request'] != true) {
echo('<div id="create_table_div">');
}
@@ -350,7 +350,7 @@ require './libraries/tbl_properties.inc.php';
// Displays the footer
require './libraries/footer.inc.php';
-if($GLOBALS['is_ajax_request'] != true) {
+if ($GLOBALS['is_ajax_request'] != true) {
echo('</div>');
}
?>
diff --git a/tbl_indexes.php b/tbl_indexes.php
index 39205f2..84555d8 100644
--- a/tbl_indexes.php
+++ b/tbl_indexes.php
@@ -98,7 +98,7 @@ if (isset($_REQUEST['do_save_data'])) {
$message = PMA_Message::success(__('Table %1$s has been altered successfully'));
$message->addParam($table);
- if( $GLOBALS['is_ajax_request'] == true) {
+ if ( $GLOBALS['is_ajax_request'] == true) {
$extra_data['index_table'] = PMA_Index::getView($table, $db);
$extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query);
PMA_ajaxResponse($message, $message->isSuccess(), $extra_data);
@@ -108,7 +108,7 @@ if (isset($_REQUEST['do_save_data'])) {
require './tbl_structure.php';
exit;
} else {
- if( $GLOBALS['is_ajax_request'] == true) {
+ if ( $GLOBALS['is_ajax_request'] == true) {
$extra_data['error'] = $error;
PMA_ajaxResponse($error,false);
}
diff --git a/tbl_operations.php b/tbl_operations.php
index 6cc913d..11021ba 100644
--- a/tbl_operations.php
+++ b/tbl_operations.php
@@ -70,14 +70,14 @@ $table_alters = array();
/**
* If the table has to be moved to some other database
*/
-if(isset($_REQUEST['submit_move']) || isset($_REQUEST['submit_copy'])) {
+if (isset($_REQUEST['submit_move']) || isset($_REQUEST['submit_copy'])) {
$_message = '';
require_once './tbl_move_copy.php';
}
/**
* If the table has to be maintained
*/
-if(isset($_REQUEST['table_maintenance'])) {
+if (isset($_REQUEST['table_maintenance'])) {
require_once './sql.php';
unset($result);
}
diff --git a/tbl_replace.php b/tbl_replace.php
index ab20d29..48d01fc 100644
--- a/tbl_replace.php
+++ b/tbl_replace.php
@@ -312,7 +312,7 @@ if ($is_insert && count($value_sets) > 0) {
// Note: logic passes here for inline edit
$message = PMA_Message::success(__('No change'));
$active_page = $goto_include;
- if(! $GLOBALS['is_ajax_request'] == true) {
+ if (! $GLOBALS['is_ajax_request'] == true) {
require_once './libraries/header.inc.php';
}
require './' . PMA_securePath($goto_include);
@@ -404,7 +404,7 @@ if (! empty($error_messages)) {
}
unset($error_messages, $warning_messages, $total_affected_rows, $last_messages, $last_message);
-if($GLOBALS['is_ajax_request'] == true) {
+if ($GLOBALS['is_ajax_request'] == true) {
/**Get the total row count of the table*/
$extra_data['row_count'] = PMA_Table::countRecords($_REQUEST['db'],$_REQUEST['table']);
$extra_data['sql_query'] = PMA_showMessage(NULL, $GLOBALS['display_query']);
diff --git a/tbl_structure.php b/tbl_structure.php
index 3cad9d8..afac23f 100644
--- a/tbl_structure.php
+++ b/tbl_structure.php
@@ -188,7 +188,7 @@ $i = 0;
<form method="post" action="tbl_structure.php" name="fieldsForm" id="fieldsForm" <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? ' class="ajax"' : '');?>>
<?php echo PMA_generate_common_hidden_inputs($db, $table);
echo '<input type="hidden" name="table_type" value=';
- if($db_is_information_schema) {
+ if ($db_is_information_schema) {
echo '"information_schema" />';
} else if ($tbl_is_view) {
echo '"view" />';
@@ -257,7 +257,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
// for the case ENUM('–','“')
$type = htmlspecialchars($type);
- if(strlen($type) > $GLOBALS['cfg']['LimitChars']) {
+ if (strlen($type) > $GLOBALS['cfg']['LimitChars']) {
$type = '<abbr title="' . $type . '">' . substr($type, 0, $GLOBALS['cfg']['LimitChars']) . '</abbr>';
}
@@ -504,8 +504,8 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
</div>
<div <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? ' class="action_primary"' : ''); ?>>
<?php
- if(isset($primary_enabled)) {
- if($primary_enabled) { ?>
+ if (isset($primary_enabled)) {
+ if ($primary_enabled) { ?>
<a href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ($primary ? ' DROP PRIMARY KEY,' : '') . ' ADD PRIMARY KEY(' . PMA_backquote($row['Field']) . ')'); ?>&message_to_show=<?php echo urlencode(sprintf(__('A primary key has been added on %s'), htmlspecialchars($row['Field']))); ?>">
<?php echo $hidden_titles['Primary']; ?>
</a>
@@ -517,8 +517,8 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
</div>
<div class="action_unique">
<?php
- if(isset($unique_enabled)) {
- if($unique_enabled) { ?>
+ if (isset($unique_enabled)) {
+ if ($unique_enabled) { ?>
<a href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' ADD UNIQUE(' . PMA_backquote($row['Field']) . ')'); ?>&message_to_show=<?php echo urlencode(sprintf(__('An index has been added on %s'), htmlspecialchars($row['Field']))); ?>">
<?php echo $hidden_titles['Unique']; ?>
</a>
@@ -530,8 +530,8 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
</div>
<div class="action_index">
<?php
- if(isset($index_enabled)) {
- if($index_enabled) { ?>
+ if (isset($index_enabled)) {
+ if ($index_enabled) { ?>
<a href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' ADD INDEX(' . PMA_backquote($row['Field']) . ')'); ?>&message_to_show=<?php echo urlencode(sprintf(__('An index has been added on %s'), htmlspecialchars($row['Field']))); ?>">
<?php echo $hidden_titles['Index']; ?>
</a>
@@ -543,8 +543,8 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
</div>
<div class="action_spatial">
<?php
- if(isset($spatial_enabled)) {
- if($spatial_enabled) { ?>
+ if (isset($spatial_enabled)) {
+ if ($spatial_enabled) { ?>
<a href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' ADD SPATIAL(' . PMA_backquote($row['Field']) . ')'); ?>&message_to_show=<?php echo urlencode(sprintf(__('An index has been added on %s'), htmlspecialchars($row['Field']))); ?>">
<?php echo $hidden_titles['Spatial']; ?>
</a>
@@ -556,8 +556,8 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
</div>
<div class="action_fulltext">
<?php
- if(isset($fulltext_enabled)) {
- if($fulltext_enabled) { ?>
+ if (isset($fulltext_enabled)) {
+ if ($fulltext_enabled) { ?>
<a href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' ADD FULLTEXT(' . PMA_backquote($row['Field']) . ')'); ?>&message_to_show=<?php echo urlencode(sprintf(__('An index has been added on %s'), htmlspecialchars($row['Field']))); ?>">
<?php echo $hidden_titles['IdxFulltext']; ?>
</a>
@@ -655,7 +655,7 @@ if (! $tbl_is_view && ! $db_is_information_schema) {
echo PMA_showMySQLDocu('Extending_MySQL', 'procedure_analyse') . "\n";
- if(PMA_Tracker::isActive())
+ if (PMA_Tracker::isActive())
{
echo '<a href="tbl_tracking.php?' . $url_query . '">';
diff --git a/tbl_tracking.php b/tbl_tracking.php
index edfc237..b249f4c 100644
--- a/tbl_tracking.php
+++ b/tbl_tracking.php
@@ -27,7 +27,7 @@ if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) {
}
if ($_REQUEST['logtype'] == 'schema') {
$selection_schema = true;
- } elseif($_REQUEST['logtype'] == 'data') {
+ } elseif ($_REQUEST['logtype'] == 'data') {
$selection_data = true;
} else {
$selection_both = true;
@@ -369,13 +369,13 @@ if (isset($_REQUEST['snapshot'])) {
*/
if (isset($_REQUEST['report']) && (isset($_REQUEST['delete_ddlog']) || isset($_REQUEST['delete_dmlog']))) {
- if(isset($_REQUEST['delete_ddlog'])){
+ if (isset($_REQUEST['delete_ddlog'])){
// Delete ddlog row data
$delete_id = $_REQUEST['delete_ddlog'];
// Only in case of valable id
- if($delete_id == (int)$delete_id){
+ if ($delete_id == (int)$delete_id){
unset($data['ddlog'][$delete_id]);
if (PMA_Tracker::changeTrackingData($_REQUEST['db'], $_REQUEST['table'], $_REQUEST['version'], 'DDL', $data['ddlog']))
@@ -386,13 +386,13 @@ if (isset($_REQUEST['report']) && (isset($_REQUEST['delete_ddlog']) || isset($_R
}
}
- if(isset($_REQUEST['delete_dmlog'])){
+ if (isset($_REQUEST['delete_dmlog'])){
// Delete dmlog row data
$delete_id = $_REQUEST['delete_dmlog'];
// Only in case of valable id
- if($delete_id == (int)$delete_id){
+ if ($delete_id == (int)$delete_id){
unset($data['dmlog'][$delete_id]);
if (PMA_Tracker::changeTrackingData($_REQUEST['db'], $_REQUEST['table'], $_REQUEST['version'], 'DML', $data['dmlog']))
diff --git a/user_password.php b/user_password.php
index a4eeffe..3ca3442 100644
--- a/user_password.php
+++ b/user_password.php
@@ -56,7 +56,7 @@ if (isset($_REQUEST['nopass'])) {
$password = $_REQUEST['pma_pw'];
}
- if($GLOBALS['is_ajax_request'] == true && $_error == true) {
+ if ($GLOBALS['is_ajax_request'] == true && $_error == true) {
/**
* If in an Ajax request, we don't need to show the rest of the page
*/
@@ -95,7 +95,7 @@ if (isset($_REQUEST['nopass'])) {
$message = PMA_Message::success(__('The profile has been updated.'));
- if($GLOBALS['is_ajax_request'] == true) {
+ if ($GLOBALS['is_ajax_request'] == true) {
$extra_data['sql_query'] = PMA_showMessage($message, $sql_query, 'success');
PMA_ajaxResponse($message, true, $extra_data);
}
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11675-g3629893
by Michal Čihař 22 Jul '11
by Michal Čihař 22 Jul '11
22 Jul '11
The branch, master has been updated
via 36298932e2a80bbd207b3b86475033f8b728a0b4 (commit)
from 84c6bd7284968789548b6ac53441774307ab13eb (commit)
- Log -----------------------------------------------------------------
commit 36298932e2a80bbd207b3b86475033f8b728a0b4
Author: Michal Čihař <mcihar(a)suse.cz>
Date: Fri Jul 22 09:07:57 2011 +0200
Spacing around if
-----------------------------------------------------------------------
Summary of changes:
sql.php | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/sql.php b/sql.php
index a954286..657311c 100644
--- a/sql.php
+++ b/sql.php
@@ -17,7 +17,7 @@ require_once './libraries/bookmark.lib.php';
$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js';
$GLOBALS['js_include'][] = 'tbl_change.js';
-if(isset($_SESSION['profiling'])) {
+if (isset($_SESSION['profiling'])) {
$GLOBALS['js_include'][] = 'highcharts/highcharts.js';
/* Files required for chart exporting */
$GLOBALS['js_include'][] = 'highcharts/exporting.js';
@@ -108,7 +108,7 @@ if (isset($_REQUEST['get_relational_values']) && $_REQUEST['get_relational_value
*
* Logic taken from libraries/display_tbl_lib.php
*/
-if(isset($_REQUEST['get_enum_values']) && $_REQUEST['get_enum_values'] == true) {
+if (isset($_REQUEST['get_enum_values']) && $_REQUEST['get_enum_values'] == true) {
$field_info_query = 'SHOW FIELDS FROM `' . $db . '`.`' . $table . '` LIKE \'' . $_REQUEST['column'] . '\' ;';
$field_info_result = PMA_DBI_fetch_result($field_info_query, null, null, null, PMA_DBI_QUERY_STORE);
@@ -120,7 +120,7 @@ if(isset($_REQUEST['get_enum_values']) && $_REQUEST['get_enum_values'] == true)
$dropdown = '<option value=""> </option>';
foreach ($values as $value) {
$dropdown .= '<option value="' . htmlspecialchars($value) . '"';
- if($value == $_REQUEST['curr_value']) {
+ if ($value == $_REQUEST['curr_value']) {
$dropdown .= ' selected="selected"';
}
$dropdown .= '>' . $value . '</option>';
@@ -135,7 +135,7 @@ if(isset($_REQUEST['get_enum_values']) && $_REQUEST['get_enum_values'] == true)
/**
* Find possible values for set fields during inline edit.
*/
-if(isset($_REQUEST['get_set_values']) && $_REQUEST['get_set_values'] == true) {
+if (isset($_REQUEST['get_set_values']) && $_REQUEST['get_set_values'] == true) {
$field_info_query = 'SHOW FIELDS FROM `' . $db . '`.`' . $table . '` LIKE \'' . $_REQUEST['column'] . '\' ;';
$field_info_result = PMA_DBI_fetch_result($field_info_query, null, null, null, PMA_DBI_QUERY_STORE);
@@ -148,7 +148,7 @@ if(isset($_REQUEST['get_set_values']) && $_REQUEST['get_set_values'] == true) {
$select = '';
foreach ($values as $value) {
$select .= '<option value="' . htmlspecialchars($value) . '"';
- if(in_array($value, $selected_values, true)) {
+ if (in_array($value, $selected_values, true)) {
$select .= ' selected="selected"';
}
$select .= '>' . $value . '</option>';
@@ -164,7 +164,7 @@ if(isset($_REQUEST['get_set_values']) && $_REQUEST['get_set_values'] == true) {
/**
* Check ajax request to set the column order
*/
-if(isset($_REQUEST['set_col_prefs']) && $_REQUEST['set_col_prefs'] == true) {
+if (isset($_REQUEST['set_col_prefs']) && $_REQUEST['set_col_prefs'] == true) {
$pmatable = new PMA_Table($table, $db);
// set column order
@@ -459,7 +459,7 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) {
// If a stored procedure was called, there may be more results that are
// queued up and waiting to be flushed from the buffer. So let's do that.
while (true) {
- if(! PMA_DBI_more_results()) {
+ if (! PMA_DBI_more_results()) {
break;
}
PMA_DBI_next_result();
@@ -478,7 +478,7 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) {
$active_page = $goto;
$message = PMA_Message::rawError($error);
- if( $GLOBALS['is_ajax_request'] == true) {
+ if ($GLOBALS['is_ajax_request'] == true) {
PMA_ajaxResponse($message, false);
}
@@ -693,7 +693,7 @@ if (0 == $num_rows || $is_affected) {
$message->addMessage(')');
}
- if( $GLOBALS['is_ajax_request'] == true) {
+ if ($GLOBALS['is_ajax_request'] == true) {
/**
* If we are in inline editing, we need to process the relational and
@@ -703,7 +703,7 @@ if (0 == $num_rows || $is_affected) {
* Logic taken from libraries/display_tbl.lib.php
*/
- if(isset($_REQUEST['rel_fields_list']) && $_REQUEST['rel_fields_list'] != '') {
+ if (isset($_REQUEST['rel_fields_list']) && $_REQUEST['rel_fields_list'] != '') {
//handle relations work here for updated row.
require_once './libraries/relation.lib.php';
@@ -767,7 +767,7 @@ if (0 == $num_rows || $is_affected) {
}
}
- if(isset($_REQUEST['do_transformations']) && $_REQUEST['do_transformations'] == true ) {
+ if (isset($_REQUEST['do_transformations']) && $_REQUEST['do_transformations'] == true ) {
require_once './libraries/transformations.lib.php';
//if some posted fields need to be transformed, generate them here.
$mime_map = PMA_getMIME($db, $table);
@@ -859,7 +859,7 @@ if (0 == $num_rows || $is_affected) {
else {
//If we are retrieving the full value of a truncated field or the original
// value of a transformed field, show it here and exit
- if( $GLOBALS['inline_edit'] == true && $GLOBALS['cfg']['AjaxEnable']) {
+ if ($GLOBALS['inline_edit'] == true && $GLOBALS['cfg']['AjaxEnable']) {
$row = PMA_DBI_fetch_row($result);
$extra_data = array();
$extra_data['value'] = $row[0];
@@ -880,7 +880,7 @@ else {
unset($message);
- if( ! $GLOBALS['is_ajax_request'] || ! $GLOBALS['cfg']['AjaxEnable']) {
+ if (! $GLOBALS['is_ajax_request'] || ! $GLOBALS['cfg']['AjaxEnable']) {
if (strlen($table)) {
require './libraries/tbl_common.php';
$url_query .= '&goto=tbl_sql.php&back=tbl_sql.php';
@@ -912,7 +912,7 @@ else {
$fields_cnt = count($fields_meta);
}
- if( ! $GLOBALS['is_ajax_request']) {
+ if (! $GLOBALS['is_ajax_request']) {
//begin the sqlqueryresults div here. container div
echo '<div id="sqlqueryresults"';
if ($GLOBALS['cfg']['AjaxEnable']) {
@@ -1054,7 +1054,7 @@ window.onload = function()
<?php
} // end print case
- if( $GLOBALS['is_ajax_request'] != true) {
+ if ($GLOBALS['is_ajax_request'] != true) {
echo '</div>'; // end sqlqueryresults div
}
} // end rows returned
@@ -1062,7 +1062,7 @@ window.onload = function()
/**
* Displays the footer
*/
-if(! isset($_REQUEST['table_maintenance'])) {
+if (! isset($_REQUEST['table_maintenance'])) {
require './libraries/footer.inc.php';
}
?>
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11674-g84c6bd7
by Michal Čihař 22 Jul '11
by Michal Čihař 22 Jul '11
22 Jul '11
The branch, master has been updated
via 84c6bd7284968789548b6ac53441774307ab13eb (commit)
via 12a31298bde7487b6306c87a737f32d8f715f4d2 (commit)
via 297bd675cc24299a0ea782829a54f3bdde60b92b (commit)
via 7b17fca511b15e59cc6bce44c349909a358b813c (commit)
via ea918f98ffa7c7d8e0a78897e6b105c5bba5aa80 (commit)
from e501b557de386e6bc1e789126285452a1725bf20 (commit)
- Log -----------------------------------------------------------------
commit 84c6bd7284968789548b6ac53441774307ab13eb
Author: Michal Čihař <mcihar(a)suse.cz>
Date: Fri Jul 22 09:06:37 2011 +0200
Fix indentation
commit 12a31298bde7487b6306c87a737f32d8f715f4d2
Author: Michal Čihař <mcihar(a)suse.cz>
Date: Fri Jul 22 09:05:25 2011 +0200
Spacing around if
commit 297bd675cc24299a0ea782829a54f3bdde60b92b
Author: Michal Čihař <mcihar(a)suse.cz>
Date: Fri Jul 22 09:02:04 2011 +0200
Wrap long line
commit 7b17fca511b15e59cc6bce44c349909a358b813c
Author: Michal Čihař <mcihar(a)suse.cz>
Date: Fri Jul 22 09:01:40 2011 +0200
Add die() calls are on places which should not happen
commit ea918f98ffa7c7d8e0a78897e6b105c5bba5aa80
Author: Michal Čihař <mcihar(a)suse.cz>
Date: Fri Jul 22 08:59:07 2011 +0200
Add file comment
-----------------------------------------------------------------------
Summary of changes:
export.php | 332 ++++++++++++++++++++++++++++++------------------------------
1 files changed, 168 insertions(+), 164 deletions(-)
diff --git a/export.php b/export.php
index f5a985a..36c1d58 100644
--- a/export.php
+++ b/export.php
@@ -1,7 +1,7 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
- * @todo too much die here, or?
+ * Main export hanling code
* @package phpMyAdmin
*/
@@ -15,7 +15,11 @@ require_once './libraries/plugin_interface.lib.php';
PMA_checkParameters(array('what', 'export_type'));
// Scan plugins
-$export_list = PMA_getPlugins('./libraries/export/', array('export_type' => $export_type, 'single_table' => isset($single_table)));
+$export_list = PMA_getPlugins(
+ './libraries/export/',
+ array(
+ 'export_type' => $export_type,
+ 'single_table' => isset($single_table)));
// Backward compatbility
$type = $what;
@@ -43,7 +47,7 @@ $save_on_server = false;
$buffer_needed = false;
// Is it a quick or custom export?
-if($_REQUEST['quick_or_custom'] == 'quick') {
+if ($_REQUEST['quick_or_custom'] == 'quick') {
$quick_export = true;
} else {
$quick_export = false;
@@ -58,7 +62,7 @@ if ($_REQUEST['output_format'] == 'astext') {
$buffer_needed = true;
}
if (($quick_export && !empty($_REQUEST['quick_export_onserver'])) || (!$quick_export && !empty($_REQUEST['onserver']))) {
- if($quick_export) {
+ if ($quick_export) {
$onserver = $_REQUEST['quick_export_onserver'];
} else {
$onserver = $_REQUEST['onserver'];
@@ -279,7 +283,7 @@ if ($asfile) {
$extension_start_pos = strlen($filename) - strlen($export_list[$type]['extension']) - 1;
$user_extension = substr($filename, $extension_start_pos, strlen($filename));
$required_extension = "." . $export_list[$type]['extension'];
- if(strtolower($user_extension) != $required_extension) {
+ if (strtolower($user_extension) != $required_extension) {
$filename .= $required_extension;
}
$mime_type = $export_list[$type]['mime_type'];
@@ -394,9 +398,9 @@ if (!$save_on_server) {
}
// Convert the multiple select elements from an array to a string
- if($export_type == 'server' && isset($_REQUEST['db_select'])) {
+ if ($export_type == 'server' && isset($_REQUEST['db_select'])) {
$_REQUEST['db_select'] = implode(",", $_REQUEST['db_select']);
- } elseif($export_type == 'database' && isset($_REQUEST['table_select'])) {
+ } elseif ($export_type == 'database' && isset($_REQUEST['table_select'])) {
$_REQUEST['table_select'] = implode(",", $_REQUEST['table_select']);
}
@@ -419,123 +423,182 @@ if (!$save_on_server) {
// need exceptions here :-)
do {
-// Add possibly some comments to export
-if (!PMA_exportHeader()) {
- break;
-}
-
-// Will we need relation & co. setup?
-$do_relation = isset($GLOBALS[$what . '_relation']);
-$do_comments = isset($GLOBALS[$what . '_include_comments']);
-$do_mime = isset($GLOBALS[$what . '_mime']);
-if ($do_relation || $do_comments || $do_mime) {
- $cfgRelation = PMA_getRelationsParam();
-}
-if ($do_mime) {
- require_once './libraries/transformations.lib.php';
-}
-
-// Include dates in export?
-$do_dates = isset($GLOBALS[$what . '_dates']);
+ // Add possibly some comments to export
+ if (!PMA_exportHeader()) {
+ break;
+ }
-/**
- * Builds the dump
- */
-// Gets the number of tables if a dump of a database has been required
-if ($export_type == 'server') {
- if (isset($db_select)) {
- $tmp_select = implode($db_select, '|');
- $tmp_select = '|' . $tmp_select . '|';
+ // Will we need relation & co. setup?
+ $do_relation = isset($GLOBALS[$what . '_relation']);
+ $do_comments = isset($GLOBALS[$what . '_include_comments']);
+ $do_mime = isset($GLOBALS[$what . '_mime']);
+ if ($do_relation || $do_comments || $do_mime) {
+ $cfgRelation = PMA_getRelationsParam();
}
- // Walk over databases
- foreach ($GLOBALS['pma']->databases as $current_db) {
- if ((isset($tmp_select) && strpos(' ' . $tmp_select, '|' . $current_db . '|'))
- || ! isset($tmp_select)) {
- if (!PMA_exportDBHeader($current_db)) {
- break 2;
- }
- if (!PMA_exportDBCreate($current_db)) {
- break 2;
- }
- if (function_exists('PMA_exportRoutines') && strpos($GLOBALS['sql_structure_or_data'], 'structure') !== false && isset($GLOBALS['sql_procedure_function'])) {
- PMA_exportRoutines($current_db);
- }
+ if ($do_mime) {
+ require_once './libraries/transformations.lib.php';
+ }
+
+ // Include dates in export?
+ $do_dates = isset($GLOBALS[$what . '_dates']);
- $tables = PMA_DBI_get_tables($current_db);
- $views = array();
- foreach ($tables as $table) {
- // if this is a view, collect it for later; views must be exported
- // after the tables
- $is_view = PMA_Table::isView($current_db, $table);
- if ($is_view) {
- $views[] = $table;
+ /**
+ * Builds the dump
+ */
+ // Gets the number of tables if a dump of a database has been required
+ if ($export_type == 'server') {
+ if (isset($db_select)) {
+ $tmp_select = implode($db_select, '|');
+ $tmp_select = '|' . $tmp_select . '|';
+ }
+ // Walk over databases
+ foreach ($GLOBALS['pma']->databases as $current_db) {
+ if ((isset($tmp_select) && strpos(' ' . $tmp_select, '|' . $current_db . '|'))
+ || ! isset($tmp_select)) {
+ if (!PMA_exportDBHeader($current_db)) {
+ break 2;
}
- if ($GLOBALS[$what . '_structure_or_data'] == 'structure' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') {
- // for a view, export a stand-in definition of the table
- // to resolve view dependencies
- if (!PMA_exportStructure($current_db, $table, $crlf, $err_url, $do_relation, $do_comments, $do_mime, $do_dates, $is_view ? 'stand_in' : 'create_table', $export_type)) {
- break 3;
- }
+ if (!PMA_exportDBCreate($current_db)) {
+ break 2;
}
- // if this is a view or a merge table, don't export data
- if (($GLOBALS[$what . '_structure_or_data'] == 'data' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') && !($is_view || PMA_Table::isMerge($current_db, $table))) {
- $local_query = 'SELECT * FROM ' . PMA_backquote($current_db) . '.' . PMA_backquote($table);
- if (!PMA_exportData($current_db, $table, $crlf, $err_url, $local_query)) {
- break 3;
+ if (function_exists('PMA_exportRoutines') && strpos($GLOBALS['sql_structure_or_data'], 'structure') !== false && isset($GLOBALS['sql_procedure_function'])) {
+ PMA_exportRoutines($current_db);
+ }
+
+ $tables = PMA_DBI_get_tables($current_db);
+ $views = array();
+ foreach ($tables as $table) {
+ // if this is a view, collect it for later; views must be exported
+ // after the tables
+ $is_view = PMA_Table::isView($current_db, $table);
+ if ($is_view) {
+ $views[] = $table;
+ }
+ if ($GLOBALS[$what . '_structure_or_data'] == 'structure' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') {
+ // for a view, export a stand-in definition of the table
+ // to resolve view dependencies
+ if (!PMA_exportStructure($current_db, $table, $crlf, $err_url, $do_relation, $do_comments, $do_mime, $do_dates, $is_view ? 'stand_in' : 'create_table', $export_type)) {
+ break 3;
+ }
+ }
+ // if this is a view or a merge table, don't export data
+ if (($GLOBALS[$what . '_structure_or_data'] == 'data' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') && !($is_view || PMA_Table::isMerge($current_db, $table))) {
+ $local_query = 'SELECT * FROM ' . PMA_backquote($current_db) . '.' . PMA_backquote($table);
+ if (!PMA_exportData($current_db, $table, $crlf, $err_url, $local_query)) {
+ break 3;
+ }
+ }
+ // now export the triggers (needs to be done after the data because
+ // triggers can modify already imported tables)
+ if ($GLOBALS[$what . '_structure_or_data'] == 'structure' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') {
+ if (!PMA_exportStructure($current_db, $table, $crlf, $err_url, $do_relation, $do_comments, $do_mime, $do_dates, 'triggers', $export_type)) {
+ break 2;
+ }
}
}
- // now export the triggers (needs to be done after the data because
- // triggers can modify already imported tables)
- if ($GLOBALS[$what . '_structure_or_data'] == 'structure' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') {
- if (!PMA_exportStructure($current_db, $table, $crlf, $err_url, $do_relation, $do_comments, $do_mime, $do_dates, 'triggers', $export_type)) {
- break 2;
+ foreach ($views as $view) {
+ // no data export for a view
+ if ($GLOBALS[$what . '_structure_or_data'] == 'structure' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') {
+ if (!PMA_exportStructure($current_db, $view, $crlf, $err_url, $do_relation, $do_comments, $do_mime, $do_dates, 'create_view', $export_type)) {
+ break 3;
+ }
}
}
+ if (!PMA_exportDBFooter($current_db)) {
+ break 2;
+ }
}
- foreach ($views as $view) {
- // no data export for a view
- if ($GLOBALS[$what . '_structure_or_data'] == 'structure' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') {
- if (!PMA_exportStructure($current_db, $view, $crlf, $err_url, $do_relation, $do_comments, $do_mime, $do_dates, 'create_view', $export_type)) {
- break 3;
- }
+ }
+ } elseif ($export_type == 'database') {
+ if (!PMA_exportDBHeader($db)) {
+ break;
+ }
+
+ if (function_exists('PMA_exportRoutines') && strpos($GLOBALS['sql_structure_or_data'], 'structure') !== false && isset($GLOBALS['sql_procedure_function'])) {
+ PMA_exportRoutines($db);
+ }
+
+ $i = 0;
+ $views = array();
+ // $tables contains the choices from the user (via $table_select)
+ foreach ($tables as $table) {
+ // if this is a view, collect it for later; views must be exported after
+ // the tables
+ $is_view = PMA_Table::isView($db, $table);
+ if ($is_view) {
+ $views[] = $table;
+ }
+ if ($GLOBALS[$what . '_structure_or_data'] == 'structure' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') {
+ // for a view, export a stand-in definition of the table
+ // to resolve view dependencies
+ if (!PMA_exportStructure($db, $table, $crlf, $err_url, $do_relation, $do_comments, $do_mime, $do_dates, $is_view ? 'stand_in' : 'create_table', $export_type)) {
+ break 2;
}
}
- if (!PMA_exportDBFooter($current_db)) {
- break 2;
+ // if this is a view or a merge table, don't export data
+ if (($GLOBALS[$what . '_structure_or_data'] == 'data' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') && !($is_view || PMA_Table::isMerge($db, $table))) {
+ $local_query = 'SELECT * FROM ' . PMA_backquote($db) . '.' . PMA_backquote($table);
+ if (!PMA_exportData($db, $table, $crlf, $err_url, $local_query)) {
+ break 2;
+ }
+ }
+ // now export the triggers (needs to be done after the data because
+ // triggers can modify already imported tables)
+ if ($GLOBALS[$what . '_structure_or_data'] == 'structure' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') {
+ if (!PMA_exportStructure($db, $table, $crlf, $err_url, $do_relation, $do_comments, $do_mime, $do_dates, 'triggers', $export_type)) {
+ break 2;
+ }
+ }
+ }
+ foreach ($views as $view) {
+ // no data export for a view
+ if ($GLOBALS[$what . '_structure_or_data'] == 'structure' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') {
+ if (!PMA_exportStructure($db, $view, $crlf, $err_url, $do_relation, $do_comments, $do_mime, $do_dates, 'create_view', $export_type)) {
+ break 2;
+ }
}
}
- }
-} elseif ($export_type == 'database') {
- if (!PMA_exportDBHeader($db)) {
- break;
- }
- if (function_exists('PMA_exportRoutines') && strpos($GLOBALS['sql_structure_or_data'], 'structure') !== false && isset($GLOBALS['sql_procedure_function'])) {
- PMA_exportRoutines($db);
- }
+ if (!PMA_exportDBFooter($db)) {
+ break;
+ }
+ } else {
+ if (!PMA_exportDBHeader($db)) {
+ break;
+ }
+ // We export just one table
+ // $allrows comes from the form when "Dump all rows" has been selected
+ if ($allrows == '0' && $limit_to > 0 && $limit_from >= 0) {
+ $add_query = ' LIMIT '
+ . (($limit_from > 0) ? $limit_from . ', ' : '')
+ . $limit_to;
+ } else {
+ $add_query = '';
+ }
- $i = 0;
- $views = array();
- // $tables contains the choices from the user (via $table_select)
- foreach ($tables as $table) {
- // if this is a view, collect it for later; views must be exported after
- // the tables
$is_view = PMA_Table::isView($db, $table);
- if ($is_view) {
- $views[] = $table;
- }
if ($GLOBALS[$what . '_structure_or_data'] == 'structure' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') {
- // for a view, export a stand-in definition of the table
- // to resolve view dependencies
- if (!PMA_exportStructure($db, $table, $crlf, $err_url, $do_relation, $do_comments, $do_mime, $do_dates, $is_view ? 'stand_in' : 'create_table', $export_type)) {
- break 2;
+ if (!PMA_exportStructure($db, $table, $crlf, $err_url, $do_relation, $do_comments, $do_mime, $do_dates, $is_view ? 'create_view' : 'create_table', $export_type)) {
+ break;
}
}
- // if this is a view or a merge table, don't export data
- if (($GLOBALS[$what . '_structure_or_data'] == 'data' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') && !($is_view || PMA_Table::isMerge($db, $table))) {
- $local_query = 'SELECT * FROM ' . PMA_backquote($db) . '.' . PMA_backquote($table);
+ // If this is an export of a single view, we have to export data;
+ // for example, a PDF report
+ // if it is a merge table, no data is exported
+ if (($GLOBALS[$what . '_structure_or_data'] == 'data' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') && ! PMA_Table::isMerge($db, $table)) {
+ if (!empty($sql_query)) {
+ // only preg_replace if needed
+ if (!empty($add_query)) {
+ // remove trailing semicolon before adding a LIMIT
+ $sql_query = preg_replace('%;\s*$%', '', $sql_query);
+ }
+ $local_query = $sql_query . $add_query;
+ PMA_DBI_select_db($db);
+ } else {
+ $local_query = 'SELECT * FROM ' . PMA_backquote($db) . '.' . PMA_backquote($table) . $add_query;
+ }
if (!PMA_exportData($db, $table, $crlf, $err_url, $local_query)) {
- break 2;
+ break;
}
}
// now export the triggers (needs to be done after the data because
@@ -545,72 +608,13 @@ if ($export_type == 'server') {
break 2;
}
}
- }
- foreach ($views as $view) {
- // no data export for a view
- if ($GLOBALS[$what . '_structure_or_data'] == 'structure' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') {
- if (!PMA_exportStructure($db, $view, $crlf, $err_url, $do_relation, $do_comments, $do_mime, $do_dates, 'create_view', $export_type)) {
- break 2;
- }
- }
- }
-
- if (!PMA_exportDBFooter($db)) {
- break;
- }
-} else {
- if (!PMA_exportDBHeader($db)) {
- break;
- }
- // We export just one table
- // $allrows comes from the form when "Dump all rows" has been selected
- if ($allrows == '0' && $limit_to > 0 && $limit_from >= 0) {
- $add_query = ' LIMIT '
- . (($limit_from > 0) ? $limit_from . ', ' : '')
- . $limit_to;
- } else {
- $add_query = '';
- }
-
- $is_view = PMA_Table::isView($db, $table);
- if ($GLOBALS[$what . '_structure_or_data'] == 'structure' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') {
- if (!PMA_exportStructure($db, $table, $crlf, $err_url, $do_relation, $do_comments, $do_mime, $do_dates, $is_view ? 'create_view' : 'create_table', $export_type)) {
+ if (!PMA_exportDBFooter($db)) {
break;
}
}
- // If this is an export of a single view, we have to export data;
- // for example, a PDF report
- // if it is a merge table, no data is exported
- if (($GLOBALS[$what . '_structure_or_data'] == 'data' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') && ! PMA_Table::isMerge($db, $table)) {
- if (!empty($sql_query)) {
- // only preg_replace if needed
- if (!empty($add_query)) {
- // remove trailing semicolon before adding a LIMIT
- $sql_query = preg_replace('%;\s*$%', '', $sql_query);
- }
- $local_query = $sql_query . $add_query;
- PMA_DBI_select_db($db);
- } else {
- $local_query = 'SELECT * FROM ' . PMA_backquote($db) . '.' . PMA_backquote($table) . $add_query;
- }
- if (!PMA_exportData($db, $table, $crlf, $err_url, $local_query)) {
- break;
- }
- }
- // now export the triggers (needs to be done after the data because
- // triggers can modify already imported tables)
- if ($GLOBALS[$what . '_structure_or_data'] == 'structure' || $GLOBALS[$what . '_structure_or_data'] == 'structure_and_data') {
- if (!PMA_exportStructure($db, $table, $crlf, $err_url, $do_relation, $do_comments, $do_mime, $do_dates, 'triggers', $export_type)) {
- break 2;
- }
- }
- if (!PMA_exportDBFooter($db)) {
+ if (!PMA_exportFooter()) {
break;
}
-}
-if (!PMA_exportFooter()) {
- break;
-}
} while (false);
// End of fake loop
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11669-ge501b55
by Michal Čihař 22 Jul '11
by Michal Čihař 22 Jul '11
22 Jul '11
The branch, master has been updated
via e501b557de386e6bc1e789126285452a1725bf20 (commit)
from 1b57acfa8b7fb11ec63c474e848069a9bde2b07a (commit)
- Log -----------------------------------------------------------------
commit e501b557de386e6bc1e789126285452a1725bf20
Author: Michal Čihař <mcihar(a)suse.cz>
Date: Fri Jul 22 08:56:51 2011 +0200
Wrap long lines
-----------------------------------------------------------------------
Summary of changes:
server_privileges.php | 145 +++++++++++++++++++++++++++++++++++++++----------
1 files changed, 116 insertions(+), 29 deletions(-)
diff --git a/server_privileges.php b/server_privileges.php
index a184682..e2f19a9 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -186,37 +186,124 @@ function PMA_rangeOfUsers($initial = '')
function PMA_extractPrivInfo($row = '', $enableHTML = false)
{
$grants = array(
- array('Select_priv', 'SELECT', __('Allows reading data.')),
- array('Insert_priv', 'INSERT', __('Allows inserting and replacing data.')),
- array('Update_priv', 'UPDATE', __('Allows changing data.')),
- array('Delete_priv', 'DELETE', __('Allows deleting data.')),
- array('Create_priv', 'CREATE', __('Allows creating new databases and tables.')),
- array('Drop_priv', 'DROP', __('Allows dropping databases and tables.')),
- array('Reload_priv', 'RELOAD', __('Allows reloading server settings and flushing the server\'s caches.')),
- array('Shutdown_priv', 'SHUTDOWN', __('Allows shutting down the server.')),
- array('Process_priv', 'PROCESS', __('Allows viewing processes of all users')),
- array('File_priv', 'FILE', __('Allows importing data from and exporting data into files.')),
- array('References_priv', 'REFERENCES', __('Has no effect in this MySQL version.')),
- array('Index_priv', 'INDEX', __('Allows creating and dropping indexes.')),
- array('Alter_priv', 'ALTER', __('Allows altering the structure of existing tables.')),
- array('Show_db_priv', 'SHOW DATABASES', __('Gives access to the complete list of databases.')),
- array('Super_priv', 'SUPER', __('Allows connecting, even if maximum number of connections is reached; required for most administrative operations like setting global variables or killing threads of other users.')),
- array('Create_tmp_table_priv', 'CREATE TEMPORARY TABLES', __('Allows creating temporary tables.')),
- array('Lock_tables_priv', 'LOCK TABLES', __('Allows locking tables for the current thread.')),
- array('Repl_slave_priv', 'REPLICATION SLAVE', __('Needed for the replication slaves.')),
- array('Repl_client_priv', 'REPLICATION CLIENT', __('Allows the user to ask where the slaves / masters are.')),
- array('Create_view_priv', 'CREATE VIEW', __('Allows creating new views.')),
- array('Event_priv', 'EVENT', __('Allows to set up events for the event scheduler')),
- array('Trigger_priv', 'TRIGGER', __('Allows creating and dropping triggers')),
+ array(
+ 'Select_priv',
+ 'SELECT',
+ __('Allows reading data.')),
+ array(
+ 'Insert_priv',
+ 'INSERT',
+ __('Allows inserting and replacing data.')),
+ array(
+ 'Update_priv',
+ 'UPDATE',
+ __('Allows changing data.')),
+ array(
+ 'Delete_priv',
+ 'DELETE',
+ __('Allows deleting data.')),
+ array(
+ 'Create_priv',
+ 'CREATE',
+ __('Allows creating new databases and tables.')),
+ array(
+ 'Drop_priv',
+ 'DROP',
+ __('Allows dropping databases and tables.')),
+ array(
+ 'Reload_priv',
+ 'RELOAD',
+ __('Allows reloading server settings and flushing the server\'s caches.')),
+ array(
+ 'Shutdown_priv',
+ 'SHUTDOWN',
+ __('Allows shutting down the server.')),
+ array(
+ 'Process_priv',
+ 'PROCESS',
+ __('Allows viewing processes of all users')),
+ array(
+ 'File_priv',
+ 'FILE',
+ __('Allows importing data from and exporting data into files.')),
+ array(
+ 'References_priv',
+ 'REFERENCES',
+ __('Has no effect in this MySQL version.')),
+ array(
+ 'Index_priv',
+ 'INDEX',
+ __('Allows creating and dropping indexes.')),
+ array(
+ 'Alter_priv',
+ 'ALTER',
+ __('Allows altering the structure of existing tables.')),
+ array(
+ 'Show_db_priv',
+ 'SHOW DATABASES',
+ __('Gives access to the complete list of databases.')),
+ array(
+ 'Super_priv',
+ 'SUPER',
+ __('Allows connecting, even if maximum number of connections is reached; required for most administrative operations like setting global variables or killing threads of other users.')),
+ array(
+ 'Create_tmp_table_priv',
+ 'CREATE TEMPORARY TABLES',
+ __('Allows creating temporary tables.')),
+ array(
+ 'Lock_tables_priv',
+ 'LOCK TABLES',
+ __('Allows locking tables for the current thread.')),
+ array(
+ 'Repl_slave_priv',
+ 'REPLICATION SLAVE',
+ __('Needed for the replication slaves.')),
+ array(
+ 'Repl_client_priv',
+ 'REPLICATION CLIENT',
+ __('Allows the user to ask where the slaves / masters are.')),
+ array(
+ 'Create_view_priv',
+ 'CREATE VIEW',
+ __('Allows creating new views.')),
+ array(
+ 'Event_priv',
+ 'EVENT',
+ __('Allows to set up events for the event scheduler')),
+ array(
+ 'Trigger_priv',
+ 'TRIGGER',
+ __('Allows creating and dropping triggers')),
// for table privs:
- array('Create View_priv', 'CREATE VIEW', __('Allows creating new views.')),
- array('Show_view_priv', 'SHOW VIEW', __('Allows performing SHOW CREATE VIEW queries.')),
+ array(
+ 'Create View_priv',
+ 'CREATE VIEW',
+ __('Allows creating new views.')),
+ array(
+ 'Show_view_priv',
+ 'SHOW VIEW',
+ __('Allows performing SHOW CREATE VIEW queries.')),
// for table privs:
- array('Show view_priv', 'SHOW VIEW', __('Allows performing SHOW CREATE VIEW queries.')),
- array('Create_routine_priv', 'CREATE ROUTINE', __('Allows creating stored routines.')),
- array('Alter_routine_priv', 'ALTER ROUTINE', __('Allows altering and dropping stored routines.')),
- array('Create_user_priv', 'CREATE USER', __('Allows creating, dropping and renaming user accounts.')),
- array('Execute_priv', 'EXECUTE', __('Allows executing stored routines.')),
+ array(
+ 'Show view_priv',
+ 'SHOW VIEW',
+ __('Allows performing SHOW CREATE VIEW queries.')),
+ array(
+ 'Create_routine_priv',
+ 'CREATE ROUTINE',
+ __('Allows creating stored routines.')),
+ array(
+ 'Alter_routine_priv',
+ 'ALTER ROUTINE',
+ __('Allows altering and dropping stored routines.')),
+ array(
+ 'Create_user_priv',
+ 'CREATE USER',
+ __('Allows creating, dropping and renaming user accounts.')),
+ array(
+ 'Execute_priv',
+ 'EXECUTE',
+ __('Allows executing stored routines.')),
);
if (!empty($row) && isset($row['Table_priv'])) {
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11668-g1b57acf
by Michal Čihař 22 Jul '11
by Michal Čihař 22 Jul '11
22 Jul '11
The branch, master has been updated
via 1b57acfa8b7fb11ec63c474e848069a9bde2b07a (commit)
from ce07c5c78a9a14288455cae6a239f0698e7d3dd9 (commit)
- Log -----------------------------------------------------------------
commit 1b57acfa8b7fb11ec63c474e848069a9bde2b07a
Author: Michal Čihař <mcihar(a)suse.cz>
Date: Fri Jul 22 08:53:03 2011 +0200
Remove unused parameter of PMA_wildcardEscapeForGrant and document others
-----------------------------------------------------------------------
Summary of changes:
server_privileges.php | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/server_privileges.php b/server_privileges.php
index 7433c46..a184682 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -134,12 +134,11 @@ $random_n = mt_rand(0,1000000); // a random number that will be appended to the
* no escaping (for example test_db) but in mysql.db you'll see test\_db
* for a db-specific privilege.
*
- * @param string $db_and_table
- * @param string $dbname
- * @param string $tablename
- * @return string the escaped (if necessary) $db_and_table
+ * @param string $dbname Database name
+ * @param string $tablename Table name
+ * @return string the escaped (if necessary) database.table
*/
-function PMA_wildcardEscapeForGrant($db_and_table, $dbname, $tablename) {
+function PMA_wildcardEscapeForGrant($dbname, $tablename) {
if (! strlen($dbname)) {
$db_and_table = '*.*';
@@ -1106,7 +1105,7 @@ if (isset($_REQUEST['change_copy'])) {
* Updates privileges
*/
if (!empty($update_privs)) {
- $db_and_table = PMA_wildcardEscapeForGrant($db_and_table, $dbname, (isset($tablename) ? $tablename : ''));
+ $db_and_table = PMA_wildcardEscapeForGrant($dbname, (isset($tablename) ? $tablename : ''));
$sql_query0 =
'REVOKE ALL PRIVILEGES ON ' . $db_and_table
@@ -1182,7 +1181,7 @@ if (!empty($update_privs)) {
* Revokes Privileges
*/
if (isset($_REQUEST['revokeall'])) {
- $db_and_table = PMA_wildcardEscapeForGrant($db_and_table, $dbname, isset($tablename) ? $tablename : '');
+ $db_and_table = PMA_wildcardEscapeForGrant($dbname, isset($tablename) ? $tablename : '');
$sql_query0 =
'REVOKE ALL PRIVILEGES ON ' . $db_and_table
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11667-gce07c5c
by Michal Čihař 22 Jul '11
by Michal Čihař 22 Jul '11
22 Jul '11
The branch, master has been updated
via ce07c5c78a9a14288455cae6a239f0698e7d3dd9 (commit)
via cf9809fff227507c64b8a28ec3e97c3e3319b801 (commit)
via bafa992f31dafdc2ce17b68928465fd63845f351 (commit)
via 858cd15383d4b88dbd50c90e8d3f3f5a9ac6d758 (commit)
via 7162fce5ead846dc1a8337becf19b344fc00e088 (commit)
via 977490b5bc2bb1149abff63d2d7f703116dfee1d (commit)
via 5b3e3cc657f440050a9d7738416d720ef9f73d30 (commit)
via fd7be23610bf895df5ccd1147996ac2fa87fc589 (commit)
via bbc3c860d30015bf64c0ccd82b7185a640915b07 (commit)
via b20fcf6c6976c2fd837f690df03a9d8d33234d25 (commit)
via 6c1b0d90cc273171129fca542f0daeb63def47e8 (commit)
via 70e466581342c8a5b15fa37d2a67e26e9225eb1f (commit)
via 75723a8c4c29792a5e39b57020facc6360ae74da (commit)
via 754b4c2b36319b0ea5236fb7db3e128256180d1c (commit)
via d4919655248b6b4fddf194aef694cfa217921aba (commit)
via 280241b6fcf38525d20ded946a5a9da8c39cd152 (commit)
via b832412665e825da7aff272715d0995855307808 (commit)
via 4249e1f8afabd6903e0c5268b284820628cd6be8 (commit)
via b4594e9a927c25d3d9d6e8dbdb234c3d825754ad (commit)
via 2cc67a386309656ea8675c74965fb42181dc4fab (commit)
via 30fac6d4a3632c80c8324f5ca07ca7339a4ab327 (commit)
via aa72bcf550ecc68fd8972127b4c86da0e7d1fae4 (commit)
via c018bcdc1f54f3a02e782f384f1a129734f849cf (commit)
via 311a048fd50d8ed30fbfc80315063277a79abe1f (commit)
via 4e7684b8a85fcbac382bc2f54848d8e1b8d87dff (commit)
via 43897a7b34158c933c2c93c48a107a7bf3e3d185 (commit)
via d98a2794c7f0b2bb461d00c2536208bd78f4846d (commit)
via 9996c86e7117218c4b0d8f376430fc3c53eec828 (commit)
via 5c757aa9b562b8f942c137a71945c5243db24da0 (commit)
via e4bce6c06c04fe4629ab89adb3da557b77d154c5 (commit)
via 677823224ecd43d78c069f4b49f1d7eff0157b5f (commit)
via d3e2dd5986876c321dceeea25009a20700f3ac57 (commit)
via 67460570fa0879f488e3008fc6dbc94454e085f6 (commit)
via 0d84178ce911b441561565c1cb647149c60f9eb1 (commit)
via 97765b2640673844b68dc231ef4266cf1277d197 (commit)
via a53838e4cc7117d3694589df29f9f68c1a53b248 (commit)
via 61800e25d1aa4175de97bbf59f9205ae82083eb1 (commit)
via 065d918598f0953903c9593c3ac091dc6f3830b8 (commit)
via fdfea2e1f6b9f37ab0abd8f07ad2b9721cbf441d (commit)
via 9ca62ba2ba10a45a7fe39d4662c9e35813ab2bf9 (commit)
via 5ddaa806268d1bc6db7c23f6e93a602c26ad5c27 (commit)
via 2386d68522fb1b7f88378a6f0253bfe62e0b57f8 (commit)
via 196f1e43ae240a8ba0a57376d83682f93d943829 (commit)
via dc975b239711d02e77531fc6e27e3a72738e8ce5 (commit)
via ebe85f2b6680f68eb3a0e5ff617c6c80416a0a4a (commit)
via 2ae978b7f4eac75d36d0fdf7fb152ff9c9e6f00c (commit)
via 6ad94579cd687495c80a47c3fc05ca569e2deaf1 (commit)
via 7900e345371d6b1f4a53e51a1a5c4e42f398f07d (commit)
via 4f02bebaf443d4f3953e344dfe4393a7a59a9f2c (commit)
via 047ca78b80740e1dd20de2a69516cf9bf7d2a59d (commit)
via 8b279115898e9fe98c09ecb0ec3d4924e711da51 (commit)
via 8f5ee2a45b3b67f875484e85ac7fdadfedce9e7e (commit)
via ea77dea7c0f8a672c01f0eeca9a3269a0592ae80 (commit)
via 76e18d875c4f9dbbc7a17e2f689dd856861ca595 (commit)
via 35270a3069907209769c0e599e57e6916e893d84 (commit)
via c46aeccbe8df4208c6755733d92a8df5d32eb825 (commit)
via 7d9eccdbf0dbef35757f2faf2bd717d11f6c35d3 (commit)
via beaf7c72d07514796f58a2fe2a15a517d863aee7 (commit)
via cd962d92ef596056f613a83f02c561c45fbf5866 (commit)
via 0ccf47fe2b66990ca29375dcc0f0f67cfc053a93 (commit)
via 055ae91fc5b1c31c414c7f0c92cc765ad577e243 (commit)
via f8afedb0948aae9d46e7016de83050bfa3b8c0ff (commit)
via 75161a0cea2738265448cbacbe707d8f20101b68 (commit)
via 77ab0becd872a51b3ab9adc461cf0d259ecd4c24 (commit)
via d667c4f3564ec335a84e96312c85ef0009acbf20 (commit)
via c7113139d65ce1649e9c35df6780f12a19398a7b (commit)
via 95e55276841950fc607c12898f1986bb5bc260e1 (commit)
via 749cee0f795a2b3be0e6cd8101c4b5e64211ac39 (commit)
via 2460fce11ef75600d6b78cb4b166424594ef12d3 (commit)
via 6bd662fbc7784dafb84ee14344327e04d9f77b22 (commit)
via aa6e4548ab32b0dc6efc1ffb6d38bb68cf2f61b9 (commit)
via 930818e004cd14afa6bdbbfb4905df1bd6acc9a3 (commit)
via b39c71fbecd44863833c08ad07c88c97ce003c1d (commit)
via 99bab35e7adfb90634e19384e4044be4c7af6dd3 (commit)
via 4953344f52fe1244e00e00e69cf08c57d4c12d4f (commit)
via d2f507892cbd3ef5f8a311b20d46e729005d1b4a (commit)
via 1eecab4f736ac626ba22b49a353a1f9b64a9788d (commit)
via 0a115497c5eb57d6226b8d959bd92a67cb604262 (commit)
via 7f73cd6481adb8855f012b80913219548b1bec54 (commit)
via 859878a73c1330d21ceceb444a24bca7f1efe973 (commit)
via 3aecd9a07f5bd11d8f1c2d819c5210268007b6ec (commit)
via 24466d933176e63b3b46976b250e3541f0d0f6a4 (commit)
via b9b9da0fa86d3b8bde25e72ef4f80cd435781900 (commit)
via 89f28c3039b469169051695a04cc5e13191ef49f (commit)
via bc13a792dfe61e9292f7f5fe1d388cb64ef626b2 (commit)
via 28ca6452919f896910e71914c7f0600b3a0b0a0a (commit)
via 85ceb133ee9cc3bf7066399f235c84d9372b44b0 (commit)
via 5af63f899abfb777f7219867dcb0e9aa43d9d57a (commit)
via 0933b9a7888ff623d2b410b6a7196ab746c02b74 (commit)
via e65663b153f14b3686f773850da30ce183af0c6a (commit)
via f57020d066a8c6bcddda6c508077168ed1564242 (commit)
via 4fdd19fd087f2a0ba935580464755f0c1f584f9e (commit)
via 370ad6ae674b8307744777866fb8f91589232397 (commit)
via ba8584f406d4a6258c44cf3f104ca97324fc62c9 (commit)
via fda72b0582976f145aa2c6033ed2d002a1977688 (commit)
via 9fac9aea63eb91edd653f9e788af7ed1f8553aa9 (commit)
via 0a9ebc0dbdf97feeb0f0cb14c906c956cdf8798a (commit)
via c1b5f59f8f0fe2c09a6d02dcd6288c15d4f3b6e3 (commit)
via 7dc709162e315dbfc98c0318950f818315e42ca2 (commit)
via cc024883c889ee5f5f62eb38a73c483c52657cbf (commit)
via 40444b9531a958b1f0eb53ada009ba139bfac457 (commit)
via 7cf4c326c349c4338bde21755134dc914771d171 (commit)
via 2288b22fd86ec256f9199faa07474822090a6303 (commit)
via f429b8a4bac4a72163013d5909b3e22608309bfa (commit)
via 361f856de2debed1b799ad52237f4e7dc14df336 (commit)
via 1df32d61e75bc94d51f2ac946b93e28779fea53a (commit)
via cac09a355eaf5e8008e462b4c2296a15fd5780f2 (commit)
via 9149ca92909a295104f6847c0191ed32cd37a1e6 (commit)
via 1eedbb7911d8afde1d243c40583430072aed31f1 (commit)
via f82530b65f340e49f014bc9b7faeba4fa8f291ce (commit)
via 5bd6b1271712ad188c36798a66de9f2a26344d0d (commit)
via e5e58ab1f95d60c416b6b2af92e9ca47ebcd0c02 (commit)
via 05ef90d7f65f9e070bd882eb238ddf46703f11b4 (commit)
via c38f25bcb26e32e2993b77134252e69b327e03aa (commit)
via 5c46612c2d896b49a972ca01f190cbb1ff426fcb (commit)
via 60fd574c3f2e6f0a5175157d9a94c432263956ff (commit)
via bbd8695fbfb4eba81dd74e0854408b8cb723166e (commit)
via dce9270c2f54ef33c77c59998b1a8d0fdad5f5e9 (commit)
via 4d8ba818e620f16bb73da1432ca6b555b6d813a4 (commit)
via 507b8b0b453c6e8734e8c87ae7e0a478a0429c05 (commit)
via 9aab5bba0fdc9ca8d8bd06924750ced688282764 (commit)
via a6b6f2820e94c08fc62a7b4bd2c35f5a325f6248 (commit)
via dd6cd76d0c6d605b3126011334eddf393cee3d0a (commit)
via 5aa3b295476c8b823d2360e4693e1b9849ff906d (commit)
via 63db64eaaffd5a4b924dd90235349335dbb4c089 (commit)
via 9fd87dd1ead2d8bc80960b699e16e71e8dea2055 (commit)
via 013fdff416de1aa5f2582ec89901b876388f691f (commit)
via 22104f78f53e8d4350af1dbd322a0c00dcd7138a (commit)
via fbcb93d6e171d591401087449223823b5e798aaa (commit)
via 57813543968a1d4d09a92a651f55de5616756edc (commit)
via 2833faaa6e287ebb6d761d6dd8c3a444ed089e54 (commit)
via 152a14bf51c9df625954cf4a314f9e96ea4b5c58 (commit)
via 2f71a814e7a62310002c90740a17f90a2540457d (commit)
via f4fa0c6e3650b1bc099e9bd2807bc9e5791e8b5c (commit)
via 7619993c1fedb16d19524bc70426f18cfb8a14bf (commit)
via ab96857c710b2066f3e87f919a25df27c8b01a26 (commit)
via 191ea287982e80175a4803755b550568c6e17f62 (commit)
via f3ea72df09cdc069ad914272e693291b7fcefd38 (commit)
via 79cf95a4c2336749d4b8a8af9b8c0c44f599bfbf (commit)
via 29d491e4bf4f35b8cdc68a9163e7f46b1b5d8f90 (commit)
via bd36c8513b21c59db9a6d3f9ba71423e63631192 (commit)
via a2de40da12e006c89c5c361560fd030cf2ab3f59 (commit)
via 8b753684e73bac2f9766ea103f65b299bfdd5347 (commit)
via 8642a81c07d27c695b49793b2d762370c1518fe8 (commit)
via 51f09bd0793a977daea37b6e9645fb948be762cf (commit)
via 5fd3864b86536000e8e798ea11d314bb0209d9b1 (commit)
via 7b0669ce07c6b445983eb6c4a97654b0b05f32b8 (commit)
via bd58d4bdf458178b3a54a9d3907c4f270635d061 (commit)
via 23faf4c0e9f7c06788571c0b8a9a8ba104a9e755 (commit)
via acf5b81c3f9334a48ec68c0c6cbeace008ed4c15 (commit)
via b8404db6f63bcdddd3993fa9932cace43c0ad2e2 (commit)
via bb2390d06f39d2d92335a458dae8d7bd1b1531c6 (commit)
via 627ceda3909f9616aa0d6f54e6852815e7a87218 (commit)
via 78b844f23aeae0d32160ab269eb6edd0274c1902 (commit)
via f3875830acffd7a132a586f5408ff8e81d463348 (commit)
via 0afb96375de582c07a3049cac866c9ff1a29587f (commit)
via 71ad77b1d8637bd15a3e8729edf2336cd1153fb8 (commit)
via 719cfb060d1e882a63710c9e3ef47206f1c9dd65 (commit)
via ab4d7b79f2b983a66de236ad19f124607e245867 (commit)
via 547106c9a341c12ae3e68c1f72f31240a1cc8c07 (commit)
via 7f127a29d37236de9d26ca5a22cd2e3f454264cf (commit)
via b69bf2422fd4f295bfdfeb91a90cbb1565ded171 (commit)
via 9683da06335aae0d1426ac45bb0fc3512c8fb979 (commit)
via 01a013f7b7ff32f897a94607e052c8e0cde87c0d (commit)
via 711a6a4068215f070b0037b25069d2f3d466011e (commit)
via fc8edd52bfe51806cad438ab683415919eedb2f9 (commit)
via ec296c85003a0c663518de0911cb559f7b857d38 (commit)
via f5750cdaced6610a4b578f9a2e0374e49f444a77 (commit)
via 2fc06fac19976749658bf403f617df46d2f37a26 (commit)
via e5bfa46356bd01af129fa3360647e0d83fc87286 (commit)
via 2b48de8eb285f8b445c7a5bf062feecc2f4319a9 (commit)
via b35c3029fbf7db9ec0bfc0db3a04d8767f4a3087 (commit)
via e36b7e653f634f6eb51faa9a12f3f9b8ba514a0d (commit)
via bef8f483ebe37ba3d007daca9fbe234cf94cacb6 (commit)
via 4f987af72b8a242ca5f8c285fc2d3a9bf8055deb (commit)
via f40092c46c2c91f3afdc530bcc4956c1c71aafe4 (commit)
via 8e250398309b686546450e84e8d9ee86701c2e4f (commit)
via 29944782ecf34c2d8f546793187107e2819161fd (commit)
via 9c94eab446f43c52a7887ea733a672135e5c2ee3 (commit)
via dc36ca8add6898c117ecc5e3419c33e54ab567f1 (commit)
via 74deb265b5ec97c27edf91bd8b3f79b5e51f78de (commit)
via 057039e6c1a954808a3c04b250d0341cb600aa49 (commit)
via 813262d8beb2a205b59d6430b0b5adeb40fb0d68 (commit)
via 9b975e8cc4a3ed8f7caae770cfeb371da7ec6c12 (commit)
via 48ad4d47b87599403763e91d5ae2735c1492d5cb (commit)
via 5d0a05af7ca95d2483896f4bb6d9c8b49348d46e (commit)
via d3bab9f885b4366e84a7b53fb99ad863e8cb78d7 (commit)
via 4dd0e64fcd400b8a028b71951e8d7af47c547930 (commit)
via 6205b0f0c10d983b72889530f52e81037cbe7707 (commit)
via 96d52af71caf023358b126a665d44715f949172b (commit)
via 8bbd92e2c256888a71a5b22e1e405e3443359df5 (commit)
via f7f5c8af219cd1fbfea86ae58a2edd43128be5c8 (commit)
via 2618f396f0e1dca2498eb83d6b4da6b256783022 (commit)
via bbc79efccaab3e5f210117e4c7ccd017a9609760 (commit)
via c93455d4363461904f4afac5bb8615687808b3ef (commit)
via 1d634f896b37c61501edf44ba85e7e0e99e632d6 (commit)
via 731521708b854d84d7a48a18b5c3d127af799764 (commit)
via ad0a3447c55583f600cb20a4f5a91b669e3b227f (commit)
via a16e4b1f41e3659ec0ca81c6d24d73b9307266c3 (commit)
via 6745a0f0bd3f9b073f0653acbabbbfa5cf5f4f98 (commit)
via 1f418406efbceb768630748a8ad62d9bb58cb2a1 (commit)
via ba600eab547e2d1478fd74414be7c6c63803f415 (commit)
via 13acbb1a2ac553f1a86ba4acb92c1aadffdf96af (commit)
via a7b1f51be1bd15685b7193e3be84b857089cc919 (commit)
via 3e8633dd102ca384daf0b3bea590583d26ce2559 (commit)
via 0a16250f2385c5886851de0e8719c67441d92d5c (commit)
via e4a89276c3bec47432f3ce1af65b3e37cc9d21b7 (commit)
via 202082763679f699c5f87099b4149288a8f2890b (commit)
via 94855e82e225212b127ab2fdf130e65449845eb8 (commit)
via 7f3df10199800b852c96c10e23170aa5d6e54f18 (commit)
via c28bdc00261c80fd7c8c6121a7078a7d99305fdf (commit)
via 46ba2638e5eeadb0537aeeeda306dd96091599b1 (commit)
via d4eb139a0357b2f97c5332c4bb58fc45ab8627c6 (commit)
via cdafa4226248ab7844df1490cd45ca14f8abdd67 (commit)
via aab9f5b5d6aee48c95fee74557be9e1b5b52006b (commit)
via 8f23e52a6a20a7cb0856520ad40f8f6e824166c1 (commit)
via 8d028ede6f12065afa97a8470d833af94e493233 (commit)
via 0fc5d1e110cbce8360f84fef775f8f09d55d36c1 (commit)
via 335c9da64cf885614fb4c936b26a4188e059a586 (commit)
via c885f46802ddde10a81a912a5970e97a721b150f (commit)
via e4d01ae3bd81d410e7023cc754d32b40c42119ff (commit)
via 7be50e05260f7179845033fe9774b22c5e9eb59e (commit)
via 8be2f739175d0845c603eabaf741ae08c56feb33 (commit)
via 9798fcf1d67f7a72cd96f7154cb13926779b41df (commit)
via 23e94878201d20ba6b3b29ac6844940fd883cee4 (commit)
via 901d8ffeb8dc9bbd1aee241347127bb6a5e6ea35 (commit)
via 1ecdb0147668fed7ce8216edc932423c025699a9 (commit)
via c735682b06918f5fe7b6089a22082a159d9f66cf (commit)
via 211d44448afda9b8171ddd9ed36c08e4ed88e5b3 (commit)
via df5be06f2314919369fae4d80f1a0e47729d0275 (commit)
via 7cb9e047cdf41c12ee355ff0d18e22398b86d597 (commit)
via 0a8feaf83917139fd735607e82368a734dbbe2a1 (commit)
via 69987aa24bd93a32bca2f10f3d5fd1daebd0dd69 (commit)
via a3927eba05a986fafb7fd935e48df96726912678 (commit)
via 6d9494db226b1c5a65f4ccd6d22d2f4989222da1 (commit)
via 910235509fc54fb3fad3b8d00bb5ac354773bcb1 (commit)
via 4628ab162e46537f1c3b99c74ae9b016cf7a21b1 (commit)
via 1218d27a0f0a4cdba84aae469cc80026999ee447 (commit)
via 905beb5cd3087ea174ea5361c9ecf2ee20d5285e (commit)
via 020c69ba4023b66fc7d2b63c9772416680c4c420 (commit)
via c6cdb6fe386232eff79ff29b87883450f0a7ddda (commit)
via d268eaba82e7acedd8a8385718155c1905dc30da (commit)
via 6ea1abe25c352c976749483f40303eb8f3968e5f (commit)
via be1a2a75cb505bb7836e7876ddd1245c57220343 (commit)
via 569b8c1099f79a91799f08975ec85db35d550994 (commit)
from 49b2ca984a6c38fa7b49aeff3f1344d837cf5834 (commit)
- Log -----------------------------------------------------------------
commit ce07c5c78a9a14288455cae6a239f0698e7d3dd9
Author: Michal Čihař <michal(a)cihar.com>
Date: Fri Jul 22 07:24:58 2011 +0200
Fix format string
commit cf9809fff227507c64b8a28ec3e97c3e3319b801
Merge: bafa992f31dafdc2ce17b68928465fd63845f351 49b2ca984a6c38fa7b49aeff3f1344d837cf5834
Author: Pootle server <pootle(a)cihar.com>
Date: Thu Jul 21 22:40:16 2011 +0200
Merge remote-tracking branch 'origin/master'
commit bafa992f31dafdc2ce17b68928465fd63845f351
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Jul 21 20:44:09 2011 +0200
Translation update done using Pootle.
commit 858cd15383d4b88dbd50c90e8d3f3f5a9ac6d758
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Jul 21 20:41:43 2011 +0200
Translation update done using Pootle.
commit 7162fce5ead846dc1a8337becf19b344fc00e088
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Jul 21 20:41:28 2011 +0200
Translation update done using Pootle.
commit 977490b5bc2bb1149abff63d2d7f703116dfee1d
Merge: 5b3e3cc657f440050a9d7738416d720ef9f73d30 4925260d959d8bd7194b912ddd1317c71f7cc42b
Author: Pootle server <pootle(a)cihar.com>
Date: Thu Jul 21 20:40:14 2011 +0200
Merge remote-tracking branch 'origin/master'
commit 5b3e3cc657f440050a9d7738416d720ef9f73d30
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Jul 21 20:17:25 2011 +0200
Translation update done using Pootle.
commit fd7be23610bf895df5ccd1147996ac2fa87fc589
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Jul 21 20:16:55 2011 +0200
Translation update done using Pootle.
commit bbc3c860d30015bf64c0ccd82b7185a640915b07
Author: Domen <dbc334(a)gmail.com>
Date: Thu Jul 21 19:45:06 2011 +0200
Translation update done using Pootle.
commit b20fcf6c6976c2fd837f690df03a9d8d33234d25
Author: Domen <dbc334(a)gmail.com>
Date: Thu Jul 21 19:39:40 2011 +0200
Translation update done using Pootle.
commit 6c1b0d90cc273171129fca542f0daeb63def47e8
Author: Domen <dbc334(a)gmail.com>
Date: Thu Jul 21 19:37:46 2011 +0200
Translation update done using Pootle.
commit 70e466581342c8a5b15fa37d2a67e26e9225eb1f
Author: Domen <dbc334(a)gmail.com>
Date: Thu Jul 21 19:37:05 2011 +0200
Translation update done using Pootle.
commit 75723a8c4c29792a5e39b57020facc6360ae74da
Author: Domen <dbc334(a)gmail.com>
Date: Thu Jul 21 19:36:50 2011 +0200
Translation update done using Pootle.
commit 754b4c2b36319b0ea5236fb7db3e128256180d1c
Author: Domen <dbc334(a)gmail.com>
Date: Thu Jul 21 19:36:37 2011 +0200
Translation update done using Pootle.
commit d4919655248b6b4fddf194aef694cfa217921aba
Author: Domen <dbc334(a)gmail.com>
Date: Thu Jul 21 19:36:22 2011 +0200
Translation update done using Pootle.
commit 280241b6fcf38525d20ded946a5a9da8c39cd152
Author: Domen <dbc334(a)gmail.com>
Date: Thu Jul 21 19:36:12 2011 +0200
Translation update done using Pootle.
commit b832412665e825da7aff272715d0995855307808
Author: Domen <dbc334(a)gmail.com>
Date: Thu Jul 21 19:36:04 2011 +0200
Translation update done using Pootle.
commit 4249e1f8afabd6903e0c5268b284820628cd6be8
Author: Domen <dbc334(a)gmail.com>
Date: Thu Jul 21 19:35:52 2011 +0200
Translation update done using Pootle.
commit b4594e9a927c25d3d9d6e8dbdb234c3d825754ad
Author: Domen <dbc334(a)gmail.com>
Date: Thu Jul 21 19:34:59 2011 +0200
Translation update done using Pootle.
commit 2cc67a386309656ea8675c74965fb42181dc4fab
Author: Domen <dbc334(a)gmail.com>
Date: Thu Jul 21 19:32:59 2011 +0200
Translation update done using Pootle.
commit 30fac6d4a3632c80c8324f5ca07ca7339a4ab327
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Jul 21 19:27:46 2011 +0200
Translation update done using Pootle.
commit aa72bcf550ecc68fd8972127b4c86da0e7d1fae4
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Jul 21 19:27:20 2011 +0200
Translation update done using Pootle.
commit c018bcdc1f54f3a02e782f384f1a129734f849cf
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Jul 21 19:26:06 2011 +0200
Translation update done using Pootle.
commit 311a048fd50d8ed30fbfc80315063277a79abe1f
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Jul 21 19:25:38 2011 +0200
Translation update done using Pootle.
commit 4e7684b8a85fcbac382bc2f54848d8e1b8d87dff
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 19:12:30 2011 +0200
Translation update done using Pootle.
commit 43897a7b34158c933c2c93c48a107a7bf3e3d185
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 19:12:25 2011 +0200
Translation update done using Pootle.
commit d98a2794c7f0b2bb461d00c2536208bd78f4846d
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 19:12:14 2011 +0200
Translation update done using Pootle.
commit 9996c86e7117218c4b0d8f376430fc3c53eec828
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 19:12:08 2011 +0200
Translation update done using Pootle.
commit 5c757aa9b562b8f942c137a71945c5243db24da0
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 19:11:50 2011 +0200
Translation update done using Pootle.
commit e4bce6c06c04fe4629ab89adb3da557b77d154c5
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 19:11:35 2011 +0200
Translation update done using Pootle.
commit 677823224ecd43d78c069f4b49f1d7eff0157b5f
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 19:11:12 2011 +0200
Translation update done using Pootle.
commit d3e2dd5986876c321dceeea25009a20700f3ac57
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 19:10:21 2011 +0200
Translation update done using Pootle.
commit 67460570fa0879f488e3008fc6dbc94454e085f6
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 19:10:09 2011 +0200
Translation update done using Pootle.
commit 0d84178ce911b441561565c1cb647149c60f9eb1
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 19:09:55 2011 +0200
Translation update done using Pootle.
commit 97765b2640673844b68dc231ef4266cf1277d197
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 19:09:43 2011 +0200
Translation update done using Pootle.
commit a53838e4cc7117d3694589df29f9f68c1a53b248
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 19:09:30 2011 +0200
Translation update done using Pootle.
commit 61800e25d1aa4175de97bbf59f9205ae82083eb1
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 19:09:10 2011 +0200
Translation update done using Pootle.
commit 065d918598f0953903c9593c3ac091dc6f3830b8
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 19:08:08 2011 +0200
Translation update done using Pootle.
commit fdfea2e1f6b9f37ab0abd8f07ad2b9721cbf441d
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 19:07:43 2011 +0200
Translation update done using Pootle.
commit 9ca62ba2ba10a45a7fe39d4662c9e35813ab2bf9
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 19:07:31 2011 +0200
Translation update done using Pootle.
commit 5ddaa806268d1bc6db7c23f6e93a602c26ad5c27
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 19:07:18 2011 +0200
Translation update done using Pootle.
commit 2386d68522fb1b7f88378a6f0253bfe62e0b57f8
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 19:06:51 2011 +0200
Translation update done using Pootle.
commit 196f1e43ae240a8ba0a57376d83682f93d943829
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 19:06:38 2011 +0200
Translation update done using Pootle.
commit dc975b239711d02e77531fc6e27e3a72738e8ce5
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 19:06:30 2011 +0200
Translation update done using Pootle.
commit ebe85f2b6680f68eb3a0e5ff617c6c80416a0a4a
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 19:05:56 2011 +0200
Translation update done using Pootle.
commit 2ae978b7f4eac75d36d0fdf7fb152ff9c9e6f00c
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Jul 21 19:05:36 2011 +0200
Translation update done using Pootle.
commit 6ad94579cd687495c80a47c3fc05ca569e2deaf1
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 19:05:29 2011 +0200
Translation update done using Pootle.
commit 7900e345371d6b1f4a53e51a1a5c4e42f398f07d
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Jul 21 19:05:15 2011 +0200
Translation update done using Pootle.
commit 4f02bebaf443d4f3953e344dfe4393a7a59a9f2c
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 19:04:56 2011 +0200
Translation update done using Pootle.
commit 047ca78b80740e1dd20de2a69516cf9bf7d2a59d
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Jul 21 19:04:43 2011 +0200
Translation update done using Pootle.
commit 8b279115898e9fe98c09ecb0ec3d4924e711da51
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 19:04:01 2011 +0200
Translation update done using Pootle.
commit 8f5ee2a45b3b67f875484e85ac7fdadfedce9e7e
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 19:03:48 2011 +0200
Translation update done using Pootle.
commit ea77dea7c0f8a672c01f0eeca9a3269a0592ae80
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:59:14 2011 +0200
Translation update done using Pootle.
commit 76e18d875c4f9dbbc7a17e2f689dd856861ca595
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:58:11 2011 +0200
Translation update done using Pootle.
commit 35270a3069907209769c0e599e57e6916e893d84
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:57:51 2011 +0200
Translation update done using Pootle.
commit c46aeccbe8df4208c6755733d92a8df5d32eb825
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:56:41 2011 +0200
Translation update done using Pootle.
commit 7d9eccdbf0dbef35757f2faf2bd717d11f6c35d3
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:56:29 2011 +0200
Translation update done using Pootle.
commit beaf7c72d07514796f58a2fe2a15a517d863aee7
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:56:18 2011 +0200
Translation update done using Pootle.
commit cd962d92ef596056f613a83f02c561c45fbf5866
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:55:29 2011 +0200
Translation update done using Pootle.
commit 0ccf47fe2b66990ca29375dcc0f0f67cfc053a93
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:55:19 2011 +0200
Translation update done using Pootle.
commit 055ae91fc5b1c31c414c7f0c92cc765ad577e243
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:54:59 2011 +0200
Translation update done using Pootle.
commit f8afedb0948aae9d46e7016de83050bfa3b8c0ff
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:54:39 2011 +0200
Translation update done using Pootle.
commit 75161a0cea2738265448cbacbe707d8f20101b68
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:50:24 2011 +0200
Translation update done using Pootle.
commit 77ab0becd872a51b3ab9adc461cf0d259ecd4c24
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:49:23 2011 +0200
Translation update done using Pootle.
commit d667c4f3564ec335a84e96312c85ef0009acbf20
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:48:31 2011 +0200
Translation update done using Pootle.
commit c7113139d65ce1649e9c35df6780f12a19398a7b
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:46:34 2011 +0200
Translation update done using Pootle.
commit 95e55276841950fc607c12898f1986bb5bc260e1
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:45:30 2011 +0200
Translation update done using Pootle.
commit 749cee0f795a2b3be0e6cd8101c4b5e64211ac39
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:45:02 2011 +0200
Translation update done using Pootle.
commit 2460fce11ef75600d6b78cb4b166424594ef12d3
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:43:24 2011 +0200
Translation update done using Pootle.
commit 6bd662fbc7784dafb84ee14344327e04d9f77b22
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:43:11 2011 +0200
Translation update done using Pootle.
commit aa6e4548ab32b0dc6efc1ffb6d38bb68cf2f61b9
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:42:48 2011 +0200
Translation update done using Pootle.
commit 930818e004cd14afa6bdbbfb4905df1bd6acc9a3
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:42:38 2011 +0200
Translation update done using Pootle.
commit b39c71fbecd44863833c08ad07c88c97ce003c1d
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:42:23 2011 +0200
Translation update done using Pootle.
commit 99bab35e7adfb90634e19384e4044be4c7af6dd3
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:42:08 2011 +0200
Translation update done using Pootle.
commit 4953344f52fe1244e00e00e69cf08c57d4c12d4f
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:42:03 2011 +0200
Translation update done using Pootle.
commit d2f507892cbd3ef5f8a311b20d46e729005d1b4a
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:41:22 2011 +0200
Translation update done using Pootle.
commit 1eecab4f736ac626ba22b49a353a1f9b64a9788d
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:40:48 2011 +0200
Translation update done using Pootle.
commit 0a115497c5eb57d6226b8d959bd92a67cb604262
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:40:16 2011 +0200
Translation update done using Pootle.
commit 7f73cd6481adb8855f012b80913219548b1bec54
Merge: 859878a73c1330d21ceceb444a24bca7f1efe973 e62d62fa124328df9d22f4d1e794148325e8d207
Author: Pootle server <pootle(a)cihar.com>
Date: Thu Jul 21 18:40:15 2011 +0200
Merge remote-tracking branch 'origin/master'
commit 859878a73c1330d21ceceb444a24bca7f1efe973
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:39:05 2011 +0200
Translation update done using Pootle.
commit 3aecd9a07f5bd11d8f1c2d819c5210268007b6ec
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:38:35 2011 +0200
Translation update done using Pootle.
commit 24466d933176e63b3b46976b250e3541f0d0f6a4
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:37:50 2011 +0200
Translation update done using Pootle.
commit b9b9da0fa86d3b8bde25e72ef4f80cd435781900
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:37:12 2011 +0200
Translation update done using Pootle.
commit 89f28c3039b469169051695a04cc5e13191ef49f
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:32:48 2011 +0200
Translation update done using Pootle.
commit bc13a792dfe61e9292f7f5fe1d388cb64ef626b2
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:31:49 2011 +0200
Translation update done using Pootle.
commit 28ca6452919f896910e71914c7f0600b3a0b0a0a
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:30:39 2011 +0200
Translation update done using Pootle.
commit 85ceb133ee9cc3bf7066399f235c84d9372b44b0
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:30:24 2011 +0200
Translation update done using Pootle.
commit 5af63f899abfb777f7219867dcb0e9aa43d9d57a
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Jul 21 18:30:13 2011 +0200
Translation update done using Pootle.
commit 0933b9a7888ff623d2b410b6a7196ab746c02b74
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:29:28 2011 +0200
Translation update done using Pootle.
commit e65663b153f14b3686f773850da30ce183af0c6a
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:29:17 2011 +0200
Translation update done using Pootle.
commit f57020d066a8c6bcddda6c508077168ed1564242
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:29:04 2011 +0200
Translation update done using Pootle.
commit 4fdd19fd087f2a0ba935580464755f0c1f584f9e
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:28:53 2011 +0200
Translation update done using Pootle.
commit 370ad6ae674b8307744777866fb8f91589232397
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:28:37 2011 +0200
Translation update done using Pootle.
commit ba8584f406d4a6258c44cf3f104ca97324fc62c9
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:28:15 2011 +0200
Translation update done using Pootle.
commit fda72b0582976f145aa2c6033ed2d002a1977688
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:27:39 2011 +0200
Translation update done using Pootle.
commit 9fac9aea63eb91edd653f9e788af7ed1f8553aa9
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:27:28 2011 +0200
Translation update done using Pootle.
commit 0a9ebc0dbdf97feeb0f0cb14c906c956cdf8798a
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:27:11 2011 +0200
Translation update done using Pootle.
commit c1b5f59f8f0fe2c09a6d02dcd6288c15d4f3b6e3
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:26:47 2011 +0200
Translation update done using Pootle.
commit 7dc709162e315dbfc98c0318950f818315e42ca2
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:26:07 2011 +0200
Translation update done using Pootle.
commit cc024883c889ee5f5f62eb38a73c483c52657cbf
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:25:56 2011 +0200
Translation update done using Pootle.
commit 40444b9531a958b1f0eb53ada009ba139bfac457
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:25:41 2011 +0200
Translation update done using Pootle.
commit 7cf4c326c349c4338bde21755134dc914771d171
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:25:22 2011 +0200
Translation update done using Pootle.
commit 2288b22fd86ec256f9199faa07474822090a6303
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:25:03 2011 +0200
Translation update done using Pootle.
commit f429b8a4bac4a72163013d5909b3e22608309bfa
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:23:44 2011 +0200
Translation update done using Pootle.
commit 361f856de2debed1b799ad52237f4e7dc14df336
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:23:35 2011 +0200
Translation update done using Pootle.
commit 1df32d61e75bc94d51f2ac946b93e28779fea53a
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:23:13 2011 +0200
Translation update done using Pootle.
commit cac09a355eaf5e8008e462b4c2296a15fd5780f2
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:22:48 2011 +0200
Translation update done using Pootle.
commit 9149ca92909a295104f6847c0191ed32cd37a1e6
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:22:31 2011 +0200
Translation update done using Pootle.
commit 1eedbb7911d8afde1d243c40583430072aed31f1
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:21:42 2011 +0200
Translation update done using Pootle.
commit f82530b65f340e49f014bc9b7faeba4fa8f291ce
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:21:28 2011 +0200
Translation update done using Pootle.
commit 5bd6b1271712ad188c36798a66de9f2a26344d0d
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:21:17 2011 +0200
Translation update done using Pootle.
commit e5e58ab1f95d60c416b6b2af92e9ca47ebcd0c02
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:20:23 2011 +0200
Translation update done using Pootle.
commit 05ef90d7f65f9e070bd882eb238ddf46703f11b4
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:20:12 2011 +0200
Translation update done using Pootle.
commit c38f25bcb26e32e2993b77134252e69b327e03aa
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:19:55 2011 +0200
Translation update done using Pootle.
commit 5c46612c2d896b49a972ca01f190cbb1ff426fcb
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:19:33 2011 +0200
Translation update done using Pootle.
commit 60fd574c3f2e6f0a5175157d9a94c432263956ff
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:18:23 2011 +0200
Translation update done using Pootle.
commit bbd8695fbfb4eba81dd74e0854408b8cb723166e
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:18:16 2011 +0200
Translation update done using Pootle.
commit dce9270c2f54ef33c77c59998b1a8d0fdad5f5e9
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:17:55 2011 +0200
Translation update done using Pootle.
commit 4d8ba818e620f16bb73da1432ca6b555b6d813a4
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:17:26 2011 +0200
Translation update done using Pootle.
commit 507b8b0b453c6e8734e8c87ae7e0a478a0429c05
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:16:43 2011 +0200
Translation update done using Pootle.
commit 9aab5bba0fdc9ca8d8bd06924750ced688282764
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:16:31 2011 +0200
Translation update done using Pootle.
commit a6b6f2820e94c08fc62a7b4bd2c35f5a325f6248
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:15:48 2011 +0200
Translation update done using Pootle.
commit dd6cd76d0c6d605b3126011334eddf393cee3d0a
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:15:34 2011 +0200
Translation update done using Pootle.
commit 5aa3b295476c8b823d2360e4693e1b9849ff906d
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:15:11 2011 +0200
Translation update done using Pootle.
commit 63db64eaaffd5a4b924dd90235349335dbb4c089
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:14:30 2011 +0200
Translation update done using Pootle.
commit 9fd87dd1ead2d8bc80960b699e16e71e8dea2055
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Jul 21 18:10:55 2011 +0200
Translation update done using Pootle.
commit 013fdff416de1aa5f2582ec89901b876388f691f
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Jul 21 18:10:40 2011 +0200
Translation update done using Pootle.
commit 22104f78f53e8d4350af1dbd322a0c00dcd7138a
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Jul 21 18:10:03 2011 +0200
Translation update done using Pootle.
commit fbcb93d6e171d591401087449223823b5e798aaa
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Jul 21 18:09:30 2011 +0200
Translation update done using Pootle.
commit 57813543968a1d4d09a92a651f55de5616756edc
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Jul 21 18:09:10 2011 +0200
Translation update done using Pootle.
commit 2833faaa6e287ebb6d761d6dd8c3a444ed089e54
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Jul 21 18:08:08 2011 +0200
Translation update done using Pootle.
commit 152a14bf51c9df625954cf4a314f9e96ea4b5c58
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Jul 21 18:06:52 2011 +0200
Translation update done using Pootle.
commit 2f71a814e7a62310002c90740a17f90a2540457d
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:05:26 2011 +0200
Translation update done using Pootle.
commit f4fa0c6e3650b1bc099e9bd2807bc9e5791e8b5c
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:05:10 2011 +0200
Translation update done using Pootle.
commit 7619993c1fedb16d19524bc70426f18cfb8a14bf
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:04:59 2011 +0200
Translation update done using Pootle.
commit ab96857c710b2066f3e87f919a25df27c8b01a26
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:04:55 2011 +0200
Translation update done using Pootle.
commit 191ea287982e80175a4803755b550568c6e17f62
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:04:37 2011 +0200
Translation update done using Pootle.
commit f3ea72df09cdc069ad914272e693291b7fcefd38
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:04:04 2011 +0200
Translation update done using Pootle.
commit 79cf95a4c2336749d4b8a8af9b8c0c44f599bfbf
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:03:55 2011 +0200
Translation update done using Pootle.
commit 29d491e4bf4f35b8cdc68a9163e7f46b1b5d8f90
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:03:40 2011 +0200
Translation update done using Pootle.
commit bd36c8513b21c59db9a6d3f9ba71423e63631192
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:03:10 2011 +0200
Translation update done using Pootle.
commit a2de40da12e006c89c5c361560fd030cf2ab3f59
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:02:36 2011 +0200
Translation update done using Pootle.
commit 8b753684e73bac2f9766ea103f65b299bfdd5347
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:02:05 2011 +0200
Translation update done using Pootle.
commit 8642a81c07d27c695b49793b2d762370c1518fe8
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Jul 21 18:01:15 2011 +0200
Translation update done using Pootle.
commit 51f09bd0793a977daea37b6e9645fb948be762cf
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:01:10 2011 +0200
Translation update done using Pootle.
commit 5fd3864b86536000e8e798ea11d314bb0209d9b1
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Jul 21 18:00:48 2011 +0200
Translation update done using Pootle.
commit 7b0669ce07c6b445983eb6c4a97654b0b05f32b8
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 18:00:17 2011 +0200
Translation update done using Pootle.
commit bd58d4bdf458178b3a54a9d3907c4f270635d061
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Jul 21 17:59:52 2011 +0200
Translation update done using Pootle.
commit 23faf4c0e9f7c06788571c0b8a9a8ba104a9e755
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:59:51 2011 +0200
Translation update done using Pootle.
commit acf5b81c3f9334a48ec68c0c6cbeace008ed4c15
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:59:36 2011 +0200
Translation update done using Pootle.
commit b8404db6f63bcdddd3993fa9932cace43c0ad2e2
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:59:25 2011 +0200
Translation update done using Pootle.
commit bb2390d06f39d2d92335a458dae8d7bd1b1531c6
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:59:12 2011 +0200
Translation update done using Pootle.
commit 627ceda3909f9616aa0d6f54e6852815e7a87218
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:58:41 2011 +0200
Translation update done using Pootle.
commit 78b844f23aeae0d32160ab269eb6edd0274c1902
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:58:27 2011 +0200
Translation update done using Pootle.
commit f3875830acffd7a132a586f5408ff8e81d463348
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:58:13 2011 +0200
Translation update done using Pootle.
commit 0afb96375de582c07a3049cac866c9ff1a29587f
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:57:49 2011 +0200
Translation update done using Pootle.
commit 71ad77b1d8637bd15a3e8729edf2336cd1153fb8
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:57:44 2011 +0200
Translation update done using Pootle.
commit 719cfb060d1e882a63710c9e3ef47206f1c9dd65
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:57:33 2011 +0200
Translation update done using Pootle.
commit ab4d7b79f2b983a66de236ad19f124607e245867
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:57:14 2011 +0200
Translation update done using Pootle.
commit 547106c9a341c12ae3e68c1f72f31240a1cc8c07
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Jul 21 17:57:13 2011 +0200
Translation update done using Pootle.
commit 7f127a29d37236de9d26ca5a22cd2e3f454264cf
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:57:06 2011 +0200
Translation update done using Pootle.
commit b69bf2422fd4f295bfdfeb91a90cbb1565ded171
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:56:55 2011 +0200
Translation update done using Pootle.
commit 9683da06335aae0d1426ac45bb0fc3512c8fb979
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:56:41 2011 +0200
Translation update done using Pootle.
commit 01a013f7b7ff32f897a94607e052c8e0cde87c0d
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:55:50 2011 +0200
Translation update done using Pootle.
commit 711a6a4068215f070b0037b25069d2f3d466011e
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:55:29 2011 +0200
Translation update done using Pootle.
commit fc8edd52bfe51806cad438ab683415919eedb2f9
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:53:05 2011 +0200
Translation update done using Pootle.
commit ec296c85003a0c663518de0911cb559f7b857d38
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:52:53 2011 +0200
Translation update done using Pootle.
commit f5750cdaced6610a4b578f9a2e0374e49f444a77
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:52:35 2011 +0200
Translation update done using Pootle.
commit 2fc06fac19976749658bf403f617df46d2f37a26
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:51:23 2011 +0200
Translation update done using Pootle.
commit e5bfa46356bd01af129fa3360647e0d83fc87286
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:51:17 2011 +0200
Translation update done using Pootle.
commit 2b48de8eb285f8b445c7a5bf062feecc2f4319a9
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:50:52 2011 +0200
Translation update done using Pootle.
commit b35c3029fbf7db9ec0bfc0db3a04d8767f4a3087
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:50:45 2011 +0200
Translation update done using Pootle.
commit e36b7e653f634f6eb51faa9a12f3f9b8ba514a0d
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:50:28 2011 +0200
Translation update done using Pootle.
commit bef8f483ebe37ba3d007daca9fbe234cf94cacb6
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:50:09 2011 +0200
Translation update done using Pootle.
commit 4f987af72b8a242ca5f8c285fc2d3a9bf8055deb
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Jul 21 17:49:23 2011 +0200
Translation update done using Pootle.
commit f40092c46c2c91f3afdc530bcc4956c1c71aafe4
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:49:20 2011 +0200
Translation update done using Pootle.
commit 8e250398309b686546450e84e8d9ee86701c2e4f
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:48:42 2011 +0200
Translation update done using Pootle.
commit 29944782ecf34c2d8f546793187107e2819161fd
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:47:59 2011 +0200
Translation update done using Pootle.
commit 9c94eab446f43c52a7887ea733a672135e5c2ee3
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Jul 21 17:47:58 2011 +0200
Translation update done using Pootle.
commit dc36ca8add6898c117ecc5e3419c33e54ab567f1
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:47:54 2011 +0200
Translation update done using Pootle.
commit 74deb265b5ec97c27edf91bd8b3f79b5e51f78de
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Jul 21 17:47:49 2011 +0200
Translation update done using Pootle.
commit 057039e6c1a954808a3c04b250d0341cb600aa49
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:46:52 2011 +0200
Translation update done using Pootle.
commit 813262d8beb2a205b59d6430b0b5adeb40fb0d68
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:46:00 2011 +0200
Translation update done using Pootle.
commit 9b975e8cc4a3ed8f7caae770cfeb371da7ec6c12
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:45:55 2011 +0200
Translation update done using Pootle.
commit 48ad4d47b87599403763e91d5ae2735c1492d5cb
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:45:40 2011 +0200
Translation update done using Pootle.
commit 5d0a05af7ca95d2483896f4bb6d9c8b49348d46e
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:45:05 2011 +0200
Translation update done using Pootle.
commit d3bab9f885b4366e84a7b53fb99ad863e8cb78d7
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:44:59 2011 +0200
Translation update done using Pootle.
commit 4dd0e64fcd400b8a028b71951e8d7af47c547930
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Jul 21 17:44:58 2011 +0200
Translation update done using Pootle.
commit 6205b0f0c10d983b72889530f52e81037cbe7707
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:44:41 2011 +0200
Translation update done using Pootle.
commit 96d52af71caf023358b126a665d44715f949172b
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:44:32 2011 +0200
Translation update done using Pootle.
commit 8bbd92e2c256888a71a5b22e1e405e3443359df5
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:44:25 2011 +0200
Translation update done using Pootle.
commit f7f5c8af219cd1fbfea86ae58a2edd43128be5c8
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:43:39 2011 +0200
Translation update done using Pootle.
commit 2618f396f0e1dca2498eb83d6b4da6b256783022
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:43:13 2011 +0200
Translation update done using Pootle.
commit bbc79efccaab3e5f210117e4c7ccd017a9609760
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:42:59 2011 +0200
Translation update done using Pootle.
commit c93455d4363461904f4afac5bb8615687808b3ef
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:41:17 2011 +0200
Translation update done using Pootle.
commit 1d634f896b37c61501edf44ba85e7e0e99e632d6
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:41:04 2011 +0200
Translation update done using Pootle.
commit 731521708b854d84d7a48a18b5c3d127af799764
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:41:02 2011 +0200
Translation update done using Pootle.
commit ad0a3447c55583f600cb20a4f5a91b669e3b227f
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:40:38 2011 +0200
Translation update done using Pootle.
commit a16e4b1f41e3659ec0ca81c6d24d73b9307266c3
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:40:00 2011 +0200
Translation update done using Pootle.
commit 6745a0f0bd3f9b073f0653acbabbbfa5cf5f4f98
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:39:45 2011 +0200
Translation update done using Pootle.
commit 1f418406efbceb768630748a8ad62d9bb58cb2a1
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Jul 21 17:39:41 2011 +0200
Translation update done using Pootle.
commit ba600eab547e2d1478fd74414be7c6c63803f415
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:39:04 2011 +0200
Translation update done using Pootle.
commit 13acbb1a2ac553f1a86ba4acb92c1aadffdf96af
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:38:23 2011 +0200
Translation update done using Pootle.
commit a7b1f51be1bd15685b7193e3be84b857089cc919
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:38:19 2011 +0200
Translation update done using Pootle.
commit 3e8633dd102ca384daf0b3bea590583d26ce2559
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:37:56 2011 +0200
Translation update done using Pootle.
commit 0a16250f2385c5886851de0e8719c67441d92d5c
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:37:24 2011 +0200
Translation update done using Pootle.
commit e4a89276c3bec47432f3ce1af65b3e37cc9d21b7
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:33:59 2011 +0200
Translation update done using Pootle.
commit 202082763679f699c5f87099b4149288a8f2890b
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:33:35 2011 +0200
Translation update done using Pootle.
commit 94855e82e225212b127ab2fdf130e65449845eb8
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Jul 21 17:33:31 2011 +0200
Translation update done using Pootle.
commit 7f3df10199800b852c96c10e23170aa5d6e54f18
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Jul 21 17:33:06 2011 +0200
Translation update done using Pootle.
commit c28bdc00261c80fd7c8c6121a7078a7d99305fdf
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:32:42 2011 +0200
Translation update done using Pootle.
commit 46ba2638e5eeadb0537aeeeda306dd96091599b1
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Jul 21 17:32:04 2011 +0200
Translation update done using Pootle.
commit d4eb139a0357b2f97c5332c4bb58fc45ab8627c6
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:31:56 2011 +0200
Translation update done using Pootle.
commit cdafa4226248ab7844df1490cd45ca14f8abdd67
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:30:04 2011 +0200
Translation update done using Pootle.
commit aab9f5b5d6aee48c95fee74557be9e1b5b52006b
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:29:42 2011 +0200
Translation update done using Pootle.
commit 8f23e52a6a20a7cb0856520ad40f8f6e824166c1
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:28:55 2011 +0200
Translation update done using Pootle.
commit 8d028ede6f12065afa97a8470d833af94e493233
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:28:49 2011 +0200
Translation update done using Pootle.
commit 0fc5d1e110cbce8360f84fef775f8f09d55d36c1
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:28:19 2011 +0200
Translation update done using Pootle.
commit 335c9da64cf885614fb4c936b26a4188e059a586
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:27:52 2011 +0200
Translation update done using Pootle.
commit c885f46802ddde10a81a912a5970e97a721b150f
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:27:36 2011 +0200
Translation update done using Pootle.
commit e4d01ae3bd81d410e7023cc754d32b40c42119ff
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:27:33 2011 +0200
Translation update done using Pootle.
commit 7be50e05260f7179845033fe9774b22c5e9eb59e
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:27:27 2011 +0200
Translation update done using Pootle.
commit 8be2f739175d0845c603eabaf741ae08c56feb33
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:27:22 2011 +0200
Translation update done using Pootle.
commit 9798fcf1d67f7a72cd96f7154cb13926779b41df
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:27:00 2011 +0200
Translation update done using Pootle.
commit 23e94878201d20ba6b3b29ac6844940fd883cee4
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:26:53 2011 +0200
Translation update done using Pootle.
commit 901d8ffeb8dc9bbd1aee241347127bb6a5e6ea35
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:26:42 2011 +0200
Translation update done using Pootle.
commit 1ecdb0147668fed7ce8216edc932423c025699a9
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:25:43 2011 +0200
Translation update done using Pootle.
commit c735682b06918f5fe7b6089a22082a159d9f66cf
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:24:48 2011 +0200
Translation update done using Pootle.
commit 211d44448afda9b8171ddd9ed36c08e4ed88e5b3
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:24:08 2011 +0200
Translation update done using Pootle.
commit df5be06f2314919369fae4d80f1a0e47729d0275
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:23:51 2011 +0200
Translation update done using Pootle.
commit 7cb9e047cdf41c12ee355ff0d18e22398b86d597
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:23:29 2011 +0200
Translation update done using Pootle.
commit 0a8feaf83917139fd735607e82368a734dbbe2a1
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:22:47 2011 +0200
Translation update done using Pootle.
commit 69987aa24bd93a32bca2f10f3d5fd1daebd0dd69
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:20:22 2011 +0200
Translation update done using Pootle.
commit a3927eba05a986fafb7fd935e48df96726912678
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:19:35 2011 +0200
Translation update done using Pootle.
commit 6d9494db226b1c5a65f4ccd6d22d2f4989222da1
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:18:48 2011 +0200
Translation update done using Pootle.
commit 910235509fc54fb3fad3b8d00bb5ac354773bcb1
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Jul 21 17:18:46 2011 +0200
Translation update done using Pootle.
commit 4628ab162e46537f1c3b99c74ae9b016cf7a21b1
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Thu Jul 21 17:18:32 2011 +0200
Translation update done using Pootle.
commit 1218d27a0f0a4cdba84aae469cc80026999ee447
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:18:22 2011 +0200
Translation update done using Pootle.
commit 905beb5cd3087ea174ea5361c9ecf2ee20d5285e
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:16:54 2011 +0200
Translation update done using Pootle.
commit 020c69ba4023b66fc7d2b63c9772416680c4c420
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:16:25 2011 +0200
Translation update done using Pootle.
commit c6cdb6fe386232eff79ff29b87883450f0a7ddda
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:15:44 2011 +0200
Translation update done using Pootle.
commit d268eaba82e7acedd8a8385718155c1905dc30da
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:14:24 2011 +0200
Translation update done using Pootle.
commit 6ea1abe25c352c976749483f40303eb8f3968e5f
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:13:56 2011 +0200
Translation update done using Pootle.
commit be1a2a75cb505bb7836e7876ddd1245c57220343
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:11:47 2011 +0200
Translation update done using Pootle.
commit 569b8c1099f79a91799f08975ec85db35d550994
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 17:09:35 2011 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
po/it.po | 510 ++++++++++++++++++++++++++++----------------------------------
po/sl.po | 38 +++--
po/tr.po | 76 +++++++---
3 files changed, 308 insertions(+), 316 deletions(-)
diff --git a/po/it.po b/po/it.po
index e127f2a..1bbcd56 100644
--- a/po/it.po
+++ b/po/it.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2011-07-21 14:00+0200\n"
-"PO-Revision-Date: 2011-07-21 16:47+0200\n"
+"PO-Revision-Date: 2011-07-21 19:12+0200\n"
"Last-Translator: Rouslan Placella <rouslan(a)placella.com>\n"
"Language-Team: italian <it(a)li.org>\n"
"Language: it\n"
@@ -1359,7 +1359,6 @@ msgid "From general log"
msgstr "Dal general log"
#: js/messages.php:145
-#, fuzzy
msgid "Analysing & loading logs. This may take a while."
msgstr ""
"L'analisi e il caricamento dei log in corso. Questa operazione potrebbe "
@@ -1371,6 +1370,9 @@ msgid ""
"together. However only the SQL Text is being compared, thus the queries "
"other attributes such as start time may differ."
msgstr ""
+"Questo campo mostra il numero di query identiche. Tuttavia solo il testo SQL "
+"é confrontato, quindi gli altro attributi delle query, come lo 'start time' "
+"potrebbero essere diversi."
#: js/messages.php:147
msgid ""
@@ -1492,7 +1494,7 @@ msgstr "Cancellazione"
msgid "The definition of a stored function must contain a RETURN statement!"
msgstr ""
"La definizione delle funzioni memorizzate deve contenere un istruzione "
-"RETURN."
+"RETURN!"
#: js/messages.php:191
msgid ""
@@ -2056,6 +2058,7 @@ msgstr "La tabella %s è stata rinominata %s"
#: libraries/Table.class.php:1274
msgid "Could not save table UI preferences"
msgstr ""
+"Impossibile salvare la tabella delle preferenze per l'interfaccia utente"
#: libraries/Theme.class.php:143
#, php-format
@@ -2183,10 +2186,9 @@ msgid "Wrong username/password. Access denied."
msgstr "Nome utente o password errati. Accesso negato."
#: libraries/auth/signon.auth.lib.php:87
-#, fuzzy
#| msgid "Config authentication"
msgid "Can not find signon authentication script:"
-msgstr "Autenticazione via config"
+msgstr "Impossibile ritrovare lo script per l'autenticazione signon:"
#: libraries/auth/swekey/swekey.auth.lib.php:118
#, php-format
@@ -2301,6 +2303,8 @@ msgid ""
"This usually means there is a syntax error in it, please check any errors "
"shown below."
msgstr ""
+"Questo di solito significa che vi è un errore di sintassi in esso, verifica "
+"eventuali errori riportati in basso."
#: libraries/common.inc.php:596
#, php-format
@@ -2470,10 +2474,9 @@ msgid "%s days, %s hours, %s minutes and %s seconds"
msgstr "%s giorni, %s ore, %s minuti e %s secondi"
#: libraries/common.lib.php:1876
-#, fuzzy
#| msgid "Routines"
msgid "Missing parameter:"
-msgstr "Routines"
+msgstr "Parametro mancante:"
#: libraries/common.lib.php:2182 libraries/common.lib.php:2185
#: libraries/display_tbl.lib.php:299
@@ -2502,10 +2505,9 @@ msgid "The %s functionality is affected by a known bug, see %s"
msgstr "La %s funzionalità è affetta da un bug noto, vedi %s"
#: libraries/common.lib.php:2447
-#, fuzzy
#| msgid "Click to select"
msgid "Click to toggle"
-msgstr "Clicca per selezionare"
+msgstr "Clicca per alternare"
#: libraries/common.lib.php:2718 libraries/common.lib.php:2725
#: libraries/common.lib.php:2914 libraries/config/setup.forms.php:296
@@ -2947,12 +2949,13 @@ msgid ""
"Disable the table maintenance mass operations, like optimizing or repairing "
"the selected tables of a database."
msgstr ""
+"Disabilita le operazioni di manutenzione delle tabelle, come "
+"l'optimizzazione o la riparazione delle tabelle selezione nel database."
#: libraries/config/messages.inc.php:61
-#, fuzzy
#| msgid "Table maintenance"
msgid "Disable multi table maintenance"
-msgstr "Amministrazione tabella"
+msgstr "Disabilita la manutenzione di meltiple tabelle"
# ma come si dice "popup"?
#: libraries/config/messages.inc.php:62
@@ -3722,10 +3725,11 @@ msgid "Enable highlighting"
msgstr "Abilita evidenziamento"
#: libraries/config/messages.inc.php:288
-#, fuzzy
#| msgid "Maximum number of tables displayed in table list"
msgid "Maximum number of recently used tables; set 0 to disable"
-msgstr "Il massimo numero di tabelle da visualizzare nella lista di tabelle"
+msgstr ""
+"Il massimo numero di tabelle recenti da visualizzare; imposta 0 per "
+"disabilitare"
#: libraries/config/messages.inc.php:289
msgid "Recently used tables"
@@ -4028,12 +4032,12 @@ msgstr "Motore di registrazione"
#: libraries/config/messages.inc.php:350
msgid "When browsing tables, the sorting of each table is remembered"
msgstr ""
+"L'ordine delle tabelle é memorizzato durante la navigazione delle tabelle"
#: libraries/config/messages.inc.php:351
-#, fuzzy
#| msgid "Rename table to"
msgid "Remember table's sorting"
-msgstr "Rinomina la tabella in"
+msgstr "Ricorda l'ordine delle tabelle"
#: libraries/config/messages.inc.php:352
msgid "Repeat the headers every X cells, [kbd]0[/kbd] deactivates this feature"
@@ -4299,9 +4303,8 @@ msgid ""
"no support. Suggested: [kbd]phpmyadmin[/kbd]"
msgstr ""
"Database utilizzato per relazioni, segnalibri and funzionalitá PDF. Vedi "
-"[a@http://wiki.phpmyadmin.net/pma/pmadb]pmadb[/a] per per tutti dettagli. "
-"Lascia vuoto per disabilitarne il supporto. Consigliato: [kbd]phpmyadmin[/"
-"kbd]"
+"[a@http://wiki.phpmyadmin.net/pma/pmadb]pmadb[/a] per tutti dettagli. Lascia "
+"vuoto per disabilitarne il supporto. Consigliato: [kbd]phpmyadmin[/kbd]"
#: libraries/config/messages.inc.php:406
msgid "Database name"
@@ -4317,7 +4320,6 @@ msgid "Server port"
msgstr "Porta del server"
#: libraries/config/messages.inc.php:409
-#, fuzzy
#| msgid ""
#| "Leave blank for no user preferences storage in database, suggested: [kbd]"
#| "pma_config[/kbd]"
@@ -4325,8 +4327,8 @@ msgid ""
"Leave blank for no \"persistent\" recently used tables across sessions, "
"suggested: [kbd]pma_recent[/kbd]"
msgstr ""
-"Lascia vuoto per disabilitare la memorizzazione delle preferenze degli "
-"utenti nel database, consigliato: [kbd]pma_config[/kbd]"
+"Lascia vuoto per disabilitare la memorizzazione delle tabelle recenti nel "
+"database, consigliato: [kbd]pma_recent[/kbd]"
#: libraries/config/messages.inc.php:410
msgid "Recently used table"
@@ -4410,7 +4412,6 @@ msgid "Display columns table"
msgstr "Visualizza i campi della tabella"
#: libraries/config/messages.inc.php:426
-#, fuzzy
#| msgid ""
#| "Leave blank for no user preferences storage in database, suggested: [kbd]"
#| "pma_config[/kbd]"
@@ -4418,14 +4419,14 @@ msgid ""
"Leave blank for no \"persistent\" tables'UI preferences across sessions, "
"suggested: [kbd]pma_table_uiprefs[/kbd]"
msgstr ""
-"Lascia vuoto per disabilitare la memorizzazione delle preferenze degli "
-"utenti nel database, consigliato: [kbd]pma_config[/kbd]"
+"Lascia vuoto per disabilitare la memorizzazione delle preferenze "
+"dell'interfaccia utenti nel database, consigliato: "
+"[kbd]pma_table_uiprefs[/kbd]"
#: libraries/config/messages.inc.php:427
-#, fuzzy
#| msgid "User preferences storage table"
msgid "UI preferences table"
-msgstr "Tabella di memorizzazione delle preferenze degli utenti"
+msgstr "Tabella di memorizzazione delle preferenze dell'interfaccia utente"
#: libraries/config/messages.inc.php:428
msgid ""
@@ -4570,12 +4571,14 @@ msgid ""
"Defines whether or not type display direction option is shown when browsing "
"a table"
msgstr ""
+"Definisce se mostrare l'opzione della direzione di visualizzazione durante "
+"la navigazione delle tabelle"
#: libraries/config/messages.inc.php:454
#, fuzzy
#| msgid "Default display direction"
msgid "Show display direction"
-msgstr "Orientamento del display"
+msgstr "Mostra la direzione della visualizzazione"
#: libraries/config/messages.inc.php:455
msgid ""
@@ -5360,28 +5363,28 @@ msgid "Language"
msgstr "Lingua"
#: libraries/display_tbl.lib.php:394
-#, fuzzy
#| msgid "Textarea columns"
msgid "Restore column order"
-msgstr "Campi di aree di testo"
+msgstr "Ripristina l'ordine dei campi"
#: libraries/display_tbl.lib.php:414
msgid "Drag to reorder"
-msgstr ""
+msgstr "Trascina per riordinare"
#: libraries/display_tbl.lib.php:415
-#, fuzzy
#| msgid "Click to select"
msgid "Click to sort"
-msgstr "Clicca per selezionare"
+msgstr "Clicca per ordinare"
#: libraries/display_tbl.lib.php:416
msgid "Click to mark/unmark"
-msgstr ""
+msgstr "Clicca per selezionare/deselezionare"
#: libraries/display_tbl.lib.php:417
msgid "Click the drop-down arrow<br />to toggle column's visibility"
msgstr ""
+"Clicca sulla freccia<br />per cambiare lo stato di visualizzazzione dei "
+"campi"
#: libraries/display_tbl.lib.php:428
#, php-format
@@ -5389,22 +5392,19 @@ msgid "%d is not valid row number."
msgstr "%d non è un numero valido di righe."
#: libraries/display_tbl.lib.php:433
-#, fuzzy
#| msgid "Textarea rows"
msgid "Start row"
-msgstr "Righe con aree di testo"
+msgstr "Riga iniziale"
#: libraries/display_tbl.lib.php:435
-#, fuzzy
#| msgid "Number of rows:"
msgid "Number of rows"
-msgstr "Numero di righi:"
+msgstr "Numero di righe"
#: libraries/display_tbl.lib.php:440
-#, fuzzy
#| msgid "More"
msgid "Mode"
-msgstr "Più"
+msgstr "Modalitá"
#: libraries/display_tbl.lib.php:442
msgid "horizontal"
@@ -5421,7 +5421,7 @@ msgstr "verticale"
#: libraries/display_tbl.lib.php:449
#, php-format
msgid "Headers every %s rows"
-msgstr ""
+msgstr "Intestazioni ogni %s righe"
#: libraries/display_tbl.lib.php:543
msgid "Sort by key"
@@ -5477,15 +5477,17 @@ msgstr "Trasformazione del browser"
#: libraries/display_tbl.lib.php:647
msgid "Geometry"
-msgstr ""
+msgstr "Geometria"
#: libraries/display_tbl.lib.php:648
+#, fuzzy
msgid "Well Known Text"
-msgstr ""
+msgstr "Well Known Text"
#: libraries/display_tbl.lib.php:649
+#, fuzzy
msgid "Well Known Binary"
-msgstr ""
+msgstr "Well Known Binary"
#: libraries/display_tbl.lib.php:1300
msgid "Copy"
@@ -5531,7 +5533,7 @@ msgstr "Mostra diagramma"
#: libraries/display_tbl.lib.php:2506
msgid "Visualize GIS data"
-msgstr ""
+msgstr "Visualizzare dati GIS"
#: libraries/display_tbl.lib.php:2526
msgid "Create view"
@@ -6310,10 +6312,9 @@ msgid "Open new phpMyAdmin window"
msgstr "Apri una nuova finestra di PhpMyAdmin"
#: libraries/gis_visualization.lib.php:129
-#, fuzzy
#| msgid "No data found for the chart."
msgid "No data found for GIS visualization."
-msgstr "Nessun tipo di dato trovato per il diagramma."
+msgstr "Nessun data trovato per la visualizzazione GIS."
#: libraries/header_printview.inc.php:49 libraries/header_printview.inc.php:54
msgid "SQL result"
@@ -6746,7 +6747,7 @@ msgstr "Storico dell'SQL"
#, fuzzy
#| msgid "Persistent connections"
msgid "Persistent recently used tables"
-msgstr "Connessione persistente"
+msgstr "Tabelle recenti persistenti"
#: libraries/relation.lib.php:136
msgid "Persistent tables' UI preferences"
@@ -6894,48 +6895,49 @@ msgstr "Genera Password"
#: libraries/rte/rte_routines.lib.php:1242
#: libraries/rte/rte_triggers.lib.php:75 libraries/rte/rte_triggers.lib.php:80
#: libraries/rte/rte_triggers.lib.php:103
-#, fuzzy, php-format
+#, php-format
#| msgid "The following queries have been executed:"
msgid "The following query has failed: \"%s\""
-msgstr "Le seguenti query sono state eseguite:"
+msgstr "La seguente query é fallita: \"%s\""
#: libraries/rte/rte_events.lib.php:116
msgid "Sorry, we failed to restore the dropped event."
msgstr ""
+"Ci dispiace, non siamo riusciti a ripristinare l'evento che é stato rimosso."
#: libraries/rte/rte_events.lib.php:117 libraries/rte/rte_routines.lib.php:269
#: libraries/rte/rte_triggers.lib.php:90
msgid "The backed up query was:"
-msgstr ""
+msgstr "La query di backup é:"
#: libraries/rte/rte_events.lib.php:121
-#, fuzzy, php-format
+#, php-format
#| msgid "Column %s has been dropped"
msgid "Event %1$s has been modified."
-msgstr "Il campo %s è stato eliminato"
+msgstr "L'evento %1$s é stato modificato."
#: libraries/rte/rte_events.lib.php:133
-#, fuzzy, php-format
+#, php-format
#| msgid "Table %1$s has been created."
msgid "Event %1$s has been created."
-msgstr "La tabella %1$s è stata creata."
+msgstr "L'evento %1$s é stato creato."
#: libraries/rte/rte_events.lib.php:141 libraries/rte/rte_routines.lib.php:294
#: libraries/rte/rte_triggers.lib.php:114
msgid "<b>One or more errors have occured while processing your request:</b>"
msgstr ""
+"<b>Si sono verificati uno o piú errori durante l'esecuz\\ione della tua "
+"richiesta:</b>"
#: libraries/rte/rte_events.lib.php:181
-#, fuzzy
#| msgid "Create view"
msgid "Create event"
-msgstr "Crea vista"
+msgstr "Crea evento"
#: libraries/rte/rte_events.lib.php:185
-#, fuzzy
#| msgid "Edit server"
msgid "Edit event"
-msgstr "Modifica server"
+msgstr "Modifica evento"
#: libraries/rte/rte_events.lib.php:212 libraries/rte/rte_routines.lib.php:370
#: libraries/rte/rte_routines.lib.php:1264
@@ -6946,109 +6948,101 @@ msgstr "Errore nel processare la richiesta"
#: libraries/rte/rte_events.lib.php:371 libraries/rte/rte_routines.lib.php:817
#: libraries/rte/rte_triggers.lib.php:298
-#, fuzzy
#| msgid "Details..."
msgid "Details"
-msgstr "Dettagli..."
+msgstr "Dettagli"
#: libraries/rte/rte_events.lib.php:374
-#, fuzzy
#| msgid "Event type"
msgid "Event name"
-msgstr "Tipo di evento"
+msgstr "Nome dell'evento"
#: libraries/rte/rte_events.lib.php:395 server_binlog.php:182
msgid "Event type"
msgstr "Tipo di evento"
#: libraries/rte/rte_events.lib.php:416 libraries/rte/rte_routines.lib.php:838
-#, fuzzy, php-format
+#, php-format
#| msgid "Change"
msgid "Change to %s"
-msgstr "Modifica"
+msgstr "Cambia a %s"
#: libraries/rte/rte_events.lib.php:422
-#, fuzzy
#| msgid "Execute"
msgid "Execute at"
-msgstr "Esegui"
+msgstr "Esegui il"
#: libraries/rte/rte_events.lib.php:430
-#, fuzzy
#| msgid "Execute"
msgid "Execute every"
-msgstr "Esegui"
+msgstr "Esegui ogni"
#: libraries/rte/rte_events.lib.php:449
-#, fuzzy
#| msgid "Startup"
msgid "Start"
-msgstr "Avvio"
+msgstr "Inizio"
#: libraries/rte/rte_events.lib.php:465 libraries/rte/rte_routines.lib.php:912
#: libraries/rte/rte_triggers.lib.php:348
-#, fuzzy
#| msgid "Description"
msgid "Definition"
-msgstr "Descrizione"
+msgstr "Definizione"
#: libraries/rte/rte_events.lib.php:471
-#, fuzzy
#| msgid "complete inserts"
msgid "On completion preserve"
-msgstr "inserimenti completi"
+msgstr "Conserva dopo il completamento"
#: libraries/rte/rte_events.lib.php:475 libraries/rte/rte_routines.lib.php:922
#: libraries/rte/rte_triggers.lib.php:354
msgid "Definer"
-msgstr ""
+msgstr "Definer"
#: libraries/rte/rte_events.lib.php:518 libraries/rte/rte_routines.lib.php:986
#: libraries/rte/rte_triggers.lib.php:392
msgid "The definer must be in the \"username@hostname\" format"
-msgstr ""
+msgstr "Il definer deve essere nel seguente formato: \"nomeutente@nomehost\""
#: libraries/rte/rte_events.lib.php:525
msgid "You must provide an event name"
-msgstr ""
+msgstr "È necessario fornire il nome dell'evento"
#: libraries/rte/rte_events.lib.php:537
msgid "You must provide a valid interval value for the event."
-msgstr ""
+msgstr "È necessario fornire un intervallo valido per l'evento."
#: libraries/rte/rte_events.lib.php:549
msgid "You must provide a valid execution time for the event."
-msgstr ""
+msgstr "È necessario fornire una data valida per l'esecuzione dell'evento."
#: libraries/rte/rte_events.lib.php:553
msgid "You must provide a valid type for the event."
-msgstr ""
+msgstr "È necessario fornire un valido tipo per l'evento."
#: libraries/rte/rte_events.lib.php:572
msgid "You must provide an event definition."
-msgstr ""
+msgstr "È necessario fornire una definizione per l'evento."
#: libraries/rte/rte_footer.lib.php:29
msgid "New"
-msgstr ""
+msgstr "Nuovo"
#: libraries/rte/rte_footer.lib.php:91
msgid "OFF"
-msgstr ""
+msgstr "Disattivato"
#: libraries/rte/rte_footer.lib.php:96
msgid "ON"
-msgstr ""
+msgstr "Attivato"
#: libraries/rte/rte_footer.lib.php:108
msgid "Event scheduler status"
-msgstr ""
+msgstr "Stato del pianificatore degli eventi"
#: libraries/rte/rte_list.lib.php:52
-#, fuzzy
#| msgid "Return type"
msgid "Returns"
-msgstr "Tipo di risultato"
+msgstr "Ritorna"
#: libraries/rte/rte_list.lib.php:58 libraries/rte/rte_triggers.lib.php:320
#: server_status.php:989 sql.php:943
@@ -7057,7 +7051,7 @@ msgstr "Tempo"
#: libraries/rte/rte_list.lib.php:59 libraries/rte/rte_triggers.lib.php:334
msgid "Event"
-msgstr "Eventi"
+msgstr "Evento"
#: libraries/rte/rte_routines.lib.php:64
msgid ""
@@ -7065,112 +7059,109 @@ msgid ""
"handling multi queries. <b>The execution of some stored routines may fail!</"
"b> Please use the improved 'mysqli' extension to avoid any problems."
msgstr ""
+"Stai utilizzanto la vecchia estenzione 'mysql' di PHP che non é in grado di "
+"eseguire multi query. <b>L'esecuzione di alcune routine memorizzate potrebbe "
+"fallire!</b> É consigliato di utilizzare l'estensione 'mysqli' per evitare "
+"eventuali problemi."
#: libraries/rte/rte_routines.lib.php:247
#: libraries/rte/rte_routines.lib.php:994
-#, fuzzy, php-format
+#, php-format
#| msgid "Invalid server index: %s"
msgid "Invalid routine type: \"%s\""
-msgstr "Indice server non valido: %s"
+msgstr "Tipo di routine non valido: \"%s\""
#: libraries/rte/rte_routines.lib.php:268
msgid "Sorry, we failed to restore the dropped routine."
msgstr ""
+"Ci dispiace, non siamo riusciti a ripristinare la routine che é stata "
+"rimossa."
#: libraries/rte/rte_routines.lib.php:273
-#, fuzzy, php-format
+#, php-format
#| msgid "Column %s has been dropped"
msgid "Routine %1$s has been modified."
-msgstr "Il campo %s è stato eliminato"
+msgstr "La routine %1$s é stata modificata."
#: libraries/rte/rte_routines.lib.php:286
-#, fuzzy, php-format
+#, php-format
#| msgid "Table %1$s has been created."
msgid "Routine %1$s has been created."
-msgstr "La tabella %1$s è stata creata."
+msgstr "La routine %1$s é stata creata."
#: libraries/rte/rte_routines.lib.php:340
-#, fuzzy
#| msgid "Create relation"
msgid "Create routine"
-msgstr "Crea relazioni"
+msgstr "Crea routine"
#: libraries/rte/rte_routines.lib.php:344
-#, fuzzy
#| msgid "Edit mode"
msgid "Edit routine"
-msgstr "Modalitá di modifica"
+msgstr "Modifica routine"
#: libraries/rte/rte_routines.lib.php:820
-#, fuzzy
#| msgid "Routines"
msgid "Routine name"
-msgstr "Routines"
+msgstr "Nome della routine"
#: libraries/rte/rte_routines.lib.php:843
msgid "Parameters"
-msgstr ""
+msgstr "Parametri"
#: libraries/rte/rte_routines.lib.php:848
-#, fuzzy
#| msgid "Direct links"
msgid "Direction"
-msgstr "Link diretti"
+msgstr "Direzione"
#: libraries/rte/rte_routines.lib.php:851 libraries/tbl_properties.inc.php:108
msgid "Length/Values"
-msgstr "Lunghezza/Set*"
+msgstr "Lunghezza/Valori"
#: libraries/rte/rte_routines.lib.php:866
-#, fuzzy
#| msgid "Add prefix"
msgid "Add parameter"
-msgstr "Aggiungi prefisso"
+msgstr "Aggiungi parametro"
#: libraries/rte/rte_routines.lib.php:870
-#, fuzzy
#| msgid "Remove database"
msgid "Remove last parameter"
-msgstr "Rimuovi il database"
+msgstr "Rimuovi l'ultimo parametro"
#: libraries/rte/rte_routines.lib.php:875
msgid "Return type"
msgstr "Tipo di risultato"
#: libraries/rte/rte_routines.lib.php:881
-#, fuzzy
#| msgid "Length/Values"
msgid "Return length/values"
-msgstr "Lunghezza/Set*"
+msgstr "Lunghezza/valori del risultato"
#: libraries/rte/rte_routines.lib.php:887
-#, fuzzy
#| msgid "Table options"
msgid "Return options"
-msgstr "Opzioni della tabella"
+msgstr "Opzioni del risultato"
#: libraries/rte/rte_routines.lib.php:918
msgid "Is deterministic"
msgstr ""
#: libraries/rte/rte_routines.lib.php:927
-#, fuzzy
#| msgid "Security"
msgid "Security type"
-msgstr "Sicurezza"
+msgstr "Tipo di sicurezza"
#: libraries/rte/rte_routines.lib.php:934
msgid "SQL data access"
-msgstr ""
+msgstr "Tipo di accesso dati SQL"
#: libraries/rte/rte_routines.lib.php:999
msgid "You must provide a routine name"
-msgstr ""
+msgstr "È necessario fornire il nome della routine"
#: libraries/rte/rte_routines.lib.php:1025
#, php-format
msgid "Invalid direction \"%s\" given for parameter."
-msgstr ""
+msgstr "Direzione invalida \"%s\" é stata fornita per un parametro."
#: libraries/rte/rte_routines.lib.php:1037
#: libraries/rte/rte_routines.lib.php:1075
@@ -7178,43 +7169,49 @@ msgid ""
"You must provide length/values for routine parameters of type ENUM, SET, "
"VARCHAR and VARBINARY."
msgstr ""
+"È necessario fornire lunghezza o valori per parameteri della routine del "
+"tipo ENUM, SET, VARCHAR e VARBINARY."
#: libraries/rte/rte_routines.lib.php:1055
msgid "You must provide a name and a type for each routine parameter."
msgstr ""
+"È necessario fornire un nome ed un tipo per ogni parametro della routine."
#: libraries/rte/rte_routines.lib.php:1065
msgid "You must provide a valid return type for the routine."
-msgstr ""
+msgstr "È necessario fornire un valido tipo del risultato."
#: libraries/rte/rte_routines.lib.php:1109
msgid "You must provide a routine definition."
-msgstr ""
+msgstr "È necessario fornire una definizione per la routine."
#: libraries/rte/rte_routines.lib.php:1198
#, php-format
msgid "%d row affected by the last statement inside the procedure"
msgid_plural "%d rows affected by the last statement inside the procedure"
msgstr[0] ""
+"%d riga influenzata dall'ultima istruzione eseguita all'interno della "
+"procedura"
msgstr[1] ""
+"%d righe influenzate dall'ultima istruzione eseguita all'interno della "
+"procedura"
#: libraries/rte/rte_routines.lib.php:1214
-#, fuzzy, php-format
+#, php-format
#| msgid "Allows executing stored routines."
msgid "Execution results of routine %s"
-msgstr "Permette l'esecuzione di routines memorizzate."
+msgstr "Risultato di esecuzione della routine %s"
#: libraries/rte/rte_routines.lib.php:1288
#: libraries/rte/rte_routines.lib.php:1294
msgid "Execute routine"
-msgstr ""
+msgstr "Esegui routine"
#: libraries/rte/rte_routines.lib.php:1345
#: libraries/rte/rte_routines.lib.php:1348
-#, fuzzy
#| msgid "Routines"
msgid "Routine parameters"
-msgstr "Routines"
+msgstr "Parametri della routine"
#: libraries/rte/rte_routines.lib.php:1355 tbl_change.php:287
#: tbl_change.php:325
@@ -7224,166 +7221,152 @@ msgstr "Funzione"
#: libraries/rte/rte_triggers.lib.php:89
msgid "Sorry, we failed to restore the dropped trigger."
msgstr ""
+"Ci dispiace, non siamo riusciti a ripristinare il trigger che é stato "
+"rimosso."
#: libraries/rte/rte_triggers.lib.php:94
-#, fuzzy, php-format
+#, php-format
#| msgid "Column %s has been dropped"
msgid "Trigger %1$s has been modified."
-msgstr "Il campo %s è stato eliminato"
+msgstr "Il trigger %1$s é stato modificato."
#: libraries/rte/rte_triggers.lib.php:106
-#, fuzzy, php-format
+#, php-format
#| msgid "Table %1$s has been created."
msgid "Trigger %1$s has been created."
-msgstr "La tabella %1$s è stata creata."
+msgstr "Il trigger %1$s é stato creato."
#: libraries/rte/rte_triggers.lib.php:157
-#, fuzzy
#| msgid "Create view"
msgid "Create trigger"
-msgstr "Crea vista"
+msgstr "Crea trigger"
#: libraries/rte/rte_triggers.lib.php:161
-#, fuzzy
#| msgid "Add a new server"
msgid "Edit trigger"
-msgstr "Aggiungi un nuovo server"
+msgstr "Modifica trigger"
#: libraries/rte/rte_triggers.lib.php:301
-#, fuzzy
#| msgid "Triggers"
msgid "Trigger name"
-msgstr "Triggers"
+msgstr "Nome del trigger"
#: libraries/rte/rte_triggers.lib.php:399
msgid "You must provide a trigger name"
-msgstr ""
+msgstr "È necessario fornire il nome del trigger"
#: libraries/rte/rte_triggers.lib.php:404
msgid "You must provide a valid timing for the trigger"
-msgstr ""
+msgstr "È necessario fornire un timing valido per il trigger"
#: libraries/rte/rte_triggers.lib.php:409
msgid "You must provide a valid event for the trigger"
-msgstr ""
+msgstr "È necessario fornire un valido evento per il trigger"
#: libraries/rte/rte_triggers.lib.php:415
-#, fuzzy
#| msgid "Invalid table name"
msgid "You must provide a valid table name"
-msgstr "Nome tabella non valido"
+msgstr "È necessario fornire un valido nome di tabella"
#: libraries/rte/rte_triggers.lib.php:421
msgid "You must provide a trigger definition."
-msgstr ""
+msgstr "È necessario fornire una definizione per il trigger."
#: libraries/rte/rte_words.lib.php:18
-#, fuzzy
#| msgid "Add index"
msgid "Add routine"
-msgstr "Aggiungi indice"
+msgstr "Aggiungi una routine"
#: libraries/rte/rte_words.lib.php:20
-#, fuzzy, php-format
+#, php-format
#| msgid "Export defaults"
msgid "Export of routine %s"
-msgstr "Esporta i predefiniti"
+msgstr "Esportazione della routine %s"
#: libraries/rte/rte_words.lib.php:21
-#, fuzzy
#| msgid "Routines"
msgid "routine"
-msgstr "Routines"
+msgstr "routine"
#: libraries/rte/rte_words.lib.php:22
-#, fuzzy
#| msgid "You don't have sufficient privileges to be here right now!"
msgid "You do not have the necessary privileges to create a routine"
-msgstr "Non hai i permessi per effettuare questa operazione!"
+msgstr "Non hai i necessari privilegi per creare una routine"
#: libraries/rte/rte_words.lib.php:23
-#, fuzzy, php-format
+#, php-format
#| msgid "No tables found in database"
msgid "No routine with name %1$s found in database %2$s"
-msgstr "Non ci sono tabelle nel database"
+msgstr "Non é stata trovata alcuna routine con nome %1$s nel database %2$s"
#: libraries/rte/rte_words.lib.php:24
-#, fuzzy
#| msgid "There are no files to upload"
msgid "There are no routines to display."
-msgstr "Nessun file da caricare"
+msgstr "Non ci sono routine da visualizzare."
#: libraries/rte/rte_words.lib.php:30
-#, fuzzy
#| msgid "Add a new server"
msgid "Add trigger"
-msgstr "Aggiungi un nuovo server"
+msgstr "Aggiungi trigger"
#: libraries/rte/rte_words.lib.php:32
-#, fuzzy, php-format
+#, php-format
#| msgid "Export contents"
msgid "Export of trigger %s"
-msgstr "Esporta contenuti"
+msgstr "Esportazione del trigger %s"
#: libraries/rte/rte_words.lib.php:33
-#, fuzzy
#| msgid "Triggers"
msgid "trigger"
-msgstr "Triggers"
+msgstr "trigger"
#: libraries/rte/rte_words.lib.php:34
-#, fuzzy
#| msgid "You don't have sufficient privileges to be here right now!"
msgid "You do not have the necessary privileges to create a trigger"
-msgstr "Non hai i permessi per effettuare questa operazione!"
+msgstr "Non hai i necessari privilegi per creare un trigger"
#: libraries/rte/rte_words.lib.php:35
-#, fuzzy, php-format
+#, php-format
#| msgid "No tables found in database"
msgid "No trigger with name %1$s found in database %2$s"
-msgstr "Non ci sono tabelle nel database"
+msgstr "Non é stata trovato alcun trigger con nome %1$s nel database %2$s"
#: libraries/rte/rte_words.lib.php:36
-#, fuzzy
#| msgid "There are no files to upload"
msgid "There are no triggers to display."
-msgstr "Nessun file da caricare"
+msgstr "Non ci sono trigger da visualizzare."
#: libraries/rte/rte_words.lib.php:42
-#, fuzzy
#| msgid "Add a new server"
msgid "Add event"
-msgstr "Aggiungi un nuovo server"
+msgstr "Aggiungi evento"
#: libraries/rte/rte_words.lib.php:44
-#, fuzzy, php-format
+#, php-format
#| msgid "Export contents"
msgid "Export of event %s"
-msgstr "Esporta contenuti"
+msgstr "Esportazione dell'evento %s"
#: libraries/rte/rte_words.lib.php:45
-#, fuzzy
#| msgid "Event"
msgid "event"
-msgstr "Eventi"
+msgstr "evento"
#: libraries/rte/rte_words.lib.php:46
-#, fuzzy
#| msgid "You don't have sufficient privileges to be here right now!"
msgid "You do not have the necessary privileges to create an event"
-msgstr "Non hai i permessi per effettuare questa operazione!"
+msgstr "Non hai i necessari privilegi per creare un evento"
#: libraries/rte/rte_words.lib.php:47
-#, fuzzy, php-format
+#, php-format
#| msgid "No tables found in database"
msgid "No event with name %1$s found in database %2$s"
-msgstr "Non ci sono tabelle nel database"
+msgstr "Non é stata trovato alcun evento con nome %1$s nel database %2$s"
#: libraries/rte/rte_words.lib.php:48
-#, fuzzy
#| msgid "There are no files to upload"
msgid "There are no events to display."
-msgstr "Nessun file da caricare"
+msgstr "Non ci sono eventi da visualizzare."
#: libraries/schema/Dia_Relation_Schema.class.php:222
#: libraries/schema/Eps_Relation_Schema.class.php:395
@@ -7833,10 +7816,9 @@ msgid "PARTITION definition"
msgstr "Definizione PARTITION"
#: libraries/tbl_properties.inc.php:779
-#, fuzzy
#| msgid "+ Add a new value"
msgid "+ Add a value"
-msgstr "+ Aggiungi un nuovo valore"
+msgstr "+ Aggiungi un valore"
#: libraries/transformations/application_octetstream__download.inc.php:9
msgid ""
@@ -8990,10 +8972,9 @@ msgid "wildcard"
msgstr "wildcard"
#: server_privileges.php:2295
-#, fuzzy
#| msgid "View %s has been dropped"
msgid "User has been added."
-msgstr "La vista %s è stata eliminata"
+msgstr "L'utente é stato aggiunto."
#: server_replication.php:49
msgid "Unknown error"
@@ -9175,26 +9156,25 @@ msgstr ""
"Vorresti <a href=\"%s\">configurarlo ora</a>?"
#: server_status.php:27
-#, fuzzy
#| msgid "Refresh"
msgid "Refresh rate"
-msgstr "Aggiorna"
+msgstr "Ritmo di aggiornamenti"
#: server_status.php:31 server_status.php:1460
-#, fuzzy, php-format
+#, php-format
#| msgid "Minute"
msgid "%d minute"
msgid_plural "%d minutes"
-msgstr[0] "Minuto"
-msgstr[1] "Minuto"
+msgstr[0] "%d minuto"
+msgstr[1] "%d minuti"
#: server_status.php:33 server_status.php:1458
-#, fuzzy, php-format
+#, php-format
#| msgid "Second"
msgid "%d second"
msgid_plural "%d seconds"
-msgstr[0] "Secondo"
-msgstr[1] "Secondo"
+msgstr[0] "%d secondo"
+msgstr[1] "%d secondi"
#: server_status.php:309
#, php-format
@@ -9270,55 +9250,50 @@ msgid "Runtime Information"
msgstr "Informazioni di Runtime"
#: server_status.php:586
-#, fuzzy
#| msgid "Server Choice"
msgid "Server traffic"
-msgstr "Scelta del server"
+msgstr "Traffico del server"
#: server_status.php:588
-#, fuzzy
#| msgid "See slave status table"
msgid "All status variables"
-msgstr "Vedi la tabella di stato dello slave"
+msgstr "Tutte le variabili di stato"
#: server_status.php:589
msgid "Monitor"
-msgstr ""
+msgstr "Monitoraggio"
#: server_status.php:599 server_status.php:621
-#, fuzzy
#| msgid "Refresh"
msgid "Refresh rate: "
-msgstr "Aggiorna"
+msgstr "Ritmo dell'aggiornamento: "
#: server_status.php:642
-#, fuzzy
#| msgid "Do not change the password"
msgid "Containing the word:"
-msgstr "Non cambiare la password"
+msgstr "Contenente la parola:"
#: server_status.php:647
#, fuzzy
#| msgid "Show open tables"
msgid "Show only alert values"
-msgstr "Mostra le tabelle aperte"
+msgstr "Mostra solo i valori di allarme"
#: server_status.php:651
msgid "Filter by category..."
-msgstr ""
+msgstr "Filtra per categoria..."
#: server_status.php:664
-#, fuzzy
#| msgid "Related Links"
msgid "Related links:"
-msgstr "Collegamenti Associati"
+msgstr "Collegamenti associati:"
#. l10n: Questions is the name of a MySQL Status variable
#: server_status.php:708
-#, fuzzy, php-format
+#, php-format
#| msgid "Customize startup page"
msgid "Questions since startup: %s"
-msgstr "Personalizza la pagina di avvio"
+msgstr "Questions eseguiti dall'avvio: %s"
#: server_status.php:714 server_status.php:749 server_status.php:865
#: server_status.php:910
@@ -9340,18 +9315,18 @@ msgstr "Istruzioni"
#. l10n: # = Amount of queries
#: server_status.php:747
msgid "#"
-msgstr ""
+msgstr "#"
#: server_status.php:814
#, php-format
msgid "Network traffic since startup: %s"
-msgstr ""
+msgstr "Traffico rete dall'avvio: %s"
#: server_status.php:822
-#, fuzzy, php-format
+#, php-format
#| msgid "This MySQL server has been running for %s. It started up on %s."
msgid "This MySQL server has been running for %1$s. It started up on %2$s."
-msgstr "Questo server MySQL sta girando da %s. É stato avviato il %s."
+msgstr "Questo server MySQL sta girando da %1$s. É stato avviato il %2$s."
#: server_status.php:832
msgid ""
@@ -9428,12 +9403,13 @@ msgid ""
"The number of connections that were aborted because the client died without "
"closing the connection properly."
msgstr ""
+"Il numero di connessioni fallite perché il cliente é morto senza chiudere la "
+"connessione correttemente."
#: server_status.php:1046
-#, fuzzy
#| msgid "Could not connect to MySQL server"
msgid "The number of failed attempts to connect to the MySQL server."
-msgstr "Impossibile effettuare la connessione al server MySQL"
+msgstr "Il numero di tentativi falliti di connettere al server MySQL."
#: server_status.php:1047
msgid ""
@@ -9454,6 +9430,8 @@ msgstr ""
msgid ""
"The number of connection attempts (successful or not) to the MySQL server."
msgstr ""
+"Il numero di tentativi di connesione al server MySQL (completati con "
+"successo o no)."
#: server_status.php:1050
msgid ""
@@ -9889,6 +9867,8 @@ msgid ""
"The maximum number of connections that have been in use simultaneously since "
"the server started."
msgstr ""
+"Il massimo numero di connessioni che sono state utilizzate "
+"contemporaneamente dall'avvio del server."
#: server_status.php:1121
msgid "The number of rows waiting to be written in INSERT DELAYED queues."
@@ -9922,6 +9902,9 @@ msgid ""
"fragmentation issues, which may be solved by issuing a FLUSH QUERY CACHE "
"statement."
msgstr ""
+"Il numero di blocchi di memoria liberi nell a query cache. Numeri alti "
+"potrebbero indicare problemi di fragmentazione che possono essere risolti "
+"con l'esecuzione dell'istruzione FLUSH QUERY CACHE."
#: server_status.php:1127
msgid "The amount of free memory for query cache."
@@ -10104,54 +10087,47 @@ msgid "The number of threads that are not sleeping."
msgstr "Il numero di processi non in attesa."
#: server_status.php:1290
-#, fuzzy
#| msgid "Textarea rows"
msgid "Start Monitor"
-msgstr "Righe con aree di testo"
+msgstr "Avvia monitoraggio"
#: server_status.php:1298
-#, fuzzy
#| msgid "Introduction"
msgid "Instructions/Setup"
-msgstr "Introduzione"
+msgstr "Istruzioni/Configurazione"
#: server_status.php:1302
msgid "Done rearranging/editing charts"
-msgstr ""
+msgstr "Ho finito di modificare/muovere i grafici"
#: server_status.php:1309
-#, fuzzy
#| msgid "Add prefix"
msgid "Add chart"
-msgstr "Aggiungi prefisso"
+msgstr "Aggiungi grafico"
#: server_status.php:1311
msgid "Rearrange/edit charts"
-msgstr ""
+msgstr "Muovi/modifica i grafici"
#: server_status.php:1313
-#, fuzzy
#| msgid "Refresh"
msgid "Refresh rate:"
-msgstr "Aggiorna"
+msgstr "Ritmo di aggiornamenti:"
#: server_status.php:1316
-#, fuzzy
#| msgid "Textarea columns"
msgid "Chart columns:"
-msgstr "Campi di aree di testo"
+msgstr "Campi del grafico:"
#: server_status.php:1330
-#, fuzzy
#| msgid "User for config auth"
msgid "Clear monitor config"
-msgstr "Utente per il config auth"
+msgstr "Cancella la configurazione di monitoraggio"
#: server_status.php:1333
-#, fuzzy
#| msgid "Introduction"
msgid "Monitor Instructions"
-msgstr "Introduzione"
+msgstr "Istruzioni per monitoraggio"
#: server_status.php:1334
msgid ""
@@ -10183,77 +10159,68 @@ msgid ""
msgstr ""
#: server_status.php:1361
-#, fuzzy
#| msgid "Usage"
msgid "CPU Usage"
-msgstr "Utilizzo"
+msgstr "Utilizzo della CPU"
#: server_status.php:1364
-#, fuzzy
msgid "Memory Usage"
-msgstr "[2. Usage]"
+msgstr "Utilizzo della memoria"
#: server_status.php:1367
-#, fuzzy
#| msgid "Usage"
msgid "Swap Usage"
-msgstr "Utilizzo"
+msgstr "Utilizzo dello swap"
#: server_status.php:1370
-#, fuzzy
#| msgid "See slave status table"
msgid "Status variable(s)"
-msgstr "Vedi la tabella di stato dello slave"
+msgstr "Variabili di stato"
#: server_status.php:1372
-#, fuzzy
#| msgid "Select Tables"
msgid "Select series:"
-msgstr "Seleziona Tables"
+msgstr "Seleziona serie:"
#: server_status.php:1374
msgid "Commonly monitored"
-msgstr ""
+msgstr "Monitorate di solito"
#: server_status.php:1389
-#, fuzzy
#| msgid "Invalid table name"
msgid "or type variable name:"
-msgstr "Nome tabella non valido"
+msgstr "or scrivi il nome di una variabile:"
#: server_status.php:1393
msgid "Display as differential value"
-msgstr ""
+msgstr "Visualizzare come valore differenziale"
#: server_status.php:1395
msgid "Apply a divisor"
-msgstr ""
+msgstr "Applica un divisore"
#: server_status.php:1402
msgid "Append unit to data values"
-msgstr ""
+msgstr "Aggiungi un unitá ai valori dei dati"
#: server_status.php:1408
-#, fuzzy
#| msgid "Add a new server"
msgid "Add this series"
-msgstr "Aggiungi un nuovo server"
+msgstr "Aggiungi questa serie"
#: server_status.php:1410
msgid "Clear series"
-msgstr ""
+msgstr "Cancella la serie"
#: server_status.php:1413
-#, fuzzy
#| msgid "SQL queries"
msgid "Series in Chart:"
-msgstr "Query SQL"
+msgstr "Serie del grafico:"
#: server_status.php:1421
-#, fuzzy
#| msgid "Loading"
msgid "Loading logs"
-msgstr "Caricamento"
+msgstr "Caricamento dei log in corso"
#: server_status.php:1424
#, fuzzy
@@ -10378,7 +10345,7 @@ msgstr ""
#: server_variables.php:58
msgid "Setting variable failed"
-msgstr ""
+msgstr "L'impostazione della variablile é fallita"
#: server_variables.php:77
msgid "Server variables and settings"
@@ -10834,7 +10801,7 @@ msgstr "Linea"
#, fuzzy
#| msgid "Inline"
msgid "Spline"
-msgstr "Inline"
+msgstr "Scanalatura"
#: tbl_chart.php:89
msgid "Pie"
@@ -10845,50 +10812,43 @@ msgid "Stacked"
msgstr "Sovrapposti"
#: tbl_chart.php:94
-#, fuzzy
#| msgid "Report title:"
msgid "Chart title"
-msgstr "Titolo del report:"
+msgstr "Titolo del grafico"
#: tbl_chart.php:99
msgid "X-Axis:"
-msgstr ""
+msgstr "Asse X:"
#: tbl_chart.php:113
-#, fuzzy
#| msgid "SQL queries"
msgid "Series:"
-msgstr "Query SQL"
+msgstr "Serie:"
#: tbl_chart.php:115
-#, fuzzy
#| msgid "Textarea columns"
msgid "The remaining columns"
-msgstr "Campi di aree di testo"
+msgstr "I campi rimanenti"
#: tbl_chart.php:128
-#, fuzzy
#| msgid "X Axis label"
msgid "X-Axis label:"
-msgstr "Etichetta per l'asse X"
+msgstr "Etichetta per l'asse X:"
#: tbl_chart.php:128
-#, fuzzy
#| msgid "Value"
msgid "X Values"
-msgstr "Valore"
+msgstr "Valori per asse X"
#: tbl_chart.php:129
-#, fuzzy
#| msgid "Y Axis label"
msgid "Y-Axis label:"
-msgstr "Etichetta per l'asse X"
+msgstr "Etichetta per l'asse Y:"
#: tbl_chart.php:129
-#, fuzzy
#| msgid "Value"
msgid "Y Values"
-msgstr "Valore"
+msgstr "Valori per asse Y"
#: tbl_create.php:30
#, php-format
@@ -10905,10 +10865,9 @@ msgid "View dump (schema) of table"
msgstr "Visualizza dump (schema) della tabella"
#: tbl_gis_visualization.php:111
-#, fuzzy
#| msgid "Display servers selection"
msgid "Display GIS Visualization"
-msgstr "Visalizza la selezione dei server"
+msgstr "Mostra la visualizzazione GIS"
#: tbl_gis_visualization.php:157
msgid "Width"
@@ -10919,22 +10878,19 @@ msgid "Height"
msgstr "Altezza"
#: tbl_gis_visualization.php:165
-#, fuzzy
#| msgid "Textarea columns"
msgid "Label column"
-msgstr "Campi di aree di testo"
+msgstr "Etichetta del campo"
#: tbl_gis_visualization.php:167
-#, fuzzy
#| msgid "- none -"
msgid "-- None --"
-msgstr "- nessuno -"
+msgstr "-- Nessuno --"
#: tbl_gis_visualization.php:180
-#, fuzzy
#| msgid "Log file count"
msgid "Spatial column"
-msgstr "Numero dei file di log"
+msgstr ""
#: tbl_gis_visualization.php:201
msgid "Use OpenStreetMaps as Base Layer"
@@ -10945,16 +10901,14 @@ msgid "Redraw"
msgstr "Ridisegna"
#: tbl_gis_visualization.php:206
-#, fuzzy
#| msgid "Save as file"
msgid "Save to file"
-msgstr "Salva con nome"
+msgstr "Salva nel file"
#: tbl_gis_visualization.php:207
-#, fuzzy
#| msgid "Table name"
msgid "File name"
-msgstr "Nome tabella"
+msgstr "Nome del file"
#: tbl_indexes.php:66
msgid "The name of the primary key must be \"PRIMARY\"!"
@@ -11216,7 +11170,7 @@ msgstr "Aggiungi un indice unico"
#, fuzzy
#| msgid "Add index"
msgid "Add SPATIAL index"
-msgstr "Aggiungi indice"
+msgstr "Aggiungi indice SPATIAL"
#: tbl_structure.php:178 tbl_structure.php:179
msgid "Add FULLTEXT index"
diff --git a/po/sl.po b/po/sl.po
index 6499aa7..7071d1f 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -4,15 +4,15 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2011-07-21 14:00+0200\n"
-"PO-Revision-Date: 2011-07-19 23:21+0200\n"
+"PO-Revision-Date: 2011-07-21 19:45+0200\n"
"Last-Translator: Domen <dbc334(a)gmail.com>\n"
"Language-Team: slovenian <sl(a)li.org>\n"
"Language: sl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
-"%100==4 ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || "
+"n%100==4 ? 2 : 3);\n"
"X-Generator: Pootle 2.0.5\n"
#: browse_foreigners.php:35 browse_foreigners.php:53
@@ -1241,6 +1241,9 @@ msgid ""
"than %d seconds. It is advisable to set this long_query_time 0-2 seconds, "
"depending on your system."
msgstr ""
+"slow_query_log je omogočen, vendar strežnik zabeleži samo poizvedbe, ki "
+"trajajo več kot %d sekund. Priporočljivo je, da nastavite long_query_time na "
+"0–2 sekundi, odvisno od vašega sistema."
#: js/messages.php:121
#, php-format
@@ -1284,6 +1287,8 @@ msgid ""
"You can't change these variables. Please log in as root or contact your "
"database administrator."
msgstr ""
+"Teh spremenljivk ne morete spremeniti. Prosimo, prijavite se kot root ali "
+"stopite v stik z upravljavcem vaše zbirke podatkov."
#: js/messages.php:132
msgid "Change settings"
@@ -1341,6 +1346,9 @@ msgid ""
"together. However only the SQL Text is being compared, thus the queries "
"other attributes such as start time may differ."
msgstr ""
+"Stolpec prikazuje število identičnih poizvedb, ki so zbrane skupaj. "
+"Primerjano je samo besedilo SQL, zato se lahko drugi atributi poizvedb, npr. "
+"začetni čas, razlikujejo."
#: js/messages.php:147
msgid ""
@@ -1348,6 +1356,8 @@ msgid ""
"same table are also being grouped together, disregarding of the inserted "
"data."
msgstr ""
+"Ker je izbrano zbiranje poizvedb INSERT, so poizvedbe INSERT iste tabele "
+"prav tako zbrane skupaj, ne glede na vstavljene podatke."
#: js/messages.php:148
msgid "Log data loaded. Queries executed in this time span:"
@@ -1825,13 +1835,12 @@ msgstr "Velikost pisave"
#: libraries/File.class.php:220
msgid "File was not an uploaded file."
-msgstr ""
+msgstr "Datoteka ni naložen datoteka."
#: libraries/File.class.php:259 libraries/File.class.php:388
-#, fuzzy
#| msgid "Unknown error in file upload."
msgid "Unknown error while uploading."
-msgstr "Neznana napaka pri nalaganju datoteke."
+msgstr "Neznana napaka pri nalaganju."
#: libraries/File.class.php:277
msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
@@ -1875,11 +1884,11 @@ msgstr ""
#: libraries/File.class.php:507
msgid "Error while moving uploaded file."
-msgstr ""
+msgstr "Napaka pri premikanju naložene datoteke."
#: libraries/File.class.php:515
msgid "Cannot read (moved) upload file."
-msgstr ""
+msgstr "Ne morem prebrati (premakniti) naložene datoteke."
#: libraries/Index.class.php:418 tbl_relation.php:526
msgid "No index defined!"
@@ -2433,10 +2442,9 @@ msgid "%s days, %s hours, %s minutes and %s seconds"
msgstr "%s dni, %s ur, %s minut in %s sekund"
#: libraries/common.lib.php:1876
-#, fuzzy
#| msgid "Routine parameters"
msgid "Missing parameter:"
-msgstr "Parametri rutine"
+msgstr "Manjkajoč parameter:"
#: libraries/common.lib.php:2182 libraries/common.lib.php:2185
#: libraries/display_tbl.lib.php:299
@@ -6865,10 +6873,9 @@ msgid "You must provide an event name"
msgstr "Navesti morate ime dogodka"
#: libraries/rte/rte_events.lib.php:537
-#, fuzzy
#| msgid "You must provide a name and a type for each routine parameter."
msgid "You must provide a valid interval value for the event."
-msgstr "Navesti morate ine in vrsto vsakega parametra rutine."
+msgstr "Navesti morateveljavno vrednost intervala dogodka."
#: libraries/rte/rte_events.lib.php:549
msgid "You must provide a valid execution time for the event."
@@ -7088,10 +7095,9 @@ msgid "You must provide a trigger name"
msgstr "Navesti morate ime sprožilca"
#: libraries/rte/rte_triggers.lib.php:404
-#, fuzzy
#| msgid "You must provide a routine name"
msgid "You must provide a valid timing for the trigger"
-msgstr "Navesti morate ime rutine"
+msgstr "Navesti morate veljavni časovni izbor sprožilca"
#: libraries/rte/rte_triggers.lib.php:409
msgid "You must provide a valid event for the trigger"
@@ -9889,6 +9895,10 @@ msgid ""
" queries. For the latter you will need to set log_output to 'TABLE' "
"and have either the slow_query_log or general_log enabled."
msgstr ""
+"Nadziranje phpMyAdmin vam lahko pomaga pri optimiziranju konfiguracije "
+"strežnika in izsleditvi časovno zahtevnih\n"
+" poizvedb. Za slednje morate nastaviti log_output na 'TABLE' in imeti "
+"ali slow_query_log ali general_log omogočeno."
#: server_status.php:1342
msgid ""
diff --git a/po/tr.po b/po/tr.po
index 3eef337..ecf52df 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2011-07-21 14:00+0200\n"
-"PO-Revision-Date: 2011-07-19 20:23+0200\n"
+"PO-Revision-Date: 2011-07-21 20:44+0200\n"
"Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n"
"Language-Team: turkish <tr(a)li.org>\n"
"Language: tr\n"
@@ -1233,6 +1233,9 @@ msgid ""
"than %d seconds. It is advisable to set this long_query_time 0-2 seconds, "
"depending on your system."
msgstr ""
+"slow_query_log etkinleştirildi ama sunucu sadece %d saniyeden daha uzun "
+"süren sorguları günlükler. Bu long_query_time'ın, sisteminize bağlı olarak "
+"0-2 saniyeye ayarlanması tavsiye edilir."
#: js/messages.php:121
#, php-format
@@ -1276,6 +1279,8 @@ msgid ""
"You can't change these variables. Please log in as root or contact your "
"database administrator."
msgstr ""
+"Bu değişkenleri değiştiremezsiniz. Lütfen root olarak oturum açın veya "
+"veritabanı yöneticinizle temasa geçin."
#: js/messages.php:132
msgid "Change settings"
@@ -1297,7 +1302,7 @@ msgstr "Ayırdedici"
#: js/messages.php:138
#, php-format
msgid "Divided by %s:"
-msgstr ""
+msgstr "Böleni %s:"
#: js/messages.php:140
msgid "Selected time range:"
@@ -1305,25 +1310,27 @@ msgstr "Seçili zaman aralığı:"
#: js/messages.php:141
msgid "Group together INSERTs into same table"
-msgstr ""
+msgstr "Aynı tablo içinde INSERT'ler birlikte gruplanır"
#: js/messages.php:142
msgid ""
"<p>Choose from which log you want the statistics to be generated from.</p> "
"Results are grouped by query text."
msgstr ""
+"<p>İstatistiklerin oluşturulmasını istediğinizden seçin.</p> Sonuçlar sorgu "
+"metnine göre gruplandırılır."
#: js/messages.php:143
msgid "From slow log"
-msgstr ""
+msgstr "Yavaş günlükten"
#: js/messages.php:144
msgid "From general log"
-msgstr ""
+msgstr "Genel günlükten"
#: js/messages.php:145
msgid "Analysing & loading logs. This may take a while."
-msgstr ""
+msgstr "Günlükler inceleniyor ve yükleniyor. Bu biraz zaman alabilir."
#: js/messages.php:146
msgid ""
@@ -1331,6 +1338,9 @@ msgid ""
"together. However only the SQL Text is being compared, thus the queries "
"other attributes such as start time may differ."
msgstr ""
+"Bu sütunlar birlikte gruplanmış özdeş sorguların miktarını gösterir. Ancak "
+"sadece SQL Metin karşılaştırılır, böylece başlama zamanı gibi sorgular diğer "
+"öznitelikler farklı olabilir."
#: js/messages.php:147
msgid ""
@@ -1338,10 +1348,13 @@ msgid ""
"same table are also being grouped together, disregarding of the inserted "
"data."
msgstr ""
+"INSERT'lerin gruplanmasından bu yana sorgular seçilir, aynı tablo içindeki "
+"INSERT sorguları, eklenen verinin hiçe sayılması, aynı zamanda birlikte "
+"gruplanır."
#: js/messages.php:148
msgid "Log data loaded. Queries executed in this time span:"
-msgstr ""
+msgstr "Günlük verisi yüklendi. Sorgular bu zaman aralığında çalıştırıldı:"
#: js/messages.php:150
msgid "Jump to Log table"
@@ -1349,7 +1362,7 @@ msgstr "Günlük tablosuna atla"
#: js/messages.php:151
msgid "Log analysed, but not data found in this time span."
-msgstr ""
+msgstr "Günlük incelendi, ama bu zaman aralığında bulunan veri yok."
#: js/messages.php:155 libraries/tbl_properties.inc.php:780
#: pmd_general.php:388 pmd_general.php:425 pmd_general.php:545
@@ -1815,13 +1828,12 @@ msgstr "Yazı Tipi boyutu"
#: libraries/File.class.php:220
msgid "File was not an uploaded file."
-msgstr ""
+msgstr "Dosya gönderilmiş bir dosya değil."
#: libraries/File.class.php:259 libraries/File.class.php:388
-#, fuzzy
#| msgid "Unknown error in file upload."
msgid "Unknown error while uploading."
-msgstr "Dosya göndermede bilinmeyen hata oldu."
+msgstr "Gönderilirken bilinmeyen hata oldu."
#: libraries/File.class.php:277
msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
@@ -1866,11 +1878,11 @@ msgstr ""
#: libraries/File.class.php:507
msgid "Error while moving uploaded file."
-msgstr ""
+msgstr "Gönderilmiş dosya taşınırken hata oldu."
#: libraries/File.class.php:515
msgid "Cannot read (moved) upload file."
-msgstr ""
+msgstr "Gönderilen dosya okunamıyor (taşınamadı)."
#: libraries/Index.class.php:418 tbl_relation.php:526
msgid "No index defined!"
@@ -2418,10 +2430,9 @@ msgid "%s days, %s hours, %s minutes and %s seconds"
msgstr "%s gün, %s saat, %s dakika ve %s saniye"
#: libraries/common.lib.php:1876
-#, fuzzy
#| msgid "Routine parameters"
msgid "Missing parameter:"
-msgstr "Yordam parametreleri"
+msgstr "Eksik parametreler:"
#: libraries/common.lib.php:2182 libraries/common.lib.php:2185
#: libraries/display_tbl.lib.php:299
@@ -9050,7 +9061,7 @@ msgstr "Tüm durum değişkenleri"
#: server_status.php:589
msgid "Monitor"
-msgstr ""
+msgstr "İzleme"
#: server_status.php:599 server_status.php:621
msgid "Refresh rate: "
@@ -9183,6 +9194,8 @@ msgid ""
"The number of connections that were aborted because the client died without "
"closing the connection properly."
msgstr ""
+"Bağlantı uygun bir şekilde kapatılmadan sonlanmış istemcinin durdurulmuş "
+"bağlantılarının sayısı."
#: server_status.php:1046
msgid "The number of failed attempts to connect to the MySQL server."
@@ -9853,7 +9866,7 @@ msgstr "Yönergeler/Ayarlama"
#: server_status.php:1302
msgid "Done rearranging/editing charts"
-msgstr ""
+msgstr "Çizelgeleri düzenlemeyi/yeniden düzeltmeyi bitir"
#: server_status.php:1309
msgid "Add chart"
@@ -9861,7 +9874,7 @@ msgstr "Çizelge ekle"
#: server_status.php:1311
msgid "Rearrange/edit charts"
-msgstr ""
+msgstr "Çizelgeleri düzenle/yeniden düzelt"
#: server_status.php:1313
msgid "Refresh rate:"
@@ -9886,7 +9899,22 @@ msgid ""
" queries. For the latter you will need to set log_output to 'TABLE' "
"and have either the slow_query_log or general_log enabled."
msgstr ""
-
+"phpMyAdmin İzleyici sunucu yapılandırmasını uyarlamada ve yoğun sorgularda "
+"iz sürme süresinde size yardımcı\n"
+"olabilir. Sonrası için log_output'u 'TABLE'a ayarlamanız gerekecektir ve ya "
+"slow_query_log ya da general_log etkinleştirilir."
+
+# <b>İzleyici kullanımı:</b><br/>\n
+# Ok, you are good to go! Once you click 'Start monitor' your browser will refresh all displayed charts
+# in a regular interval. You may add charts and change the refresh rate under 'Settings', or remove any chart
+# using the cog icon on each respective chart.
+# <p>When you get to see a sudden spike in activity, select the relevant time span on any chart by holding down the
+# left mouse button and panning over the chart. This will load statistics from the logs helping you find what caused the
+# activity spike.</p>
+# <p><b>Please note:</b>
+# Enabling the general_log may increase the server load by up to 5-15%. Also be aware that generating statistics out of the logs is a
+# very load intensive task, thus it is advisable to select only a small time span.
+# </p>
#: server_status.php:1342
msgid ""
"<b>Using the monitor:</b><br/>\n"
@@ -9914,7 +9942,7 @@ msgstr "İşlemci Kullanımı"
#: server_status.php:1364
msgid "Memory Usage"
-msgstr ""
+msgstr "Bellek Kullanımı"
#: server_status.php:1367
msgid "Swap Usage"
@@ -9930,7 +9958,7 @@ msgstr "Dizi seç:"
#: server_status.php:1374
msgid "Commonly monitored"
-msgstr ""
+msgstr "Genellikle izlenen"
#: server_status.php:1389
msgid "or type variable name:"
@@ -9938,15 +9966,15 @@ msgstr "veya değişken adını yazın:"
#: server_status.php:1393
msgid "Display as differential value"
-msgstr ""
+msgstr "Ayırtedici değer olarak görüntüle"
#: server_status.php:1395
msgid "Apply a divisor"
-msgstr ""
+msgstr "Böleni uygula"
#: server_status.php:1402
msgid "Append unit to data values"
-msgstr ""
+msgstr "Veri değerlerine birimi ekle"
#: server_status.php:1408
msgid "Add this series"
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11422-g49b2ca9
by Rouslan Placella 21 Jul '11
by Rouslan Placella 21 Jul '11
21 Jul '11
The branch, master has been updated
via 49b2ca984a6c38fa7b49aeff3f1344d837cf5834 (commit)
from 4925260d959d8bd7194b912ddd1317c71f7cc42b (commit)
- Log -----------------------------------------------------------------
commit 49b2ca984a6c38fa7b49aeff3f1344d837cf5834
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Thu Jul 21 20:07:59 2011 +0100
No need to show a "table" column in the list of triggers, if a table is already selected.
-----------------------------------------------------------------------
Summary of changes:
libraries/rte/rte_list.lib.php | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/libraries/rte/rte_list.lib.php b/libraries/rte/rte_list.lib.php
index 91cbbbc..3b6177d 100644
--- a/libraries/rte/rte_list.lib.php
+++ b/libraries/rte/rte_list.lib.php
@@ -20,6 +20,8 @@ if (! defined('PHPMYADMIN')) {
*/
function PMA_RTE_getList($type, $items)
{
+ global $table;
+
/**
* Conditional classes switch the list on or off
*/
@@ -53,7 +55,9 @@ function PMA_RTE_getList($type, $items)
break;
case 'trigger':
$retval .= " <th>" . __('Name') . "</th>\n";
- $retval .= " <th>" . __('Table') . "</th>\n";
+ if (empty($table)) {
+ $retval .= " <th>" . __('Table') . "</th>\n";
+ }
$retval .= " <th colspan='3'>" . __('Action') . "</th>\n";
$retval .= " <th>" . __('Time') . "</th>\n";
$retval .= " <th>" . __('Event') . "</th>\n";
@@ -220,11 +224,13 @@ function PMA_TRI_getRowForList($trigger, $rowclass = '')
$retval .= " " . htmlspecialchars($trigger['name']) . "\n";
$retval .= " </strong>\n";
$retval .= " </td>\n";
- $retval .= " <td>\n";
- $retval .= " <a href='db_triggers.php?db={$db}"
- . "&table={$trigger['table']}'>"
- . $trigger['table'] . "</a>\n";
- $retval .= " </td>\n";
+ if (empty($table)) {
+ $retval .= " <td>\n";
+ $retval .= " <a href='db_triggers.php?db={$db}"
+ . "&table={$trigger['table']}'>"
+ . $trigger['table'] . "</a>\n";
+ $retval .= " </td>\n";
+ }
$retval .= " <td>\n";
if (PMA_currentUserHasPrivilege('TRIGGER', $db, $table)) {
$retval .= ' <a ' . $ajax_class['edit']
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11421-g4925260
by Marc Delisle 21 Jul '11
by Marc Delisle 21 Jul '11
21 Jul '11
The branch, master has been updated
via 4925260d959d8bd7194b912ddd1317c71f7cc42b (commit)
from e62d62fa124328df9d22f4d1e794148325e8d207 (commit)
- Log -----------------------------------------------------------------
commit 4925260d959d8bd7194b912ddd1317c71f7cc42b
Author: Tyron Madlener <tyronx(a)gmail.com>
Date: Thu Jul 21 13:15:12 2011 -0400
Call to a renamed function
-----------------------------------------------------------------------
Summary of changes:
js/server_status.js | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/js/server_status.js b/js/server_status.js
index ac4071c..4a61bfe 100644
--- a/js/server_status.js
+++ b/js/server_status.js
@@ -368,7 +368,7 @@ $(function() {
switch(tab.attr('id')) {
case 'statustabs_traffic':
if(data != null) tab.find('.tabInnerContent').html(data);
- initTooltips();
+ PMA_convertFootnotesToTooltips();
break;
case 'statustabs_queries':
if(data != null) {
@@ -1677,4 +1677,4 @@ $(function() {
$(this).hide();
});
-});
\ No newline at end of file
+});
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11420-ge62d62f
by Madhura Jayaratne 21 Jul '11
by Madhura Jayaratne 21 Jul '11
21 Jul '11
The branch, master has been updated
via e62d62fa124328df9d22f4d1e794148325e8d207 (commit)
via 498d53f17787fe37c8adf121fb071712c5c4e587 (commit)
via de5c41d5372146803e0b97fcbb20d983c38d6459 (commit)
via 96140680eeed6858d708d51532f9aec8bdd0d195 (commit)
from c7c532e1f335079fe65cac3f30adae1b1ddb8e34 (commit)
- Log -----------------------------------------------------------------
commit e62d62fa124328df9d22f4d1e794148325e8d207
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: Thu Jul 21 21:50:55 2011 +0530
Add package name
commit 498d53f17787fe37c8adf121fb071712c5c4e587
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: Thu Jul 21 21:45:27 2011 +0530
Keep 1 space after the longest variable name
commit de5c41d5372146803e0b97fcbb20d983c38d6459
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: Thu Jul 21 21:44:30 2011 +0530
Line length
commit 96140680eeed6858d708d51532f9aec8bdd0d195
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: Thu Jul 21 21:29:14 2011 +0530
Indicate that these methods returns nothing
-----------------------------------------------------------------------
Summary of changes:
libraries/gis/pma_gis_factory.php | 2 +-
libraries/gis/pma_gis_geometry.php | 33 +++++++++++++++----------
libraries/gis/pma_gis_geometrycollection.php | 5 ++-
libraries/gis/pma_gis_linestring.php | 10 ++++---
libraries/gis/pma_gis_multilinestring.php | 10 ++++---
libraries/gis/pma_gis_multipoint.php | 10 ++++---
libraries/gis/pma_gis_multipolygon.php | 8 ++++--
libraries/gis/pma_gis_point.php | 12 +++++----
libraries/gis/pma_gis_polygon.php | 5 ++-
libraries/gis/pma_gis_visualization.php | 19 +++++++++++++-
10 files changed, 74 insertions(+), 40 deletions(-)
diff --git a/libraries/gis/pma_gis_factory.php b/libraries/gis/pma_gis_factory.php
index 7dd1dae..73e6c4c 100644
--- a/libraries/gis/pma_gis_factory.php
+++ b/libraries/gis/pma_gis_factory.php
@@ -2,7 +2,7 @@
/**
* Factory class that handles the creation of geometric objects.
*
- * @package phpMyAdmin
+ * @package phpMyAdmin-GIS
*/
class PMA_GIS_Factory
{
diff --git a/libraries/gis/pma_gis_geometry.php b/libraries/gis/pma_gis_geometry.php
index 8decdcc..787eaf3 100644
--- a/libraries/gis/pma_gis_geometry.php
+++ b/libraries/gis/pma_gis_geometry.php
@@ -2,7 +2,7 @@
/**
* Base class for all GIS data type classes.
*
- * @package phpMyAdmin
+ * @package phpMyAdmin-GIS
*/
abstract class PMA_GIS_Geometry
{
@@ -45,13 +45,14 @@ abstract class PMA_GIS_Geometry
public abstract function prepareRowAsPdf($spatial, $label, $color, $scale_data, $pdf);
/**
- * Prepares the JavaScript related to a row in the GIS dataset to visualize it with OpenLayers.
+ * Prepares the JavaScript related to a row in the GIS dataset
+ * to visualize it with OpenLayers.
*
- * @param string $spatial GIS data object
- * @param int $srid Spatial reference ID
- * @param string $label Label for the GIS data object
- * @param string $color Color for the GIS data object
- * @param array $scale_data Array containing data related to scaling
+ * @param string $spatial GIS data object
+ * @param int $srid Spatial reference ID
+ * @param string $label Label for the GIS data object
+ * @param string $color Color for the GIS data object
+ * @param array $scale_data Array containing data related to scaling
*
* @return the JavaScript related to a row in the GIS dataset
*/
@@ -77,9 +78,11 @@ abstract class PMA_GIS_Geometry
protected function getBoundsForOl($srid, $scale_data)
{
return 'bound = new OpenLayers.Bounds(); bound.extend(new OpenLayers.LonLat('
- . $scale_data['minX'] . ', ' . $scale_data['minY'] . ').transform(new OpenLayers.Projection("EPSG:'
+ . $scale_data['minX'] . ', ' . $scale_data['minY']
+ . ').transform(new OpenLayers.Projection("EPSG:'
. $srid . '"), map.getProjectionObject())); bound.extend(new OpenLayers.LonLat('
- . $scale_data['maxX'] . ', ' . $scale_data['maxY'] . ').transform(new OpenLayers.Projection("EPSG:'
+ . $scale_data['maxX'] . ', ' . $scale_data['maxY']
+ . ').transform(new OpenLayers.Projection("EPSG:'
. $srid . '"), map.getProjectionObject()));';
}
@@ -173,8 +176,10 @@ abstract class PMA_GIS_Geometry
$points_arr = $this->extractPoints($polygon, null);
$row .= 'new OpenLayers.Geometry.LinearRing(new Array(';
foreach ($points_arr as $point) {
- $row .= '(new OpenLayers.Geometry.Point(' . $point[0] . ', ' . $point[1] . '))'
- . '.transform(new OpenLayers.Projection("EPSG:' . $srid . '"), map.getProjectionObject()), ';
+ $row .= '(new OpenLayers.Geometry.Point('
+ . $point[0] . ', ' . $point[1] . '))'
+ . '.transform(new OpenLayers.Projection("EPSG:'
+ . $srid . '"), map.getProjectionObject()), ';
}
$row = substr($row, 0, strlen($row) - 2);
$row .= '))';
@@ -185,8 +190,10 @@ abstract class PMA_GIS_Geometry
$points_arr = $this->extractPoints($ring, null);
$row .= 'new OpenLayers.Geometry.LinearRing(new Array(';
foreach ($points_arr as $point) {
- $row .= '(new OpenLayers.Geometry.Point(' . $point[0] . ', ' . $point[1] . '))'
- . '.transform(new OpenLayers.Projection("EPSG:' . $srid . '"), map.getProjectionObject()), ';
+ $row .= '(new OpenLayers.Geometry.Point('
+ . $point[0] . ', ' . $point[1] . '))'
+ . '.transform(new OpenLayers.Projection("EPSG:'
+ . $srid . '"), map.getProjectionObject()), ';
}
$row = substr($row, 0, strlen($row) - 2);
$row .= ')), ';
diff --git a/libraries/gis/pma_gis_geometrycollection.php b/libraries/gis/pma_gis_geometrycollection.php
index ca48f08..a3da6bf 100644
--- a/libraries/gis/pma_gis_geometrycollection.php
+++ b/libraries/gis/pma_gis_geometrycollection.php
@@ -2,7 +2,7 @@
/**
* Handles the visualization of GIS GEOMETRYCOLLECTION objects.
*
- * @package phpMyAdmin
+ * @package phpMyAdmin-GIS
*/
class PMA_GIS_Geometrycollection extends PMA_GIS_Geometry
{
@@ -165,7 +165,8 @@ class PMA_GIS_Geometrycollection extends PMA_GIS_Geometry
}
/**
- * Prepares JavaScript related to a row in the GIS dataset to visualize it with OpenLayers.
+ * Prepares JavaScript related to a row in the GIS dataset
+ * to visualize it with OpenLayers.
*
* @param string $spatial GIS GEOMETRYCOLLECTION object
* @param int $srid Spatial reference ID
diff --git a/libraries/gis/pma_gis_linestring.php b/libraries/gis/pma_gis_linestring.php
index dad4f9b..97113b7 100644
--- a/libraries/gis/pma_gis_linestring.php
+++ b/libraries/gis/pma_gis_linestring.php
@@ -2,7 +2,7 @@
/**
* Handles the visualization of GIS LINESTRING objects.
*
- * @package phpMyAdmin
+ * @package phpMyAdmin-GIS
*/
class PMA_GIS_Linestring extends PMA_GIS_Geometry
{
@@ -154,7 +154,8 @@ class PMA_GIS_Linestring extends PMA_GIS_Geometry
}
/**
- * Prepares JavaScript related to a row in the GIS dataset to visualize it with OpenLayers.
+ * Prepares JavaScript related to a row in the GIS dataset
+ * to visualize it with OpenLayers.
*
* @param string $spatial GIS LINESTRING object
* @param int $srid Spatial reference ID
@@ -183,8 +184,9 @@ class PMA_GIS_Linestring extends PMA_GIS_Geometry
$row = 'new Array(';
foreach ($points_arr as $point) {
- $row .= '(new OpenLayers.Geometry.Point(' . $point[0] . ', ' . $point[1] . '))'
- . '.transform(new OpenLayers.Projection("EPSG:' . $srid . '"), map.getProjectionObject()), ';
+ $row .= '(new OpenLayers.Geometry.Point(' . $point[0] . ', '
+ . $point[1] . ')).transform(new OpenLayers.Projection("EPSG:'
+ . $srid . '"), map.getProjectionObject()), ';
}
$row = substr($row, 0, strlen($row) - 2);
$row .= ')';
diff --git a/libraries/gis/pma_gis_multilinestring.php b/libraries/gis/pma_gis_multilinestring.php
index 1289a93..733cc84 100644
--- a/libraries/gis/pma_gis_multilinestring.php
+++ b/libraries/gis/pma_gis_multilinestring.php
@@ -2,7 +2,7 @@
/**
* Handles the visualization of GIS MULTILINESTRING objects.
*
- * @package phpMyAdmin
+ * @package phpMyAdmin-GIS
*/
class PMA_GIS_Multilinestring extends PMA_GIS_Geometry
{
@@ -179,7 +179,8 @@ class PMA_GIS_Multilinestring extends PMA_GIS_Geometry
}
/**
- * Prepares JavaScript related to a row in the GIS dataset to visualize it with OpenLayers.
+ * Prepares JavaScript related to a row in the GIS dataset
+ * to visualize it with OpenLayers.
*
* @param string $spatial GIS MULTILINESTRING object
* @param int $srid Spatial reference ID
@@ -213,8 +214,9 @@ class PMA_GIS_Multilinestring extends PMA_GIS_Geometry
$points_arr = $this->extractPoints($linestring, null);
$row .= 'new OpenLayers.Geometry.LineString(new Array(';
foreach ($points_arr as $point) {
- $row .= '(new OpenLayers.Geometry.Point(' . $point[0] . ', ' . $point[1] . '))'
- . '.transform(new OpenLayers.Projection("EPSG:' . $srid . '"), map.getProjectionObject()), ';
+ $row .= '(new OpenLayers.Geometry.Point(' . $point[0] . ', '
+ . $point[1] . ')).transform(new OpenLayers.Projection("EPSG:'
+ . $srid . '"), map.getProjectionObject()), ';
}
$row = substr($row, 0, strlen($row) - 2);
$row .= ')), ';
diff --git a/libraries/gis/pma_gis_multipoint.php b/libraries/gis/pma_gis_multipoint.php
index 48e9099..ce20f92 100644
--- a/libraries/gis/pma_gis_multipoint.php
+++ b/libraries/gis/pma_gis_multipoint.php
@@ -2,7 +2,7 @@
/**
* Handles the visualization of GIS MULTIPOINT objects.
*
- * @package phpMyAdmin
+ * @package phpMyAdmin-GIS
*/
class PMA_GIS_Multipoint extends PMA_GIS_Geometry
{
@@ -143,7 +143,8 @@ class PMA_GIS_Multipoint extends PMA_GIS_Geometry
}
/**
- * Prepares JavaScript related to a row in the GIS dataset to visualize it with OpenLayers.
+ * Prepares JavaScript related to a row in the GIS dataset
+ * to visualize it with OpenLayers.
*
* @param string $spatial GIS MULTIPOINT object
* @param int $srid Spatial reference ID
@@ -175,8 +176,9 @@ class PMA_GIS_Multipoint extends PMA_GIS_Geometry
$row = 'new Array(';
foreach ($points_arr as $point) {
- $row .= '(new OpenLayers.Geometry.Point(' . $point[0] . ', ' . $point[1] . '))'
- . '.transform(new OpenLayers.Projection("EPSG:' . $srid . '"), map.getProjectionObject()), ';
+ $row .= '(new OpenLayers.Geometry.Point(' . $point[0] . ', ' . $point[1]
+ . ')).transform(new OpenLayers.Projection("EPSG:' . $srid
+ . '"), map.getProjectionObject()), ';
}
$row = substr($row, 0, strlen($row) - 2);
$row .= ')';
diff --git a/libraries/gis/pma_gis_multipolygon.php b/libraries/gis/pma_gis_multipolygon.php
index db6f6cb..431fc88 100644
--- a/libraries/gis/pma_gis_multipolygon.php
+++ b/libraries/gis/pma_gis_multipolygon.php
@@ -2,7 +2,7 @@
/**
* Handles the visualization of GIS MULTIPOLYGON objects.
*
- * @package phpMyAdmin
+ * @package phpMyAdmin-GIS
*/
class PMA_GIS_Multipolygon extends PMA_GIS_Geometry
{
@@ -154,7 +154,8 @@ class PMA_GIS_Multipolygon extends PMA_GIS_Geometry
foreach ($inner as $inner_poly) {
$points_arr = array_merge(
- $points_arr, $this->extractPoints($inner_poly, $scale_data, true)
+ $points_arr,
+ $this->extractPoints($inner_poly, $scale_data, true)
);
}
}
@@ -223,7 +224,8 @@ class PMA_GIS_Multipolygon extends PMA_GIS_Geometry
}
/**
- * Prepares JavaScript related to a row in the GIS dataset to visualize it with OpenLayers.
+ * Prepares JavaScript related to a row in the GIS dataset
+ * to visualize it with OpenLayers.
*
* @param string $spatial GIS MULTIPOLYGON object
* @param int $srid Spatial reference ID
diff --git a/libraries/gis/pma_gis_point.php b/libraries/gis/pma_gis_point.php
index 4318572..31531f3 100644
--- a/libraries/gis/pma_gis_point.php
+++ b/libraries/gis/pma_gis_point.php
@@ -2,7 +2,7 @@
/**
* Handles the visualization of GIS POINT objects.
*
- * @package phpMyAdmin
+ * @package phpMyAdmin-GIS
*/
class PMA_GIS_Point extends PMA_GIS_Geometry
{
@@ -136,7 +136,8 @@ class PMA_GIS_Point extends PMA_GIS_Geometry
}
/**
- * Prepares JavaScript related to a row in the GIS dataset to visualize it with OpenLayers.
+ * Prepares JavaScript related to a row in the GIS dataset
+ * to visualize it with OpenLayers.
*
* @param string $spatial GIS POINT object
* @param int $srid Spatial reference ID
@@ -167,9 +168,10 @@ class PMA_GIS_Point extends PMA_GIS_Geometry
$points_arr = $this->extractPoints($point, null);
$result .= 'vectorLayer.addFeatures(new OpenLayers.Feature.Vector(('
- . 'new OpenLayers.Geometry.Point(' . $points_arr[0][0] . ', ' . $points_arr[0][1] . ')'
- . '.transform(new OpenLayers.Projection("EPSG:' . $srid . '"), map.getProjectionObject())),'
- . ' null, ' . json_encode($style_options) . '));';
+ . 'new OpenLayers.Geometry.Point(' . $points_arr[0][0] . ', '
+ . $points_arr[0][1] . ').transform(new OpenLayers.Projection("EPSG:'
+ . $srid . '"), map.getProjectionObject())), null, '
+ . json_encode($style_options) . '));';
return $result;
}
}
diff --git a/libraries/gis/pma_gis_polygon.php b/libraries/gis/pma_gis_polygon.php
index ce8ffa8..02f0173 100644
--- a/libraries/gis/pma_gis_polygon.php
+++ b/libraries/gis/pma_gis_polygon.php
@@ -2,7 +2,7 @@
/**
* Handles the visualization of GIS POLYGON objects.
*
- * @package phpMyAdmin
+ * @package phpMyAdmin-GIS
*/
class PMA_GIS_Polygon extends PMA_GIS_Geometry
{
@@ -206,7 +206,8 @@ class PMA_GIS_Polygon extends PMA_GIS_Geometry
}
/**
- * Prepares JavaScript related to a row in the GIS dataset to visualize it with OpenLayers.
+ * Prepares JavaScript related to a row in the GIS dataset
+ * to visualize it with OpenLayers.
*
* @param string $spatial GIS POLYGON object
* @param int $srid Spatial reference ID
diff --git a/libraries/gis/pma_gis_visualization.php b/libraries/gis/pma_gis_visualization.php
index 7c36857..d8da0d7 100644
--- a/libraries/gis/pma_gis_visualization.php
+++ b/libraries/gis/pma_gis_visualization.php
@@ -2,7 +2,7 @@
/**
* Generates the JavaScripts needed to visualize GIS data.
*
- * @package phpMyAdmin
+ * @package phpMyAdmin-GIS
*/
class PMA_GIS_Visualization
{
@@ -74,6 +74,8 @@ class PMA_GIS_Visualization
/**
* All the variable initialization, options handling has to be done here.
+ *
+ * @return nothing
*/
protected function init()
{
@@ -83,6 +85,8 @@ class PMA_GIS_Visualization
/**
* A function which handles passed parameters. Useful if desired
* chart needs to be a little bit different from the default one.
+ *
+ * @return nothing
*/
private function _handleOptions()
{
@@ -121,6 +125,8 @@ class PMA_GIS_Visualization
* @param string $file_name file name
* @param string $type mime type
* @param string $ext extension of the file
+ *
+ * @return nothing
*/
private function _toFile($file_name, $type, $ext)
{
@@ -179,6 +185,8 @@ class PMA_GIS_Visualization
* Saves as a SVG image to a file.
*
* @param string $file_name File name
+ *
+ * @return nothing
*/
public function toFileAsSvg($file_name)
{
@@ -201,7 +209,10 @@ class PMA_GIS_Visualization
// fill the background
$bg = imagecolorallocate($image, 229, 229, 229);
- imagefilledrectangle($image, 0, 0, $this->_settings['width'] - 1, $this->_settings['height'] - 1, $bg);
+ imagefilledrectangle(
+ $image, 0, 0, $this->_settings['width'] - 1,
+ $this->_settings['height'] - 1, $bg
+ );
$scale_data = $this->_scaleDataSet($this->_data);
$image = $this->_prepareDataSet($this->_data, 0, $scale_data, 'png', $image);
@@ -234,6 +245,8 @@ class PMA_GIS_Visualization
* Saves as a PNG image to a file.
*
* @param string $file_name File name
+ *
+ * @return nothing
*/
public function toFileAsPng($file_name)
{
@@ -260,6 +273,8 @@ class PMA_GIS_Visualization
* Saves as a PDF to a file.
*
* @param string $file_name File name
+ *
+ * @return nothing
*/
public function toFileAsPdf($file_name)
{
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11416-gc7c532e
by Madhura Jayaratne 21 Jul '11
by Madhura Jayaratne 21 Jul '11
21 Jul '11
The branch, master has been updated
via c7c532e1f335079fe65cac3f30adae1b1ddb8e34 (commit)
via c01b63d01a20fab8fb96897304834ed0357ee580 (commit)
via 1e8914fe508d06774f8bf4159587db35cb24b3ef (commit)
via 338756306b9b795fb9e320aeca994f5993120f5d (commit)
via dc9312cae327017ef623619940c7eb99d10aeb81 (commit)
via ffa28f0f7cb5b901702e943b69e3dfcfbcd05a66 (commit)
via 24b28f1017a555e06023eac4a9868d655de378e7 (commit)
from 6cb1bdc030e1d50aa11fa50e83649ad77eb6fadf (commit)
- Log -----------------------------------------------------------------
commit c7c532e1f335079fe65cac3f30adae1b1ddb8e34
Merge: c01b63d01a20fab8fb96897304834ed0357ee580 6cb1bdc030e1d50aa11fa50e83649ad77eb6fadf
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: Thu Jul 21 20:37:38 2011 +0530
Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
commit c01b63d01a20fab8fb96897304834ed0357ee580
Merge: 1e8914fe508d06774f8bf4159587db35cb24b3ef 147ba5e5cb1155ff71252cd4ad1ed4f97510567a
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: Thu Jul 21 20:31:48 2011 +0530
Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
commit 1e8914fe508d06774f8bf4159587db35cb24b3ef
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: Thu Jul 21 20:19:24 2011 +0530
Avoid code duplication
commit 338756306b9b795fb9e320aeca994f5993120f5d
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: Thu Jul 21 19:35:03 2011 +0530
Better variable naming
commit dc9312cae327017ef623619940c7eb99d10aeb81
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: Thu Jul 21 18:35:53 2011 +0530
Return assigned to wrong variable
commit ffa28f0f7cb5b901702e943b69e3dfcfbcd05a66
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: Thu Jul 21 18:33:45 2011 +0530
Avoid variables with short names
commit 24b28f1017a555e06023eac4a9868d655de378e7
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: Thu Jul 21 18:29:51 2011 +0530
Unused variable
-----------------------------------------------------------------------
Summary of changes:
libraries/gis/pma_gis_geometry.php | 49 ++++++++++++++++++++++---
libraries/gis/pma_gis_geometrycollection.php | 6 ++--
libraries/gis/pma_gis_linestring.php | 20 +++++-----
libraries/gis/pma_gis_multilinestring.php | 20 +++++-----
libraries/gis/pma_gis_multipoint.php | 44 +++++++++++-----------
libraries/gis/pma_gis_multipolygon.php | 48 ++++++-------------------
libraries/gis/pma_gis_point.php | 44 +++++++++++-----------
libraries/gis/pma_gis_polygon.php | 51 +++++++-------------------
8 files changed, 135 insertions(+), 147 deletions(-)
diff --git a/libraries/gis/pma_gis_geometry.php b/libraries/gis/pma_gis_geometry.php
index 9ff2c2c..8decdcc 100644
--- a/libraries/gis/pma_gis_geometry.php
+++ b/libraries/gis/pma_gis_geometry.php
@@ -36,13 +36,13 @@ abstract class PMA_GIS_Geometry
*
* @param string $spatial GIS data object
* @param string $label Label for the GIS data object
- * @param string $line_color Color for the GIS data object
+ * @param string $color Color for the GIS data object
* @param array $scale_data Array containing data related to scaling
* @param image $pdf TCPDF instance
*
* @return the modified TCPDF instance
*/
- public abstract function prepareRowAsPdf($spatial, $label, $line_color, $scale_data, $pdf);
+ public abstract function prepareRowAsPdf($spatial, $label, $color, $scale_data, $pdf);
/**
* Prepares the JavaScript related to a row in the GIS dataset to visualize it with OpenLayers.
@@ -50,12 +50,12 @@ abstract class PMA_GIS_Geometry
* @param string $spatial GIS data object
* @param int $srid Spatial reference ID
* @param string $label Label for the GIS data object
- * @param string $point_color Color for the GIS data object
+ * @param string $color Color for the GIS data object
* @param array $scale_data Array containing data related to scaling
*
* @return the JavaScript related to a row in the GIS dataset
*/
- public abstract function prepareRowAsOl($spatial, $srid, $label, $point_color, $scale_data);
+ public abstract function prepareRowAsOl($spatial, $srid, $label, $color, $scale_data);
/**
* Scales each row.
@@ -152,10 +152,49 @@ abstract class PMA_GIS_Geometry
$points_arr[] = $x;
$points_arr[] = $y;
}
- unset($cordinate_arr);
}
return $points_arr;
}
+
+ /**
+ * Generates JavaScriipt for adding points for OpenLayers polygon.
+ *
+ * @param string $polygon points of a polygon in WKT form
+ * @param string $srid spatial reference id
+ *
+ * @return JavaScriipt for adding points for OpenLayers polygon
+ */
+ protected function addPointsForOpenLayersPolygon($polygon, $srid)
+ {
+ $row = 'new OpenLayers.Geometry.Polygon(new Array(';
+ // If the polygon doesnt have an inner polygon
+ if (strpos($polygon, "),(") === false) {
+ $points_arr = $this->extractPoints($polygon, null);
+ $row .= 'new OpenLayers.Geometry.LinearRing(new Array(';
+ foreach ($points_arr as $point) {
+ $row .= '(new OpenLayers.Geometry.Point(' . $point[0] . ', ' . $point[1] . '))'
+ . '.transform(new OpenLayers.Projection("EPSG:' . $srid . '"), map.getProjectionObject()), ';
+ }
+ $row = substr($row, 0, strlen($row) - 2);
+ $row .= '))';
+ } else {
+ // Seperate outer and inner polygons
+ $parts = explode("),(", $polygon);
+ foreach ($parts as $ring) {
+ $points_arr = $this->extractPoints($ring, null);
+ $row .= 'new OpenLayers.Geometry.LinearRing(new Array(';
+ foreach ($points_arr as $point) {
+ $row .= '(new OpenLayers.Geometry.Point(' . $point[0] . ', ' . $point[1] . '))'
+ . '.transform(new OpenLayers.Projection("EPSG:' . $srid . '"), map.getProjectionObject()), ';
+ }
+ $row = substr($row, 0, strlen($row) - 2);
+ $row .= ')), ';
+ }
+ $row = substr($row, 0, strlen($row) - 2);
+ }
+ $row .= ')), ';
+ return $row;
+ }
}
?>
diff --git a/libraries/gis/pma_gis_geometrycollection.php b/libraries/gis/pma_gis_geometrycollection.php
index 43a7cf4..ca48f08 100644
--- a/libraries/gis/pma_gis_geometrycollection.php
+++ b/libraries/gis/pma_gis_geometrycollection.php
@@ -24,8 +24,8 @@ class PMA_GIS_Geometrycollection extends PMA_GIS_Geometry
public static function singleton()
{
if (!isset(self::$_instance)) {
- $c = __CLASS__;
- self::$_instance = new $c;
+ $class = __CLASS__;
+ self::$_instance = new $class;
}
return self::$_instance;
@@ -130,7 +130,7 @@ class PMA_GIS_Geometrycollection extends PMA_GIS_Geometry
$type = substr($sub_part, 0, $type_pos);
$gis_obj = PMA_GIS_Factory::factory($type);
- $image = $gis_obj->prepareRowAsPdf($sub_part, $label, $color, $scale_data, $pdf);
+ $pdf = $gis_obj->prepareRowAsPdf($sub_part, $label, $color, $scale_data, $pdf);
}
return $pdf;
}
diff --git a/libraries/gis/pma_gis_linestring.php b/libraries/gis/pma_gis_linestring.php
index 05483be..dad4f9b 100644
--- a/libraries/gis/pma_gis_linestring.php
+++ b/libraries/gis/pma_gis_linestring.php
@@ -24,8 +24,8 @@ class PMA_GIS_Linestring extends PMA_GIS_Geometry
public static function singleton()
{
if (!isset(self::$_instance)) {
- $c = __CLASS__;
- self::$_instance = new $c;
+ $class = __CLASS__;
+ self::$_instance = new $class;
}
return self::$_instance;
@@ -59,10 +59,10 @@ class PMA_GIS_Linestring extends PMA_GIS_Geometry
public function prepareRowAsPng($spatial, $label, $line_color, $scale_data, $image)
{
// allocate colors
- $r = hexdec(substr($line_color, 1, 2));
- $g = hexdec(substr($line_color, 3, 2));
- $b = hexdec(substr($line_color, 4, 2));
- $color = imagecolorallocate($image, $r, $g, $b);
+ $red = hexdec(substr($line_color, 1, 2));
+ $green = hexdec(substr($line_color, 3, 2));
+ $blue = hexdec(substr($line_color, 4, 2));
+ $color = imagecolorallocate($image, $red, $green, $blue);
// Trim to remove leading 'LINESTRING(' and trailing ')'
$linesrting = substr($spatial, 11, (strlen($spatial) - 12));
@@ -94,10 +94,10 @@ class PMA_GIS_Linestring extends PMA_GIS_Geometry
public function prepareRowAsPdf($spatial, $label, $line_color, $scale_data, $pdf)
{
// allocate colors
- $r = hexdec(substr($line_color, 1, 2));
- $g = hexdec(substr($line_color, 3, 2));
- $b = hexdec(substr($line_color, 4, 2));
- $line = array('width' => 1.5, 'color' => array($r, $g, $b));
+ $red = hexdec(substr($line_color, 1, 2));
+ $green = hexdec(substr($line_color, 3, 2));
+ $blue = hexdec(substr($line_color, 4, 2));
+ $line = array('width' => 1.5, 'color' => array($red, $green, $blue));
// Trim to remove leading 'LINESTRING(' and trailing ')'
$linesrting = substr($spatial, 11, (strlen($spatial) - 12));
diff --git a/libraries/gis/pma_gis_multilinestring.php b/libraries/gis/pma_gis_multilinestring.php
index 9291202..1289a93 100644
--- a/libraries/gis/pma_gis_multilinestring.php
+++ b/libraries/gis/pma_gis_multilinestring.php
@@ -24,8 +24,8 @@ class PMA_GIS_Multilinestring extends PMA_GIS_Geometry
public static function singleton()
{
if (!isset(self::$_instance)) {
- $c = __CLASS__;
- self::$_instance = new $c;
+ $class = __CLASS__;
+ self::$_instance = new $class;
}
return self::$_instance;
@@ -68,10 +68,10 @@ class PMA_GIS_Multilinestring extends PMA_GIS_Geometry
public function prepareRowAsPng($spatial, $label, $line_color, $scale_data, $image)
{
// allocate colors
- $r = hexdec(substr($line_color, 1, 2));
- $g = hexdec(substr($line_color, 3, 2));
- $b = hexdec(substr($line_color, 4, 2));
- $color = imagecolorallocate($image, $r, $g, $b);
+ $red = hexdec(substr($line_color, 1, 2));
+ $green = hexdec(substr($line_color, 3, 2));
+ $blue = hexdec(substr($line_color, 4, 2));
+ $color = imagecolorallocate($image, $red, $green, $blue);
// Trim to remove leading 'MULTILINESTRING((' and trailing '))'
$multilinestirng = substr($spatial, 17, (strlen($spatial) - 19));
@@ -108,10 +108,10 @@ class PMA_GIS_Multilinestring extends PMA_GIS_Geometry
public function prepareRowAsPdf($spatial, $label, $line_color, $scale_data, $pdf)
{
// allocate colors
- $r = hexdec(substr($line_color, 1, 2));
- $g = hexdec(substr($line_color, 3, 2));
- $b = hexdec(substr($line_color, 4, 2));
- $line = array('width' => 1.5, 'color' => array($r, $g, $b));
+ $red = hexdec(substr($line_color, 1, 2));
+ $green = hexdec(substr($line_color, 3, 2));
+ $blue = hexdec(substr($line_color, 4, 2));
+ $line = array('width' => 1.5, 'color' => array($red, $green, $blue));
// Trim to remove leading 'MULTILINESTRING((' and trailing '))'
$multilinestirng = substr($spatial, 17, (strlen($spatial) - 19));
diff --git a/libraries/gis/pma_gis_multipoint.php b/libraries/gis/pma_gis_multipoint.php
index 8b66022..48e9099 100644
--- a/libraries/gis/pma_gis_multipoint.php
+++ b/libraries/gis/pma_gis_multipoint.php
@@ -24,8 +24,8 @@ class PMA_GIS_Multipoint extends PMA_GIS_Geometry
public static function singleton()
{
if (!isset(self::$_instance)) {
- $c = __CLASS__;
- self::$_instance = new $c;
+ $class = __CLASS__;
+ self::$_instance = new $class;
}
return self::$_instance;
@@ -48,21 +48,21 @@ class PMA_GIS_Multipoint extends PMA_GIS_Geometry
/**
* Adds to the PNG image object, the data related to a row in the GIS dataset.
*
- * @param string $spatial GIS MULTIPOINT object
- * @param string $label Label for the GIS MULTIPOINT object
- * @param string $line_color Color for the GIS MULTIPOINT object
- * @param array $scale_data Array containing data related to scaling
- * @param image $image Image object
+ * @param string $spatial GIS MULTIPOINT object
+ * @param string $label Label for the GIS MULTIPOINT object
+ * @param string $point_color Color for the GIS MULTIPOINT object
+ * @param array $scale_data Array containing data related to scaling
+ * @param image $image Image object
*
* @return the modified image object
*/
- public function prepareRowAsPng($spatial, $label, $line_color, $scale_data, $image)
+ public function prepareRowAsPng($spatial, $label, $point_color, $scale_data, $image)
{
// allocate colors
- $r = hexdec(substr($line_color, 1, 2));
- $g = hexdec(substr($line_color, 3, 2));
- $b = hexdec(substr($line_color, 4, 2));
- $color = imagecolorallocate($image, $r, $g, $b);
+ $red = hexdec(substr($point_color, 1, 2));
+ $green = hexdec(substr($point_color, 3, 2));
+ $blue = hexdec(substr($point_color, 4, 2));
+ $color = imagecolorallocate($image, $red, $green, $blue);
// Trim to remove leading 'MULTIPOINT(' and trailing ')'
$multipoint = substr($spatial, 11, (strlen($spatial) - 12));
@@ -78,21 +78,21 @@ class PMA_GIS_Multipoint extends PMA_GIS_Geometry
/**
* Adds to the TCPDF instance, the data related to a row in the GIS dataset.
*
- * @param string $spatial GIS MULTIPOINT object
- * @param string $label Label for the GIS MULTIPOINT object
- * @param string $line_color Color for the GIS MULTIPOINT object
- * @param array $scale_data Array containing data related to scaling
- * @param image $pdf TCPDF instance
+ * @param string $spatial GIS MULTIPOINT object
+ * @param string $label Label for the GIS MULTIPOINT object
+ * @param string $point_color Color for the GIS MULTIPOINT object
+ * @param array $scale_data Array containing data related to scaling
+ * @param image $pdf TCPDF instance
*
* @return the modified TCPDF instance
*/
- public function prepareRowAsPdf($spatial, $label, $line_color, $scale_data, $pdf)
+ public function prepareRowAsPdf($spatial, $label, $point_color, $scale_data, $pdf)
{
// allocate colors
- $r = hexdec(substr($line_color, 1, 2));
- $g = hexdec(substr($line_color, 3, 2));
- $b = hexdec(substr($line_color, 4, 2));
- $line = array('width' => 1.25, 'color' => array($r, $g, $b));
+ $red = hexdec(substr($point_color, 1, 2));
+ $green = hexdec(substr($point_color, 3, 2));
+ $blue = hexdec(substr($point_color, 4, 2));
+ $line = array('width' => 1.25, 'color' => array($red, $green, $blue));
// Trim to remove leading 'MULTIPOINT(' and trailing ')'
$multipoint = substr($spatial, 11, (strlen($spatial) - 12));
diff --git a/libraries/gis/pma_gis_multipolygon.php b/libraries/gis/pma_gis_multipolygon.php
index c0adcd1..db6f6cb 100644
--- a/libraries/gis/pma_gis_multipolygon.php
+++ b/libraries/gis/pma_gis_multipolygon.php
@@ -24,8 +24,8 @@ class PMA_GIS_Multipolygon extends PMA_GIS_Geometry
public static function singleton()
{
if (!isset(self::$_instance)) {
- $c = __CLASS__;
- self::$_instance = new $c;
+ $class = __CLASS__;
+ self::$_instance = new $class;
}
return self::$_instance;
@@ -82,10 +82,10 @@ class PMA_GIS_Multipolygon extends PMA_GIS_Geometry
public function prepareRowAsPng($spatial, $label, $fill_color, $scale_data, $image)
{
// allocate colors
- $r = hexdec(substr($fill_color, 1, 2));
- $g = hexdec(substr($fill_color, 3, 2));
- $b = hexdec(substr($fill_color, 4, 2));
- $color = imagecolorallocate($image, $r, $g, $b);
+ $red = hexdec(substr($fill_color, 1, 2));
+ $green = hexdec(substr($fill_color, 3, 2));
+ $blue = hexdec(substr($fill_color, 4, 2));
+ $color = imagecolorallocate($image, $red, $green, $blue);
// Trim to remove leading 'MULTIPOLYGON(((' and trailing ')))'
$multipolygon = substr($spatial, 15, (strlen($spatial) - 18));
@@ -130,10 +130,10 @@ class PMA_GIS_Multipolygon extends PMA_GIS_Geometry
public function prepareRowAsPdf($spatial, $label, $fill_color, $scale_data, $pdf)
{
// allocate colors
- $r = hexdec(substr($fill_color, 1, 2));
- $g = hexdec(substr($fill_color, 3, 2));
- $b = hexdec(substr($fill_color, 4, 2));
- $color = array($r, $g, $b);
+ $red = hexdec(substr($fill_color, 1, 2));
+ $green = hexdec(substr($fill_color, 3, 2));
+ $blue = hexdec(substr($fill_color, 4, 2));
+ $color = array($red, $green, $blue);
// Trim to remove leading 'MULTIPOLYGON(((' and trailing ')))'
$multipolygon = substr($spatial, 15, (strlen($spatial) - 18));
@@ -257,33 +257,7 @@ class PMA_GIS_Multipolygon extends PMA_GIS_Geometry
. 'new OpenLayers.Geometry.MultiPolygon(new Array(';
foreach ($polygons as $polygon) {
- $row .= 'new OpenLayers.Geometry.Polygon(new Array(';
- // If the polygon doesnt have an inner polygon
- if (strpos($polygon, "),(") === false) {
- $points_arr = $this->extractPoints($polygon, null);
- $row .= 'new OpenLayers.Geometry.LinearRing(new Array(';
- foreach ($points_arr as $point) {
- $row .= '(new OpenLayers.Geometry.Point(' . $point[0] . ', ' . $point[1] . '))'
- . '.transform(new OpenLayers.Projection("EPSG:' . $srid . '"), map.getProjectionObject()), ';
- }
- $row = substr($row, 0, strlen($row) - 2);
- $row .= '))';
- } else {
- // Seperate outer and inner polygons
- $parts = explode("),(", $polygon);
- foreach ($parts as $ring) {
- $points_arr = $this->extractPoints($ring, null);
- $row .= 'new OpenLayers.Geometry.LinearRing(new Array(';
- foreach ($points_arr as $point) {
- $row .= '(new OpenLayers.Geometry.Point(' . $point[0] . ', ' . $point[1] . '))'
- . '.transform(new OpenLayers.Projection("EPSG:' . $srid . '"), map.getProjectionObject()), ';
- }
- $row = substr($row, 0, strlen($row) - 2);
- $row .= ')), ';
- }
- $row = substr($row, 0, strlen($row) - 2);
- }
- $row .= ')), ';
+ $row .= $this->addPointsForOpenLayersPolygon($polygon, $srid);
}
$row = substr($row, 0, strlen($row) - 2);
$row .= ')), null, ' . json_encode($style_options) . '));';
diff --git a/libraries/gis/pma_gis_point.php b/libraries/gis/pma_gis_point.php
index 365eae4..4318572 100644
--- a/libraries/gis/pma_gis_point.php
+++ b/libraries/gis/pma_gis_point.php
@@ -24,8 +24,8 @@ class PMA_GIS_Point extends PMA_GIS_Geometry
public static function singleton()
{
if (!isset(self::$_instance)) {
- $c = __CLASS__;
- self::$_instance = new $c;
+ $class = __CLASS__;
+ self::$_instance = new $class;
}
return self::$_instance;
@@ -48,21 +48,21 @@ class PMA_GIS_Point extends PMA_GIS_Geometry
/**
* Adds to the PNG image object, the data related to a row in the GIS dataset.
*
- * @param string $spatial GIS POINT object
- * @param string $label Label for the GIS POINT object
- * @param string $line_color Color for the GIS POINT object
- * @param array $scale_data Array containing data related to scaling
- * @param image $image Image object
+ * @param string $spatial GIS POINT object
+ * @param string $label Label for the GIS POINT object
+ * @param string $point_color Color for the GIS POINT object
+ * @param array $scale_data Array containing data related to scaling
+ * @param image $image Image object
*
* @return the modified image object
*/
- public function prepareRowAsPng($spatial, $label, $line_color, $scale_data, $image)
+ public function prepareRowAsPng($spatial, $label, $point_color, $scale_data, $image)
{
// allocate colors
- $r = hexdec(substr($line_color, 1, 2));
- $g = hexdec(substr($line_color, 3, 2));
- $b = hexdec(substr($line_color, 4, 2));
- $color = imagecolorallocate($image, $r, $g, $b);
+ $red = hexdec(substr($point_color, 1, 2));
+ $green = hexdec(substr($point_color, 3, 2));
+ $blue = hexdec(substr($point_color, 4, 2));
+ $color = imagecolorallocate($image, $red, $green, $blue);
// Trim to remove leading 'POINT(' and trailing ')'
$point = substr($spatial, 6, (strlen($spatial) - 7));
@@ -76,21 +76,21 @@ class PMA_GIS_Point extends PMA_GIS_Geometry
/**
* Adds to the TCPDF instance, the data related to a row in the GIS dataset.
*
- * @param string $spatial GIS POINT object
- * @param string $label Label for the GIS POINT object
- * @param string $line_color Color for the GIS POINT object
- * @param array $scale_data Array containing data related to scaling
- * @param image $pdf TCPDF instance
+ * @param string $spatial GIS POINT object
+ * @param string $label Label for the GIS POINT object
+ * @param string $point_color Color for the GIS POINT object
+ * @param array $scale_data Array containing data related to scaling
+ * @param image $pdf TCPDF instance
*
* @return the modified TCPDF instance
*/
- public function prepareRowAsPdf($spatial, $label, $line_color, $scale_data, $pdf)
+ public function prepareRowAsPdf($spatial, $label, $point_color, $scale_data, $pdf)
{
// allocate colors
- $r = hexdec(substr($line_color, 1, 2));
- $g = hexdec(substr($line_color, 3, 2));
- $b = hexdec(substr($line_color, 4, 2));
- $line = array('width' => 1.25, 'color' => array($r, $g, $b));
+ $red = hexdec(substr($point_color, 1, 2));
+ $green = hexdec(substr($point_color, 3, 2));
+ $blue = hexdec(substr($point_color, 4, 2));
+ $line = array('width' => 1.25, 'color' => array($red, $green, $blue));
// Trim to remove leading 'POINT(' and trailing ')'
$point = substr($spatial, 6, (strlen($spatial) - 7));
diff --git a/libraries/gis/pma_gis_polygon.php b/libraries/gis/pma_gis_polygon.php
index 5da0d25..ce8ffa8 100644
--- a/libraries/gis/pma_gis_polygon.php
+++ b/libraries/gis/pma_gis_polygon.php
@@ -24,8 +24,8 @@ class PMA_GIS_Polygon extends PMA_GIS_Geometry
public static function singleton()
{
if (!isset(self::$_instance)) {
- $c = __CLASS__;
- self::$_instance = new $c;
+ $class = __CLASS__;
+ self::$_instance = new $class;
}
return self::$_instance;
@@ -77,10 +77,10 @@ class PMA_GIS_Polygon extends PMA_GIS_Geometry
public function prepareRowAsPng($spatial, $label, $fill_color, $scale_data, $image)
{
// allocate colors
- $r = hexdec(substr($fill_color, 1, 2));
- $g = hexdec(substr($fill_color, 3, 2));
- $b = hexdec(substr($fill_color, 4, 2));
- $color = imagecolorallocate($image, $r, $g, $b);
+ $red = hexdec(substr($fill_color, 1, 2));
+ $green = hexdec(substr($fill_color, 3, 2));
+ $blue = hexdec(substr($fill_color, 4, 2));
+ $color = imagecolorallocate($image, $red, $green, $blue);
// Trim to remove leading 'POLYGON((' and trailing '))'
$polygon = substr($spatial, 9, (strlen($spatial) - 11));
@@ -122,10 +122,10 @@ class PMA_GIS_Polygon extends PMA_GIS_Geometry
public function prepareRowAsPdf($spatial, $label, $fill_color, $scale_data, $pdf)
{
// allocate colors
- $r = hexdec(substr($fill_color, 1, 2));
- $g = hexdec(substr($fill_color, 3, 2));
- $b = hexdec(substr($fill_color, 4, 2));
- $color = array($r, $g, $b);
+ $red = hexdec(substr($fill_color, 1, 2));
+ $green = hexdec(substr($fill_color, 3, 2));
+ $blue = hexdec(substr($fill_color, 4, 2));
+ $color = array($red, $green, $blue);
// Trim to remove leading 'POLYGON((' and trailing '))'
$polygon = substr($spatial, 9, (strlen($spatial) - 11));
@@ -234,34 +234,9 @@ class PMA_GIS_Polygon extends PMA_GIS_Geometry
// Trim to remove leading 'POLYGON((' and trailing '))'
$polygon = substr($spatial, 9, (strlen($spatial) - 11));
- $row .= 'vectorLayer.addFeatures(new OpenLayers.Feature.Vector('
- . 'new OpenLayers.Geometry.Polygon(new Array(';
- // If the polygon doesnt have an inner polygon
- if (strpos($polygon, "),(") === false) {
- $points_arr = $this->extractPoints($polygon, null);
- $row .= 'new OpenLayers.Geometry.LinearRing(new Array(';
- foreach ($points_arr as $point) {
- $row .= '(new OpenLayers.Geometry.Point(' . $point[0] . ', ' . $point[1] . '))'
- . '.transform(new OpenLayers.Projection("EPSG:' . $srid . '"), map.getProjectionObject()), ';
- }
- $row = substr($row, 0, strlen($row) - 2);
- $row .= '))';
- } else {
- // Seperate outer and inner polygons
- $parts = explode("),(", $polygon);
- foreach ($parts as $ring) {
- $points_arr = $this->extractPoints($ring, null);
- $row .= 'new OpenLayers.Geometry.LinearRing(new Array(';
- foreach ($points_arr as $point) {
- $row .= '(new OpenLayers.Geometry.Point(' . $point[0] . ', ' . $point[1] . '))'
- . '.transform(new OpenLayers.Projection("EPSG:' . $srid . '"), map.getProjectionObject()), ';
- }
- $row = substr($row, 0, strlen($row) - 2);
- $row .= ')), ';
- }
- $row = substr($row, 0, strlen($row) - 2);
- }
- $row .= ')), null, ' . json_encode($style_options) . '));';
+ $row .= 'vectorLayer.addFeatures(new OpenLayers.Feature.Vector(';
+ $row .= $this->addPointsForOpenLayersPolygon($polygon, $srid);
+ $row .= 'null, ' . json_encode($style_options) . '));';
return $row;
}
hooks/post-receive
--
phpMyAdmin
1
0