@@ -6,4 +6,4 @@ |
||
6 | 6 | ***************************************************************************/ |
7 | 7 | |
8 | 8 | $nongc = true; |
9 | -require __DIR__ . '/map2.php'; |
|
9 | +require __DIR__.'/map2.php'; |
@@ -14,8 +14,8 @@ discard block |
||
14 | 14 | use Oc\Libse\Http\RequestHttp; |
15 | 15 | use Oc\Libse\Language\TranslatorLanguage; |
16 | 16 | |
17 | -require __DIR__ . '/lib2/web.inc.php'; |
|
18 | -require_once __DIR__ . '/lib2/logic/labels.inc.php'; |
|
17 | +require __DIR__.'/lib2/web.inc.php'; |
|
18 | +require_once __DIR__.'/lib2/logic/labels.inc.php'; |
|
19 | 19 | |
20 | 20 | $login->verify(); |
21 | 21 | |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | if ($count > 0) { |
29 | 29 | $formatter = new FormatterCoordinate(); |
30 | 30 | |
31 | - for ($i = 0; $i < $count; $i ++) { |
|
31 | + for ($i = 0; $i < $count; $i++) { |
|
32 | 32 | $waypoints[$i]['coord']['lat'] = $waypoints[$i]['coordinate']->latitude(); |
33 | 33 | $waypoints[$i]['coord']['lon'] = $waypoints[$i]['coordinate']->longitude(); |
34 | 34 | $waypoints[$i]['coordinateHtml'] = $formatter->formatHtml($waypoints[$i]['coordinate'], '<br />'); |
@@ -78,9 +78,9 @@ discard block |
||
78 | 78 | |
79 | 79 | $desclang = isset($_REQUEST['desclang']) ? $_REQUEST['desclang'] : false; |
80 | 80 | if ($desclang) { |
81 | - $sPreferedDescLang = $_REQUEST['desclang'] . ',' . $opt['template']['locale'] . ',EN'; |
|
81 | + $sPreferedDescLang = $_REQUEST['desclang'].','.$opt['template']['locale'].',EN'; |
|
82 | 82 | } else { |
83 | - $sPreferedDescLang = $opt['template']['locale'] . ',EN'; |
|
83 | + $sPreferedDescLang = $opt['template']['locale'].',EN'; |
|
84 | 84 | } |
85 | 85 | |
86 | 86 | $logpics = isset($_REQUEST['logpics']) && ($_REQUEST['logpics'] == 1); |
@@ -203,7 +203,7 @@ discard block |
||
203 | 203 | $digits = 0; |
204 | 204 | } |
205 | 205 | } |
206 | -$rCache['waylength'] = sprintf('%.' . $digits . 'f', $rCache['waylength']); |
|
206 | +$rCache['waylength'] = sprintf('%.'.$digits.'f', $rCache['waylength']); |
|
207 | 207 | |
208 | 208 | // replace links |
209 | 209 | $rCache['desc'] = use_current_protocol_in_html($rCache['desc']); |
@@ -243,7 +243,7 @@ discard block |
||
243 | 243 | } |
244 | 244 | |
245 | 245 | $tpl->assign('cache', $rCache); |
246 | -$tpl->title = $rCache['wpoc'] . ' ' . $rCache['name']; |
|
246 | +$tpl->title = $rCache['wpoc'].' '.$rCache['name']; |
|
247 | 247 | |
248 | 248 | $coord = new coordinate($rCache['latitude'], $rCache['longitude']); |
249 | 249 | $tpl->assign('coordinates', $coord->getDecimalMinutes()); |
@@ -391,11 +391,11 @@ discard block |
||
391 | 391 | */ |
392 | 392 | $tpl->assign('show_logpics', $logpics ? 1 : 0); |
393 | 393 | if ($logpics) { |
394 | - LogPics::setPaging(LogPics::FOR_CACHE_GALLERY, 0, $cacheid, "viewcache.php?cacheid=" . $cacheid . "&logpics=1"); |
|
394 | + LogPics::setPaging(LogPics::FOR_CACHE_GALLERY, 0, $cacheid, "viewcache.php?cacheid=".$cacheid."&logpics=1"); |
|
395 | 395 | $tpl->assign( |
396 | 396 | 'subtitle', |
397 | - "<< <a href='viewcache.php?cacheid=" . $cacheid . "'>" . |
|
398 | - $translate->t('Back to the cache description', '', basename(__FILE__), __LINE__) . "</a>" |
|
397 | + "<< <a href='viewcache.php?cacheid=".$cacheid."'>". |
|
398 | + $translate->t('Back to the cache description', '', basename(__FILE__), __LINE__)."</a>" |
|
399 | 399 | ); |
400 | 400 | |
401 | 401 | } else { |
@@ -424,7 +424,7 @@ discard block |
||
424 | 424 | } |
425 | 425 | |
426 | 426 | $cachemap['iframe'] = $opt['logic']['cachemaps']['iframe']; |
427 | -$url = $opt['page']['protocol'] . strstr($opt['logic']['cachemaps']['url'], '://'); |
|
427 | +$url = $opt['page']['protocol'].strstr($opt['logic']['cachemaps']['url'], '://'); |
|
428 | 428 | $url = str_replace('{userzoom}', $userzoom, $url); |
429 | 429 | $url = str_replace('{latitude}', $rCache['latitude'], $url); |
430 | 430 | $url = str_replace('{longitude}', $rCache['longitude'], $url); |
@@ -6,7 +6,7 @@ |
||
6 | 6 | * @subpackage plugins |
7 | 7 | */ |
8 | 8 | |
9 | -require_once $opt['rootpath'] . 'lib2/smiley.inc.php'; |
|
9 | +require_once $opt['rootpath'].'lib2/smiley.inc.php'; |
|
10 | 10 | |
11 | 11 | function smarty_modifier_smiley($string) |
12 | 12 | { |
@@ -57,10 +57,10 @@ discard block |
||
57 | 57 | $end = 0; |
58 | 58 | while (($start = smarty_prefilter_t_strpos_multi( |
59 | 59 | $source, |
60 | - [$smarty->left_delimiter . 't ', $smarty->left_delimiter . 't' . $smarty->right_delimiter], |
|
60 | + [$smarty->left_delimiter.'t ', $smarty->left_delimiter.'t'.$smarty->right_delimiter], |
|
61 | 61 | $end |
62 | 62 | )) !== false) { |
63 | - $end = mb_strpos($source, $smarty->left_delimiter . '/t' . $smarty->right_delimiter, $start); |
|
63 | + $end = mb_strpos($source, $smarty->left_delimiter.'/t'.$smarty->right_delimiter, $start); |
|
64 | 64 | $block_t = mb_substr($source, $start, $end - $start); |
65 | 65 | |
66 | 66 | $messgage_start = mb_strrpos($block_t, '}') + 1; |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | ); |
73 | 73 | |
74 | 74 | $output .= mb_substr($source, $output_start, $start - $output_start); |
75 | - $output_start = $end + mb_strlen($smarty->left_delimiter . $smarty->right_delimiter) + 2; |
|
75 | + $output_start = $end + mb_strlen($smarty->left_delimiter.$smarty->right_delimiter) + 2; |
|
76 | 76 | |
77 | 77 | $output .= $block_t; |
78 | 78 | } |
@@ -116,11 +116,11 @@ discard block |
||
116 | 116 | if ($block != '') { |
117 | 117 | $block .= ' '; |
118 | 118 | } |
119 | - $block .= $k . '=' . $v; |
|
119 | + $block .= $k.'='.$v; |
|
120 | 120 | } |
121 | 121 | |
122 | 122 | // pass it to block.t |
123 | - return $smarty->left_delimiter . 't ' . $block . $smarty->right_delimiter . $message . $smarty->left_delimiter . '/t' . $smarty->right_delimiter; |
|
123 | + return $smarty->left_delimiter.'t '.$block.$smarty->right_delimiter.$message.$smarty->left_delimiter.'/t'.$smarty->right_delimiter; |
|
124 | 124 | } |
125 | 125 | unset($attrs['plural']); |
126 | 126 | unset($attrs['count']); |
@@ -148,7 +148,7 @@ discard block |
||
148 | 148 | |
149 | 149 | /* Tokenize tag attributes. */ |
150 | 150 | preg_match_all( |
151 | - '~(?:' . $smarty->_obj_call_regexp . '|' . $smarty->_qstr_regexp . ' | (?>[^"\'=\s]+) |
|
151 | + '~(?:'.$smarty->_obj_call_regexp.'|'.$smarty->_qstr_regexp.' | (?>[^"\'=\s]+) |
|
152 | 152 | )+ | |
153 | 153 | [=] |
154 | 154 | ~x', |
@@ -206,16 +206,16 @@ discard block |
||
206 | 206 | if ($token == 'null') { |
207 | 207 | $token = 'null'; |
208 | 208 | } else { |
209 | - if (preg_match('~^' . $smarty->_num_const_regexp . '|0[xX][0-9a-fA-F]+$~', $token)) { |
|
209 | + if (preg_match('~^'.$smarty->_num_const_regexp.'|0[xX][0-9a-fA-F]+$~', $token)) { |
|
210 | 210 | /* treat integer literally */ |
211 | 211 | } else { |
212 | 212 | if (!preg_match( |
213 | - '~^' . $smarty->_obj_call_regexp . '|' . $smarty->_var_regexp . '(?:' . $smarty->_mod_regexp . ')*$~', |
|
213 | + '~^'.$smarty->_obj_call_regexp.'|'.$smarty->_var_regexp.'(?:'.$smarty->_mod_regexp.')*$~', |
|
214 | 214 | $token |
215 | 215 | ) |
216 | 216 | ) { |
217 | 217 | /* treat as a string, double-quote it escaping quotes */ |
218 | - $token = '"' . addslashes($token) . '"'; |
|
218 | + $token = '"'.addslashes($token).'"'; |
|
219 | 219 | } |
220 | 220 | } |
221 | 221 | } |
@@ -299,12 +299,12 @@ discard block |
||
299 | 299 | $number = 1; |
300 | 300 | foreach ($attrs as $attr) { |
301 | 301 | if (is_numeric($attr)) { |
302 | - $trans = mb_ereg_replace('%' . $number, $attr, $trans); |
|
302 | + $trans = mb_ereg_replace('%'.$number, $attr, $trans); |
|
303 | 303 | } else { |
304 | - $trans = mb_ereg_replace('%' . $number, $smarty->left_delimiter . $attr . $smarty->right_delimiter, $trans); |
|
304 | + $trans = mb_ereg_replace('%'.$number, $smarty->left_delimiter.$attr.$smarty->right_delimiter, $trans); |
|
305 | 305 | } |
306 | 306 | |
307 | - $number ++; |
|
307 | + $number++; |
|
308 | 308 | } |
309 | 309 | |
310 | 310 | return $trans; |
@@ -24,9 +24,9 @@ discard block |
||
24 | 24 | if (SID != '' && session_id() != '') { |
25 | 25 | $text = preg_replace( |
26 | 26 | '/<\\/form>/i', |
27 | - '<input type="hidden" name="' . htmlspecialchars(session_name()) . '" value="' . htmlspecialchars( |
|
27 | + '<input type="hidden" name="'.htmlspecialchars(session_name()).'" value="'.htmlspecialchars( |
|
28 | 28 | session_id() |
29 | - ) . '" /></form>', |
|
29 | + ).'" /></form>', |
|
30 | 30 | $text |
31 | 31 | ); |
32 | 32 | $text = preg_replace_callback( |
@@ -59,12 +59,12 @@ discard block |
||
59 | 59 | } |
60 | 60 | |
61 | 61 | if (strpos($match[2], '?') === false) { |
62 | - return 'href=' . $match[1] . $match[2] . '?' . urlencode(session_name()) . '=' . urlencode( |
|
62 | + return 'href='.$match[1].$match[2].'?'.urlencode(session_name()).'='.urlencode( |
|
63 | 63 | session_id() |
64 | - ) . $match[3]; |
|
64 | + ).$match[3]; |
|
65 | 65 | } else { |
66 | - return 'href=' . $match[1] . $match[2] . '&' . urlencode(session_name()) . '=' . urlencode( |
|
66 | + return 'href='.$match[1].$match[2].'&'.urlencode(session_name()).'='.urlencode( |
|
67 | 67 | session_id() |
68 | - ) . $match[3]; |
|
68 | + ).$match[3]; |
|
69 | 69 | } |
70 | 70 | } |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | $lonMin = $lon - floor($lon); |
31 | 31 | $lon -= $lonMin; |
32 | 32 | |
33 | - $retval = '<select name="' . htmlspecialchars($prefix, ENT_QUOTES, 'UTF-8') . 'NS">'; |
|
33 | + $retval = '<select name="'.htmlspecialchars($prefix, ENT_QUOTES, 'UTF-8').'NS">'; |
|
34 | 34 | if ($bLatNeg) { |
35 | 35 | $retval .= '<option value="N">N</option>'; |
36 | 36 | $retval .= '<option value="S" selected="selected">S</option>'; |
@@ -40,28 +40,28 @@ discard block |
||
40 | 40 | } |
41 | 41 | $retval .= '</select> '; |
42 | 42 | |
43 | - $retval .= '<input type="text" name="' . htmlspecialchars( |
|
43 | + $retval .= '<input type="text" name="'.htmlspecialchars( |
|
44 | 44 | $prefix, |
45 | 45 | ENT_QUOTES, |
46 | 46 | 'UTF-8' |
47 | - ) . 'Lat" value="' . htmlspecialchars( |
|
47 | + ).'Lat" value="'.htmlspecialchars( |
|
48 | 48 | sprintf('%02d', $lat), |
49 | 49 | ENT_QUOTES, |
50 | 50 | 'UTF-8' |
51 | - ) . '" size="1" maxlength="2" />° '; |
|
52 | - $retval .= '<input type="text" name="' . htmlspecialchars( |
|
51 | + ).'" size="1" maxlength="2" />° '; |
|
52 | + $retval .= '<input type="text" name="'.htmlspecialchars( |
|
53 | 53 | $prefix, |
54 | 54 | ENT_QUOTES, |
55 | 55 | 'UTF-8' |
56 | - ) . 'LatMin" value="' . htmlspecialchars( |
|
56 | + ).'LatMin" value="'.htmlspecialchars( |
|
57 | 57 | sprintf('%06.3f', $latMin * 60), |
58 | 58 | ENT_QUOTES, |
59 | 59 | 'UTF-8' |
60 | - ) . '" size="5" maxlength="6" /> \''; |
|
60 | + ).'" size="5" maxlength="6" /> \''; |
|
61 | 61 | |
62 | 62 | $retval .= '<br />'; |
63 | 63 | |
64 | - $retval .= '<select name="' . htmlspecialchars($prefix, ENT_QUOTES, 'UTF-8') . 'EW">'; |
|
64 | + $retval .= '<select name="'.htmlspecialchars($prefix, ENT_QUOTES, 'UTF-8').'EW">'; |
|
65 | 65 | if ($bLonNeg) { |
66 | 66 | $retval .= '<option value="E">E</option>'; |
67 | 67 | $retval .= '<option value="W" selected="selected">W</option>'; |
@@ -71,24 +71,24 @@ discard block |
||
71 | 71 | } |
72 | 72 | $retval .= '</select> '; |
73 | 73 | |
74 | - $retval .= '<input type="text" name="' . htmlspecialchars( |
|
74 | + $retval .= '<input type="text" name="'.htmlspecialchars( |
|
75 | 75 | $prefix, |
76 | 76 | ENT_QUOTES, |
77 | 77 | 'UTF-8' |
78 | - ) . 'Lon" value="' . htmlspecialchars( |
|
78 | + ).'Lon" value="'.htmlspecialchars( |
|
79 | 79 | sprintf('%03d', $lon), |
80 | 80 | ENT_QUOTES, |
81 | 81 | 'UTF-8' |
82 | - ) . '" size="2" maxlength="3" />° '; |
|
83 | - $retval .= '<input type="text" name="' . htmlspecialchars( |
|
82 | + ).'" size="2" maxlength="3" />° '; |
|
83 | + $retval .= '<input type="text" name="'.htmlspecialchars( |
|
84 | 84 | $prefix, |
85 | 85 | ENT_QUOTES, |
86 | 86 | 'UTF-8' |
87 | - ) . 'LonMin" value="' . htmlspecialchars( |
|
87 | + ).'LonMin" value="'.htmlspecialchars( |
|
88 | 88 | sprintf('%06.3f', $lonMin * 60), |
89 | 89 | ENT_QUOTES, |
90 | 90 | 'UTF-8' |
91 | - ) . '" size="5" maxlength="6" /> \''; |
|
91 | + ).'" size="5" maxlength="6" /> \''; |
|
92 | 92 | |
93 | 93 | return $retval; |
94 | 94 | } |
@@ -24,15 +24,15 @@ |
||
24 | 24 | $tr = []; |
25 | 25 | $p = 0; |
26 | 26 | |
27 | - for ($i = 1; $i < func_num_args(); $i ++) { |
|
27 | + for ($i = 1; $i < func_num_args(); $i++) { |
|
28 | 28 | $arg = func_get_arg($i); |
29 | 29 | |
30 | 30 | if (is_array($arg)) { |
31 | 31 | foreach ($arg as $aarg) { |
32 | - $tr['%' . ++ $p] = $aarg; |
|
32 | + $tr['%'.++ $p] = $aarg; |
|
33 | 33 | } |
34 | 34 | } else { |
35 | - $tr['%' . ++ $p] = $arg; |
|
35 | + $tr['%'.++ $p] = $arg; |
|
36 | 36 | } |
37 | 37 | } |
38 | 38 |
@@ -61,7 +61,7 @@ |
||
61 | 61 | |
62 | 62 | $retval .= mb_substr($text, $curpos, $starthttp - $curpos); |
63 | 63 | $url = mb_substr($text, $starthttp, $endhttp - $starthttp); |
64 | - $retval .= '<a href="' . $url . '" alt="" target="_blank">' . $url . '</a>'; |
|
64 | + $retval .= '<a href="'.$url.'" alt="" target="_blank">'.$url.'</a>'; |
|
65 | 65 | |
66 | 66 | $curpos = $endhttp; |
67 | 67 | if ($curpos >= mb_strlen($text)) { |
@@ -20,7 +20,7 @@ |
||
20 | 20 | { |
21 | 21 | $hour = floor($value); |
22 | 22 | |
23 | - return $hour . ':' . sprintf('%02.0F', ($value - $hour) * 60); |
|
23 | + return $hour.':'.sprintf('%02.0F', ($value - $hour) * 60); |
|
24 | 24 | } |
25 | 25 | |
26 | 26 | /* vim: set expandtab: */ |