Completed
Pull Request — development (#730)
by Kai
09:59 queued 02:50
created
htdocs/lib2/ss_zip.class.php 1 patch
Indentation   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -34,8 +34,7 @@
 block discarded – undo
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.
Please login to merge, or discard this patch.
local/maintenance/email_recovery.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -100,7 +100,7 @@
 block discarded – undo
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);
Please login to merge, or discard this patch.
htdocs/lang/de/ocstyle/removedesc.inc.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@
 block discarded – undo
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');
Please login to merge, or discard this patch.
htdocs/lib2/error.inc.php 1 patch
Indentation   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -6,36 +6,36 @@
 block discarded – undo
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);
Please login to merge, or discard this patch.
htdocs/okapi_settings.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -52,7 +52,7 @@
 block discarded – undo
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
 }
Please login to merge, or discard this patch.
htdocs/src/Oc/GeoCache/Persistence/GeoCacheLog/GeoCacheLogRepository.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -79,9 +79,9 @@  discard block
 block discarded – undo
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
 block discarded – undo
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) {
Please login to merge, or discard this patch.
htdocs/src/Oc/GeoCache/Persistence/GeoCache/GeoCacheRepository.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -79,9 +79,9 @@  discard block
 block discarded – undo
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
 block discarded – undo
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) {
Please login to merge, or discard this patch.
htdocs/okapi/meta.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,4 +1,4 @@
 block discarded – undo
1 1
 <?php return array (
2
-  'version_number' => 1687,
3
-  'git_revision' => 'a18bee1a2c15f4bea9015ee9648ff8e46adff809',
2
+    'version_number' => 1687,
3
+    'git_revision' => 'a18bee1a2c15f4bea9015ee9648ff8e46adff809',
4 4
 );
5 5
\ No newline at end of file
Please login to merge, or discard this patch.