OpencachingDeutschland / oc-server3

htdocs/config2/settings-sample-vagrant.inc.php

Spacing +2 added lines, -2 removed lines

@@ -63,7 +63,7 @@ 
 $opt['session']['mode'] = SAVE_COOKIE;
 $opt['session']['cookiename'] = 'ocvagrant'; // only with SAVE_COOKIE
 $opt['session']['path'] = '/';
-$opt['session']['domain'] = 'local.team-opencaching.de';    // may be overwritten by $opt['domain'][...]['cookiedomain']
+$opt['session']['domain'] = 'local.team-opencaching.de'; // may be overwritten by $opt['domain'][...]['cookiedomain']
 
 /* If the Referer was sent by the client and the substring was not found,
  * the embedded session id will be marked as invalid.
@@ -221,7 +221,7 @@ 
  * Take caution on caching issues (!)
  */
 
-$opt['map']['towns']['enable'] = true;  // for releasing v14
+$opt['map']['towns']['enable'] = true; // for releasing v14
 
 define('MNU_INFO', 1015);
 define('MNU_TEAMBLOG', 1016);

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) {