| @@ -7,34 +7,34 @@ | ||
| 7 | 7 | * Common error messages | 
| 8 | 8 | ***************************************************************************/ | 
| 9 | 9 | |
| 10 | - define('ERROR_UNKNOWN', 1000); | |
| 11 | - define('ERROR_TEMPLATE_NOT_FOUND', 1001); | |
| 12 | - define('ERROR_COMPILATION_FAILED', 1002); | |
| 13 | - define('ERROR_NO_ACCESS', 1003); | |
| 14 | - define('ERROR_INVALID_OPERATION', 1004); | |
| 15 | - define('ERROR_LOGIN_REQUIRED', 1005); | |
| 16 | - define('ERROR_MAIL_TEMPLATE_NOT_FOUND', 1006); | |
| 17 | - define('ERROR_NO_COOKIES', 1007); | |
| 18 | - define('ERROR_ALREADY_LOGGEDIN', 1008); | |
| 19 | - define('ERROR_USER_NOT_ACTIVE', 1009); | |
| 20 | - define('ERROR_USER_NO_EMAIL', 1010); | |
| 21 | - define('ERROR_CACHE_NOT_PUBLISHED', 1011); | |
| 22 | - define('ERROR_CACHE_LOCKED', 1012); | |
| 10 | +    define('ERROR_UNKNOWN', 1000); | |
| 11 | +    define('ERROR_TEMPLATE_NOT_FOUND', 1001); | |
| 12 | +    define('ERROR_COMPILATION_FAILED', 1002); | |
| 13 | +    define('ERROR_NO_ACCESS', 1003); | |
| 14 | +    define('ERROR_INVALID_OPERATION', 1004); | |
| 15 | +    define('ERROR_LOGIN_REQUIRED', 1005); | |
| 16 | +    define('ERROR_MAIL_TEMPLATE_NOT_FOUND', 1006); | |
| 17 | +    define('ERROR_NO_COOKIES', 1007); | |
| 18 | +    define('ERROR_ALREADY_LOGGEDIN', 1008); | |
| 19 | +    define('ERROR_USER_NOT_ACTIVE', 1009); | |
| 20 | +    define('ERROR_USER_NO_EMAIL', 1010); | |
| 21 | +    define('ERROR_CACHE_NOT_PUBLISHED', 1011); | |
| 22 | +    define('ERROR_CACHE_LOCKED', 1012); | |
| 23 | 23 | |
| 24 | - define('ERROR_SEARCHPLUGIN_WAYPOINT_FORMAT', 1013); | |
| 25 | - define('ERROR_SEARCHPLUGIN_WAYPOINT_MANY', 1014); | |
| 26 | - define('ERROR_SEARCHPLUGIN_WAYPOINT_NOTFOUND', 1015); | |
| 24 | +    define('ERROR_SEARCHPLUGIN_WAYPOINT_FORMAT', 1013); | |
| 25 | +    define('ERROR_SEARCHPLUGIN_WAYPOINT_MANY', 1014); | |
| 26 | +    define('ERROR_SEARCHPLUGIN_WAYPOINT_NOTFOUND', 1015); | |
| 27 | 27 | |
| 28 | - define('ERROR_DB_COULD_NOT_RECONNECT', 1016); | |
| 29 | - define('ERROR_DB_NO_ROOT', 1017); | |
| 28 | +    define('ERROR_DB_COULD_NOT_RECONNECT', 1016); | |
| 29 | +    define('ERROR_DB_NO_ROOT', 1017); | |
| 30 | 30 | |
| 31 | - define('ERROR_USER_NOT_EXISTS', 1018); | |
| 32 | - define('ERROR_CACHE_NOT_EXISTS', 1019); | |
| 33 | - define('ERROR_CACHELOG_NOT_EXISTS', 1020); | |
| 34 | - define('ERROR_PICTURE_NOT_EXISTS', 1021); | |
| 31 | +    define('ERROR_USER_NOT_EXISTS', 1018); | |
| 32 | +    define('ERROR_CACHE_NOT_EXISTS', 1019); | |
| 33 | +    define('ERROR_CACHELOG_NOT_EXISTS', 1020); | |
| 34 | +    define('ERROR_PICTURE_NOT_EXISTS', 1021); | |
| 35 | 35 | |
| 36 | - define('ERROR_UPLOAD_ERR_NO_FILE', 1022); | |
| 37 | - define('ERROR_UPLOAD_ERR_SIZE', 1023); | |
| 38 | - define('ERROR_UPLOAD_ERR_TYPE', 1024); | |
| 39 | - define('ERROR_UPLOAD_UNKNOWN', 1025); | |
| 40 | - define('ERROR_UPLOAD_ERR_BAD_FORMAT', 1026); | |
| 36 | +    define('ERROR_UPLOAD_ERR_NO_FILE', 1022); | |
| 37 | +    define('ERROR_UPLOAD_ERR_SIZE', 1023); | |
| 38 | +    define('ERROR_UPLOAD_ERR_TYPE', 1024); | |
| 39 | +    define('ERROR_UPLOAD_UNKNOWN', 1025); | |
| 40 | +    define('ERROR_UPLOAD_ERR_BAD_FORMAT', 1026); | |
| @@ -33,7 +33,7 @@ discard block | ||
| 33 | 33 | 'DATA_LICENSE_URL' => $opt['page']['absolute_url'] . $opt['logic']['license']['terms'], | 
| 34 | 34 | 'DEBUG' => ($opt['debug'] & DEBUG_DEVELOPER != 0), | 
| 35 | 35 | 'DEBUG_PREVENT_SEMAPHORES' | 
| 36 | - => !$opt['php']['semaphores'], # not available on old developer system | |
| 36 | + => !$opt['php']['semaphores'], # not available on old developer system | |
| 37 | 37 | 'DB_SERVER' => $opt['db']['servername'], | 
| 38 | 38 | 'DB_NAME' => $opt['db']['placeholder']['db'], | 
| 39 | 39 | 'DB_USERNAME' => $opt['db']['username'], | 
| @@ -54,7 +54,7 @@ discard block | ||
| 54 | 54 | 'OC_NODE_ID' => $opt['logic']['node']['id'], | 
| 55 | 55 | 'OC_COOKIE_NAME' => $opt['session']['cookiename'] . 'data', | 
| 56 | 56 | 'OCDE_HTML_PURIFIER_SETTINGS' | 
| 57 | - => $opt['html_purifier'], | |
| 57 | + => $opt['html_purifier'], | |
| 58 | 58 | 'GITHUB_ACCESS_TOKEN' => $opt['okapi']['github_access_token'], | 
| 59 | 59 | ); | 
| 60 | 60 | } | 
| @@ -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. | 
| @@ -100,7 +100,7 @@ | ||
| 100 | 100 | 'SELECT COUNT(*) | 
| 101 | 101 | FROM `' . $table . '` | 
| 102 | 102 | WHERE ' . $this->getDateCondition($table, $dateField) . | 
| 103 | -                       ($andWhere ? ' AND (' . $andWhere . ')' : ''), | |
| 103 | +                        ($andWhere ? ' AND (' . $andWhere . ')' : ''), | |
| 104 | 104 | 0 | 
| 105 | 105 | ); | 
| 106 | 106 | self::message(1, $objectCount . ' ' . $description); | 
| @@ -11,7 +11,7 @@ | ||
| 11 | 11 | * language specific vars | 
| 12 | 12 | ****************************************************************************/ | 
| 13 | 13 | |
| 14 | - $error_wrong_node = t('this description was created on another Opencaching-webserver and can only be deleted there.'); | |
| 14 | +    $error_wrong_node = t('this description was created on another Opencaching-webserver and can only be deleted there.'); | |
| 15 | 15 | |
| 16 | - $commit = t('the cache description has been deleted'); | |
| 17 | - $commit_title = t('delete this cache-description'); | |
| 16 | +    $commit = t('the cache description has been deleted'); | |
| 17 | +    $commit_title = t('delete this cache-description'); | |
| @@ -314,7 +314,7 @@ | ||
| 314 | 314 | `text`='&4', | 
| 315 | 315 | `text_html`='&5', | 
| 316 | 316 | `text_htmledit`='&6'" . | 
| 317 | - ($log_type == cachelog::LOGTYPE_ACTIVE ? $cache_ok_sql : "") . " | |
| 317 | + ($log_type == cachelog::LOGTYPE_ACTIVE ? $cache_ok_sql : "") . " | |
| 318 | 318 | WHERE `id`='&7'", | 
| 319 | 319 | $log_type, | 
| 320 | 320 | $oc_team_comment, | 
| @@ -86,7 +86,7 @@ | ||
| 86 | 86 | |
| 87 | 87 | $db['debug'] = (($opt['debug'] & DEBUG_SQLDEBUGGER) == DEBUG_SQLDEBUGGER); | 
| 88 | 88 |  if ($db['debug'] === true) { | 
| 89 | - require_once __DIR__ . '/sqldebugger.class.php'; | |
| 89 | + require_once __DIR__ . '/sqldebugger.class.php'; | |
| 90 | 90 | } | 
| 91 | 91 | |
| 92 | 92 | |
| @@ -190,14 +190,14 @@ | ||
| 190 | 190 | $tpl->assign( | 
| 191 | 191 | 'other_report_in_progress', | 
| 192 | 192 | sql_value( | 
| 193 | - "SELECT `id` | |
| 193 | + "SELECT `id` | |
| 194 | 194 | FROM `cache_reports` | 
| 195 | 195 | WHERE `cacheid`='&1' AND `id`<>'&2' AND `status`='&3' | 
| 196 | 196 | LIMIT 1", | 
| 197 | - null, | |
| 198 | - $record['cacheid'], | |
| 199 | - $record['id'], | |
| 200 | - CACHE_REPORT_INPROGRESS | |
| 197 | + null, | |
| 198 | + $record['cacheid'], | |
| 199 | + $record['id'], | |
| 200 | + CACHE_REPORT_INPROGRESS | |
| 201 | 201 | ) !== null | 
| 202 | 202 | ); | 
| 203 | 203 | |