Completed
Push — next ( 7ad3ec...211d75 )
by Thomas
17s
created
htdocs/editdesc.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -22,8 +22,8 @@  discard block
 block discarded – undo
22 22
         isset($_REQUEST['desclang']) &&
23 23
         !isset($_REQUEST['descid'])) {  // Ocprop
24 24
 
25
-        $cache_id = $_REQUEST['cacheid'];  // Ocprop
26
-        $desc_lang = $_REQUEST['desclang'];  // Ocprop
25
+        $cache_id = $_REQUEST['cacheid']; // Ocprop
26
+        $desc_lang = $_REQUEST['desclang']; // Ocprop
27 27
 
28 28
         $rs = sql("SELECT `id` FROM `cache_desc` WHERE `cache_id`='&1' AND `language`='&2'", $cache_id, $desc_lang);
29 29
         if (mysqli_num_rows($rs) == 1) {
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
90 90
                 //save to DB?
91 91
                 if (isset($_POST['post'])) {  // Ocprop
92 92
                     //here we read all used information from the form if submitted
93
-                    $descMode = isset($_POST['descMode']) ? $_POST['descMode'] + 0 : 1;  // Ocprop
93
+                    $descMode = isset($_POST['descMode']) ? $_POST['descMode'] + 0 : 1; // Ocprop
94 94
 
95 95
                     // fuer alte Versionen von OCProp
96 96
                     if (isset($_POST['submit']) && !isset($_POST['version2'])) {
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
                         $oldDescMode = $descMode;
124 124
                     }
125 125
 
126
-                    $short_desc = trim($_POST['short_desc']);  // Ocprop
126
+                    $short_desc = trim($_POST['short_desc']); // Ocprop
127 127
                     $hint = htmlspecialchars(trim($_POST['hints']), ENT_COMPAT, 'UTF-8');
128 128
                     $desclang = $_POST['desclang'];
129 129
                     $show_all_langs = isset($_POST['show_all_langs_value']) ? $_POST['show_all_langs_value'] : 0;
@@ -138,7 +138,7 @@  discard block
 block discarded – undo
138 138
                     }
139 139
 
140 140
                     // Text from textarea
141
-                    $desc = trim($_POST['desc']);  // Ocprop
141
+                    $desc = trim($_POST['desc']); // Ocprop
142 142
 
143 143
                     // fuer alte Versionen von OCProp
144 144
                     if (isset($_POST['submit']) && !isset($_POST['version2'])) {
@@ -295,7 +295,7 @@  discard block
 block discarded – undo
295 295
                 tpl_set_var('desclang', htmlspecialchars($desc_lang, ENT_COMPAT, 'UTF-8'));
296 296
                 tpl_set_var('desclang_name', htmlspecialchars(db_LanguageFromShort($desc_lang), ENT_COMPAT, 'UTF-8'));
297 297
                 tpl_set_var('cachename', htmlspecialchars($desc_record['name'], ENT_COMPAT, 'UTF-8'));
298
-                tpl_set_var('reset', $reset);  // obsolete
298
+                tpl_set_var('reset', $reset); // obsolete
299 299
                 tpl_set_var('submit', $submit);
300 300
 
301 301
                 // Text / normal HTML / HTML editor
Please login to merge, or discard this patch.
htdocs/lang/de/ocstyle/varset.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@
 block discarded – undo
47 47
 // REQUEST-Variablen durchlaufen und an target anhaengen
48 48
 $allowed = ['cacheid', 'userid', 'logid', 'desclang', 'descid'];
49 49
 
50
-foreach($_REQUEST as $varname => $varvalue) {
50
+foreach ($_REQUEST as $varname => $varvalue) {
51 51
     if (in_array($varname, $allowed)) {
52 52
         $target .= $varname . '=' . $varvalue . '&';
53 53
     }
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/okapi/meta.php 2 patches
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' => 1908,
3
-  'git_revision' => '6be38dcd869651db7dd2fddf94a09e3f64519320',
2
+    'version_number' => 1908,
3
+    'git_revision' => '6be38dcd869651db7dd2fddf94a09e3f64519320',
4 4
 );
5 5
\ No newline at end of file
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,4 +1,4 @@
 block discarded – undo
1
-<?php return array (
1
+<?php return array(
2 2
   'version_number' => 1908,
3 3
   'git_revision' => '6be38dcd869651db7dd2fddf94a09e3f64519320',
4 4
 );
5 5
\ No newline at end of file
Please login to merge, or discard this patch.