Completed
Pull Request — development (#482)
by Mirco
06:34
created
htdocs/lib2/common.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@
 block discarded – undo
11 11
 
12 12
 require_once __DIR__ . '/../vendor/autoload.php';
13 13
 
14
-$opt['rootpath'] = __DIR__ .'/../';
14
+$opt['rootpath'] = __DIR__ . '/../';
15 15
 
16 16
 function __autoload($class_name)
17 17
 {
Please login to merge, or discard this patch.
local/mailing/mailing.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -39,7 +39,7 @@
 block discarded – undo
39 39
 
40 40
 foreach ($sendTo as $receiver) {
41 41
     $receiver = trim($receiver);
42
-    echo ++ $n . "/$total: $receiver";
42
+    echo ++$n . "/$total: $receiver";
43 43
     mail(
44 44
         $receiver,
45 45
         $subject,
Please login to merge, or discard this patch.
local/ocxml11client/xml2array.inc.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -14,14 +14,14 @@
 block discarded – undo
14 14
 
15 15
     public function push_pos(&$pos)
16 16
     {
17
-        $this->stack[count($this->stack)] =& $pos;
18
-        $this->stack_ref =& $pos;
17
+        $this->stack[count($this->stack)] = & $pos;
18
+        $this->stack_ref = & $pos;
19 19
     }
20 20
 
21 21
     public function pop_pos()
22 22
     {
23 23
         unset($this->stack[count($this->stack) - 1]);
24
-        $this->stack_ref =& $this->stack[count($this->stack) - 1];
24
+        $this->stack_ref = & $this->stack[count($this->stack) - 1];
25 25
     }
26 26
 
27 27
     /**
Please login to merge, or discard this patch.
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 (mysql_num_rows($rs) == 1) {
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
                 //save to DB?
90 90
                 if (isset($_POST['post'])) {  // Ocprop
91 91
                     //here we read all used information from the form if submitted
92
-                    $descMode = isset($_POST['descMode']) ? $_POST['descMode'] + 0 : 1;  // Ocprop
92
+                    $descMode = isset($_POST['descMode']) ? $_POST['descMode'] + 0 : 1; // Ocprop
93 93
 
94 94
                     // fuer alte Versionen von OCProp
95 95
                     if (isset($_POST['submit']) && !isset($_POST['version2'])) {
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
                         $oldDescMode = $descMode;
123 123
                     }
124 124
 
125
-                    $short_desc = $_POST['short_desc'];  // Ocprop
125
+                    $short_desc = $_POST['short_desc']; // Ocprop
126 126
                     $hint = htmlspecialchars($_POST['hints'], ENT_COMPAT, 'UTF-8');
127 127
                     $desclang = $_POST['desclang'];
128 128
                     $show_all_langs = isset($_POST['show_all_langs_value']) ? $_POST['show_all_langs_value'] : 0;
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
137 137
                     }
138 138
 
139 139
                     // Text from textarea
140
-                    $desc = $_POST['desc'];  // Ocprop
140
+                    $desc = $_POST['desc']; // Ocprop
141 141
 
142 142
                     // fuer alte Versionen von OCProp
143 143
                     if (isset($_POST['submit']) && !isset($_POST['version2'])) {
@@ -296,7 +296,7 @@  discard block
 block discarded – undo
296 296
                 tpl_set_var('desclang', htmlspecialchars($desc_lang, ENT_COMPAT, 'UTF-8'));
297 297
                 tpl_set_var('desclang_name', htmlspecialchars(db_LanguageFromShort($desc_lang), ENT_COMPAT, 'UTF-8'));
298 298
                 tpl_set_var('cachename', htmlspecialchars($desc_record['name'], ENT_COMPAT, 'UTF-8'));
299
-                tpl_set_var('reset', $reset);  // obsolete
299
+                tpl_set_var('reset', $reset); // obsolete
300 300
                 tpl_set_var('submit', $submit);
301 301
 
302 302
                 // Text / normal HTML / HTML editor
Please login to merge, or discard this patch.
htdocs/lib/settings-dist.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -142,7 +142,7 @@
 block discarded – undo
142 142
 
143 143
 /* default locale
144 144
  */
145
-$opt['template']['default']['locale'] = 'DE';   // can be overwritten by $opt['domain'][<domain>]['locale']
145
+$opt['template']['default']['locale'] = 'DE'; // can be overwritten by $opt['domain'][<domain>]['locale']
146 146
 
147 147
 // include all locale settings
148 148
 require_once __DIR__ . '/../config2/locale.inc.php';
Please login to merge, or discard this patch.
htdocs/lib/settings-sample-dev.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@
 block discarded – undo
18 18
 
19 19
 // database names
20 20
 $dbname = 'opencaching';
21
-$tmpdbname = 'octmp';   // empty db with CREATE and DROP privileges
21
+$tmpdbname = 'octmp'; // empty db with CREATE and DROP privileges
22 22
 
23 23
 // common developer system settings
24 24
 require 'settings-dev.inc.php';
Please login to merge, or discard this patch.
htdocs/lang/de/ocstyle/main.tpl.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
153 153
 <?php
154 154
 foreach ($opt['template']['locales'] as $k => $lang) {
155 155
     if ($lang['status'] == OC_LOCALE_ACTIVE) {
156
-        echo '<a style="text-decoration: none;" href="'.$langUrl . $k . '"><img src="' . $lang['flag'] .
156
+        echo '<a style="text-decoration: none;" href="' . $langUrl . $k . '"><img src="' . $lang['flag'] .
157 157
             '" alt="' . $lang['name'] . '" title="' . $lang['name'] . '" width="24px" height="18px" /></a> ';
158 158
     }
159 159
 }
@@ -182,7 +182,7 @@  discard block
 block discarded – undo
182 182
                                         }
183 183
                                         $nLastGroup = $tpl_usercountries[$i]['group'];
184 184
 
185
-                                        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>';
185
+                                        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>';
186 186
                                     }
187 187
 ?>
188 188
                                 </select>&nbsp;
Please login to merge, or discard this patch.
htdocs/newdesc.php 1 patch
Spacing   +6 added lines, -7 removed lines patch added patch discarded remove patch
@@ -43,11 +43,11 @@  discard block
 block discarded – undo
43 43
 
44 44
                 //get the posted data
45 45
                 $show_all_langs = isset($_POST['show_all_langs']) ? $_POST['show_all_langs'] : 0;
46
-                $short_desc = isset($_POST['short_desc']) ? $_POST['short_desc'] : '';  // Ocprop
46
+                $short_desc = isset($_POST['short_desc']) ? $_POST['short_desc'] : ''; // Ocprop
47 47
 
48
-                $hints = isset($_POST['hints']) ? $_POST['hints'] : '';  // Ocprop
49
-                $sel_lang = isset($_POST['desc_lang']) ? $_POST['desc_lang'] : $default_lang;  // Ocprop
50
-                $desc = isset($_POST['desc']) ? $_POST['desc'] : '';  // Ocprop
48
+                $hints = isset($_POST['hints']) ? $_POST['hints'] : ''; // Ocprop
49
+                $sel_lang = isset($_POST['desc_lang']) ? $_POST['desc_lang'] : $default_lang; // Ocprop
50
+                $desc = isset($_POST['desc']) ? $_POST['desc'] : ''; // Ocprop
51 51
 
52 52
                 // read descMode; if not set, initialize from user profile
53 53
                 if (isset($_POST['descMode'])) {  // Ocprop
@@ -212,8 +212,7 @@  discard block
 block discarded – undo
212 212
                 tpl_set_var('name', htmlspecialchars($cache_record['name'], ENT_COMPAT, 'UTF-8'));
213 213
                 tpl_set_var('cacheid', htmlspecialchars($cache_id, ENT_COMPAT, 'UTF-8'));
214 214
 
215
-                tpl_set_var('lang_message', $desc_lang_exists ? $lang_message :
216
-                    (isset($_POST['submitform']) && $sel_lang == '0' ? $error_no_lang_selected : ''));
215
+                tpl_set_var('lang_message', $desc_lang_exists ? $lang_message : (isset($_POST['submitform']) && $sel_lang == '0' ? $error_no_lang_selected : ''));
217 216
 
218 217
                 tpl_set_var('show_all_langs', $show_all_langs);
219 218
                 tpl_set_var('show_all_langs_submit', ($show_all_langs == 0) ? $show_all_langs_submit : '');
@@ -235,7 +234,7 @@  discard block
 block discarded – undo
235 234
                 $headers .= '<script language="javascript" type="text/javascript" src="' . editorJsPath() . '"></script>' . "\n";
236 235
                 tpl_set_var('htmlheaders', $headers);
237 236
 
238
-                tpl_set_var('reset', $reset);  // obsolete
237
+                tpl_set_var('reset', $reset); // obsolete
239 238
                 tpl_set_var('submit', $submit);
240 239
             }
241 240
         } else {
Please login to merge, or discard this patch.
htdocs/config2/settings-dev.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -79,7 +79,7 @@
 block discarded – undo
79 79
 );
80 80
 
81 81
 $opt['page']['develsystem'] = true;
82
-$opt['page']['max_logins_per_hour'] = 1000;    // for development ...
82
+$opt['page']['max_logins_per_hour'] = 1000; // for development ...
83 83
 
84 84
 $opt['mail']['from'] = 'root';
85 85
 $opt['mail']['subject'] = '[local.team-opencaching.de] ';
Please login to merge, or discard this patch.