| @@ -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'); | |
| @@ -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 | } | 
| @@ -3,11 +3,9 @@ | ||
| 3 | 3 | * for license information see LICENSE.md | 
| 4 | 4 | ***************************************************************************/ | 
| 5 | 5 | |
| 6 | -use Oc\FieldNotes\Entity\FieldNote; | |
| 7 | 6 | use Oc\FieldNotes\Enum\LogType as FieldNotesLogType; | 
| 8 | 7 | use Oc\FieldNotes\Persistence\FieldNoteEntity; | 
| 9 | 8 | use Oc\FieldNotes\Persistence\FieldNoteService; | 
| 10 | -use Oc\GeoCache\Entity\GeocacheLog; | |
| 11 | 9 | use Oc\GeoCache\Enum\GeoCacheType; | 
| 12 | 10 | use Oc\GeoCache\Enum\LogType as GeoCacheLogType; | 
| 13 | 11 | use Oc\GeoCache\Enum\NeedMaintenance; | 
| @@ -65,9 +65,9 @@ discard block | ||
| 65 | 65 | public function fetchOneBy(array $where = []): ?GeoCacheEntity | 
| 66 | 66 |      { | 
| 67 | 67 | $queryBuilder = $this->connection->createQueryBuilder() | 
| 68 | -             ->select('*') | |
| 69 | - ->from(self::TABLE) | |
| 70 | - ->setMaxResults(1); | |
| 68 | +                ->select('*') | |
| 69 | + ->from(self::TABLE) | |
| 70 | + ->setMaxResults(1); | |
| 71 | 71 | |
| 72 | 72 |          if (count($where) > 0) { | 
| 73 | 73 |              foreach ($where as $column => $value) { | 
| @@ -95,8 +95,8 @@ discard block | ||
| 95 | 95 | public function fetchBy(array $where = []): array | 
| 96 | 96 |      { | 
| 97 | 97 | $queryBuilder = $this->connection->createQueryBuilder() | 
| 98 | -             ->select('*') | |
| 99 | - ->from(self::TABLE); | |
| 98 | +                ->select('*') | |
| 99 | + ->from(self::TABLE); | |
| 100 | 100 | |
| 101 | 101 |          if (count($where) > 0) { | 
| 102 | 102 |              foreach ($where as $column => $value) { | 
| @@ -64,9 +64,9 @@ discard block | ||
| 64 | 64 | public function fetchOneBy(array $where = []): ?GeoCacheLogEntity | 
| 65 | 65 |      { | 
| 66 | 66 | $queryBuilder = $this->connection->createQueryBuilder() | 
| 67 | -             ->select('*') | |
| 68 | - ->from(self::TABLE) | |
| 69 | - ->setMaxResults(1); | |
| 67 | +                ->select('*') | |
| 68 | + ->from(self::TABLE) | |
| 69 | + ->setMaxResults(1); | |
| 70 | 70 | |
| 71 | 71 |          if (count($where) > 0) { | 
| 72 | 72 |              foreach ($where as $column => $value) { | 
| @@ -94,8 +94,8 @@ discard block | ||
| 94 | 94 | public function fetchBy(array $where = []): array | 
| 95 | 95 |      { | 
| 96 | 96 | $queryBuilder = $this->connection->createQueryBuilder() | 
| 97 | -             ->select('*') | |
| 98 | - ->from(self::TABLE); | |
| 97 | +                ->select('*') | |
| 98 | + ->from(self::TABLE); | |
| 99 | 99 | |
| 100 | 100 |          if (count($where) > 0) { | 
| 101 | 101 |              foreach ($where as $column => $value) { | 
| @@ -21,7 +21,6 @@ | ||
| 21 | 21 | * Validates a single item. | 
| 22 | 22 | * | 
| 23 | 23 | * @param mixed $item Item to validate | 
| 24 | - | |
| 25 | 24 | * @throws ValidationException | 
| 26 | 25 | */ | 
| 27 | 26 | public function validate($item): void |