XOOPS / XoopsCore

htdocs/modules/profile/activate.php

Spacing +10 added lines, -10 removed lines

@@ -22,7 +22,7 @@ 
  * @author          Taiwen Jiang <phppp@users.sourceforge.net>
  */
 
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 $xoops = Xoops::getInstance();
 
 $xoops->header();
@@ -43,7 +43,7 @@ 
     } else {
         if ($thisuser->getVar('level') > 0) {
             $xoops->redirect(
-                $xoops->url('modules/' . $xoops->module->getVar('dirname', 'n'). '/index.php'),
+                $xoops->url('modules/'.$xoops->module->getVar('dirname', 'n').'/index.php'),
                 5,
                 XoopsLocale::E_SELECTED_ACCOUNT_IS_ALREADY_ACTIVATED,
                 false
@@ -58,7 +58,7 @@ 
                     $xoopsMailer->setTemplate('activated.tpl');
                     $xoopsMailer->assign('SITENAME', $xoops->getConfig('sitename'));
                     $xoopsMailer->assign('ADMINMAIL', $xoops->getConfig('adminmail'));
-                    $xoopsMailer->assign('SITEURL', \XoopsBaseConfig::get('url') . "/");
+                    $xoopsMailer->assign('SITEURL', \XoopsBaseConfig::get('url')."/");
                     $xoopsMailer->setToUsers($thisuser);
                     $xoopsMailer->setFromEmail($xoops->getConfig('adminmail'));
                     $xoopsMailer->setFromName($xoops->getConfig('sitename'));
@@ -69,12 +69,12 @@ 
                     } else {
                         printf(XoopsLocale::SF_NOTIFICATION_EMAIL_SENT_TO, $thisuser->getVar('uname'));
                     }
-                    include __DIR__ . '/footer.php';
+                    include __DIR__.'/footer.php';
                 } else {
                     $xoops->redirect(
-                        $xoops->url('modules/' . $xoops->module->getVar('dirname', 'n') . '/user.php'),
+                        $xoops->url('modules/'.$xoops->module->getVar('dirname', 'n').'/user.php'),
                         5,
-                        XoopsLocale::S_YOUR_ACCOUNT_ACTIVATED . ' ' . XoopsLocale::LOGIN_WITH_REGISTERED_PASSWORD,
+                        XoopsLocale::S_YOUR_ACCOUNT_ACTIVATED.' '.XoopsLocale::LOGIN_WITH_REGISTERED_PASSWORD,
                         false
                     );
                 }
@@ -101,15 +101,15 @@ 
     $xoopsMailer->setTemplate('register.tpl');
     $xoopsMailer->assign('SITENAME', $xoops->getConfig('sitename'));
     $xoopsMailer->assign('ADMINMAIL', $xoops->getConfig('adminmail'));
-    $xoopsMailer->assign('SITEURL', \XoopsBaseConfig::get('url') . "/");
+    $xoopsMailer->assign('SITEURL', \XoopsBaseConfig::get('url')."/");
     $xoopsMailer->setToUsers($getuser[0]);
     $xoopsMailer->setFromEmail($xoops->getConfig('adminmail'));
     $xoopsMailer->setFromName($xoops->getConfig('sitename'));
     $xoopsMailer->setSubject(sprintf(XoopsLocale::F_USER_ACTIVATION_KEY_FOR, $getuser->getVar('uname')));
     if (!$xoopsMailer->send()) {
-        echo XoopsLocale::S_YOU_ARE_NOW_REGISTERED . ' ' . XoopsLocale::EMAIL_HAS_NOT_BEEN_SENT_WITH_ACTIVATION_KEY;
+        echo XoopsLocale::S_YOU_ARE_NOW_REGISTERED.' '.XoopsLocale::EMAIL_HAS_NOT_BEEN_SENT_WITH_ACTIVATION_KEY;
     } else {
-        echo XoopsLocale::S_YOU_ARE_NOW_REGISTERED . ' ' . XoopsLocale::EMAIL_HAS_BEEN_SENT_WITH_ACTIVATION_KEY;
+        echo XoopsLocale::S_YOU_ARE_NOW_REGISTERED.' '.XoopsLocale::EMAIL_HAS_BEEN_SENT_WITH_ACTIVATION_KEY;
     }
 } else {
     $form = new Xoops\Form\ThemeForm('', 'form', 'activate.php');
@@ -120,4 +120,4 @@ 
 
 $xoops->registry()->get('profile_breadcrumbs')->addItem(new Link(['caption' => _PROFILE_MA_REGISTER]));
 
-include __DIR__ . '/footer.php';
+include __DIR__.'/footer.php';

htdocs/modules/profile/include/update.php

Spacing +13 added lines, -13 removed lines

@@ -30,23 +30,23 @@ 
     $xoops = Xoops::getInstance();
 
     if ($oldversion < 162) {
-        $xoopsDB->queryF("UPDATE `" . $xoopsDB->prefix("profile_field") . " SET field_valuetype=2 WHERE field_name=umode");
+        $xoopsDB->queryF("UPDATE `".$xoopsDB->prefix("profile_field")." SET field_valuetype=2 WHERE field_name=umode");
     }
 
     if ($oldversion < 100) {
 
         // Drop old category table
-        $sql = "DROP TABLE " . $xoopsDB->prefix("profile_category");
+        $sql = "DROP TABLE ".$xoopsDB->prefix("profile_category");
         $xoopsDB->queryF($sql);
 
         // Drop old field-category link table
-        $sql = "DROP TABLE " . $xoopsDB->prefix("profile_fieldcategory");
+        $sql = "DROP TABLE ".$xoopsDB->prefix("profile_fieldcategory");
         $xoopsDB->queryF($sql);
 
         // Create new tables for new profile module
-        $xoopsDB->queryFromFile(\XoopsBaseConfig::get('root-path') . "/modules/" . $module->getVar('dirname', 'n') . "/sql/mysql.sql");
+        $xoopsDB->queryFromFile(\XoopsBaseConfig::get('root-path')."/modules/".$module->getVar('dirname', 'n')."/sql/mysql.sql");
 
-        include_once __DIR__ . "/install.php";
+        include_once __DIR__."/install.php";
         xoops_module_install_profile($module);
         $goupperm_handler = $xoops->getHandlerGroupPermission();
 
@@ -55,7 +55,7 @@ 
         $skip_fields = $field_handler->getUserVars();
         $skip_fields[] = 'newemail';
         $skip_fields[] = 'pm_link';
-        $sql = "SELECT * FROM `" . $xoopsDB->prefix("user_profile_field") . "` WHERE `field_name` NOT IN ('" . implode("', '", $skip_fields) . "')";
+        $sql = "SELECT * FROM `".$xoopsDB->prefix("user_profile_field")."` WHERE `field_name` NOT IN ('".implode("', '", $skip_fields)."')";
         $result = $xoopsDB->query($sql);
         $fields = array();
         while (false !== ($myrow = $xoopsDB->fetchArray($result))) {
@@ -72,14 +72,14 @@ 
             $field_handler->insert($object, true);
 
             $gperm_itemid = $object->getVar('field_id');
-            $sql = "UPDATE " . $xoopsDB->prefix("system_permission") . " SET gperm_itemid = " . $gperm_itemid . "   WHERE gperm_itemid = " . $myrow['fieldid'] . "       AND gperm_modid = " . $module->getVar('mid') . "       AND gperm_name IN ('profile_edit', 'profile_search')";
+            $sql = "UPDATE ".$xoopsDB->prefix("system_permission")." SET gperm_itemid = ".$gperm_itemid."   WHERE gperm_itemid = ".$myrow['fieldid']."       AND gperm_modid = ".$module->getVar('mid')."       AND gperm_name IN ('profile_edit', 'profile_search')";
             $xoopsDB->queryF($sql);
 
             $groups_visible = $goupperm_handler->getGroupIds("profile_visible", $myrow['fieldid'], $module->getVar('mid'));
             $groups_show = $goupperm_handler->getGroupIds("profile_show", $myrow['fieldid'], $module->getVar('mid'));
             foreach ($groups_visible as $ugid) {
                 foreach ($groups_show as $pgid) {
-                    $sql = "INSERT INTO " . $xoopsDB->prefix("profile_visibility") . " (field_id, user_group, profile_group) " . " VALUES " . " ({$gperm_itemid}, {$ugid}, {$pgid})";
+                    $sql = "INSERT INTO ".$xoopsDB->prefix("profile_visibility")." (field_id, user_group, profile_group) "." VALUES "." ({$gperm_itemid}, {$ugid}, {$pgid})";
                     $xoopsDB->queryF($sql);
                 }
             }
@@ -90,19 +90,19 @@ 
 
         // Copy data from profile table
         foreach ($fields as $field) {
-            $xoopsDB->queryF("UPDATE `" . $xoopsDB->prefix("profile_profile") . "` u, `" . $xoopsDB->prefix("user_profile") . "` p SET u.{$field} = p.{$field} WHERE u.profile_id=p.profileid");
+            $xoopsDB->queryF("UPDATE `".$xoopsDB->prefix("profile_profile")."` u, `".$xoopsDB->prefix("user_profile")."` p SET u.{$field} = p.{$field} WHERE u.profile_id=p.profileid");
         }
 
         // Drop old profile table
-        $sql = "DROP TABLE " . $xoopsDB->prefix("user_profile");
+        $sql = "DROP TABLE ".$xoopsDB->prefix("user_profile");
         $xoopsDB->queryF($sql);
 
         // Drop old field module
-        $sql = "DROP TABLE " . $xoopsDB->prefix("user_profile_field");
+        $sql = "DROP TABLE ".$xoopsDB->prefix("user_profile_field");
         $xoopsDB->queryF($sql);
 
         // Remove not used items
-        $sql = "DELETE FROM " . $xoopsDB->prefix("system_permission") . "   WHERE `gperm_modid` = " . $module->getVar('mid') . " AND `gperm_name` IN ('profile_show', 'profile_visible')";
+        $sql = "DELETE FROM ".$xoopsDB->prefix("system_permission")."   WHERE `gperm_modid` = ".$module->getVar('mid')." AND `gperm_name` IN ('profile_show', 'profile_visible')";
         $xoopsDB->queryF($sql);
     }
 
@@ -110,7 +110,7 @@ 
     $profile_handler->cleanOrphan($xoopsDB->prefix("system_user"), "uid", "profile_id");
     $field_handler = $xoops->getModuleHandler('field', $module->getVar('dirname', 'n'));
     $user_fields = $field_handler->getUserVars();
-    $criteria = new Criteria("field_name", "('" . implode("', '", $user_fields) . "')", "IN");
+    $criteria = new Criteria("field_name", "('".implode("', '", $user_fields)."')", "IN");
     $field_handler->updateAll("field_config", 0, $criteria);
 
     return true;

htdocs/modules/profile/include/forms.php

Spacing +4 added lines, -4 removed lines

@@ -97,7 +97,7 @@ 
     $myts = \Xoops\Core\Text\Sanitizer::getInstance();
     if ($step_no == 1 && $xoops->getConfig('reg_dispdsclmr') != 0 && $xoops->getConfig('reg_disclaimer') != '') {
         $disc_tray = new Xoops\Form\ElementTray(XoopsLocale::DISCLAIMER, '<br />');
-        $disc_text = new Xoops\Form\Label("", "<div class=\"pad5\">" . $myts->displayTarea($xoops->getConfig('reg_disclaimer'), 1) . "</div>");
+        $disc_text = new Xoops\Form\Label("", "<div class=\"pad5\">".$myts->displayTarea($xoops->getConfig('reg_disclaimer'), 1)."</div>");
         $disc_tray->addElement($disc_text);
         $agree_chk = new Xoops\Form\Checkbox('', 'agree_disc');
         $agree_chk->addOption(1, XoopsLocale::I_AGREE_TO_THE_ABOVE);
@@ -169,7 +169,7 @@ 
         //If the user is an admin and is editing someone else
         $pwd_text = new Xoops\Form\Password('', 'password');
         $pwd_text2 = new Xoops\Form\Password('', 'vpass');
-        $pwd_tray = new Xoops\Form\ElementTray(XoopsLocale::PASSWORD . '<br />' . XoopsLocale::TYPE_NEW_PASSWORD_TWICE_TO_CHANGE_IT);
+        $pwd_tray = new Xoops\Form\ElementTray(XoopsLocale::PASSWORD.'<br />'.XoopsLocale::TYPE_NEW_PASSWORD_TWICE_TO_CHANGE_IT);
         $pwd_tray->addElement($pwd_text);
         $pwd_tray->addElement($pwd_text2);
         $elements[0][] = array('element' => $pwd_tray, 'required' => 0); //cannot set an element tray required
@@ -238,8 +238,8 @@ 
         $title = isset($categories[$k]) ? $categories[$k]['cat_title'] : _PROFILE_MA_DEFAULT;
         $desc = isset($categories[$k]) ? $categories[$k]['cat_description'] : "";
         //$form->addElement(new Xoops\Form\Label("<div class='break'>{$title}</div>", $desc), false);
-        $desc = ($desc != '' ? ' - ' . $desc : '');
-        $form->insertBreak($title . $desc);
+        $desc = ($desc != '' ? ' - '.$desc : '');
+        $form->insertBreak($title.$desc);
         foreach (array_keys($elements[$k]) as $i) {
             $form->addElement($elements[$k][$i]['element'], $elements[$k][$i]['required']);
         }

htdocs/modules/profile/include/install.php

Spacing +15 added lines, -15 removed lines

@@ -78,9 +78,9 @@ 
     global $xoopsDB;
     $module_id = $xoops->registry()->get('profile_id');
 
-    $xoopsDB->queryF("INSERT INTO " . $xoopsDB->prefix("profile_profile") . " (profile_id) " . " SELECT uid " . " FROM " . $xoopsDB->prefix("system_user"));
+    $xoopsDB->queryF("INSERT INTO ".$xoopsDB->prefix("profile_profile")." (profile_id) "." SELECT uid "." FROM ".$xoopsDB->prefix("system_user"));
 
-    $sql = "INSERT INTO " . $xoopsDB->prefix("system_permission") . " (gperm_groupid, gperm_itemid, gperm_modid, gperm_name) " . " VALUES " . " (" . FixedGroups::ADMIN . ", " . FixedGroups::ADMIN . ", {$module_id}, 'profile_access'), " . " (" . FixedGroups::ADMIN . ", " . FixedGroups::USERS . ", {$module_id}, 'profile_access'), " . " (" . FixedGroups::USERS . ", " . FixedGroups::USERS . ", {$module_id}, 'profile_access'), " . " (" . FixedGroups::ANONYMOUS . ", " . FixedGroups::USERS . ", {$module_id}, 'profile_access') " . " ";
+    $sql = "INSERT INTO ".$xoopsDB->prefix("system_permission")." (gperm_groupid, gperm_itemid, gperm_modid, gperm_name) "." VALUES "." (".FixedGroups::ADMIN.", ".FixedGroups::ADMIN.", {$module_id}, 'profile_access'), "." (".FixedGroups::ADMIN.", ".FixedGroups::USERS.", {$module_id}, 'profile_access'), "." (".FixedGroups::USERS.", ".FixedGroups::USERS.", {$module_id}, 'profile_access'), "." (".FixedGroups::ANONYMOUS.", ".FixedGroups::USERS.", {$module_id}, 'profile_access') "." ";
     $xoopsDB->queryF($sql);
 
 }
@@ -171,22 +171,22 @@ 
     global $xoopsDB;
     $gperm_itemid = $field_id;
     $gperm_modid = $module_id;
-    $sql = "INSERT INTO " . $xoopsDB->prefix("system_permission") . " (gperm_groupid, gperm_itemid, gperm_modid, gperm_name) " . " VALUES " . ($canedit
-            ? " (" . FixedGroups::ADMIN . ", {$gperm_itemid}, {$gperm_modid}, 'profile_edit'), " : "") . ($canedit == 1
-            ? " (" . FixedGroups::USERS . ", {$gperm_itemid}, {$gperm_modid}, 'profile_edit'), "
-            : "") . " (" . FixedGroups::ADMIN . ", {$gperm_itemid}, {$gperm_modid}, 'profile_search'), " . " (" . FixedGroups::USERS . ", {$gperm_itemid}, {$gperm_modid}, 'profile_search') " . " ";
+    $sql = "INSERT INTO ".$xoopsDB->prefix("system_permission")." (gperm_groupid, gperm_itemid, gperm_modid, gperm_name) "." VALUES ".($canedit
+            ? " (".FixedGroups::ADMIN.", {$gperm_itemid}, {$gperm_modid}, 'profile_edit'), " : "").($canedit == 1
+            ? " (".FixedGroups::USERS.", {$gperm_itemid}, {$gperm_modid}, 'profile_edit'), "
+            : "")." (".FixedGroups::ADMIN.", {$gperm_itemid}, {$gperm_modid}, 'profile_search'), "." (".FixedGroups::USERS.", {$gperm_itemid}, {$gperm_modid}, 'profile_search') "." ";
     $xoopsDB->queryF($sql);
 
     if ($visible) {
-        $sql = "INSERT INTO " . $xoopsDB->prefix("profile_visibility")
+        $sql = "INSERT INTO ".$xoopsDB->prefix("profile_visibility")
             . " (field_id, user_group, profile_group) "
             . " VALUES "
-            . " ({$gperm_itemid}, " . FixedGroups::ADMIN . ", " . FixedGroups::ADMIN . "), "
-            . " ({$gperm_itemid}, " . FixedGroups::ADMIN . ", " . FixedGroups::USERS . "), "
-            . " ({$gperm_itemid}, " . FixedGroups::USERS . ", " . FixedGroups::ADMIN . "), "
-            . " ({$gperm_itemid}, " . FixedGroups::USERS . ", " . FixedGroups::USERS . "), "
-            . " ({$gperm_itemid}, " . FixedGroups::ANONYMOUS . ", " . FixedGroups::ADMIN . "), "
-            . " ({$gperm_itemid}, " . FixedGroups::ANONYMOUS . ", " . FixedGroups::USERS . ")" . " ";
+            . " ({$gperm_itemid}, ".FixedGroups::ADMIN.", ".FixedGroups::ADMIN."), "
+            . " ({$gperm_itemid}, ".FixedGroups::ADMIN.", ".FixedGroups::USERS."), "
+            . " ({$gperm_itemid}, ".FixedGroups::USERS.", ".FixedGroups::ADMIN."), "
+            . " ({$gperm_itemid}, ".FixedGroups::USERS.", ".FixedGroups::USERS."), "
+            . " ({$gperm_itemid}, ".FixedGroups::ANONYMOUS.", ".FixedGroups::ADMIN."), "
+            . " ({$gperm_itemid}, ".FixedGroups::ANONYMOUS.", ".FixedGroups::USERS.")"." ";
         $xoopsDB->queryF($sql);
     }
 }
@@ -199,7 +199,7 @@ 
     $xoops = Xoops::getInstance();
     $xoops->db();
     global $xoopsDB;
-    $xoopsDB->query("INSERT INTO " . $xoopsDB->prefix("profile_category") . " VALUES (0, " . $xoopsDB->quote($name) . ", '', {$weight})");
+    $xoopsDB->query("INSERT INTO ".$xoopsDB->prefix("profile_category")." VALUES (0, ".$xoopsDB->quote($name).", '', {$weight})");
 }
 
 /**
@@ -212,5 +212,5 @@ 
     $xoops = Xoops::getInstance();
     $xoops->db();
     global $xoopsDB;
-    $xoopsDB->query("INSERT INTO " . $xoopsDB->prefix("profile_regstep") . " VALUES (0, " . $xoopsDB->quote($name) . ", " . $xoopsDB->quote($desc) . ", {$order}, {$save})");
+    $xoopsDB->query("INSERT INTO ".$xoopsDB->prefix("profile_regstep")." VALUES (0, ".$xoopsDB->quote($name).", ".$xoopsDB->quote($desc).", {$order}, {$save})");
 }

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

Spacing +1 added lines, -1 removed lines

@@ -54,4 +54,4 @@
 define("_PROFILE_MI_ABOUT", "About");
 define("_PROFILE_MI_HOME", "Home");
 
-define("_PROFILE_MA_THEME","Theme");
+define("_PROFILE_MA_THEME", "Theme");

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

Spacing +7 added lines, -7 removed lines

@@ -4,7 +4,7 @@ 
 // Translator: XOOPS Translation Team
 
 define("_PROFILE_MA_REGISTER_NOTGROUP", "New user is not registered to corresponding groups.");
-define("_PROFILE_MA_FINISH_LOGIN","Your account has been created successfully, please click to log on.");
+define("_PROFILE_MA_FINISH_LOGIN", "Your account has been created successfully, please click to log on.");
 define("_PROFILE_MA_REGISTER_FINISH", "Thanks for registering");
 define("_PROFILE_MA_REGISTER_STEPS", "Register steps:");
 
@@ -15,10 +15,10 @@ 
 define("_PROFILE_MA_EXPIRED", "The process has been expired, please go back to try again.");
 
 
-define("_PROFILE_MA_RECENTACTIVITY","Recent Activities");
-define("_PROFILE_MA_ACTIVATE","Activate");
-define("_PROFILE_MA_DEACTIVATE","Deactivate");
-define("_PROFILE_MA_SENDPM","Send Message");
+define("_PROFILE_MA_RECENTACTIVITY", "Recent Activities");
+define("_PROFILE_MA_ACTIVATE", "Activate");
+define("_PROFILE_MA_DEACTIVATE", "Deactivate");
+define("_PROFILE_MA_SENDPM", "Send Message");
 
 //changepass.php
 define("_PROFILE_MA_CHANGEPASSWORD", "Change Password");
@@ -48,8 +48,8 @@ 
 define("_PROFILE_MA_EMAILCHANGED", "Your Email Address Has Been Changed");
 define("_PROFILE_MA_SITEDEFAULT", "Site default");
 
-define("_PROFILE_MA_USERINFO","User profile");
-define("_PROFILE_MA_REGISTER","Registration form");
+define("_PROFILE_MA_USERINFO", "User profile");
+define("_PROFILE_MA_REGISTER", "Registration form");
 
 define("_PROFILE_MA_ACTUS", "Active Users: %s");
 define("_PROFILE_MA_FOUNDUSER", "%s users found");

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

Spacing +9 added lines, -9 removed lines

@@ -49,10 +49,10 @@ 
 define("_PROFILE_AM_PROF_SEARCH", "Searchable by these groups");
 define("_PROFILE_AM_PROF_ACCESS", "Profile accessible by these groups");
 define("_PROFILE_AM_PROF_ACCESS_DESC",
-        "<ul>" .
-        "<li>Admin groups: If a user belongs to admin groups, the current user has access if and only if one of the current user's groups is allowed to access admin group; else</li>" .
-        "<li>Non basic groups: If a user belongs to one or more non basic groups (NOT admin, user, anonymous), the current user has access if and only if one of the current user's groups is allowed to allowed to any of the non basic groups; else</li>" .
-        "<li>User group: If a user belongs to User group only, the current user has access if and only if one of his groups is allowed to access User group</li>" .
+        "<ul>".
+        "<li>Admin groups: If a user belongs to admin groups, the current user has access if and only if one of the current user's groups is allowed to access admin group; else</li>".
+        "<li>Non basic groups: If a user belongs to one or more non basic groups (NOT admin, user, anonymous), the current user has access if and only if one of the current user's groups is allowed to allowed to any of the non basic groups; else</li>".
+        "<li>User group: If a user belongs to User group only, the current user has access if and only if one of his groups is allowed to access User group</li>".
         "</ul>");
 
 define("_PROFILE_AM_FIELDVISIBLE", "The field ");
@@ -86,10 +86,10 @@ 
 // User management
 define("_PROFILE_AM_EDITUSER", "Edit User");
 define("_PROFILE_AM_SELECTUSER", "Select User");
-define("_PROFILE_AM_ADDUSER","Add User");
-define("_PROFILE_AM_THEME","Theme");
-define("_PROFILE_AM_RANK","Rank");
-define("_PROFILE_AM_USERDONEXIT","User doesn't exist!");
+define("_PROFILE_AM_ADDUSER", "Add User");
+define("_PROFILE_AM_THEME", "Theme");
+define("_PROFILE_AM_RANK", "Rank");
+define("_PROFILE_AM_USERDONEXIT", "User doesn't exist!");
 define("_PROFILE_MA_USERLEVEL", "User Level");
 
 define("_PROFILE_MA_ACTIVE", "Active");
@@ -118,4 +118,4 @@ 
 define("_PROFILE_AM_CATEGORY_LIST", "List of categories");
 define("_PROFILE_AM_STEP_LIST", "List of registration step");
 define("_PROFILE_AM_FIELD_LIST", "List of fields");
-define("_PROFILE_AM_ERROR_WEIGHT","You need a positive integer");
+define("_PROFILE_AM_ERROR_WEIGHT", "You need a positive integer");

htdocs/modules/profile/lostpass.php

Spacing +6 added lines, -6 removed lines

@@ -20,7 +20,7 @@ 
  * @author          Taiwen Jiang <phppp@users.sourceforge.net>
  */
 
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 $xoops = Xoops::getInstance();
 $email = isset($_GET['email']) ? trim($_GET['email']) : '';
 $email = isset($_POST['email']) ? trim($_POST['email']) : $email;
@@ -47,7 +47,7 @@ 
         $xoopsMailer->setTemplate("lostpass2.tpl");
         $xoopsMailer->assign("SITENAME", $xoops->getConfig('sitename'));
         $xoopsMailer->assign("ADMINMAIL", $xoops->getConfig('adminmail'));
-        $xoopsMailer->assign("SITEURL", \XoopsBaseConfig::get('url') . "/");
+        $xoopsMailer->assign("SITEURL", \XoopsBaseConfig::get('url')."/");
         $xoopsMailer->assign("IP", $_SERVER['REMOTE_ADDR']);
         $xoopsMailer->assign("NEWPWD", $newpass);
         $xoopsMailer->setToUsers($user);
@@ -64,7 +64,7 @@ 
         if (!$xoopsDB->queryF($sql)) {
             $xoops->header();
             echo XoopsLocale::E_USER_NOT_UPDATED;
-            include __DIR__ . '/footer.php';
+            include __DIR__.'/footer.php';
         }
         $xoops->redirect("user.php", 3, sprintf(XoopsLocale::SF_PASSWORD_SENT_TO, $user->getVar("uname")), false);
         // If no Code, send it
@@ -74,9 +74,9 @@ 
         $xoopsMailer->setTemplate("lostpass1.tpl");
         $xoopsMailer->assign("SITENAME", $xoops->getConfig('sitename'));
         $xoopsMailer->assign("ADMINMAIL", $xoops->getConfig('adminmail'));
-        $xoopsMailer->assign("SITEURL", \XoopsBaseConfig::get('url') . "/");
+        $xoopsMailer->assign("SITEURL", \XoopsBaseConfig::get('url')."/");
         $xoopsMailer->assign("IP", $_SERVER['REMOTE_ADDR']);
-        $xoopsMailer->assign("NEWPWD_LINK", \XoopsBaseConfig::get('url') . "/modules/profile/lostpass.php?email={$email}&code=" . $areyou);
+        $xoopsMailer->assign("NEWPWD_LINK", \XoopsBaseConfig::get('url')."/modules/profile/lostpass.php?email={$email}&code=".$areyou);
         $xoopsMailer->setToUsers($user);
         $xoopsMailer->setFromEmail($xoops->getConfig('adminmail'));
         $xoopsMailer->setFromName($xoops->getConfig('sitename'));
@@ -88,6 +88,6 @@ 
         echo "<h4>";
         printf(XoopsLocale::F_CONFIRMATION_EMAIL_SENT, $user->getVar('uname'));
         echo "</h4>";
-        include __DIR__ . '/footer.php';
+        include __DIR__.'/footer.php';
     }
 }

htdocs/modules/profile/user.php

Spacing +13 added lines, -13 removed lines

@@ -22,7 +22,7 @@ 
  * @author          Taiwen Jiang <phppp@users.sourceforge.net>
  */
 
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 
 $xoops = Xoops::getInstance();
 $op = 'main';
@@ -52,7 +52,7 @@ 
         $xoops->tpl()->assign('lang_youremail', XoopsLocale::C_YOUR_EMAIL);
         $xoops->tpl()->assign('lang_sendpassword', XoopsLocale::SEND_PASSWORD);
         $xoops->tpl()->assign('mailpasswd_token', $xoops->security()->createToken());
-        include __DIR__ . '/footer.php';
+        include __DIR__.'/footer.php';
     }
     if (!empty($_GET['xoops_redirect'])) {
         $redirect = trim($_GET['xoops_redirect']);
@@ -64,11 +64,11 @@ 
             }
         }
         if (!$isExternal) {
-            header('Location: ' . $redirect);
+            header('Location: '.$redirect);
             exit();
         }
     }
-    header('Location: ./userinfo.php?uid=' . $xoops->user->getVar('uid'));
+    header('Location: ./userinfo.php?uid='.$xoops->user->getVar('uid'));
     exit();
 }
 
@@ -85,8 +85,8 @@ 
     if ($xoops->isUser()) {
         $xoops->getHandlerOnline()->destroy($xoops->user->getVar('uid'));
     }
-    $message = XoopsLocale::S_YOU_ARE_NOW_LOGGED_OUT . '<br />' . XoopsLocale::S_THANK_YOU_FOR_VISITING_OUR_SITE;
-    $xoops->redirect(\XoopsBaseConfig::get('url') . '/', 1, $message);
+    $message = XoopsLocale::S_YOU_ARE_NOW_LOGGED_OUT.'<br />'.XoopsLocale::S_THANK_YOU_FOR_VISITING_OUR_SITE;
+    $xoops->redirect(\XoopsBaseConfig::get('url').'/', 1, $message);
 }
 
 if ($op === 'actv') {
@@ -98,18 +98,18 @@ 
 if ($op === 'delete') {
     $xoops->getConfigs();
     if (!$xoops->isUser() || $xoops->getConfig('self_delete') != 1) {
-        $xoops->redirect(\XoopsBaseConfig::get('url') . '/', 5, XoopsLocale::E_NO_ACTION_PERMISSION);
+        $xoops->redirect(\XoopsBaseConfig::get('url').'/', 5, XoopsLocale::E_NO_ACTION_PERMISSION);
     } else {
         $groups = $xoops->user->getGroups();
         if (in_array(FixedGroups::ADMIN, $groups)) {
             // users in the webmasters group may not be deleted
-            $xoops->redirect(\XoopsBaseConfig::get('url') . '/', 5, XoopsLocale::E_USER_IN_WEBMASTER_GROUP_CANNOT_BE_REMOVED);
+            $xoops->redirect(\XoopsBaseConfig::get('url').'/', 5, XoopsLocale::E_USER_IN_WEBMASTER_GROUP_CANNOT_BE_REMOVED);
         }
         $ok = !isset($_POST['ok']) ? 0 : (int)($_POST['ok']);
         if ($ok != 1) {
-            include __DIR__ . '/header.php';
-            echo $xoops->confirm(array('op' => 'delete', 'ok' => 1), 'user.php', XoopsLocale::Q_ARE_YOU_SURE_TO_DELETE_ACCOUNT . '<br/>' . XoopsLocale::THIS_WILL_REMOVE_ALL_YOUR_INFO);
-            include __DIR__ . '/footer.php';
+            include __DIR__.'/header.php';
+            echo $xoops->confirm(array('op' => 'delete', 'ok' => 1), 'user.php', XoopsLocale::Q_ARE_YOU_SURE_TO_DELETE_ACCOUNT.'<br/>'.XoopsLocale::THIS_WILL_REMOVE_ALL_YOUR_INFO);
+            include __DIR__.'/footer.php';
         } else {
             $del_uid = $xoops->user->getVar("uid");
             if (false != $xoops->getHandlerMember()->deleteUser($xoops->user)) {
@@ -118,9 +118,9 @@ 
                 if ($xoops->isActiveModule('notifications')) {
                     Notifications::getInstance()->getHandlerNotification()->unsubscribeByUser($del_uid);
                 }
-                $xoops->redirect(\XoopsBaseConfig::get('url') . '/', 5, XoopsLocale::S_YOUR_ACCOUNT_DELETED);
+                $xoops->redirect(\XoopsBaseConfig::get('url').'/', 5, XoopsLocale::S_YOUR_ACCOUNT_DELETED);
             }
-            $xoops->redirect(\XoopsBaseConfig::get('url') . '/', 5, XoopsLocale::E_NO_ACTION_PERMISSION);
+            $xoops->redirect(\XoopsBaseConfig::get('url').'/', 5, XoopsLocale::E_NO_ACTION_PERMISSION);
         }
     }
 }