@@ -112,7 +112,8 @@ |
||
| 112 | 112 | $emailadr |
| 113 | 113 | ); |
| 114 | 114 | } else { |
| 115 | - if ($bounced) { // maximum one bounce per day is counted, to filter out temporary problems |
|
| 115 | + if ($bounced) { |
|
| 116 | +// maximum one bounce per day is counted, to filter out temporary problems |
|
| 116 | 117 | sql( |
| 117 | 118 | "UPDATE `user` SET `email_problems`=`email_problems`+1, `last_email_problem`='&2' |
| 118 | 119 | WHERE `email`='&1' AND IFNULL(`last_email_problem`,'') < '&2'", |
@@ -39,7 +39,8 @@ |
||
| 39 | 39 | } elseif ($action == 'delete') { |
| 40 | 40 | $queryid = isset($_REQUEST['queryid']) ? $_REQUEST['queryid'] + 0 : 0; |
| 41 | 41 | deletequery($queryid); |
| 42 | -} else { // default: view |
|
| 42 | +} else { |
|
| 43 | +// default: view |
|
| 43 | 44 | viewqueries(); |
| 44 | 45 | } |
| 45 | 46 | |
@@ -32,7 +32,8 @@ discard block |
||
| 32 | 32 | $cacheId = 0; |
| 33 | 33 | if (isset($_REQUEST['wp'])) { |
| 34 | 34 | $cacheId = cache::cacheIdFromWP($_REQUEST['wp']); |
| 35 | -} elseif (isset($_REQUEST['cacheid'])) { // Ocprop |
|
| 35 | +} elseif (isset($_REQUEST['cacheid'])) { |
|
| 36 | +// Ocprop |
|
| 36 | 37 | $cacheId = $_REQUEST['cacheid']; |
| 37 | 38 | } |
| 38 | 39 | |
@@ -217,7 +218,8 @@ discard block |
||
| 217 | 218 | $validate['duplicateLog'] = true; |
| 218 | 219 | |
| 219 | 220 | // all checks done, no error => log |
| 220 | - if (isset($_POST['submitform']) && $loggable) { // Ocprop |
|
| 221 | + if (isset($_POST['submitform']) && $loggable) { |
|
| 222 | +// Ocprop |
|
| 221 | 223 | /* |
| 222 | 224 | * check if time is logged |
| 223 | 225 | * set seconds 00:00:01, means "00:00 was logged" |
@@ -21,7 +21,8 @@ discard block |
||
| 21 | 21 | // check for old-style parameters |
| 22 | 22 | if (isset($_REQUEST['cacheid']) && |
| 23 | 23 | isset($_REQUEST['desclang']) && |
| 24 | - !isset($_REQUEST['descid'])) { // Ocprop |
|
| 24 | + !isset($_REQUEST['descid'])) { |
|
| 25 | +// Ocprop |
|
| 25 | 26 | |
| 26 | 27 | $cache_id = $_REQUEST['cacheid']; // Ocprop |
| 27 | 28 | $desc_lang = $_REQUEST['desclang']; // Ocprop |
@@ -88,7 +89,8 @@ discard block |
||
| 88 | 89 | $show_all_langs = false; |
| 89 | 90 | |
| 90 | 91 | //save to DB? |
| 91 | - if (isset($_POST['post'])) { // Ocprop |
|
| 92 | + if (isset($_POST['post'])) { |
|
| 93 | +// Ocprop |
|
| 92 | 94 | //here we read all used information from the form if submitted |
| 93 | 95 | $descMode = isset($_POST['descMode']) ? $_POST['descMode'] + 0 : 1; // Ocprop |
| 94 | 96 | |
@@ -147,7 +149,8 @@ discard block |
||
| 147 | 149 | |
| 148 | 150 | $desc = processEditorInput($oldDescMode, $descMode, $desc); |
| 149 | 151 | |
| 150 | - if (isset($_POST['submitform'])) { // Ocprop |
|
| 152 | + if (isset($_POST['submitform'])) { |
|
| 153 | +// Ocprop |
|
| 151 | 154 | // prüfen, ob sprache nicht schon vorhanden |
| 152 | 155 | $rs = sql( |
| 153 | 156 | "SELECT COUNT(*) `count` |
@@ -106,7 +106,8 @@ discard block |
||
| 106 | 106 | tpl_set_var('short_desc', htmlspecialchars($short_desc, ENT_COMPAT, 'UTF-8')); |
| 107 | 107 | |
| 108 | 108 | // descMode auslesen, falls nicht gesetzt aus dem Profil laden |
| 109 | - if (isset($_POST['descMode'])) {// Ocprop |
|
| 109 | + if (isset($_POST['descMode'])) { |
|
| 110 | +// Ocprop |
|
| 110 | 111 | $descMode = $_POST['descMode'] + 0; |
| 111 | 112 | if (($descMode < 1) || ($descMode > 3)) { |
| 112 | 113 | $descMode = 3; |
@@ -569,7 +570,8 @@ discard block |
||
| 569 | 570 | |
| 570 | 571 | tpl_set_var('firstcache_note', mb_ereg_replace('%1', $opt['page']['sitename'], $firstcache_note)); |
| 571 | 572 | |
| 572 | - if (isset($_POST['submitform'])) { // Ocprop |
|
| 573 | + if (isset($_POST['submitform'])) { |
|
| 574 | +// Ocprop |
|
| 573 | 575 | // check the entered data |
| 574 | 576 | |
| 575 | 577 | // check coordinates |
@@ -76,7 +76,8 @@ discard block |
||
| 76 | 76 | if ($error == false) { |
| 77 | 77 | //cacheid |
| 78 | 78 | $cache_id = 0; |
| 79 | - if (isset($_REQUEST['cacheid'])) { // Ocprop |
|
| 79 | + if (isset($_REQUEST['cacheid'])) { |
|
| 80 | +// Ocprop |
|
| 80 | 81 | $cache_id = $_REQUEST['cacheid']; |
| 81 | 82 | } |
| 82 | 83 | |
@@ -196,7 +197,8 @@ discard block |
||
| 196 | 197 | $way_length = isset($_POST['way_length']) ? $_POST['way_length'] : $cache_record['way_length']; |
| 197 | 198 | |
| 198 | 199 | if ($status_old == 5 && $status == 5) { |
| 199 | - if (isset($_POST['publish'])) { // Ocprop |
|
| 200 | + if (isset($_POST['publish'])) { |
|
| 201 | +// Ocprop |
|
| 200 | 202 | $publish = $_POST['publish']; |
| 201 | 203 | if (!($publish == 'now' || $publish == 'later' || $publish == 'notnow')) { |
| 202 | 204 | // somebody messed up the POST-data, so we do not publish the cache, since he isn't published right now (status=5) |
@@ -226,7 +228,8 @@ discard block |
||
| 226 | 228 | $status = $status_old; |
| 227 | 229 | } |
| 228 | 230 | |
| 229 | - if ($status_old == 7) { // cache is locked |
|
| 231 | + if ($status_old == 7) { |
|
| 232 | +// cache is locked |
|
| 230 | 233 | // only admins can change status of locked caches |
| 231 | 234 | if (($bAdmin & ADMIN_USER) != ADMIN_USER) { |
| 232 | 235 | // no status change allowed for normal user |
@@ -434,7 +437,8 @@ discard block |
||
| 434 | 437 | } |
| 435 | 438 | |
| 436 | 439 | //try to save to DB? |
| 437 | - if (isset($_POST['submit'])) { // Ocprop |
|
| 440 | + if (isset($_POST['submit'])) { |
|
| 441 | +// Ocprop |
|
| 438 | 442 | // all validations ok? |
| 439 | 443 | if (!( |
| 440 | 444 | $hidden_date_not_ok || $lat_not_ok || $lon_not_ok || $name_not_ok || |
@@ -917,7 +921,8 @@ discard block |
||
| 917 | 921 | tpl_set_var('statuschange', $status_old == 5 ? '' : mb_ereg_replace('%1', $cache_id, $status_change)); |
| 918 | 922 | |
| 919 | 923 | // show activation form? |
| 920 | - if ($status_old == 5) { // status = not yet published |
|
| 924 | + if ($status_old == 5) { |
|
| 925 | +// status = not yet published |
|
| 921 | 926 | $tmp = $activation_form; |
| 922 | 927 | |
| 923 | 928 | $tmp = mb_ereg_replace( |
@@ -27,7 +27,8 @@ |
||
| 27 | 27 | $for_cachedesc, |
| 28 | 28 | $html, |
| 29 | 29 | $twolines = false |
| 30 | -) { |
|
| 30 | +) |
|
| 31 | +{ |
|
| 31 | 32 | global $opt, $translate; |
| 32 | 33 | |
| 33 | 34 | $ltext = ""; |
@@ -145,10 +145,11 @@ discard block |
||
| 145 | 145 | <td><strong>{t}Language:{/t} </strong></td> |
| 146 | 146 | <td> |
| 147 | 147 | <?php |
| 148 | - foreach ($opt['template']['locales'] AS $k => $lang) |
|
| 149 | - if ($lang['status'] == OC_LOCALE_ACTIVE) |
|
| 148 | + foreach ($opt['template']['locales'] AS $k => $lang) { |
|
| 149 | + if ($lang['status'] == OC_LOCALE_ACTIVE) |
|
| 150 | 150 | echo '<a style="text-decoration: none;" href="index.php?locale=' . $k . '"><img src="' . $lang['flag'] . '" alt="' . $lang['name'] . '" title="' . $lang['name'] . '" width="24px" height="18px" /></a> '; |
| 151 | -?> |
|
| 151 | + } |
|
| 152 | + ?> |
|
| 152 | 153 | </td> |
| 153 | 154 | <td> <strong>{t}Country:{/t} </strong></td> |
| 154 | 155 | <td> |
@@ -157,10 +158,8 @@ discard block |
||
| 157 | 158 | global $tpl_usercountries; |
| 158 | 159 | $nLastGroup = 0; |
| 159 | 160 | $maxUserCountries = count($tpl_usercountries); |
| 160 | - for ($i = 0; $i < $maxUserCountries; $i++) |
|
| 161 | - { |
|
| 162 | - if ($nLastGroup != $tpl_usercountries[$i]['group']) |
|
| 163 | - { |
|
| 161 | + for ($i = 0; $i < $maxUserCountries; $i++) { |
|
| 162 | + if ($nLastGroup != $tpl_usercountries[$i]['group']) { |
|
| 164 | 163 | echo '<option disabled="disabled">'; |
| 165 | 164 | if ($tpl_usercountries[$i]['group'] == 1) { |
| 166 | 165 | echo '- ' . t('This OC node') . ' -'; |
@@ -205,11 +204,12 @@ discard block |
||
| 205 | 204 | <ul> |
| 206 | 205 | <?php |
| 207 | 206 | // $pageidx is -1 e.g. when calling newcache.php as logged-off-user (-> login.tpl.php) |
| 208 | - if ($pageidx >= 0) |
|
| 209 | - mnu_EchoMainMenu($menu[$pageidx]['siteid']); |
|
| 210 | - else |
|
| 211 | - mnu_EchoMainMenu(-1); |
|
| 212 | -?> |
|
| 207 | + if ($pageidx >= 0) { |
|
| 208 | + mnu_EchoMainMenu($menu[$pageidx]['siteid']); |
|
| 209 | + } else { |
|
| 210 | + mnu_EchoMainMenu(-1); |
|
| 211 | + } |
|
| 212 | + ?> |
|
| 213 | 213 | </ul> |
| 214 | 214 | </div> |
| 215 | 215 | |
@@ -228,8 +228,7 @@ discard block |
||
| 228 | 228 | <div class="nav3"> |
| 229 | 229 | <?php |
| 230 | 230 | //SubNavigation |
| 231 | - if (isset($menu[$pageidx]['submenu'])) |
|
| 232 | - { |
|
| 231 | + if (isset($menu[$pageidx]['submenu'])) { |
|
| 233 | 232 | ?> |
| 234 | 233 | <ul> |
| 235 | 234 | <li class="title">{t}Main menu{/t}</li> |
@@ -257,8 +256,7 @@ discard block |
||
| 257 | 256 | |
| 258 | 257 | <!-- Paypalbutton --> |
| 259 | 258 | <?php |
| 260 | - if (isset($opt['page']['showdonations']) && $opt['page']['showdonations']) |
|
| 261 | - { |
|
| 259 | + if (isset($opt['page']['showdonations']) && $opt['page']['showdonations']) { |
|
| 262 | 260 | ?> |
| 263 | 261 | <p class="sidebar-maintitle">{t}Donations{/t}</p> |
| 264 | 262 | <div style="margin-top:16px;width:100%;text-align:center;"> |
@@ -273,8 +271,7 @@ discard block |
||
| 273 | 271 | |
| 274 | 272 | <!-- Social Media --> |
| 275 | 273 | <?php |
| 276 | - if (isset($opt['page']['showsocialmedia']) && $opt['page']['showsocialmedia']) |
|
| 277 | - { |
|
| 274 | + if (isset($opt['page']['showsocialmedia']) && $opt['page']['showsocialmedia']) { |
|
| 278 | 275 | ?> |
| 279 | 276 | <p class="sidebar-maintitle">{t}Social media{/t}</p> |
| 280 | 277 | <div style="margin-top: 10px; margin-bottom: 14px; margin-left: auto; margin-right: auto; text-align: center"> |