XOOPS / XoopsCore

htdocs/modules/mailusers/admin/send_mails.php

Spacing +20 added lines, -20 removed lines

@@ -23,7 +23,7 @@ 
  * @version         $Id$
  */
 
-include_once __DIR__ . '/header.php';
+include_once __DIR__.'/header.php';
 
 $xoops = Xoops::getInstance();
 // Parameters
@@ -36,7 +36,7 @@ 
 $xoops->header('admin:mailusers/mailusers_send_mail.tpl');
 // Define Stylesheet
 $xoops->theme()->addBaseStylesheetAssets('modules/system/css/admin.css');
-$xoops->theme()->addBaseScriptAssets(array('@jquery','media/xoops/xoops.js','modules/system/js/admin.js'));
+$xoops->theme()->addBaseScriptAssets(array('@jquery', 'media/xoops/xoops.js', 'modules/system/js/admin.js'));
 
 $admin_page = new \Xoops\Module\Admin();
 $admin_page->renderNavigation('send_mails.php');
@@ -48,13 +48,13 @@ 
         $display_criteria = 1;
         $form = new Xoops\Form\ThemeForm(_AM_MAILUSERS_LIST, "mailusers", "send_mails.php", 'post', true);
         //----------------------------------------
-        if (!empty($memberslist_id) && (Request::getMethod()==='POST')) {
+        if (!empty($memberslist_id) && (Request::getMethod() === 'POST')) {
             $user_count = count($memberslist_id);
             $display_names = "";
             for ($i = 0; $i < $user_count; ++$i) {
                 $uid_hidden = new Xoops\Form\Hidden("mail_to_user[]", $memberslist_id[$i]);
                 $form->addElement($uid_hidden);
-                $display_names .= "<a href='" . \XoopsBaseConfig::get('url') . "/userinfo.php?uid=" . $memberslist_id[$i] . "' rel='external'>" . XoopsUser::getUnameFromId($memberslist_id[$i]) . "</a>, ";
+                $display_names .= "<a href='".\XoopsBaseConfig::get('url')."/userinfo.php?uid=".$memberslist_id[$i]."' rel='external'>".XoopsUser::getUnameFromId($memberslist_id[$i])."</a>, ";
                 unset($uid_hidden);
             }
             $users_label = new Xoops\Form\Label(_AM_MAILUSERS_SENDTOUSERS2, substr($display_names, 0, -2));
@@ -65,41 +65,41 @@ 
         //----------------------------------------
         if (!empty($display_criteria)) {
             $selected_groups = array();
-            $group_select = new Xoops\Form\SelectGroup('<div class="bold spacer">' . _AM_MAILUSERS_GROUPIS . '<span class="bold green">*</span></div>', "mail_to_group", false, $selected_groups, 5, true);
+            $group_select = new Xoops\Form\SelectGroup('<div class="bold spacer">'._AM_MAILUSERS_GROUPIS.'<span class="bold green">*</span></div>', "mail_to_group", false, $selected_groups, 5, true);
 
-            $lastlog_min = new Xoops\Form\DateSelect(_AM_MAILUSERS_LASTLOGMIN . '<span class="bold green">*</span>', 'mail_lastlog_min');
+            $lastlog_min = new Xoops\Form\DateSelect(_AM_MAILUSERS_LASTLOGMIN.'<span class="bold green">*</span>', 'mail_lastlog_min');
             $lastlog_min->setValue('');
-            $lastlog_max = new Xoops\Form\DateSelect(_AM_MAILUSERS_LASTLOGMAX . '<span class="bold green">*</span>', 'mail_lastlog_max');
+            $lastlog_max = new Xoops\Form\DateSelect(_AM_MAILUSERS_LASTLOGMAX.'<span class="bold green">*</span>', 'mail_lastlog_max');
             $lastlog_max->setValue('');
 
-            $date = new Xoops\Form\ElementTray('<div class="bold spacer">' . _AM_MAILUSERS_DATE . '</div>', '');
+            $date = new Xoops\Form\ElementTray('<div class="bold spacer">'._AM_MAILUSERS_DATE.'</div>', '');
             $date->addElement($lastlog_min);
             $date->addElement($lastlog_max);
 
-            $idle_more = new Xoops\Form\Text(_AM_MAILUSERS_IDLEMORE . '<span class="bold green">*</span>', "mail_idle_more", 2, 5);
-            $idle_less = new Xoops\Form\Text(_AM_MAILUSERS_IDLELESS . '<span class="bold green">*</span>', "mail_idle_less", 2, 5);
+            $idle_more = new Xoops\Form\Text(_AM_MAILUSERS_IDLEMORE.'<span class="bold green">*</span>', "mail_idle_more", 2, 5);
+            $idle_less = new Xoops\Form\Text(_AM_MAILUSERS_IDLELESS.'<span class="bold green">*</span>', "mail_idle_less", 2, 5);
 
-            $idle = new Xoops\Form\ElementTray('<div class="bold spacer">' . _AM_MAILUSERS_DAY . '</div>', '');
+            $idle = new Xoops\Form\ElementTray('<div class="bold spacer">'._AM_MAILUSERS_DAY.'</div>', '');
             $idle->addElement($idle_more);
             $idle->addElement($idle_less);
 
-            $regd_min = new Xoops\Form\DateSelect(_AM_MAILUSERS_REGDMIN . '<span class="bold green">*</span>', "mail_regd_min");
+            $regd_min = new Xoops\Form\DateSelect(_AM_MAILUSERS_REGDMIN.'<span class="bold green">*</span>', "mail_regd_min");
             $regd_min->setValue('');
-            $regd_max = new Xoops\Form\DateSelect(_AM_MAILUSERS_REGDMAX . '<span class="bold green">*</span>', "mail_regd_max");
+            $regd_max = new Xoops\Form\DateSelect(_AM_MAILUSERS_REGDMAX.'<span class="bold green">*</span>', "mail_regd_max");
             $regd_max->setValue('');
 
-            $regdate = new Xoops\Form\ElementTray('<div class="bold spacer">' . _AM_MAILUSERS_REGDATE . '</div>', '');
+            $regdate = new Xoops\Form\ElementTray('<div class="bold spacer">'._AM_MAILUSERS_REGDATE.'</div>', '');
             $regdate->addElement($regd_min);
             $regdate->addElement($regd_max);
 
             $mailok_cbox = new Xoops\Form\Checkbox('', 'mail_mailok');
-            $mailok_cbox->addOption(1, _AM_MAILUSERS_MAILOK . '<span class="bold green">*</span>');
+            $mailok_cbox->addOption(1, _AM_MAILUSERS_MAILOK.'<span class="bold green">*</span>');
             $inactive_cbox = new Xoops\Form\Checkbox('', "mail_inactive");
-            $inactive_cbox->addOption(1, _AM_MAILUSERS_INACTIVE . '<span class="bold green">*</span>');
+            $inactive_cbox->addOption(1, _AM_MAILUSERS_INACTIVE.'<span class="bold green">*</span>');
             $inactive_cbox->setExtra("onclick='javascript:disableElement(\"mail_lastlog_min\");disableElement(\"mail_lastlog_max\");disableElement(\"mail_idle_more\");disableElement(\"mail_idle_less\");disableElement(\"mail_to_group[]\");'");
 
             $criteria_tray = new Xoops\Form\ElementTray(_AM_MAILUSERS_SENDTOUSERS, "<br /><br />");
-            $criteria_tray->setDescription('<span class="bold green">*</span>' . _AM_MAILUSERS_OPTIONAL);
+            $criteria_tray->setDescription('<span class="bold green">*</span>'._AM_MAILUSERS_OPTIONAL);
             $criteria_tray->addElement($group_select);
             //$criteria_tray->addElement($lastlog);
             $criteria_tray->addElement($date);
@@ -114,12 +114,12 @@ 
             //$criteria_tray->addElement($regd_max);
             $form->addElement($criteria_tray);
         }
-        $fname_text = new Xoops\Form\Text(_AM_MAILUSERS_MAILFNAME, "mail_fromname", 30, 255, $xoops->getConfig('fromname') ? $xoops->getConfig('fromname') :htmlspecialchars($xoops->getConfig('sitename'), ENT_QUOTES));
+        $fname_text = new Xoops\Form\Text(_AM_MAILUSERS_MAILFNAME, "mail_fromname", 30, 255, $xoops->getConfig('fromname') ? $xoops->getConfig('fromname') : htmlspecialchars($xoops->getConfig('sitename'), ENT_QUOTES));
         $fromemail = $xoops->getConfig('from') ? $xoops->getConfig('from') : $xoops->user->getVar("email", "E");
         $femail_text = new Xoops\Form\Text(_AM_MAILUSERS_MAILFMAIL, "mail_fromemail", 30, 255, $fromemail);
-        $subject_caption = _AM_MAILUSERS_MAILSUBJECT . "<br /><br /><span style='font-size:x-small;font-weight:bold;'>" . _AM_MAILUSERS_MAILTAGS . "</span><br /><span style='font-size:x-small;font-weight:normal;'>" . _AM_MAILUSERS_MAILTAGS2 . "</span>";
+        $subject_caption = _AM_MAILUSERS_MAILSUBJECT."<br /><br /><span style='font-size:x-small;font-weight:bold;'>"._AM_MAILUSERS_MAILTAGS."</span><br /><span style='font-size:x-small;font-weight:normal;'>"._AM_MAILUSERS_MAILTAGS2."</span>";
         $subject_text = new Xoops\Form\Text($subject_caption, "mail_subject", 50, 255);
-        $body_caption = _AM_MAILUSERS_MAILBODY . "<br /><br /><span style='font-size:x-small;font-weight:bold;'>" . _AM_MAILUSERS_MAILTAGS . "</span><br /><span style='font-size:x-small;font-weight:normal;'>" . _AM_MAILUSERS_MAILTAGS1 . "<br />" . _AM_MAILUSERS_MAILTAGS2 . "<br />" . _AM_MAILUSERS_MAILTAGS3 . "<br />" . _AM_MAILUSERS_MAILTAGS4 . "</span>";
+        $body_caption = _AM_MAILUSERS_MAILBODY."<br /><br /><span style='font-size:x-small;font-weight:bold;'>"._AM_MAILUSERS_MAILTAGS."</span><br /><span style='font-size:x-small;font-weight:normal;'>"._AM_MAILUSERS_MAILTAGS1."<br />"._AM_MAILUSERS_MAILTAGS2."<br />"._AM_MAILUSERS_MAILTAGS3."<br />"._AM_MAILUSERS_MAILTAGS4."</span>";
         $editor_configs = array();
         $editor_configs["name"] = "mail_body";
         $editor_configs["value"] = '';

htdocs/modules/mailusers/admin/header.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
  * @version         $Id$
  */
 
-require_once dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
+require_once dirname(dirname(dirname(__DIR__))).'/include/cp_header.php';
 
 $xoops = Xoops::getInstance();
 $helper = Xoops\Module\Helper::getHelper('mailusers');

htdocs/modules/mailusers/xoops_version.php

Spacing +1 added lines, -1 removed lines

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

htdocs/modules/mailusers/language/english/admin.php

Spacing +36 added lines, -36 removed lines

@@ -34,51 +34,51 @@
 
 
 //define("_AM_MAILUSERS_AMIFCHECKD", "If this is checked, all the above plus private messaging will be ignored");
-define("_AM_MAILUSERS_EMAIL","Email");
-define("_AM_MAILUSERS_GROUPIS"," - Group:");
-define("_AM_MAILUSERS_DAY"," - Last Login days ago:");
-define("_AM_MAILUSERS_IDLEMORE","more than X");
-define("_AM_MAILUSERS_IDLELESS","less than X");
+define("_AM_MAILUSERS_EMAIL", "Email");
+define("_AM_MAILUSERS_GROUPIS", " - Group:");
+define("_AM_MAILUSERS_DAY", " - Last Login days ago:");
+define("_AM_MAILUSERS_IDLEMORE", "more than X");
+define("_AM_MAILUSERS_IDLELESS", "less than X");
 
-define("_AM_MAILUSERS_DATE"," - Last Login date:");
-define("_AM_MAILUSERS_LASTLOGMAX","before");
-define("_AM_MAILUSERS_LASTLOGMIN","after");
+define("_AM_MAILUSERS_DATE", " - Last Login date:");
+define("_AM_MAILUSERS_LASTLOGMAX", "before");
+define("_AM_MAILUSERS_LASTLOGMIN", "after");
 
-define("_AM_MAILUSERS_REGDATE"," - Registered date:");
-define("_AM_MAILUSERS_REGDMIN","after");
-define("_AM_MAILUSERS_REGDMAX","before");
+define("_AM_MAILUSERS_REGDATE", " - Registered date:");
+define("_AM_MAILUSERS_REGDMIN", "after");
+define("_AM_MAILUSERS_REGDMAX", "before");
 
-define("_AM_MAILUSERS_INACTIVE","Send message to inactive users only");
-define("_AM_MAILUSERS_MAILOK","Send message only to users that accept notification messages");
+define("_AM_MAILUSERS_INACTIVE", "Send message to inactive users only");
+define("_AM_MAILUSERS_MAILOK", "Send message only to users that accept notification messages");
 
-define("_AM_MAILUSERS_OPTIONAL","Optional value");
+define("_AM_MAILUSERS_OPTIONAL", "Optional value");
 
-define("_AM_MAILUSERS_LIST","Send Message to Users");
-define("_AM_MAILUSERS_MAILBODY","Body");
-define("_AM_MAILUSERS_MAILFNAME","From Name");
-define("_AM_MAILUSERS_MAILFMAIL","From Email (email only)");
+define("_AM_MAILUSERS_LIST", "Send Message to Users");
+define("_AM_MAILUSERS_MAILBODY", "Body");
+define("_AM_MAILUSERS_MAILFNAME", "From Name");
+define("_AM_MAILUSERS_MAILFMAIL", "From Email (email only)");
 
-define("_AM_MAILUSERS_MAILTAGS","Useful Tags:");
-define("_AM_MAILUSERS_MAILTAGS1","{X_UID} will print user id");
-define("_AM_MAILUSERS_MAILTAGS2","{X_UNAME} will print user name");
-define("_AM_MAILUSERS_MAILTAGS3","{X_UEMAIL} will print user email");
-define("_AM_MAILUSERS_MAILTAGS4","{X_UACTLINK} will print user activation link");
-define("_AM_MAILUSERS_MAILSUBJECT","Subject");
+define("_AM_MAILUSERS_MAILTAGS", "Useful Tags:");
+define("_AM_MAILUSERS_MAILTAGS1", "{X_UID} will print user id");
+define("_AM_MAILUSERS_MAILTAGS2", "{X_UNAME} will print user name");
+define("_AM_MAILUSERS_MAILTAGS3", "{X_UEMAIL} will print user email");
+define("_AM_MAILUSERS_MAILTAGS4", "{X_UACTLINK} will print user activation link");
+define("_AM_MAILUSERS_MAILSUBJECT", "Subject");
 //define("_AM_MAILUSERS_MANAGER", "User Message Manager");
 define("_AM_MAILUSERS_SENDNEXT", "Next");
 define("_AM_MAILUSERS_NOUSERMATCH", "No user matched");
-define("_AM_MAILUSERS_PM","Private Message");
+define("_AM_MAILUSERS_PM", "Private Message");
 
-define("_AM_MAILUSERS_SENDCOMP","Sending message completed.");
-define("_AM_MAILUSERS_SENDTO","Send to");
-define("_AM_MAILUSERS_SENDTOUSERS","Send message to users whose:");
-define("_AM_MAILUSERS_SENDTOUSERS2","Send to:");
-define("_AM_MAILUSERS_SENT","Sent Users");
-define("_AM_MAILUSERS_SENTNUM","%s - %s (total: %s users)");
+define("_AM_MAILUSERS_SENDCOMP", "Sending message completed.");
+define("_AM_MAILUSERS_SENDTO", "Send to");
+define("_AM_MAILUSERS_SENDTOUSERS", "Send message to users whose:");
+define("_AM_MAILUSERS_SENDTOUSERS2", "Send to:");
+define("_AM_MAILUSERS_SENT", "Sent Users");
+define("_AM_MAILUSERS_SENTNUM", "%s - %s (total: %s users)");
 //define("_AM_MAILUSERS_TIMEFORMAT", "(Format yyyy-mm-dd, optional)");
 
-define("_AM_MAILUSERS_MAILFROM","Mail is sent from");
-define("_AM_MAILUSERS_MAILERMETHOD","Transport method");
-define("_AM_MAILUSERS_SENDMAILPATH","Path to sendmail");
-define("_AM_MAILUSERS_SMTPHOST","SMTP host");
-define("_AM_MAILUSERS_SMTPUSER","SMTP user");
+define("_AM_MAILUSERS_MAILFROM", "Mail is sent from");
+define("_AM_MAILUSERS_MAILERMETHOD", "Transport method");
+define("_AM_MAILUSERS_SENDMAILPATH", "Path to sendmail");
+define("_AM_MAILUSERS_SMTPHOST", "SMTP host");
+define("_AM_MAILUSERS_SMTPUSER", "SMTP user");

htdocs/modules/gravatars/admin/index.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
  * @author          Mage Grégory (AKA Mage)
  * @version         $Id$
  */
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 
 $xoops = Xoops::getInstance();
 

htdocs/modules/gravatars/xoops_version.php

Spacing +1 added lines, -1 removed lines

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

htdocs/modules/gravatars/preloads/preload.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
     public static function eventCoreServiceLocateAvatar(Provider $provider)
     {
         if (is_a($provider, '\Xoops\Core\Service\Provider')) {
-            $path = dirname(__DIR__) . '/class/GravatarsProvider.php';
+            $path = dirname(__DIR__).'/class/GravatarsProvider.php';
             require $path;
             $object = new GravatarsProvider();
             $provider->register($object);

htdocs/modules/gravatars/language/english/modinfo.php

Spacing +2 added lines, -2 removed lines

@@ -15,7 +15,7 @@
  * @author          Richard Griffith <richard@geekwright.com>
  */
 
-define('_MI_GRAVATARS_NAME','Gravatars');
-define('_MI_GRAVATARS_DESC','Use gravatar.com for system avatars');
+define('_MI_GRAVATARS_NAME', 'Gravatars');
+define('_MI_GRAVATARS_DESC', 'Use gravatar.com for system avatars');
 
 //define('_MI_GRAVATARS_CONF_X','Option');

htdocs/modules/gravatars/class/GravatarsProvider.php

Spacing +6 added lines, -6 removed lines

@@ -37,15 +37,15 @@ 
      */
     private static function getGravatar($email)
     {
-        $s = 80;   // Size in pixels, defaults to 80px [ 1 - 2048 ]
+        $s = 80; // Size in pixels, defaults to 80px [ 1 - 2048 ]
         $d = 'mm'; // Default imageset to use [ 404 | mm | identicon | monsterid | wavatar ]
-        $r = 'g';  // Maximum rating (inclusive) [ g | pg | r | x ]
+        $r = 'g'; // Maximum rating (inclusive) [ g | pg | r | x ]
         if ($helper = Xoops\Module\Helper::getHelper('gravatars')) {
             $v = $helper->getConfig('pixel_size');
             $s = (empty($v)) ? $s : $v;
             $v = $helper->getConfig('default_imageset');
             $d = (empty($v)) ? $d : $v;
-            $d = ($d==='default') ? '' : $d; // preferences does not like empty string
+            $d = ($d === 'default') ? '' : $d; // preferences does not like empty string
             $v = $helper->getConfig('max_rating');
             $r = (empty($v)) ? $r : $v;
         }
@@ -71,7 +71,7 @@ 
      */
     private function getUserById($uid)
     {
-        $user = \Xoops::getInstance()->getHandlerMember()->getUser((int) $uid);
+        $user = \Xoops::getInstance()->getHandlerMember()->getUser((int)$uid);
         return (is_object($user)) ? $user : null;
     }
 
@@ -121,7 +121,7 @@ 
                 $noInfo = false;
             }
         } elseif (is_scalar($userinfo)) {
-            $user = $this->getUserById((int) $userinfo);
+            $user = $this->getUserById((int)$userinfo);
             if (is_object($user) && ($user instanceof XoopsUser)) {
                 $email = $user->getVar('email', 'e');
                 $response->setValue(self::getGravatar($email));
@@ -148,7 +148,7 @@ 
         if (is_object($userinfo)) {
             if ($userinfo instanceof XoopsUser) {
                 $email = $userinfo->getVar('email', 'e');
-                $link = 'http://www.gravatar.com/' . md5(strtolower(trim($email)));
+                $link = 'http://www.gravatar.com/'.md5(strtolower(trim($email)));
                 $response->setValue($link);
                 $noInfo = false;
             }