synced/fixed vim line

browse_foreigners.php

@@ -1,6 +1,6 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
 /**
  * display selection for relational field values
  */

calendar.php

@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
 
 require_once('./libraries/common.lib.php');

changelog.php

@@ -1,9 +1,9 @@
 <?php
-// vim: expandtab sw=4 ts=4 sts=4:
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Simple script to set correct charset for changelog
  *
- * @id      $Id$
+ * @version $Id$
  */
 
 $changelog = htmlspecialchars(file_get_contents('ChangeLog'));

chk_rel.php

@@ -1,6 +1,6 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
 
 
 /**

config.sample.inc.php

@@ -1,7 +1,6 @@
 <?php
-
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
 
 /**
  * phpMyAdmin sample configuration, you can use it as base for

db_create.php

@@ -1,6 +1,6 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
 
 
 /**

db_datadict.php

@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
 
 

db_export.php

@@ -1,6 +1,6 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
 /**
  * dumps a database
  *
@@ -42,14 +42,14 @@ foreach ( $tables as $each_table ) {
     //    continue;
     //}
     if ( ! empty( $unselectall )
-      || ( isset( $tmp_select ) 
+      || ( isset( $tmp_select )
            && false !== strpos( $tmp_select, '|' . $each_table['Name'] . '|') ) ) {
         $is_selected = '';
     } else {
         $is_selected = ' selected="selected"';
     }
     $table_html   = htmlspecialchars( $each_table['Name'] );
-    $multi_values .= '                <option value="' . $table_html . '"' 
+    $multi_values .= '                <option value="' . $table_html . '"'
         . $is_selected . '>' . $table_html . '</option>' . "\n";
 } // end for
 $multi_values .= "\n";

db_import.php

@@ -1,6 +1,6 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
 
 require_once('./libraries/common.lib.php');
 

db_operations.php

@@ -1,6 +1,6 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
 
 /**
  * handles miscellaneous db operations:

db_printview.php

@@ -1,6 +1,6 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
 
 require_once './libraries/common.lib.php';
 

db_qbe.php

@@ -1,6 +1,6 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
 
 /**
  * query by example the whole database

db_sql.php

@@ -1,6 +1,6 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
 
 require_once('./libraries/common.lib.php');
 

db_structure.php

@@ -1,6 +1,6 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
 
 require_once './libraries/common.lib.php';
 require_once './libraries/Table.class.php';
@@ -347,7 +347,7 @@ foreach ($tables as $keyname => $each_table) {
     //  so ensure that we'll display "in use" below for a table
     //  that needs to be repaired
 
-    if (isset($each_table['TABLE_ROWS']) && ($each_table['ENGINE'] != null || $table_is_view)) { 
+    if (isset($each_table['TABLE_ROWS']) && ($each_table['ENGINE'] != null || $table_is_view)) {
         if ($table_is_view  && $each_table['TABLE_ROWS'] >= $cfg['MaxExactCountViews']) {
             $at_least_one_view_exceeds_max_count = true;
             $show_superscript = '<sup>1</sup>';
@@ -496,7 +496,7 @@ if ($at_least_one_view_exceeds_max_count && !$db_is_information_schema) {
 <hr />
 
 <?php
-// Routines 
+// Routines
 echo '<fieldset>' . "\n";
 echo ' <legend>' . $strRoutines . '</legend>' . "\n";
 require './libraries/db_routines.inc.php';

import.php

@@ -1,6 +1,6 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
 
 /* Core script for import, this is just the glue around all other stuff */
 
@@ -393,7 +393,7 @@ if ($timeout_passed) {
     }
 }
 
-// Parse and analyze the query, for correct db and table name 
+// Parse and analyze the query, for correct db and table name
 // in case of a query typed in the query window
 require_once('./libraries/parse_analyze.lib.php');
 

index.php

@@ -1,6 +1,6 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
 /**
  * forms frameset
  *

js/navigation.js

@@ -1,4 +1,11 @@
-// vim: expandtab sw=4 ts=4 sts=4:
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * function used in or for navigation frame
+ */
+
+/**
+ * init
+ */
 var today = new Date();
 var expires = new Date(today.getTime() + (56 * 86400000));
 var pma_navi_width;
@@ -80,7 +87,7 @@ function PMA_setFrameSize()
     pma_navi_width = PMA_getCookie('pma_navi_width');
     //alert('from cookie: ' + typeof(pma_navi_width) + ' : ' + pma_navi_width);
     if (pma_navi_width != null) {
-	    if (parent.text_dir == 'ltr') {
+        if (parent.text_dir == 'ltr') {
             parent.document.getElementById('mainFrameset').cols = pma_navi_width + ',*';
         } else {
             parent.document.getElementById('mainFrameset').cols = '*,' + pma_navi_width;

libraries/Config.class.php

@@ -1,6 +1,6 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
 
 /**
  * Configuration class
@@ -402,7 +402,7 @@ class PMA_Config
         // (from config.inc.php) so that $cfg['DefaultConnectionCollation']
         // can have an effect. Note that the presence of collation
         // information in a cookie has priority over what is defined
-        // in the default or user's config files. 
+        // in the default or user's config files.
         /**
          * @todo check validity of $_COOKIE['pma_collation_connection']
          */

libraries/PMA_Sql.class.php

@@ -1,5 +1,5 @@
 <?php
-// vim: expandtab sw=4 ts=4 sts=4:
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * holds PMA_Sql class
  *

libraries/Table.class.php

@@ -1,6 +1,6 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
 
 class PMA_Table {
 
@@ -600,22 +600,22 @@ class PMA_Table {
             }
 
             /* no need to PMA_backquote() */
-	    if (isset($target_for_view)) {
+        if (isset($target_for_view)) {
-		// this a view definition; we just found the first db name
+        // this a view definition; we just found the first db name
-		// that follows DEFINER VIEW
+        // that follows DEFINER VIEW
-		// so change it for the new db name
+        // so change it for the new db name
                 $parsed_sql[$i]['data'] = $target_for_view;
-		// then we have to find all references to the source db 
+        // then we have to find all references to the source db
-		// and change them to the target db, ensuring we stay into
+        // and change them to the target db, ensuring we stay into
-		// the $parsed_sql limits
+        // the $parsed_sql limits
-		$last = $parsed_sql['len'] - 1;
+        $last = $parsed_sql['len'] - 1;
-		$backquoted_source_db = PMA_backquote($source_db);
+        $backquoted_source_db = PMA_backquote($source_db);
-		for (++$i; $i <= $last; $i++) { 
+        for (++$i; $i <= $last; $i++) {
-            	    if ($parsed_sql[$i]['type'] == 'quote_backtick' && $parsed_sql[$i]['data'] == $backquoted_source_db) {
+                    if ($parsed_sql[$i]['type'] == 'quote_backtick' && $parsed_sql[$i]['data'] == $backquoted_source_db) {
                         $parsed_sql[$i]['data'] = $target_for_view;
-		    }
+            }
-		}
+        }
-		unset($last,$backquoted_source_db);
+        unset($last,$backquoted_source_db);
             } else {
                 $parsed_sql[$i]['data'] = $target;
             }

libraries/Theme.class.php

@@ -1,5 +1,5 @@
 <?php
-// vim: expandtab sw=4 ts=4 sts=4:
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * hold PMA_Theme class
  *

libraries/Theme_Manager.class.php

@@ -1,6 +1,6 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
 
 require_once './libraries/Theme.class.php';
 

libraries/auth/config.auth.lib.php

@@ -1,11 +1,10 @@
 <?php
-/* $Id$ */
+/* vim: set expandtab sw=4 ts=4 sts=4: */
-// vim: expandtab sw=4 ts=4 sts=4:
+/**
-
+ * Set of functions used to run config authentication (ie no authentication).
-// +--------------------------------------------------------------------------+
+ *
-// | Set of functions used to run config authentication (ie no                |
+ * @version $Id$
-// | authentication).                                                         |
+ */
-// +--------------------------------------------------------------------------+
 
 
 /**

libraries/auth/http.auth.lib.php

@@ -1,11 +1,11 @@
 <?php
-/* $Id$ */
+/* vim: set expandtab sw=4 ts=4 sts=4: */
-// vim: expandtab sw=4 ts=4 sts=4:
+/**
-
+ * Set of functions used to run http authentication.
-// +--------------------------------------------------------------------------+
+ * NOTE: Requires PHP loaded as a Apache module.
-// | Set of functions used to run http authentication.                        |
+ *
-// | NOTE: Requires PHP loaded as a Apache module.                            |
+ * @version $Id$
-// +--------------------------------------------------------------------------+
+ */
 
 
 /**

libraries/auth/signon.auth.lib.php

@@ -1,10 +1,10 @@
 <?php
-/* $Id$ */
+/* vim: set expandtab sw=4 ts=4 sts=4: */
-// vim: expandtab sw=4 ts=4 sts=4:
+/**
-
+ * Set of functions used to run single signon authentication.
-// +--------------------------------------------------------------------------+
+ *
-// | Set of functions used to run single signon authentication.               |
+ * @version $Id$
-// +--------------------------------------------------------------------------+
+ */
 
 
 /**

libraries/blowfish.php

@@ -1,7 +1,6 @@
 <?php
-
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
 
 /**
  * The Cipher_blowfish:: class implements the Cipher interface enryption data
@@ -389,7 +388,7 @@ class Horde_Cipher_blowfish {
         $parts = $this->_encryptBlock($L, $R);
         return pack("NN", $parts['L'], $parts['R']);
     }
-    
+
     /**
      * Encrypt a block on data.
      *

libraries/bookmark.lib.php

@@ -1,6 +1,6 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
 
 /**
  * Set of functions used with the bookmark feature

libraries/charset_conversion.lib.php

@@ -1,6 +1,6 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
 
 
 /**

libraries/check_user_privileges.lib.php

@@ -1,6 +1,6 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
 
 // Get user's global privileges and some db-specific privileges
 // ($controllink and $userlink are links to MySQL defined in the "common.lib.php" library)

libraries/cleanup.lib.php

@@ -1,6 +1,6 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id: common.lib.php 9531 2006-10-10 14:06:56Z nijel $ */
-// vim: expandtab sw=4 ts=4 sts=4:
 
 /**
  * Functions for cleanup of user input.

libraries/common.lib.php

@@ -1,5 +1,5 @@
 <?php
-// vim: expandtab sw=4 ts=4 sts=4:
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Misc stuff and functions used by ALL the scripts.
  * MUST be included by every script

libraries/config.default.php

@@ -1,5 +1,5 @@
 <?php
-// vim: expandtab sw=4 ts=4 sts=4:
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * N   N  OOO  !!   DDDD   OOO    N   N  OOO  TTTTT   EEEE DDDD  I TTTTT !!
  * NN  N O   O !!   D   D O   O   NN  N O   O   T     E    D   D I   T   !!
@@ -541,7 +541,7 @@ $cfg['LeftLogoLink'] = 'main.php';
 
 /**
  * whether to open the linked page in the main window ('main') or
- * in a new window ('new') 
+ * in a new window ('new')
  *
  * @global string $cfg['LeftLogoLinkWindow']
  */

libraries/database_interface.lib.php

@@ -1,6 +1,6 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
 
 /**
  * Common Option Constants For DBI Functions

libraries/db_common.inc.php

@@ -1,6 +1,6 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
 
 /**
  * Gets some core libraries

libraries/db_info.inc.php

@@ -1,6 +1,6 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
 
 
 // Check parameters
@@ -58,7 +58,7 @@ if ( $cfg['ShowTooltip'] ) {
 // Special speedup for newer MySQL Versions (in 4.0 format changed)
 if ( true === $cfg['SkipLockedTables'] ) {
     $db_info_result = PMA_DBI_query('SHOW OPEN TABLES FROM ' . PMA_backquote($db) . ';');
-    
+
     // Blending out tables in use
     if ($db_info_result != FALSE && PMA_DBI_num_rows($db_info_result) > 0) {
         while ($tmp = PMA_DBI_fetch_row($db_info_result)) {
@@ -97,7 +97,7 @@ if ( true === $cfg['SkipLockedTables'] ) {
                     }
                 }
                 PMA_DBI_free_result($db_info_result);
-                
+
                 if ( $GLOBALS['cfg']['NaturalOrder'] ) {
                     uksort( $tables, 'strnatcasecmp' );
                 }
@@ -123,7 +123,7 @@ if ( ! isset( $sot_ready ) ) {
         // all tables in db
         $tables = PMA_DBI_get_tables_full( $db );
     }
-    
+
     if ( $cfg['ShowTooltip'] ) {
         foreach ( $tables as $each_table ) {
             fillTooltip( $tooltip_truename, $tooltip_aliasname, $each_table );

libraries/db_links.inc.php

@@ -1,6 +1,6 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
 
 require_once('./libraries/common.lib.php');
 

libraries/db_routines.inc.php

@@ -1,11 +1,11 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
 
 // Check parameters
 if ( PMA_MYSQL_INT_VERSION >= 50002 ) {
     $url_query .= '&amp;goto=db_structure.php';
-    
+
     $routines = PMA_DBI_fetch_result('SELECT SPECIFIC_NAME,ROUTINE_NAME,ROUTINE_TYPE,DTD_IDENTIFIER FROM information_schema.ROUTINES WHERE ROUTINE_SCHEMA= \'' . PMA_sqlAddslashes($db,true) . '\';');
 
     if ($routines) {
@@ -23,7 +23,7 @@ if ( PMA_MYSQL_INT_VERSION >= 50002 ) {
               $strRoutineReturnType);
         $ct=0;
         $delimiter = '//';
-        foreach ($routines as $routine) { 
+        foreach ($routines as $routine) {
             $drop_and_create = '\'DROP ' . $routine['ROUTINE_TYPE'] . ' ' . PMA_backquote($routine['SPECIFIC_NAME']) . $delimiter . "\n"
                 . 'CREATE ' . $routine['ROUTINE_TYPE'] . ' ' . PMA_backquote($routine['SPECIFIC_NAME']) . '()' . "\n" . '\'';
 
@@ -53,7 +53,7 @@ if ( PMA_MYSQL_INT_VERSION >= 50002 ) {
                               <td><b>%s</b></td>
                               <td>%s</td>
                               <td>%s</td>
-                              <td>%s</td>                              
+                              <td>%s</td>
                               <td>%s</td>
                               <td>%s</td>
                          </tr>',

libraries/db_table_exists.lib.php

@@ -1,6 +1,6 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
 
 /**
  * Ensure the database and the table exist (else move to the "parent" script)

libraries/dbg/setup.php

@@ -1,9 +1,12 @@
 <?php
-/* $Id$ */
+/* vim: set expandtab sw=4 ts=4 sts=4: */
-// vim: expandtab sw=4 ts=4 sts=4:
+/**
+ * @version $Id$
+ */
+
 /**
  * checks for DBG extension and trys to load if not loaded
- * 
+ *
  * allways use $GLOBALS here, as this script is included by footer.inc.hp
  * which can also be included from inside a function
  */
@@ -14,7 +17,7 @@ if ( $GLOBALS['cfg']['DBG']['enable'] ) {
     if ( ! @extension_loaded('dbg') && ! PMA_dl('dbg') ) {
         echo '<div class="warning">'
             .sprintf( $GLOBALS['strCantLoad'], 'DBG' )
-            .' <a href="./Documentation.html#faqdbg" target="documentation">' 
+            .' <a href="./Documentation.html#faqdbg" target="documentation">'
             .$GLOBALS['strDocu'] . '</a>'
             .'</div>';
     } else {

libraries/dbi/mysql.dbi.lib.php

@@ -1,11 +1,14 @@
 <?php
-/* $Id$ */
+/* vim: set expandtab sw=4 ts=4 sts=4: */
-// vim: expandtab sw=4 ts=4 sts=4:
-
 /**
  * Interface to the classic MySQL extension
+ *
+ * @version $Id$
  */
 
+/**
+ *
+ */
 // MySQL client API
 if (!defined('PMA_MYSQL_CLIENT_API')) {
     if (function_exists('mysql_get_client_info')) {

libraries/dbi/mysqli.dbi.lib.php

@@ -1,9 +1,9 @@
 <?php
-/* $Id$ */
+/* vim: set expandtab sw=4 ts=4 sts=4: */
-// vim: expandtab sw=4 ts=4 sts=4:
-
 /**
  * Interface to the improved MySQL extension (MySQLi)
+ *
+ * @version $Id$
  */
 
 // MySQL client API

libraries/display_create_database.lib.php

@@ -1,6 +1,6 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
 
 // Displays form for creating database (if user has privileges for that)
 

libraries/display_create_table.lib.php

@@ -1,6 +1,6 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
 
 // Displays form for creating a table (if user has privileges for that)
 
@@ -10,7 +10,7 @@ require_once('./libraries/check_user_privileges.lib.php');
 // privilege by looking at SHOW GRANTS output;
 // for < 4.1.0, it could be more difficult because the logic tries to
 // detect the current host and it might be expressed in many ways; also
-// on a shared server, the user might be unable to define a controluser 
+// on a shared server, the user might be unable to define a controluser
 // that has the proper rights to the "mysql" db;
 // so we give up and assume that user has the right to create a table
 //

libraries/display_export.lib.php

@@ -1,6 +1,6 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
 
 require_once './libraries/Table.class.php';
 

libraries/display_import.lib.php

@@ -1,6 +1,6 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
 
 require_once('./libraries/file_listing.php');
 require_once('./libraries/plugin_interface.lib.php');

libraries/display_select_lang.lib.php

@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /*
  * Code for displaying language selection
  * $Id$
@@ -49,7 +50,7 @@ function PMA_select_language($use_fieldset = FALSE) {
     }
 
     $language_title = $GLOBALS['strLanguage'] . ($GLOBALS['strLanguage'] != 'Language' ? ' - Language' : '') . ' <a href="./translators.html" target="documentation">' .
-            ( $cfg['ReplaceHelpImg'] ? 
+            ( $cfg['ReplaceHelpImg'] ?
                 '<img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 'b_info.png" width="11" height="11" alt="Info" />' :
                 '(*)' ) . '</a>';
     if ($use_fieldset) {

libraries/display_tbl.lib.php

@@ -1,6 +1,6 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
 
 require_once './libraries/Table.class.php';
 
@@ -1718,7 +1718,7 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql)
     //     displayed
     $total      = '';
     $is_display = PMA_setDisplayMode($the_disp_mode, $total);
-    // what was this for? 
+    // what was this for?
     // $total can be 0 if $cfg['MaxExactCountViews'] = 0
     //if ($total == '') {
     //    unset($total);
@@ -2019,7 +2019,7 @@ function PMA_displayResultsOperations($the_disp_mode, $analyzed_sql) {
     // CREATE VIEW
     /**
      *
-     * @todo detect privileges to create a view 
+     * @todo detect privileges to create a view
      *       (but see 2006-01-19 note in display_create_table.lib.php,
      *        I think we cannot detect db-specific privileges reliably)
      */

libraries/display_tbl_links.lib.php

@@ -1,6 +1,6 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
 
 // modified 2004-05-08 by Michael Keck <mail_at_michaelkeck_dot_de>
 // - bugfix for select all checkboxes

libraries/engines/bdb.lib.php

@@ -1,7 +1,12 @@
 <?php
-/* $Id$ */
+/* vim: set expandtab sw=4 ts=4 sts=4: */
-// vim: expandtab sw=4 ts=4 sts=4:
+/**
+ * @version $Id$
+ */
 
+/**
+ *
+ */
 class PMA_StorageEngine_bdb extends PMA_StorageEngine
 {
     /**

libraries/engines/berkeleydb.lib.php

@@ -1,7 +1,12 @@
 <?php
-/* $Id$ */
+/* vim: set expandtab sw=4 ts=4 sts=4: */
-// vim: expandtab sw=4 ts=4 sts=4:
+/**
+ * @version $Id$
+ */
 
+/**
+ *
+ */
 include_once './libraries/engines/bdb.lib.php';
 
 class PMA_StorageEngine_berkeleydb extends PMA_StorageEngine_bdb

libraries/engines/binlog.lib.php

@@ -1,7 +1,12 @@
 <?php
-/* $Id$ */
+/* vim: set expandtab sw=4 ts=4 sts=4: */
-// vim: expandtab sw=4 ts=4 sts=4:
+/**
+ * @version $Id$
+ */
 
+/**
+ *
+ */
 class PMA_StorageEngine_binlog extends PMA_StorageEngine
 {
     /**

libraries/engines/innobase.lib.php

@@ -1,8 +1,18 @@
 <?php
-/* $Id$ */
+/* vim: set expandtab sw=4 ts=4 sts=4: */
-// vim: expandtab sw=4 ts=4 sts=4:
+/**
+ *
+ * @version $Id$
+ */
 
-include_once('./libraries/engines/innodb.lib.php');
+/**
+ *
+ */
+include_once './libraries/engines/innodb.lib.php';
+
+/**
+ *
+ */
 class PMA_StorageEngine_innobase extends PMA_StorageEngine_innodb {}
 
 ?>

libraries/engines/innodb.lib.php

@@ -1,7 +1,12 @@
 <?php
-/* $Id$ */
+/* vim: set expandtab sw=4 ts=4 sts=4: */
-// vim: expandtab sw=4 ts=4 sts=4:
+/**
+ * @version $Id$
+ */
 
+/**
+ *
+ */
 class PMA_StorageEngine_innodb extends PMA_StorageEngine
 {
     /**

libraries/engines/memory.lib.php

@@ -1,6 +1,9 @@
 <?php
-/* $Id$ */
+/* vim: set expandtab sw=4 ts=4 sts=4: */
-// vim: expandtab sw=4 ts=4 sts=4:
+/**
+ * @version $Id$
+ */
+
 /**
  * the MEMORY (HEAP) storage engine
  */

libraries/engines/merge.lib.php

@@ -1,7 +1,12 @@
 <?php
-/* $Id$ */
+/* vim: set expandtab sw=4 ts=4 sts=4: */
-// vim: expandtab sw=4 ts=4 sts=4:
+/**
+ * @version $Id$
+ */
 
+/**
+ *
+ */
 class PMA_StorageEngine_merge extends PMA_StorageEngine
 {
 }

libraries/engines/mrg_myisam.lib.php

@@ -1,9 +1,17 @@
 <?php
-/* $Id$ */
+/* vim: set expandtab sw=4 ts=4 sts=4: */
-// vim: expandtab sw=4 ts=4 sts=4:
+/**
+ * @version $Id$
+ */
 
+/**
+ *
+ */
 include_once './libraries/engines/merge.lib.php';
 
+/**
+ *
+ */
 class PMA_StorageEngine_mrg_myisam extends PMA_StorageEngine_merge
 {
     /**

libraries/engines/myisam.lib.php

@@ -1,6 +1,9 @@
 <?php
-/* $Id$ */
+/* vim: set expandtab sw=4 ts=4 sts=4: */
-// vim: expandtab sw=4 ts=4 sts=4:
+/**
+ * @version $Id$
+ */
+
 /**
  * the MyISAM storage engine
  */

libraries/engines/ndbcluster.lib.php

@@ -1,7 +1,12 @@
 <?php
-/* $Id$ */
+/* vim: set expandtab sw=4 ts=4 sts=4: */
-// vim: expandtab sw=4 ts=4 sts=4:
+/**
+ * @version $Id$
+ */
 
+/**
+ *
+ */
 class PMA_StorageEngine_ndbcluster extends PMA_StorageEngine
 {
     /**

libraries/export/csv.php

@@ -1,6 +1,8 @@
 <?php
-/* $Id$ */
+/* vim: set expandtab sw=4 ts=4 sts=4: */
-// vim: expandtab sw=4 ts=4 sts=4:
+/**
+ * @version $Id$
+ */
 
 /**
  * Set of functions used to build CSV dumps of tables

libraries/export/excel.php

@@ -1,6 +1,6 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
 
 /**
  * Set of functions used to build CSV dumps of tables

libraries/export/htmlexcel.php

@@ -1,6 +1,6 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
 
 /**
  * Set of functions used to build CSV dumps of tables
@@ -68,7 +68,7 @@ xmlns="http://www.w3.org/TR/REC-html40">
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>
 <head>
-	<meta http-equiv="Content-type" content="text/html;charset=' . ( isset($charset_of_file) ? $charset_of_file : $charset ) .'" />
+    <meta http-equiv="Content-type" content="text/html;charset=' . ( isset($charset_of_file) ? $charset_of_file : $charset ) .'" />
 <style id="Classeur1_16681_Styles">
 </style>
 

libraries/export/htmlword.php

@@ -1,6 +1,6 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
 
 /**
  * Set of functions used to build CSV dumps of tables
@@ -61,7 +61,7 @@ xmlns="http://www.w3.org/TR/REC-html40">
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>
 <head>
-	<meta http-equiv="Content-type" content="text/html;charset=' . ( isset($charset_of_file) ? $charset_of_file : $charset ) .'" />
+    <meta http-equiv="Content-type" content="text/html;charset=' . ( isset($charset_of_file) ? $charset_of_file : $charset ) .'" />
 </head>
 <body>');
 }

libraries/export/latex.php

@@ -1,6 +1,6 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
 
 /**
  * Set of functions used to build dumps of tables
@@ -278,7 +278,7 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) {
  * @param   boolean  whether to include relation comments
  * @param   boolean  whether to include column comments
  * @param   boolean  whether to include mime comments
- * @param   string   future feature: support view dependencies 
+ * @param   string   future feature: support view dependencies
  *
  * @return  bool     Whether it suceeded
  *

libraries/export/ods.php

@@ -1,6 +1,6 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
 
 /**
  * Set of functions used to build CSV dumps of tables

libraries/export/odt.php

@@ -1,6 +1,6 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
 
 /**
  * Set of functions used to build CSV dumps of tables
@@ -225,7 +225,7 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) {
  * @param   boolean  whether to include relation comments
  * @param   boolean  whether to include column comments
  * @param   boolean  whether to include mime comments
- * @param   string   future feature: support view dependencies 
+ * @param   string   future feature: support view dependencies
  *
  * @return  bool     Whether it suceeded
  *

libraries/export/pdf.php

@@ -1,6 +1,6 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
 
 /**
  * Produce a PDF report (export) from a query

libraries/export/sql.php

@@ -1,6 +1,7 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
+
 /**
  * Set of functions used to build SQL dumps of tables
  */
@@ -166,8 +167,8 @@ function PMA_exportFooter()
     $charset_of_file = isset($GLOBALS['charset_of_file']) ? $GLOBALS['charset_of_file'] : '';
     if (!empty($GLOBALS['asfile']) && isset($mysql_charset_map[$charset_of_file])) {
         $foot .=  $crlf
-               . '/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;' . $crlf 
+               . '/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;' . $crlf
-               . '/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;' . $crlf 
+               . '/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;' . $crlf
                . '/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;' . $crlf;
     }
 
@@ -216,7 +217,7 @@ function PMA_exportHeader()
     }
 
     /* We want exported AUTO_INCREMENT fields to have still same value, do this only for recent MySQL exports */
-    if (!isset($GLOBALS['sql_compatibility']) || $GLOBALS['sql_compatibility'] == 'NONE') { 
+    if (!isset($GLOBALS['sql_compatibility']) || $GLOBALS['sql_compatibility'] == 'NONE') {
         $head .=  $crlf . 'SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";' . $crlf;
     }
 
@@ -224,7 +225,7 @@ function PMA_exportHeader()
         $head .=  $crlf .'SET AUTOCOMMIT=0;' . $crlf
                 . 'START TRANSACTION;' . $crlf;
     }
-   
+
     $head .= $crlf;
 
     $charset_of_file = isset($GLOBALS['charset_of_file']) ? $GLOBALS['charset_of_file'] : '';
@@ -320,7 +321,7 @@ function PMA_exportDBFooter($db)
             $delimiter = '$$';
             $procs_funcs = $crlf
               . $comment_marker . $crlf
-              . $comment_marker . $GLOBALS['strProcedures'] . $crlf 
+              . $comment_marker . $GLOBALS['strProcedures'] . $crlf
               . $comment_marker . $crlf
               . 'DELIMITER ' . $delimiter . $crlf
               . $comment_marker . $crlf;
@@ -347,7 +348,7 @@ function PMA_exportDBFooter($db)
         if ( !empty($procs_funcs)) {
             $result = PMA_exportOutputHandler($procs_funcs);
         }
-    } 
+    }
     return $result;
 }
 
@@ -359,7 +360,7 @@ function PMA_exportDBFooter($db)
  * @param   string   the vew name
  * @param   string   the end of line sequence
  *
- * @return  string   resulting definition 
+ * @return  string   resulting definition
  *
  * @access  public
  */
@@ -370,7 +371,7 @@ function PMA_getTableDefStandIn($db, $view, $crlf) {
     foreach($columns as $column_name => $definition) {
         $tmp[] = PMA_backquote($column_name) . ' ' . $definition['Type'] . $crlf;
     }
-    $create_query .= implode(',', $tmp) . ');'; 
+    $create_query .= implode(',', $tmp) . ');';
     return($create_query);
 }
 
@@ -528,11 +529,11 @@ function PMA_getTableDef($db, $table, $crlf, $error_url, $show_dates = false)
                         if (strpos($sql_lines[$j], 'CONSTRAINT') === FALSE) {
                             $str_tmp = preg_replace('/(FOREIGN[\s]+KEY)/', 'ADD \1', $sql_lines[$j]);
                             $sql_constraints_query .= $str_tmp;
-                            $sql_constraints .= $str_tmp; 
+                            $sql_constraints .= $str_tmp;
                         } else {
                             $str_tmp = preg_replace('/(CONSTRAINT)/', 'ADD \1', $sql_lines[$j]);
                             $sql_constraints_query .= $str_tmp;
-                            $sql_constraints .= $str_tmp; 
+                            $sql_constraints .= $str_tmp;
                         }
                         $first = FALSE;
                     } else {
@@ -552,7 +553,7 @@ function PMA_getTableDef($db, $table, $crlf, $error_url, $show_dates = false)
     // remove a possible "AUTO_INCREMENT = value" clause
     // that could be there starting with MySQL 5.0.24
     $schema_create = preg_replace('/AUTO_INCREMENT\s*=\s*([0-9])+/', '', $schema_create);
-    
+
     $schema_create .= $auto_increment;
 
     PMA_DBI_free_result($result);
@@ -656,7 +657,7 @@ function PMA_getTableComments($db, $table, $crlf, $do_relation = false, $do_comm
  * @param   boolean  whether to include relation comments
  * @param   boolean  whether to include column comments
  * @param   boolean  whether to include mime comments
- * @param   string   'stand_in', 'create_table', 'create_view' 
+ * @param   string   'stand_in', 'create_table', 'create_view'
  *
  * @return  bool     Whether it suceeded
  *

libraries/export/xls.php

@@ -1,6 +1,6 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
 
 // Check if we have native MS Excel export using PEAR class Spreadsheet_Excel_Writer
 if (!empty($GLOBALS['cfg']['TempDir'])) {

libraries/export/xml.php

@@ -1,6 +1,6 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
 
 /**
  * Set of functions used to build XML dumps of tables

libraries/export/yaml.php

@@ -1,5 +1,6 @@
 <?php
-// vim: expandtab sw=4 ts=4 sts=4:
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/* $Id$ */
 
 if (isset($plugin_list)) {
     $plugin_list['yaml'] = array(
@@ -7,7 +8,7 @@ if (isset($plugin_list)) {
         'extension' => 'yml',
         'mime_type' => 'text/yaml',
         'force_file' => true,
-      	'options' => array(
+          'options' => array(
             array('type' => 'hidden', 'name' => 'data'),
             ),
         'options_text' => 'strOptions',
@@ -51,7 +52,7 @@ function PMA_exportFooter()
  */
 function PMA_exportHeader()
 {
-	return TRUE;
+    return TRUE;
 }
 
 /**
@@ -119,14 +120,14 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query)
     }
     unset($i);
 
-	$cnt = 0;
+    $cnt = 0;
-	$buffer = '';
+    $buffer = '';
     while ($record = PMA_DBI_fetch_row($result)) {
-		$cnt++;
+        $cnt++;
-		$buffer = $cnt . ":$crlf";
+        $buffer = $cnt . ":$crlf";
         for ($i = 0; $i < $columns_cnt; $i++) {
             if ( isset($record[$i]) && !is_null($record[$i])) {
-				$buffer .= '  ' . $columns[$i] . ': '  . htmlspecialchars($record[$i]) . $crlf;
+                $buffer .= '  ' . $columns[$i] . ': '  . htmlspecialchars($record[$i]) . $crlf;
             }
         }
 

libraries/file_listing.php

@@ -1,6 +1,6 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
 // Functions for listing directories
 
 /**
@@ -63,9 +63,9 @@ function PMA_getFileSelectOptions($dir, $extensions = '', $active = '')
 function PMA_supportedDecompressions()
 {
     global $cfg;
-    
+
     $compressions = '';
-    
+
     if ($cfg['GZipDump'] && @function_exists('gzopen')) {
         if (!empty($compressions)) {
             $compressions .= '|';

libraries/footer.inc.php

@@ -1,6 +1,6 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
 
 /**
  * WARNING: This script has to be included at the very end of your code because
@@ -137,7 +137,7 @@ if (file_exists('./config.footer.inc.php')) {
  * Generates profiling data if requested
  */
 
-// profiling deactivated due to licensing issues 
+// profiling deactivated due to licensing issues
 if (! empty($GLOBALS['cfg']['DBG']['enable'])
   && ! empty($GLOBALS['cfg']['DBG']['profile']['enable'])) {
     //run the basic setup code first

libraries/get_foreign.lib.php

@@ -1,6 +1,6 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
 
 
 require_once './libraries/Table.class.php';

libraries/grab_globals.lib.php

@@ -1,6 +1,6 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
 
 
 /**

libraries/header.inc.php

@@ -1,6 +1,6 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
 
 require_once './libraries/common.lib.php';
 

libraries/header_http.inc.php

@@ -1,6 +1,6 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
 
 if (isset($_REQUEST['GLOBALS']) || isset($_FILES['GLOBALS'])) {
     die("GLOBALS overwrite attempt");

libraries/header_meta_style.inc.php

@@ -1,6 +1,6 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
 
 if (isset($_REQUEST['GLOBALS']) || isset($_FILES['GLOBALS'])) {
     die("GLOBALS overwrite attempt");

libraries/header_printview.inc.php

@@ -1,6 +1,6 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
 
 /**
  * Gets a core script and starts output buffering work

libraries/iconv_wrapper.lib.php

@@ -1,6 +1,6 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
 
 # GNU iconv code set to IBM AIX libiconv code set table
 # Keys of this table should be in lowercase, and searches should be performed using lowercase!
@@ -39,7 +39,7 @@ $gnu_iconv_to_aix_iconv_codepage_map = array (
  *
  * @access  public
  *
- * @author  bwiberg  Björn Wiberg <Bjorn.Wiberg@its.uu.se> 
+ * @author  bwiberg  Björn Wiberg <Bjorn.Wiberg@its.uu.se>
  */
 function PMA_aix_iconv_wrapper($in_charset, $out_charset, $str) {
 

libraries/import/docsql.php

@@ -1,6 +1,6 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4 ft=php:
 
 /* DocSQL import plugin for phpMyAdmin */
 
@@ -11,7 +11,7 @@ if ($plugin_param == 'database' && $GLOBALS['num_tables'] > 0 && $GLOBALS['cfgRe
             'text' => 'strDocSQL',                // text to be displayed as choice
             'extension' => '',                  // extension this plugin can handle
             'options' => array(                 // array of options for your plugin (optional)
-                array('type' => 'text', 'name' => 'table', 'text' => 'strTableName'), 
+                array('type' => 'text', 'name' => 'table', 'text' => 'strTableName'),
             ),
             'options_text' => 'strDocSQLOptions', // text to describe plugin options (must be set if options are used)
             );
@@ -56,7 +56,7 @@ if ($plugin_param == 'database' && $GLOBALS['num_tables'] > 0 && $GLOBALS['cfgRe
                 if (!empty($inf[2]) && strlen(trim($inf[2])) > 0) {
                     $for = explode('->', $inf[2]);
                     $qry = '
-                         INSERT INTO 
+                         INSERT INTO
                                 ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($GLOBALS['cfgRelation']['relation']) . '
                               ( master_db, master_table, master_field, foreign_db, foreign_table, foreign_field)
                          VALUES (

libraries/import/ldi.php

@@ -1,6 +1,6 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
 
 /* CSV import plugin for phpMyAdmin */
 
@@ -91,12 +91,12 @@ if ($plugin_param == 'table') {
                 } // end for
                 $sql .= ')';
             }
-        
+
             PMA_importRunQuery($sql, $sql);
             PMA_importRunQuery();
             $finished = TRUE;
         }
-        
+
     }
 }
 ?>

libraries/import/sql.php

@@ -1,7 +1,6 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-/* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
 
 /* SQL import plugin for phpMyAdmin */
 
@@ -207,14 +206,14 @@ if (isset($plugin_list)) {
                     continue;
                 }
             }
-           // Change delimiter, if redefined, and skip it (don't send to server!) 
+           // Change delimiter, if redefined, and skip it (don't send to server!)
            if ((substr($buffer, $i, 9) == "DELIMITER") && ($buffer[$i + 9] <= ' ') && ($i<$len-11) && (!(strpos($buffer,"\n",$i+11)===FALSE) )) {
                $new_line_pos = strpos($buffer, "\n", $i + 10);
                $sql_delimiter = substr($buffer, $i+10, $new_line_pos - $i -10);
                $i= $new_line_pos + 1;
                // Next query part will start here
                $start_pos = $i;
-               continue;               
+               continue;
             }
 
             // End of SQL
@@ -248,7 +247,7 @@ if (isset($plugin_list)) {
                     $start_pos = $i;
                 }
             }
-           
+
         } // End of parser loop
     } // End of import loop
     // Commit any possible data in buffers

libraries/information_schema_relations.lib.php

@@ -1,6 +1,6 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
 
 $GLOBALS['information_schema_relations'] = array(
     'CHARACTER_SETS' => array(

libraries/ip_allow_deny.lib.php

@@ -1,6 +1,6 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
 
 /**
  * This library is used with the server IP allow/deny host authentication

libraries/js_escape.lib.php

@@ -1,6 +1,6 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id: common.lib.php 9832 2007-01-09 09:50:49Z nijel $ */
-// vim: expandtab sw=4 ts=4 sts=4:
 
 /**
  * Javascript escaping functions.
@@ -29,16 +29,16 @@
  */
 function PMA_jsFormat($a_string = '', $add_backquotes = true)
 {
-	if (is_string($a_string)) {
+    if (is_string($a_string)) {
-		$a_string = htmlspecialchars($a_string);
+        $a_string = htmlspecialchars($a_string);
-		$a_string = PMA_escapeJsString($a_string);
+        $a_string = PMA_escapeJsString($a_string);
-		/**
+        /**
-		 * @todo what is this good for?
+         * @todo what is this good for?
-		 */
+         */
-		$a_string = str_replace('#', '\\#', $a_string);
+        $a_string = str_replace('#', '\\#', $a_string);
-	}
+    }
 
-	return (($add_backquotes) ? PMA_backquote($a_string) : $a_string);
+    return (($add_backquotes) ? PMA_backquote($a_string) : $a_string);
 } // end of the 'PMA_jsFormat()' function
 
 /**
@@ -53,12 +53,12 @@ function PMA_jsFormat($a_string = '', $add_backquotes = true)
  */
 function PMA_escapeJsString($string)
 {
-	return preg_replace('@</script@i', '</\' + \'script',
+    return preg_replace('@</script@i', '</\' + \'script',
-						strtr($string, array(
+                        strtr($string, array(
-								'\\' => '\\\\',
+                                '\\' => '\\\\',
-								'\'' => '\\\'',
+                                '\'' => '\\\'',
-								"\n" => '\n',
+                                "\n" => '\n',
-								"\r" => '\r')));
+                                "\r" => '\r')));
 }
 
 ?>

libraries/kanji-encoding.lib.php

@@ -1,6 +1,6 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
 
 
 /**

libraries/language.lib.php

@@ -1,6 +1,6 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
 
 /**
  * phpMyAdmin Language Loading File

libraries/mcrypt.lib.php

@@ -1,7 +1,6 @@
 <?php
-
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
 
 /**
  * Initialization

libraries/mult_submits.inc.php

@@ -1,6 +1,6 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
 
 
 /**
@@ -193,7 +193,7 @@ if ( !empty($submit_mult) && !empty($what)) {
                     $full_query = preg_replace('@,$@', ');<br />', $full_query);
                 }
                 break;
-                
+
             case 'drop_fld':
                 if ($full_query == '') {
                     $full_query .= 'ALTER TABLE '
@@ -302,7 +302,7 @@ elseif ($mult_btn == $strYes) {
         } // end while
         PMA_DBI_free_result($result);
     }
-    
+
     for ($i = 0; $i < $selected_cnt; $i++) {
         switch ($query_type) {
             case 'row_delete':
@@ -399,7 +399,7 @@ elseif ($mult_btn == $strYes) {
 
         // All "DROP TABLE", "DROP FIELD", "OPTIMIZE TABLE" and "REPAIR TABLE"
         // statements will be run at once below
-        if ($run_parts) { 
+        if ($run_parts) {
             $sql_query .= $a_query . ';' . "\n";
             if ($query_type != 'drop_db') {
                 PMA_DBI_select_db($db);

libraries/mysql_charsets.lib.php

@@ -1,6 +1,6 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
 
 if (PMA_MYSQL_INT_VERSION >= 40100){
 

libraries/navigation_header.inc.php

@@ -1,6 +1,6 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
 
 /**
  * displays the pma logo, links and db and server selection in left frame

libraries/ob.lib.php

@@ -1,6 +1,6 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
 
 
 /**

libraries/opendocument.lib.php

@@ -1,6 +1,6 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
 
 /**
  * Simple interface for creating OASIS OpenDocument files.

libraries/parse_analyze.lib.php

@@ -1,6 +1,6 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
 
 $GLOBALS['unparsed_sql'] = $sql_query;
 $parsed_sql = PMA_SQP_parse($sql_query);

libraries/plugin_interface.lib.php

@@ -1,6 +1,6 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
 
 /**
  * Generic plugin interface.

libraries/relation.lib.php

@@ -1,6 +1,6 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
 
 require_once './libraries/Table.class.php';
 

libraries/relation_cleanup.lib.php

@@ -1,6 +1,6 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
 
 /**
  * Set of functions used for cleaning up phpMyAdmin tables

libraries/select_lang.lib.php

@@ -1,5 +1,5 @@
 <?php
-// vim: expandtab sw=4 ts=4 sts=4:
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * phpMyAdmin Language Loading File
  *

libraries/select_server.lib.php

@@ -1,5 +1,5 @@
 <?php
-// vim: expandtab sw=4 ts=4 sts=4:
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /*
  * Code for displaying server selection written by nijel
  * $Id$
@@ -71,7 +71,7 @@ function PMA_select_server($not_only_options, $ommit_fieldset)
                 $label .= ' - ' . $server['only_db'];
             // try to avoid displaying a too wide selector
             } elseif (count($server['only_db']) < 4) {
-		        $label .= ' - ' . implode(', ', $server['only_db']);
+                $label .= ' - ' . implode(', ', $server['only_db']);
             }
         }
         if (!empty($server['user']) && $server['auth_type'] == 'config') {

libraries/server_links.inc.php

@@ -1,6 +1,6 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
 
 // Check parameters