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
  *

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';

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 */
 

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

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

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   !!

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

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,6 +1,6 @@
 <?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 ) {

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,6 +1,9 @@
 <?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
  *

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)
 

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$

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';
 

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

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

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
  */

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
 
 /**

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

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!

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 */
 

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 */
 

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 */
 

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:
 
 
 /**

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