mprins / dokuwiki-plugin-openlayersmap

StaticMap.php

Braces +21 added lines, -13 removed lines

@@ -343,8 +343,9 @@ 
 	public function checkMapCache() {
 		$this->mapCacheID = md5 ( $this->serializeParams () );
 		$filename = $this->mapCacheIDToFilename ();
-		if (file_exists ( $filename ))
-			return true;
+		if (file_exists ( $filename )) {
+					return true;
+		}
 	}
 	public function serializeParams() {
 		return join ( "&", array (
@@ -398,8 +399,9 @@ 
 	 * @param string $url
 	 */
 	public function fetchTile($url) {
-		if ($this->useTileCache && ($cached = $this->checkTileCache ( $url )))
-			return $cached;
+		if ($this->useTileCache && ($cached = $this->checkTileCache ( $url ))) {
+					return $cached;
+		}
 
 		$_UA = 'Mozilla/4.0 (compatible; DokuWikiSpatial HTTP Client; ' . PHP_OS . ')';
 		if (function_exists ( "curl_init" )) {
@@ -467,7 +469,9 @@ 
 	 *        	drawing colour
 	 */
 	private function drawGeometry($geom, $colour) {
-		if (empty($geom)) return;
+		if (empty($geom)) {
+			return;
+		}
 		
 		switch ($geom->geometryType ()) {
 			case 'GeometryCollection' :
@@ -605,14 +609,18 @@ 
 	public function makeMap() {
 		$this->initCoords ();
 		$this->createBaseMap ();
-		if (! empty ( $this->markers ))
-			$this->placeMarkers ();
-		if (file_exists ( $this->kmlFileName ))
-			$this->drawKML ();
-		if (file_exists ( $this->gpxFileName ))
-			$this->drawGPX ();
-		if (file_exists ( $this->geojsonFileName ))
-			$this->drawGeojson ();
+		if (! empty ( $this->markers )) {
+					$this->placeMarkers ();
+		}
+		if (file_exists ( $this->kmlFileName )) {
+					$this->drawKML ();
+		}
+		if (file_exists ( $this->gpxFileName )) {
+					$this->drawGPX ();
+		}
+		if (file_exists ( $this->geojsonFileName )) {
+					$this->drawGeojson ();
+		}
 
 		$this->drawCopyright ();
 	}

syntax/olmap.php

Braces +7 added lines, -4 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' )) {
 	define ( 'DOKU_INC', realpath ( dirname ( __FILE__ ) . '/../../' ) . '/' );
-if (! defined ( 'DOKU_PLUGIN' ))
+}
+if (! defined ( 'DOKU_PLUGIN' )) {
 	define ( 'DOKU_PLUGIN', DOKU_INC . 'lib/plugins/' );
+}
 require_once (DOKU_PLUGIN . 'syntax.php');
 
 /**
@@ -582,8 +584,9 @@ 
 			$imgUrl .= "?ma=" . $bbox ['minlat'] . "%2C" . $bbox ['minlon'] . "%2C" . $bbox ['maxlat'] . "%2C" . $bbox ['maxlon'];
 			$imgUrl .= "&dcl=1";
 		}
-		if (strpos ( $imgUrl, "?" ) === false)
-			$imgUrl .= "?";
+		if (strpos ( $imgUrl, "?" ) === false) {
+					$imgUrl .= "?";
+		}
 
 		//$imgUrl .= "&ms=" . str_replace ( "px", "", $gmap ['width'] ) . "," . str_replace ( "px", "", $gmap ['height'] );
 		$imgUrl .= "&ms=" . str_replace ( "px", "", $gmap ['width'] ) . "%2C" . str_replace ( "px", "", $gmap ['height'] );

helper/staticmap.php

Braces +15 added lines, -5 removed lines

@@ -14,8 +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.'openlayersmap/StaticMap.php';
 /**
  * DokuWiki Plugin openlayersmap (staticmap Helper Component).
@@ -77,13 +81,19 @@ 
 
 		// normalize zoom
 		$zoom = $zoom?intval($zoom):0;
-		if($zoom > 18) $zoom = 18;
+		if($zoom > 18) {
+			$zoom = 18;
+		}
 		// normalize WxH
 		list($width, $height) = explode('x',$size);
 		$width = intval($width);
-		if($width > $this->maxWidth) $width = $this->maxWidth;
+		if($width > $this->maxWidth) {
+			$width = $this->maxWidth;
+		}
 		$height = intval($height);
-		if($height > $this->maxHeight) $height = $this->maxHeight;
+		if($height > $this->maxHeight) {
+			$height = $this->maxHeight;
+		}
 
 		// cleanup/validate gpx/kml
 		$kml = $this->mediaIdToPath($kml);

_test/general.test.php

Indentation +35 added lines, -35 removed lines

@@ -24,44 +24,44 @@
  */
 class general_plugin_openlayersmap_test extends DokuWikiTest {
 
-    protected $pluginsEnabled = array('openlayersmap','geophp');
+	protected $pluginsEnabled = array('openlayersmap','geophp');
 
-    /**
-     * 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('openlayersmap', $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('openlayersmap', $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_openlayersmap_isloaded() {
-        global $plugin_controller;
-        $this->assertTrue(
-                    in_array('geophp', $plugin_controller->getList()),
-                    "geophp plugin is loaded"
-                            );
-        $this->assertTrue(
-                    in_array('openlayersmap', $plugin_controller->getList()),
-                    "openlayersmap plugin is loaded"
-                            );
-    }
+	/**
+	 * test if plugin is loaded.
+	 */
+	public function test_plugin_openlayersmap_isloaded() {
+		global $plugin_controller;
+		$this->assertTrue(
+					in_array('geophp', $plugin_controller->getList()),
+					"geophp plugin is loaded"
+							);
+		$this->assertTrue(
+					in_array('openlayersmap', $plugin_controller->getList()),
+					"openlayersmap plugin is loaded"
+							);
+	}
 }

admin/purge.php

Braces +15 added lines, -5 removed lines

@@ -14,8 +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.'admin.php';
 /**
  * DokuWiki Plugin openlayersmap (Admin Component).
@@ -45,14 +49,20 @@ 
 	 */
 	public function handle() {
 		global $conf;
-		if(!isset($_REQUEST['continue']) || !checkSecurityToken()) return;
+		if(!isset($_REQUEST['continue']) || !checkSecurityToken()) {
+			return;
+		}
 		if(isset($_REQUEST['purgetiles'])){
 			$path = $conf['cachedir'].'/olmaptiles';
-			if ($this->rrmdir($path)) msg($this->getLang('admin_purged_tiles'),0);
+			if ($this->rrmdir($path)) {
+				msg($this->getLang('admin_purged_tiles'),0);
+			}
 		}
 		if(isset($_REQUEST['purgemaps'])){
 			$path = $conf['mediadir'].'/olmapmaps';
-			if ($this->rrmdir($path)) msg($this->getLang('admin_purged_maps'),0);
+			if ($this->rrmdir($path)) {
+				msg($this->getLang('admin_purged_maps'),0);
+			}
 		}
 	}
 

action.php

Braces +6 added lines, -2 removed lines

@@ -15,8 +15,12 @@
  * 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 . 'action.php');
 /**
  * Plugin OL Maps: Allow Display of a OpenLayers Map in a wiki page.