@@ -91,28 +91,28 @@ |
||
| 91 | 91 | |
| 92 | 92 | $allowed_logtypes = []; |
| 93 | 93 | if ($owner || $admin_report || $admin_locked) { |
| 94 | - $allowed_logtypes[] = 3; // note |
|
| 94 | + $allowed_logtypes[] = 3; // note |
|
| 95 | 95 | } |
| 96 | 96 | if (($owner && $statuslogs) || $admin_report) { |
| 97 | 97 | if ($cache_status != 5 && (($cache_status != 4 && $cache_status != 7) || $admin_report)) { |
| 98 | - $allowed_logtypes[] = 10; // ready for search |
|
| 99 | - $allowed_logtypes[] = 11; // temporarily not available |
|
| 100 | - $allowed_logtypes[] = 9; // archived |
|
| 101 | - $allowed_logtypes[] = 13; // locked |
|
| 98 | + $allowed_logtypes[] = 10; // ready for search |
|
| 99 | + $allowed_logtypes[] = 11; // temporarily not available |
|
| 100 | + $allowed_logtypes[] = 9; // archived |
|
| 101 | + $allowed_logtypes[] = 13; // locked |
|
| 102 | 102 | } |
| 103 | 103 | if ($admin_report || $old_logtype == 14) { |
| 104 | 104 | $allowed_logtypes[] = 14; |
| 105 | 105 | } // locked, invisible |
| 106 | 106 | } |
| 107 | 107 | if ($cache_type == 6) { // event |
| 108 | - $allowed_logtypes[] = 8; // will attend |
|
| 109 | - $allowed_logtypes[] = 7; // attended |
|
| 108 | + $allowed_logtypes[] = 8; // will attend |
|
| 109 | + $allowed_logtypes[] = 7; // attended |
|
| 110 | 110 | } else { |
| 111 | - $allowed_logtypes[] = 1; // found |
|
| 112 | - $allowed_logtypes[] = 2; // not found |
|
| 111 | + $allowed_logtypes[] = 1; // found |
|
| 112 | + $allowed_logtypes[] = 2; // not found |
|
| 113 | 113 | } |
| 114 | 114 | if (!($owner || $admin_report || $admin_locked)) { |
| 115 | - $allowed_logtypes[] = 3; // note |
|
| 115 | + $allowed_logtypes[] = 3; // note |
|
| 116 | 116 | } |
| 117 | 117 | |
| 118 | 118 | // always allow to keep the existing logtype when the log is edited by an admin |
@@ -444,9 +444,9 @@ |
||
| 444 | 444 | } |
| 445 | 445 | |
| 446 | 446 | // restore picture file |
| 447 | - $this->setUrl($original_url); // set the url, so that we can |
|
| 448 | - $filename = $this->getFilename(); // .. retreive the file path+name |
|
| 449 | - $this->setFilenames($filename); // now set url(s) from the new uuid |
|
| 447 | + $this->setUrl($original_url); // set the url, so that we can |
|
| 448 | + $filename = $this->getFilename(); // .. retreive the file path+name |
|
| 449 | + $this->setFilenames($filename); // now set url(s) from the new uuid |
|
| 450 | 450 | try { |
| 451 | 451 | rename($this->deleted_filename($filename), $this->getFilename()); |
| 452 | 452 | } catch (Exception $e) { |
@@ -22,7 +22,7 @@ |
||
| 22 | 22 | |
| 23 | 23 | public $compile_id = null; |
| 24 | 24 | |
| 25 | - public $cache_id = null; // This is a smarty caching ID, not a caches.cache_id. |
|
| 25 | + public $cache_id = null; // This is a smarty caching ID, not a caches.cache_id. |
|
| 26 | 26 | |
| 27 | 27 | public $title = ''; |
| 28 | 28 | |
@@ -12,7 +12,7 @@ |
||
| 12 | 12 | |
| 13 | 13 | public $sAutoIncrementField = null; |
| 14 | 14 | |
| 15 | - public $pk; // (idx:name; type, default, nullable, value, insertfunction) |
|
| 15 | + public $pk; // (idx:name; type, default, nullable, value, insertfunction) |
|
| 16 | 16 | |
| 17 | 17 | public $fields; // (idx:name; type, default, nullable, value, changed, insertfunction) |
| 18 | 18 | |
@@ -20,13 +20,13 @@ |
||
| 20 | 20 | * |
| 21 | 21 | ***************************************************************************/ |
| 22 | 22 | |
| 23 | -define('LOGIN_UNKNOWN_ERROR', -1); // unkown error occured |
|
| 24 | -define('LOGIN_OK', 0); // login succeeded |
|
| 25 | -define('LOGIN_BADUSERPW', 1); // bad username or password |
|
| 26 | -define('LOGIN_TOOMUCHLOGINS', 2); // too many logins in short time |
|
| 27 | -define('LOGIN_USERNOTACTIVE', 3); // the useraccount locked |
|
| 23 | +define('LOGIN_UNKNOWN_ERROR', -1); // unkown error occured |
|
| 24 | +define('LOGIN_OK', 0); // login succeeded |
|
| 25 | +define('LOGIN_BADUSERPW', 1); // bad username or password |
|
| 26 | +define('LOGIN_TOOMUCHLOGINS', 2); // too many logins in short time |
|
| 27 | +define('LOGIN_USERNOTACTIVE', 3); // the useraccount locked |
|
| 28 | 28 | define('LOGIN_EMPTY_USERPASSWORD', 4); // given username/password was empty |
| 29 | -define('LOGIN_LOGOUT_OK', 5); // logout was successfull |
|
| 29 | +define('LOGIN_LOGOUT_OK', 5); // logout was successfull |
|
| 30 | 30 | |
| 31 | 31 | // login times in seconds |
| 32 | 32 | define('LOGIN_TIME', 60 * 60); |
@@ -390,7 +390,7 @@ discard block |
||
| 390 | 390 | $thislog = mb_ereg_replace('{username}', text_xmlentities($rLog['username']), $thislog); |
| 391 | 391 | |
| 392 | 392 | if ($rLog['type'] == 3 && $rLog['needs_maintenance'] == 2) { |
| 393 | - $logtype = 'Needs Maintenance'; // with capital M, other than cache attribute |
|
| 393 | + $logtype = 'Needs Maintenance'; // with capital M, other than cache attribute |
|
| 394 | 394 | } elseif (isset($gpxLogType[$rLog['type']])) { |
| 395 | 395 | $logtype = $gpxLogType[$rLog['type']]; |
| 396 | 396 | } else { |
@@ -511,22 +511,22 @@ discard block |
||
| 511 | 511 | switch ($childWaypoint['type']) { |
| 512 | 512 | case 1: |
| 513 | 513 | $wp_typename = 'Parking Area'; |
| 514 | - break; // well-known garmin symbols |
|
| 514 | + break; // well-known garmin symbols |
|
| 515 | 515 | case 2: |
| 516 | 516 | $wp_typename = 'Flag, Green'; |
| 517 | - break; // stage / ref point |
|
| 517 | + break; // stage / ref point |
|
| 518 | 518 | case 3: |
| 519 | 519 | $wp_typename = 'Flag, Blue'; |
| 520 | - break; // path |
|
| 520 | + break; // path |
|
| 521 | 521 | case 4: |
| 522 | 522 | $wp_typename = 'Circle with X'; |
| 523 | 523 | break; // final |
| 524 | 524 | case 5: |
| 525 | 525 | $wp_typename = 'Diamond, Green'; |
| 526 | - break; // point of interest |
|
| 526 | + break; // point of interest |
|
| 527 | 527 | default: |
| 528 | 528 | $wp_typename = 'Flag, Blue'; |
| 529 | - break; // for the case new types are forgotten here .. |
|
| 529 | + break; // for the case new types are forgotten here .. |
|
| 530 | 530 | } |
| 531 | 531 | $thiswp = mb_ereg_replace('{type}', text_xmlentities($wp_typename), $thiswp); |
| 532 | 532 | $thiswp = mb_ereg_replace('{parent}', $r['waypoint'], $thiswp); |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | $tpl->cache_lifetime = 900; |
| 70 | 70 | $tpl->cache_id = $exclude_country; |
| 71 | 71 | $logcount = 250; |
| 72 | - $paging = false; // paging would have poor performance for all logs |
|
| 72 | + $paging = false; // paging would have poor performance for all logs |
|
| 73 | 73 | $orderByDate = $logselection == 3 ? '{fromtable}.`order_date` DESC, ' : ''; |
| 74 | 74 | } else { |
| 75 | 75 | // latest logs for all countries or for one country |
@@ -88,7 +88,7 @@ discard block |
||
| 88 | 88 | $tpl->cache_lifetime = 300; |
| 89 | 89 | $tpl->cache_id = $country; |
| 90 | 90 | $logcount = 250; |
| 91 | - $paging = false; // paging would have poor performance for all logs |
|
| 91 | + $paging = false; // paging would have poor performance for all logs |
|
| 92 | 92 | $orderByDate = $logselection == 3 ? '{fromtable}.`order_date` DESC, ' : ''; |
| 93 | 93 | $optimize_for_latest_logs = ($country == '' || $country == $opt['page']['main_country']); |
| 94 | 94 | } |
@@ -9,7 +9,7 @@ |
||
| 9 | 9 | * |
| 10 | 10 | * @return int |
| 11 | 11 | */ |
| 12 | -function smarty_function_rand(array $params, \OcSmarty &$smarty) |
|
| 12 | +function smarty_function_rand(array $params, \OcSmarty & $smarty) |
|
| 13 | 13 | { |
| 14 | 14 | $min = isset($params['min']) ? $params['min'] + 0 : 0; |
| 15 | 15 | $max = isset($params['max']) ? $params['max'] + 0 : 0; |
@@ -57,7 +57,7 @@ |
||
| 57 | 57 | * |
| 58 | 58 | * @return string |
| 59 | 59 | */ |
| 60 | -function smarty_block_t(array $params, $text, \OcSmarty &$smarty, &$repeat) |
|
| 60 | +function smarty_block_t(array $params, $text, \OcSmarty & $smarty, &$repeat) |
|
| 61 | 61 | { |
| 62 | 62 | global $opt; |
| 63 | 63 | |