OpencachingDeutschland / oc-server3

htdocs/lib/logic.inc.php

Spacing +6 added lines, -6 removed lines

@@ -15,8 +15,8 @@ 
     return sqlValue(
         "SELECT IFNULL(`stt`.`text`, `cache_type`.`en`)
          FROM `cache_type`
-         LEFT JOIN `sys_trans_text` `stt` ON `stt`.`trans_id`=`cache_type`.`trans_id` AND `stt`.`lang`='" . sql_escape($language) . "'
-         WHERE `cache_type`.`id`='" . sql_escape($cachetype) . "'",
+         LEFT JOIN `sys_trans_text` `stt` ON `stt`.`trans_id`=`cache_type`.`trans_id` AND `stt`.`lang`='" . sql_escape($language)."'
+         WHERE `cache_type`.`id`='" . sql_escape($cachetype)."'",
         ''
     );
 }
@@ -26,8 +26,8 @@ 
     return sqlValue(
         "SELECT IFNULL(`stt`.`text`, `cache_size`.`en`)
          FROM `cache_size`
-         LEFT JOIN `sys_trans_text` `stt` ON `stt`.`trans_id`=`cache_size`.`trans_id` AND `stt`.`lang`='" . sql_escape($language) . "'
-         WHERE `cache_size`.`id`='" . sql_escape($cachesize) . "'",
+         LEFT JOIN `sys_trans_text` `stt` ON `stt`.`trans_id`=`cache_size`.`trans_id` AND `stt`.`lang`='" . sql_escape($language)."'
+         WHERE `cache_size`.`id`='" . sql_escape($cachesize)."'",
         ''
     );
 }
@@ -37,8 +37,8 @@ 
     return sqlValue(
         "SELECT IFNULL(`stt`.`text`, `log_types`.`en`)
          FROM `log_types`
-         LEFT JOIN `sys_trans_text` `stt` ON `stt`.`trans_id`=`log_types`.`trans_id` AND `stt`.`lang`='" . sql_escape($language) . "'
-         WHERE `log_types`.`id`='" . sql_escape($logtype) . "'",
+         LEFT JOIN `sys_trans_text` `stt` ON `stt`.`trans_id`=`log_types`.`trans_id` AND `stt`.`lang`='" . sql_escape($language)."'
+         WHERE `log_types`.`id`='" . sql_escape($logtype)."'",
         ''
     );
 }

htdocs/newdesc.php

Spacing +21 added lines, -22 removed lines

@@ -9,10 +9,10 @@ 
  *  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) {
@@ -26,7 +26,7 @@ 
         $tplname = 'login';
 
         tpl_set_var('username', '');
-        tpl_set_var('target', htmlspecialchars('newdesc.php?cacheid=' . urlencode($cache_id), ENT_COMPAT, 'UTF-8'));
+        tpl_set_var('target', htmlspecialchars('newdesc.php?cacheid='.urlencode($cache_id), ENT_COMPAT, 'UTF-8'));
         tpl_set_var('message', $login_required);
         tpl_set_var('helplink', helppagelink('login'));
     } else {
@@ -40,15 +40,15 @@ 
             if ($cache_record['user_id'] == $usr['userid']) {
                 $tplname = 'newdesc';
 
-                require $stylepath . '/newdesc.inc.php';
+                require $stylepath.'/newdesc.inc.php';
 
                 //get the posted data
                 $show_all_langs = isset($_POST['show_all_langs']) ? $_POST['show_all_langs'] : 0;
-                $short_desc = isset($_POST['short_desc']) ? $_POST['short_desc'] : '';  // Ocprop
+                $short_desc = isset($_POST['short_desc']) ? $_POST['short_desc'] : ''; // Ocprop
 
-                $hints = isset($_POST['hints']) ? $_POST['hints'] : '';  // Ocprop
-                $sel_lang = isset($_POST['desc_lang']) ? $_POST['desc_lang'] : $default_lang;  // Ocprop
-                $desc = isset($_POST['desc']) ? $_POST['desc'] : '';  // Ocprop
+                $hints = isset($_POST['hints']) ? $_POST['hints'] : ''; // Ocprop
+                $sel_lang = isset($_POST['desc_lang']) ? $_POST['desc_lang'] : $default_lang; // Ocprop
+                $desc = isset($_POST['desc']) ? $_POST['desc'] : ''; // Ocprop
 
                 // read descMode; if not set, initialize from user profile
                 if (isset($_POST['descMode'])) {  // Ocprop
@@ -65,7 +65,7 @@ 
                         $oldDescMode = $descMode;
                     }
                 } else {
-                    if (sqlValue("SELECT `no_htmledit_flag` FROM `user` WHERE `user_id`='" . sql_escape($usr['userid']) . "'", 1) == 1) {
+                    if (sqlValue("SELECT `no_htmledit_flag` FROM `user` WHERE `user_id`='".sql_escape($usr['userid'])."'", 1) == 1) {
                         $descMode = 1;
                     } else {
                         $descMode = 3;
@@ -128,7 +128,7 @@ 
                         // do not use slave server for the next time ...
                         db_slave_exclude();
 
-                        tpl_redirect('editcache.php?cacheid=' . urlencode($cache_id));
+                        tpl_redirect('editcache.php?cacheid='.urlencode($cache_id));
                         exit;
                     }
                 } elseif (isset($_POST['show_all_langs_submit'])) {
@@ -142,8 +142,8 @@ 
                             FROM `languages_list_default`
                             LEFT JOIN `cache_desc`
                                 ON `languages_list_default`.`show`=`cache_desc`.`language`
-                                AND `cache_desc`.`cache_id`='" . sql_escape($cache_id) . "'
-                            WHERE `languages_list_default`.`lang`='" . sql_escape($locale) . "'
+                                AND `cache_desc`.`cache_id`='" . sql_escape($cache_id)."'
+                            WHERE `languages_list_default`.`lang`='" . sql_escape($locale)."'
                             AND ISNULL(`cache_desc`.`cache_id`)", 0) == 0
                     ) {
                         $show_all_langs = 1;
@@ -179,13 +179,13 @@ 
                     if ($sSelected != '') {
                         $selected = true;
                     }
-                    $langoptions .= '<option value="' . htmlspecialchars($rLanguage['short'], ENT_COMPAT, 'UTF-8') . '"' . $sSelected . '>' . htmlspecialchars($rLanguage['name'], ENT_COMPAT, 'UTF-8') . '</option>' . "\n";
+                    $langoptions .= '<option value="'.htmlspecialchars($rLanguage['short'], ENT_COMPAT, 'UTF-8').'"'.$sSelected.'>'.htmlspecialchars($rLanguage['name'], ENT_COMPAT, 'UTF-8').'</option>'."\n";
                 }
                 sql_free_result($rsLanguages);
                 if ($langoptions == '') {
                     // We get here if someone has added descriptions for all avaiable languages, which
                     // is very unlikely to happen ever. Just for completeness (see issue #108):
-                    tpl_redirect('editcache.php?cacheid=' . urlencode($cache_id));
+                    tpl_redirect('editcache.php?cacheid='.urlencode($cache_id));
                 }
 
                 tpl_set_var('langoptions', $langoptions);
@@ -195,8 +195,7 @@ 
                 tpl_set_var('name', htmlspecialchars($cache_record['name'], ENT_COMPAT, 'UTF-8'));
                 tpl_set_var('cacheid', htmlspecialchars($cache_id, ENT_COMPAT, 'UTF-8'));
 
-                tpl_set_var('lang_message', $desc_lang_exists ? $lang_message :
-                    (isset($_POST['submitform']) && $sel_lang == '0' ? $error_no_lang_selected : ''));
+                tpl_set_var('lang_message', $desc_lang_exists ? $lang_message : (isset($_POST['submitform']) && $sel_lang == '0' ? $error_no_lang_selected : ''));
 
                 tpl_set_var('show_all_langs', $show_all_langs);
                 tpl_set_var('show_all_langs_submit', ($show_all_langs == 0) ? $show_all_langs_submit : '');
@@ -209,16 +208,16 @@ 
                 tpl_set_var('descMode', $descMode);
                 tpl_set_var('htmlnotice', $descMode == 2 ? $htmlnotice : '');
 
-                $headers = tpl_get_var('htmlheaders') . "\n";
+                $headers = tpl_get_var('htmlheaders')."\n";
                 if ($descMode == 3) {
                     // TinyMCE
-                    $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=' . ($cache_id + 0) . '&lang=' . strtolower($locale) . '"></script>' . "\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='.($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);
 
-                tpl_set_var('reset', $reset);  // obsolete
+                tpl_set_var('reset', $reset); // obsolete
                 tpl_set_var('submit', $submit);
             } else {
                 //TODO: not the owner

Braces +4 added lines, -2 removed lines

@@ -51,7 +51,8 @@ 
                 $desc = isset($_POST['desc']) ? $_POST['desc'] : '';  // Ocprop
 
                 // read descMode; if not set, initialize from user profile
-                if (isset($_POST['descMode'])) {  // Ocprop
+                if (isset($_POST['descMode'])) {
+// Ocprop
                     $descMode = $_POST['descMode'] + 0;
                     if (($descMode < 1) || ($descMode > 3)) {
                         $descMode = 3;
@@ -89,7 +90,8 @@ 
                 $desc_lang_exists = false;
 
                 //save to db?
-                if (isset($_POST['submitform']) && $sel_lang != '0') {  // Ocprop
+                if (isset($_POST['submitform']) && $sel_lang != '0') {
+// Ocprop
                     //check if the entered language already exists
                     $desc_rs = sql(
                         "SELECT `id`

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);
     }
 }

Braces +2 added lines, -1 removed lines

@@ -61,7 +61,8 @@
     } else {
         showAdoptScreen($cacheid, $submit);
     }
-} else { // if ($action == 'listbyuser')
+} else {
+// if ($action == 'listbyuser')
     $tpl->assign('action', 'listbyuser');
     listRequestsByUserId();
 }

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/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";
         }
     }
 }