OpencachingDeutschland / oc-server3

htdocs/lib/common.inc.php

Spacing +1 added lines, -1 removed lines

@@ -680,7 +680,7 @@
 
     $str = $translate->t($str, '', basename(__FILE__), __LINE__);
     $args = func_get_args();
-    for ($nIndex = count($args) - 1; $nIndex > 0; $nIndex --) {
+    for ($nIndex = count($args) - 1; $nIndex > 0; $nIndex--) {
         $str = str_replace('%' . $nIndex, $args[$nIndex], $str);
     }
 

htdocs/lib/consts-common.inc.php

Spacing +2 added lines, -2 removed lines

@@ -7,10 +7,10 @@
  *  common constant definitions of lib1 and lib2
  ***************************************************************************/
 
-define('GUI_HTML', 0);   // also defined in lib/consts.inc.php
+define('GUI_HTML', 0); // also defined in lib/consts.inc.php
 define('GUI_TEXT', 1);
 
-define('HTTPS_DISABLED', 0);   // also defined in lib/consts.inc.php
+define('HTTPS_DISABLED', 0); // also defined in lib/consts.inc.php
 define('HTTPS_ENABLED', 1);
 define('HTTPS_ENFORCED', 2);
 

htdocs/lib/settings-sample-dev.inc.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 
 // database names
 $dbname = 'opencaching';
-$tmpdbname = 'octmp';   // empty db with CREATE and DROP privileges
+$tmpdbname = 'octmp'; // empty db with CREATE and DROP privileges
 
 // common developer system settings
 require 'settings-dev.inc.php';

htdocs/lib/sqldebugger.inc.php

Spacing +2 added lines, -2 removed lines

@@ -155,7 +155,7 @@ 
     global $sqldbg_cmdNo;
     global $sqldbg_sumTimes;
 
-    $sqldbg_cmdNo ++;
+    $sqldbg_cmdNo++;
 
     echo '<p class="sqlno"><span class="white">/*</span> SQL command ' . $sqldbg_cmdNo . ' ';
     if ($bSlave) {
@@ -230,7 +230,7 @@ 
 
         while ($r = sql_fetch_assoc($rs)) {
             $usebr = true;
-            $nLine ++;
+            $nLine++;
             if ($bFirstLine == true) {
                 echo '<tr>' . "\n";
                 foreach ($r as $field => $value) {

Doc Comments +9 added lines

@@ -329,6 +329,9 @@ 
     exit;
 }
 
+/**
+ * @param string $sql
+ */
 function sqldbg_strip_temptable($sql)
 {
     $start = mb_strpos(mb_strtoupper($sql), 'SELECT ');
@@ -340,6 +343,9 @@ 
     return mb_substr($sql, $start);
 }
 
+/**
+ * @param string $sql
+ */
 function sqldbg_strip_from($sql)
 {
     $start = mb_strpos(mb_strtoupper($sql), 'FROM ');
@@ -351,6 +357,9 @@ 
     return 'SELECT * ' . mb_substr($sql, $start);
 }
 
+/**
+ * @param string $sql
+ */
 function sqldbg_insert_nocache($sql)
 {
     if (mb_strtoupper(mb_substr($sql, 0, 7)) == 'SELECT ') {

htdocs/lib/login.class.php

Spacing +4 added lines, -4 removed lines

@@ -18,13 +18,13 @@
  *
  ***************************************************************************/
 
-define('LOGIN_UNKNOWN_ERROR', - 1);     // unkown error occured
-define('LOGIN_OK', 0);            // login succeeded
-define('LOGIN_BADUSERPW', 1);     // bad username or password
+define('LOGIN_UNKNOWN_ERROR', - 1); // unkown error occured
+define('LOGIN_OK', 0); // login succeeded
+define('LOGIN_BADUSERPW', 1); // bad username or password
 define('LOGIN_TOOMUCHLOGINS', 2); // too many logins in short time
 define('LOGIN_USERNOTACTIVE', 3); // the useraccount locked
 define('LOGIN_EMPTY_USERPASSWORD', 4); // given username/password was empty
-define('LOGIN_LOGOUT_OK', 5);          // logout was successfull
+define('LOGIN_LOGOUT_OK', 5); // logout was successfull
 
 // login times in seconds
 define('LOGIN_TIME', 60 * 60);

htdocs/newcachesrest.php

Spacing +1 added lines, -2 removed lines

@@ -14,8 +14,7 @@
 $tpl->caching = true;
 $tpl->cache_lifetime = 3600;
 
-$country = isset($_REQUEST['usercountry']) ? $_REQUEST['usercountry'] :
-    (isset($_REQUEST['country']) ? $_REQUEST['country'] : $opt['page']['main_country']);
+$country = isset($_REQUEST['usercountry']) ? $_REQUEST['usercountry'] : (isset($_REQUEST['country']) ? $_REQUEST['country'] : $opt['page']['main_country']);
 
 if (!$tpl->is_cached()) {
     $newCaches = array();

htdocs/picture.php

Spacing +3 added lines, -3 removed lines

@@ -75,11 +75,11 @@
     if (isset($_REQUEST['ok'])) { // Ocprop
         $bError = false;
 
-        $picture->setSpoiler(isset($_REQUEST['spoiler']) && $_REQUEST['spoiler'] == '1');  // Ocprop
-        $picture->setDisplay((isset($_REQUEST['notdisplay']) && $_REQUEST['notdisplay'] == '1') == false);  // Ocprop
+        $picture->setSpoiler(isset($_REQUEST['spoiler']) && $_REQUEST['spoiler'] == '1'); // Ocprop
+        $picture->setDisplay((isset($_REQUEST['notdisplay']) && $_REQUEST['notdisplay'] == '1') == false); // Ocprop
         $picture->setMapPreview(isset($_REQUEST['mappreview']) && $_REQUEST['mappreview'] == '1');
 
-        $title = isset($_REQUEST['title']) ? $_REQUEST['title'] : '';  // Ocprop
+        $title = isset($_REQUEST['title']) ? $_REQUEST['title'] : ''; // Ocprop
         if ($title == '' || ($picture->getObjectType() == OBJECT_CACHELOG && trim($title) == '')) {
             $tpl->assign('errortitle', true);
             $bError = true;

htdocs/query.php

Spacing +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
     if ($submit == true) {
         $options = sql_value("SELECT `options` FROM `queries` WHERE `id`='&1'", false, $queryid);
         if (!$options) {
-            $tpl->error(ERROR_UNKNOWN);   // query does not exist
+            $tpl->error(ERROR_UNKNOWN); // query does not exist
         } elseif ($sortby || $sortorder || $creationdate) {
             $oa = unserialize($options);
             if ($sortby) {

local/mailing/mailing.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 
 foreach ($sendto as $receiver) {
     $receiver = trim($receiver);
-    echo ++ $n . "/$total: $receiver";
+    echo ++$n . "/$total: $receiver";
     mail(
         $receiver,
         $subject,