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

Conflicts: db_structure.php libraries/database_interface.lib.php libraries/server_synchronize.lib.php server_status.php sql.php
darshanasbg · Jul 22, 2011 · 3586bb9 · 3586bb9
2 parents 74a00a1 + d8f6e7d
commit 3586bb9
Show file tree

Hide file tree

Showing 222 changed files with 47,786 additions and 47,284 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
@@ -2079,14 +2079,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
@@ -3106,7 +3106,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">
@@ -3121,7 +3121,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/
@@ -3130,9 +3130,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
@@ -3141,12 +3141,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>
@@ -4295,7 +4295,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>
@@ -4309,11 +4309,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/chart_export.php b/chart_export.php
@@ -11,12 +11,12 @@
 
 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 @@
     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
@@ -50,7 +50,7 @@
     /**
      * 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);
     }
 
@@ -64,7 +64,7 @@
     /**
      * 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_datadict.php b/db_datadict.php
@@ -91,7 +91,7 @@
             $pk_array[$row['Column_name']] = 1;
         }
         // Retains keys informations
-        if ($row['Key_name'] != $lastIndex){
+        if ($row['Key_name'] != $lastIndex) {
             $indexes[] = $row['Key_name'];
             $lastIndex = $row['Key_name'];
         }

diff --git a/db_export.php b/db_export.php
@@ -49,14 +49,14 @@
 }
 
 // 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
@@ -301,7 +301,7 @@
      * 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_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/db_search.php b/db_search.php
@@ -92,7 +92,7 @@
  */
 $sub_part = '';
 
-if( $GLOBALS['is_ajax_request'] != true) {
+if ( $GLOBALS['is_ajax_request'] != true) {
     require './libraries/db_info.inc.php';
     echo '<div id="searchresults">';
 }
@@ -113,10 +113,10 @@
      * explode
      * count
      * strlen
-     * @param   string   the table name
-     * @param   string   restrict the search to this field
-     * @param   string   the string to search
-     * @param   integer  type of search (1 -> 1 word at least, 2 -> all words,
+     * @param string   the table name
+     * @param string   restrict the search to this field
+     * @param string   the string to search
+     * @param integer  type of search (1 -> 1 word at least, 2 -> all words,
      *                                   3 -> exact string, 4 -> regexp)
      *
      * @return  array    3 SQL querys (for count, display and delete results)
@@ -262,7 +262,7 @@ function PMA_getSearchSqls($table, $field, $search_str, $search_option)
 /**
  * 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
@@ -62,17 +62,17 @@
 
 // 1. No tables
 if ($num_tables == 0) {
-	echo '<p>' . __('No tables found in database') . '</p>' . "\n";
+    echo '<p>' . __('No tables found in database') . '</p>' . "\n";
 
-	if (empty($db_is_information_schema)) {
-		require './libraries/display_create_table.lib.php';
-	} // end if (Create Table dialog)
+    if (empty($db_is_information_schema)) {
+        require './libraries/display_create_table.lib.php';
+    } // end if (Create Table dialog)
 
-	/**
-	 * Displays the footer
-	 */
-	require_once './libraries/footer.inc.php';
-	exit;
+    /**
+     * Displays the footer
+     */
+    require_once './libraries/footer.inc.php';
+    exit;
 }
 
 // else
@@ -183,7 +183,7 @@
             }
             //$display_rows                   =  ' - ';
             break;
-	    // Mysql 5.0.x (and lower) uses MRG_MyISAM and MySQL 5.1.x (and higher) uses MRG_MYISAM
+        // Mysql 5.0.x (and lower) uses MRG_MyISAM and MySQL 5.1.x (and higher) uses MRG_MYISAM
         // Both are aliases for MERGE
         case 'MRG_MyISAM' :
         case 'MRG_MYISAM' :
@@ -384,7 +384,7 @@
                 $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
@@ -16,7 +16,7 @@
 /**
  * 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 .= '&amp;goto=tbl_tracking.php&amp;back=db_tracking.php';
@@ -34,7 +34,7 @@
      * 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);
     }