@@ -35,6 +35,6 @@  | 
                                                    ||
| 35 | 35 | |
| 36 | 36 | protected function getValue($value)  | 
                                                        
| 37 | 37 |      { | 
                                                        
| 38 | - return (int) $value;  | 
                                                        |
| 38 | + return (int)$value;  | 
                                                        |
| 39 | 39 | }  | 
                                                        
| 40 | 40 | }  | 
                                                        
@@ -29,7 +29,7 @@ discard block  | 
                                                    ||
| 29 | 29 | // number of points in the polygon  | 
                                                        
| 30 | 30 | $n = count($polygon);  | 
                                                        
| 31 | 31 | $poly1 = $polygon[0];  | 
                                                        
| 32 | -        for ($i = 1; $i <= $n; $i ++) { | 
                                                        |
| 32 | +        for ($i = 1; $i <= $n; $i++) { | 
                                                        |
| 33 | 33 |              $poly1XY = explode(' ', $poly1); | 
                                                        
| 34 | 34 | $poly1x = $poly1XY[0];  | 
                                                        
| 35 | 35 | $poly1y = $poly1XY[1];  | 
                                                        
@@ -44,7 +44,7 @@ discard block  | 
                                                    ||
| 44 | 44 |                          if ($poly1y != $poly2y) { | 
                                                        
| 45 | 45 | $xinters = ($py - $poly1y) * ($poly2x - $poly1x) / ($poly2y - $poly1y) + $poly1x;  | 
                                                        
| 46 | 46 |                              if ($poly1x == $poly2x || $px <= $xinters) { | 
                                                        
| 47 | - $counter ++;  | 
                                                        |
| 47 | + $counter++;  | 
                                                        |
| 48 | 48 | }  | 
                                                        
| 49 | 49 | }  | 
                                                        
| 50 | 50 | }  | 
                                                        
@@ -59,7 +59,7 @@  | 
                                                    ||
| 59 | 59 | $to_page = min($last_page, max($first_page, $current_page - $lrspan) + $this->max_pages_shown - 1);  | 
                                                        
| 60 | 60 | $from_page = max($first_page, $to_page - $this->max_pages_shown + 1);  | 
                                                        
| 61 | 61 | |
| 62 | -            for ($page = $from_page; $page <= $to_page; $page ++) { | 
                                                        |
| 62 | +            for ($page = $from_page; $page <= $to_page; $page++) { | 
                                                        |
| 63 | 63 |                  if ($page == $current_page) { | 
                                                        
| 64 | 64 | $pages[$page] = false;  | 
                                                        
| 65 | 65 |                  } else { | 
                                                        
@@ -74,7 +74,7 @@  | 
                                                    ||
| 74 | 74 | break;  | 
                                                        
| 75 | 75 | }  | 
                                                        
| 76 | 76 | $command['result'][] = $r;  | 
                                                        
| 77 | - $c ++;  | 
                                                        |
| 77 | + $c++;  | 
                                                        |
| 78 | 78 | }  | 
                                                        
| 79 | 79 | sql_free_result($rs);  | 
                                                        
| 80 | 80 | |
@@ -14,8 +14,7 @@  | 
                                                    ||
| 14 | 14 | $tpl->caching = true;  | 
                                                        
| 15 | 15 | $tpl->cache_lifetime = 3600;  | 
                                                        
| 16 | 16 | |
| 17 | -$country = isset($_REQUEST['usercountry']) ? $_REQUEST['usercountry'] :  | 
                                                        |
| 18 | - (isset($_REQUEST['country']) ? $_REQUEST['country'] : $opt['page']['main_country']);  | 
                                                        |
| 17 | +$country = isset($_REQUEST['usercountry']) ? $_REQUEST['usercountry'] : (isset($_REQUEST['country']) ? $_REQUEST['country'] : $opt['page']['main_country']);  | 
                                                        |
| 19 | 18 | |
| 20 | 19 |  if (!$tpl->is_cached()) { | 
                                                        
| 21 | 20 | $newCaches = array();  | 
                                                        
@@ -17,9 +17,9 @@ discard block  | 
                                                    ||
| 17 | 17 | * $opt['locale']  | 
                                                        
| 18 | 18 | ***************************************************************************/  | 
                                                        
| 19 | 19 | |
| 20 | -define('OC_LOCALE_ACTIVE', 2);    // enable language and show language button in header line | 
                                                        |
| 21 | -define('OC_LOCALE_HIDDEN', 1);    // enable language but hide language button in header line | 
                                                        |
| 22 | -define('OC_LOCALE_DISABLED', 0);  // disable language | 
                                                        |
| 20 | +define('OC_LOCALE_ACTIVE', 2); // enable language and show language button in header line | 
                                                        |
| 21 | +define('OC_LOCALE_HIDDEN', 1); // enable language but hide language button in header line | 
                                                        |
| 22 | +define('OC_LOCALE_DISABLED', 0); // disable language | 
                                                        |
| 23 | 23 | |
| 24 | 24 | $opt['template']['locales']['DE']['status'] = OC_LOCALE_ACTIVE;  | 
                                                        
| 25 | 25 | $opt['template']['locales']['DE']['flag'] = 'images/flag/DE.png';  | 
                                                        
@@ -131,7 +131,7 @@ discard block  | 
                                                    ||
| 131 | 131 |  $opt['locale']['DE']['page']['license'] = '<a rel="license" href="%1"><img alt="Creative Commons Lizenzvertrag" style="border-width:0" src="resource2/ocstyle/images/media/cc-by-nc-nd-small.png" /></a><div style="text-align:center; margin:8px 0 0 6px;">Die <a href="articles.php?page=impressum#datalicense">Inhalte</a> von {site} stehen unter der Creative-Commons-Lizenz <a rel="license" href="%1">BY-NC-ND 3.0 DE</a>.</div>'; | 
                                                        
| 132 | 132 | $opt['locale']['DE']['helpwiki'] = 'http://wiki.opencaching.de/index.php/';  | 
                                                        
| 133 | 133 | $opt['locale']['DE']['mostly_translated'] = true;  | 
                                                        
| 134 | -$opt['locale']['DE']['what3words'] = true; // "beta"  | 
                                                        |
| 134 | +$opt['locale']['DE']['what3words'] = true; // "beta"  | 
                                                        |
| 135 | 135 | |
| 136 | 136 | $opt['locale']['IT']['format']['dateshort'] = '%d/%m/%y';  | 
                                                        
| 137 | 137 | $opt['locale']['IT']['format']['dm'] = '%d/%m';  | 
                                                        
@@ -233,7 +233,7 @@ discard block  | 
                                                    ||
| 233 | 233 | $opt['locale']['SV']['page']['subtitle1'] = 'Geocaching med Opencaching';  | 
                                                        
| 234 | 234 | $opt['locale']['SV']['page']['subtitle2'] = '';  | 
                                                        
| 235 | 235 | $opt['locale']['SV']['mostly_translated'] = false;  | 
                                                        
| 236 | -$opt['locale']['SV']['what3words'] = true; // "beta"  | 
                                                        |
| 236 | +$opt['locale']['SV']['what3words'] = true; // "beta"  | 
                                                        |
| 237 | 237 | |
| 238 | 238 | $opt['locale']['NO']['format']['dateshort'] = '%d.%m.%y';  | 
                                                        
| 239 | 239 | $opt['locale']['NO']['format']['dm'] = '%d.%m.';  | 
                                                        
@@ -283,7 +283,7 @@ discard block  | 
                                                    ||
| 283 | 283 | $opt['locale']['RU']['country'] = 'RU';  | 
                                                        
| 284 | 284 | $opt['locale']['RU']['primary_lang_of'] = ['RU'];  | 
                                                        
| 285 | 285 | $opt['locale']['RU']['mostly_translated'] = false;  | 
                                                        
| 286 | -$opt['locale']['RU']['what3words'] = true; // "beta"  | 
                                                        |
| 286 | +$opt['locale']['RU']['what3words'] = true; // "beta"  | 
                                                        |
| 287 | 287 | |
| 288 | 288 | $opt['locale']['DA']['format']['dateshort'] = '%d.%m.%y';  | 
                                                        
| 289 | 289 | $opt['locale']['DA']['format']['dm'] = '%d.%m.';  | 
                                                        
@@ -199,7 +199,7 @@ discard block  | 
                                                    ||
| 199 | 199 | $str = '';  | 
                                                        
| 200 | 200 | |
| 201 | 201 | ftsearch_load_ignores();  | 
                                                        
| 202 | -    for ($i = count($astr) - 1; $i >= 0; $i --) { | 
                                                        |
| 202 | +    for ($i = count($astr) - 1; $i >= 0; $i--) { | 
                                                        |
| 203 | 203 | // ignore?  | 
                                                        
| 204 | 204 |          if (array_search(mb_strtolower($astr[$i]), $ftsearch_ignores) !== false) { | 
                                                        
| 205 | 205 | unset($astr[$i]);  | 
                                                        
@@ -254,7 +254,7 @@ discard block  | 
                                                    ||
| 254 | 254 | |
| 255 | 255 | // doppelte chars ersetzen  | 
                                                        
| 256 | 256 |      $ordZ = ord('z'); | 
                                                        
| 257 | -    for ($c = ord('a'); $c <= $ordZ; $c ++) { | 
                                                        |
| 257 | +    for ($c = ord('a'); $c <= $ordZ; $c++) { | 
                                                        |
| 258 | 258 | $old_str = '';  | 
                                                        
| 259 | 259 |          while ($old_str !== $str) { | 
                                                        
| 260 | 260 | $old_str = $str;  | 
                                                        
@@ -61,7 +61,7 @@  | 
                                                    ||
| 61 | 61 | $pidDaemon = fgets($pidFile, 20);  | 
                                                        
| 62 | 62 | fclose($pidFile);  | 
                                                        
| 63 | 63 | |
| 64 | - $pidDaemon = (int) $pidDaemon;  | 
                                                        |
| 64 | + $pidDaemon = (int)$pidDaemon;  | 
                                                        |
| 65 | 65 | |
| 66 | 66 | // bad PID file, e.g. due to system malfunction while creating the file?  | 
                                                        
| 67 | 67 |              if ($pidDaemon <= 0) { | 
                                                        
@@ -34,8 +34,7 @@  | 
                                                    ||
| 34 | 34 | public $cdir = [];  | 
                                                        
| 35 | 35 | |
| 36 | 36 | /** constructor  | 
                                                        
| 37 | -  | 
                                                        |
| 38 | -*  | 
                                                        |
| 37 | + *  | 
                                                        |
| 39 | 38 | *@param string $zipFile if not empty must contain path to valid zip file, ss_zip will try to open and parse it.  | 
                                                        
| 40 | 39 | * If this parameter is empty, the new empty zip archive is created. This parameter has no meaning in  | 
                                                        
| 41 | 40 | * LIGHT verion, please upgrade to PROfessional version.  | 
                                                        
@@ -141,9 +141,9 @@ discard block  | 
                                                    ||
| 141 | 141 | }  | 
                                                        
| 142 | 142 | |
| 143 | 143 | $fnl = strlen($filename);  | 
                                                        
| 144 | - $fh = "\x14\x00"; // ver needed to extract  | 
                                                        |
| 145 | - $fh .= "\x00\x00"; // gen purpose bit flag  | 
                                                        |
| 146 | - $fh .= "\x08\x00"; // compression method  | 
                                                        |
| 144 | + $fh = "\x14\x00"; // ver needed to extract  | 
                                                        |
| 145 | + $fh .= "\x00\x00"; // gen purpose bit flag  | 
                                                        |
| 146 | + $fh .= "\x08\x00"; // compression method  | 
                                                        |
| 147 | 147 | $fh .= "\x00\x00\x00\x00"; // last mod time and date  | 
                                                        
| 148 | 148 | $fh .=  | 
                                                        
| 149 | 149 | pack(  | 
                                                        
@@ -170,16 +170,16 @@ discard block  | 
                                                    ||
| 170 | 170 | 'va*v3V2',  | 
                                                        
| 171 | 171 | 0,  | 
                                                        
| 172 | 172 | $fh,  | 
                                                        
| 173 | - 0, // file comment length  | 
                                                        |
| 174 | - 0, // disk number start  | 
                                                        |
| 175 | - 0, // internal file attributes  | 
                                                        |
| 176 | - $attr, // external file attributes - 'archive/directory' bit set  | 
                                                        |
| 173 | + 0, // file comment length  | 
                                                        |
| 174 | + 0, // disk number start  | 
                                                        |
| 175 | + 0, // internal file attributes  | 
                                                        |
| 176 | + $attr, // external file attributes - 'archive/directory' bit set  | 
                                                        |
| 177 | 177 | $this->offset  | 
                                                        
| 178 | 178 | ) . $filename;  | 
                                                        
| 179 | 179 | |
| 180 | 180 | $this->offset += 42 + $fnl + $gzsize;  | 
                                                        
| 181 | 181 | $this->cdir[] = $cdir;  | 
                                                        
| 182 | - $this->cnt ++;  | 
                                                        |
| 182 | + $this->cnt++;  | 
                                                        |
| 183 | 183 | $this->idx = $this->cnt - 1;  | 
                                                        
| 184 | 184 | }  | 
                                                        
| 185 | 185 | |
@@ -227,7 +227,7 @@ discard block  | 
                                                    ||
| 227 | 227 | $cdsl, // size of central dir  | 
                                                        
| 228 | 228 | $zdsl, // offset to start of central dir  | 
                                                        
| 229 | 229 | 0  | 
                                                        
| 230 | - ); // .zip file comment length  | 
                                                        |
| 230 | + ); // .zip file comment length  | 
                                                        |
| 231 | 231 | return $this->zipfile;  | 
                                                        
| 232 | 232 | }  | 
                                                        
| 233 | 233 | |