mprins / dokuwiki-plugin-openlayersmap

syntax/searchlayer.php

Spacing +26 added lines, -26 removed lines

@@ -14,22 +14,22 @@ 
  * 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_LF' ))
-	define ( 'DOKU_LF', "\n" );
-if (! defined ( 'DOKU_TAB' ))
-	define ( 'DOKU_TAB', "\t" );
-if (! defined ( 'DOKU_PLUGIN' ))
-	define ( 'DOKU_PLUGIN', DOKU_INC . 'lib/plugins/' );
+if (!defined('DOKU_LF'))
+	define('DOKU_LF', "\n");
+if (!defined('DOKU_TAB'))
+	define('DOKU_TAB', "\t");
+if (!defined('DOKU_PLUGIN'))
+	define('DOKU_PLUGIN', DOKU_INC.'lib/plugins/');
 
-require_once DOKU_PLUGIN . 'syntax.php';
+require_once DOKU_PLUGIN.'syntax.php';
 /**
  * adds a WMS 1.1.1 layer to your map.
  */
 class syntax_plugin_openlayersmapoverlays_searchlayer extends DokuWiki_Syntax_Plugin {
-	private $dflt = array (
+	private $dflt = array(
 			'id' => 'olmap',
 			'name' => '',
 			'search' => '',
@@ -76,8 +76,8 @@ 
 	 * @see Doku_Parser_Mode::connectTo()
 	 */
 	public function connectTo($mode) {
-		$this->Lexer->addSpecialPattern ( '<olmap_searchlayer ?[^>\n]*>.*?</olmap_searchlayer>',
-				$mode, 'plugin_openlayersmapoverlays_searchlayer' );
+		$this->Lexer->addSpecialPattern('<olmap_searchlayer ?[^>\n]*>.*?</olmap_searchlayer>',
+				$mode, 'plugin_openlayersmapoverlays_searchlayer');
 	}
 
 	/**
@@ -86,19 +86,19 @@ 
 	 * @see DokuWiki_Syntax_Plugin::handle()
 	 */
 	public function handle($match, $state, $pos, Doku_Handler $handler) {
-		$param = array ();
+		$param = array();
 		$data = $this->dflt;
 
-		preg_match_all ( '/(\w*)="(.*?)"/us', $match, $param, PREG_SET_ORDER );
+		preg_match_all('/(\w*)="(.*?)"/us', $match, $param, PREG_SET_ORDER);
 
-		foreach ( $param as $kvpair ) {
-			list ( $matched, $key, $val ) = $kvpair;
-			if (isset ( $data [$key] )) {
-				$key = strtolower ( $key );
+		foreach ($param as $kvpair) {
+			list ($matched, $key, $val) = $kvpair;
+			if (isset ($data [$key])) {
+				$key = strtolower($key);
 				$data [$key] = $val;
 			}
 		}
-		dbglog($data,'syntax_plugin_overlayer::handle: parsed data is:');
+		dbglog($data, 'syntax_plugin_overlayer::handle: parsed data is:');
 		return $data;
 	}
 
@@ -112,22 +112,22 @@ 
 			return false;
 
 		static $loadedOLlib = false;
-		if (! $loadedOLlib) {
-			$renderer->doc .= DOKU_LF . '<script type="text/javascript" src="' . DOKU_BASE . 'lib/plugins/openlayersmapoverlays/lib/layers.js' . '"></script>';
+		if (!$loadedOLlib) {
+			$renderer->doc .= DOKU_LF.'<script type="text/javascript" src="'.DOKU_BASE.'lib/plugins/openlayersmapoverlays/lib/layers.js'.'"></script>';
 			$loadedOLlib = true;
 		}
 		// incremented for each olmap_wmslayer tag in the page source
 		static $overlaynumber = 0;
 
-		list ( $id, $url, $name, $visible ) = $data;
-		$renderer->doc .= DOKU_LF . "<script type='text/javascript'><!--//--><![CDATA[//><!--" . DOKU_LF;
+		list ($id, $url, $name, $visible) = $data;
+		$renderer->doc .= DOKU_LF."<script type='text/javascript'><!--//--><![CDATA[//><!--".DOKU_LF;
 		$str = '{';
-		foreach ( $data as $key => $val ) {
-			$str .= "'" . $key . "' : '" . $val . "',";
+		foreach ($data as $key => $val) {
+			$str .= "'".$key."' : '".$val."',";
 		}
 		$str .= "'type':'wms'}";
-		$renderer->doc .= "olMapOverlays['wms" . $overlaynumber . "'] = " . $str . ";" . DOKU_LF . "//--><!]]></script>";
-		$overlaynumber ++;
+		$renderer->doc .= "olMapOverlays['wms".$overlaynumber."'] = ".$str.";".DOKU_LF."//--><!]]></script>";
+		$overlaynumber++;
 		return true;
 	}
 }

Braces +11 added lines, -6 removed lines

@@ -14,15 +14,19 @@ 
  * 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_LF' ))
+if (! defined ( 'DOKU_LF' )) {
 	define ( 'DOKU_LF', "\n" );
-if (! defined ( 'DOKU_TAB' ))
+}
+if (! defined ( 'DOKU_TAB' )) {
 	define ( 'DOKU_TAB', "\t" );
-if (! defined ( 'DOKU_PLUGIN' ))
+}
+if (! defined ( 'DOKU_PLUGIN' )) {
 	define ( 'DOKU_PLUGIN', DOKU_INC . 'lib/plugins/' );
+}
 
 require_once DOKU_PLUGIN . 'syntax.php';
 /**
@@ -108,8 +112,9 @@ 
 	 * @see DokuWiki_Syntax_Plugin::render()
 	 */
 	public function render($mode, Doku_Renderer $renderer, $data) {
-		if ($mode != 'xhtml')
-			return false;
+		if ($mode != 'xhtml') {
+					return false;
+		}
 
 		static $loadedOLlib = false;
 		if (! $loadedOLlib) {

Indentation +95 added lines, -95 removed lines

@@ -15,119 +15,119 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 if (! defined ( 'DOKU_INC' ))
-	die ();
+    die ();
 
 if (! defined ( 'DOKU_LF' ))
-	define ( 'DOKU_LF', "\n" );
+    define ( 'DOKU_LF', "\n" );
 if (! defined ( 'DOKU_TAB' ))
-	define ( 'DOKU_TAB', "\t" );
+    define ( 'DOKU_TAB', "\t" );
 if (! defined ( 'DOKU_PLUGIN' ))
-	define ( 'DOKU_PLUGIN', DOKU_INC . 'lib/plugins/' );
+    define ( 'DOKU_PLUGIN', DOKU_INC . 'lib/plugins/' );
 
 require_once DOKU_PLUGIN . 'syntax.php';
 /**
  * adds a WMS 1.1.1 layer to your map.
  */
 class syntax_plugin_openlayersmapoverlays_searchlayer extends DokuWiki_Syntax_Plugin {
-	private $dflt = array (
-			'id' => 'olmap',
-			'name' => '',
-			'search' => '',
-			'opacity' => 0.8,
-			'attribution' => '',
-			'visible' => false,
-			'layers' => '',
-			'version' => '1.1.1',
-			'format' => 'image/png',
-			'transparent' => 'true'
-	);
+    private $dflt = array (
+            'id' => 'olmap',
+            'name' => '',
+            'search' => '',
+            'opacity' => 0.8,
+            'attribution' => '',
+            'visible' => false,
+            'layers' => '',
+            'version' => '1.1.1',
+            'format' => 'image/png',
+            'transparent' => 'true'
+    );
 
-	/**
-	 * (non-PHPdoc)
-	 *
-	 * @see DokuWiki_Syntax_Plugin::getPType()
-	 */
-	public function getPType() {
-		return 'block';
-	}
+    /**
+     * (non-PHPdoc)
+     *
+     * @see DokuWiki_Syntax_Plugin::getPType()
+     */
+    public function getPType() {
+        return 'block';
+    }
 
-	/**
-	 * (non-PHPdoc)
-	 *
-	 * @see DokuWiki_Syntax_Plugin::getType()
-	 */
-	public function getType() {
-		// return 'FIXME: container|baseonly|formatting|substition|protected|disabled|paragraphs';
-		return 'baseonly';
-	}
+    /**
+     * (non-PHPdoc)
+     *
+     * @see DokuWiki_Syntax_Plugin::getType()
+     */
+    public function getType() {
+        // return 'FIXME: container|baseonly|formatting|substition|protected|disabled|paragraphs';
+        return 'baseonly';
+    }
 
-	/**
-	 * (non-PHPdoc)
-	 *
-	 * @see Doku_Parser_Mode::getSort()
-	 */
-	public function getSort() {
-		return 902;
-	}
+    /**
+     * (non-PHPdoc)
+     *
+     * @see Doku_Parser_Mode::getSort()
+     */
+    public function getSort() {
+        return 902;
+    }
 
-	/**
-	 * Connect to our special pattern.
-	 *
-	 * @see Doku_Parser_Mode::connectTo()
-	 */
-	public function connectTo($mode) {
-		$this->Lexer->addSpecialPattern ( '<olmap_searchlayer ?[^>\n]*>.*?</olmap_searchlayer>',
-				$mode, 'plugin_openlayersmapoverlays_searchlayer' );
-	}
+    /**
+     * Connect to our special pattern.
+     *
+     * @see Doku_Parser_Mode::connectTo()
+     */
+    public function connectTo($mode) {
+        $this->Lexer->addSpecialPattern ( '<olmap_searchlayer ?[^>\n]*>.*?</olmap_searchlayer>',
+                $mode, 'plugin_openlayersmapoverlays_searchlayer' );
+    }
 
-	/**
-	 * (non-PHPdoc)
-	 *
-	 * @see DokuWiki_Syntax_Plugin::handle()
-	 */
-	public function handle($match, $state, $pos, Doku_Handler $handler) {
-		$param = array ();
-		$data = $this->dflt;
+    /**
+     * (non-PHPdoc)
+     *
+     * @see DokuWiki_Syntax_Plugin::handle()
+     */
+    public function handle($match, $state, $pos, Doku_Handler $handler) {
+        $param = array ();
+        $data = $this->dflt;
 
-		preg_match_all ( '/(\w*)="(.*?)"/us', $match, $param, PREG_SET_ORDER );
+        preg_match_all ( '/(\w*)="(.*?)"/us', $match, $param, PREG_SET_ORDER );
 
-		foreach ( $param as $kvpair ) {
-			list ( $matched, $key, $val ) = $kvpair;
-			if (isset ( $data [$key] )) {
-				$key = strtolower ( $key );
-				$data [$key] = $val;
-			}
-		}
-		dbglog($data,'syntax_plugin_overlayer::handle: parsed data is:');
-		return $data;
-	}
+        foreach ( $param as $kvpair ) {
+            list ( $matched, $key, $val ) = $kvpair;
+            if (isset ( $data [$key] )) {
+                $key = strtolower ( $key );
+                $data [$key] = $val;
+            }
+        }
+        dbglog($data,'syntax_plugin_overlayer::handle: parsed data is:');
+        return $data;
+    }
 
-	/**
-	 * (non-PHPdoc)
-	 *
-	 * @see DokuWiki_Syntax_Plugin::render()
-	 */
-	public function render($mode, Doku_Renderer $renderer, $data) {
-		if ($mode != 'xhtml')
-			return false;
+    /**
+     * (non-PHPdoc)
+     *
+     * @see DokuWiki_Syntax_Plugin::render()
+     */
+    public function render($mode, Doku_Renderer $renderer, $data) {
+        if ($mode != 'xhtml')
+            return false;
 
-		static $loadedOLlib = false;
-		if (! $loadedOLlib) {
-			$renderer->doc .= DOKU_LF . '<script type="text/javascript" src="' . DOKU_BASE . 'lib/plugins/openlayersmapoverlays/lib/layers.js' . '"></script>';
-			$loadedOLlib = true;
-		}
-		// incremented for each olmap_wmslayer tag in the page source
-		static $overlaynumber = 0;
+        static $loadedOLlib = false;
+        if (! $loadedOLlib) {
+            $renderer->doc .= DOKU_LF . '<script type="text/javascript" src="' . DOKU_BASE . 'lib/plugins/openlayersmapoverlays/lib/layers.js' . '"></script>';
+            $loadedOLlib = true;
+        }
+        // incremented for each olmap_wmslayer tag in the page source
+        static $overlaynumber = 0;
 
-		list ( $id, $url, $name, $visible ) = $data;
-		$renderer->doc .= DOKU_LF . "<script type='text/javascript'><!--//--><![CDATA[//><!--" . DOKU_LF;
-		$str = '{';
-		foreach ( $data as $key => $val ) {
-			$str .= "'" . $key . "' : '" . $val . "',";
-		}
-		$str .= "'type':'wms'}";
-		$renderer->doc .= "olMapOverlays['wms" . $overlaynumber . "'] = " . $str . ";" . DOKU_LF . "//--><!]]></script>";
-		$overlaynumber ++;
-		return true;
-	}
+        list ( $id, $url, $name, $visible ) = $data;
+        $renderer->doc .= DOKU_LF . "<script type='text/javascript'><!--//--><![CDATA[//><!--" . DOKU_LF;
+        $str = '{';
+        foreach ( $data as $key => $val ) {
+            $str .= "'" . $key . "' : '" . $val . "',";
+        }
+        $str .= "'type':'wms'}";
+        $renderer->doc .= "olMapOverlays['wms" . $overlaynumber . "'] = " . $str . ";" . DOKU_LF . "//--><!]]></script>";
+        $overlaynumber ++;
+        return true;
+    }
 }