mprins / dokuwiki-plugin-geotag

syntax/geotag.php

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

action.php

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();

conf/metadata.php

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

_test/general.test.php

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

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