XOOPS / XoopsCore25

htdocs/modules/pm/class/message.php

Spacing +10 added lines, -10 removed lines

@@ -134,7 +134,7 @@ 
     public function getSavecount(XoopsUser $user = null)
     {
         if (!is_object($user)) {
-            $user =& $GLOBALS['xoopsUser'];
+            $user = & $GLOBALS['xoopsUser'];
         }
         $crit_to = new CriteriaCompo(new Criteria('to_delete', 0));
         $crit_to->add(new Criteria('to_save', 1));
@@ -159,7 +159,7 @@ 
         global $xoopsConfig;
 
         if (!is_object($user)) {
-            $user =& $GLOBALS['xoopsUser'];
+            $user = & $GLOBALS['xoopsUser'];
         }
         $msg = sprintf(_PM_EMAIL_DESC, $user->getVar('uname'));
         $msg .= "\n\n";
@@ -167,17 +167,17 @@ 
         $msg .= "\n";
         $from = new XoopsUser($pm->getVar('from_userid'));
         $to   = new XoopsUser($pm->getVar('to_userid'));
-        $msg .= sprintf(_PM_EMAIL_FROM, $from->getVar('uname') . ' (' . XOOPS_URL . '/userinfo.php?uid=' . $pm->getVar('from_userid') . ')');
+        $msg .= sprintf(_PM_EMAIL_FROM, $from->getVar('uname').' ('.XOOPS_URL.'/userinfo.php?uid='.$pm->getVar('from_userid').')');
         $msg .= "\n";
-        $msg .= sprintf(_PM_EMAIL_TO, $to->getVar('uname') . ' (' . XOOPS_URL . '/userinfo.php?uid=' . $pm->getVar('to_userid') . ')');
+        $msg .= sprintf(_PM_EMAIL_TO, $to->getVar('uname').' ('.XOOPS_URL.'/userinfo.php?uid='.$pm->getVar('to_userid').')');
         $msg .= "\n";
-        $msg .= _PM_EMAIL_MESSAGE . ":\n";
-        $msg .= "\n" . $pm->getVar('subject') . "\n";
-        $msg .= "\n" . strip_tags(str_replace(array('<p>', '</p>', '<br>', '<br>'), "\n", $pm->getVar('msg_text'))) . "\n\n";
+        $msg .= _PM_EMAIL_MESSAGE.":\n";
+        $msg .= "\n".$pm->getVar('subject')."\n";
+        $msg .= "\n".strip_tags(str_replace(array('<p>', '</p>', '<br>', '<br>'), "\n", $pm->getVar('msg_text')))."\n\n";
         $msg .= "--------------\n";
-        $msg .= $xoopsConfig['sitename'] . ': ' . XOOPS_URL . "\n";
+        $msg .= $xoopsConfig['sitename'].': '.XOOPS_URL."\n";
 
-        $xoopsMailer =& xoops_getMailer();
+        $xoopsMailer = & xoops_getMailer();
         $xoopsMailer->useMail();
         $xoopsMailer->setToEmails($user->getVar('email'));
         $xoopsMailer->setFromEmail($xoopsConfig['adminmail']);
@@ -195,7 +195,7 @@ 
      **/
     public function getPruneForm()
     {
-        include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+        include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
         $form = new XoopsThemeForm(_PM_AM_PRUNE, 'form', 'prune.php', 'post', true);
 
         $form->addElement(new XoopsFormDateTime(_PM_AM_PRUNEAFTER, 'after'));

htdocs/modules/pm/admin/admin_header.php

Spacing +9 added lines, -9 removed lines

@@ -17,9 +17,9 @@ 
  */
 
 $path = dirname(dirname(dirname(__DIR__)));
-include_once $path . '/mainfile.php';
-include_once $path . '/include/cp_functions.php';
-require_once $path . '/include/cp_header.php';
+include_once $path.'/mainfile.php';
+include_once $path.'/include/cp_functions.php';
+require_once $path.'/include/cp_header.php';
 
 global $xoopsModule;
 
@@ -33,11 +33,11 @@ 
 xoops_loadLanguage('modinfo', $thisModuleDir);
 xoops_loadLanguage('main', $thisModuleDir);
 
-$pathIcon16      = '../' . $xoopsModule->getInfo('icons16');
-$pathIcon32      = '../' . $xoopsModule->getInfo('icons32');
+$pathIcon16      = '../'.$xoopsModule->getInfo('icons16');
+$pathIcon32      = '../'.$xoopsModule->getInfo('icons32');
 $pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin');
 
-include_once $GLOBALS['xoops']->path($pathModuleAdmin . '/moduleadmin.php');
+include_once $GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php');
 
 if ($xoopsUser) {
     /* @var $moduleperm_handler XoopsGroupPermHandler  */
@@ -46,17 +46,17 @@ 
         redirect_header(XOOPS_URL, 1, _NOPERM);
     }
 } else {
-    redirect_header(XOOPS_URL . '/user.php', 1, _NOPERM);
+    redirect_header(XOOPS_URL.'/user.php', 1, _NOPERM);
 }
 
 if (!isset($xoopsTpl) || !is_object($xoopsTpl)) {
-    include_once XOOPS_ROOT_PATH . '/class/template.php';
+    include_once XOOPS_ROOT_PATH.'/class/template.php';
     $xoopsTpl = new XoopsTpl();
 }
 
 //$xoopsTpl->assign('pathIcon16', $pathIcon16);
 
 if (!isset($GLOBALS['xoopsTpl']) || !is_object($GLOBALS['xoopsTpl'])) {
-    include_once XOOPS_ROOT_PATH . '/class/template.php';
+    include_once XOOPS_ROOT_PATH.'/class/template.php';
     $GLOBALS['xoopsTpl'] = new XoopsTpl();
 }

htdocs/modules/pm/admin/about.php

Spacing +4 added lines, -4 removed lines

@@ -16,9 +16,9 @@ 
  * @author              Mage, Mamba
  **/
 
-include_once dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
-include_once dirname(dirname(dirname(__DIR__))) . '/class/xoopsformloader.php';
-include_once __DIR__ . '/admin_header.php';
+include_once dirname(dirname(dirname(__DIR__))).'/include/cp_header.php';
+include_once dirname(dirname(dirname(__DIR__))).'/class/xoopsformloader.php';
+include_once __DIR__.'/admin_header.php';
 xoops_cp_header();
 
 $aboutAdmin = new ModuleAdmin();
@@ -26,5 +26,5 @@ 
 echo $aboutAdmin->addNavigation(basename(__FILE__));
 echo $aboutAdmin->renderAbout('xoopsfoundation@gmail.com', false);
 
-include_once __DIR__ . '/admin_footer.php';
+include_once __DIR__.'/admin_footer.php';
 //xoops_cp_footer();

htdocs/modules/pm/admin/admin_footer.php

Spacing +1 added lines, -1 removed lines

@@ -16,6 +16,6 @@
  * @author              XOOPS Development Team
  **/
 
-echo "<div class='adminfooter'>\n" . "  <div style='text-align: center;'>\n" . "    <a href='http://www.xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n" . "  </div>\n" . '  ' . _AM_MODULEADMIN_ADMIN_FOOTER . "\n" . '</div>';
+echo "<div class='adminfooter'>\n"."  <div style='text-align: center;'>\n"."    <a href='http://www.xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"."  </div>\n".'  '._AM_MODULEADMIN_ADMIN_FOOTER."\n".'</div>';
 
 xoops_cp_footer();

htdocs/modules/pm/admin/header.php

Spacing +2 added lines, -2 removed lines

@@ -16,9 +16,9 @@
  * @author              Taiwen Jiang <phppp@users.sourceforge.net>
  */
 
-require_once dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
+require_once dirname(dirname(dirname(__DIR__))).'/include/cp_header.php';
 
 if (!isset($GLOBALS['xoopsTpl']) || !is_object($GLOBALS['xoopsTpl'])) {
-    include_once XOOPS_ROOT_PATH . '/class/template.php';
+    include_once XOOPS_ROOT_PATH.'/class/template.php';
     $GLOBALS['xoopsTpl'] = new XoopsTpl();
 }

htdocs/modules/pm/admin/menu.php

Spacing +7 added lines, -7 removed lines

@@ -19,7 +19,7 @@ 
 // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
 
 $path = dirname(dirname(dirname(__DIR__)));
-include_once $path . '/mainfile.php';
+include_once $path.'/mainfile.php';
 
 $dirname         = basename(dirname(__DIR__));
 /* @var $module_handler XoopsModuleHandler */
@@ -27,10 +27,10 @@ 
 $module          = $module_handler->getByDirname($dirname);
 $pathIcon32      = $module->getInfo('icons32');
 $pathModuleAdmin = $module->getInfo('dirmoduleadmin');
-$pathLanguage    = $path . $pathModuleAdmin;
+$pathLanguage    = $path.$pathModuleAdmin;
 
-if (!file_exists($fileinc = $pathLanguage . '/language/' . $GLOBALS['xoopsConfig']['language'] . '/' . 'main.php')) {
-    $fileinc = $pathLanguage . '/language/english/main.php';
+if (!file_exists($fileinc = $pathLanguage.'/language/'.$GLOBALS['xoopsConfig']['language'].'/'.'main.php')) {
+    $fileinc = $pathLanguage.'/language/english/main.php';
 }
 
 include_once $fileinc;
@@ -40,12 +40,12 @@ 
 $i                      = 1;
 $adminmenu[$i]['title'] = _PM_MI_INDEX;
 $adminmenu[$i]['link']  = 'admin/admin.php';
-$adminmenu[$i]['icon']  = $pathIcon32 . '/home.png';
+$adminmenu[$i]['icon']  = $pathIcon32.'/home.png';
 ++$i;
 $adminmenu[$i]['title'] = _PM_MI_PRUNE;
 $adminmenu[$i]['link']  = 'admin/prune.php';
-$adminmenu[$i]['icon']  = $pathIcon32 . '/prune.png';
+$adminmenu[$i]['icon']  = $pathIcon32.'/prune.png';
 ++$i;
 $adminmenu[$i]['title'] = _PM_MI_ABOUT;
 $adminmenu[$i]['link']  = 'admin/about.php';
-$adminmenu[$i]['icon']  = $pathIcon32 . '/about.png';
+$adminmenu[$i]['icon']  = $pathIcon32.'/about.png';

htdocs/modules/pm/admin/prune.php

Spacing +2 added lines, -2 removed lines

@@ -16,7 +16,7 @@ 
  * @author              Jan Pedersen
  * @author              Taiwen Jiang <phppp@users.sourceforge.net>
  */
-include_once __DIR__ . '/admin_header.php';
+include_once __DIR__.'/admin_header.php';
 xoops_cp_header();
 
 $indexAdmin = new ModuleAdmin();
@@ -83,5 +83,5 @@ 
         redirect_header('admin.php', 2, sprintf(_PM_AM_MESSAGESPRUNED, $deletedrows));
         break;
 }
-include_once __DIR__ . '/admin_footer.php';
+include_once __DIR__.'/admin_footer.php';
 //xoops_cp_footer();

htdocs/modules/pm/admin/admin.php

Spacing +2 added lines, -2 removed lines

@@ -16,7 +16,7 @@ 
  * @author              Taiwen Jiang <phppp@users.sourceforge.net>
  */
 
-include_once __DIR__ . '/admin_header.php';
+include_once __DIR__.'/admin_header.php';
 xoops_cp_header();
 
 $indexAdmin = new ModuleAdmin();
@@ -24,5 +24,5 @@ 
 echo $indexAdmin->addNavigation(basename(__FILE__));
 echo $indexAdmin->renderIndex();
 
-include_once __DIR__ . '/admin_footer.php';
+include_once __DIR__.'/admin_footer.php';
 //xoops_cp_footer();

htdocs/modules/pm/pmlite.php

Spacing +14 added lines, -14 removed lines

@@ -18,9 +18,9 @@ 
  */
 
 if (!defined('XOOPS_MAINFILE_INCLUDED')) {
-    include_once dirname(dirname(__DIR__)) . '/mainfile.php';
+    include_once dirname(dirname(__DIR__)).'/mainfile.php';
 } else {
-    chdir(XOOPS_ROOT_PATH . '/modules/pm/');
+    chdir(XOOPS_ROOT_PATH.'/modules/pm/');
     xoops_loadLanguage('main', 'pm');
 }
 
@@ -38,7 +38,7 @@ 
 $msg_id    = XoopsRequest::getInt('msg_id', 0, 'GET');
 
 if (empty($_GET['refresh']) && $op !== 'submit') {
-    $jump = 'pmlite.php?refresh=' . time();
+    $jump = 'pmlite.php?refresh='.time();
     if ($send == 1) {
         $jump .= "&send={$send}";
     } elseif ($send2 == 1) {
@@ -47,7 +47,7 @@ 
         $jump .= "&reply={$reply}&msg_id={$msg_id}";
     } else {
     }
-    header('location: ' . $jump);
+    header('location: '.$jump);
     exit();
 }
 
@@ -62,9 +62,9 @@ 
     $member_handler = xoops_getHandler('member');
     $count          = $member_handler->getUserCount(new Criteria('uid', XoopsRequest::getInt('to_userid', 0, 'POST')));
     if ($count != 1) {
-        echo '<br><br><div><h4>' . _PM_USERNOEXIST . '<br>';
-        echo _PM_PLZTRYAGAIN . '</h4><br>';
-        echo "[ <a href='javascript:history.go(-1)'>" . _PM_GOBACK . '</a> ]</div>';
+        echo '<br><br><div><h4>'._PM_USERNOEXIST.'<br>';
+        echo _PM_PLZTRYAGAIN.'</h4><br>';
+        echo "[ <a href='javascript:history.go(-1)'>"._PM_GOBACK.'</a> ]</div>';
     } elseif ($GLOBALS['xoopsSecurity']->check()) {
         $pm_handler = xoops_getModuleHandler('message', 'pm');
         $pm         = $pm_handler->create();
@@ -83,15 +83,15 @@ 
         }
         if (!$pm_handler->insert($pm)) {
             echo $pm->getHtmlErrors();
-            echo "<br><a href='javascript:history.go(-1)'>" . _PM_GOBACK . '</a>';
+            echo "<br><a href='javascript:history.go(-1)'>"._PM_GOBACK.'</a>';
         } else {
             // @todo: Send notification email if user has selected this in the profile
 
-            echo "<br><br><div style='text-align:center;'><h4>" . _PM_MESSAGEPOSTED . "</h4><br><a href=\"javascript:window.opener.location='" . XOOPS_URL . "/viewpmsg.php';window.close();\">" . _PM_CLICKHERE . "</a><br><br><a href=\"javascript:window.close();\">" . _PM_ORCLOSEWINDOW . '</a></div>';
+            echo "<br><br><div style='text-align:center;'><h4>"._PM_MESSAGEPOSTED."</h4><br><a href=\"javascript:window.opener.location='".XOOPS_URL."/viewpmsg.php';window.close();\">"._PM_CLICKHERE."</a><br><br><a href=\"javascript:window.close();\">"._PM_ORCLOSEWINDOW.'</a></div>';
         }
     } else {
         echo implode('<br>', $GLOBALS['xoopsSecurity']->getErrors());
-        echo "<br><a href=\"javascript:window.close();\">" . _PM_ORCLOSEWINDOW . '</a>';
+        echo "<br><a href=\"javascript:window.close();\">"._PM_ORCLOSEWINDOW.'</a>';
     }
 } elseif ($reply == 1 || $send == 1 || $send2 == 1 || $sendmod == 1) {
     if ($reply == 1) {
@@ -101,7 +101,7 @@ 
             $pm_uname = XoopsUser::getUnameFromId($pm->getVar('from_userid'));
             $message  = "[quote]\n";
             $message .= sprintf(_PM_USERWROTE, $pm_uname);
-            $message .= "\n" . $pm->getVar('msg_text', 'E') . "\n[/quote]";
+            $message .= "\n".$pm->getVar('msg_text', 'E')."\n[/quote]";
         } else {
             unset($pm);
             $reply = $send2 = 0;
@@ -115,8 +115,8 @@ 
     $message = '';
     if ($reply == 1) {
         $subject = $pm->getVar('subject', 'E');
-        if (!preg_match('/^' . _RE . '/i', $subject)) {
-            $subject = _RE . ' ' . $subject;
+        if (!preg_match('/^'._RE.'/i', $subject)) {
+            $subject = _RE.' '.$subject;
         }
         $pmform->addElement(new XoopsFormLabel(_PM_TO, $pm_uname));
         $pmform->addElement(new XoopsFormHidden('to_userid', $pm->getVar('from_userid')));
@@ -142,7 +142,7 @@ 
     $icons_radio = new XoopsFormRadio(_MESSAGEICON, 'msg_image', $msg_image);
     $subjectImages = array();
     foreach ($subject_icons as $name => $value) {
-        $subjectImages[$name] = '<img src="' . XOOPS_URL . '/images/subject/' . $value .'">';
+        $subjectImages[$name] = '<img src="'.XOOPS_URL.'/images/subject/'.$value.'">';
     }
     $icons_radio->addOptionArray($subjectImages);
     $pmform->addElement($icons_radio);