Completed
Push — development ( 1b87d2...43bb99 )
by Thomas
06:02
created
htdocs/lib2/util.inc.php 2 patches
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
 /**
100 100
  * @param $filename
101 101
  * @param $maxLength
102
- * @return bool|string
102
+ * @return false|string
103 103
  */
104 104
 function read_file($filename, $maxLength = 4096)
105 105
 {
@@ -265,7 +265,7 @@  discard block
 block discarded – undo
265 265
  * format number with 1000s dots
266 266
  *
267 267
  * @param $n
268
- * @return mixed|string
268
+ * @return string
269 269
  */
270 270
 function number1000($n)
271 271
 {
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@
 block discarded – undo
9 9
  */
10 10
 function is_valid_email_address($eMail)
11 11
 {
12
-    return (int) ($eMail === filter_var($eMail, FILTER_VALIDATE_EMAIL));
12
+    return (int)($eMail === filter_var($eMail, FILTER_VALIDATE_EMAIL));
13 13
 }
14 14
 
15 15
 /**
Please login to merge, or discard this patch.
htdocs/viewcache.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -46,7 +46,7 @@
 block discarded – undo
46 46
 // get cacheid
47 47
 $cacheid = 0;
48 48
 if (isset($_REQUEST['cacheid'])) {
49
-    $cacheid = (int) $_REQUEST['cacheid'];
49
+    $cacheid = (int)$_REQUEST['cacheid'];
50 50
 } else {
51 51
     if (isset($_REQUEST['uuid'])) {
52 52
         $cacheid = cache::cacheIdFromUUID($_REQUEST['uuid']);
Please login to merge, or discard this patch.
htdocs/lang/de/ocstyle/main.tpl.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
155 155
 <?php
156 156
 foreach ($opt['template']['locales'] as $k => $lang) {
157 157
     if ($lang['status'] == OC_LOCALE_ACTIVE) {
158
-        echo '<a style="text-decoration: none;" href="'.$langUrl . $k . '"><img src="' . $lang['flag'] .
158
+        echo '<a style="text-decoration: none;" href="' . $langUrl . $k . '"><img src="' . $lang['flag'] .
159 159
             '" alt="' . $lang['name'] . '" title="' . $lang['name'] . '" width="24px" height="18px" /></a> ';
160 160
     }
161 161
 }
@@ -184,7 +184,7 @@  discard block
 block discarded – undo
184 184
                                         }
185 185
                                         $nLastGroup = $tpl_usercountries[$i]['group'];
186 186
 
187
-                                        echo '<option value="' . htmlspecialchars($tpl_usercountries[$i]['country'], ENT_COMPAT, 'UTF-8') . '"' . (($sUserCountry==$tpl_usercountries[$i]['country']) ? ' selected="selected"' : '') . '>' . htmlspecialchars($tpl_usercountries[$i]['name'], ENT_COMPAT, 'UTF-8') . '</option>';
187
+                                        echo '<option value="' . htmlspecialchars($tpl_usercountries[$i]['country'], ENT_COMPAT, 'UTF-8') . '"' . (($sUserCountry == $tpl_usercountries[$i]['country']) ? ' selected="selected"' : '') . '>' . htmlspecialchars($tpl_usercountries[$i]['name'], ENT_COMPAT, 'UTF-8') . '</option>';
188 188
                                     }
189 189
 ?>
190 190
                                 </select>&nbsp;
@@ -345,7 +345,7 @@  discard block
 block discarded – undo
345 345
             </div> <!-- page-container-1 -->
346 346
 
347 347
         </div> <!-- overall -->
348
-        <?php if($opt['tracking']['googleAnalytics']) { ?>
348
+        <?php if ($opt['tracking']['googleAnalytics']) { ?>
349 349
             <script type="text/javascript">
350 350
                 // Set to the same value as the web property used on the site
351 351
                 var gaProperty = '<?= $opt['tracking']['googleAnalytics']; ?>';
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/picture.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
     } else {
87 87
         $position = PHP_INT_MAX;
88 88
     }
89
-    $position = min($position, $allpics ? $allpics[count($allpics)-1]['seq'] + 1 : 1);
89
+    $position = min($position, $allpics ? $allpics[count($allpics) - 1]['seq'] + 1 : 1);
90 90
 
91 91
     // uploaded file ok?
92 92
     if (isset($_REQUEST['ok'])) { // Ocprop
@@ -233,7 +233,7 @@  discard block
 block discarded – undo
233 233
     }
234 234
     $tpl->assign('allpics', $allpics);
235 235
     $tpl->assign('position', $position);
236
-    $tpl->assign('appendseq', $allpics ? $allpics[count($allpics)-1]['seq']+1 : 1);
236
+    $tpl->assign('appendseq', $allpics ? $allpics[count($allpics) - 1]['seq'] + 1 : 1);
237 237
 }
238 238
 
239 239
 $rsCache = sql("SELECT `wp_oc`, `name` FROM `caches` WHERE `cache_id`='&1'", $picture->getCacheId());
Please login to merge, or discard this patch.
htdocs/lib2/edithelper.inc.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
             // mode switch from plain text to HTML editor => convert HTML special chars
37 37
             $text = nl2br(htmlspecialchars($text));
38 38
             // .. and smilies
39
-            $text = ' ' . $text . ' ';   // see Redmine #1103
39
+            $text = ' ' . $text . ' '; // see Redmine #1103
40 40
             $text = str_replace($smiley['text'], $smiley['spaced_image'], $text);
41 41
             if (substr($text, 0, 1) == ' ') {
42 42
                 $text = substr($text, 1);
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
             // convert to HTML for storing to database
60 60
             // also implemented in okapi/services/logs/submit.php
61 61
             $text = nl2br(htmlspecialchars($text, ENT_COMPAT, 'UTF-8'));
62
-            $text = str_replace('  ', '&nbsp; ', $text);   // can produce new '  ' ('&nbsp; ' + ' ')
62
+            $text = str_replace('  ', '&nbsp; ', $text); // can produce new '  ' ('&nbsp; ' + ' ')
63 63
             $text = str_replace('  ', '&nbsp; ', $text);
64 64
         } else {
65 65
             // mode switch from HTML editor to plain text, or decode HTML-encoded plain text
Please login to merge, or discard this patch.
htdocs/myhome.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -138,7 +138,7 @@
 block discarded – undo
138 138
     $allpics = 'ownlogs';
139 139
 }
140 140
 if ($allpics == 'ownlogs' || $allpics == 'owncaches') {
141
-    $gallery =  ($allpics == 'ownlogs' ? LogPics::FOR_OWNLOGS_GALLERY : LogPics::FOR_OWNCACHES_GALLERY);
141
+    $gallery = ($allpics == 'ownlogs' ? LogPics::FOR_OWNLOGS_GALLERY : LogPics::FOR_OWNCACHES_GALLERY);
142 142
     $all_pictures = LogPics::get($gallery);
143 143
     LogPics::setPaging($gallery, 0, 0, "myhome.php?allpics=" . $allpics);
144 144
 } else {
Please login to merge, or discard this patch.
htdocs/src/Oc/Translation/CrowdinImport.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@
 block discarded – undo
41 41
     }
42 42
 
43 43
     /**
44
-     * @param $path
44
+     * @param string $path
45 45
      * @return TranslationStruct[]
46 46
      */
47 47
     private function readCrowdinCsv($path)
Please login to merge, or discard this patch.
htdocs/src/Oc/Postfix/JournalLogs.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -71,7 +71,7 @@
 block discarded – undo
71 71
                     $cursor[$key] = $value;
72 72
                 }
73 73
 
74
-                $logEntry->id = (int) hexdec($cursor['i']);
74
+                $logEntry->id = (int)hexdec($cursor['i']);
75 75
 
76 76
                 $timeStamp = $entry['__REALTIME_TIMESTAMP'];
77 77
                 $logEntry->created = \DateTimeImmutable::createFromFormat(
Please login to merge, or discard this patch.