mprins / dokuwiki-plugin-spatialhelper

helper/index.php

Doc Comments +1 added lines, -2 removed lines

@@ -162,11 +162,10 @@
 	/**
 	 * Add an index entry for this file having EXIF / IPTC data.
 	 *
-	 * @param unknown_type $param
 	 * @see http://www.php.net/manual/en/function.iptcparse.php
 	 * @see http://php.net/manual/en/function.exif-read-data.php
 	 *
-	 * @return true when image was succesfully added to the index.
+	 * @return boolean when image was succesfully added to the index.
 	 */
 	function indexImage($img) {
 		// test for supported files (jpeg only)

Spacing +57 added lines, -57 removed lines

@@ -14,7 +14,7 @@ 
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-if (! defined ( 'DOKU_INC' ))
+if (!defined('DOKU_INC'))
 	die ();
 
 /**
@@ -37,7 +37,7 @@ 
 	 *
 	 * @var array
 	 */
-	protected $spatial_idx = array ();
+	protected $spatial_idx = array();
 
 	/**
 	 * handle to the geoPHP plugin.
@@ -49,20 +49,20 @@ 
 	 */
 	function __construct() {
 		// parent::__construct ();
-		if (! $geophp = &plugin_load ( 'helper', 'geophp' )) {
+		if (!$geophp = &plugin_load('helper', 'geophp')) {
 			$message = 'helper_plugin_spatialhelper_index::spatialhelper_index: geophp plugin is not available.';
-			msg ( $message, - 1 );
+			msg($message, - 1);
 			return "";
 		}
 
 		global $conf;
 		$this->idx_dir = $conf ['indexdir'];
 		// test if there is a spatialindex, if not build one for the wiki
-		if (! @file_exists ( $this->idx_dir . '/spatial.idx' )) {
+		if (!@file_exists($this->idx_dir . '/spatial.idx')) {
 			// creates and stores the index
-			$this->generateSpatialIndex ();
+			$this->generateSpatialIndex();
 		} else {
-			$this->spatial_idx = unserialize ( io_readFile ( $this->idx_dir . '/spatial.idx', false ) );
+			$this->spatial_idx = unserialize(io_readFile($this->idx_dir . '/spatial.idx', false));
 			// dbglog ( $this->spatial_idx, 'done loading spatial index' );
 		}
 	}
@@ -74,14 +74,14 @@ 
 	 *        	the document ID
 	 */
 	function updateSpatialIndex($id) {
-		$geotags = p_get_metadata ( $id, 'geo' );
-		if (empty ( $geotags )) return false;
+		$geotags = p_get_metadata($id, 'geo');
+		if (empty ($geotags)) return false;
 		if (empty ($geotags ['lon']) || empty ($geotags ['lat'])) return false;
 		// dbglog ( $geotags, "Geo metadata found for page $id" );
-		$geometry = new Point ( $geotags ['lon'], $geotags ['lat'] );
-		$geohash = $geometry->out ( 'geohash' );
+		$geometry = new Point($geotags ['lon'], $geotags ['lat']);
+		$geohash = $geometry->out('geohash');
 		// dbglog ( 'Update index for geohash: ' . $geohash );
-		$succes = $this->_addToIndex ( $geohash, $id );
+		$succes = $this->_addToIndex($geohash, $id);
 	}
 
 	/**
@@ -93,9 +93,9 @@ 
 	 *        	spatial index
 	 */
 	function findHashesForId($id, $index) {
-		$hashes = array ();
-		foreach ( $index as $hash => $docIds ) {
-			if (in_array ( $id, $docIds, false )) {
+		$hashes = array();
+		foreach ($index as $hash => $docIds) {
+			if (in_array($id, $docIds, false)) {
 				$hashes [] = $hash;
 			}
 		}
@@ -111,29 +111,29 @@ 
 	 */
 	function deleteFromIndex($id) {
 		// check the index for document
-		$knownHashes = $this->findHashesForId ( $id, $this->spatial_idx );
-		if (empty ( $knownHashes ))
+		$knownHashes = $this->findHashesForId($id, $this->spatial_idx);
+		if (empty ($knownHashes))
 			return;
 
 			// TODO shortcut, need to make sure there is only one element, if not the index is corrupt
 		$knownHash = $knownHashes [0];
 		$knownIds = $this->spatial_idx [$knownHash];
-		$i = array_search ( $id, $knownIds );
+		$i = array_search($id, $knownIds);
 		// dbglog ( "removing: $knownIds[$i] from the index." );
-		unset ( $knownIds [$i] );
+		unset ($knownIds [$i]);
 		$this->spatial_idx [$knownHash] = $knownIds;
-		if (empty ( $this->spatial_idx [$knownHash] )) {
+		if (empty ($this->spatial_idx [$knownHash])) {
 			// dbglog ( "removing key: $knownHash from the index." );
-			unset ( $this->spatial_idx [$knownHash] );
+			unset ($this->spatial_idx [$knownHash]);
 		}
-		$succes = $this->_saveIndex ();
+		$succes = $this->_saveIndex();
 	}
 
 	/**
 	 * Save spatial index.
 	 */
 	private function _saveIndex() {
-		return io_saveFile ( $this->idx_dir . '/spatial.idx', serialize ( $this->spatial_idx ) );
+		return io_saveFile($this->idx_dir . '/spatial.idx', serialize($this->spatial_idx));
 	}
 
 	/**
@@ -144,17 +144,17 @@ 
 	function generateSpatialIndex() {
 		global $conf;
 		require_once (DOKU_INC . 'inc/search.php');
-		$pages = array ();
-		search ( $pages, $conf ['datadir'], 'search_allpages', array () );
-		foreach ( $pages as $page ) {
-			$this->updateSpatialIndex ( $page ['id'] );
+		$pages = array();
+		search($pages, $conf ['datadir'], 'search_allpages', array());
+		foreach ($pages as $page) {
+			$this->updateSpatialIndex($page ['id']);
 		}
 		// media
-		$media = array ();
-		search ( $media, $conf ['mediadir'], 'search_media', array () );
-		foreach ( $media as $medium ) {
+		$media = array();
+		search($media, $conf ['mediadir'], 'search_media', array());
+		foreach ($media as $medium) {
 			if ($medium ['isimg'])
-				$this->indexImage ( $medium );
+				$this->indexImage($medium);
 		}
 		return true;
 	}
@@ -170,19 +170,19 @@ 
 	 */
 	function indexImage($img) {
 		// test for supported files (jpeg only)
-		if ((substr ( $img ['file'], - strlen ( '.jpg' ) ) !== '.jpg') and (substr ( $img ['file'], - strlen ( '.jpeg' ) ) !== '.jpeg')) {
+		if ((substr($img ['file'], - strlen('.jpg')) !== '.jpg') and (substr($img ['file'], - strlen('.jpeg')) !== '.jpeg')) {
 			return false;
 		}
 
-		$geometry = $this->getCoordsFromExif ( $img ['id'] );
+		$geometry = $this->getCoordsFromExif($img ['id']);
 		if (!$geometry) {
 			return false;
 		}
-		$geohash = $geometry->out ( 'geohash' );
+		$geohash = $geometry->out('geohash');
 		// TODO truncate the geohash to something reasonable, otherwise they are
 		// useless as an indexing mechanism eg. u1h73weckdrmskdqec3c9 is far too
 		// precise, limit at ~9 as most GPS are not submeter accurate
-		return $this->_addToIndex ( $geohash, 'media__' . $img ['id'] );
+		return $this->_addToIndex($geohash, 'media__' . $img ['id']);
 	}
 
 	/**
@@ -193,26 +193,26 @@ 
 	 * @return Point or false
 	 */
 	public function getCoordsFromExif($id) {
-		$exif = exif_read_data ( mediaFN ( $id ), 0, true );
-		if (empty ( $exif ['GPS'] )) {
+		$exif = exif_read_data(mediaFN($id), 0, true);
+		if (empty ($exif ['GPS'])) {
 			return false;
 		}
 
-		$lat = $this->_convertDMStoD ( array (
+		$lat = $this->_convertDMStoD(array(
 				$exif ['GPS'] ['GPSLatitude'] [0],
 				$exif ['GPS'] ['GPSLatitude'] [1],
 				$exif ['GPS'] ['GPSLatitude'] [2],
 				$exif ['GPS'] ['GPSLatitudeRef']
-		) );
+		));
 
-		$lon = $this->_convertDMStoD ( array (
+		$lon = $this->_convertDMStoD(array(
 				$exif ['GPS'] ['GPSLongitude'] [0],
 				$exif ['GPS'] ['GPSLongitude'] [1],
 				$exif ['GPS'] ['GPSLongitude'] [2],
 				$exif ['GPS'] ['GPSLongitudeRef']
-		) );
+		));
 
-		return new Point ( $lon, $lat );
+		return new Point($lon, $lat);
 	}
 
 	/**
@@ -224,17 +224,17 @@ 
 	 * @return boolean true when succesful
 	 */
 	private function _addToIndex($geohash, $id) {
-		$pageIds = array ();
+		$pageIds = array();
 		// check index for key/geohash
-		if (! array_key_exists ( $geohash, $this->spatial_idx )) {
+		if (!array_key_exists($geohash, $this->spatial_idx)) {
 			// dbglog ( "Geohash $geohash not in index, just add $id." );
 			$pageIds [] = $id;
 		} else {
 			// dbglog ( 'Geohash for document is in index, find it.' );
 			// check the index for document
-			$knownHashes = $this->findHashesForId ( $id, $this->spatial_idx );
-			if (empty ( $knownHashes )) {
-				dbglog ( "No index record found for document $id, just add" );
+			$knownHashes = $this->findHashesForId($id, $this->spatial_idx);
+			if (empty ($knownHashes)) {
+				dbglog("No index record found for document $id, just add");
 				$pageIds = $this->spatial_idx [$geohash];
 				$pageIds [] = $id;
 			}
@@ -246,14 +246,14 @@ 
 				return true;
 			}
 
-			if (! empty ( $knownHash )) {
+			if (!empty ($knownHash)) {
 				// dbglog ( "Document/media $id was found in index but has different geohash (it moved)." );
 				$knownIds = $this->spatial_idx [$knownHash];
 				// dbglog ( $knownIds, "Known id's for this hash:" );
 				// remove it from the old geohash element
-				$i = array_search ( $id, $knownIds );
+				$i = array_search($id, $knownIds);
 				// dbglog ( 'Unsetting:' . $knownIds [$i] );
-				unset ( $knownIds [$i] );
+				unset ($knownIds [$i]);
 				$this->spatial_idx [$knownHash] = $knownIds;
 				// set on new geohash element
 				$pageIds = $this->spatial_idx [$geohash];
@@ -262,7 +262,7 @@ 
 		}
 		// store and save
 		$this->spatial_idx [$geohash] = $pageIds;
-		return $this->_saveIndex ();
+		return $this->_saveIndex();
 	}
 
 	/**
@@ -273,12 +273,12 @@ 
 	 * @return number
 	 */
 	private function _convertDMStoD($param) {
-		if (!is_array($param)){
-			$param = array ($param);
+		if (!is_array($param)) {
+			$param = array($param);
 		}
-		$deg = $this->_convertRationaltoFloat ( $param [0] );
-		$min = $this->_convertRationaltoFloat ( $param [1] ) / 60;
-		$sec = $this->_convertRationaltoFloat ( $param [2] ) / 60 / 60;
+		$deg = $this->_convertRationaltoFloat($param [0]);
+		$min = $this->_convertRationaltoFloat($param [1]) / 60;
+		$sec = $this->_convertRationaltoFloat($param [2]) / 60 / 60;
 		// Hemisphere (N, S, W or E)
 		$hem = $param [4] == ('N' | 'E') ? - 1 : 1;
 		return $hem * $deg + $min + $sec;
@@ -287,7 +287,7 @@ 
 	private function _convertRationaltoFloat($param) {
 		// rational64u
 		$nums = explode('/', $param);
-		if (intval ($nums[1]) > 0 ){
+		if (intval($nums[1]) > 0) {
 			return intval($nums[0]) / intval($nums[1]);
 		} else {
 			return intval($nums[0]);

Braces +14 added lines, -7 removed lines

@@ -14,8 +14,9 @@ 
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-if (! defined ( 'DOKU_INC' ))
+if (! defined ( 'DOKU_INC' )) {
 	die ();
+}
 
 /**
  * DokuWiki Plugin spatialhelper (index component).
@@ -75,8 +76,12 @@ 
 	 */
 	function updateSpatialIndex($id) {
 		$geotags = p_get_metadata ( $id, 'geo' );
-		if (empty ( $geotags )) return false;
-		if (empty ($geotags ['lon']) || empty ($geotags ['lat'])) return false;
+		if (empty ( $geotags )) {
+			return false;
+		}
+		if (empty ($geotags ['lon']) || empty ($geotags ['lat'])) {
+			return false;
+		}
 		// dbglog ( $geotags, "Geo metadata found for page $id" );
 		$geometry = new Point ( $geotags ['lon'], $geotags ['lat'] );
 		$geohash = $geometry->out ( 'geohash' );
@@ -112,8 +117,9 @@ 
 	function deleteFromIndex($id) {
 		// check the index for document
 		$knownHashes = $this->findHashesForId ( $id, $this->spatial_idx );
-		if (empty ( $knownHashes ))
-			return;
+		if (empty ( $knownHashes )) {
+					return;
+		}
 
 			// TODO shortcut, need to make sure there is only one element, if not the index is corrupt
 		$knownHash = $knownHashes [0];
@@ -153,8 +159,9 @@ 
 		$media = array ();
 		search ( $media, $conf ['mediadir'], 'search_media', array () );
 		foreach ( $media as $medium ) {
-			if ($medium ['isimg'])
-				$this->indexImage ( $medium );
+			if ($medium ['isimg']) {
+							$this->indexImage ( $medium );
+			}
 		}
 		return true;
 	}

admin/purge.php

Spacing +20 added lines, -20 removed lines

@@ -14,10 +14,10 @@ 
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-if (! defined ( 'DOKU_INC' ))
+if (!defined('DOKU_INC'))
 	die ();
-if (! defined ( 'DOKU_PLUGIN' ))
-	define ( 'DOKU_PLUGIN', DOKU_INC . 'lib/plugins/' );
+if (!defined('DOKU_PLUGIN'))
+	define('DOKU_PLUGIN', DOKU_INC . 'lib/plugins/');
 require_once DOKU_PLUGIN . 'admin.php';
 /**
  * DokuWiki Plugin spatialhelper (Admin Component).
@@ -52,22 +52,22 @@ 
 	 */
 	public function handle() {
 		global $conf;
-		if (isset ( $_REQUEST ['purgeindex'] )) {
+		if (isset ($_REQUEST ['purgeindex'])) {
 			global $conf;
 			$path = $conf ['indexdir'] . '/spatial.idx';
-			if (file_exists ( $path )) {
-				if (unlink ( $path )) {
-					msg ( $this->getLang ( 'admin_purged_tiles' ), 0 );
+			if (file_exists($path)) {
+				if (unlink($path)) {
+					msg($this->getLang('admin_purged_tiles'), 0);
 				}
 			}
 		}
 
-		$indexer = plugin_load ( 'helper', 'spatialhelper_index' );
-		$indexer->generateSpatialIndex ();
+		$indexer = plugin_load('helper', 'spatialhelper_index');
+		$indexer->generateSpatialIndex();
 
-		$sitemapper = plugin_load ( 'helper', 'spatialhelper_sitemap' );
-		$sitemapper->createKMLSitemap ( $this->getConf('media_kml') );
-		$sitemapper->createGeoRSSSitemap ( $this->getConf('media_georss') );
+		$sitemapper = plugin_load('helper', 'spatialhelper_sitemap');
+		$sitemapper->createKMLSitemap($this->getConf('media_kml'));
+		$sitemapper->createGeoRSSSitemap($this->getConf('media_georss'));
 	}
 
 	/**
@@ -76,17 +76,17 @@ 
 	 * @see DokuWiki_Admin_Plugin::html()
 	 */
 	public function html() {
-		echo $this->locale_xhtml ( 'admin_purge_intro' );
+		echo $this->locale_xhtml('admin_purge_intro');
 
-		$form = new Doku_Form ( array (
+		$form = new Doku_Form(array(
 				'id' => 'spatialhelper__purgeform',
 				'method' => 'post'
-		) );
-		$form->addHidden ( 'purgeindex', 'true' );
+		));
+		$form->addHidden('purgeindex', 'true');
 
-		$form->addElement ( form_makeButton ( 'submit', 'admin', $this->getLang ( 'admin_submit' ), array (
-				'title' => $this->getLang ( 'admin_submit' )
-		) ) );
-		$form->printForm ();
+		$form->addElement(form_makeButton('submit', 'admin', $this->getLang('admin_submit'), array(
+				'title' => $this->getLang('admin_submit')
+		)));
+		$form->printForm();
 	}
 }

Braces +4 added lines, -2 removed lines

@@ -14,10 +14,12 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-if (! defined ( 'DOKU_INC' ))
+if (! defined ( 'DOKU_INC' )) {
 	die ();
-if (! defined ( 'DOKU_PLUGIN' ))
+}
+if (! defined ( 'DOKU_PLUGIN' )) {
 	define ( 'DOKU_PLUGIN', DOKU_INC . 'lib/plugins/' );
+}
 require_once DOKU_PLUGIN . 'admin.php';
 /**
  * DokuWiki Plugin spatialhelper (Admin Component).

_test/general.test.php

Indentation +31 added lines, -31 removed lines

@@ -23,40 +23,40 @@
  */
 class general_plugin_spatialhelper_test extends DokuWikiTest {
 
-    protected $pluginsEnabled = array('spatialhelper');
+	protected $pluginsEnabled = array('spatialhelper');
 
-    /**
-     * Simple test to make sure the plugin.info.txt is in correct format.
-     */
-    public function test_plugininfo() {
-        $file = __DIR__ . '/../plugin.info.txt';
-        $this->assertFileExists($file);
+	/**
+	 * Simple test to make sure the plugin.info.txt is in correct format.
+	 */
+	public function test_plugininfo() {
+		$file = __DIR__ . '/../plugin.info.txt';
+		$this->assertFileExists($file);
 
-        $info = confToHash($file);
+		$info = confToHash($file);
 
-        $this->assertArrayHasKey('base', $info);
-        $this->assertArrayHasKey('author', $info);
-        $this->assertArrayHasKey('email', $info);
-        $this->assertArrayHasKey('date', $info);
-        $this->assertArrayHasKey('name', $info);
-        $this->assertArrayHasKey('desc', $info);
-        $this->assertArrayHasKey('url', $info);
+		$this->assertArrayHasKey('base', $info);
+		$this->assertArrayHasKey('author', $info);
+		$this->assertArrayHasKey('email', $info);
+		$this->assertArrayHasKey('date', $info);
+		$this->assertArrayHasKey('name', $info);
+		$this->assertArrayHasKey('desc', $info);
+		$this->assertArrayHasKey('url', $info);
 
-        $this->assertEquals('spatialhelper', $info['base']);
-        $this->assertRegExp('/^https?:\/\//', $info['url']);
-        $this->assertTrue(mail_isvalid($info['email']));
-        $this->assertRegExp('/^\d\d\d\d-\d\d-\d\d$/', $info['date']);
-        $this->assertTrue(false !== strtotime($info['date']));
-    }
+		$this->assertEquals('spatialhelper', $info['base']);
+		$this->assertRegExp('/^https?:\/\//', $info['url']);
+		$this->assertTrue(mail_isvalid($info['email']));
+		$this->assertRegExp('/^\d\d\d\d-\d\d-\d\d$/', $info['date']);
+		$this->assertTrue(false !== strtotime($info['date']));
+	}
 
-    /**
-     * test if plugin is loaded.
-     */
-    public function test_plugin_spatialhelper_isloaded() {
-        global $plugin_controller;
-        $this->assertTrue(
-                    in_array('spatialhelper', $plugin_controller->getList()),
-                    "spatialhelper plugin is loaded"
-                            );
-    }
+	/**
+	 * test if plugin is loaded.
+	 */
+	public function test_plugin_spatialhelper_isloaded() {
+		global $plugin_controller;
+		$this->assertTrue(
+					in_array('spatialhelper', $plugin_controller->getList()),
+					"spatialhelper plugin is loaded"
+							);
+	}
 }

helper/search.php

Spacing +61 added lines, -61 removed lines

@@ -14,10 +14,10 @@ 
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-if (! defined ( 'DOKU_INC' ))
+if (!defined('DOKU_INC'))
 	die ();
-if (! defined ( 'DOKU_PLUGIN' ))
-	define ( 'DOKU_PLUGIN', DOKU_INC . 'lib/plugins/' );
+if (!defined('DOKU_PLUGIN'))
+	define('DOKU_PLUGIN', DOKU_INC . 'lib/plugins/');
 
 /**
  * DokuWiki Plugin spatialhelper (Search component).
@@ -31,7 +31,7 @@ 
 	 *
 	 * @var array
 	 */
-	protected $spatial_idx = array ();
+	protected $spatial_idx = array();
 
 	/**
 	 * Precision, Distance of Adjacent Cell in Meters.
@@ -40,7 +40,7 @@ 
 	 *
 	 * @var float
 	 */
-	private $precision = array (
+	private $precision = array(
 			5003530,
 			625441,
 			123264,
@@ -65,18 +65,18 @@ 
 		// parent::__construct ();
 		global $conf;
 
-		if (! $geophp = &plugin_load ( 'helper', 'geophp' )) {
+		if (!$geophp = &plugin_load('helper', 'geophp')) {
 			$message = 'helper_plugin_spatialhelper_search::spatialhelper_search: geophp plugin is not available.';
-			msg ( $message, - 1 );
+			msg($message, - 1);
 			return "";
 		}
 
 		$idx_dir = $conf ['indexdir'];
-		if (! @file_exists ( $idx_dir . '/spatial.idx' )) {
-			$indexer = plugin_load ( 'helper', 'spatialhelper_index' );
+		if (!@file_exists($idx_dir . '/spatial.idx')) {
+			$indexer = plugin_load('helper', 'spatialhelper_index');
 		}
 
-		$this->spatial_idx = unserialize ( io_readFile ( $fn = $idx_dir . '/spatial.idx', false ) );
+		$this->spatial_idx = unserialize(io_readFile($fn = $idx_dir . '/spatial.idx', false));
 	}
 
 	/**
@@ -88,8 +88,8 @@ 
 	 *        	The x coordinate (or longitude)
 	 */
 	function findNearbyLatLon($lat, $lon) {
-		$geometry = new Point ( $lon, $lat );
-		return $this->findNearby ( $geometry->out ( 'geohash' ), $geometry );
+		$geometry = new Point($lon, $lat);
+		return $this->findNearby($geometry->out('geohash'), $geometry);
 	}
 
 	/**
@@ -102,76 +102,76 @@ 
 	 * @return array of ...
 	 */
 	function findNearby($geohash, Point $p = null) {
-		$_geohashClass = new Geohash ();
-		if (! $p) {
-			$decodedPoint = $_geohashClass->read ( $geohash );
+		$_geohashClass = new Geohash();
+		if (!$p) {
+			$decodedPoint = $_geohashClass->read($geohash);
 		} else {
 			$decodedPoint = $p;
 		}
 
 		// find adjacent blocks
-		$adjacent = array ();
+		$adjacent = array();
 		$adjacent ['center'] = $geohash;
-		$adjacent ['top'] = $_geohashClass->adjacent ( $adjacent ['center'], 'top' );
-		$adjacent ['bottom'] = $_geohashClass->adjacent ( $adjacent ['center'], 'bottom' );
-		$adjacent ['right'] = $_geohashClass->adjacent ( $adjacent ['center'], 'right' );
-		$adjacent ['left'] = $_geohashClass->adjacent ( $adjacent ['center'], 'left' );
-		$adjacent ['topleft'] = $_geohashClass->adjacent ( $adjacent ['left'], 'top' );
-		$adjacent ['topright'] = $_geohashClass->adjacent ( $adjacent ['right'], 'top' );
-		$adjacent ['bottomright'] = $_geohashClass->adjacent ( $adjacent ['right'], 'bottom' );
-		$adjacent ['bottomleft'] = $_geohashClass->adjacent ( $adjacent ['left'], 'bottom' );
+		$adjacent ['top'] = $_geohashClass->adjacent($adjacent ['center'], 'top');
+		$adjacent ['bottom'] = $_geohashClass->adjacent($adjacent ['center'], 'bottom');
+		$adjacent ['right'] = $_geohashClass->adjacent($adjacent ['center'], 'right');
+		$adjacent ['left'] = $_geohashClass->adjacent($adjacent ['center'], 'left');
+		$adjacent ['topleft'] = $_geohashClass->adjacent($adjacent ['left'], 'top');
+		$adjacent ['topright'] = $_geohashClass->adjacent($adjacent ['right'], 'top');
+		$adjacent ['bottomright'] = $_geohashClass->adjacent($adjacent ['right'], 'bottom');
+		$adjacent ['bottomleft'] = $_geohashClass->adjacent($adjacent ['left'], 'bottom');
 		// dbglog ( $adjacent, "adjacent geo hashes:" );
 
 		// find all the pages in the index that overlap with the adjacent hashes
-		$docIds = array ();
-		foreach ( $adjacent as $adjHash ) {
-			if (is_array ( $this->spatial_idx )) {
-				foreach ( $this->spatial_idx as $_geohash => $_docIds ) {
-					if (strstr ( $_geohash, $adjHash )) {
+		$docIds = array();
+		foreach ($adjacent as $adjHash) {
+			if (is_array($this->spatial_idx)) {
+				foreach ($this->spatial_idx as $_geohash => $_docIds) {
+					if (strstr($_geohash, $adjHash)) {
 						// dbglog ( "Found adjacent geo hash: $adjHash in $_geohash" );
 						// if $adjHash similar to geohash
-						$docIds = array_merge ( $docIds, $_docIds );
+						$docIds = array_merge($docIds, $_docIds);
 					}
 				}
 			}
 		}
-		$docIds = array_unique ( $docIds );
+		$docIds = array_unique($docIds);
 		// dbglog ( $docIds, "found docIDs" );
 
 		// create associative array of pages + calculate distance
-		$pages = array ();
-		$media = array ();
-		$indexer = plugin_load ( 'helper', 'spatialhelper_index' );
+		$pages = array();
+		$media = array();
+		$indexer = plugin_load('helper', 'spatialhelper_index');
 
-		foreach ( $docIds as $id ) {
-			if (strpos ( $id, 'media__', 0 ) === 0) {
-				$id = substr ( $id, strlen ( 'media__' ) );
-				if (auth_quickaclcheck ( $id ) >= /*AUTH_READ*/1) {
-					$point = $indexer->getCoordsFromExif ( $id );
-					$line = new LineString ( [
+		foreach ($docIds as $id) {
+			if (strpos($id, 'media__', 0) === 0) {
+				$id = substr($id, strlen('media__'));
+				if (auth_quickaclcheck($id) >= /*AUTH_READ*/1) {
+					$point = $indexer->getCoordsFromExif($id);
+					$line = new LineString([
 							$decodedPoint,
 							$point
-					] );
-					$media [] = array (
+					]);
+					$media [] = array(
 							'id' => $id,
-							'distance' => ( int ) ($line->greatCircleLength ()),
-							'lat' => $point->y (),
-							'lon' => $point->x ()
+							'distance' => ( int ) ($line->greatCircleLength()),
+							'lat' => $point->y(),
+							'lon' => $point->x()
 					// optionally add other meta such as tag, description...
 										);
 				}
 			} else {
-				if (auth_quickaclcheck ( $id ) >= /*AUTH_READ*/1) {
-					$geotags = p_get_metadata ( $id, 'geo' );
-					$point = new Point ( $geotags ['lon'], $geotags ['lat'] );
-					$line = new LineString ( [
+				if (auth_quickaclcheck($id) >= /*AUTH_READ*/1) {
+					$geotags = p_get_metadata($id, 'geo');
+					$point = new Point($geotags ['lon'], $geotags ['lat']);
+					$line = new LineString([
 							$decodedPoint,
 							$point
-					] );
-					$pages [] = array (
+					]);
+					$pages [] = array(
 							'id' => $id,
-							'distance' => ( int ) ($line->greatCircleLength ()),
-							'description' => p_get_metadata ( $id, 'description' )['abstract'],
+							'distance' => ( int ) ($line->greatCircleLength()),
+							'description' => p_get_metadata($id, 'description')['abstract'],
 							'lat' => $geotags ['lat'],
 							'lon' => $geotags ['lon']
 					// optionally add other meta such as tag...
@@ -181,20 +181,20 @@ 
 		}
 
 		// sort all the pages/media using distance
-		usort ( $pages, function ($a, $b) {
-			return strnatcmp ( $a ['distance'], $b ['distance'] );
+		usort($pages, function($a, $b) {
+			return strnatcmp($a ['distance'], $b ['distance']);
 		} );
-		usort ( $media, function ($a, $b) {
-			return strnatcmp ( $a ['distance'], $b ['distance'] );
+		usort($media, function($a, $b) {
+			return strnatcmp($a ['distance'], $b ['distance']);
 		} );
 
-		return array (
+		return array(
 				'pages' => $pages,
 				'media' => $media,
-				'lat' => $decodedPoint->y (),
-				'lon' => $decodedPoint->x (),
+				'lat' => $decodedPoint->y(),
+				'lon' => $decodedPoint->x(),
 				'geohash' => $geohash,
-				'precision' => $this->precision [strlen ( $geohash )]
+				'precision' => $this->precision [strlen($geohash)]
 		);
 	}
 }
\ No newline at end of file

Braces +4 added lines, -2 removed lines

@@ -14,10 +14,12 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-if (! defined ( 'DOKU_INC' ))
+if (! defined ( 'DOKU_INC' )) {
 	die ();
-if (! defined ( 'DOKU_PLUGIN' ))
+}
+if (! defined ( 'DOKU_PLUGIN' )) {
 	define ( 'DOKU_PLUGIN', DOKU_INC . 'lib/plugins/' );
+}
 
 /**
  * DokuWiki Plugin spatialhelper (Search component).

helper/sitemap.php

Spacing +17 added lines, -17 removed lines

@@ -14,11 +14,11 @@ 
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-if (! defined('DOKU_INC'))
+if (!defined('DOKU_INC'))
 	die ();
-if (! defined('DOKU_PLUGIN'))
+if (!defined('DOKU_PLUGIN'))
 	define('DOKU_PLUGIN', DOKU_INC . 'lib/plugins/');
-if (! defined('DOKU_LF'))
+if (!defined('DOKU_LF'))
 	define('DOKU_LF', "\n");
 
 /**
@@ -31,7 +31,7 @@ 
 	/**
 	 * spatial index.
 	 */
-	var $spatial_idx = array ();
+	var $spatial_idx = array();
 
 	/**
 	 * constructor, load spatial index.
@@ -42,29 +42,29 @@ 
 		$idx_dir = $conf['indexdir'];
 		if (!@file_exists($idx_dir . '/spatial.idx')) {
 			$indexer = plugin_load('helper', 'spatialhelper_index');
-			$indexer->generateSpatialIndex ();
+			$indexer->generateSpatialIndex();
 		}
 		$this->spatial_idx = unserialize(io_readFile($fn = $idx_dir . '/spatial.idx', false));
 	}
 
 	function getMethods() {
-		$result[] = array (
+		$result[] = array(
 				'name' => 'createGeoRSSSitemap',
 				'desc' => 'create a spatial sitemap in GeoRSS format.',
-				'params' => array (
+				'params' => array(
 						'path' => 'string'
 				),
-				'return' => array (
+				'return' => array(
 						'success' => 'boolean'
 				)
 		);
-		$result[] = array (
+		$result[] = array(
 				'name' => 'createKMLSitemap',
 				'desc' => 'create a spatial sitemap in KML format.',
-				'params' => array (
+				'params' => array(
 						'path' => 'string'
 				),
-				'return' => array (
+				'return' => array(
 						'success' => 'boolean'
 				)
 		);
@@ -85,7 +85,7 @@ 
 		$RSSstart = '<?xml version="1.0" encoding="UTF-8"?>' . DOKU_LF;
 		$RSSstart .= '<feed xmlns="http://www.w3.org/2005/Atom" xmlns:georss="http://www.georss.org/georss" xmlns:dc="http://purl.org/dc/elements/1.1/">' . DOKU_LF;
 		$RSSstart .= '<title>' . $conf['title'] . ' spatial feed</title>' . DOKU_LF;
-		if (! empty($conf['tagline'])) {
+		if (!empty($conf['tagline'])) {
 			$RSSstart .= '<subtitle>' . $conf['tagline'] . '</subtitle>' . DOKU_LF;
 		}
 		$RSSstart .= '<dc:publisher>' . $conf['title'] . '</dc:publisher>' . DOKU_LF;
@@ -103,9 +103,9 @@ 
 		$fh = fopen(mediaFN($mediaID), 'w');
 		fwrite($fh, $RSSstart);
 
-		foreach($this->spatial_idx as $idxEntry) {
+		foreach ($this->spatial_idx as $idxEntry) {
 			// get list of id's
-			foreach($idxEntry as $id) {
+			foreach ($idxEntry as $id) {
 				// for document item in the index
 				if (strpos($id, 'media__', 0) !== 0) {
 					// public and non-hidden pages only
@@ -172,9 +172,9 @@ 
 		$fh = fopen(mediaFN($mediaID), 'w');
 		fwrite($fh, $KMLstart);
 
-		foreach($this->spatial_idx as $idxEntry) {
+		foreach ($this->spatial_idx as $idxEntry) {
 			// get list of id's
-			foreach($idxEntry as $id) {
+			foreach ($idxEntry as $id) {
 				// for document item in the index
 				if (strpos($id, 'media__', 0) !== 0) {
 					// public and non-hidden pages only
@@ -194,7 +194,7 @@ 
 					$plcm .= '  <name>' . $meta['title'] . '</name>' . DOKU_LF;
 					// TODO escape quotes in: title="' . $meta['title'] . '"
 					$plcm .= '  <atom:link href="' . wl($id, '' . true) . '" rel="alternate" type="text/html" />' . DOKU_LF;
-					if (! empty($meta['creator'])) {
+					if (!empty($meta['creator'])) {
 						$entry .= '  <atom:author><atom:name>' . $meta['creator'] . '</atom:name></atom:author>' . DOKU_LF;
 					}
 

Braces +18 added lines, -11 removed lines

@@ -14,12 +14,15 @@ 
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-if (! defined('DOKU_INC'))
+if (! defined('DOKU_INC')) {
 	die ();
-if (! defined('DOKU_PLUGIN'))
+}
+if (! defined('DOKU_PLUGIN')) {
 	define('DOKU_PLUGIN', DOKU_INC . 'lib/plugins/');
-if (! defined('DOKU_LF'))
+}
+if (! defined('DOKU_LF')) {
 	define('DOKU_LF', "\n");
+}
 
 /**
  * DokuWiki Plugin spatialhelper (sitemap Component).
@@ -109,10 +112,12 @@ 
 				// for document item in the index
 				if (strpos($id, 'media__', 0) !== 0) {
 					// public and non-hidden pages only
-					if (isHiddenPage($id))
-						continue;
-					if (auth_aclcheck($id, '', '') < AUTH_READ)
-						continue;
+					if (isHiddenPage($id)) {
+											continue;
+					}
+					if (auth_aclcheck($id, '', '') < AUTH_READ) {
+											continue;
+					}
 
 					$meta = p_get_metadata($id);
 
@@ -178,10 +183,12 @@ 
 				// for document item in the index
 				if (strpos($id, 'media__', 0) !== 0) {
 					// public and non-hidden pages only
-					if (isHiddenPage($id))
-						continue;
-					if (auth_aclcheck($id, '', '') < AUTH_READ)
-						continue;
+					if (isHiddenPage($id)) {
+											continue;
+					}
+					if (auth_aclcheck($id, '', '') < AUTH_READ) {
+											continue;
+					}
 
 					$meta = p_get_metadata($id);
 

syntax/findnearby.php

Spacing +12 added lines, -12 removed lines

@@ -14,10 +14,10 @@ 
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF

  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

  */

-if (! defined ( 'DOKU_INC' ))

+if (!defined('DOKU_INC'))

 	die ();

-if (! defined ( 'DOKU_PLUGIN' ))

-	define ( 'DOKU_PLUGIN', DOKU_INC . 'lib/plugins/' );

+if (!defined('DOKU_PLUGIN'))

+	define('DOKU_PLUGIN', DOKU_INC . 'lib/plugins/');

 require_once (DOKU_PLUGIN . 'syntax.php');

 

 /**

@@ -58,7 +58,7 @@ 
 	 * @see Doku_Parser_Mode::connectTo()

 	 */

 	public function connectTo($mode) {

-		$this->Lexer->addSpecialPattern ( '\{\{findnearby>.*?\}\}', $mode, 'plugin_spatialhelper_findnearby' );

+		$this->Lexer->addSpecialPattern('\{\{findnearby>.*?\}\}', $mode, 'plugin_spatialhelper_findnearby');

 	}

 

 	/**

@@ -67,21 +67,21 @@ 
 	 * @see DokuWiki_Syntax_Plugin::handle()

 	 */

 	public function handle($match, $state, $pos, Doku_Handler $handler) {

-		$data = array ();

-		$data [0] = trim ( substr ( $match, strlen ( '{{findnearby>' ), - 2 ) );

-		if (strlen ( $data [0]) < 1 ) {

-			$data [0] = $this->getLang ( 'search_findnearby' );

+		$data = array();

+		$data [0] = trim(substr($match, strlen('{{findnearby>'), - 2));

+		if (strlen($data [0]) < 1) {

+			$data [0] = $this->getLang('search_findnearby');

 		}

-		$meta = p_get_metadata ( getID (), 'geo' );

+		$meta = p_get_metadata(getID(), 'geo');

 		if ($meta) {

 			if ($meta ['lat'] && $meta ['lon']) {

-				$data [1] = array (

+				$data [1] = array(

 						'do' => 'findnearby',

 						'lat' => $meta ['lat'],

 						'lon' => $meta ['lon']

 				);

 			} elseif ($meta ['geohash']) {

-				$data [1] = array (

+				$data [1] = array(

 						'do' => 'findnearby',

 						'geohash' => $meta ['geohash']

 				);

@@ -101,7 +101,7 @@ 
 			return false;

 

 		if ($mode == 'xhtml') {

-			$renderer->doc .= '<a href="' . wl ( getID (), $data [1] ) . '" class="findnearby">' . hsc( $data [0] ) . '</a>';

+			$renderer->doc .= '<a href="' . wl(getID(), $data [1]) . '" class="findnearby">' . hsc($data [0]) . '</a>';

 			return true;

 		// } elseif ($mode == 'metadata') {

 		} elseif ($mode == 'odt') {

Braces +9 added lines, -6 removed lines

@@ -14,10 +14,12 @@ 
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF

  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

  */

-if (! defined ( 'DOKU_INC' ))

-	die ();

-if (! defined ( 'DOKU_PLUGIN' ))

-	define ( 'DOKU_PLUGIN', DOKU_INC . 'lib/plugins/' );

+if (! defined ( 'DOKU_INC' )) {
+	die ();
+}
+if (! defined ( 'DOKU_PLUGIN' )) {
+	define ( 'DOKU_PLUGIN', DOKU_INC . 'lib/plugins/' );
+}
 require_once (DOKU_PLUGIN . 'syntax.php');

 

 /**

@@ -97,8 +99,9 @@ 
 	 * @see DokuWiki_Syntax_Plugin::render()

 	 */

 	public function render($mode, Doku_Renderer $renderer, $data) {

-		if ($data === false)

-			return false;

+		if ($data === false) {
+					return false;
+		}
 

 		if ($mode == 'xhtml') {

 			$renderer->doc .= '<a href="' . wl ( getID (), $data [1] ) . '" class="findnearby">' . hsc( $data [0] ) . '</a>';

action.php

Spacing +90 added lines, -90 removed lines

@@ -14,12 +14,12 @@ 
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF

  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

  */

-if (! defined ( 'DOKU_INC' ))

+if (!defined('DOKU_INC'))

 	die ();

-if (! defined ( 'DOKU_PLUGIN' ))

-	define ( 'DOKU_PLUGIN', DOKU_INC . 'lib/plugins/' );

-if (! defined ( 'DOKU_LF' ))

-	define ( 'DOKU_LF', "\n" );

+if (!defined('DOKU_PLUGIN'))

+	define('DOKU_PLUGIN', DOKU_INC . 'lib/plugins/');

+if (!defined('DOKU_LF'))

+	define('DOKU_LF', "\n");

 require_once (DOKU_PLUGIN . 'action.php');

 

 /**

@@ -39,30 +39,30 @@ 
 	public function register(Doku_Event_Handler $controller) {

 		// listen for page add / delete events

 		// http://www.dokuwiki.org/devel:event:indexer_page_add

-		$controller->register_hook ( 'INDEXER_PAGE_ADD', 'BEFORE', $this, 'handle_indexer_page_add' );

-		$controller->register_hook ( 'IO_WIKIPAGE_WRITE', 'BEFORE', $this, '_removeFromIndex' );

+		$controller->register_hook('INDEXER_PAGE_ADD', 'BEFORE', $this, 'handle_indexer_page_add');

+		$controller->register_hook('IO_WIKIPAGE_WRITE', 'BEFORE', $this, '_removeFromIndex');

 

 		// http://www.dokuwiki.org/devel:event:sitemap_generate

-		$controller->register_hook ( 'SITEMAP_GENERATE', 'BEFORE', $this, 'handle_sitemap_generate_before' );

+		$controller->register_hook('SITEMAP_GENERATE', 'BEFORE', $this, 'handle_sitemap_generate_before');

 		// using after will only trigger us if a sitemap was actually created

-		$controller->register_hook ( 'SITEMAP_GENERATE', 'AFTER', $this, 'handle_sitemap_generate_after' );

+		$controller->register_hook('SITEMAP_GENERATE', 'AFTER', $this, 'handle_sitemap_generate_after');

 

 		// handle actions we know of

-		$controller->register_hook ( 'ACTION_ACT_PREPROCESS', 'BEFORE', $this, 'handle_action_act_preprocess', array () );

+		$controller->register_hook('ACTION_ACT_PREPROCESS', 'BEFORE', $this, 'handle_action_act_preprocess', array());

 		// handle HTML eg. /dokuwiki/doku.php?id=start&do=findnearby&geohash=u15vk4

-		$controller->register_hook ( 'TPL_ACT_UNKNOWN', 'BEFORE', $this, '_findnearby', array (

+		$controller->register_hook('TPL_ACT_UNKNOWN', 'BEFORE', $this, '_findnearby', array(

 				'format' => 'HTML'

-		) );

+		));

 		// handles AJAX/json eg: jQuery.post("/dokuwiki/lib/exe/ajax.php?id=start&call=findnearby&geohash=u15vk4");

-		$controller->register_hook ( 'AJAX_CALL_UNKNOWN', 'BEFORE', $this, '_findnearby', array (

+		$controller->register_hook('AJAX_CALL_UNKNOWN', 'BEFORE', $this, '_findnearby', array(

 				'format' => 'JSON'

-		) );

+		));

 

 		// listen for media uploads and deletes

-		$controller->register_hook ( 'MEDIA_UPLOAD_FINISH', 'BEFORE', $this, '_handle_media_uploaded', array () );

-		$controller->register_hook ( 'MEDIA_DELETE_FILE', 'BEFORE', $this, '_handle_media_deleted', array () );

+		$controller->register_hook('MEDIA_UPLOAD_FINISH', 'BEFORE', $this, '_handle_media_uploaded', array());

+		$controller->register_hook('MEDIA_DELETE_FILE', 'BEFORE', $this, '_handle_media_deleted', array());

 

-		$controller->register_hook ( 'TPL_METAHEADER_OUTPUT', 'BEFORE', $this, 'handle_metaheader_output' );

+		$controller->register_hook('TPL_METAHEADER_OUTPUT', 'BEFORE', $this, 'handle_metaheader_output');

 	}

 

 	/**

@@ -78,8 +78,8 @@ 
 		// $event→data['body'] – empty, can be filled by additional content to index by your plugin

 		// $event→data['metadata'] – the metadata that shall be indexed. This is an array where the keys are the metadata indexes and the value a string or an array of strings with the values. title and relation_references will already be set.

 		$id = $event->data ['page'];

-		$indexer = & plugin_load ( 'helper', 'spatialhelper_index' );

-		$entries = $indexer->updateSpatialIndex ( $id );

+		$indexer = & plugin_load('helper', 'spatialhelper_index');

+		$entries = $indexer->updateSpatialIndex($id);

 	}

 

 	/**

@@ -90,7 +90,7 @@ 
 	 * @param object $param

 	 *        	the parameters passed to register_hook when this handler was registered

 	 */

-	function _removeFromIndex(Doku_Event &$event, $param) {

+	function _removeFromIndex(Doku_Event & $event, $param) {

 		// event data:

 		// $data[0] – The raw arguments for io_saveFile as an array. Do not change file path.

 		// $data[0][0] – the file path.

@@ -100,19 +100,19 @@ 
 		// $data[3] – rev: The page revision, false for current wiki pages.

 

 		// dbglog ( $event->data, "Event data in _removeFromIndex." );

-		if (@file_exists ( $event->data [0] [0] )) {

+		if (@file_exists($event->data [0] [0])) {

 			// file not new

-			if (! $event->data [0] [1]) {

+			if (!$event->data [0] [1]) {

 				// file is empty, page is being deleted

-				if (empty ( $event->data [1] )) {

+				if (empty ($event->data [1])) {

 					// root namespace

 					$id = $event->data [2];

 				} else {

 					$id = $event->data [1] . ":" . $event->data [2];

 				}

-				$indexer = & plugin_load ( 'helper', 'spatialhelper_index' );

+				$indexer = & plugin_load('helper', 'spatialhelper_index');

 				if ($indexer) {

-					$indexer->deleteFromIndex ( $id );

+					$indexer->deleteFromIndex($id);

 				}

 			}

 		}

@@ -125,9 +125,9 @@ 
 	 * @param unknown $param

 	 */

 	function handle_sitemap_generate_before(Doku_Event $event, $param) {

-		$path = mediaFN ( $this->getConf ( 'media_kml' ) );

-		$lastmod = @filemtime ( $path );

-		$event->data ['items'] [] = new SitemapItem ( ml ( $this->getConf ( 'media_kml' ), '', true, '&', true ), $lastmod );

+		$path = mediaFN($this->getConf('media_kml'));

+		$lastmod = @filemtime($path);

+		$event->data ['items'] [] = new SitemapItem(ml($this->getConf('media_kml'), '', true, '&', true), $lastmod);

 		// dbglog ( $event->data ['items'], "Added a new SitemapItem object that points to the KML of public geocoded pages." );

 	}

 

@@ -144,11 +144,11 @@ 
 		// $event→data['sitemap']: The path of the file the sitemap will be saved to.

 

 		// dbglog ($event->data['items'], "createSpatialSitemap loading helper" );

-		if ($helper = & plugin_load ( 'helper', 'spatialhelper_sitemap' )) {

+		if ($helper = & plugin_load('helper', 'spatialhelper_sitemap')) {

 			// dbglog ( $helper, "createSpatialSitemap loaded helper." );

 

-			$kml = $helper->createKMLSitemap ( $this->getConf ( 'media_kml' ) );

-			$rss = $helper->createGeoRSSSitemap ( $this->getConf ( 'media_georss' ) );

+			$kml = $helper->createKMLSitemap($this->getConf('media_kml'));

+			$rss = $helper->createGeoRSSSitemap($this->getConf('media_georss'));

 

 			return $kml && $rss;

 		} else {

@@ -168,7 +168,7 @@ 
 	function handle_action_act_preprocess(Doku_Event $event, $param) {

 		if ($event->data != 'findnearby')

 			return;

-		$event->preventDefault ();

+		$event->preventDefault();

 	}

 

 	/**

@@ -180,34 +180,34 @@ 
 	 *        	associative array with keys

 	 *        	'format'=> HTML | JSON

 	 */

-	function _findnearby(Doku_Event &$event, $param) {

+	function _findnearby(Doku_Event & $event, $param) {

 		if ($event->data != 'findnearby')

 			return;

-		$event->preventDefault ();

+		$event->preventDefault();

 

 		global $INPUT;

-		if ($helper = & plugin_load ( 'helper', 'spatialhelper_search' )) {

-			if ($INPUT->has ( 'lat' ) && $INPUT->has ( 'lon' )) {

-				$results = $helper->findNearbyLatLon ( $INPUT->param ( 'lat' ), $INPUT->param ( 'lon' ) );

-			} elseif ($INPUT->has ( 'geohash' )) {

-				$results = $helper->findNearby ( $INPUT->str ( 'geohash' ) );

+		if ($helper = & plugin_load('helper', 'spatialhelper_search')) {

+			if ($INPUT->has('lat') && $INPUT->has('lon')) {

+				$results = $helper->findNearbyLatLon($INPUT->param('lat'), $INPUT->param('lon'));

+			} elseif ($INPUT->has('geohash')) {

+				$results = $helper->findNearby($INPUT->str('geohash'));

 			} else {

-				$results = array (

-						'error' => hsc ( $this->getLang ( 'invalidinput' ) )

+				$results = array(

+						'error' => hsc($this->getLang('invalidinput'))

 				);

 			}

 		}

 

-		$showMedia = $INPUT->bool ( 'showMedia', true );

+		$showMedia = $INPUT->bool('showMedia', true);

 

-		switch ( $param[ 'format' ] ) {

+		switch ($param['format']) {

 			case 'JSON' :

-				$this->printJSON ( $results );

+				$this->printJSON($results);

 				break;

 			case 'HTML' :

 			// fall through to default

 			default :

-				$this->printHTML ( $results, $showMedia );

+				$this->printHTML($results, $showMedia);

 				break;

 		}

 	}

@@ -219,9 +219,9 @@ 
 	 */

 	private function printJSON($searchresults) {

 		require_once DOKU_INC . 'inc/JSON.php';

-		$json = new JSON ();

-		header ( 'Content-Type: application/json' );

-		print $json->encode ( $searchresults );

+		$json = new JSON();

+		header('Content-Type: application/json');

+		print $json->encode($searchresults);

 	}

 

 	/**

@@ -237,52 +237,52 @@ 
 		$lon = ( float ) $searchresults ['lon'];

 		$geohash = ( string ) $searchresults ['geohash'];

 

-		if (isset ( $searchresults ['error'] )) {

-			print '<div class="level1"><p>' . hsc ( $results ['error'] ) . '</p></div>';

+		if (isset ($searchresults ['error'])) {

+			print '<div class="level1"><p>' . hsc($results ['error']) . '</p></div>';

 			return;

 		}

 

 		// print a HTML list

-		print '<h1>' . $this->getLang ( 'results_header' ) . '</h1>' . DOKU_LF;

+		print '<h1>' . $this->getLang('results_header') . '</h1>' . DOKU_LF;

 		print '<div class="level1">' . DOKU_LF;

-		if (! empty ( $pages )) {

+		if (!empty ($pages)) {

 			$pagelist = '<ol>' . DOKU_LF;

-			foreach ( $pages as $page ) {

-				$pagelist .= '<li>' . html_wikilink ( ':' . $page ['id'], useHeading ( 'navigation' ) ? null : noNS ( $page ['id'] ) ) . ' (' . $this->getLang ( 'results_distance_prefix' ) . $page ['distance'] . '&nbsp;m) ' . $page ['description'] . '</li>' . DOKU_LF;

+			foreach ($pages as $page) {

+				$pagelist .= '<li>' . html_wikilink(':' . $page ['id'], useHeading('navigation') ? null : noNS($page ['id'])) . ' (' . $this->getLang('results_distance_prefix') . $page ['distance'] . '&nbsp;m) ' . $page ['description'] . '</li>' . DOKU_LF;

 			}

 			$pagelist .= '</ol>' . DOKU_LF;

 

-			print '<h2>' . $this->getLang ( 'results_pages' ) . hsc ( ' lat;lon: ' . $lat . ';' . $lon . ' (geohash: ' . $geohash . ')' ) . '</h2>';

+			print '<h2>' . $this->getLang('results_pages') . hsc(' lat;lon: ' . $lat . ';' . $lon . ' (geohash: ' . $geohash . ')') . '</h2>';

 			print '<div class="level2">' . DOKU_LF;

 			print $pagelist;

 			print '</div>' . DOKU_LF;

 		} else {

-			print '<p>' . hsc ( $this->getLang ( 'nothingfound' ) ) . '</p>';

+			print '<p>' . hsc($this->getLang('nothingfound')) . '</p>';

 		}

 

-		if (! empty ( $media ) && $showMedia) {

+		if (!empty ($media) && $showMedia) {

 			$pagelist = '<ol>' . DOKU_LF;

-			foreach ( $media as $m ) {

-				$opts = array ();

-				$link = ml ( $m ['id'], $opts, false, '&amp;', false );

+			foreach ($media as $m) {

+				$opts = array();

+				$link = ml($m ['id'], $opts, false, '&amp;', false);

 				$opts ['w'] = '100';

-				$src = ml ( $m ['id'], $opts );

-				$pagelist .= '<li><a href="' . $link . '"><img src="' . $src . '"></a> (' . $this->getLang ( 'results_distance_prefix' ) . $page ['distance'] . '&nbsp;m) ' . hsc ( $desc ) . '</li>' . DOKU_LF;

+				$src = ml($m ['id'], $opts);

+				$pagelist .= '<li><a href="' . $link . '"><img src="' . $src . '"></a> (' . $this->getLang('results_distance_prefix') . $page ['distance'] . '&nbsp;m) ' . hsc($desc) . '</li>' . DOKU_LF;

 			}

 			$pagelist .= '</ol>' . DOKU_LF;

 

-			print '<h2>' . $this->getLang ( 'results_media' ) . hsc ( ' lat;lon: ' . $lat . ';' . $lon . ' (geohash: ' . $geohash . ')' ) . '</h2>' . DOKU_LF;

+			print '<h2>' . $this->getLang('results_media') . hsc(' lat;lon: ' . $lat . ';' . $lon . ' (geohash: ' . $geohash . ')') . '</h2>' . DOKU_LF;

 			print '<div class="level2">' . DOKU_LF;

 			print $pagelist;

 			print '</div>' . DOKU_LF;

 		}

-		print '<p>' . $this->getLang ( 'results_precision' ) . $searchresults ['precision'] . ' m. ';

-		if (strlen ( $geohash ) > 1) {

-			$url = wl ( getID (), array (

+		print '<p>' . $this->getLang('results_precision') . $searchresults ['precision'] . ' m. ';

+		if (strlen($geohash) > 1) {

+			$url = wl(getID(), array(

 					'do' => 'findnearby',

-					'geohash' => substr ( $geohash, 0, - 1 )

-			) );

-			print '<a href="' . $url . '" class="findnearby">' . $this->getLang ( 'search_largerarea' ) . '</a>.</p>' . DOKU_LF;

+					'geohash' => substr($geohash, 0, - 1)

+			));

+			print '<a href="' . $url . '" class="findnearby">' . $this->getLang('search_largerarea') . '</a>.</p>' . DOKU_LF;

 		}

 		print '</div>' . DOKU_LF;

 	}

@@ -294,7 +294,7 @@ 
 	 *        	event object by reference

 	 * @param unknown $param

 	 */

-	function _handle_media_uploaded(Doku_Event &$event, $param) {

+	function _handle_media_uploaded(Doku_Event & $event, $param) {

 		// data[0] temporary file name (read from $_FILES)

 		// data[1] file name of the file being uploaded

 		// data[2] future directory id of the file being uploaded

@@ -306,10 +306,10 @@ 
 

 		// check the list of mimetypes

 		// if it's a supported type call appropriate index function

-		if (substr_compare ( $event->data [3], 'image/jpeg', 0 )) {

-			$indexer = plugin_load ( 'helper', 'spatialhelper_index' );

+		if (substr_compare($event->data [3], 'image/jpeg', 0)) {

+			$indexer = plugin_load('helper', 'spatialhelper_index');

 			if ($indexer) {

-				$indexer->indexImage ( $event->data [2], $event->data [1] );

+				$indexer->indexImage($event->data [2], $event->data [1]);

 			}

 		}

 		// TODO add image/tiff

@@ -319,7 +319,7 @@ 
 	/**

 	 * removes the media from the index.

 	 */

-	function _handle_media_deleted(Doku_Event &$event, $param) {

+	function _handle_media_deleted(Doku_Event & $event, $param) {

 		// data['id'] ID data['unl'] unlink return code

 		// data['del'] Namespace directory unlink return code

 		// data['name'] file name data['path'] full path to the file

@@ -328,9 +328,9 @@ 
 		// dbglog ( $event->data, "_handle_media_deleted::event data" );

 

 		// remove the media id from the index

-		$indexer = & plugin_load ( 'helper', 'spatialhelper_index' );

+		$indexer = & plugin_load('helper', 'spatialhelper_index');

 		if ($indexer) {

-			$indexer->deleteFromIndex ( 'media__' . $event->data ['id'] );

+			$indexer->deleteFromIndex('media__' . $event->data ['id']);

 		}

 	}

 

@@ -346,16 +346,16 @@ 
 	 */

 	public function handle_metaheader_output(Doku_Event $event, $param) {

 		// TODO maybe test for exist

-		$event->data ["link"] [] = array (

+		$event->data ["link"] [] = array(

 				"type" => "application/atom+xml",

 				"rel" => "alternate",

-				"href" => ml ( $this->getConf ( 'media_georss' ) ),

+				"href" => ml($this->getConf('media_georss')),

 				"title" => "Spatial ATOM Feed"

 		);

-		$event->data ["link"] [] = array (

+		$event->data ["link"] [] = array(

 				"type" => "application/vnd.google-earth.kml+xml",

 				"rel" => "alternate",

-				"href" => ml ( $this->getConf ( 'media_kml' ) ),

+				"href" => ml($this->getConf('media_kml')),

 				"title" => "KML Sitemap"

 		);

 	}

@@ -371,25 +371,25 @@ 
 	 *        	- bearing in degrees (compass direction)

 	 */

 	private function _geo_destination($start, $dist, $brng) {

-		$lat1 = _toRad ( $start [0] );

-		$lon1 = _toRad ( $start [1] );

+		$lat1 = _toRad($start [0]);

+		$lon1 = _toRad($start [1]);

 		// http://en.wikipedia.org/wiki/Earth_radius

 		// average earth radius in km

 		$dist = $dist / 6371.01;

-		$brng = _toRad ( $brng );

+		$brng = _toRad($brng);

 

-		$lon2 = $lon1 + atan2 ( sin ( $brng ) * sin ( $dist ) * cos ( $lat1 ), cos ( $dist ) - sin ( $lat1 ) * sin ( $lat2 ) );

-		$lon2 = fmod ( ($lon2 + 3 * pi ()), (2 * pi ()) ) - pi ();

+		$lon2 = $lon1 + atan2(sin($brng) * sin($dist) * cos($lat1), cos($dist) - sin($lat1) * sin($lat2));

+		$lon2 = fmod(($lon2 + 3 * pi()), (2 * pi())) - pi();

 

-		return array (

-				_toDeg ( $lat2 ),

-				_toDeg ( $lon2 )

+		return array(

+				_toDeg($lat2),

+				_toDeg($lon2)

 		);

 	}

 	private function _toRad($deg) {

-		return $deg * pi () / 180;

+		return $deg * pi() / 180;

 	}

 	private function _toDeg($rad) {

-		return $rad * 180 / pi ();

+		return $rad * 180 / pi();

 	}

 }

Braces +15 added lines, -10 removed lines

@@ -14,12 +14,15 @@ 
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF

  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

  */

-if (! defined ( 'DOKU_INC' ))

-	die ();

-if (! defined ( 'DOKU_PLUGIN' ))

-	define ( 'DOKU_PLUGIN', DOKU_INC . 'lib/plugins/' );

-if (! defined ( 'DOKU_LF' ))

-	define ( 'DOKU_LF', "\n" );

+if (! defined ( 'DOKU_INC' )) {
+	die ();
+}
+if (! defined ( 'DOKU_PLUGIN' )) {
+	define ( 'DOKU_PLUGIN', DOKU_INC . 'lib/plugins/' );
+}
+if (! defined ( 'DOKU_LF' )) {
+	define ( 'DOKU_LF', "\n" );
+}
 require_once (DOKU_PLUGIN . 'action.php');

 

 /**

@@ -166,8 +169,9 @@ 
 	 *        	not used

 	 */

 	function handle_action_act_preprocess(Doku_Event $event, $param) {

-		if ($event->data != 'findnearby')

-			return;

+		if ($event->data != 'findnearby') {
+					return;
+		}
 		$event->preventDefault ();

 	}

 

@@ -181,8 +185,9 @@ 
 	 *        	'format'=> HTML | JSON

 	 */

 	function _findnearby(Doku_Event &$event, $param) {

-		if ($event->data != 'findnearby')

-			return;

+		if ($event->data != 'findnearby') {
+					return;
+		}
 		$event->preventDefault ();

 

 		global $INPUT;