Completed
Pull Request — development (#914)
by
unknown
47s
created
htdocs/lib2/logic/cachelist.class.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -435,8 +435,8 @@  discard block
 block discarded – undo
435 435
             . ($namelike ? " AND `name` LIKE '%" . sql_escape($namelike) . "%'" : '')
436 436
             . ($userlike ? " AND `username` LIKE '%" . sql_escape($userlike) . "%'" : ''),
437 437
             0,
438
-            (int) $startat,
439
-            (int) $maxitems,
438
+            (int)$startat,
439
+            (int)$maxitems,
440 440
             true
441 441
         );
442 442
     }
@@ -526,8 +526,8 @@  discard block
 block discarded – undo
526 526
              ORDER BY `prio`, $nameField
527 527
              LIMIT &2,&3",
528 528
             $login->userid,
529
-            (int) $startat,
530
-            (int) $maxitems
529
+            (int)$startat,
530
+            (int)$maxitems
531 531
         );
532 532
 
533 533
         $lists = sql_fetch_assoc_table($rs);
Please login to merge, or discard this patch.
htdocs/newcaches.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -72,8 +72,8 @@
 block discarded – undo
72 72
             ]
73 73
         )
74 74
         ->orderBy('caches.' . $dateField, $sortOrder)
75
-        ->setFirstResult((int) $startAt)
76
-        ->setMaxResults((int) $perpage);
75
+        ->setFirstResult((int)$startAt)
76
+        ->setMaxResults((int)$perpage);
77 77
 
78 78
     if ($country) {
79 79
         $newCachesQuery->andWhere('`caches`.`country`= :country');
Please login to merge, or discard this patch.
local/stat/coordstat.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
     $year = substr($cache['date_created'], 0, 4);
25 25
     if ($year >= 2005 && $year <= date('Y') && ($lat != 0 || $long != 0)) {
26 26
         $years[$year] = true;
27
-        $liste[$lat][$long]['caches'][$year] ++;
27
+        $liste[$lat][$long]['caches'][$year]++;
28 28
     }
29 29
 }
30 30
 mysqli_free_result($rs);
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
         $year = substr($cache['date'], 0, 4);
49 49
         if ($year >= 2005 && $year <= date('Y') && ($lat != 0 || $long != 0)) {
50 50
             $years[$year] = true;
51
-            $liste[$lat][$long]['logs'][$year] ++;
51
+            $liste[$lat][$long]['logs'][$year]++;
52 52
         }
53 53
     }
54 54
     mysqli_free_result($rs);
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
 while ($cache = sql_fetch_assoc($rs)) {
66 66
     $lat = floor($cache['latitude'] / $grid);
67 67
     $long = floor($cache['longitude'] / $grid);
68
-    $liste[$lat][$long]['caches']['all'] ++;
68
+    $liste[$lat][$long]['caches']['all']++;
69 69
     $liste[$lat][$long]['logs']['all'] += $cache['logs'];
70 70
 }
71 71
 mysqli_free_result($rs);
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
 }
@@ -185,7 +185,7 @@  discard block
 block discarded – undo
185 185
                                         }
186 186
                                         $nLastGroup = $tpl_usercountries[$i]['group'];
187 187
 
188
-                                        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
+                                        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>';
189 189
                                     }
190 190
 ?>
191 191
                                 </select>
@@ -390,7 +390,7 @@  discard block
 block discarded – undo
390 390
             </div> <!-- page-container-1 -->
391 391
 
392 392
         </div> <!-- overall -->
393
-        <?php if($opt['tracking']['googleAnalytics']) { ?>
393
+        <?php if ($opt['tracking']['googleAnalytics']) { ?>
394 394
             <script type="text/javascript">
395 395
                 // Set to the same value as the web property used on the site
396 396
                 var gaProperty = '<?= $opt['tracking']['googleAnalytics']; ?>';
Please login to merge, or discard this patch.
htdocs/lib2/logic/cachelog.class.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -357,7 +357,7 @@  discard block
 block discarded – undo
357 357
         //     return array();
358 358
         // Logic Error - log types are still valid when no NEW logs are allowed for the cache.
359 359
         // (Would e.g. block admin logs and log-type restoring for locked caches.)
360
-        return get_cache_log_types($this->getCacheId(), $this->getType());  // depends on userid
360
+        return get_cache_log_types($this->getCacheId(), $this->getType()); // depends on userid
361 361
     }
362 362
 
363 363
     public static function isDuplicate($cacheId, $userId, $logType, $logDate, $logText)
@@ -443,8 +443,8 @@  discard block
 block discarded – undo
443 443
             if ($dateOk && $submit) {
444 444
                 $dateOk = (
445 445
                     mktime(
446
-                        (int) $hour,
447
-                        (int) $minute,
446
+                        (int)$hour,
447
+                        (int)$minute,
448 448
                         0,
449 449
                         $month,
450 450
                         $day,
Please login to merge, or discard this patch.
htdocs/src/Oc/Page/Persistence/PageRepository.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
             $databaseArray
76 76
         );
77 77
 
78
-        $entity->id = (int) $this->connection->lastInsertId();
78
+        $entity->id = (int)$this->connection->lastInsertId();
79 79
 
80 80
         return $entity;
81 81
     }
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
             ['id' => $entity->id]
100 100
         );
101 101
 
102
-        $entity->id = (int) $this->connection->lastInsertId();
102
+        $entity->id = (int)$this->connection->lastInsertId();
103 103
 
104 104
         return $entity;
105 105
     }
@@ -147,13 +147,13 @@  discard block
 block discarded – undo
147 147
     public function getEntityFromDatabaseArray(array $data): PageEntity
148 148
     {
149 149
         $entity = new PageEntity();
150
-        $entity->id = (int) $data['id'];
150
+        $entity->id = (int)$data['id'];
151 151
         $entity->slug = $data['slug'];
152 152
         $entity->metaKeywords = $data['meta_keywords'];
153 153
         $entity->metaDescription = $data['meta_description'];
154 154
         $entity->metaSocial = $data['meta_social'];
155 155
         $entity->updatedAt = new DateTime($data['updated_at']);
156
-        $entity->active = (bool) $data['active'];
156
+        $entity->active = (bool)$data['active'];
157 157
 
158 158
         return $entity;
159 159
     }
Please login to merge, or discard this patch.
htdocs/src/Oc/Page/Persistence/BlockRepository.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
83 83
             $databaseArray
84 84
         );
85 85
 
86
-        $entity->id = (int) $this->connection->lastInsertId();
86
+        $entity->id = (int)$this->connection->lastInsertId();
87 87
 
88 88
         return $entity;
89 89
     }
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
             ['id' => $entity->id]
108 108
         );
109 109
 
110
-        $entity->id = (int) $this->connection->lastInsertId();
110
+        $entity->id = (int)$this->connection->lastInsertId();
111 111
 
112 112
         return $entity;
113 113
     }
@@ -143,7 +143,7 @@  discard block
 block discarded – undo
143 143
             'page_id' => $entity->pageId,
144 144
             'title' => $entity->title,
145 145
             'html' => $entity->html,
146
-            'position' => (int) $entity->position,
146
+            'position' => (int)$entity->position,
147 147
             'updated_at' => $entity->updatedAt->format(DateTime::ATOM),
148 148
             'active' => $entity->active,
149 149
         ];
@@ -155,13 +155,13 @@  discard block
 block discarded – undo
155 155
     public function getEntityFromDatabaseArray(array $data): BlockEntity
156 156
     {
157 157
         $entity = new BlockEntity();
158
-        $entity->id = (int) $data['id'];
159
-        $entity->pageId = (int) $data['page_id'];
158
+        $entity->id = (int)$data['id'];
159
+        $entity->pageId = (int)$data['page_id'];
160 160
         $entity->title = $data['title'];
161 161
         $entity->html = $data['html'];
162
-        $entity->position = (int) $data['position'];
162
+        $entity->position = (int)$data['position'];
163 163
         $entity->updatedAt = new DateTime($data['updated_at']);
164
-        $entity->active = (bool) $data['active'];
164
+        $entity->active = (bool)$data['active'];
165 165
 
166 166
         return $entity;
167 167
     }
Please login to merge, or discard this patch.
htdocs/src/Oc/Menu/Renderer/MainRenderer.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
     {
56 56
         $options = array_merge($this->defaultOptions, $options);
57 57
 
58
-        $childrenClass = (array) $item->getChildrenAttribute('class');
58
+        $childrenClass = (array)$item->getChildrenAttribute('class');
59 59
 
60 60
         if ($options['listClass']) {
61 61
             $childrenClass[] = $options['listClass'];
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
137 137
         }
138 138
 
139 139
         // create an array than can be imploded as a class list
140
-        $class = (array) $item->getAttribute('class');
140
+        $class = (array)$item->getAttribute('class');
141 141
 
142 142
         if ($options['itemClass']) {
143 143
             $class[] = $options['itemClass'];
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
178 178
         $html .= $this->renderLink($item, $options);
179 179
 
180 180
         // renders the embedded ul
181
-        $childrenClass = (array) $item->getChildrenAttribute('class');
181
+        $childrenClass = (array)$item->getChildrenAttribute('class');
182 182
         if ($options['listClass']) {
183 183
             $childrenClass[] = $options['listClass'];
184 184
         }
@@ -219,7 +219,7 @@  discard block
 block discarded – undo
219 219
 
220 220
     protected function renderLinkElement(ItemInterface $item, array $options): string
221 221
     {
222
-        $childrenClass = (array) $item->getChildrenAttribute('class');
222
+        $childrenClass = (array)$item->getChildrenAttribute('class');
223 223
 
224 224
         if ($options['linkClass']) {
225 225
             $childrenClass[] = $options['linkClass'];
@@ -233,7 +233,7 @@  discard block
 block discarded – undo
233 233
 
234 234
     protected function renderSpanElement(ItemInterface $item, array $options): string
235 235
     {
236
-        $childrenClass = (array) $item->getChildrenAttribute('class');
236
+        $childrenClass = (array)$item->getChildrenAttribute('class');
237 237
 
238 238
         if ($options['textClass']) {
239 239
             $childrenClass[] = $options['textClass'];
Please login to merge, or discard this patch.
htdocs/src/Oc/User/UserRepository.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
             $databaseArray
94 94
         );
95 95
 
96
-        $entity->id = (int) $this->connection->lastInsertId();
96
+        $entity->id = (int)$this->connection->lastInsertId();
97 97
 
98 98
         return $entity;
99 99
     }
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
117 117
             ['id' => $entity->id]
118 118
         );
119 119
 
120
-        $entity->id = (int) $this->connection->lastInsertId();
120
+        $entity->id = (int)$this->connection->lastInsertId();
121 121
 
122 122
         return $entity;
123 123
     }
@@ -189,13 +189,13 @@  discard block
 block discarded – undo
189 189
     public function getEntityFromDatabaseArray(array $data): UserEntity
190 190
     {
191 191
         $entity = new UserEntity();
192
-        $entity->id = (int) $data['user_id'];
192
+        $entity->id = (int)$data['user_id'];
193 193
         $entity->username = $data['username'];
194 194
         $entity->password = $data['password'];
195 195
         $entity->email = $data['email'];
196
-        $entity->latitude = (double) $data['latitude'];
197
-        $entity->longitude = (double) $data['longitude'];
198
-        $entity->isActive = (bool) $data['is_active_flag'];
196
+        $entity->latitude = (double)$data['latitude'];
197
+        $entity->longitude = (double)$data['longitude'];
198
+        $entity->isActive = (bool)$data['is_active_flag'];
199 199
         $entity->firstname = $data['first_name'];
200 200
         $entity->lastname = $data['last_name'];
201 201
         $entity->country = $data['country'];
Please login to merge, or discard this patch.