From a738c7435c42454919b7c7a7bf2bad5785a253b8 Mon Sep 17 00:00:00 2001
From: Sebastian Mendel <cybot_tm@users.sourceforge.net>
Date: Fri, 16 Mar 2007 08:58:14 +0000
Subject: [PATCH] added vim-line, tweaked doc

---
 test/AllTests.php               |  1 +
 test/FailTest.php               |  3 ++-
 test/PMA_get_real_size_test.php |  3 ++-
 test/PMA_pow_test.php           |  3 ++-
 test/PMA_sanitize_test.php      |  3 ++-
 test/core.lib.php               | 29 ++++++++++++++---------------
 test/escape_js_string.php       |  5 ++---
 test/theme.php                  | 32 ++++++++++++++++----------------
 8 files changed, 41 insertions(+), 38 deletions(-)

diff --git a/test/AllTests.php b/test/AllTests.php
index 7f2b28c33..95e65bd4a 100644
--- a/test/AllTests.php
+++ b/test/AllTests.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: expandtab sw=4 ts=4 sts=4: */
 /**
  * runs all defined tests
  *
diff --git a/test/FailTest.php b/test/FailTest.php
index c37cb3ac7..cc9a249a1 100644
--- a/test/FailTest.php
+++ b/test/FailTest.php
@@ -1,8 +1,9 @@
 <?php
+/* vim: expandtab sw=4 ts=4 sts=4: */
 /**
  * tests for PMA_get_real_size()
  *
- * @version $Id: $
+ * @version $Id$
  * @package phpMyAdmin-test
  */
 
diff --git a/test/PMA_get_real_size_test.php b/test/PMA_get_real_size_test.php
index 69bccb6db..040e3dece 100644
--- a/test/PMA_get_real_size_test.php
+++ b/test/PMA_get_real_size_test.php
@@ -1,8 +1,9 @@
 <?php
+/* vim: expandtab sw=4 ts=4 sts=4: */
 /**
  * tests for PMA_get_real_size()
  *
- * @version $Id: $
+ * @version $Id$
  * @package phpMyAdmin-test
  */
 
diff --git a/test/PMA_pow_test.php b/test/PMA_pow_test.php
index 893092cde..1b63f24e7 100644
--- a/test/PMA_pow_test.php
+++ b/test/PMA_pow_test.php
@@ -1,8 +1,9 @@
 <?php
+/* vim: expandtab sw=4 ts=4 sts=4: */
 /**
  * tests for PMA_pow()
  *
- * @version $Id: $
+ * @version $Id$
  * @package phpMyAdmin-test
  */
 
diff --git a/test/PMA_sanitize_test.php b/test/PMA_sanitize_test.php
index 693935401..b39c90ded 100644
--- a/test/PMA_sanitize_test.php
+++ b/test/PMA_sanitize_test.php
@@ -1,8 +1,9 @@
 <?php
+/* vim: expandtab sw=4 ts=4 sts=4: */
 /**
  * tests for PMA_sanitize()
  *
- * @version $Id: $
+ * @version $Id$
  * @package phpMyAdmin-test
  */
 
diff --git a/test/core.lib.php b/test/core.lib.php
index 6ebfe164c..9d7bc8c88 100644
--- a/test/core.lib.php
+++ b/test/core.lib.php
@@ -1,12 +1,11 @@
 <?php
-/* $Id: common.lib.php 9832 2007-01-09 09:50:49Z nijel $ */
-// vim: expandtab sw=4 ts=4 sts=4:
-
+/* vim: expandtab sw=4 ts=4 sts=4: */
 /**
  * Core testing library to wrap phpMyAdmin and add some useful functions.
  *
  * @author Michal Čihař <michal@cihar.com>
  * @package phpMyAdmin-test
+ * @version $Id: common.lib.php 9832 2007-01-09 09:50:49Z nijel $
  */
 
 /**
@@ -23,10 +22,10 @@ chdir('..');
  * @param string failure description
  */
 function PMA_test_fail($function, $test, $message) {
-	$function = htmlspecialchars($function);
-	$test = htmlspecialchars($test);
-	$message = htmlspecialchars($message);
-	echo <<<EOT
+    $function = htmlspecialchars($function);
+    $test = htmlspecialchars($test);
+    $message = htmlspecialchars($message);
+    echo <<<EOT
 <dt>$function ($test)</dt>
 <dd><strong>Failed:</strong> $message</dd>
 EOT;
@@ -39,9 +38,9 @@ EOT;
  * @param string test description
  */
 function PMA_test_okay($function, $test) {
-	$function = htmlspecialchars($function);
-	$test = htmlspecialchars($test);
-	echo <<<EOT
+    $function = htmlspecialchars($function);
+    $test = htmlspecialchars($test);
+    echo <<<EOT
 <dt>$function ($test)</dt>
 <dd><strong>OK</strong></dd>
 EOT;
@@ -58,10 +57,10 @@ EOT;
  * @param string expected result
  */
 function PMA_test_string($function, $test, $received, $expected) {
-	if ($received != $expected) {
-		PMA_test_fail($function, $test, "Strings >$received< and >$expected< do not match");
-	} else {
-		PMA_test_okay($function, $test);
-	}
+    if ($received != $expected) {
+        PMA_test_fail($function, $test, "Strings >$received< and >$expected< do not match");
+    } else {
+        PMA_test_okay($function, $test);
+    }
 }
 ?>
diff --git a/test/escape_js_string.php b/test/escape_js_string.php
index 6632bf943..9b6012ccf 100644
--- a/test/escape_js_string.php
+++ b/test/escape_js_string.php
@@ -1,12 +1,11 @@
 <?php
-/* $Id: common.lib.php 9832 2007-01-09 09:50:49Z nijel $ */
-// vim: expandtab sw=4 ts=4 sts=4:
-
+/* vim: expandtab sw=4 ts=4 sts=4: */
 /**
  * Test for javascript escaping.
  *
  * @author Michal Čihař <michal@cihar.com>
  * @package phpMyAdmin-test
+ * @version $Id: common.lib.php 9832 2007-01-09 09:50:49Z nijel $
  */
 
 /**
diff --git a/test/theme.php b/test/theme.php
index 37346c380..49bed9dbf 100644
--- a/test/theme.php
+++ b/test/theme.php
@@ -1,19 +1,19 @@
 <?php
-/* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
+/* vim: expandtab sw=4 ts=4 sts=4: */
 /**
  * theme test
  *
  * @uses    libraries/common.lib.php        global fnctions
  * @package phpMyAdmin-test
+ * @version $Id$
  */
 
-chdir( '..' );
+chdir('..');
 
 /**
  * Gets core libraries and defines some variables
  */
-require_once('./libraries/common.lib.php');
+require_once './libraries/common.lib.php';
 
 $lang_iso_code = $GLOBALS['available_languages'][$GLOBALS['lang']][2];
 
@@ -28,7 +28,7 @@ header('Content-Type: text/html; charset=' . $GLOBALS['charset']);
     dir="<?php echo $GLOBALS['text_dir']; ?>">
 <head>
     <title>phpMyAdmin <?php echo PMA_VERSION; ?> -
-        <?php echo htmlspecialchars( $HTTP_HOST ); ?> - Theme Test</title>
+        <?php echo htmlspecialchars($HTTP_HOST); ?> - Theme Test</title>
     <meta http-equiv="Content-Type"
         content="text/html; charset=<?php echo $GLOBALS['charset']; ?>" />
     <link rel="stylesheet" type="text/css"
@@ -51,23 +51,23 @@ $item = '<a href="%1$s?%2$s" class="item">'
     .'%4$s: %3$s</a>' . "\n";
 
 echo '<div id="serverinfo">' . "\n";
-printf( $item,
+printf($item,
         $GLOBALS['cfg']['DefaultTabServer'],
         PMA_generate_common_url(),
         'Server',
         $GLOBALS['strServer'],
-        's_host.png' );
+        's_host.png');
 
 echo $separator;
-printf( $item,
+printf($item,
         $GLOBALS['cfg']['DefaultTabDatabase'],
         '',
         'Database',
         $GLOBALS['strDatabase'],
-        's_db.png' );
+        's_db.png');
 
 echo $separator;
-printf( $item,
+printf($item,
         $GLOBALS['cfg']['DefaultTabTable'],
         '',
         'Table',
@@ -76,7 +76,7 @@ printf( $item,
             : $GLOBALS['strTable']),
         (isset($GLOBALS['tbl_is_view']) && $GLOBALS['tbl_is_view']
             ? 'b_views'
-            : 's_tbl') . '.png' );
+            : 's_tbl') . '.png');
 
 echo '<span class="table_comment" id="span_table_comment">'
     .'&quot;Table comment&quot</span>' . "\n";
@@ -138,10 +138,10 @@ $tabs['import']['link'] = 'server_import.php';
 $tabs['import']['text'] = 'active';
 $tabs['import']['class'] = 'active';
 
-echo PMA_getTabs( $tabs );
-unset( $tabs );
+echo PMA_getTabs($tabs);
+unset($tabs);
 
-if ( @file_exists( $pmaThemeImage . 'logo_right.png') ) {
+if (@file_exists($pmaThemeImage . 'logo_right.png')) {
     ?>
     <img id="pmalogoright" src="../<?php echo $pmaThemeImage; ?>logo_right.png"
         alt="phpMyAdmin" />
@@ -150,7 +150,7 @@ if ( @file_exists( $pmaThemeImage . 'logo_right.png') ) {
 ?>
 <h1>
 <?php
-echo sprintf( $strWelcome,
+echo sprintf($strWelcome,
     '<bdo dir="ltr" xml:lang="en">phpMyAdmin ' . PMA_VERSION . '</bdo>');
 ?>
 </h1>
@@ -161,7 +161,7 @@ echo sprintf( $strWelcome,
 <fieldset>
     <legend><?php echo $strTheme; ?></legend>
 <?php
-    echo $_SESSION['PMA_Theme_Manager']->getHtmlSelectBox( false );
+    echo $_SESSION['PMA_Theme_Manager']->getHtmlSelectBox(false);
 ?>
 <noscript><input type="submit" value="Go" style="vertical-align: middle" /></noscript>
 </fieldset>