@@ -141,7 +141,7 @@ |
||
| 141 | 141 | $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>'; |
| 142 | 142 | $opt['locale']['DE']['helpwiki'] = 'http://wiki.opencaching.de/index.php/'; |
| 143 | 143 | $opt['locale']['DE']['mostly_translated'] = true; |
| 144 | -$opt['locale']['DE']['what3words'] = true; // "beta" |
|
| 144 | +$opt['locale']['DE']['what3words'] = true; // "beta" |
|
| 145 | 145 | |
| 146 | 146 | $opt['locale']['IT']['format']['dateshort'] = '%d/%m/%y'; |
| 147 | 147 | $opt['locale']['IT']['format']['dm'] = '%d/%m'; |
@@ -15,7 +15,7 @@ |
||
| 15 | 15 | $dontwatch = isset($_REQUEST['dontwatch']); |
| 16 | 16 | $bookmark = isset($_REQUEST['bookmark']); |
| 17 | 17 | $unbookmark = isset($_REQUEST['unbookmark']); |
| 18 | -$invalid_waypoints = isset($_REQUEST['invalidwp']) ? '&invalidwp='.urlencode($_REQUEST['invalidwp']) : ''; |
|
| 18 | +$invalid_waypoints = isset($_REQUEST['invalidwp']) ? '&invalidwp=' . urlencode($_REQUEST['invalidwp']) : ''; |
|
| 19 | 19 | |
| 20 | 20 | if ($id) { |
| 21 | 21 | $login->verify(); |
@@ -176,7 +176,7 @@ discard block |
||
| 176 | 176 | tpl_set_var('rating_message', mb_ereg_replace('{rating_msg}', $rating_msg, $rating_tpl)); |
| 177 | 177 | |
| 178 | 178 | if (isset($_POST['descMode'])) { |
| 179 | - $descMode = $_POST['descMode'] + 0; // Ocprop: 2 |
|
| 179 | + $descMode = $_POST['descMode'] + 0; // Ocprop: 2 |
|
| 180 | 180 | if (($descMode < 1) || ($descMode > 3)) { |
| 181 | 181 | $descMode = 3; |
| 182 | 182 | } |
@@ -434,7 +434,7 @@ discard block |
||
| 434 | 434 | tpl_set_var('logminute', htmlspecialchars($log_time_minute, ENT_COMPAT, 'UTF-8')); |
| 435 | 435 | tpl_set_var('cachename', htmlspecialchars($cache_name, ENT_COMPAT, 'UTF-8')); |
| 436 | 436 | tpl_set_var('cacheid', $log_record['cache_id']); |
| 437 | - tpl_set_var('reset', $reset); // obsolete |
|
| 437 | + tpl_set_var('reset', $reset); // obsolete |
|
| 438 | 438 | tpl_set_var('submit', $submit); |
| 439 | 439 | tpl_set_var('logid', $log_id); |
| 440 | 440 | tpl_set_var('date_message', !$date_ok ? $date_message : ''); |
@@ -28,7 +28,7 @@ |
||
| 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 />'); |
@@ -126,7 +126,7 @@ discard block |
||
| 126 | 126 | |
| 127 | 127 | // sql debugging |
| 128 | 128 | $sql_allow_debug = 0; |
| 129 | -$sql_debug_cryptkey = 'this is my very, very secret \'secret key\''; // min. 24 chars |
|
| 129 | +$sql_debug_cryptkey = 'this is my very, very secret \'secret key\''; // min. 24 chars |
|
| 130 | 130 | |
| 131 | 131 | // replacements for sql() |
| 132 | 132 | $sql_replacements['db'] = $dbname; |
@@ -148,7 +148,7 @@ discard block |
||
| 148 | 148 | |
| 149 | 149 | /* default locale |
| 150 | 150 | */ |
| 151 | -$opt['template']['default']['locale'] = 'DE'; // can be overwritten by $opt['domain'][<domain>]['locale'] |
|
| 151 | +$opt['template']['default']['locale'] = 'DE'; // can be overwritten by $opt['domain'][<domain>]['locale'] |
|
| 152 | 152 | |
| 153 | 153 | // include all locale settings |
| 154 | 154 | require_once $rootpath . 'config2/locale.inc.php'; |
@@ -117,11 +117,11 @@ |
||
| 117 | 117 | /* maximum number of failed logins per hour before that IP address is blocked |
| 118 | 118 | * (used to prevent brute-force-attacks) |
| 119 | 119 | */ |
| 120 | -$opt['page']['max_logins_per_hour'] = 1000; // for development ... |
|
| 120 | +$opt['page']['max_logins_per_hour'] = 1000; // for development ... |
|
| 121 | 121 | $opt['page']['headoverlay'] = 'oc_head_alpha3'; |
| 122 | 122 | |
| 123 | 123 | // data license |
| 124 | -$opt['logic']['license']['disclaimer'] = true; // also in lib2/settings-dist.inc.php |
|
| 124 | +$opt['logic']['license']['disclaimer'] = true; // also in lib2/settings-dist.inc.php |
|
| 125 | 125 | $opt['logic']['license']['terms'] = $absolute_server_URI . 'articles.php?page=impressum#datalicense'; |
| 126 | 126 | |
| 127 | 127 | $opt['logic']['admin']['listingadmin_notification'] = 'root'; |
@@ -680,7 +680,7 @@ |
||
| 680 | 680 | |
| 681 | 681 | $str = $translate->t($str, '', basename(__FILE__), __LINE__); |
| 682 | 682 | $args = func_get_args(); |
| 683 | - for ($nIndex = count($args) - 1; $nIndex > 0; $nIndex --) { |
|
| 683 | + for ($nIndex = count($args) - 1; $nIndex > 0; $nIndex--) { |
|
| 684 | 684 | $str = str_replace('%' . $nIndex, $args[$nIndex], $str); |
| 685 | 685 | } |
| 686 | 686 | |
@@ -7,10 +7,10 @@ |
||
| 7 | 7 | * common constant definitions of lib1 and lib2 |
| 8 | 8 | ***************************************************************************/ |
| 9 | 9 | |
| 10 | -define('GUI_HTML', 0); // also defined in lib/consts.inc.php |
|
| 10 | +define('GUI_HTML', 0); // also defined in lib/consts.inc.php |
|
| 11 | 11 | define('GUI_TEXT', 1); |
| 12 | 12 | |
| 13 | -define('HTTPS_DISABLED', 0); // also defined in lib/consts.inc.php |
|
| 13 | +define('HTTPS_DISABLED', 0); // also defined in lib/consts.inc.php |
|
| 14 | 14 | define('HTTPS_ENABLED', 1); |
| 15 | 15 | define('HTTPS_ENFORCED', 2); |
| 16 | 16 | |
@@ -18,7 +18,7 @@ |
||
| 18 | 18 | |
| 19 | 19 | // database names |
| 20 | 20 | $dbname = 'opencaching'; |
| 21 | -$tmpdbname = 'octmp'; // empty db with CREATE and DROP privileges |
|
| 21 | +$tmpdbname = 'octmp'; // empty db with CREATE and DROP privileges |
|
| 22 | 22 | |
| 23 | 23 | // common developer system settings |
| 24 | 24 | require 'settings-dev.inc.php'; |