OpencachingDeutschland / oc-server3

htdocs/adoptcache.php

Spacing +4 added lines, -4 removed lines

@@ -5,7 +5,7 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 $tpl->name = 'adoptcache';
 $tpl->menuitem = MNU_CACHES_ADOPT;
@@ -173,7 +173,7 @@ 
 
     $adopt_result = $cache->addAdoption($userid);
     if ($adopt_result === true) {
-        $tpl->redirect('adoptcache.php?action=listbycache&cacheid=' . $cacheid);
+        $tpl->redirect('adoptcache.php?action=listbycache&cacheid='.$cacheid);
     } else {
         $tpl->assign('error', $adopt_result);
         listRequestsByCacheId($cacheid);
@@ -194,7 +194,7 @@ 
         $tpl->error(ERROR_UNKNOWN);
     }
 
-    $tpl->redirect('viewcache.php?cacheid=' . $cacheid);
+    $tpl->redirect('viewcache.php?cacheid='.$cacheid);
 }
 
 function cancelRequest($cacheid, $userid)
@@ -218,6 +218,6 @@ 
     if ($userid == $login->userid) {
         $tpl->redirect('adoptcache.php');
     } else {
-        $tpl->redirect('adoptcache.php?action=listbycache&cacheid=' . $cacheid);
+        $tpl->redirect('adoptcache.php?action=listbycache&cacheid='.$cacheid);
     }
 }

htdocs/viewprofile.php

Spacing +4 added lines, -4 removed lines

@@ -5,7 +5,7 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 $tpl->name = 'viewprofile';
 $tpl->menuitem = MNU_CACHES_USERPROFILE;
@@ -291,14 +291,14 @@ 
 }
 
 if ($show_oconly81) {
-    require __DIR__ . '/lib2/logic/oconly81.inc.php';
+    require __DIR__.'/lib2/logic/oconly81.inc.php';
     set_oconly81_tpldata($userid);
 }
 
 //Titel
 $menu->SetSelectItem($tpl->menuitem);
 
-$tpl->title = $menu->GetMenuTitle() . " " . $record['username'];
+$tpl->title = $menu->GetMenuTitle()." ".$record['username'];
 
 
 $tpl->assign('username', $record['username']);
@@ -329,7 +329,7 @@ 
     if (!$allpics) {
         $tpl->assign('logpics', LogPics::get(LogPics::FOR_USER_STAT, $userid));
     } else {
-        LogPics::setPaging(LogPics::FOR_USER_GALLERY, $userid, 0, "viewprofile.php?userid=" . $userid . "&allpics=1");
+        LogPics::setPaging(LogPics::FOR_USER_GALLERY, $userid, 0, "viewprofile.php?userid=".$userid."&allpics=1");
         $tpl->name = 'viewprofile_pics';
         // actually we dont need all the other stuff here ..
     }

htdocs/editdesc.php

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

Braces +6 added lines, -3 removed lines

@@ -21,7 +21,8 @@ 
     // check for old-style parameters
     if (isset($_REQUEST['cacheid']) &&
         isset($_REQUEST['desclang']) &&
-        !isset($_REQUEST['descid'])) {  // Ocprop
+        !isset($_REQUEST['descid'])) {
+// Ocprop
 
         $cache_id = $_REQUEST['cacheid'];  // Ocprop
         $desc_lang = $_REQUEST['desclang'];  // Ocprop
@@ -88,7 +89,8 @@ 
                 $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
 
@@ -147,7 +149,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(
                             "SELECT COUNT(*) `count`

htdocs/adminreports.php

Spacing +5 added lines, -5 removed lines

@@ -5,7 +5,7 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 $tpl->name = 'adminreports';
 $tpl->menuitem = MNU_ADMIN_REPORTS;
@@ -43,15 +43,15 @@ 
     ($adminid == 0 || ($adminid != $login->userid && $age >= 14))
 ) {
     sql("UPDATE `cache_reports` SET `status`=2, `adminid`=&2 WHERE `id`=&1", $rid, $login->userid);
-    $tpl->redirect('adminreports.php?id=' . $rid);
+    $tpl->redirect('adminreports.php?id='.$rid);
 } elseif (isset($_REQUEST['contact']) && $ownerid > 0) {
     $wp_oc = sql_value("SELECT `wp_oc` FROM `caches` WHERE `cache_id`='&1'", '', $cacheid);
-    $tpl->redirect('mailto.php?userid=' . urlencode($ownerid) . '&wp=' . $wp_oc);
+    $tpl->redirect('mailto.php?userid='.urlencode($ownerid).'&wp='.$wp_oc);
 } elseif (isset($_REQUEST['contact_reporter']) && $reporterid > 0) {
-    $tpl->redirect('mailto.php?userid=' . urlencode($reporterid) . '&reportid=' . $rid);
+    $tpl->redirect('mailto.php?userid='.urlencode($reporterid).'&reportid='.$rid);
 } elseif (isset($_REQUEST['done']) && $adminid == $login->userid) {
     sql("UPDATE `cache_reports` SET `status`=3 WHERE `id`=&1", $rid);
-    $tpl->redirect('adminreports.php?id=' . $rid);
+    $tpl->redirect('adminreports.php?id='.$rid);
 } elseif (isset($_REQUEST['assign']) && ($adminid == 0 || $adminid != $login->userid)) {
     $error = 1;
     $id = 0;

htdocs/event_attendance.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-require __DIR__ . '/lib2/web.inc.php';
+require __DIR__.'/lib2/web.inc.php';
 
 $tpl->name = 'event_attendance';
 $tpl->popup = true;

local/devel/find_bad_encodings.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 +4 added lines, -4 removed lines

@@ -7,7 +7,7 @@ 
  *  Searches for files which are no longer Unicode-encoded
  ***************************************************************************/
 
-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 {
@@ -41,7 +41,7 @@ 
 
 function test_encoding($path)
 {
-    static $ur_exclude = [  // no unicode reminder needed
+    static $ur_exclude = [// no unicode reminder needed
         'lang/de/ocstyle/search1/search.result.caches',
         'lib2/b2evo-captcha',
         'lib2/HTMLPurifier',
@@ -57,7 +57,7 @@ 
         if (mb_trim(mb_substr($contents, $ur + 17, 2)) != "メモ") {
             $ur = mb_stripos($contents, "Unicode Reminder");
             if (mb_trim(mb_substr($contents, $ur + 17, 2)) != "メモ") {
-                echo "Bad Unicode Reminder found in $path: " . mb_trim(mb_substr($contents, $ur + 17, 2)) . "\n";
+                echo "Bad Unicode Reminder found in $path: ".mb_trim(mb_substr($contents, $ur + 17, 2))."\n";
             } else {
                 echo "Unexpected non-ASCII chars (BOMs?) in header of $path\n";
             }

local/maintenance/update_passwords.php

Spacing +3 added lines, -3 removed lines

@@ -8,9 +8,9 @@
  ***************************************************************************/
 
 global $opt;
-$opt['rootpath'] = __DIR__ . '/../../htdocs/';
-require $opt['rootpath'] . 'lib2/cli.inc.php';
-require $opt['rootpath'] . 'lib2/logic/crypt.class.php';
+$opt['rootpath'] = __DIR__.'/../../htdocs/';
+require $opt['rootpath'].'lib2/cli.inc.php';
+require $opt['rootpath'].'lib2/logic/crypt.class.php';
 
 if (!isset($opt['logic']['password_salt']) || strlen($opt['logic']['password_salt']) < 32) {
     echo "Warning!\nPassword Salt not set or too short!\n\n";

local/maintenance/update_queries.php

Spacing +4 added lines, -4 removed lines

@@ -9,7 +9,7 @@ 
  ***************************************************************************/
 
 $opt['rootpath'] = '../../htdocs/';
-require $opt['rootpath'] . 'lib2/web.inc.php';
+require $opt['rootpath'].'lib2/web.inc.php';
 
 if ($argc != 2 || $argv[1] != 'go') {
     die("run with parameter 'go' to update queries\n");
@@ -22,15 +22,15 @@ 
         $cachesize = $query['cachesize'];
 
         // add nano size to all queries that include micro or other
-        if (preg_match('/[;][12][;]/', ';' . $cachesize . ';') &&
-            !preg_match('/[;][8][;]/', ';' . $cachesize . ';')
+        if (preg_match('/[;][12][;]/', ';'.$cachesize.';') &&
+            !preg_match('/[;][8][;]/', ';'.$cachesize.';')
         ) {
             // echo $r['name'] . ": " . $cachesize . " -> " . $query['cachesize'] .= ";8\n";
             $query['cachesize'] .= ';8';
             $saveopt = serialize($query);
             // sql("UPDATE queries SET `options`='&1' WHERE `id`='&2'", $saveopt, $r['id']);
             // ^^ run this line only if you are absolutely sure what you are doing
-            echo 'added nano to query ' . $r['id'] . "(" . $cachesize . ') of user ' . $r['user_id'] . "\n";
+            echo 'added nano to query '.$r['id']."(".$cachesize.') of user '.$r['user_id']."\n";
         }
     }
 }

local/maintenance/init_user_languages.php

Spacing +7 added lines, -7 removed lines

@@ -8,9 +8,9 @@ 
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-$opt['rootpath'] = __DIR__ . '/../../htdocs/';
-require_once $opt['rootpath'] . 'lib2/cli.inc.php';
-require_once $opt['rootpath'] . 'lib2/logic/user.class.php';
+$opt['rootpath'] = __DIR__.'/../../htdocs/';
+require_once $opt['rootpath'].'lib2/cli.inc.php';
+require_once $opt['rootpath'].'lib2/logic/user.class.php';
 
 $write = ($argc == 2 && $argv[1] = 'write');
 if (!$write) {
@@ -31,11 +31,11 @@ 
                 $lang
             );
         }
-        ++ $set;
+        ++$set;
     }
-    if (++ $processed % 1000 == 0) {
-        echo "$set of $processed " . ($write ? '' : 'would be ') . "set\n";
+    if (++$processed % 1000 == 0) {
+        echo "$set of $processed ".($write ? '' : 'would be ')."set\n";
     }
 }
-echo "$set of $processed " . ($write ? '' : 'would be ') . "set\n";
+echo "$set of $processed ".($write ? '' : 'would be ')."set\n";
 sql_free_result($rs);