Completed
Push — development ( 1b87d2...43bb99 )
by Thomas
06:02
created
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/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/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.
htdocs/src/Oc/Postfix/LogEntity.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
     public function toDatabaseArray()
31 31
     {
32 32
         return [
33
-            'id' => (int) $this->id,
33
+            'id' => (int)$this->id,
34 34
             'email' => $this->email,
35 35
             'status' => $this->status,
36 36
             'created' => $this->created,
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
      */
44 44
     public function fromDatabaseArray(array $data)
45 45
     {
46
-        $this->id = (int) $data['id'];
46
+        $this->id = (int)$data['id'];
47 47
         $this->email = $data['email'];
48 48
         $this->status = $data['status'];
49 49
         $this->created = $data['created'];
Please login to merge, or discard this patch.
htdocs/src/Oc/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/lib2/logic/cache.class.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -505,8 +505,8 @@
 block discarded – undo
505 505
         }
506 506
 
507 507
         $coords = [];
508
-        if ($this->getType() != 7 && $this->getType() != 8 &&  // quiz cache
509
-            $this->hasAttribute(61) != true &&                 // safari cache
508
+        if ($this->getType() != 7 && $this->getType() != 8 && // quiz cache
509
+            $this->hasAttribute(61) != true && // safari cache
510 510
             $this->getStatus() != 5                            // unpublished cache
511 511
         ) {
512 512
             $rsCoords = sql(
Please login to merge, or discard this patch.
htdocs/okapi/index.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-$GLOBALS['rootpath'] = __DIR__.'/../';
3
+$GLOBALS['rootpath'] = __DIR__ . '/../';
4 4
 
5 5
 require_once __DIR__ . '/../vendor/autoload.php';
6 6
 
7
-require_once __DIR__ .'/../vendor/opencaching/okapi/okapi/index.php';
7
+require_once __DIR__ . '/../vendor/opencaching/okapi/okapi/index.php';
Please login to merge, or discard this patch.