@@ -30,7 +30,7 @@ |
||
| 30 | 30 | * Simple test to make sure the plugin.info.txt is in correct format. |
| 31 | 31 | */ |
| 32 | 32 | final public function test_plugininfo(): void { |
| 33 | - $file = __DIR__ . '/../plugin.info.txt'; |
|
| 33 | + $file = __DIR__.'/../plugin.info.txt'; |
|
| 34 | 34 | self::assertFileExists($file); |
| 35 | 35 | |
| 36 | 36 | $info = confToHash($file); |
@@ -119,13 +119,13 @@ |
||
| 119 | 119 | // incremented for each olmap_wmslayer tag in the page source |
| 120 | 120 | static $overlaynumber = 0; |
| 121 | 121 | |
| 122 | - $renderer->doc .= DOKU_LF . '<script defer="defer" src="data:text/javascript;base64,'; |
|
| 123 | - $str = '{'; |
|
| 122 | + $renderer->doc .= DOKU_LF.'<script defer="defer" src="data:text/javascript;base64,'; |
|
| 123 | + $str = '{'; |
|
| 124 | 124 | foreach ($data as $key => $val) { |
| 125 | - $str .= "'" . $key . "' : '" . $val . "',"; |
|
| 125 | + $str .= "'".$key."' : '".$val."',"; |
|
| 126 | 126 | } |
| 127 | 127 | $str .= "'type':'wms'}"; |
| 128 | - $renderer->doc .= base64_encode("olMapOverlays['wms" . $overlaynumber . "'] = " . $str . ";") |
|
| 128 | + $renderer->doc .= base64_encode("olMapOverlays['wms".$overlaynumber."'] = ".$str.";") |
|
| 129 | 129 | . '"></script>'; |
| 130 | 130 | $overlaynumber++; |
| 131 | 131 | return true; |
@@ -116,13 +116,13 @@ |
||
| 116 | 116 | // incremented for each olmap_osmlayer tag in the page source |
| 117 | 117 | static $overlaynumber = 0; |
| 118 | 118 | |
| 119 | - $renderer->doc .= DOKU_LF . '<script defer="defer" src="data:text/javascript;base64,'; |
|
| 120 | - $str = '{'; |
|
| 119 | + $renderer->doc .= DOKU_LF.'<script defer="defer" src="data:text/javascript;base64,'; |
|
| 120 | + $str = '{'; |
|
| 121 | 121 | foreach ($data as $key => $val) { |
| 122 | - $str .= "'" . $key . "' : '" . $val . "',"; |
|
| 122 | + $str .= "'".$key."' : '".$val."',"; |
|
| 123 | 123 | } |
| 124 | 124 | $str .= '"type":"osm"}'; |
| 125 | - $renderer->doc .= base64_encode("olMapOverlays['osm" . $overlaynumber . "'] = " . $str . ";") |
|
| 125 | + $renderer->doc .= base64_encode("olMapOverlays['osm".$overlaynumber."'] = ".$str.";") |
|
| 126 | 126 | . '"></script>'; |
| 127 | 127 | $overlaynumber++; |
| 128 | 128 | return true; |
@@ -120,13 +120,13 @@ |
||
| 120 | 120 | // incremented for each olmap_agslayer tag in the page source |
| 121 | 121 | static $overlaynumber = 0; |
| 122 | 122 | |
| 123 | - $renderer->doc .= DOKU_LF . '<script defer="defer" src="data:text/javascript;base64,'; |
|
| 124 | - $str = '{'; |
|
| 123 | + $renderer->doc .= DOKU_LF.'<script defer="defer" src="data:text/javascript;base64,'; |
|
| 124 | + $str = '{'; |
|
| 125 | 125 | foreach ($data as $key => $val) { |
| 126 | - $str .= "'" . $key . "' : '" . $val . "',"; |
|
| 126 | + $str .= "'".$key."' : '".$val."',"; |
|
| 127 | 127 | } |
| 128 | 128 | $str .= "'type':'ags'}"; |
| 129 | - $renderer->doc .= base64_encode("olMapOverlays['ags" . $overlaynumber . "'] = " . $str . ";") |
|
| 129 | + $renderer->doc .= base64_encode("olMapOverlays['ags".$overlaynumber."'] = ".$str.";") |
|
| 130 | 130 | . '"></script>'; |
| 131 | 131 | $overlaynumber++; |
| 132 | 132 | return true; |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | $conf['plugin']['openlayersmap']['optionStaticMapGenerator'] = 'local'; |
| 39 | 39 | $conf['plugin']['openlayersmap']['autoZoomMap'] = 1; |
| 40 | 40 | |
| 41 | - TestUtils::rcopy(TMP_DIR, __DIR__ . '/data/'); |
|
| 41 | + TestUtils::rcopy(TMP_DIR, __DIR__.'/data/'); |
|
| 42 | 42 | } |
| 43 | 43 | |
| 44 | 44 | final public function setUp(): void { |
@@ -50,9 +50,9 @@ discard block |
||
| 50 | 50 | // foreach($data as $val) { |
| 51 | 51 | // idx_addPage($val['id']); |
| 52 | 52 | // } |
| 53 | - if($conf['allowdebug']) { |
|
| 54 | - if(mkdir(DOKU_TMP_DATA . 'data/log/debug/', 0777, true)) { |
|
| 55 | - touch(DOKU_TMP_DATA . 'data/log/debug/' . date('Y-m-d') . '.log'); |
|
| 53 | + if ($conf['allowdebug']) { |
|
| 54 | + if (mkdir(DOKU_TMP_DATA.'data/log/debug/', 0777, true)) { |
|
| 55 | + touch(DOKU_TMP_DATA.'data/log/debug/'.date('Y-m-d').'.log'); |
|
| 56 | 56 | } |
| 57 | 57 | |
| 58 | 58 | } |
@@ -63,10 +63,10 @@ discard block |
||
| 63 | 63 | |
| 64 | 64 | global $conf; |
| 65 | 65 | // try to get the debug log after running the test, print and clear |
| 66 | - if($conf['allowdebug']) { |
|
| 66 | + if ($conf['allowdebug']) { |
|
| 67 | 67 | print "\n"; |
| 68 | - readfile(DOKU_TMP_DATA . 'data/log/debug/' . date('Y-m-d') . '.log'); |
|
| 69 | - unlink(DOKU_TMP_DATA . 'data/log/debug/' . date('Y-m-d') . '.log'); |
|
| 68 | + readfile(DOKU_TMP_DATA.'data/log/debug/'.date('Y-m-d').'.log'); |
|
| 69 | + unlink(DOKU_TMP_DATA.'data/log/debug/'.date('Y-m-d').'.log'); |
|
| 70 | 70 | } |
| 71 | 71 | } |
| 72 | 72 | |
@@ -117,13 +117,13 @@ |
||
| 117 | 117 | // incremented for each olmap_wmtslayer tag in the page source |
| 118 | 118 | static $overlaynumber = 0; |
| 119 | 119 | |
| 120 | - $renderer->doc .= DOKU_LF . '<script defer="defer" src="data:text/javascript;base64,'; |
|
| 120 | + $renderer->doc .= DOKU_LF.'<script defer="defer" src="data:text/javascript;base64,'; |
|
| 121 | 121 | $str = '{'; |
| 122 | 122 | foreach ($data as $key => $val) { |
| 123 | - $str .= "'" . $key . "':'" . $val . "', "; |
|
| 123 | + $str .= "'".$key."':'".$val."', "; |
|
| 124 | 124 | } |
| 125 | 125 | $str .= "'type':'wmts'}"; |
| 126 | - $renderer->doc .= base64_encode("olMapOverlays['wmts" . $overlaynumber . "'] = " . $str . ";") |
|
| 126 | + $renderer->doc .= base64_encode("olMapOverlays['wmts".$overlaynumber."'] = ".$str.";") |
|
| 127 | 127 | . '"></script>'; |
| 128 | 128 | $overlaynumber++; |
| 129 | 129 | return true; |
@@ -81,6 +81,6 @@ |
||
| 81 | 81 | $plugin_info = $this->getInfo(); |
| 82 | 82 | $event->data['openlayersmap']['version'] = $plugin_info['date']; |
| 83 | 83 | $event->data['openlayersmap']['dwversion'] = $versionInfo['date']; |
| 84 | - $event->data['openlayersmap']['combinedversion'] = $versionInfo['date'] . '_' . $plugin_info['date']; |
|
| 84 | + $event->data['openlayersmap']['combinedversion'] = $versionInfo['date'].'_'.$plugin_info['date']; |
|
| 85 | 85 | } |
| 86 | 86 | } |
@@ -139,6 +139,6 @@ |
||
| 139 | 139 | $id = substr($id, 1); |
| 140 | 140 | } |
| 141 | 141 | $id = str_replace(":", "/", $id); |
| 142 | - return $conf['mediadir'] . '/' . $id; |
|
| 142 | + return $conf['mediadir'].'/'.$id; |
|
| 143 | 143 | } |
| 144 | 144 | } |
@@ -44,7 +44,7 @@ |
||
| 44 | 44 | <body> |
| 45 | 45 | <div class="box"><?php |
| 46 | 46 | foreach (glob('*.png') as $img) { |
| 47 | - echo '<img src="' . $img . '" alt="' . $img . '" title="' . $img . '" /> '; |
|
| 47 | + echo '<img src="'.$img.'" alt="'.$img.'" title="'.$img.'" /> '; |
|
| 48 | 48 | } |
| 49 | 49 | ?></div> |
| 50 | 50 | </body> |