Merge remote-tracking branch 'origin/master' into aris

libraries/common.lib.php

@@ -891,9 +891,9 @@ function PMA_reloadNavigation($jsonly=false)
         unset($_SESSION['tmp_user_values']['table_limit_offset']);
         echo "\n";
         $reload_url = './navigation.php?' . PMA_generate_common_url($GLOBALS['db'], '', '&');
-	if (!$jsonly)
-	  echo '<script type="text/javascript">' . PHP_EOL;
-	?>
+        if (!$jsonly)
+          echo '<script type="text/javascript">' . PHP_EOL;
+    ?>
 //<![CDATA[
 if (typeof(window.parent) != 'undefined'
     && typeof(window.parent.frame_navigation) != 'undefined'
@@ -1430,9 +1430,13 @@ function PMA_localizeNumber($value)
  */
 function PMA_formatNumber($value, $length = 3, $comma = 0, $only_down = false)
 {
+    $originalValue = $value;
     //number_format is not multibyte safe, str_replace is safe
     if ($length === 0) {
-        return PMA_localizeNumber(number_format($value, $comma));
+        $value = number_format($value, $comma);
+        if($originalValue!=0 && floatval($value) == 0) $value = ' <'.(1/PMA_pow(10,$comma));
+        
+        return PMA_localizeNumber($value);
     }
 
     // this units needs no translation, ISO
@@ -1494,6 +1498,8 @@ function PMA_formatNumber($value, $length = 3, $comma = 0, $only_down = false)
 
     //number_format is not multibyte safe, str_replace is safe
     $value = PMA_localizeNumber(number_format($value, $comma));
+    
+    if($originalValue!=0 && floatval($value) == 0) return ' <'.(1/PMA_pow(10,$comma)).' '.$unit;
 
     return $sign . $value . ' ' . $unit;
 } // end of the 'PMA_formatNumber' function
@@ -1644,10 +1650,10 @@ function PMA_generate_html_tab($tab, $url_params = array())
         $tab['attr'] .= ' title="' . htmlspecialchars($tab['warning']) . '"';
     }
 
-	// 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'])) {
-		$url_params = array_merge($url_params, $tab['url_params']);
-	}
+    // 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'])) {
+        $url_params = array_merge($url_params, $tab['url_params']);
+    }
 
     // build the link
     if (!empty($tab['link'])) {
@@ -2937,8 +2943,8 @@ function PMA_browseUploadFile($max_upload_size) {
  * @param $uploaddir
  */
 function PMA_selectUploadFile($import_list, $uploaddir) {
-	echo '<label for="radio_local_import_file">' . sprintf(__("Select from the web server upload directory <b>%s</b>:"), htmlspecialchars(PMA_userDir($uploaddir))) . '</label>';
-	$extensions = '';
+    echo '<label for="radio_local_import_file">' . sprintf(__("Select from the web server upload directory <b>%s</b>:"), htmlspecialchars(PMA_userDir($uploaddir))) . '</label>';
+    $extensions = '';
     foreach ($import_list as $key => $val) {
         if (!empty($extensions)) {
             $extensions .= '|';

libraries/display_tbl.lib.php

@@ -445,7 +445,7 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
     global $sql_query, $num_rows;
     global $vertical_display, $highlight_columns;
 
-    // required to generate sort links that will remember whether the 
+    // required to generate sort links that will remember whether the
     // "Show all" button has been clicked
     $sql_md5 = md5($GLOBALS['sql_query']);
     $session_max_rows = $_SESSION['tmp_user_values']['query'][$sql_md5]['max_rows'];
@@ -2387,7 +2387,7 @@ function PMA_handle_non_printable_contents($category, $content, $transform_funct
     } elseif (isset($content)) {
         $size = strlen($content);
         $display_size = PMA_formatByteDown($size, 3, 1);
-        $result .= ' - '. $display_size[0] . ' ' . $display_size[1];
+        $result .= ' - '. $display_size[0] . ' ' . $display_size[1];
     }
     $result .= ']';
 

libraries/server_links.inc.php

@@ -34,6 +34,7 @@ if (!$GLOBALS['is_ajax_request']) {
 
     /**
      * Displays tab links
+     * Put the links we assume are used less, towards the end
      */
     $tabs = array();
 
@@ -49,11 +50,6 @@ if (!$GLOBALS['is_ajax_request']) {
     $tabs['status']['link'] = 'server_status.php';
     $tabs['status']['text'] = __('Status');
 
-    if (! empty($binary_logs)) {
-        $tabs['binlog']['icon'] = 's_tbl.png';
-        $tabs['binlog']['link'] = 'server_binlog.php';
-        $tabs['binlog']['text'] = __('Binary log');
-    }
     $tabs['process']['icon'] = 's_process.png';
     $tabs['process']['link'] = 'server_processlist.php';
     $tabs['process']['text'] = __('Processes');
@@ -72,6 +68,28 @@ if (!$GLOBALS['is_ajax_request']) {
     $tabs['import']['link'] = 'server_import.php';
     $tabs['import']['text'] = __('Import');
 
+    $tabs['settings']['icon'] = 'b_tblops.png';
+    $tabs['settings']['link'] = 'prefs_manage.php';
+    $tabs['settings']['text'] = __('Settings');
+    $tabs['settings']['active'] = in_array(basename($GLOBALS['PMA_PHP_SELF']),
+        array('prefs_forms.php', 'prefs_manage.php'));
+
+    $tabs['synchronize']['icon'] = 's_sync.png';
+    $tabs['synchronize']['link'] = 'server_synchronize.php';
+    $tabs['synchronize']['text'] = __('Synchronize');
+
+    if (! empty($binary_logs)) {
+        $tabs['binlog']['icon'] = 's_tbl.png';
+        $tabs['binlog']['link'] = 'server_binlog.php';
+        $tabs['binlog']['text'] = __('Binary log');
+    }
+
+    if ($is_superuser) {
+        $tabs['replication']['icon'] = 's_replication.png';
+        $tabs['replication']['link'] = 'server_replication.php';
+        $tabs['replication']['text'] = __('Replication');
+    }
+
     $tabs['vars']['icon'] = 's_vars.png';
     $tabs['vars']['link'] = 'server_variables.php';
     $tabs['vars']['text'] = __('Variables');
@@ -84,22 +102,6 @@ if (!$GLOBALS['is_ajax_request']) {
     $tabs['engine']['link'] = 'server_engines.php';
     $tabs['engine']['text'] = __('Engines');
 
-    if ($is_superuser) {
-        $tabs['replication']['icon'] = 's_replication.png';
-        $tabs['replication']['link'] = 'server_replication.php';
-        $tabs['replication']['text'] = __('Replication');
-    }
-
-    $tabs['synchronize']['icon'] = 's_sync.png';
-    $tabs['synchronize']['link'] = 'server_synchronize.php';
-    $tabs['synchronize']['text'] = __('Synchronize');
-
-    $tabs['settings']['icon'] = 'b_tblops.png';
-    $tabs['settings']['link'] = 'prefs_manage.php';
-    $tabs['settings']['text'] = __('Settings');
-    $tabs['settings']['active'] = in_array(basename($GLOBALS['PMA_PHP_SELF']),
-        array('prefs_forms.php', 'prefs_manage.php'));
-
     echo PMA_generate_html_tabs($tabs, array());
     unset($tabs);