XOOPS / XoopsCore

htdocs/install/class/installwizard.php

Spacing +17 added lines, -17 removed lines

@@ -64,12 +64,12 @@ 
         $this->initLanguage(!empty($_COOKIE['xo_install_lang']) ? $_COOKIE['xo_install_lang'] : 'en_US');
         // Setup pages
         $pages = array();
-        include_once dirname(__DIR__) . '/include/page.php';
+        include_once dirname(__DIR__).'/include/page.php';
         $this->pages = $pages;
 
         // Load default configs
         $configs = array();
-        include_once dirname(__DIR__) . '/include/config.php';
+        include_once dirname(__DIR__).'/include/config.php';
         $this->configs = $configs;
 
         if (!$this->checkAccess()) {
@@ -135,10 +135,10 @@ 
      */
     public function loadLangFile($file)
     {
-        if (file_exists($file = XOOPS_INSTALL_PATH . "/locale/{$this->language}/{$file}.php")) {
+        if (file_exists($file = XOOPS_INSTALL_PATH."/locale/{$this->language}/{$file}.php")) {
             include_once $file;
         } else {
-            $file = XOOPS_INSTALL_PATH . "/locale/en_US/{$file}.php";
+            $file = XOOPS_INSTALL_PATH."/locale/en_US/{$file}.php";
             include_once $file;
         }
     }
@@ -151,7 +151,7 @@ 
     public function initLanguage($language)
     {
         $language = preg_replace("/[^a-z0-9_\-]/i", "", $language);
-        if (!file_exists(XOOPS_INSTALL_PATH . "/locale/{$language}/install.php")) {
+        if (!file_exists(XOOPS_INSTALL_PATH."/locale/{$language}/install.php")) {
             $language = 'en_US';
         }
         $this->language = $language;
@@ -193,7 +193,7 @@ 
         $proto = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on') ? 'https' : 'http';
         $host = $_SERVER['HTTP_HOST'];
         $base = substr($_SERVER['PHP_SELF'], 0, strrpos($_SERVER['PHP_SELF'], '/'));
-        return $proto . '://' . $host . $base;
+        return $proto.'://'.$host.$base;
     }
 
     /**
@@ -218,13 +218,13 @@ 
         }
         if (!isset($pages[$pageIndex])) {
             if (defined("XOOPS_URL")) {
-                return XOOPS_URL . '/';
+                return XOOPS_URL.'/';
             } else {
                 return $this->baseLocation();
             }
         }
         $page = $pages[$pageIndex];
-        return $this->baseLocation() . "/page_{$page}.php";
+        return $this->baseLocation()."/page_{$page}.php";
     }
 
     /**
@@ -253,7 +253,7 @@ 
 
         /* @var Xoops\Form\Form $form */
         foreach ($this->form as $form) {
-            $ret .= "<fieldset><legend>" . $form->getTitle() . "</legend>\n";
+            $ret .= "<fieldset><legend>".$form->getTitle()."</legend>\n";
 
             /* @var Xoops\Form\Element $ele */
             foreach ($form->getElements() as $ele) {
@@ -261,31 +261,31 @@ 
                 if ($ele instanceof Xoops\Form\Element) {
                     if (!$ele->isHidden()) {
                         if (($caption = $ele->getCaption()) != '') {
-                            $ret .= "<label class='xolabel' for='" . $ele->getName() . "'>" . $caption . "</label>";
+                            $ret .= "<label class='xolabel' for='".$ele->getName()."'>".$caption."</label>";
                             if (($desc = $ele->getDescription()) != '') {
                                 $ret .= "<div class='xoform-help'>";
                                 $ret .= $desc;
                                 $ret .= "</div>";
                             }
                         }
-                        $ret .= $ele->render() . "\n";
+                        $ret .= $ele->render()."\n";
                     } else {
-                        $hidden .= $ele->render() . "\n";
+                        $hidden .= $ele->render()."\n";
                     }
                 }
             }
-            $ret .= "</fieldset>\n" . $hidden . "\n" . $form->renderValidationJS(true);
+            $ret .= "</fieldset>\n".$hidden."\n".$form->renderValidationJS(true);
         }
         return $ret;
     }
 
     function cleanCache($cacheFolder) {
-        $cache = array(1,2,3);
+        $cache = array(1, 2, 3);
         if (!empty($cache)) {
             for ($i = 0; $i < count($cache); ++$i) {
                 switch ($cache[$i]) {
                     case 1:
-                        $files = glob($cacheFolder. '/caches/smarty_cache/*.*');
+                        $files = glob($cacheFolder.'/caches/smarty_cache/*.*');
                         foreach ($files as $filename) {
                             if (basename(strtolower($filename)) !== 'index.html') {
                                 unlink($filename);
@@ -294,7 +294,7 @@ 
                         break;
 
                     case 2:
-                        $files = glob($cacheFolder . '/caches/smarty_compile/*.*');
+                        $files = glob($cacheFolder.'/caches/smarty_compile/*.*');
                         foreach ($files as $filename) {
                             if (basename(strtolower($filename)) !== 'index.html') {
                                 unlink($filename);
@@ -303,7 +303,7 @@ 
                         break;
 
                     case 3:
-                        $files = glob($cacheFolder . '/caches/xoops_cache/*.*');
+                        $files = glob($cacheFolder.'/caches/xoops_cache/*.*');
                         foreach ($files as $filename) {
                             if (basename(strtolower($filename)) !== 'index.html') {
                                 unlink($filename);

htdocs/install/index.php

Spacing +1 added lines, -1 removed lines

@@ -25,5 +25,5 @@
  * @version     $Id$
  */
 
-require_once __DIR__ . '/page_langselect.php';
+require_once __DIR__.'/page_langselect.php';
 exit();

htdocs/install/page_start.php

Spacing +5 added lines, -5 removed lines

@@ -24,7 +24,7 @@ 
  * @version     $Id$
  */
 
-require_once __DIR__ . '/include/common.inc.php';
+require_once __DIR__.'/include/common.inc.php';
 
 $_SESSION['error'] = array();
 //$_SESSION['settings'] = array();
@@ -43,7 +43,7 @@ 
 
 $writable = "<ul class='confirmMsg'>";
 foreach ($wizard->configs['writable'] as $key => $value) {
-    if (is_dir('../' . $value)) {
+    if (is_dir('../'.$value)) {
         $writable .= "<li class='directory'>$value</li>";
     } else {
         $writable .= "<li class='files'>$value</li>";
@@ -59,10 +59,10 @@ 
 
 $writable_trust = "<ul class='confirmMsg'>";
 foreach ($wizard->configs['dataPath'] as $key => $value) {
-    $writable_trust .= "<li class='directory'>" . $wizard->configs['xoopsPathDefault']['data'] . '/' . $key . "</li>";
+    $writable_trust .= "<li class='directory'>".$wizard->configs['xoopsPathDefault']['data'].'/'.$key."</li>";
     if (is_array($value)) {
         foreach ($value as $key2 => $value2) {
-            $writable_trust .= "<li class='directory'>" . $wizard->configs['xoopsPathDefault']['data'] . '/' . $key . '/' . $value2 . "</li>";
+            $writable_trust .= "<li class='directory'>".$wizard->configs['xoopsPathDefault']['data'].'/'.$key.'/'.$value2."</li>";
         }
     }
 }
@@ -73,4 +73,4 @@ 
 $_SESSION['pageHasHelp'] = false;
 $_SESSION['pageHasForm'] = false;
 $_SESSION['content'] = $content;
-include XOOPS_INSTALL_PATH . '/include/install_tpl.php';
+include XOOPS_INSTALL_PATH.'/include/install_tpl.php';

htdocs/install/page_siteinit.php

Spacing +17 added lines, -17 removed lines

@@ -23,13 +23,13 @@ 
  * @author      DuGris (aka L. JEN) <dugris@frxoops.org>
  */
 
-require_once __DIR__ . '/include/common.inc.php';
+require_once __DIR__.'/include/common.inc.php';
 
 set_time_limit(0); // don't want this to timeout
 
 function exception_handler($exception)
 {
-    echo "Uncaught exception: " , $exception->getMessage(), "\n";
+    echo "Uncaught exception: ", $exception->getMessage(), "\n";
     var_dump($exception->getTrace());
 }
 
@@ -54,8 +54,8 @@ 
 $xoops->loadLocale('system');
 
 // Install system module
-include_once $root . "/modules/system/class/module.php";
-include_once $root . "/modules/system/class/system.php";
+include_once $root."/modules/system/class/module.php";
+include_once $root."/modules/system/class/system.php";
 
 $system_module = new SystemModule();
 $system = System::getInstance();
@@ -114,7 +114,7 @@ 
         exit();
     }
 
-    $res = $dbm->query("SELECT COUNT(*) FROM " . $dbm->db->prefix('system_user'));
+    $res = $dbm->query("SELECT COUNT(*) FROM ".$dbm->db->prefix('system_user'));
     list ($isadmin) = $dbm->db->fetchRow($res);
 }
 
@@ -123,7 +123,7 @@ 
 if ($isadmin) {
     $pageHasForm = false;
     $pageHasHelp = false;
-    echo "<div class='x2-note errorMsg'>" . ADMIN_EXIST . "</div>\n";
+    echo "<div class='x2-note errorMsg'>".ADMIN_EXIST."</div>\n";
 } else {
     ?>
 <fieldset>
@@ -132,20 +132,20 @@ 
     <?php
             echo '<script type="text/javascript">
                 var desc = new Array();
-                desc[0] = "' . PASSWORD_DESC . '";
-                desc[1] = "' . PASSWORD_VERY_WEAK . '";
-                desc[2] = "' . PASSWORD_WEAK . '";
-                desc[3] = "' . PASSWORD_BETTER . '";
-                desc[4] = "' . PASSWORD_MEDIUM . '";
-                desc[5] = "' . PASSWORD_STRONG . '";
-                desc[6] = "' . PASSWORD_STRONGEST . '";
+                desc[0] = "' . PASSWORD_DESC.'";
+                desc[1] = "' . PASSWORD_VERY_WEAK.'";
+                desc[2] = "' . PASSWORD_WEAK.'";
+                desc[3] = "' . PASSWORD_BETTER.'";
+                desc[4] = "' . PASSWORD_MEDIUM.'";
+                desc[5] = "' . PASSWORD_STRONG.'";
+                desc[6] = "' . PASSWORD_STRONGEST.'";
         </script>';
 
     echo xoFormField('adminname', $siteconfig['adminname'], ADMIN_LOGIN_LABEL);
     if (!empty($error["name"])) {
         echo '<ul class="diags1">';
         foreach ($error["name"] as $errmsg) {
-            echo '<li class="failure">' . $errmsg . '</li>';
+            echo '<li class="failure">'.$errmsg.'</li>';
         }
         echo '</ul>';
     }
@@ -154,7 +154,7 @@ 
     if (!empty($error["email"])) {
         echo '<ul class="diags1">';
         foreach ($error["email"] as $errmsg) {
-            echo '<li class="failure">' . $errmsg . '</li>';
+            echo '<li class="failure">'.$errmsg.'</li>';
         }
         echo '</ul>';
     }
@@ -168,7 +168,7 @@ 
         if (!empty($error["pass"])) {
             echo '<ul class="diags1">';
             foreach ($error["pass"] as $errmsg) {
-                echo '<li class="failure">' . $errmsg . '</li>';
+                echo '<li class="failure">'.$errmsg.'</li>';
             }
             echo '</ul>';
         }
@@ -211,4 +211,4 @@ 
 $_SESSION['pageHasHelp'] = $pageHasHelp;
 $_SESSION['pageHasForm'] = $pageHasForm;
 $_SESSION['content'] = $content;
-include XOOPS_INSTALL_PATH . '/include/install_tpl.php';
+include XOOPS_INSTALL_PATH.'/include/install_tpl.php';

htdocs/readpmsg.php

Spacing +2 added lines, -2 removed lines

@@ -22,7 +22,7 @@ 
  * @version         $Id$
  */
 
-include __DIR__ . '/mainfile.php';
+include __DIR__.'/mainfile.php';
 $xoops = Xoops::getInstance();
 $xoops->events()->triggerEvent('core.readpmsg.start');
 
@@ -96,7 +96,7 @@ 
             }
         } else {
             $xoops->tpl()->assign('subject', $obj->getVar("subject"));
-            echo $xoops->confirm(array("ok" => 1, "msg_id" => $id, "op" => "delete"), 'readpmsg.php', XoopsLocale::Q_ARE_YOU_SURE_YOU_WANT_TO_DELETE_THIS_MESSAGES . '<br />' . $obj->getVar("subject"));
+            echo $xoops->confirm(array("ok" => 1, "msg_id" => $id, "op" => "delete"), 'readpmsg.php', XoopsLocale::Q_ARE_YOU_SURE_YOU_WANT_TO_DELETE_THIS_MESSAGES.'<br />'.$obj->getVar("subject"));
         }
         break;
 }

htdocs/misc.php

Indentation +2 added lines, -2 removed lines

@@ -88,8 +88,8 @@
                     $ymail = isset($_POST['ymail']) ? trim($_POST['ymail']) : '';
                 }
                 if (!isset($_POST['yname']) || trim($_POST['yname']) == "" || $ymail == ''
-				|| !isset($_POST['fname']) || trim($_POST['fname']) == "" || !isset($_POST['fmail'])
-				|| trim($_POST['fmail']) == '') {
+                || !isset($_POST['fname']) || trim($_POST['fname']) == "" || !isset($_POST['fmail'])
+                || trim($_POST['fmail']) == '') {
                     $xoops->redirect($xoops_url . "/misc.php?action=showpopups&type=friend&op=sendform", 2, XoopsLocale::E_YOU_NEED_TO_ENTER_REQUIRED_INFO);
                     exit();
                 }

Spacing +8 added lines, -8 removed lines

@@ -24,7 +24,7 @@ 
  * @version         $Id$
  */
 
-include __DIR__ . '/mainfile.php';
+include __DIR__.'/mainfile.php';
 
 $xoops = Xoops::getInstance();
 $xoops->logger()->quiet();
@@ -90,21 +90,21 @@ 
                 if (!isset($_POST['yname']) || trim($_POST['yname']) == "" || $ymail == ''
 				|| !isset($_POST['fname']) || trim($_POST['fname']) == "" || !isset($_POST['fmail'])
 				|| trim($_POST['fmail']) == '') {
-                    $xoops->redirect($xoops_url . "/misc.php?action=showpopups&type=friend&op=sendform", 2, XoopsLocale::E_YOU_NEED_TO_ENTER_REQUIRED_INFO);
+                    $xoops->redirect($xoops_url."/misc.php?action=showpopups&type=friend&op=sendform", 2, XoopsLocale::E_YOU_NEED_TO_ENTER_REQUIRED_INFO);
                     exit();
                 }
                 $yname = trim($_POST['yname']);
                 $fname = trim($_POST['fname']);
                 $fmail = trim($_POST['fmail']);
                 if (!$xoops->checkEmail($fmail) || !$xoops->checkEmail($ymail) || preg_match("/[\\0-\\31]/", $yname)) {
-                    $errormessage = XoopsLocale::EMAIL_PROVIDED_IS_INVALID . "<br />" . XoopsLocale::E_CHECK_EMAIL_AND_TRY_AGAIN . "";
-                    $xoops->redirect($xoops_url . "/misc.php?action=showpopups&amp;type=friend&amp;op=sendform", 2, $errormessage);
+                    $errormessage = XoopsLocale::EMAIL_PROVIDED_IS_INVALID."<br />".XoopsLocale::E_CHECK_EMAIL_AND_TRY_AGAIN."";
+                    $xoops->redirect($xoops_url."/misc.php?action=showpopups&amp;type=friend&amp;op=sendform", 2, $errormessage);
                 }
                 $xoopsMailer = $xoops->getMailer();
                 $xoopsMailer->setTemplate("tellfriend.tpl");
                 $xoopsMailer->assign("SITENAME", $xoops->getConfig('sitename'));
                 $xoopsMailer->assign("ADMINMAIL", $xoops->getConfig('adminmail'));
-                $xoopsMailer->assign("SITEURL", $xoops_url . "/");
+                $xoopsMailer->assign("SITEURL", $xoops_url."/");
                 $xoopsMailer->assign("YOUR_NAME", $yname);
                 $xoopsMailer->assign("FRIEND_NAME", $fname);
                 $xoopsMailer->setToEmails($fmail);
@@ -144,11 +144,11 @@ 
                     $onlineUsers[$i]['name'] = $user->getVar('uname');
                     $response = $xoops->service("Avatar")->getAvatarUrl($user);
                     $avatar = $response->getValue();
-                    $avatar = empty($avatar) ? $xoops_upload_url . '/blank.gif' : $avatar;
+                    $avatar = empty($avatar) ? $xoops_upload_url.'/blank.gif' : $avatar;
                     $onlineUsers[$i]['avatar'] = $avatar;
                 } else {
                     $onlineUsers[$i]['name'] = $xoops->getConfig('anonymous');
-                    $onlineUsers[$i]['avatar'] = $xoops_upload_url . '/blank.gif';
+                    $onlineUsers[$i]['avatar'] = $xoops_upload_url.'/blank.gif';
                 }
             }
 
@@ -166,7 +166,7 @@ 
             if ($xoops->getConfig('use_ssl') && isset($_POST[$xoops->getConfig('sslpost_name')]) && $xoops->isUser()) {
                 $xoops->loadLanguage('user');
                 echo sprintf(XoopsLocale::E_INCORRECT_LOGIN, $xoops->user->getVar('uname'));
-                echo '<div style="text-align:center;"><input class="formButton" value="' . XoopsLocale::A_CLOSE . '" type="button" onclick="window.opener.location.reload();window.close();" /></div>';
+                echo '<div style="text-align:center;"><input class="formButton" value="'.XoopsLocale::A_CLOSE.'" type="button" onclick="window.opener.location.reload();window.close();" /></div>';
                 $closebutton = false;
             }
             break;

htdocs/image.php

Spacing +2 added lines, -2 removed lines

@@ -19,9 +19,9 @@
  * @version         $Id$
  */
 
-include __DIR__ . '/mainfile.php';
+include __DIR__.'/mainfile.php';
 
 \Xoops::getInstance()->events()->triggerEvent('core.image');
 
 header('Content-type: image/gif');
-readfile(\XoopsBaseConfig::get('uploads-path') . '/blank.gif');
+readfile(\XoopsBaseConfig::get('uploads-path').'/blank.gif');

htdocs/browse.php

Spacing +8 added lines, -8 removed lines

@@ -20,7 +20,7 @@ 
  */
 
 $xoopsOption['nocommon'] = true;
-require_once __DIR__ . '/mainfile.php';
+require_once __DIR__.'/mainfile.php';
 
 //error_reporting(0);
 
@@ -42,7 +42,7 @@ 
 
 $path_type = substr($path, 0, strpos($path, '/'));
 if (!isset($xoops->paths[$path_type])) {
-    $path = "XOOPS/" . $path;
+    $path = "XOOPS/".$path;
     $path_type = "XOOPS";
 }
 
@@ -56,7 +56,7 @@ 
 $dir = realpath($xoops->paths[$path_type][0]);
 
 //We are not allowing directory traversal either
-if ($file===false || $dir===false || !strstr($file, $dir)) {
+if ($file === false || $dir === false || !strstr($file, $dir)) {
     header("HTTP/1.0 404 Not Found");
     exit();
 }
@@ -94,11 +94,11 @@ 
 
 // Output now
 // seconds, minutes, hours, days
-$expires = 60*60*24*15;
+$expires = 60 * 60 * 24 * 15;
 //header("Pragma: public");
-header("Cache-Control: public, max-age=" . $expires);
-header('Expires: ' . gmdate('D, d M Y H:i:s', time() + $expires) . ' GMT');
-header('Last-Modified: ' . gmdate('D, d M Y H:i:s T', $mtime));
-header('Content-type: ' . $mimetype);
+header("Cache-Control: public, max-age=".$expires);
+header('Expires: '.gmdate('D, d M Y H:i:s', time() + $expires).' GMT');
+header('Last-Modified: '.gmdate('D, d M Y H:i:s T', $mtime));
+header('Content-type: '.$mimetype);
 readfile($file);
 exit;

htdocs/notifications.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
  * @version         $Id$
  */
 
-include __DIR__ . '/mainfile.php';
+include __DIR__.'/mainfile.php';
 
 $xoops = Xoops::getInstance();
 if ($xoops->isActiveModule('notifications')) {