geekwright / XoopsCore

htdocs/modules/pm/admin/prune.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
  * @author          Jan Pedersen
  * @author          Taiwen Jiang <phppp@users.sourceforge.net>
  */
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 
 $xoops = Xoops::getInstance();
 $xoops->header();

htdocs/modules/pm/admin/header.php

Spacing +1 added lines, -1 removed lines

@@ -19,6 +19,6 @@
  * @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';
 
 $xoops = Xoops::getInstance();

htdocs/modules/pm/xoops_version.php

Spacing +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
 // paypal
 $modversion['paypal']                  = array();
 $modversion['paypal']['business']      = 'xoopsfoundation@gmail.com';
-$modversion['paypal']['item_name']     = 'Donation : ' . _PM_MI_DESC;
+$modversion['paypal']['item_name']     = 'Donation : '._PM_MI_DESC;
 $modversion['paypal']['amount']        = 0;
 $modversion['paypal']['currency_code'] = 'USD';
 

htdocs/modules/pm/readpmsg.php

Spacing +3 added lines, -3 removed lines

@@ -26,7 +26,7 @@ 
  * @author          Taiwen Jiang <phppp@users.sourceforge.net>
  */
 
-include_once dirname(dirname(__DIR__)) . '/mainfile.php';
+include_once dirname(dirname(__DIR__)).'/mainfile.php';
 
 $xoops = Xoops::getInstance();
 
@@ -49,7 +49,7 @@ 
 if (is_object($pm) && !$xoops->user->isAdmin() && ($pm->getVar('from_userid') != $xoops->user->getVar('uid'))
     && ($pm->getVar('to_userid') != $xoops->user->getVar('uid'))
 ) {
-    $xoops->redirect(XOOPS_URL . '/modules/' . $xoops->module->getVar("dirname", "n") . '/index.php', 2, XoopsLocale::E_NO_ACCESS_PERMISSION);
+    $xoops->redirect(XOOPS_URL.'/modules/'.$xoops->module->getVar("dirname", "n").'/index.php', 2, XoopsLocale::E_NO_ACCESS_PERMISSION);
 }
 
 if (is_object($pm) && !empty($_POST['action'])) {
@@ -112,7 +112,7 @@ 
         }
     }
     $res_message = isset($res_message) ? $res_message : (($res) ? _PM_ACTION_DONE : _PM_ACTION_ERROR);
-    $xoops->redirect('viewpmsg.php?op=' . htmlspecialchars($_REQUEST['op']), 2, $res_message);
+    $xoops->redirect('viewpmsg.php?op='.htmlspecialchars($_REQUEST['op']), 2, $res_message);
 }
 $start = !empty($_GET['start']) ? (int)($_GET['start']) : 0;
 $total_messages = !empty($_GET['total_messages']) ? (int)($_GET['total_messages']) : 0;

htdocs/modules/pm/preloads/preload.php

Spacing +4 added lines, -4 removed lines

@@ -34,7 +34,7 @@ 
      */
     public static function eventCorePmliteStart($args)
     {
-        header("location: ./modules/pm/pmlite.php" . (empty($_SERVER['QUERY_STRING']) ? "" : "?" . $_SERVER['QUERY_STRING']));
+        header("location: ./modules/pm/pmlite.php".(empty($_SERVER['QUERY_STRING']) ? "" : "?".$_SERVER['QUERY_STRING']));
         exit();
     }
 
@@ -47,7 +47,7 @@ 
      */
     public static function eventCoreReadpmsgStart($args)
     {
-        header("location: ./modules/pm/readpmsg.php" . (empty($_SERVER['QUERY_STRING']) ? "" : "?" . $_SERVER['QUERY_STRING']));
+        header("location: ./modules/pm/readpmsg.php".(empty($_SERVER['QUERY_STRING']) ? "" : "?".$_SERVER['QUERY_STRING']));
         exit();
     }
 
@@ -60,7 +60,7 @@ 
      */
     public static function eventCoreViewpmsgStart($args)
     {
-        header("location: ./modules/pm/viewpmsg.php" . (empty($_SERVER['QUERY_STRING']) ? "" : "?" . $_SERVER['QUERY_STRING']));
+        header("location: ./modules/pm/viewpmsg.php".(empty($_SERVER['QUERY_STRING']) ? "" : "?".$_SERVER['QUERY_STRING']));
         exit();
     }
 
@@ -97,7 +97,7 @@ 
      */
     public static function eventCoreServiceLocateUserMessage(Provider $provider)
     {
-        $path = dirname(__DIR__) . '/class/PMProvider.php';
+        $path = dirname(__DIR__).'/class/PMProvider.php';
         require $path;
         $object = new PMProvider();
         $provider->register($object);

htdocs/modules/pm/language/english/main.php

Spacing +41 added lines, -41 removed lines

@@ -6,61 +6,61 @@ 
 $xoops = Xoops::getInstance();
 
 //%%%%%%    File Name readpmsg.php  %%%%%
-define("_PM_DELETED","Your message(s) has been deleted");
-define("_PM_PRIVATEMESSAGE","Private Messages");
-define("_PM_INBOX","Inbox");
-define("_PM_FROM","From");
-define("_PM_YOUDONTHAVE","You don't have any private messages");
-define("_PM_FOLDER_EMPTY","This folder is empty.");
-define("_PM_FROMC","From: ");
-define("_PM_SENTC","Sent: "); // The date of message sent
+define("_PM_DELETED", "Your message(s) has been deleted");
+define("_PM_PRIVATEMESSAGE", "Private Messages");
+define("_PM_INBOX", "Inbox");
+define("_PM_FROM", "From");
+define("_PM_YOUDONTHAVE", "You don't have any private messages");
+define("_PM_FOLDER_EMPTY", "This folder is empty.");
+define("_PM_FROMC", "From: ");
+define("_PM_SENTC", "Sent: "); // The date of message sent
 //define("_PM_PROFILE","Profile");
 
 // %s is a username
-define("_PM_PREVIOUS","Previous Message");
-define("_PM_NEXT","Next Message");
+define("_PM_PREVIOUS", "Previous Message");
+define("_PM_NEXT", "Next Message");
 
 //%%%%%%    File Name pmlite.php    %%%%%
 //define("_PM_SORRY","Sorry! You are not a registered user.");
 //define("_PM_REGISTERNOW","Register Now!");
-define("_PM_GOBACK","Go Back");
-define("_PM_USERNOEXIST","The selected user doesn't exist in the database.");
-define("_PM_PLZTRYAGAIN","Please check the name and try again.");
-define("_PM_MESSAGEPOSTED","Your message has been posted");
-define("_PM_CLICKHERE","You can click here to view your private messages");
-define("_PM_ORCLOSEWINDOW","Or click here to close this window.");
-define("_PM_USERWROTE","%s wrote:");
-define("_PM_TO","To: ");
-define("_PM_SUBJECTC","Subject: ");
-define("_PM_MESSAGEC","Message: ");
-define("_PM_CLEAR","Clear");
-define("_PM_CANCELSEND","Cancel Send");
+define("_PM_GOBACK", "Go Back");
+define("_PM_USERNOEXIST", "The selected user doesn't exist in the database.");
+define("_PM_PLZTRYAGAIN", "Please check the name and try again.");
+define("_PM_MESSAGEPOSTED", "Your message has been posted");
+define("_PM_CLICKHERE", "You can click here to view your private messages");
+define("_PM_ORCLOSEWINDOW", "Or click here to close this window.");
+define("_PM_USERWROTE", "%s wrote:");
+define("_PM_TO", "To: ");
+define("_PM_SUBJECTC", "Subject: ");
+define("_PM_MESSAGEC", "Message: ");
+define("_PM_CLEAR", "Clear");
+define("_PM_CANCELSEND", "Cancel Send");
 //define("_PM_SUBMIT","Submit");
 define("_PM_SAVEINOUTBOX", "Save a copy in your outbox?");
 
 //%%%%%%    File Name viewpmsg.php  %%%%%
-define("_PM_SUBJECT","Subject");
-define("_PM_DATE","Date");
-define("_PM_NOTREAD","Not Read");
-define("_PM_SEND","Send new message");
-define("_PM_DELETE","Delete");
-define("_PM_TOSAVE","Move to Savebox");
-define("_PM_UNSAVE","Move out of Savebox");
-define("_PM_EMPTY","Empty");
+define("_PM_SUBJECT", "Subject");
+define("_PM_DATE", "Date");
+define("_PM_NOTREAD", "Not Read");
+define("_PM_SEND", "Send new message");
+define("_PM_DELETE", "Delete");
+define("_PM_TOSAVE", "Move to Savebox");
+define("_PM_UNSAVE", "Move out of Savebox");
+define("_PM_EMPTY", "Empty");
 define("_PM_REPLY", "Reply");
 //define("_PM_PLZREG","Please register first to send private messages!");
-define("_PM_SAVED_PART","You are allowed %d in your Savebox and you saved %d messages for this time");
-define("_PM_SAVED_ALL","Messages have been moved to Savebox");
-define("_PM_UNSAVED","Messages have been removed from Savebox");
-define("_PM_EMPTIED","The box has been emptied");
-define("_PM_RUSUREEMPTY","Are you sure to empty the box?");
-define("_PM_SURE_TO_DELETE","Are you sure to delete these message(s)?");
+define("_PM_SAVED_PART", "You are allowed %d in your Savebox and you saved %d messages for this time");
+define("_PM_SAVED_ALL", "Messages have been moved to Savebox");
+define("_PM_UNSAVED", "Messages have been removed from Savebox");
+define("_PM_EMPTIED", "The box has been emptied");
+define("_PM_RUSUREEMPTY", "Are you sure to empty the box?");
+define("_PM_SURE_TO_DELETE", "Are you sure to delete these message(s)?");
 
 define("_PM_ONLINE", "Online");
 
-define("_PM_OUTBOX","Outbox");
-define("_PM_SAVEBOX","Savebox");
-define("_PM_SAVE","SAVE");
+define("_PM_OUTBOX", "Outbox");
+define("_PM_SAVEBOX", "Savebox");
+define("_PM_SAVE", "SAVE");
 
 //WANISYS.NET PM HACK1.5
 //define("_PM_SORT","SORT");
@@ -89,5 +89,5 @@ 
 define("_PM_ACTION_ERROR", "Operation failed");
 
 //XOOPS 2.5.2
-define("_PM_READ","Already Read");
-define("_PM_SUBJECT_ICONS","Subject Icons: ");
+define("_PM_READ", "Already Read");
+define("_PM_SUBJECT_ICONS", "Subject Icons: ");

htdocs/modules/pm/pmlite.php

Spacing +13 added lines, -13 removed lines

@@ -24,9 +24,9 @@ 
  */
 
 if (!defined('XOOPS_MAINFILE_INCLUDED')) {
-    include_once dirname(dirname(__DIR__)) . '/mainfile.php';
+    include_once dirname(dirname(__DIR__)).'/mainfile.php';
 } else {
-    chdir(\XoopsBaseConfig::get('root-path') . '/modules/pm/');
+    chdir(\XoopsBaseConfig::get('root-path').'/modules/pm/');
 }
 $xoops = Xoops::getInstance();
 $xoops->loadLanguage('main', 'pm');
@@ -39,7 +39,7 @@ 
 $msg_id = isset($_GET['msg_id']) ? (int)($_GET['msg_id']) : 0;
 
 if (empty($_GET['refresh']) && isset($_POST['op']) && $_POST['op'] !== "submit") {
-    $jump = "pmlite.php?refresh=" . time();
+    $jump = "pmlite.php?refresh=".time();
     if ($send == 1) {
         $jump .= "&send={$send}";
     } else {
@@ -52,7 +52,7 @@ 
             }
         }
     }
-    header('location: ' . $jump);
+    header('location: '.$jump);
     exit();
 }
 
@@ -69,8 +69,8 @@ 
     $tpl = new XoopsTpl();
     if ($count != 1) {
         $error_message = _PM_USERNOEXIST;
-        $error_message .= "<br />" . _PM_PLZTRYAGAIN;
-        $error_message .= "<br />[ <a href='javascript:history.go(-1)'>" . _PM_GOBACK . "</a> ]";
+        $error_message .= "<br />"._PM_PLZTRYAGAIN;
+        $error_message .= "<br />[ <a href='javascript:history.go(-1)'>"._PM_GOBACK."</a> ]";
         $tpl->assign('error_message', $error_message);
     } else {
         if ($xoops->security()->check()) {
@@ -90,19 +90,19 @@ 
             }
             if (!$pm_handler->insert($pm)) {
                 $error_message = $pm->getHtmlErrors();
-                $error_message .= "<br /><a href='javascript:history.go(-1)'>" . _PM_GOBACK . "</a>";
+                $error_message .= "<br /><a href='javascript:history.go(-1)'>"._PM_GOBACK."</a>";
                 $tpl->assign('error_message', $error_message);
             } else {
                 // @todo: Send notification email if user has selected this in the profile
                 $info_message = _PM_MESSAGEPOSTED;
                 $info_message .= "<br />";
-                $info_message .= "<br /><a href=\"javascript:window.opener.location='" . \XoopsBaseConfig::get('url') . "/viewpmsg.php';window.close();\">" . _PM_CLICKHERE . "</a>";
-                $info_message .= "<br /><br /><a href=\"javascript:window.close();\">" . _PM_ORCLOSEWINDOW . "</a>";
+                $info_message .= "<br /><a href=\"javascript:window.opener.location='".\XoopsBaseConfig::get('url')."/viewpmsg.php';window.close();\">"._PM_CLICKHERE."</a>";
+                $info_message .= "<br /><br /><a href=\"javascript:window.close();\">"._PM_ORCLOSEWINDOW."</a>";
                 $tpl->assign('info_message', $info_message);
             }
         } else {
             $error_message = implode('<br />', $xoops->security()->getErrors());
-            $error_message .= "<br /><a href=\"javascript:window.close();\">" . _PM_ORCLOSEWINDOW . "</a>";
+            $error_message .= "<br /><a href=\"javascript:window.close();\">"._PM_ORCLOSEWINDOW."</a>";
             $tpl->assign('error_message', $error_message);
         }
     }
@@ -119,7 +119,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;
@@ -131,8 +131,8 @@ 
 
         if ($reply == 1) {
             $subject = $pm->getVar('subject', 'E');
-            if (!preg_match("/^" . XoopsLocale::C_RE . "/i", $subject)) {
-                $subject = XoopsLocale::C_RE . ' ' . $subject;
+            if (!preg_match("/^".XoopsLocale::C_RE."/i", $subject)) {
+                $subject = XoopsLocale::C_RE.' '.$subject;
             }
             $form->addElement(new Xoops\Form\Label(_PM_TO, $pm_uname));
             $form->addElement(new Xoops\Form\Hidden('to_userid', $pm->getVar("from_userid")));

htdocs/modules/pm/viewpmsg.php

Indentation +3 added lines, -3 removed lines

@@ -51,8 +51,8 @@ 
     } else {
         if (empty($_REQUEST['ok'])) {
             echo $xoops->confirm(array(
-                                 'ok' => 1, 'delete_messages' => 1, 'op' => $op,
-                                 'msg_ids' => json_encode(array_map("intval", $_POST['msg_id']))
+                                    'ok' => 1, 'delete_messages' => 1, 'op' => $op,
+                                    'msg_ids' => json_encode(array_map("intval", $_POST['msg_id']))
                             ), $_SERVER['REQUEST_URI'], XoopsLocale::Q_ARE_YOU_SURE_YOU_WANT_TO_DELETE_THIS_MESSAGES);
             $xoops->footer();
         } else {
@@ -129,7 +129,7 @@ 
     } else {
         if (empty($_REQUEST['ok'])) {
             echo $xoops->confirm(array(
-                                 'ok' => 1, 'empty_messages' => 1, 'op' => $op
+                                    'ok' => 1, 'empty_messages' => 1, 'op' => $op
                             ), $_SERVER['REQUEST_URI'], _PM_RUSUREEMPTY);
             $xoops->footer();
         } else {

Spacing +5 added lines, -5 removed lines

@@ -26,7 +26,7 @@ 
  * @author          Taiwen Jiang <phppp@users.sourceforge.net>
  */
 
-include_once dirname(dirname(__DIR__)) . '/mainfile.php';
+include_once dirname(dirname(__DIR__)).'/mainfile.php';
 
 $xoops = Xoops::getInstance();
 
@@ -61,7 +61,7 @@ 
                 $clean_msg_id = array_map("intval", $clean_msg_id);
             }
             $size = count($clean_msg_id);
-            $msg =& $clean_msg_id;
+            $msg = & $clean_msg_id;
             for ($i = 0; $i < $size; ++$i) {
                 $pm = $pm_handler->get($msg[$i]);
                 if ($pm->getVar('to_userid') == $xoops->user->getVar('uid')) {
@@ -218,7 +218,7 @@ 
 $xoops->tpl()->assign('op', $op);
 
 if ($total_messages > $xoops->getModuleConfig('perpage')) {
-    $nav = new XoopsPageNav($total_messages, $xoops->getModuleConfig('perpage'), $start, "start", 'op=' . $op);
+    $nav = new XoopsPageNav($total_messages, $xoops->getModuleConfig('perpage'), $start, "start", 'op='.$op);
     $xoops->tpl()->assign('pagenav', $nav->renderNav(4));
 }
 
@@ -233,7 +233,7 @@ 
         }
     }
     $member_handler = $xoops->getHandlerMember();
-    $senders = $member_handler->getUserList(new Criteria('uid', "(" . implode(", ", array_unique($uids)) . ")", "IN"));
+    $senders = $member_handler->getUserList(new Criteria('uid', "(".implode(", ", array_unique($uids)).")", "IN"));
     foreach (array_keys($pm_arr) as $i) {
         $message = $pm_arr[$i];
         //$message['msg_time'] = XoopsLocale::formatTimestamp($message["msg_time"], 'e');
@@ -252,7 +252,7 @@ 
 $send_button = new Xoops\Form\Button('', 'send', XoopsLocale::A_SEND);
 $send_button->set(
     'onclick',
-    'openWithSelfMain("' . $xoops->url('modules/pm/pmlite.php?send=1') . '" , "pmlite", 740,640);'
+    'openWithSelfMain("'.$xoops->url('modules/pm/pmlite.php?send=1').'" , "pmlite", 740,640);'
 );
 $delete_button = new Xoops\Form\Button('', 'delete_messages', XoopsLocale::A_DELETE, 'submit');
 $move_button = new Xoops\Form\Button('', 'move_messages', ($op === 'save') ? _PM_UNSAVE

htdocs/modules/pm/class/message.php

Indentation +2 added lines, -2 removed lines

@@ -180,8 +180,8 @@
         $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";
+                                                    "<p>", "</p>", "<br />", "<br />"
+                                                ), "\n", $pm->getVar("msg_text"))) . "\n\n";
         $msg .= "--------------\n";
         $msg .= $xoops->getConfig('sitename') . ": " . \XoopsBaseConfig::get('url') . "\n";
 

Spacing +9 added lines, -9 removed lines

@@ -171,19 +171,19 @@
         $msg .= "\n";
         $from = new XoopsUser($pm->getVar("from_userid"));
         $to = new XoopsUser($pm->getVar("to_userid"));
-        $msg .= sprintf(_PM_EMAIL_FROM, $from->getVar("uname") . " (" . \XoopsBaseConfig::get('url')
-            . "/userinfo.php?uid=" . $pm->getVar("from_userid") . ")");
+        $msg .= sprintf(_PM_EMAIL_FROM, $from->getVar("uname")." (".\XoopsBaseConfig::get('url')
+            . "/userinfo.php?uid=".$pm->getVar("from_userid").")");
         $msg .= "\n";
-        $msg .= sprintf(_PM_EMAIL_TO, $to->getVar("uname") . " (" . \XoopsBaseConfig::get('url')
-            . "/userinfo.php?uid=" . $pm->getVar("to_userid") . ")");
+        $msg .= sprintf(_PM_EMAIL_TO, $to->getVar("uname")." (".\XoopsBaseConfig::get('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(
+        $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";
+                                              ), "\n", $pm->getVar("msg_text")))."\n\n";
         $msg .= "--------------\n";
-        $msg .= $xoops->getConfig('sitename') . ": " . \XoopsBaseConfig::get('url') . "\n";
+        $msg .= $xoops->getConfig('sitename').": ".\XoopsBaseConfig::get('url')."\n";
 
         $xoopsMailer = $xoops->getMailer();
         $xoopsMailer->useMail();