OpencachingDeutschland / oc-server3

local/devel/find_unicode_boms.php

Doc Comments +3 added lines

@@ -39,6 +39,9 @@
 }
 
 
+/**
+ * @param string $path
+ */
 function testforbom($path)
 {
     $filestart = file_get_contents($path, false, null, 0, 2);

Spacing +2 added lines, -2 removed lines

@@ -7,7 +7,7 @@ 
  *  Searches for Unicode byte order marks in code and template files
  ***************************************************************************/
 
-chdir(__DIR__ . '/../../htdocs');
+chdir(__DIR__.'/../../htdocs');
 require_once 'lib2/cli.inc.php';
 
 
@@ -25,7 +25,7 @@ 
     $hDir = opendir($dir);
     if ($hDir !== false) {
         while (($file = readdir($hDir)) !== false) {
-            $path = $dir . '/' . $file;
+            $path = $dir.'/'.$file;
             if (is_dir($path) && substr($file, 0, 1) !== '.' && $subdirs) {
                 scan($path, $subdirs);
             } else {

local/ocxml11client/index.php

Doc Comments +8 added lines

@@ -1281,11 +1281,19 @@
     }
 }
 
+/**
+ * @param string $recordtype
+ * @param string $info
+ */
 function importError($recordtype, $uuid, $r, $info)
 {
     echo 'error: ' . $recordtype . ' (' . $uuid . '): ' . $info . "\n";
 }
 
+/**
+ * @param string $recordtype
+ * @param string $info
+ */
 function importWarn($recordtype, $uuid, $r, $info)
 {
     echo 'warn: ' . $recordtype . ' (' . $uuid . '): ' . $info . "\n";

Spacing +56 added lines, -56 removed lines

@@ -27,12 +27,12 @@ 
  * - Test mit aktuellem OC.de-Stand
  ***************************************************************************/
 
-$rootpath = __DIR__ . '/../../htdocs/';
+$rootpath = __DIR__.'/../../htdocs/';
 
 // chdir to proper directory (needed for cronjobs)
 chdir(substr(realpath($_SERVER['PHP_SELF']), 0, strrpos(realpath($_SERVER['PHP_SELF']), '/')));
 
-require_once $rootpath . 'lib/clicompatbase.inc.php';
+require_once $rootpath.'lib/clicompatbase.inc.php';
 require_once 'xml2array.inc.php';
 require_once 'settings.php';
 
@@ -67,16 +67,16 @@ 
     $nFileNr = 0;
     $rs = sql('SELECT `id`, `url` FROM `pictures` WHERE `local`=0');
     while ($r = sql_fetch_array($rs)) {
-        $nFileNr ++;
+        $nFileNr++;
         $fileparts = mb_split('/', $r['url']);
         $filename = $fileparts[count($fileparts) - 1];
 
-        echo 'Downloading file ' . $nFileNr . ' of ' . $rCount['c'] . ': ' . $filename . "\n";
+        echo 'Downloading file '.$nFileNr.' of '.$rCount['c'].': '.$filename."\n";
 
         $success = true;
-        if (!file_exists($opt['pictures']['directory'] . $filename)) {
-            if (!@copy($r['url'], $opt['pictures']['directory'] . $filename)) {
-                echo 'error: Download nicht erfolgreich' . "\n";
+        if (!file_exists($opt['pictures']['directory'].$filename)) {
+            if (!@copy($r['url'], $opt['pictures']['directory'].$filename)) {
+                echo 'error: Download nicht erfolgreich'."\n";
                 $success = false;
             }
         }
@@ -84,7 +84,7 @@ 
         if ($success == true) {
             sql(
                 "UPDATE `pictures` SET `local`=1, `url`='&1' WHERE `id`='&2'",
-                $opt['pictures']['url'] . $filename,
+                $opt['pictures']['url'].$filename,
                 $r['id']
             );
         }
@@ -196,7 +196,7 @@ 
 
     if ($opt['session'] == 1) {
         // records abfragen
-        $sessionfile = $opt['tmpdir'] . 'session.xml';
+        $sessionfile = $opt['tmpdir'].'session.xml';
         if (file_exists($sessionfile)) {
             unlink($sessionfile);
         }
@@ -215,21 +215,21 @@ 
         $recordscount += $session['OCXMLSESSION']['RECORDS']['PICTURE'];
         $recordscount += $session['OCXMLSESSION']['RECORDS']['REMOVEOBJECT'];
 
-        echo 'Abruf seit ' . $lastUpdate . "\n";
+        echo 'Abruf seit '.$lastUpdate."\n";
         echo "------------------------\n";
-        echo 'Session-Id: ' . $sessionid . "\n";
-        echo 'User: ' . $session['OCXMLSESSION']['RECORDS']['USER'] . "\n";
-        echo 'Cache: ' . $session['OCXMLSESSION']['RECORDS']['CACHE'] . "\n";
-        echo 'Cachdesc: ' . $session['OCXMLSESSION']['RECORDS']['CACHEDESC'] . "\n";
-        echo 'Cachelog: ' . $session['OCXMLSESSION']['RECORDS']['CACHELOG'] . "\n";
-        echo 'Picture: ' . $session['OCXMLSESSION']['RECORDS']['PICTURE'] . "\n";
-        echo 'Removedobject: ' . $session['OCXMLSESSION']['RECORDS']['REMOVEOBJECT'] . "\n";
+        echo 'Session-Id: '.$sessionid."\n";
+        echo 'User: '.$session['OCXMLSESSION']['RECORDS']['USER']."\n";
+        echo 'Cache: '.$session['OCXMLSESSION']['RECORDS']['CACHE']."\n";
+        echo 'Cachdesc: '.$session['OCXMLSESSION']['RECORDS']['CACHEDESC']."\n";
+        echo 'Cachelog: '.$session['OCXMLSESSION']['RECORDS']['CACHELOG']."\n";
+        echo 'Picture: '.$session['OCXMLSESSION']['RECORDS']['PICTURE']."\n";
+        echo 'Removedobject: '.$session['OCXMLSESSION']['RECORDS']['REMOVEOBJECT']."\n";
         echo "------------------------\n";
-        echo 'Summe: ' . $recordscount . "\n";
+        echo 'Summe: '.$recordscount."\n";
 
         $filescount = ($recordscount + (500 - $recordscount % 500)) / 500;
 
-        echo 'Anzahl der Pakete: ' . $filescount . "\n";
+        echo 'Anzahl der Pakete: '.$filescount."\n";
         echo "\n";
 
         if ($recordscount == 0) {
@@ -237,20 +237,20 @@ 
             exit;
         }
 
-        for ($i = 1; $i <= $filescount; $i ++) {
-            echo "Download Paket: " . $i . ' von ' . $filescount . "\n";
+        for ($i = 1; $i <= $filescount; $i++) {
+            echo "Download Paket: ".$i.' von '.$filescount."\n";
 
             $fileurl = $opt['url_getsession'];
             $fileurl = mb_ereg_replace('{sessionid}', $sessionid, $fileurl);
             $fileurl = mb_ereg_replace('{file}', $i, $fileurl);
             $fileurl = mb_ereg_replace('{zip}', $opt['zip'], $fileurl);
-            $target = $opt['tmpdir'] . $sessionid . '-' . sprintf('%04d', $i) . $fileext;
+            $target = $opt['tmpdir'].$sessionid.'-'.sprintf('%04d', $i).$fileext;
 
             copy($fileurl, $target);
         }
     } else {
-        echo 'Download ...' . "\n";
-        $target = $opt['tmpdir'] . date('YmdHis') . $fileext;
+        echo 'Download ...'."\n";
+        $target = $opt['tmpdir'].date('YmdHis').$fileext;
         copy($url, $target);
     }
 }
@@ -262,24 +262,24 @@ 
     // alle zips entpacken
     $hDir = opendir($opt['tmpdir']);
     while (false !== ($file = readdir($hDir))) {
-        if (is_file($opt['tmpdir'] . $file)) {
+        if (is_file($opt['tmpdir'].$file)) {
             $bCopy = false;
             if (mb_substr($file, mb_strrpos($file, '.')) == '.zip') {
-                echo 'Unzipping file ' . $file . "\n";
+                echo 'Unzipping file '.$file."\n";
                 system(
-                    $opt['unzip'] . ' --type=zip --src="' . $opt['rel_tmpdir'] . '/' . $file . '" --dst="' . $opt['rel_tmpdir'] . '"'
+                    $opt['unzip'].' --type=zip --src="'.$opt['rel_tmpdir'].'/'.$file.'" --dst="'.$opt['rel_tmpdir'].'"'
                 );
             } else {
                 if (mb_substr($file, mb_strrpos($file, '.')) == '.gz') {
-                    echo 'Unzipping file ' . $file . "\n";
+                    echo 'Unzipping file '.$file."\n";
                     system(
-                        $opt['unzip'] . ' --type=gzip --src="' . $opt['rel_tmpdir'] . '/' . $file . '" --dst="' . $opt['rel_tmpdir'] . '"'
+                        $opt['unzip'].' --type=gzip --src="'.$opt['rel_tmpdir'].'/'.$file.'" --dst="'.$opt['rel_tmpdir'].'"'
                     );
                 } else {
                     if (mb_substr($file, mb_strrpos($file, '.')) == '.bz2') {
-                        echo 'Unzipping file ' . $file . "\n";
+                        echo 'Unzipping file '.$file."\n";
                         system(
-                            $opt['unzip'] . ' --type=bzip2 --src="' . $opt['rel_tmpdir'] . '/' . $file . '" --dst="' . $opt['rel_tmpdir'] . '"'
+                            $opt['unzip'].' --type=bzip2 --src="'.$opt['rel_tmpdir'].'/'.$file.'" --dst="'.$opt['rel_tmpdir'].'"'
                         );
                     } else {
                         if (mb_substr($file, mb_strrpos($file, '.')) == '.xml') {
@@ -291,16 +291,16 @@ 
 
             // und jetzt die gezippte Datei verschieben
             $archivdir = $opt['archivdir'];
-            $archivdir .= $opt['curdb'] . '/';
+            $archivdir .= $opt['curdb'].'/';
 
             if (!is_dir($archivdir)) {
                 mkdir($archivdir);
             }
 
             if ($bCopy == true) {
-                copy($opt['tmpdir'] . $file, $archivdir . '/' . $file);
+                copy($opt['tmpdir'].$file, $archivdir.'/'.$file);
             } else {
-                rename($opt['tmpdir'] . $file, $archivdir . '/' . $file);
+                rename($opt['tmpdir'].$file, $archivdir.'/'.$file);
             }
         }
     }
@@ -315,9 +315,9 @@ 
 
     $hDir = opendir($opt['tmpdir']);
     while (false !== ($file = readdir($hDir))) {
-        if (is_file($opt['tmpdir'] . $file)) {
+        if (is_file($opt['tmpdir'].$file)) {
             if ($file != '.cvsignore') {
-                $files[] = $opt['tmpdir'] . $file;
+                $files[] = $opt['tmpdir'].$file;
             }
         }
     }
@@ -331,7 +331,7 @@ 
 
 function importxmlfile($file)
 {
-    echo 'Importing file ' . $file . "\n";
+    echo 'Importing file '.$file."\n";
 
     $xmlReader = new xmlReader();
     $xmlReader->open($file);
@@ -411,11 +411,11 @@ 
                             if ($sSubElement != '') {
                                 // vorheriges element zuerst schlißen
                                 $sSubElement = '';
-                                $nRecursionLevel --;
+                                $nRecursionLevel--;
                             }
 
                             $sSubElement = mb_strtoupper($xmlReader->name);
-                            $nRecursionLevel ++;
+                            $nRecursionLevel++;
 
                             // attribute auslesen
                             if ($xmlReader->moveToFirstAttribute()) {
@@ -432,7 +432,7 @@ 
                         } else {
                             if ($xmlReader->nodeType == XMLReader::END_ELEMENT) {
                                 $sSubElement = '';
-                                $nRecursionLevel --;
+                                $nRecursionLevel--;
                             }
                         }
                     }
@@ -459,7 +459,7 @@ 
                     ImportRemovedObjectArray($node['REMOVEDOBJECT']);
                     break;
                 default:
-                    echo 'Unknown Element "' . $xmlReader->name . '", skipping' . "\n";
+                    echo 'Unknown Element "'.$xmlReader->name.'", skipping'."\n";
                     break;
             }
         }
@@ -481,9 +481,9 @@ 
 
     $hDir = opendir($opt['tmpdir']);
     while (false !== ($file = readdir($hDir))) {
-        if (is_file($opt['tmpdir'] . $file)) {
+        if (is_file($opt['tmpdir'].$file)) {
             if ($file != '.cvsignore') {
-                unlink($opt['tmpdir'] . $file);
+                unlink($opt['tmpdir'].$file);
             }
         }
     }
@@ -501,14 +501,14 @@ 
         // andere DB connecten?
         if (mb_substr($arg, 0, 5) == '--db=') {
             if (!is_numeric(mb_substr($arg, 5))) {
-                die('invalid alternative DB' . "\n");
+                die('invalid alternative DB'."\n");
             }
 
             $nDb = mb_substr($arg, 5);
 
             if ($nDb != 0) {
                 if (!isset($opt['db'][$nDb])) {
-                    die('invalid alternative DB' . "\n");
+                    die('invalid alternative DB'."\n");
                 }
 
                 mysql_close($dblink);
@@ -517,7 +517,7 @@ 
                     sql("SET NAMES 'utf8'");
                     sql('USE `&1`', $opt['db'][1]['name']);
                 } else {
-                    die('Connect to alternative DB failed' . "\n");
+                    die('Connect to alternative DB failed'."\n");
                 }
 
                 $opt['curdb'] = $nDb;
@@ -531,7 +531,7 @@ 
             sql("SET NAMES 'utf8'");
             sql('USE `&1`', $dbname);
         } else {
-            die('Connect to alternative DB failed' . "\n");
+            die('Connect to alternative DB failed'."\n");
         }
     }
 }
@@ -544,7 +544,7 @@ 
         !isset($r['USERNAME']['__DATA']) ||
         !isset($r['LASTMODIFIED']['__DATA'])
     ) {
-        echo 'warn: ImportUserArray required element not defined' . "\n";
+        echo 'warn: ImportUserArray required element not defined'."\n";
 
         return;
     }
@@ -637,7 +637,7 @@ 
         !isset($r['DATECREATED']['__DATA']) ||
         !isset($r['LASTMODIFIED']['__DATA'])
     ) {
-        echo 'warn: ImportCacheArray required element not defined' . "\n";
+        echo 'warn: ImportCacheArray required element not defined'."\n";
 
         return;
     }
@@ -808,7 +808,7 @@ 
         !isset($r['LANGUAGE']['__ATTR']['ID']) ||
         !isset($r['LASTMODIFIED']['__DATA'])
     ) {
-        echo 'error: ImportCacheDescArray required element not defined' . "\n";
+        echo 'error: ImportCacheDescArray required element not defined'."\n";
 
         return;
     }
@@ -965,7 +965,7 @@ 
         !isset($r['DATECREATED']['__DATA']) ||
         !isset($r['LASTMODIFIED']['__DATA'])
     ) {
-        echo 'error: ImportCachelogArray required element not defined' . "\n";
+        echo 'error: ImportCachelogArray required element not defined'."\n";
 
         return;
     }
@@ -996,7 +996,7 @@ 
 
     // logtype gültig?
     if (sqlValue(
-            "SELECT COUNT(*) FROM `log_types` WHERE `id`='" . sql_escape($r['LOGTYPE']['__ATTR']['ID']) . "'",
+            "SELECT COUNT(*) FROM `log_types` WHERE `id`='".sql_escape($r['LOGTYPE']['__ATTR']['ID'])."'",
             0
         ) == 0
     ) {
@@ -1070,7 +1070,7 @@ 
         !isset($r['DATECREATED']['__DATA']) ||
         !isset($r['LASTMODIFIED']['__DATA'])
     ) {
-        echo 'error: ImportPictureArray required element not defined ' . "\n";
+        echo 'error: ImportPictureArray required element not defined '."\n";
 
         return;
     }
@@ -1171,7 +1171,7 @@ 
         !isset($r['OBJECT']['__DATA']) ||
         !isset($r['REMOVEDDATE']['__DATA'])
     ) {
-        echo 'error: ImportRemovedObjectArray required element not defined' . "\n";
+        echo 'error: ImportRemovedObjectArray required element not defined'."\n";
 
         return;
     }
@@ -1283,12 +1283,12 @@ 
 
 function importError($recordtype, $uuid, $r, $info)
 {
-    echo 'error: ' . $recordtype . ' (' . $uuid . '): ' . $info . "\n";
+    echo 'error: '.$recordtype.' ('.$uuid.'): '.$info."\n";
 }
 
 function importWarn($recordtype, $uuid, $r, $info)
 {
-    echo 'warn: ' . $recordtype . ' (' . $uuid . '): ' . $info . "\n";
+    echo 'warn: '.$recordtype.' ('.$uuid.'): '.$info."\n";
 }
 
 function restorevalues()

local/ocxml11client/xml2array.inc.php

Doc Comments +3 added lines

@@ -26,6 +26,9 @@
         $this->stack_ref =& $this->stack[count($this->stack) - 1];
     }
 
+    /**
+     * @param false|string $strInputXML
+     */
     public function parse($strInputXML)
     {
 

Spacing +3 added lines, -3 removed lines

@@ -16,14 +16,14 @@
 
     public function push_pos(&$pos)
     {
-        $this->stack[count($this->stack)] =& $pos;
-        $this->stack_ref =& $pos;
+        $this->stack[count($this->stack)] = & $pos;
+        $this->stack_ref = & $pos;
     }
 
     public function pop_pos()
     {
         unset($this->stack[count($this->stack) - 1]);
-        $this->stack_ref =& $this->stack[count($this->stack) - 1];
+        $this->stack_ref = & $this->stack[count($this->stack) - 1];
     }
 
     public function parse($strInputXML)

htdocs/editdesc.php

Braces +14 added lines, -7 removed lines

@@ -19,9 +19,12 @@ 
     require $stylepath . '/editdesc.inc.php';
 
     // check for old-style parameters
-    if (isset($_REQUEST['cacheid']) && isset($_REQUEST['desclang']) && !isset($_REQUEST['descid']))  // Ocprop
+    if (isset($_REQUEST['cacheid']) && isset($_REQUEST['desclang']) && !isset($_REQUEST['descid'])) {
+        // Ocprop
     {
-        $cache_id = $_REQUEST['cacheid'];  // Ocprop
+        $cache_id = $_REQUEST['cacheid'];
+    }
+    // Ocprop
         $desc_lang = $_REQUEST['desclang'];  // Ocprop
 
         $rs = sql("SELECT `id` FROM `cache_desc` WHERE `cache_id`='&1' AND `language`='&2'", $cache_id, $desc_lang);
@@ -87,10 +90,13 @@ 
                 $show_all_langs = false;
 
                 //save to DB?
-                if (isset($_POST['post']))  // Ocprop
+                if (isset($_POST['post'])) {
+                    // Ocprop
                 {
                     //here we read all used information from the form if submitted
-                    $descMode = isset($_POST['descMode']) ? $_POST['descMode'] + 0 : 1;  // Ocprop
+                    $descMode = isset($_POST['descMode']) ? $_POST['descMode'] + 0 : 1;
+                }
+                // Ocprop
 
                     // fuer alte Versionen von OCProp
                     if (isset($_POST['submit']) && !isset($_POST['version2'])) {
@@ -147,7 +153,8 @@ 
 
                     $desc = processEditorInput($oldDescMode, $descMode, $desc);
 
-                    if (isset($_POST['submitform']))  // Ocprop
+                    if (isset($_POST['submitform'])) {
+                        // Ocprop
                     {
                         // prüfen, ob sprache nicht schon vorhanden
                         $rs = sql(
@@ -160,6 +167,7 @@ 
                             $descid,
                             $desclang
                         );
+                    }
                         $r = sql_fetch_array($rs);
                         if ($r['count'] > 0) {
                             tpl_errorMsg('editdesc', $error_desc_exists);
@@ -224,8 +232,7 @@ 
 
                     if ($oldDescMode == 0) {
                         $desc = processEditorInput($oldDescMode, $descMode, $desc_record['desc']);
-                    }
-                    else {
+                    } else {
                         $desc = $desc_record['desc'];
                     }
                 }

Spacing +18 added lines, -18 removed lines

@@ -9,20 +9,20 @@ 
  *  Unicode Reminder メモ
  *****************************************************************************/
 
-require_once __DIR__ . '/lib/consts.inc.php';
+require_once __DIR__.'/lib/consts.inc.php';
 $opt['gui'] = GUI_HTML;
-require_once __DIR__ . '/lib/common.inc.php';
-require_once __DIR__ . '/lib2/edithelper.inc.php';
+require_once __DIR__.'/lib/common.inc.php';
+require_once __DIR__.'/lib2/edithelper.inc.php';
 
 // Preprocessing
 if ($error == false) {
-    require $stylepath . '/editdesc.inc.php';
+    require $stylepath.'/editdesc.inc.php';
 
     // check for old-style parameters
     if (isset($_REQUEST['cacheid']) && isset($_REQUEST['desclang']) && !isset($_REQUEST['descid']))  // Ocprop
     {
-        $cache_id = $_REQUEST['cacheid'];  // Ocprop
-        $desc_lang = $_REQUEST['desclang'];  // Ocprop
+        $cache_id = $_REQUEST['cacheid']; // Ocprop
+        $desc_lang = $_REQUEST['desclang']; // Ocprop
 
         $rs = sql("SELECT `id` FROM `cache_desc` WHERE `cache_id`='&1' AND `language`='&2'", $cache_id, $desc_lang);
         if (mysql_num_rows($rs) == 1) {
@@ -43,7 +43,7 @@ 
         $tplname = 'login';
 
         tpl_set_var('username', '');
-        tpl_set_var('target', htmlspecialchars('editdesc.php?descid=' . urlencode($descid), ENT_COMPAT, 'UTF-8'));
+        tpl_set_var('target', htmlspecialchars('editdesc.php?descid='.urlencode($descid), ENT_COMPAT, 'UTF-8'));
         tpl_set_var('message_start', "");
         tpl_set_var('message_end', "");
         tpl_set_var('message', $login_required);
@@ -90,7 +90,7 @@ 
                 if (isset($_POST['post']))  // Ocprop
                 {
                     //here we read all used information from the form if submitted
-                    $descMode = isset($_POST['descMode']) ? $_POST['descMode'] + 0 : 1;  // Ocprop
+                    $descMode = isset($_POST['descMode']) ? $_POST['descMode'] + 0 : 1; // Ocprop
 
                     // fuer alte Versionen von OCProp
                     if (isset($_POST['submit']) && !isset($_POST['version2'])) {
@@ -123,7 +123,7 @@ 
                         $oldDescMode = $descMode;
                     }
 
-                    $short_desc = $_POST['short_desc'];  // Ocprop
+                    $short_desc = $_POST['short_desc']; // Ocprop
                     $hint = htmlspecialchars($_POST['hints'], ENT_COMPAT, 'UTF-8');
                     $desclang = $_POST['desclang'];
                     $show_all_langs = isset($_POST['show_all_langs_value']) ? $_POST['show_all_langs_value'] : 0;
@@ -138,7 +138,7 @@ 
                     }
 
                     // Text from textarea
-                    $desc = $_POST['desc'];  // Ocprop
+                    $desc = $_POST['desc']; // Ocprop
 
                     // fuer alte Versionen von OCProp
                     if (isset($_POST['submit']) && !isset($_POST['version2'])) {
@@ -207,7 +207,7 @@ 
                         db_slave_exclude();
 
                         // redirect to cachepage
-                        tpl_redirect('editcache.php?cacheid=' . urlencode($desc_record['cache_id']));
+                        tpl_redirect('editcache.php?cacheid='.urlencode($desc_record['cache_id']));
                         exit;
                     } elseif (isset($_POST['show_all_langs'])) {
                         $show_all_langs = true;
@@ -277,7 +277,7 @@ 
                     ($show_all_langs == true) ? 1 : 0);
                 while ($rLanguage = sql_fetch_assoc($rsLanguages)) {
                     $sSelected = ($rLanguage['short'] == $desc_lang) ? ' selected="selected"' : '';
-                    $languages .= '<option value="' . $rLanguage['short'] . '"' . $sSelected . '>' . htmlspecialchars($rLanguage['name'], ENT_COMPAT, 'UTF-8') . '</option>' . "\n";
+                    $languages .= '<option value="'.$rLanguage['short'].'"'.$sSelected.'>'.htmlspecialchars($rLanguage['name'], ENT_COMPAT, 'UTF-8').'</option>'."\n";
                 }
                 sql_free_result($rsLanguages);
 
@@ -297,20 +297,20 @@ 
                 tpl_set_var('desclang', htmlspecialchars($desc_lang, ENT_COMPAT, 'UTF-8'));
                 tpl_set_var('desclang_name', htmlspecialchars(db_LanguageFromShort($desc_lang), ENT_COMPAT, 'UTF-8'));
                 tpl_set_var('cachename', htmlspecialchars($desc_record['name'], ENT_COMPAT, 'UTF-8'));
-                tpl_set_var('reset', $reset);  // obsolete
+                tpl_set_var('reset', $reset); // obsolete
                 tpl_set_var('submit', $submit);
 
                 // Text / normal HTML / HTML editor
                 tpl_set_var('use_tinymce', ($desc_htmledit == 1) ? 1 : 0);
 
-                $headers = tpl_get_var('htmlheaders') . "\n";
+                $headers = tpl_get_var('htmlheaders')."\n";
                 if (($desc_html == 1) && ($desc_htmledit == 1)) {
                     // TinyMCE
-                    $headers = tpl_get_var('htmlheaders') . "\n";
-                    $headers .= '<script language="javascript" type="text/javascript" src="resource2/tinymce/tiny_mce_gzip.js"></script>' . "\n";
-                    $headers .= '<script language="javascript" type="text/javascript" src="resource2/tinymce/config/desc.js.php?cacheid=' . ($desc_record['cache_id'] + 0) . '&lang=' . strtolower($locale) . '"></script>' . "\n";
+                    $headers = tpl_get_var('htmlheaders')."\n";
+                    $headers .= '<script language="javascript" type="text/javascript" src="resource2/tinymce/tiny_mce_gzip.js"></script>'."\n";
+                    $headers .= '<script language="javascript" type="text/javascript" src="resource2/tinymce/config/desc.js.php?cacheid='.($desc_record['cache_id'] + 0).'&lang='.strtolower($locale).'"></script>'."\n";
                 }
-                $headers .= '<script language="javascript" type="text/javascript" src="' . editorJsPath() . '"></script>' . "\n";
+                $headers .= '<script language="javascript" type="text/javascript" src="'.editorJsPath().'"></script>'."\n";
                 tpl_set_var('htmlheaders', $headers);
             } else {
                 // @todo: not the owner

htdocs/src/Oc/SmartyPlugins/block.nocache.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
         if (!isset($counter[$name])) {
             $counter[$name] = 0;
         }
-        $counter[$name] ++;
+        $counter[$name]++;
 
         if ($smarty->_cache_including) {
             $param = isset($smarty->_cache_info['cached_vars'][$name][$counter[$name]]) ? $smarty->_cache_info['cached_vars'][$name][$counter[$name]] : [];

htdocs/src/Oc/SmartyPlugins/function.season.php

Spacing +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
     ];
 
     $nTimestamp = time();
-    for ($nIndex = 0; $nIndex < count($seasons); $nIndex ++) {
+    for ($nIndex = 0; $nIndex < count($seasons); $nIndex++) {
         if (strtotime($seasons[$nIndex][0]) > $nTimestamp) {
             return $params['winter'];
         } //'';

htdocs/okapi_settings.php

Indentation +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
         'DATA_LICENSE_URL' => $opt['page']['absolute_url'] . $opt['logic']['license']['terms'],
         'DEBUG'            => ($opt['debug'] & DEBUG_DEVELOPER != 0),
         'DEBUG_PREVENT_SEMAPHORES'
-                           => !$opt['php']['semaphores'],  # not available on old developer system
+                            => !$opt['php']['semaphores'],  # not available on old developer system
         'DB_SERVER'        => $opt['db']['servername'],
         'DB_NAME'          => $opt['db']['placeholder']['db'],
         'DB_USERNAME'      => $opt['db']['username'],
@@ -54,7 +54,7 @@ 
         'OC_NODE_ID'       => $opt['logic']['node']['id'],
         'OC_COOKIE_NAME'   => $opt['session']['cookiename'] . 'data',
         'OCDE_HTML_PURIFIER_SETTINGS'
-                           => $opt['html_purifier'],
+                            => $opt['html_purifier'],
         'GITHUB_ACCESS_TOKEN' => $opt['okapi']['github_access_token'],
     );
 }

Spacing +11 added lines, -11 removed lines

@@ -16,24 +16,24 @@ 
     # [3] http://code.google.com/p/opencaching-api/issues/detail?id=132
 
     $opt['rootpath'] = $GLOBALS['rootpath'];
-    require $opt['rootpath'] . 'lib2/const.inc.php';   # (into the *local* scope!)
-    require $opt['rootpath'] . 'config2/settings-dist.inc.php';
-    require $opt['rootpath'] . 'config2/settings.inc.php';
+    require $opt['rootpath'].'lib2/const.inc.php'; # (into the *local* scope!)
+    require $opt['rootpath'].'config2/settings-dist.inc.php';
+    require $opt['rootpath'].'config2/settings.inc.php';
     
     return array(
 
         # Settings which ARE NOT present in settings.inc.php:
 
-        'OC_BRANCH' => 'oc.de',  # Tell OKAPI to work in "OCDE mode".
+        'OC_BRANCH' => 'oc.de', # Tell OKAPI to work in "OCDE mode".
 
         # Settings which ARE present in settings.inc.php:
 
         'ADMINS'           => array($opt['db']['warn']['mail'], 'rygielski@mimuw.edu.pl'),
         'FROM_FIELD'       => $opt['mail']['contact'],
-        'DATA_LICENSE_URL' => $opt['page']['absolute_url'] . $opt['logic']['license']['terms'],
+        'DATA_LICENSE_URL' => $opt['page']['absolute_url'].$opt['logic']['license']['terms'],
         'DEBUG'            => ($opt['debug'] & DEBUG_DEVELOPER != 0),
         'DEBUG_PREVENT_SEMAPHORES'
-                           => !$opt['php']['semaphores'],  # not available on old developer system
+                           => !$opt['php']['semaphores'], # not available on old developer system
         'DB_SERVER'        => $opt['db']['servername'],
         'DB_NAME'          => $opt['db']['placeholder']['db'],
         'DB_USERNAME'      => $opt['db']['username'],
@@ -43,16 +43,16 @@ 
         'TIMEZONE'         => $opt['php']['timezone'],
         'SITE_URL'         => $opt['page']['absolute_url'],
         'REGISTRATION_URL' => $opt['page']['https']['mode'] != HTTPS_DISABLED
-                                  ? 'https://' . $opt['page']['domain'] . '/register.php'
-                                  : $opt['page']['absolute_url'] . 'register.php',
+                                  ? 'https://'.$opt['page']['domain'].'/register.php'
+                                  : $opt['page']['absolute_url'].'register.php',
         'VAR_DIR'          => $opt['okapi']['var_dir'],
         'IMAGES_DIR'       => rtrim($opt['logic']['pictures']['dir'], '/'),
         'IMAGES_URL'       => rtrim($opt['logic']['pictures']['url'], '/').'/',
         'IMAGE_MAX_UPLOAD_SIZE' => 2 * $opt['logic']['pictures']['maxsize'],
-        'IMAGE_MAX_PIXEL_COUNT' => 786432,  # 1024 x 768; TODO: move PICTURE_MAX_LONG_SIDE to settings
-        'SITE_LOGO'        => $opt['page']['absolute_url'] . 'resource2/' . $opt['template']['default']['style'] . '/images/oclogo/oc_logo_alpha3.png',
+        'IMAGE_MAX_PIXEL_COUNT' => 786432, # 1024 x 768; TODO: move PICTURE_MAX_LONG_SIDE to settings
+        'SITE_LOGO'        => $opt['page']['absolute_url'].'resource2/'.$opt['template']['default']['style'].'/images/oclogo/oc_logo_alpha3.png',
         'OC_NODE_ID'       => $opt['logic']['node']['id'],
-        'OC_COOKIE_NAME'   => $opt['session']['cookiename'] . 'data',
+        'OC_COOKIE_NAME'   => $opt['session']['cookiename'].'data',
         'OCDE_HTML_PURIFIER_SETTINGS'
                            => $opt['html_purifier'],
         'GITHUB_ACCESS_TOKEN' => $opt['okapi']['github_access_token'],

htdocs/resource2/tinymce/config/log.js.php

Indentation +4 added lines, -4 removed lines

@@ -1,10 +1,10 @@
 <?php
-  if (isset($_REQUEST['lang'])) {
+    if (isset($_REQUEST['lang'])) {
     $lang = $_REQUEST['lang'];
-  }
-  else {
+    }
+    else {
     $lang = 'de';
-  }
+    }
 ?>
 tinyMCE_GZ.init({
     plugins : 'advhr,contextmenu,emotions,insertdatetime,paste,table',

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
 
 function imageBrowser(field_name, url, type, win)
 {
-  window.open('../../../../imagebrowser.php?logid=<?php echo isset($_REQUEST['logid']) ? ($_REQUEST['logid']+0) : 0; ?>', '', 'width=450,height=550,menubar=no,scrollbars=yes,status=no,location=no,resizable=yes,status=no,dependent');
+  window.open('../../../../imagebrowser.php?logid=<?php echo isset($_REQUEST['logid']) ? ($_REQUEST['logid'] + 0) : 0; ?>', '', 'width=450,height=550,menubar=no,scrollbars=yes,status=no,location=no,resizable=yes,status=no,dependent');
   fileBrowserWin = win;
   fileBrowserFieldName = field_name;
 }

Braces +1 added lines, -2 removed lines

@@ -1,8 +1,7 @@
 <?php
   if (isset($_REQUEST['lang'])) {
     $lang = $_REQUEST['lang'];
-  }
-  else {
+  } else {
     $lang = 'de';
   }
 ?>

htdocs/resource2/tinymce/config/desc.js.php

Indentation +8 added lines, -8 removed lines

@@ -1,16 +1,16 @@
 <?php
-  if (isset($_REQUEST['cacheid'])) {
+    if (isset($_REQUEST['cacheid'])) {
     $cacheID = $_REQUEST['cacheid'];
-  }
-  else {
+    }
+    else {
     $cacheID = 0;
-  }
-  if (isset($_REQUEST['lang'])) {
+    }
+    if (isset($_REQUEST['lang'])) {
     $lang = $_REQUEST['lang'];
-  }
-  else {
+    }
+    else {
     $lang = 'de';
-  }
+    }
 ?>
 tinyMCE_GZ.init({
     plugins : 'advhr,contextmenu,emotions,insertdatetime,paste,table',

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
 
 function imageBrowser(field_name, url, type, win)
 {
-  window.open('../../../../imagebrowser.php?cacheid=<?php echo $cacheID+0; ?>', '', 'width=450,height=550,menubar=no,scrollbars=yes,status=no,location=no,resizable=yes,status=no,dependent');
+  window.open('../../../../imagebrowser.php?cacheid=<?php echo $cacheID + 0; ?>', '', 'width=450,height=550,menubar=no,scrollbars=yes,status=no,location=no,resizable=yes,status=no,dependent');
   fileBrowserWin = win;
   fileBrowserFieldName = field_name;
 }

Braces +2 added lines, -4 removed lines

@@ -1,14 +1,12 @@
 <?php
   if (isset($_REQUEST['cacheid'])) {
     $cacheID = $_REQUEST['cacheid'];
-  }
-  else {
+  } else {
     $cacheID = 0;
   }
   if (isset($_REQUEST['lang'])) {
     $lang = $_REQUEST['lang'];
-  }
-  else {
+  } else {
     $lang = 'de';
   }
 ?>