@@ -29,12 +29,12 @@ |
||
| 29 | 29 | } |
| 30 | 30 | |
| 31 | 31 | switch ($action) { |
| 32 | - case 'addignore': |
|
| 33 | - sql("INSERT IGNORE INTO `cache_ignore` (`cache_id`, `user_id`) VALUES ('&1', '&2')", $cache_id, $login->userid); |
|
| 34 | - break; |
|
| 35 | - case 'removeignore': |
|
| 36 | - sql("DELETE FROM `cache_ignore` WHERE `cache_id`='&1' AND `user_id`='&2'", $cache_id, $login->userid); |
|
| 37 | - break; |
|
| 32 | + case 'addignore': |
|
| 33 | + sql("INSERT IGNORE INTO `cache_ignore` (`cache_id`, `user_id`) VALUES ('&1', '&2')", $cache_id, $login->userid); |
|
| 34 | + break; |
|
| 35 | + case 'removeignore': |
|
| 36 | + sql("DELETE FROM `cache_ignore` WHERE `cache_id`='&1' AND `user_id`='&2'", $cache_id, $login->userid); |
|
| 37 | + break; |
|
| 38 | 38 | } |
| 39 | 39 | |
| 40 | 40 | // clear cached map result, so that the change directly appears on the map |
@@ -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. |
@@ -86,83 +86,83 @@ discard block |
||
| 86 | 86 | } |
| 87 | 87 | |
| 88 | 88 | switch ($action) { |
| 89 | - case 'selectlang': |
|
| 90 | - break; |
|
| 89 | + case 'selectlang': |
|
| 90 | + break; |
|
| 91 | 91 | |
| 92 | - case 'verify': |
|
| 93 | - verify(); |
|
| 94 | - break; |
|
| 92 | + case 'verify': |
|
| 93 | + verify(); |
|
| 94 | + break; |
|
| 95 | 95 | |
| 96 | - case 'resetids': |
|
| 97 | - resetIds(); |
|
| 98 | - break; |
|
| 96 | + case 'resetids': |
|
| 97 | + resetIds(); |
|
| 98 | + break; |
|
| 99 | 99 | |
| 100 | - case 'clearcache': |
|
| 101 | - clearCache(); |
|
| 102 | - break; |
|
| 100 | + case 'clearcache': |
|
| 101 | + clearCache(); |
|
| 102 | + break; |
|
| 103 | 103 | |
| 104 | - case 'export': |
|
| 105 | - export(); |
|
| 106 | - break; |
|
| 104 | + case 'export': |
|
| 105 | + export(); |
|
| 106 | + break; |
|
| 107 | 107 | |
| 108 | - case 'xmlexport': |
|
| 109 | - xmlexport(); |
|
| 110 | - break; |
|
| 108 | + case 'xmlexport': |
|
| 109 | + xmlexport(); |
|
| 110 | + break; |
|
| 111 | 111 | |
| 112 | - case 'xmlimport': |
|
| 113 | - break; |
|
| 112 | + case 'xmlimport': |
|
| 113 | + break; |
|
| 114 | 114 | |
| 115 | - case 'xmlimport2': |
|
| 116 | - xmlimport2(); |
|
| 117 | - break; |
|
| 115 | + case 'xmlimport2': |
|
| 116 | + xmlimport2(); |
|
| 117 | + break; |
|
| 118 | 118 | |
| 119 | - case 'xmlimport3': |
|
| 120 | - xmlimport3(); |
|
| 121 | - break; |
|
| 119 | + case 'xmlimport3': |
|
| 120 | + xmlimport3(); |
|
| 121 | + break; |
|
| 122 | 122 | |
| 123 | - case 'textexportnew': |
|
| 124 | - textexport($translang, false); |
|
| 125 | - break; |
|
| 123 | + case 'textexportnew': |
|
| 124 | + textexport($translang, false); |
|
| 125 | + break; |
|
| 126 | 126 | |
| 127 | - case 'textexportall': |
|
| 128 | - textexport($translang, true); |
|
| 129 | - break; |
|
| 127 | + case 'textexportall': |
|
| 128 | + textexport($translang, true); |
|
| 129 | + break; |
|
| 130 | 130 | |
| 131 | - case 'textimport': |
|
| 132 | - break; |
|
| 131 | + case 'textimport': |
|
| 132 | + break; |
|
| 133 | 133 | |
| 134 | - case 'textimport2': |
|
| 135 | - textimport($translang); |
|
| 136 | - break; |
|
| 134 | + case 'textimport2': |
|
| 135 | + textimport($translang); |
|
| 136 | + break; |
|
| 137 | 137 | |
| 138 | - case 'edit': |
|
| 139 | - if (!$access->mayTranslate($translang)) { |
|
| 140 | - $tpl->error(ERROR_NO_ACCESS); |
|
| 141 | - } |
|
| 142 | - edit(); |
|
| 143 | - break; |
|
| 138 | + case 'edit': |
|
| 139 | + if (!$access->mayTranslate($translang)) { |
|
| 140 | + $tpl->error(ERROR_NO_ACCESS); |
|
| 141 | + } |
|
| 142 | + edit(); |
|
| 143 | + break; |
|
| 144 | 144 | |
| 145 | - case 'copy_en': |
|
| 146 | - copy_english_texts(); |
|
| 147 | - break; |
|
| 145 | + case 'copy_en': |
|
| 146 | + copy_english_texts(); |
|
| 147 | + break; |
|
| 148 | 148 | |
| 149 | - case 'listfaults': |
|
| 150 | - $trans = sql( |
|
| 151 | - 'SELECT `sys_trans`.`id`, |
|
| 149 | + case 'listfaults': |
|
| 150 | + $trans = sql( |
|
| 151 | + 'SELECT `sys_trans`.`id`, |
|
| 152 | 152 | `sys_trans`.`text` |
| 153 | 153 | FROM `sys_trans` |
| 154 | 154 | LEFT JOIN `sys_trans_ref` |
| 155 | 155 | ON `sys_trans`.`id`=`sys_trans_ref`.`trans_id` |
| 156 | 156 | WHERE ISNULL(`sys_trans_ref`.`trans_id`) |
| 157 | 157 | ORDER BY `sys_trans`.`id` DESC' |
| 158 | - ); |
|
| 159 | - $tpl->assign_rs('trans', $trans); |
|
| 160 | - sql_free_result($trans); |
|
| 161 | - break; |
|
| 158 | + ); |
|
| 159 | + $tpl->assign_rs('trans', $trans); |
|
| 160 | + sql_free_result($trans); |
|
| 161 | + break; |
|
| 162 | 162 | |
| 163 | - case 'listall': |
|
| 164 | - $trans = sql( |
|
| 165 | - "SELECT `sys_trans`.`id`, |
|
| 163 | + case 'listall': |
|
| 164 | + $trans = sql( |
|
| 165 | + "SELECT `sys_trans`.`id`, |
|
| 166 | 166 | `sys_trans`.`text`, |
| 167 | 167 | `sys_trans_text`.`text` AS `trans` |
| 168 | 168 | FROM `sys_trans` |
@@ -170,48 +170,48 @@ discard block |
||
| 170 | 170 | ON `sys_trans`.`id`=`sys_trans_text`.`trans_id` |
| 171 | 171 | AND `sys_trans_text`.`lang`='&1' |
| 172 | 172 | ORDER BY `sys_trans`.`id` DESC", |
| 173 | - $translang |
|
| 174 | - ); |
|
| 175 | - $tpl->assign_rs('trans', $trans); |
|
| 176 | - sql_free_result($trans); |
|
| 177 | - break; |
|
| 173 | + $translang |
|
| 174 | + ); |
|
| 175 | + $tpl->assign_rs('trans', $trans); |
|
| 176 | + sql_free_result($trans); |
|
| 177 | + break; |
|
| 178 | 178 | |
| 179 | - case 'remove': |
|
| 180 | - if (!$access->mayTranslate($translang)) { |
|
| 181 | - $tpl->error(ERROR_NO_ACCESS); |
|
| 182 | - } |
|
| 183 | - remove(); |
|
| 184 | - break; |
|
| 185 | - |
|
| 186 | - case 'scan': |
|
| 187 | - scan(); |
|
| 188 | - break; |
|
| 189 | - |
|
| 190 | - case 'scanstart': |
|
| 191 | - scanStart(); |
|
| 192 | - break; |
|
| 193 | - |
|
| 194 | - case 'scanfile': |
|
| 195 | - $filename = isset($_REQUEST['filename']) ? $_REQUEST['filename'] : ''; |
|
| 196 | - scanFile($filename); |
|
| 197 | - exit; |
|
| 198 | - |
|
| 199 | - case 'quicknone': |
|
| 200 | - $cookie->un_set('translate_mode'); |
|
| 201 | - break; |
|
| 202 | - |
|
| 203 | - case 'quicknew': |
|
| 204 | - $cookie->set('translate_mode', 'new'); |
|
| 205 | - break; |
|
| 206 | - |
|
| 207 | - case 'quickall': |
|
| 208 | - $cookie->set('translate_mode', 'all'); |
|
| 209 | - break; |
|
| 210 | - |
|
| 211 | - default: |
|
| 212 | - $action = 'listnew'; |
|
| 213 | - $trans = sql( |
|
| 214 | - "SELECT DISTINCT `sys_trans`.`id`, |
|
| 179 | + case 'remove': |
|
| 180 | + if (!$access->mayTranslate($translang)) { |
|
| 181 | + $tpl->error(ERROR_NO_ACCESS); |
|
| 182 | + } |
|
| 183 | + remove(); |
|
| 184 | + break; |
|
| 185 | + |
|
| 186 | + case 'scan': |
|
| 187 | + scan(); |
|
| 188 | + break; |
|
| 189 | + |
|
| 190 | + case 'scanstart': |
|
| 191 | + scanStart(); |
|
| 192 | + break; |
|
| 193 | + |
|
| 194 | + case 'scanfile': |
|
| 195 | + $filename = isset($_REQUEST['filename']) ? $_REQUEST['filename'] : ''; |
|
| 196 | + scanFile($filename); |
|
| 197 | + exit; |
|
| 198 | + |
|
| 199 | + case 'quicknone': |
|
| 200 | + $cookie->un_set('translate_mode'); |
|
| 201 | + break; |
|
| 202 | + |
|
| 203 | + case 'quicknew': |
|
| 204 | + $cookie->set('translate_mode', 'new'); |
|
| 205 | + break; |
|
| 206 | + |
|
| 207 | + case 'quickall': |
|
| 208 | + $cookie->set('translate_mode', 'all'); |
|
| 209 | + break; |
|
| 210 | + |
|
| 211 | + default: |
|
| 212 | + $action = 'listnew'; |
|
| 213 | + $trans = sql( |
|
| 214 | + "SELECT DISTINCT `sys_trans`.`id`, |
|
| 215 | 215 | `sys_trans`.`text` |
| 216 | 216 | FROM `sys_trans` |
| 217 | 217 | LEFT JOIN `sys_trans_text` |
@@ -222,10 +222,10 @@ discard block |
||
| 222 | 222 | WHERE ISNULL(`sys_trans_text`.`trans_id`) |
| 223 | 223 | OR `sys_trans_text`.`text`='' |
| 224 | 224 | ORDER BY `sys_trans`.`id` DESC", |
| 225 | - $translang |
|
| 226 | - ); |
|
| 227 | - $tpl->assign_rs('trans', $trans); |
|
| 228 | - sql_free_result($trans); |
|
| 225 | + $translang |
|
| 226 | + ); |
|
| 227 | + $tpl->assign_rs('trans', $trans); |
|
| 228 | + sql_free_result($trans); |
|
| 229 | 229 | } |
| 230 | 230 | |
| 231 | 231 | $languages = []; |
@@ -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'); |
|
@@ -6,36 +6,36 @@ |
||
| 6 | 6 | * Common error messages |
| 7 | 7 | ***************************************************************************/ |
| 8 | 8 | |
| 9 | - define('ERROR_UNKNOWN', 1000); |
|
| 10 | - define('ERROR_TEMPLATE_NOT_FOUND', 1001); |
|
| 11 | - define('ERROR_COMPILATION_FAILED', 1002); |
|
| 12 | - define('ERROR_NO_ACCESS', 1003); |
|
| 13 | - define('ERROR_INVALID_OPERATION', 1004); |
|
| 14 | - define('ERROR_LOGIN_REQUIRED', 1005); |
|
| 15 | - define('ERROR_MAIL_TEMPLATE_NOT_FOUND', 1006); |
|
| 16 | - define('ERROR_NO_COOKIES', 1007); |
|
| 17 | - define('ERROR_ALREADY_LOGGEDIN', 1008); |
|
| 18 | - define('ERROR_USER_NOT_ACTIVE', 1009); |
|
| 19 | - define('ERROR_USER_NO_EMAIL', 1010); |
|
| 20 | - define('ERROR_CACHE_NOT_PUBLISHED', 1011); |
|
| 21 | - define('ERROR_CACHE_LOCKED', 1012); |
|
| 9 | + define('ERROR_UNKNOWN', 1000); |
|
| 10 | + define('ERROR_TEMPLATE_NOT_FOUND', 1001); |
|
| 11 | + define('ERROR_COMPILATION_FAILED', 1002); |
|
| 12 | + define('ERROR_NO_ACCESS', 1003); |
|
| 13 | + define('ERROR_INVALID_OPERATION', 1004); |
|
| 14 | + define('ERROR_LOGIN_REQUIRED', 1005); |
|
| 15 | + define('ERROR_MAIL_TEMPLATE_NOT_FOUND', 1006); |
|
| 16 | + define('ERROR_NO_COOKIES', 1007); |
|
| 17 | + define('ERROR_ALREADY_LOGGEDIN', 1008); |
|
| 18 | + define('ERROR_USER_NOT_ACTIVE', 1009); |
|
| 19 | + define('ERROR_USER_NO_EMAIL', 1010); |
|
| 20 | + define('ERROR_CACHE_NOT_PUBLISHED', 1011); |
|
| 21 | + define('ERROR_CACHE_LOCKED', 1012); |
|
| 22 | 22 | |
| 23 | - define('ERROR_SEARCHPLUGIN_WAYPOINT_FORMAT', 1013); |
|
| 24 | - define('ERROR_SEARCHPLUGIN_WAYPOINT_MANY', 1014); |
|
| 25 | - define('ERROR_SEARCHPLUGIN_WAYPOINT_NOTFOUND', 1015); |
|
| 23 | + define('ERROR_SEARCHPLUGIN_WAYPOINT_FORMAT', 1013); |
|
| 24 | + define('ERROR_SEARCHPLUGIN_WAYPOINT_MANY', 1014); |
|
| 25 | + define('ERROR_SEARCHPLUGIN_WAYPOINT_NOTFOUND', 1015); |
|
| 26 | 26 | |
| 27 | - define('ERROR_DB_COULD_NOT_RECONNECT', 1016); |
|
| 28 | - define('ERROR_DB_NO_ROOT', 1017); |
|
| 27 | + define('ERROR_DB_COULD_NOT_RECONNECT', 1016); |
|
| 28 | + define('ERROR_DB_NO_ROOT', 1017); |
|
| 29 | 29 | |
| 30 | - define('ERROR_USER_NOT_EXISTS', 1018); |
|
| 31 | - define('ERROR_CACHE_NOT_EXISTS', 1019); |
|
| 32 | - define('ERROR_CACHELOG_NOT_EXISTS', 1020); |
|
| 33 | - define('ERROR_PICTURE_NOT_EXISTS', 1021); |
|
| 30 | + define('ERROR_USER_NOT_EXISTS', 1018); |
|
| 31 | + define('ERROR_CACHE_NOT_EXISTS', 1019); |
|
| 32 | + define('ERROR_CACHELOG_NOT_EXISTS', 1020); |
|
| 33 | + define('ERROR_PICTURE_NOT_EXISTS', 1021); |
|
| 34 | 34 | |
| 35 | - define('ERROR_UPLOAD_ERR_NO_FILE', 1022); |
|
| 36 | - define('ERROR_UPLOAD_ERR_SIZE', 1023); |
|
| 37 | - define('ERROR_UPLOAD_ERR_TYPE', 1024); |
|
| 38 | - define('ERROR_UPLOAD_UNKNOWN', 1025); |
|
| 39 | - define('ERROR_UPLOAD_ERR_BAD_FORMAT', 1026); |
|
| 35 | + define('ERROR_UPLOAD_ERR_NO_FILE', 1022); |
|
| 36 | + define('ERROR_UPLOAD_ERR_SIZE', 1023); |
|
| 37 | + define('ERROR_UPLOAD_ERR_TYPE', 1024); |
|
| 38 | + define('ERROR_UPLOAD_UNKNOWN', 1025); |
|
| 39 | + define('ERROR_UPLOAD_ERR_BAD_FORMAT', 1026); |
|
| 40 | 40 | |
| 41 | - define('ERROR_WRONG_NODE', 1027); |
|
| 41 | + define('ERROR_WRONG_NODE', 1027); |
|
@@ -52,7 +52,7 @@ |
||
| 52 | 52 | 'OC_COOKIE_NAME' => $opt['session']['cookiename'] . 'data', |
| 53 | 53 | 'VERSION_FILE' => __DIR__ . '/okapi/meta.php', |
| 54 | 54 | 'OCDE_HTML_PURIFIER_SETTINGS' |
| 55 | - => $opt['html_purifier'], |
|
| 55 | + => $opt['html_purifier'], |
|
| 56 | 56 | 'GITHUB_ACCESS_TOKEN' => $opt['okapi']['github_access_token'], |
| 57 | 57 | ]; |
| 58 | 58 | } |
@@ -79,9 +79,9 @@ discard block |
||
| 79 | 79 | public function fetchOneBy(array $where = []) |
| 80 | 80 | { |
| 81 | 81 | $queryBuilder = $this->connection->createQueryBuilder() |
| 82 | - ->select('*') |
|
| 83 | - ->from(self::TABLE) |
|
| 84 | - ->setMaxResults(1); |
|
| 82 | + ->select('*') |
|
| 83 | + ->from(self::TABLE) |
|
| 84 | + ->setMaxResults(1); |
|
| 85 | 85 | |
| 86 | 86 | if (count($where) > 0) { |
| 87 | 87 | foreach ($where as $column => $value) { |
@@ -112,8 +112,8 @@ discard block |
||
| 112 | 112 | public function fetchBy(array $where = []) |
| 113 | 113 | { |
| 114 | 114 | $queryBuilder = $this->connection->createQueryBuilder() |
| 115 | - ->select('*') |
|
| 116 | - ->from(self::TABLE); |
|
| 115 | + ->select('*') |
|
| 116 | + ->from(self::TABLE); |
|
| 117 | 117 | |
| 118 | 118 | if (count($where) > 0) { |
| 119 | 119 | foreach ($where as $column => $value) { |
@@ -79,9 +79,9 @@ discard block |
||
| 79 | 79 | public function fetchOneBy(array $where = []) |
| 80 | 80 | { |
| 81 | 81 | $queryBuilder = $this->connection->createQueryBuilder() |
| 82 | - ->select('*') |
|
| 83 | - ->from(self::TABLE) |
|
| 84 | - ->setMaxResults(1); |
|
| 82 | + ->select('*') |
|
| 83 | + ->from(self::TABLE) |
|
| 84 | + ->setMaxResults(1); |
|
| 85 | 85 | |
| 86 | 86 | if (count($where) > 0) { |
| 87 | 87 | foreach ($where as $column => $value) { |
@@ -112,8 +112,8 @@ discard block |
||
| 112 | 112 | public function fetchBy(array $where = []) |
| 113 | 113 | { |
| 114 | 114 | $queryBuilder = $this->connection->createQueryBuilder() |
| 115 | - ->select('*') |
|
| 116 | - ->from(self::TABLE); |
|
| 115 | + ->select('*') |
|
| 116 | + ->from(self::TABLE); |
|
| 117 | 117 | |
| 118 | 118 | if (count($where) > 0) { |
| 119 | 119 | foreach ($where as $column => $value) { |