mprins / dokuwiki-plugin-geotag

conf/metadata.php

Indentation +1 added lines, -1 removed lines

@@ -29,4 +29,4 @@
 $meta ['toolbar_icon']        = array ('onoff' );

 $meta ['geotag_showsearch']   = array ('onoff' );

 $meta ['displayformat']       = array ('multichoice',

-                                    '_choices' => array ('DD','DMS') );

+									'_choices' => array ('DD','DMS') );

Spacing +9 added lines, -9 removed lines

@@ -21,12 +21,12 @@
  * @license BSD license

  * @author Mark C. Prins <mprins@users.sf.net>

  */

-$meta ['geotag_pinggeourl']      = array ('onoff');

-$meta ['geotag_location_prefix'] = array ('string');

-$meta ['geotag_showlocation'] = array ('onoff');

-$meta ['geotag_hide']         = array ('onoff' );

-$meta ['geotag_prevent_microformat_render'] = array ('onoff' );

-$meta ['toolbar_icon']        = array ('onoff' );

-$meta ['geotag_showsearch']   = array ('onoff' );

-$meta ['displayformat']       = array ('multichoice',

-                                    '_choices' => array ('DD','DMS') );

+$meta ['geotag_pinggeourl']      = array('onoff');

+$meta ['geotag_location_prefix'] = array('string');

+$meta ['geotag_showlocation'] = array('onoff');

+$meta ['geotag_hide']         = array('onoff');

+$meta ['geotag_prevent_microformat_render'] = array('onoff');

+$meta ['toolbar_icon']        = array('onoff');

+$meta ['geotag_showsearch']   = array('onoff');

+$meta ['displayformat']       = array('multichoice',

+                                    '_choices' => array('DD', 'DMS'));

helper.php

Braces +3 added lines, -1 removed lines

@@ -14,7 +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')) die();
+if (!defined('DOKU_INC')) {
+	die();
+}
 
 /**
  * DokuWiki Plugin geotag (Helper Component). This helper class provides

_test/general.test.php

Indentation +31 added lines, -31 removed lines

@@ -23,40 +23,40 @@
  */
 class general_plugin_geotag_test extends DokuWikiTest {
 
-    protected $pluginsEnabled = array('geotag');
+	protected $pluginsEnabled = array('geotag');
 
-    /**
-     * 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('geotag', $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('geotag', $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_geotag_isloaded() {
-        global $plugin_controller;
-        $this->assertTrue(
-                    in_array('geotag', $plugin_controller->getList()),
-                    "geotag plugin is loaded"
-                            );
-    }
+	/**
+	 * test if plugin is loaded.
+	 */
+	public function test_plugin_geotag_isloaded() {
+		global $plugin_controller;
+		$this->assertTrue(
+					in_array('geotag', $plugin_controller->getList()),
+					"geotag plugin is loaded"
+							);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
      * Simple test to make sure the plugin.info.txt is in correct format
      */
     public function test_plugininfo() {
-        $file = __DIR__.'/../plugin.info.txt';
+        $file = __DIR__ . '/../plugin.info.txt';
         $this->assertFileExists($file);
 
         $info = confToHash($file);

_test/syntax.test.php

Indentation +41 added lines, -41 removed lines

@@ -23,55 +23,55 @@
  */
 class syntax_plugin_geotag_test extends DokuWikiTest {
 
-    protected $pluginsEnabled = array('geotag');
+	protected $pluginsEnabled = array('geotag');
 
-    /**
-     * copy data and add pages to the index.
-     */
-    public static function setUpBeforeClass() {
-        parent::setUpBeforeClass();
-        global $conf;
-        $conf['allowdebug'] = 1;
+	/**
+	 * copy data and add pages to the index.
+	 */
+	public static function setUpBeforeClass() {
+		parent::setUpBeforeClass();
+		global $conf;
+		$conf['allowdebug'] = 1;
 
-        TestUtils::rcopy(TMP_DIR, dirname(__FILE__).'/data/');
+		TestUtils::rcopy(TMP_DIR, dirname(__FILE__).'/data/');
 
-        dbglog("\nset up class syntax_plugin_geotag_test");
-    }
+		dbglog("\nset up class syntax_plugin_geotag_test");
+	}
 
-    function setUp() {
-        parent::setUp();
+	function setUp() {
+		parent::setUp();
 
-        global $conf;
-        $conf['allowdebug'] = 1;
-        $conf['cachetime'] = -1;
+		global $conf;
+		$conf['allowdebug'] = 1;
+		$conf['cachetime'] = -1;
 
-        $data = array();
-        search($data, $conf['datadir'], 'search_allpages', array('skipacl' => true));
+		$data = array();
+		search($data, $conf['datadir'], 'search_allpages', array('skipacl' => true));
 
-        //dbglog($data, "pages for indexing");
+		//dbglog($data, "pages for indexing");
 
-        $verbose = false;
-        $force = false;
-        foreach ($data as $val) {
-            idx_addPage($val['id'], $verbose, $force);
-        }
-        //idx_addPage('bob_ross_says', $verbose, $force);
-        //idx_addPage('link', $verbose, $force);
-        //idx_addPage('geotag_syntax', $verbose, $force);
-        if ($conf['allowdebug']) {
-            touch(DOKU_TMP_DATA.'cache/debug.log');
-        }
-    }
+		$verbose = false;
+		$force = false;
+		foreach ($data as $val) {
+			idx_addPage($val['id'], $verbose, $force);
+		}
+		//idx_addPage('bob_ross_says', $verbose, $force);
+		//idx_addPage('link', $verbose, $force);
+		//idx_addPage('geotag_syntax', $verbose, $force);
+		if ($conf['allowdebug']) {
+			touch(DOKU_TMP_DATA.'cache/debug.log');
+		}
+	}
 
-    public function tearDown() {
-        parent::tearDown();
+	public function tearDown() {
+		parent::tearDown();
 
-        global $conf;
-        // try to get the debug log after running the test, print and clear
-        if ($conf['allowdebug']) {
-            print "\n";
-            readfile(DOKU_TMP_DATA.'cache/debug.log');
-            unlink(DOKU_TMP_DATA.'cache/debug.log');
-        }
-    }
+		global $conf;
+		// try to get the debug log after running the test, print and clear
+		if ($conf['allowdebug']) {
+			print "\n";
+			readfile(DOKU_TMP_DATA.'cache/debug.log');
+			unlink(DOKU_TMP_DATA.'cache/debug.log');
+		}
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -33,7 +33,7 @@ 
         global $conf;
         $conf['allowdebug'] = 1;
 
-        TestUtils::rcopy(TMP_DIR, dirname(__FILE__).'/data/');
+        TestUtils::rcopy(TMP_DIR, dirname(__FILE__) . '/data/');
 
         dbglog("\nset up class syntax_plugin_geotag_test");
     }
@@ -59,7 +59,7 @@ 
         //idx_addPage('link', $verbose, $force);
         //idx_addPage('geotag_syntax', $verbose, $force);
         if ($conf['allowdebug']) {
-            touch(DOKU_TMP_DATA.'cache/debug.log');
+            touch(DOKU_TMP_DATA . 'cache/debug.log');
         }
     }
 
@@ -70,8 +70,8 @@ 
         // try to get the debug log after running the test, print and clear
         if ($conf['allowdebug']) {
             print "\n";
-            readfile(DOKU_TMP_DATA.'cache/debug.log');
-            unlink(DOKU_TMP_DATA.'cache/debug.log');
+            readfile(DOKU_TMP_DATA . 'cache/debug.log');
+            unlink(DOKU_TMP_DATA . 'cache/debug.log');
         }
     }
 }

action.php

Spacing +34 added lines, -34 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' ))
-	define ( 'DOKU_PLUGIN', DOKU_INC . 'lib/plugins/' );
+if (!defined('DOKU_PLUGIN'))
+	define('DOKU_PLUGIN', DOKU_INC . 'lib/plugins/');
 require_once (DOKU_PLUGIN . 'action.php');
 
 /**
@@ -36,10 +36,10 @@ 
 	 *        	DokuWiki's event controller object. Also available as global $EVENT_HANDLER
 	 */
 	public function register(Doku_Event_Handler $controller) {
-		$controller->register_hook ( 'TPL_METAHEADER_OUTPUT', 'BEFORE', $this, 'handle_metaheader_output' );
-		$controller->register_hook ( 'IO_WIKIPAGE_WRITE', 'BEFORE', $this, 'ping_geourl', array () );
-		if ($this->getConf ( 'toolbar_icon' )) {
-			$controller->register_hook ( 'TOOLBAR_DEFINE', 'AFTER', $this, 'insert_button', array () );
+		$controller->register_hook('TPL_METAHEADER_OUTPUT', 'BEFORE', $this, 'handle_metaheader_output');
+		$controller->register_hook('IO_WIKIPAGE_WRITE', 'BEFORE', $this, 'ping_geourl', array());
+		if ($this->getConf('toolbar_icon')) {
+			$controller->register_hook('TOOLBAR_DEFINE', 'AFTER', $this, 'insert_button', array());
 		}
 	}
 
@@ -55,8 +55,8 @@ 
 	 */
 	public function handle_metaheader_output(Doku_Event $event, $param) {
 		global $ID;
-		$title = p_get_metadata ( $ID, 'title', true );
-		$geotags = p_get_metadata ( $ID, 'geo', true );
+		$title = p_get_metadata($ID, 'title', true);
+		$geotags = p_get_metadata($ID, 'geo', true);
 		$region = $geotags ['region'];
 		$lat = $geotags ['lat'];
 		$lon = $geotags ['lon'];
@@ -65,45 +65,45 @@ 
 		$placename = $geotags ['placename'];
 		$geohash = $geotags ['geohash'];
 
-		if (! empty ( $region )) {
-			$event->data ['meta'] [] = array (
+		if (!empty ($region)) {
+			$event->data ['meta'] [] = array(
 					'name' => 'geo.region',
 					'content' => $region
 			);
 		}
-		if (! empty ( $placename )) {
-			$event->data ['meta'] [] = array (
+		if (!empty ($placename)) {
+			$event->data ['meta'] [] = array(
 					'name' => 'geo.placename',
 					'content' => $placename
 			);
 		}
-		if (! (empty ( $lat ) && empty ( $lon ))) {
-			if (! empty ( $alt )) {
-				$event->data ['meta'] [] = array (
+		if (!(empty ($lat) && empty ($lon))) {
+			if (!empty ($alt)) {
+				$event->data ['meta'] [] = array(
 						'name' => 'geo.position',
 						'content' => $lat . ';' . $lon . ';' . $alt
 				);
 			} else {
-				$event->data ['meta'] [] = array (
+				$event->data ['meta'] [] = array(
 						'name' => 'geo.position',
 						'content' => $lat . ';' . $lon
 				);
 			}
 		}
-		if (! empty ( $country )) {
-			$event->data ['meta'] [] = array (
+		if (!empty ($country)) {
+			$event->data ['meta'] [] = array(
 					'name' => 'geo.country',
 					'content' => $country
 			);
 		}
-		if (! (empty ( $lat ) && empty ( $lon ))) {
-			$event->data ['meta'] [] = array (
+		if (!(empty ($lat) && empty ($lon))) {
+			$event->data ['meta'] [] = array(
 					'name' => "ICBM",
 					'content' => $lat . ', ' . $lon
 			);
 			// icbm is generally useless without a DC.title,
 			// so we copy that from title unless it's empty...
-			if (! (empty ( $title ))) {
+			if (!(empty ($title))) {
 				/*
 				 * don't specify the DC namespace as this is incomplete; it should be done at the
 				 * template level as it also needs a 'profile' attribute on the head/container,
@@ -113,14 +113,14 @@ 
 				// 		'rel' => 'schema.DC',
 				// 		'href' => 'http://purl.org/dc/elements/1.1/'
 				// );
-				$event->data ['meta'] [] = array (
+				$event->data ['meta'] [] = array(
 						'name' => "DC.title",
 						'content' => $title
 				);
 			}
 		}
-		if (! empty ( $geohash )) {
-			$event->data ['meta'] [] = array (
+		if (!empty ($geohash)) {
+			$event->data ['meta'] [] = array(
 					'name' => 'geo.geohash',
 					'content' => $geohash
 			);
@@ -144,20 +144,20 @@ 
 		// $data[1] – ns: The colon separated namespace path minus the trailing page name. (false if root ns)
 		// $data[2] – page_name: The wiki page name.
 		// $data[3] – rev: The page revision, false for current wiki pages.
-		if (! $this->getConf ( 'geotag_pinggeourl' ))
+		if (!$this->getConf('geotag_pinggeourl'))
 			return false; // config says don't ping
 		if ($event->data [3])
 			return false; // old revision saved
-		if (! $event->data [0] [1])
+		if (!$event->data [0] [1])
 			return false; // file is empty
-		if (@file_exists ( $event->data [0] [0] ))
+		if (@file_exists($event->data [0] [0]))
 			return false; // file not new
-		if (p_get_metadata ( $ID, 'geo', true ))
+		if (p_get_metadata($ID, 'geo', true))
 			return false; // no geo metadata available, ping is useless
 
-		$url = 'http://geourl.org/ping/?p=' . wl ( $ID, '', true );
-		$http = new DokuHTTPClient ();
-		$result = $http->get ( $url );
+		$url = 'http://geourl.org/ping/?p=' . wl($ID, '', true);
+		$http = new DokuHTTPClient();
+		$result = $http->get($url);
 		// dbglog ( $result, "GeoURL Ping response for $url" );
 		return $result;
 	}
@@ -169,9 +169,9 @@ 
 	 *        	the DokuWiki event
 	 */
 	function insert_button(Doku_Event $event, $param) {
-		$event->data [] = array (
+		$event->data [] = array(
 				'type' => 'format',
-				'title' => $this->getLang ( 'toolbar_desc' ),
+				'title' => $this->getLang('toolbar_desc'),
 				'icon' => '../../plugins/geotag/images/geotag.png',
 				'open' => '{{geotag>lat:',
 				'sample' => '52.2345',

Braces +24 added lines, -12 removed lines

@@ -14,11 +14,13 @@ 
  * 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 . 'action.php');
 
 /**
@@ -144,16 +146,26 @@ 
 		// $data[1] – ns: The colon separated namespace path minus the trailing page name. (false if root ns)
 		// $data[2] – page_name: The wiki page name.
 		// $data[3] – rev: The page revision, false for current wiki pages.
-		if (! $this->getConf ( 'geotag_pinggeourl' ))
-			return false; // config says don't ping
-		if ($event->data [3])
-			return false; // old revision saved
-		if (! $event->data [0] [1])
-			return false; // file is empty
-		if (@file_exists ( $event->data [0] [0] ))
-			return false; // file not new
-		if (p_get_metadata ( $ID, 'geo', true ))
-			return false; // no geo metadata available, ping is useless
+		if (! $this->getConf ( 'geotag_pinggeourl' )) {
+					return false;
+		}
+		// config says don't ping
+		if ($event->data [3]) {
+					return false;
+		}
+		// old revision saved
+		if (! $event->data [0] [1]) {
+					return false;
+		}
+		// file is empty
+		if (@file_exists ( $event->data [0] [0] )) {
+					return false;
+		}
+		// file not new
+		if (p_get_metadata ( $ID, 'geo', true )) {
+					return false;
+		}
+		// no geo metadata available, ping is useless
 
 		$url = 'http://geourl.org/ping/?p=' . wl ( $ID, '', true );
 		$http = new DokuHTTPClient ();

syntax/geotag.php

Spacing +64 added lines, -64 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' ))
-	define ( 'DOKU_PLUGIN', DOKU_INC . 'lib/plugins/' );
+if (!defined('DOKU_PLUGIN'))
+	define('DOKU_PLUGIN', DOKU_INC . 'lib/plugins/');
 
 require_once (DOKU_PLUGIN . 'syntax.php');
 /**
@@ -59,7 +59,7 @@ 
 	 * @see Doku_Parser_Mode::connectTo()
 	 */
 	public function connectTo($mode) {
-		$this->Lexer->addSpecialPattern ( '\{\{geotag>.*?\}\}', $mode, 'plugin_geotag_geotag' );
+		$this->Lexer->addSpecialPattern('\{\{geotag>.*?\}\}', $mode, 'plugin_geotag_geotag');
 	}
 
 	/**
@@ -67,44 +67,44 @@ 
 	 * @see DokuWiki_Syntax_Plugin::handle()
 	 */
 	public function handle($match, $state, $pos, Doku_Handler $handler) {
-		$tags = trim ( substr ( $match, 9, - 2 ) );
+		$tags = trim(substr($match, 9, - 2));
 		// parse geotag content
-		preg_match ( "(lat[:|=]\d*\.\d*)", $tags, $lat );
-		preg_match ( "(lon[:|=]\d*\.\d*)", $tags, $lon );
-		preg_match ( "(alt[:|=]\d*\.?\d*)", $tags, $alt );
-		preg_match ( "/(region[:|=][\p{L}\s\w'-]*)/u", $tags, $region );
-		preg_match ( "/(placename[:|=][\p{L}\s\w'-]*)/u", $tags, $placename );
-		preg_match ( "/(country[:|=][\p{L}\s\w'-]*)/u", $tags, $country );
-		preg_match ( "(hide|unhide)", $tags, $hide );
+		preg_match("(lat[:|=]\d*\.\d*)", $tags, $lat);
+		preg_match("(lon[:|=]\d*\.\d*)", $tags, $lon);
+		preg_match("(alt[:|=]\d*\.?\d*)", $tags, $alt);
+		preg_match("/(region[:|=][\p{L}\s\w'-]*)/u", $tags, $region);
+		preg_match("/(placename[:|=][\p{L}\s\w'-]*)/u", $tags, $placename);
+		preg_match("/(country[:|=][\p{L}\s\w'-]*)/u", $tags, $country);
+		preg_match("(hide|unhide)", $tags, $hide);
 
-		$showlocation = $this->getConf ( 'geotag_location_prefix' );
-		if ($this->getConf ( 'geotag_showlocation' )) {
-			$showlocation = trim ( substr ( $placename [0], 10 ) );
-			if (strlen ( $showlocation ) < 1) {
-				$showlocation = $this->getConf ( 'geotag_location_prefix' );
+		$showlocation = $this->getConf('geotag_location_prefix');
+		if ($this->getConf('geotag_showlocation')) {
+			$showlocation = trim(substr($placename [0], 10));
+			if (strlen($showlocation) < 1) {
+				$showlocation = $this->getConf('geotag_location_prefix');
 			}
 		}
 		// read config for system setting
 		$style = '';
-		if ($this->getConf ( 'geotag_hide' )) {
+		if ($this->getConf('geotag_hide')) {
 			$style = ' style="display: none;"';
 		}
 		// override config for the current tag
-		if (trim ( $hide [0] ) == 'hide') {
+		if (trim($hide [0]) == 'hide') {
 			$style = ' style="display: none;"';
-		} elseif (trim ( $hide [0] ) == 'unhide') {
+		} elseif (trim($hide [0]) == 'unhide') {
 			$style = '';
 		}
 
-		$data = array (
-				hsc ( trim ( substr ( $lat [0], 4 ) ) ),
-				hsc ( trim ( substr ( $lon [0], 4 ) ) ),
-				hsc ( trim ( substr ( $alt [0], 4 ) ) ),
-				$this->_geohash ( substr ( $lat [0], 4 ), substr ( $lon [0], 4 ) ),
-				hsc ( trim ( substr ( $region [0], 7 ) ) ),
-				hsc ( trim ( substr ( $placename [0], 10 ) ) ),
-				hsc ( trim ( substr ( $country [0], 8 ) ) ),
-				hsc ( $showlocation ),
+		$data = array(
+				hsc(trim(substr($lat [0], 4))),
+				hsc(trim(substr($lon [0], 4))),
+				hsc(trim(substr($alt [0], 4))),
+				$this->_geohash(substr($lat [0], 4), substr($lon [0], 4)),
+				hsc(trim(substr($region [0], 7))),
+				hsc(trim(substr($placename [0], 10))),
+				hsc(trim(substr($country [0], 8))),
+				hsc($showlocation),
 				$style
 		);
 		return $data;
@@ -117,44 +117,44 @@ 
 	public function render($mode, Doku_Renderer $renderer, $data) {
 		if ($data === false)
 			return false;
-		list ( $lat, $lon, $alt, $geohash, $region, $placename, $country, $showlocation, $style ) = $data;
+		list ($lat, $lon, $alt, $geohash, $region, $placename, $country, $showlocation, $style) = $data;
 		$ddlat = $lat;
 		$ddlon = $lon;
-		if ($this->getConf ( 'displayformat' ) === 'DMS') {
-			$lat = $this->convertLat ( $lat );
-			$lon = $this->convertLon ( $lon );
+		if ($this->getConf('displayformat') === 'DMS') {
+			$lat = $this->convertLat($lat);
+			$lon = $this->convertLon($lon);
 		} else {
 			$lat .= 'º';
 			$lon .= 'º';
 		}
 
 		if ($mode == 'xhtml') {
-			if ($this->getConf ( 'geotag_prevent_microformat_render' )) {
+			if ($this->getConf('geotag_prevent_microformat_render')) {
 				return true;
 			}
-			if ($this->getConf ( 'geotag_showsearch' )) {
+			if ($this->getConf('geotag_showsearch')) {
 				$searchPre = '';
 				$searchPost = '';
-				if ($spHelper = &plugin_load ( 'helper', 'spatialhelper_search' )) {
-					$title = $this->getLang ( 'findnearby' ) . '&nbsp;' . $placename;
-					$url = wl ( getID (), array (
+				if ($spHelper = &plugin_load('helper', 'spatialhelper_search')) {
+					$title = $this->getLang('findnearby') . '&nbsp;' . $placename;
+					$url = wl(getID(), array(
 							'do' => 'findnearby',
 							'lat' => $ddlat,
 							'lon' => $ddlon
-					) );
+					));
 					$searchPre = '<a href="' . $url . '" title="' . $title . '">';
 					$searchPost = '<span class="a11y">' . $title . '</span></a>';
 				}
 			}
 
 			// render geotag microformat/schema.org microdata
-			$renderer->doc .= '<span class="geotagPrint">' . $this->getLang ( 'geotag_desc' ) . '</span>';
-			$renderer->doc .= '<div class="h-geo geo"' . $style . ' title="' . $this->getLang ( 'geotag_desc' ) . $placename . '" itemscope itemtype="http://schema.org/Place">';
+			$renderer->doc .= '<span class="geotagPrint">' . $this->getLang('geotag_desc') . '</span>';
+			$renderer->doc .= '<div class="h-geo geo"' . $style . ' title="' . $this->getLang('geotag_desc') . $placename . '" itemscope itemtype="http://schema.org/Place">';
 			$renderer->doc .= '<span itemprop="name">' . $showlocation . '</span>:&nbsp;' . $searchPre;
 			$renderer->doc .= '<span itemprop="geo" itemscope itemtype="http://schema.org/GeoCoordinates">';
 			$renderer->doc .= '<span class="p-latitude latitude" itemprop="latitude" data-latitude="' . $ddlat . '">' . $lat . '</span>;';
 			$renderer->doc .= '<span class="p-longitude longitude" itemprop="longitude" data-longitude="' . $ddlon . '">' . $lon . '</span>';
-			if (! empty ( $alt )) {
+			if (!empty ($alt)) {
 				$renderer->doc .= ', <span class="p-altitude altitude" itemprop="elevation" data-altitude="' . $alt . '">' . $alt . 'm</span>';
 			}
 			$renderer->doc .= '</span>' . $searchPost . '</div>' . DOKU_LF;
@@ -170,15 +170,15 @@ 
 			$renderer->meta ['geo'] ['alt'] = $alt;
 			return true;
 		} elseif ($mode == 'odt') {
-			if (! empty ( $alt ))
+			if (!empty ($alt))
 				$alt = ', ' . $alt . 'm';
-			$renderer->p_open ();
-			$renderer->_odtAddImage ( DOKU_PLUGIN . 'geotag/images/geotag.png', null, null, 'left', '' );
-			$renderer->doc .= '<text:span>' . $this->getLang ( 'geotag_desc' ) . ' ' . $placename . ': </text:span>';
-			$renderer->monospace_open ();
+			$renderer->p_open();
+			$renderer->_odtAddImage(DOKU_PLUGIN . 'geotag/images/geotag.png', null, null, 'left', '');
+			$renderer->doc .= '<text:span>' . $this->getLang('geotag_desc') . ' ' . $placename . ': </text:span>';
+			$renderer->monospace_open();
 			$renderer->doc .= $lat . ';' . $lon . $alt;
-			$renderer->monospace_close ();
-			$renderer->p_close ();
+			$renderer->monospace_close();
+			$renderer->p_close();
 			return true;
 		}
 		return false;
@@ -191,14 +191,14 @@ 
 	 * @param float $lon
 	 */
 	private function _geohash($lat, $lon) {
-		if (! $geophp = &plugin_load ( 'helper', 'geophp' )) {
-			dbglog ( $geophp, 'syntax_plugin_geotag_geotag::_geohash: geophp plugin is not available.' );
+		if (!$geophp = &plugin_load('helper', 'geophp')) {
+			dbglog($geophp, 'syntax_plugin_geotag_geotag::_geohash: geophp plugin is not available.');
 			return "";
 		}
-		$_lat = floatval ( $lat );
-		$_lon = floatval ( $lon );
-		$geometry = new Point ( $_lon, $_lat );
-		return $geometry->out ( 'geohash' );
+		$_lat = floatval($lat);
+		$_lon = floatval($lon);
+		$geometry = new Point($_lon, $_lat);
+		return $geometry->out('geohash');
 	}
 
 	/**
@@ -209,10 +209,10 @@ 
 	 * @return string dms
 	 */
 	private function _convertDDtoDMS($decimaldegrees) {
-		$dms = floor ( $decimaldegrees );
+		$dms = floor($decimaldegrees);
 		$secs = ($decimaldegrees - $dms) * 3600;
-		$min = floor ( $secs / 60 );
-		$sec = round ( $secs - ($min * 60), 3 );
+		$min = floor($secs / 60);
+		$sec = round($secs - ($min * 60), 3);
 		$dms .= 'º' . $min . '\'' . $sec . '"';
 		return $dms;
 	}
@@ -225,13 +225,13 @@ 
 	 * @return string
 	 */
 	private function convertLat($decimaldegrees) {
-		if (strpos ( $decimaldegrees, '-' ) !== false) {
+		if (strpos($decimaldegrees, '-') !== false) {
 			$latPos = "S";
 		} else {
 			$latPos = "N";
 		}
-		$dms = $this->_convertDDtoDMS ( abs ( floatval ( $decimaldegrees ) ) );
-		return hsc ( $dms . $latPos );
+		$dms = $this->_convertDDtoDMS(abs(floatval($decimaldegrees)));
+		return hsc($dms . $latPos);
 	}
 
 	/**
@@ -242,12 +242,12 @@ 
 	 * @return string
 	 */
 	private function convertLon($decimaldegrees) {
-		if (strpos ( $decimaldegrees, '-' ) !== false) {
+		if (strpos($decimaldegrees, '-') !== false) {
 			$lonPos = "W";
 		} else {
 			$lonPos = "E";
 		}
-		$dms = $this->_convertDDtoDMS ( abs ( floatval ( $decimaldegrees ) ) );
-		return hsc ( $dms . $lonPos );
+		$dms = $this->_convertDDtoDMS(abs(floatval($decimaldegrees)));
+		return hsc($dms . $lonPos);
 	}
 }

Braces +10 added lines, -6 removed lines

@@ -14,11 +14,13 @@ 
  * 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 . 'syntax.php');
 /**
@@ -115,8 +117,9 @@ 
 	 * @see DokuWiki_Syntax_Plugin::render()
 	 */
 	public function render($mode, Doku_Renderer $renderer, $data) {
-		if ($data === false)
-			return false;
+		if ($data === false) {
+					return false;
+		}
 		list ( $lat, $lon, $alt, $geohash, $region, $placename, $country, $showlocation, $style ) = $data;
 		$ddlat = $lat;
 		$ddlon = $lon;
@@ -170,8 +173,9 @@ 
 			$renderer->meta ['geo'] ['alt'] = $alt;
 			return true;
 		} elseif ($mode == 'odt') {
-			if (! empty ( $alt ))
-				$alt = ', ' . $alt . 'm';
+			if (! empty ( $alt )) {
+							$alt = ', ' . $alt . 'm';
+			}
 			$renderer->p_open ();
 			$renderer->_odtAddImage ( DOKU_PLUGIN . 'geotag/images/geotag.png', null, null, 'left', '' );
 			$renderer->doc .= '<text:span>' . $this->getLang ( 'geotag_desc' ) . ' ' . $placename . ': </text:span>';