Completed
Pull Request — development (#569)
by Mirko
07:01
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   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@  discard block
 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
 /**
@@ -205,7 +205,7 @@  discard block
 block discarded – undo
205 205
 function escape_javascript($text)
206 206
 {
207 207
     return str_replace(
208
-        ['\'', '"',],
208
+        ['\'', '"', ],
209 209
         ['\\\'', '"'],
210 210
         $text
211 211
     );
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/src/OcBundle/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/OcBundle/Translation/TranslationStruct.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -56,7 +56,7 @@
 block discarded – undo
56 56
 
57 57
     public function fromCsvArray(array $data)
58 58
     {
59
-        $this->identifier = (int) $data['Identifier'];
59
+        $this->identifier = (int)$data['Identifier'];
60 60
         $this->sourceString = $data['SourceString'];
61 61
         $this->comment = $data['Comment'];
62 62
         $this->de = $data['DE'];
Please login to merge, or discard this patch.
htdocs/adminreports.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -190,14 +190,14 @@
 block discarded – undo
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
 
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
@@ -137,7 +137,7 @@
 block discarded – undo
137 137
     $allpics = 'ownlogs';
138 138
 }
139 139
 if ($allpics == 'ownlogs' || $allpics == 'owncaches') {
140
-    $gallery =  ($allpics == 'ownlogs' ? LogPics::FOR_OWNLOGS_GALLERY : LogPics::FOR_OWNCACHES_GALLERY);
140
+    $gallery = ($allpics == 'ownlogs' ? LogPics::FOR_OWNLOGS_GALLERY : LogPics::FOR_OWNCACHES_GALLERY);
141 141
     $all_pictures = LogPics::get($gallery);
142 142
     LogPics::setPaging($gallery, 0, 0, "myhome.php?allpics=1");
143 143
 } else {
Please login to merge, or discard this patch.
htdocs/src/OcBundle/Command/OkapiCronjobsCommand.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -25,8 +25,8 @@
 block discarded – undo
25 25
 
26 26
     protected function execute(InputInterface $input, OutputInterface $output)
27 27
     {
28
-        require_once __DIR__.'/../../../okapi/core.php';
29
-        require_once __DIR__.'/../../../okapi/vendor/autoload.php';
28
+        require_once __DIR__ . '/../../../okapi/core.php';
29
+        require_once __DIR__ . '/../../../okapi/vendor/autoload.php';
30 30
         Okapi::execute_cron5_cronjobs();
31 31
     }
32 32
 }
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.