OpencachingDeutschland / oc-server3

htdocs/lib2/search/ftsearch.inc.php

Spacing +2 added lines, -2 removed lines

@@ -199,7 +199,7 @@ 
     $str = '';
 
     ftsearch_load_ignores();
-    for ($i = count($astr) - 1; $i >= 0; $i --) {
+    for ($i = count($astr) - 1; $i >= 0; $i--) {
         // ignore?
         if (array_search(mb_strtolower($astr[$i]), $ftsearch_ignores) !== false) {
             unset($astr[$i]);
@@ -254,7 +254,7 @@ 
 
     // doppelte chars ersetzen
     $ordZ = ord('z');
-    for ($c = ord('a'); $c <= $ordZ; $c ++) {
+    for ($c = ord('a'); $c <= $ordZ; $c++) {
         $old_str = '';
         while ($old_str !== $str) {
             $old_str = $str;

htdocs/lib2/menu.class.php

Spacing +3 added lines, -3 removed lines

@@ -80,7 +80,7 @@ 
                         'parent' => MNU_MAP
                     ];
                     $menuitem[MNU_MAP]['subitems'][] = $menu_map;
-                    ++ $menu_map;
+                    ++$menu_map;
                 }
             }
         }
@@ -107,7 +107,7 @@ 
         $rsSubmenu = sqlf("SELECT `id` FROM `sys_menu` WHERE `parent`=0 ORDER BY `parent` ASC, `position` ASC");
         while ($rSubmenu = sql_fetch_assoc($rsSubmenu)) {
             $aMenu[MNU_ROOT]['subitems'][$nPos] = $rSubmenu['id'];
-            $nPos ++;
+            $nPos++;
         }
         sql_free_result($rsSubmenu);
         fwrite($f, "\n");
@@ -144,7 +144,7 @@ 
             );
             while ($rSubmenu = sql_fetch_assoc($rsSubmenu)) {
                 $aMenu[$r['id']]['subitems'][$nPos] = $rSubmenu['id'];
-                $nPos ++;
+                $nPos++;
             }
             sql_free_result($rsSubmenu);
         }

htdocs/src/Oc/Session/SessionDataNative.php

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
                     // TODO fix the following if statement, seems corrupted
                     if (strtolower(
                             substr(
-                                'http' + strstr($_SERVER['REFERER'], '://'),
+                                'http' +strstr($_SERVER['REFERER'], '://'),
                                 0,
                                 strlen($opt['page']['absolute_http_url'])
                             )

htdocs/src/Oc/Cache/WebCache.php

Spacing +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
                 \set_php_locale();
 
                 if ($this->translate->t('INTERNAL_LANG', 'all', 'OcSmarty.class.php', '') !== $sLanguage) {
-                    echo 'setlocale() failed to set language to ' . $sLanguage ."\n";
+                    echo 'setlocale() failed to set language to ' . $sLanguage . "\n";
                     die("Is the translation of INTERNAL_LANG correct?\n");
                 }
 

htdocs/lib2/util.inc.php

Doc Comments +2 added lines, -2 removed lines

@@ -284,7 +284,7 @@ 
  * @param $filename
  * @param $maxLength
  *
- * @return bool|string
+ * @return false|string
  */
 function read_file($filename, $maxLength = 4096)
 {
@@ -453,7 +453,7 @@ 
  *
  * @param $n
  *
- * @return mixed|string
+ * @return string
  */
 function number1000($n)
 {

Spacing +1 added lines, -1 removed lines

@@ -241,7 +241,7 @@
     while ($nCurPos < mb_strlen($str)) {
         $nNextSep = mb_strlen($str);
         $sepLength = mb_strlen($sep);
-        for ($nSepPos = 0; $nSepPos < $sepLength; $nSepPos ++) {
+        for ($nSepPos = 0; $nSepPos < $sepLength; $nSepPos++) {
             $nThisPos = mb_strpos($str, mb_substr($sep, $nSepPos, 1), $nCurPos);
             if ($nThisPos !== false && $nNextSep > $nThisPos) {
                 $nNextSep = $nThisPos;

htdocs/config2/settings-dist-travis.inc.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ .'/settings-sample-vagrant.inc.php';
+require_once __DIR__ . '/settings-sample-vagrant.inc.php';
 
 // database access
 $opt['db']['servername'] = '127.0.0.1';

htdocs/lib2/logic/picture.class.php

Spacing +2 added lines, -2 removed lines

@@ -464,9 +464,9 @@
                 return false;
             } else {
                 // restore picture file
-                $this->setUrl($original_url);     // set the url, so that we can
+                $this->setUrl($original_url); // set the url, so that we can
                 $filename = $this->getFilename(); // .. retrieve the file path+name
-                $this->setFilenames($filename);   // now set url(s) from the new uuid
+                $this->setFilenames($filename); // now set url(s) from the new uuid
                 try {
                     rename($this->deletedFilename($filename), $this->getFilename());
                 } catch (Exception $e) {

Doc Comments +2 added lines, -2 removed lines

@@ -692,7 +692,7 @@ 
     }
 
     /**
-     * @return bool|string
+     * @return string|false
      */
     public function getPageLink()
     {
@@ -724,7 +724,7 @@ 
     /**
      * @param $tmpFile
      * @param $longSideSize
-     * @return bool
+     * @return null|boolean
      */
     public function rotate_and_shrink($tmpFile, $longSideSize)
     {

htdocs/lang/de/ocstyle/main.tpl.php

Spacing +2 added lines, -2 removed lines

@@ -154,7 +154,7 @@ 
 <?php
 foreach ($opt['template']['locales'] AS $k => $lang) {
     if ($lang['status'] == OC_LOCALE_ACTIVE) {
-        echo '<a style="text-decoration: none;" href="'.$langUrl . $k . '"><img src="' . $lang['flag'] .
+        echo '<a style="text-decoration: none;" href="' . $langUrl . $k . '"><img src="' . $lang['flag'] .
             '" alt="' . $lang['name'] . '" title="' . $lang['name'] . '" width="24px" height="18px" /></a> ';
     }
 }
@@ -185,7 +185,7 @@ 
                                         }
                                         $nLastGroup = $tpl_usercountries[$i]['group'];
 
-                                        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>';
+                                        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>';
                                     }
 ?>
                                 </select>&nbsp;

htdocs/lib/clicompatbase.inc.php

Doc Comments +3 added lines

@@ -506,6 +506,9 @@
     return mysql_fetch_assoc($rs);
 }
 
+/**
+ * @param resource $rs
+ */
 function sql_fetch_row($rs)
 {
     return mysql_fetch_row($rs);

Spacing +3 added lines, -3 removed lines

@@ -38,9 +38,9 @@
 mb_language('uni');
 
 //load default webserver-settings and common includes
-require_once __DIR__  . '/consts.inc.php';
-require_once __DIR__  . '/settings.inc.php';
-require_once __DIR__  . '/../lib2/errorhandler.inc.php';
+require_once __DIR__ . '/consts.inc.php';
+require_once __DIR__ . '/settings.inc.php';
+require_once __DIR__ . '/../lib2/errorhandler.inc.php';
 
 // check for banned UAs
 $useragent = isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : "";