Replace tabs with spaces, cleanup identation

ossguy · Jul 22, 2011 · d553062 · d553062
1 parent 3f8badd
commit d553062
Show file tree

Hide file tree

Showing 43 changed files with 413 additions and 413 deletions.
diff --git a/Documentation.html b/Documentation.html
@@ -59,10 +59,10 @@ <h2 id="require">Requirements</h2>
 <ul><li><b>PHP</b>
         <ul><li>You need PHP 5.2.0 or newer, with <tt>session</tt> support
                 (<a href="#faq1_31">see
-			<abbr title="Frequently Asked Questions">FAQ</abbr> 1.31</a>)
-		, the Standard PHP Library (SPL) extension and JSON support.
+            <abbr title="Frequently Asked Questions">FAQ</abbr> 1.31</a>)
+        , the Standard PHP Library (SPL) extension and JSON support.
                 </li>
-		<li>To support uploading of ZIP files, you need the PHP <tt>zip</tt> extension.</li>
+        <li>To support uploading of ZIP files, you need the PHP <tt>zip</tt> extension.</li>
         <li>For proper support of multibyte strings (eg. UTF-8, which is
             currently the default), you should install the mbstring and ctype
             extensions.
@@ -778,7 +778,7 @@ <h2 id="config">Configuration</h2>
 
         Please see the <a href="#setup">install section</a> on &quot;Using authentication modes&quot;
         for more information.
-	</dd>
+    </dd>
     <dt id="servers_auth_http_realm">
     <span id="cfg_Servers_auth_http_realm">$cfg['Servers'][$i]['auth_http_realm']</span> string<br />
     </dt>
@@ -1244,10 +1244,10 @@ <h2 id="config">Configuration</h2>
     </dd>
     <dt><span id="cfg_Servers_AllowNoPassword">$cfg['Servers'][$i]['AllowNoPassword']</span>
         boolean</dt>
-	<dd>Whether to allow logins without a password. The default
-	value of <tt>false</tt> for this parameter prevents unintended access 
-	to a MySQL server with was left with an empty password for root or
-	on which an anonymous (blank) user is defined.
+    <dd>Whether to allow logins without a password. The default
+    value of <tt>false</tt> for this parameter prevents unintended access 
+    to a MySQL server with was left with an empty password for root or
+    on which an anonymous (blank) user is defined.
     </dd>
     <dt id="servers_allowdeny_order">
         <span id="cfg_Servers_AllowDeny_order">$cfg['Servers'][$i]['AllowDeny']['order']</span> string
@@ -2078,14 +2078,14 @@ <h2 id="config">Configuration</h2>
 
         This is needed for native MS Excel export, see
         <a href="#faq6_23"><abbr title="Frequently Asked Questions">FAQ</abbr>
-		6.23</a> and to work around limitations of 
-	<tt>open_basedir</tt> for uploaded
+        6.23</a> and to work around limitations of 
+    <tt>open_basedir</tt> for uploaded
         files, see <a href="#faq1_11"><abbr title="Frequently Asked Questions">FAQ</abbr>
         1.11</a>.
         <br /><br />
 
-	If the directory where phpMyAdmin is installed is subject to an
-	<tt>open_basedir</tt> restriction, you need to create a
+    If the directory where phpMyAdmin is installed is subject to an
+    <tt>open_basedir</tt> restriction, you need to create a
         temporary directory in some directory accessible by the web
         server. However for security reasons, this directory should be outside
         the tree published by webserver. If you cannot avoid having this
@@ -3105,7 +3105,7 @@ <h4 id="faq1_38">
 
     <p>
         You can also disable the warning using the <a href="#cfg_SuhosinDisableWarning">
-	    <tt>SuhosinDisableWarning</tt> directive</a>.
+        <tt>SuhosinDisableWarning</tt> directive</a>.
     </p>
 
 <h4 id="faq1_39">
@@ -3120,7 +3120,7 @@ <h4 id="faq1_40">
     <a href="#faq1_40">1.40 When accessing phpMyAdmin via an Apache reverse proxy, cookie login does not work.</a></h4>
 
 <p>To be able to use cookie auth Apache must know that it has to rewrite the set-cookie headers.<br />
-	Example from the Apache 2.2 documentation:</p>
+    Example from the Apache 2.2 documentation:</p>
 <pre>
 ProxyPass /mirror/foo/ http://backend.example.com/
 ProxyPassReverse /mirror/foo/ http://backend.example.com/
@@ -3129,9 +3129,9 @@ <h4 id="faq1_40">
 </pre>
 
 <p>Note: if the backend url looks like http://host/~user/phpmyadmin,
-	the tilde (~) must be url encoded as %7E in the ProxyPassReverse* lines.
-	This is not specific to phpmyadmin, it's just the behavior of Apache.
-	</p>
+    the tilde (~) must be url encoded as %7E in the ProxyPassReverse* lines.
+    This is not specific to phpmyadmin, it's just the behavior of Apache.
+    </p>
 
 <pre>
 ProxyPass /mirror/foo/ http://backend.example.com/~user/phpmyadmin
@@ -3140,12 +3140,12 @@ <h4 id="faq1_40">
 ProxyPassReverseCookiePath /%7Euser/phpmyadmin /mirror/foo
 </pre>
 
-	<p>See <a href="http://httpd.apache.org/docs/2.2/mod/mod_proxy.html">http://httpd.apache.org/docs/2.2/mod/mod_proxy.html</a>
-	for more details.</p>
+    <p>See <a href="http://httpd.apache.org/docs/2.2/mod/mod_proxy.html">http://httpd.apache.org/docs/2.2/mod/mod_proxy.html</a>
+    for more details.</p>
 
 <h4 id="faq1_41">
-	<a href="#faq1_41">1.41 When I view a database and ask to see its
-	       privileges, I get an error about an unknown column.</a></h4>
+    <a href="#faq1_41">1.41 When I view a database and ask to see its
+           privileges, I get an error about an unknown column.</a></h4>
 
 <p> The MySQL server's privilege tables are not up to date, you need to run
 the <tt>mysql_upgrade</tt> command on the server.</p>
@@ -4294,7 +4294,7 @@ <h4 id="faq6_24">
     ones is done whenever you enter Structure page for this table.</p>
 
 <h4 id="faq6_25">
-	<a href="#faq6_25">6.25 How does BLOB streaming work in phpMyAdmin?</a></h4>
+    <a href="#faq6_25">6.25 How does BLOB streaming work in phpMyAdmin?</a></h4>
 
 <p> For general information about BLOB streaming on MySQL, visit <a href="http://blobstreaming.org">blobstreaming.org</a>. You need the following components:</p>
 <ul>
@@ -4308,11 +4308,11 @@ <h4 id="faq6_25">
 <p>Here are details about configuration and operation:</p>
 
 <ol>
-	<li>In <tt>config.inc.php</tt> your host should be defined with a FQDN (fully qualified domain name) instead of &quot;localhost&quot;.</li>
+    <li>In <tt>config.inc.php</tt> your host should be defined with a FQDN (fully qualified domain name) instead of &quot;localhost&quot;.</li>
     <li>Ensure that your target table is under the <tt>PBXT</tt> storage engine and has a <tt>LONGBLOB</tt> column (which must be nullable if you want to remove the BLOB reference from it).</li>
-	<li>When you insert or update a row in this table, put a checkmark on the &quot;Upload to BLOB repository&quot; optional choice; otherwise, the upload will be done directly in your LONGBLOB column instead of the repository.</li>
-	<li>Finally when you browse your table, you'll see in your column a link to stream your data, for example &quot;View image&quot;. A header containing the correct MIME-type will be sent to your browser; this MIME-type was stored at upload time.</li> 
-</ol>	
+    <li>When you insert or update a row in this table, put a checkmark on the &quot;Upload to BLOB repository&quot; optional choice; otherwise, the upload will be done directly in your LONGBLOB column instead of the repository.</li>
+    <li>Finally when you browse your table, you'll see in your column a link to stream your data, for example &quot;View image&quot;. A header containing the correct MIME-type will be sent to your browser; this MIME-type was stored at upload time.</li> 
+</ol>    
 
 <h4 id="faq6_26">
     <a href="#faq6_26">6.26 How can I select a range of rows?</a></h4>

diff --git a/db_qbe.php b/db_qbe.php
@@ -182,7 +182,7 @@ function showColumnSelectCell($columns, $column_number, $selected = '')
     if (isset($tab_designer['link'])) {
 ?>
 <div id="visual_builder_anchor" class="notice hide">
-	<span id="footnote_1">
+    <span id="footnote_1">
 <?php echo __('Switch to') . ' <a href="' . $tab_designer['link'] . PMA_get_arg_separator('html') . 'query=1">' . __('visual builder') . '</a>'; ?>
     </span>
 </div>

diff --git a/import_status.php b/import_status.php
@@ -18,7 +18,7 @@
     header('Content-type: text/html');
 
     // wait 0.3 sec before we check for $_SESSION variable, which is set inside import.php
-	usleep(300000);
+    usleep(300000);
 
     // wait until message is available
     while ($_SESSION['Import_message']['message'] == null) {
@@ -27,7 +27,7 @@
 
     echo $_SESSION['Import_message']['message'];
     echo '<fieldset class="tblFooters">' . "\n";
-    echo '	[ <a href="' . $_SESSION['Import_message']['go_back_url'] . '">' . __('Back') . '</a> ]' . "\n";
+    echo '    [ <a href="' . $_SESSION['Import_message']['go_back_url'] . '">' . __('Back') . '</a> ]' . "\n";
     echo '</fieldset>'."\n";
 
 } else {

diff --git a/js/db_structure.js b/js/db_structure.js
@@ -69,8 +69,8 @@ $(document).ready(function() {
         if ($("#insert_table_dialog").length > 0) {
             $("#insert_table_dialog").remove();
         }
-       	var $div = $('<div id="insert_table_dialog"></div>');
-       	var target = "tbl_change.php";
+           var $div = $('<div id="insert_table_dialog"></div>');
+           var target = "tbl_change.php";
 
         /**
          *  @var    button_options  Object that stores the options passed to jQueryUI

diff --git a/js/server_status.js b/js/server_status.js
@@ -406,7 +406,7 @@ $(function() {
                                }
                             }
                         }
-                    },		
+                    },        
                     tooltip: {
                         formatter: function() { 
                             return '<b>' + this.point.name + '</b><br/>' + Highcharts.numberFormat(this.y, 2) + '<br/>(' + Highcharts.numberFormat(this.percentage, 2) + ' %)'; 
@@ -1576,12 +1576,12 @@ $(function() {
                     if(data.numRows > 12) {
                         $('div#logTable').prepend(
                             '<fieldset id="logDataFilter">' +
-                            '	<legend>Filters</legend>' +
-                            '	<div class="formelement">' +
-                            '		<label for="filterQueryText">Filter queries by word/regexp:</label>' +
-                            '		<input name="filterQueryText" type="text" id="filterQueryText" style="vertical-align: baseline;" />' +
+                            '    <legend>Filters</legend>' +
+                            '    <div class="formelement">' +
+                            '        <label for="filterQueryText">Filter queries by word/regexp:</label>' +
+                            '        <input name="filterQueryText" type="text" id="filterQueryText" style="vertical-align: baseline;" />' +
                             ((data.numRows > 250) ? ' <button name="startFilterQueryText" id="startFilterQueryText">Filter</button>' : '') +                        
-                            '	</div>' +
+                            '    </div>' +
                             '</fieldset>'
                         );
 

diff --git a/js/tbl_chart.js b/js/tbl_chart.js
@@ -22,7 +22,7 @@ $(document).ready(function() {
                 false
             );
         }
-    });	
+    });    
 
     var currentSettings = {
         chart: { 

diff --git a/js/tbl_select.js b/js/tbl_select.js
@@ -70,7 +70,7 @@ $(document).ready(function() {
                 $("#sqlqueryresults").trigger('makegrid');
                 $('#tbl_search_form')
                 // work around for bug #3168569 - Issue on toggling the "Hide search criteria" in chrome.
-                 .slideToggle()	
+                 .slideToggle()    
                  .hide();
                 $('#togglesearchformlink')
                  // always start with the Show message

diff --git a/js/tbl_structure.js b/js/tbl_structure.js
@@ -342,10 +342,10 @@ $(document).ready(function() {
 /**
  * Loads the append_fields_form to the Change dialog allowing users
  * to change the columns
- * @param   string	action  Variable which parses the name of the
- * 							destination file
- * @param   string	$url    Variable which parses the data for the
- * 							post action
+ * @param   string    action  Variable which parses the name of the
+ *                             destination file
+ * @param   string    $url    Variable which parses the data for the
+ *                             post action
  */
 function changeColumns(action,url) {
     /*Remove the hidden dialogs if there are*/

diff --git a/libraries/StorageEngine.class.php b/libraries/StorageEngine.class.php
@@ -186,20 +186,20 @@ function getHtmlVariables()
         return $ret;
     }
 
-	/**
-	 * returns the engine specific handling for
-	 * PMA_ENGINE_DETAILS_TYPE_SIZE type variables.
-	 *
-	 * This function should be overridden when
-	 * PMA_ENGINE_DETAILS_TYPE_SIZE type needs to be
-	 * handled differently for a particular engine.
-	 *
-	 * @return string the formatted value and its unit
-	 */
-	function resolveTypeSize($value)
-	{
-		return PMA_formatByteDown($value);
-	}
+    /**
+     * returns the engine specific handling for
+     * PMA_ENGINE_DETAILS_TYPE_SIZE type variables.
+     *
+     * This function should be overridden when
+     * PMA_ENGINE_DETAILS_TYPE_SIZE type needs to be
+     * handled differently for a particular engine.
+     *
+     * @return string the formatted value and its unit
+     */
+    function resolveTypeSize($value)
+    {
+        return PMA_formatByteDown($value);
+    }
 
     /**
      * returns array with detailed info about engine specific server variables
@@ -276,7 +276,7 @@ function __construct($engine)
             }
         } else {
             $this->engine_init();
-		}
+        }
     }
 
     /**

diff --git a/libraries/Tracker.class.php b/libraries/Tracker.class.php
@@ -472,7 +472,7 @@ static private function changeTracking($dbname, $tablename, $version, $new_state
      * @param string $dbname       name of database
      * @param string $tablename    name of table
      * @param string $version      version
-     * @param string $type      	type of data(DDL || DML)
+     * @param string $type          type of data(DDL || DML)
      * @param string || array $new_data   the new tracking data
      *
      * @return bool result of change

diff --git a/libraries/auth/http.auth.lib.php b/libraries/auth/http.auth.lib.php
@@ -42,7 +42,7 @@ function PMA_auth()
     header('WWW-Authenticate: Basic realm="' . $realm_message .  '"');
     header('HTTP/1.0 401 Unauthorized');
     if (php_sapi_name() !== 'cgi-fcgi') {
-	header('status: 401 Unauthorized');
+        header('status: 401 Unauthorized');
     }
 
     // Defines the charset to be used

diff --git a/libraries/auth/signon.auth.lib.php b/libraries/auth/signon.auth.lib.php
@@ -121,7 +121,7 @@ function PMA_auth_check()
             }
         }
         if (isset($_SESSION['PMA_single_signon_host'])) {
-	        $single_signon_host = $_SESSION['PMA_single_signon_host'];
+            $single_signon_host = $_SESSION['PMA_single_signon_host'];
         }
 
         if (isset($_SESSION['PMA_single_signon_port'])) {

diff --git a/libraries/common.inc.php b/libraries/common.inc.php
@@ -997,9 +997,9 @@
  * true
  */
 if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
-	$GLOBALS['is_ajax_request'] = true;
+    $GLOBALS['is_ajax_request'] = true;
 } else {
-	$GLOBALS['is_ajax_request'] = false;
+    $GLOBALS['is_ajax_request'] = false;
 }
 
 /**

diff --git a/libraries/config.values.php b/libraries/config.values.php
@@ -68,10 +68,10 @@
     'tbl_change.php',    // insert row page
     'sql.php');          // browse page
 $cfg_db['QueryWindowDefTab'] = array(
-	'sql',     // SQL
-	'files',   // Import files
-	'history', // SQL history
-	'full');   // All (SQL and SQL history)
+    'sql',     // SQL
+    'files',   // Import files
+    'history', // SQL history
+    'full');   // All (SQL and SQL history)
 $cfg_db['InitialSlidersState'] = array('open' => __('Open'), 'closed' => __('Closed'));
 $cfg_db['Import']['format'] = array(
     'csv',    // CSV

diff --git a/libraries/config/FormDisplay.class.php b/libraries/config/FormDisplay.class.php
@@ -334,8 +334,8 @@ private function _displayFieldInput(Form $form, $field, $system_path, $work_path
                 }
                 return;
             case 'NULL':
-            	trigger_error("Field $system_path has no type", E_USER_WARNING);
-            	return;
+                trigger_error("Field $system_path has no type", E_USER_WARNING);
+                return;
         }
 
         // TrustedProxies requires changes before displaying

diff --git a/libraries/config/config_functions.lib.php b/libraries/config/config_functions.lib.php
@@ -67,9 +67,9 @@ function PMA_lang($lang_key)
 function PMA_lang_name($canonical_path, $type = 'name', $default = 'key')
 {
     $lang_key = str_replace(
-    	array('Servers/1/', '/'),
-    	array('Servers/', '_'),
-    	$canonical_path) . '_' . $type;
+        array('Servers/1/', '/'),
+        array('Servers/', '_'),
+        $canonical_path) . '_' . $type;
     return isset($GLOBALS["strConfig$lang_key"])
         ? ($type == 'desc' ? PMA_lang($lang_key) : $GLOBALS["strConfig$lang_key"])
         : ($default == 'key' ? $lang_key : $default);

diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php
@@ -224,7 +224,7 @@
     'DefaultTabServer',
     'DefaultTabDatabase',
     'DefaultTabTable',
-	'QueryWindowDefTab');
+    'QueryWindowDefTab');
 $forms['Import']['Import_defaults'] = array('Import' => array(
     'format',
     'charset',

diff --git a/libraries/config/validate.lib.php b/libraries/config/validate.lib.php
@@ -132,7 +132,7 @@ function PMA_config_validate($validator_id, &$values, $isPostSource)
 
 /**
  * Empty error handler, used to temporarily restore PHP internal error handler
- * 
+ *
  * @return bool
  */
 function PMA_null_error_handler()
@@ -337,8 +337,8 @@ function validate_trusted_proxies($path, $values)
         $lines = array();
         foreach ($values[$path] as $ip => $v) {
             $lines[] = preg_match('/^-\d+$/', $ip)
-            	? $v
-            	: $ip . ': ' . $v;
+                ? $v
+                : $ip . ': ' . $v;
         }
     } else {
         // AJAX validation
@@ -441,7 +441,7 @@ function validate_by_regex($path, $values, $regex)
 
 /**
  * Validates upper bound for numeric inputs
- * 
+ *
  * @param string $path
  * @param array  $values
  * @param int    $max_value
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,7 +22,7 @@ $(document).ready(function() { @@
                     false
                 );
             }
-        });
+        });
         var currentSettings = {
             chart: {
@@ Expand Down @@