Merge remote-tracking branch 'origin/master'

gis_data_editor.php

@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 require_once 'libraries/common.inc.php';
 if (! isset($_REQUEST['get_gis_editor']) && ! isset($_REQUEST['generate'])) {
     include_once 'libraries/header_http.inc.php';

js/OpenStreetMap.js

@@ -1,3 +1,4 @@
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Namespace: Util.OSM
  */

js/gis_data_editor.js

@@ -1,3 +1,4 @@
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * @fileoverview    functions used in GIS data editor
  *

js/keyhandler.js

@@ -1,3 +1,4 @@
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
   * Allows moving around inputs/select by Ctrl+arrows
   *

js/makegrid.js

@@ -1,3 +1,4 @@
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Create advanced table (resize, reorder, and show/hide columns; and also grid editing).
  * This function is designed mainly for table DOM generated from browsing a table in the database.

js/querywindow.js

@@ -1,3 +1,4 @@
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 function PMA_queryAutoCommit()
 {
     var sqlqueryform = document.getElementById('sqlqueryform');

js/server_plugins.js

@@ -1,3 +1,4 @@
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Functions used in server plugins pages
  */
@@ -27,4 +28,4 @@ $(function() {
     });
     $tables.find('thead th')
         .append('<img class="sortableIcon" src="' + pma_theme_image + 'cleardot.gif" alt="">');
-});
+});

js/server_status_monitor.js

@@ -1,3 +1,4 @@
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 $(function() {
     // Show tab links
     $('div#statustabs_charting div.tabLinks').show();

js/server_variables.js

@@ -1,3 +1,4 @@
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 $(function() {
     var textFilter = null, odd_row = false;
     var testString = 'abcdefghijklmnopqrstuvwxyz0123456789,ABCEFGHIJKLMOPQRSTUVWXYZ';

js/tbl_chart.js

@@ -1,3 +1,4 @@
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 var chart_xaxis_idx = -1;
 var chart_series;
 var chart_series_index = -1;

js/tbl_gis_visualization.js

@@ -1,3 +1,4 @@
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * @fileoverview    functions used for visualizing GIS data
  *

libraries/PMA.php

@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Enter description here...
  * @package PhpMyAdmin

libraries/data_drizzle.inc.php

@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Column types and functions supported by Drizzle
  *
@@ -222,4 +223,4 @@ if ($cfg['ShowFunctionFields']) {
     unset($restrict_functions);
 } // end if
 
-?>
+?>

libraries/data_mysql.inc.php

@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Column types and functions supported by MySQL
  *
@@ -283,4 +284,4 @@ if ($cfg['ShowFunctionFields']) {
     unset($restrict_functions);
 } // end if
 
-?>
+?>

libraries/gis/pma_gis_factory.php

@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Factory class that handles the creation of geometric objects.
  *
@@ -47,4 +48,4 @@ class PMA_GIS_Factory
         }
     }
 }
-?>
+?>

libraries/gis/pma_gis_geometry.php

@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Base class for all GIS data type classes.
  *

libraries/gis/pma_gis_geometrycollection.php

@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Handles the visualization of GIS GEOMETRYCOLLECTION objects.
  *

libraries/gis/pma_gis_linestring.php

@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Handles the visualization of GIS LINESTRING objects.
  *

libraries/gis/pma_gis_multilinestring.php

@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Handles the visualization of GIS MULTILINESTRING objects.
  *

libraries/gis/pma_gis_multipoint.php

@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Handles the visualization of GIS MULTIPOINT objects.
  *

libraries/gis/pma_gis_multipolygon.php

@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Handles the visualization of GIS MULTIPOLYGON objects.
  *

libraries/gis/pma_gis_point.php

@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Handles the visualization of GIS POINT objects.
  *

libraries/gis/pma_gis_polygon.php

@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Handles the visualization of GIS POLYGON objects.
  *

libraries/gis/pma_gis_visualization.php

@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Generates the JavaScripts needed to visualize GIS data.
  *

libraries/gis_visualization.lib.php

@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Functions used to generate GIS visualizations.
  *

libraries/import/shp.php

@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * ESRI Shape file import plugin for phpMyAdmin
  *

libraries/server_variables_doc.php

@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Used to create server variables documentation links
  * $VARIABLE_DOC_LINKS[string $name] = array(

setup/frames/index.inc.php

@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Overview (main page)
  *

setup/frames/menu.inc.php

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

setup/frames/servers.inc.php

@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Server create and edit view
  *

setup/index.php

@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Front controller for setup script
  *

setup/scripts.js

@@ -1,3 +1,4 @@
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Functions used in Setup configuration forms
  */

tbl_gis_visualization.php

@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * handles creation of the GIS visualizations.
  *

test/bootstrap-dist.php

@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 
 // Adding phpMyAdmin sources to include path
 set_include_path(get_include_path() . PATH_SEPARATOR . dirname(realpath("../index.php")));

test/classes/PMA_Theme_test.php

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

test/classes/_data/gen_version_info/info.inc.php

@@ -1,7 +1,8 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Full infrmation about theme, including $theme_generation and $theme_version
  */
 $theme_name = 'Test Theme';
 $theme_generation = "2";
-$theme_version = "0.3";
+$theme_version = "0.3";

test/classes/_data/incorrect_theme/info.inc.php

@@ -1,7 +1,8 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Incorrect theme information file.
  * Full name is not specified
  */
 
-$theme_full_version = '1.0';
+$theme_full_version = '1.0';

test/classes/gis/PMA_GIS_Factory_test.php

@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Test for PMA_GIS_Factory
  *
@@ -77,4 +78,4 @@ class PMA_GIS_FactoryTest extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
+?>

test/classes/gis/PMA_GIS_Geom_test.php

@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Abstract parent class for all PMA_GIS_<Geom_type> test classes
  *
@@ -71,4 +72,4 @@ abstract class PMA_GIS_GeomTest extends PHPUnit_Framework_TestCase
         $this->assertEquals($this->object->scaleRow($spatial), $min_max);
     }
 }
-?>
+?>

test/classes/gis/PMA_GIS_Geometry_test.php

@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Test for PMA_GIS_Geometry
  *
@@ -244,4 +245,4 @@ class PMA_GIS_GeometryTest extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
+?>

test/classes/gis/PMA_GIS_Linestring_test.php

@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Test for PMA_GIS_Linestring
  *
@@ -159,4 +160,4 @@ class PMA_GIS_LinestringTest extends PMA_GIS_GeomTest
         );
     }
 }
-?>
+?>

test/classes/gis/PMA_GIS_Multilinestring_test.php

@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Test for PMA_GIS_Multilinestring
  *
@@ -219,4 +220,4 @@ class PMA_GIS_MultilinestringTest extends PMA_GIS_GeomTest
         );
     }
 }
-?>
+?>

test/classes/gis/PMA_GIS_Multipoint_test.php

@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Test for PMA_GIS_Multipoint
  *
@@ -163,4 +164,4 @@ class PMA_GIS_MultipointTest extends PMA_GIS_GeomTest
         );
     }
 }
-?>
+?>

test/classes/gis/PMA_GIS_Multipolygon_test.php

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

test/classes/gis/PMA_GIS_Point_test.php

@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Test for PMA_GIS_Point
  *
@@ -165,4 +166,4 @@ class PMA_GIS_PointTest extends PMA_GIS_GeomTest
         );
     }
 }
-?>
+?>

test/classes/gis/PMA_GIS_Polygon_test.php

@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Test for PMA_GIS_Polygon
  *
@@ -345,4 +346,4 @@ class PMA_GIS_PolygonTest extends PMA_GIS_GeomTest
         );
     }
 }
-?>
+?>

test/libraries/PMA_GIS_modifyQuery_test.php

@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Tests for PMA_GIS_modifyQuery method
  *
@@ -91,4 +92,4 @@ class PMA_GIS_modifyQueryTest extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
+?>

url.php

@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * URL redirector to avoid leaking Referer with some sensitive information.
  */

webapp.php

@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * generate an WebApp file for Prism / WebRunner
  *