geekwright / XoopsCore

htdocs/modules/avatars/class/form/avatar_user.php

Indentation +2 added lines, -2 removed lines

@@ -37,8 +37,8 @@
         $avatar_selected = $xoops->user->getVar("user_avatar", "E");
         $avatar_selected = in_array($avatar_selected, array_keys($avatar_list)) ? $avatar_selected : "blank.gif";
         $avatar_select->addOptionArray($avatar_list);
-		$xoops_url = \XoopsBaseConfig::get('url');
-		$xoops_upload_url = \XoopsBaseConfig::get('uploads-url');
+        $xoops_url = \XoopsBaseConfig::get('url');
+        $xoops_upload_url = \XoopsBaseConfig::get('uploads-url');
         $avatar_select->setExtra("onchange='showImgSelected(\"avatar\", \"user_avatar\", \"uploads\", \"\", \"" . $xoops_url . "\")'");
         $avatar_tray = new Xoops\Form\ElementTray(XoopsLocale::FILE, ' ');
         $avatar_tray->addElement($avatar_select);

Spacing +3 added lines, -3 removed lines

@@ -39,11 +39,11 @@
         $avatar_select->addOptionArray($avatar_list);
 		$xoops_url = \XoopsBaseConfig::get('url');
 		$xoops_upload_url = \XoopsBaseConfig::get('uploads-url');
-        $avatar_select->setExtra("onchange='showImgSelected(\"avatar\", \"user_avatar\", \"uploads\", \"\", \"" . $xoops_url . "\")'");
+        $avatar_select->setExtra("onchange='showImgSelected(\"avatar\", \"user_avatar\", \"uploads\", \"\", \"".$xoops_url."\")'");
         $avatar_tray = new Xoops\Form\ElementTray(XoopsLocale::FILE, ' ');
         $avatar_tray->addElement($avatar_select);
-        $avatar_tray->addElement(new Xoops\Form\Label('', "<a href=\"javascript:openWithSelfMain('" . $xoops_url . "/modules/avatars/popup.php','avatars',600,400);\">" . XoopsLocale::LIST_. "</a><br />"));
-        $avatar_tray->addElement(new Xoops\Form\Label('', "<br /><img src='" . $xoops_upload_url . "/" . $avatar_selected . "' name='avatar' id='avatar' alt='' />"));
+        $avatar_tray->addElement(new Xoops\Form\Label('', "<a href=\"javascript:openWithSelfMain('".$xoops_url."/modules/avatars/popup.php','avatars',600,400);\">".XoopsLocale::LIST_."</a><br />"));
+        $avatar_tray->addElement(new Xoops\Form\Label('', "<br /><img src='".$xoops_upload_url."/".$avatar_selected."' name='avatar' id='avatar' alt='' />"));
         if ($helper->getConfig('avatars_allowupload') == 1 && $xoops->user->getVar('posts') >= $helper->getConfig('avatars_postsrequired')) {
             $fileseltray_img = new Xoops\Form\ElementTray('<br />', '<br /><br />');
             $fileseltray_img->addElement(new Xoops\Form\File(XoopsLocale::A_UPLOAD, 'user_avatar'), false);

htdocs/modules/avatars/class/form/avatar.php

Indentation +2 added lines, -2 removed lines

@@ -40,11 +40,11 @@
         $this->addElement(new Xoops\Form\Text(XoopsLocale::NAME, 'avatar_name', 5, 255, $obj->getVar('avatar_name', 'e')), true);
         // Upload part
         $imgtray_img = new Xoops\Form\ElementTray(XoopsLocale::FILE, '<br />');
-		$avatars_path = \XoopsBaseConfig::get('uploads-path') . '/avatars';
+        $avatars_path = \XoopsBaseConfig::get('uploads-path') . '/avatars';
         $imageselect_img = new Xoops\Form\Select(sprintf(XoopsLocale::F_FILE_EXISTS_IN, $avatars_path . '/'), 'avatar_file', $blank_img);
         $imageselect_img->addOption($blank_img, $blank_img);
         \Xoops\Core\Lists\ImageFile::setOptionsArray($imageselect_img, $avatars_path);
-		$xoops_upload_url = \XoopsBaseConfig::get('uploads-url');
+        $xoops_upload_url = \XoopsBaseConfig::get('uploads-url');
         $imageselect_img->setExtra("onchange='showImgSelected(\"xo-avatar-img\", \"avatar_file\", \"avatars\", \"\", \"" . $xoops_upload_url . "\")'");
         $imgtray_img->addElement($imageselect_img, false);
         $imgtray_img->addElement(new Xoops\Form\Label('', "<br /><img src='" . $xoops_upload_url . "/avatars/" . $blank_img . "' name='image_img' id='xo-avatar-img' alt='' />"));

Spacing +4 added lines, -4 removed lines

@@ -40,14 +40,14 @@
         $this->addElement(new Xoops\Form\Text(XoopsLocale::NAME, 'avatar_name', 5, 255, $obj->getVar('avatar_name', 'e')), true);
         // Upload part
         $imgtray_img = new Xoops\Form\ElementTray(XoopsLocale::FILE, '<br />');
-		$avatars_path = \XoopsBaseConfig::get('uploads-path') . '/avatars';
-        $imageselect_img = new Xoops\Form\Select(sprintf(XoopsLocale::F_FILE_EXISTS_IN, $avatars_path . '/'), 'avatar_file', $blank_img);
+		$avatars_path = \XoopsBaseConfig::get('uploads-path').'/avatars';
+        $imageselect_img = new Xoops\Form\Select(sprintf(XoopsLocale::F_FILE_EXISTS_IN, $avatars_path.'/'), 'avatar_file', $blank_img);
         $imageselect_img->addOption($blank_img, $blank_img);
         \Xoops\Core\Lists\ImageFile::setOptionsArray($imageselect_img, $avatars_path);
 		$xoops_upload_url = \XoopsBaseConfig::get('uploads-url');
-        $imageselect_img->setExtra("onchange='showImgSelected(\"xo-avatar-img\", \"avatar_file\", \"avatars\", \"\", \"" . $xoops_upload_url . "\")'");
+        $imageselect_img->setExtra("onchange='showImgSelected(\"xo-avatar-img\", \"avatar_file\", \"avatars\", \"\", \"".$xoops_upload_url."\")'");
         $imgtray_img->addElement($imageselect_img, false);
-        $imgtray_img->addElement(new Xoops\Form\Label('', "<br /><img src='" . $xoops_upload_url . "/avatars/" . $blank_img . "' name='image_img' id='xo-avatar-img' alt='' />"));
+        $imgtray_img->addElement(new Xoops\Form\Label('', "<br /><img src='".$xoops_upload_url."/avatars/".$blank_img."' name='image_img' id='xo-avatar-img' alt='' />"));
         $fileseltray_img = new Xoops\Form\ElementTray('<br />', '<br /><br />');
         $fileseltray_img->addElement(new Xoops\Form\File(XoopsLocale::A_UPLOAD, 'avatar_file'), false);
         // , $xoops->getModuleConfig('avatars_imagefilesize')

htdocs/modules/profile/userinfo.php

Spacing +12 added lines, -12 removed lines

@@ -23,7 +23,7 @@ 
  * @author          Taiwen Jiang <phppp@users.sourceforge.net>
  */
 
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 $xoops = Xoops::getInstance();
 include_once $xoops->path('modules/system/constants.php');
 
@@ -32,7 +32,7 @@ 
     if ($xoops->isUser()) {
         $uid = $xoops->user->getVar('uid');
     } else {
-        header('location: ' . \XoopsBaseConfig::get('url'));
+        header('location: '.\XoopsBaseConfig::get('url'));
         exit();
     }
 }
@@ -65,7 +65,7 @@ 
 
     // Redirect if not a user or not active and the current user is not admin
     if (!is_object($thisUser) || (!$thisUser->isActive() && (!$xoops->user || !$xoops->user->isAdmin()))) {
-        $xoops->redirect(\XoopsBaseConfig::get('url') . "/modules/" . $xoops->module->getVar('dirname', 'n'), 3, XoopsLocale::E_NO_USER_SELECTED);
+        $xoops->redirect(\XoopsBaseConfig::get('url')."/modules/".$xoops->module->getVar('dirname', 'n'), 3, XoopsLocale::E_NO_USER_SELECTED);
     }
 
     /**
@@ -101,7 +101,7 @@ 
     }
 
     if ($rejected) {
-        $xoops->redirect(\XoopsBaseConfig::get('url') . "/modules/" . $xoops->module->getVar('dirname', 'n'), 3, XoopsLocale::E_NO_ACCESS_PERMISSION);
+        $xoops->redirect(\XoopsBaseConfig::get('url')."/modules/".$xoops->module->getVar('dirname', 'n'), 3, XoopsLocale::E_NO_ACCESS_PERMISSION);
     }
 
     if ($xoops->isUser() && $xoops->user->isAdmin()) {
@@ -122,9 +122,9 @@ 
 // Let extensions add navigation button
 //$xoops->events()->triggerEvent('core.userinfo.button', array($thisUser, &$btn));
 $response = $xoops->service("Avatar")->getAvatarEditUrl($thisUser);
-$link=$response->getValue();
+$link = $response->getValue();
 if (!empty($link)) {
-    $btn[] = array( 'link' => $link, 'title' => XoopsLocale::AVATAR, 'icon' => 'icon-user');
+    $btn[] = array('link' => $link, 'title' => XoopsLocale::AVATAR, 'icon' => 'icon-user');
     $xoops->tpl()->assign('btn', $btn);
 }
 
@@ -193,7 +193,7 @@ 
 
 if ($xoops->isActiveModule('search') && $xoops->getModuleConfig('profile_search') && $xoops->getModuleConfig('enable_search', 'search')) {
     $available_plugins = \Xoops\Module\Plugin::getPlugins('search');
-    $criteria = new Criteria('dirname', "('" . implode("','", array_keys($available_plugins)) . "')", 'IN');
+    $criteria = new Criteria('dirname', "('".implode("','", array_keys($available_plugins))."')", 'IN');
     $modules = $module_handler->getObjectsArray($criteria, true);
     $mids = array_keys($modules);
 
@@ -211,18 +211,18 @@ 
                 if (is_array($results) && $count > 0) {
                     for ($i = 0; $i < $count; ++$i) {
                         if (isset($results[$i]['image']) && $results[$i]['image'] != '') {
-                            $results[$i]['image'] = \XoopsBaseConfig::get('url') . '/modules/' . $module->getVar('dirname', 'n') . '/' . $results[$i]['image'];
+                            $results[$i]['image'] = \XoopsBaseConfig::get('url').'/modules/'.$module->getVar('dirname', 'n').'/'.$results[$i]['image'];
                         } else {
-                            $results[$i]['image'] = \XoopsBaseConfig::get('url') . '/images/icons/posticon2.gif';
+                            $results[$i]['image'] = \XoopsBaseConfig::get('url').'/images/icons/posticon2.gif';
                         }
                         if (!preg_match("/^http[s]*:\/\//i", $results[$i]['link'])) {
-                            $results[$i]['link'] = \XoopsBaseConfig::get('url') . "/modules/" . $module->getVar('dirname', 'n') . "/" . $results[$i]['link'];
+                            $results[$i]['link'] = \XoopsBaseConfig::get('url')."/modules/".$module->getVar('dirname', 'n')."/".$results[$i]['link'];
                         }
                         $results[$i]['title'] = $myts->htmlSpecialChars($results[$i]['title']);
                         $results[$i]['time'] = $results[$i]['time'] ? XoopsLocale::formatTimestamp($results[$i]['time']) : '';
                     }
                     if ($count == 5) {
-                        $showall_link = '<a href="' . \XoopsBaseConfig::get('url') . '/search.php?action=showallbyuser&amp;mid=' . $mid . '&amp;uid=' . $thisUser->getVar('uid') . '">' . XoopsLocale::SHOW_ALL . '</a>';
+                        $showall_link = '<a href="'.\XoopsBaseConfig::get('url').'/search.php?action=showallbyuser&amp;mid='.$mid.'&amp;uid='.$thisUser->getVar('uid').'">'.XoopsLocale::SHOW_ALL.'</a>';
                     } else {
                         $showall_link = '';
                     }
@@ -243,4 +243,4 @@ 
 $xoops->tpl()->assign('avatar', $avatar);
 $xoops->tpl()->assign('recent_activity', _PROFILE_MA_RECENTACTIVITY);
 $xoops->registry()->get('profile_breadcrumbs')->addItem(new Link(['caption' => _PROFILE_MA_USERINFO]));
-include __DIR__ . '/footer.php';
+include __DIR__.'/footer.php';

htdocs/modules/profile/edituser.php

Spacing +5 added lines, -5 removed lines

@@ -22,7 +22,7 @@ 
  * @author          Taiwen Jiang <phppp@users.sourceforge.net>
  */
 
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 $xoops = Xoops::getInstance();
 
 // If not a user, redirect
@@ -36,7 +36,7 @@ 
 
 if ($op === 'save') {
     if (!$xoops->security()->check()) {
-        $xoops->redirect(\XoopsBaseConfig::get('url') . "/modules/" . $xoops->module->getVar('dirname', 'n') . "/", 3, XoopsLocale::E_NO_ACTION_PERMISSION . "<br />" . implode('<br />', $xoops->security()->getErrors()));
+        $xoops->redirect(\XoopsBaseConfig::get('url')."/modules/".$xoops->module->getVar('dirname', 'n')."/", 3, XoopsLocale::E_NO_ACTION_PERMISSION."<br />".implode('<br />', $xoops->security()->getErrors()));
         exit();
     }
     $uid = $xoops->user->getVar('uid');
@@ -85,14 +85,14 @@ 
             $profile->setVar('profile_id', $edituser->getVar('uid'));
             $profile_handler->insert($profile);
             unset($_SESSION['xoopsUserTheme']);
-            $xoops->redirect(\XoopsBaseConfig::get('url') . '/modules/' . $xoops->module->getVar('dirname', 'n') . '/userinfo.php?uid=' . $edituser->getVar('uid'), 2, XoopsLocale::S_YOUR_PROFILE_UPDATED);
+            $xoops->redirect(\XoopsBaseConfig::get('url').'/modules/'.$xoops->module->getVar('dirname', 'n').'/userinfo.php?uid='.$edituser->getVar('uid'), 2, XoopsLocale::S_YOUR_PROFILE_UPDATED);
         }
     }
 }
 
 if ($op === 'editprofile') {
     $xoops->header('module:profile/profile_editprofile.tpl');
-    include_once __DIR__ . '/include/forms.php';
+    include_once __DIR__.'/include/forms.php';
     $form = profile_getUserForm($xoops->user);
     $form->assign($xoops->tpl());
     if (!empty($stop)) {
@@ -103,4 +103,4 @@ 
         new Link(['caption' => XoopsLocale::EDIT_PROFILE])
     );
 }
-include __DIR__ . '/footer.php';
+include __DIR__.'/footer.php';

htdocs/modules/profile/admin/about.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
  * @author          Mamba
  */
 
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 
 $xoops = Xoops::getInstance();
 $xoops->header();

htdocs/modules/profile/admin/deactivate.php

Spacing +2 added lines, -2 removed lines

@@ -21,7 +21,7 @@ 
  * @author          Taiwen Jiang <phppp@users.sourceforge.net>
  */
 
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 $xoops = Xoops::getInstance();
 $xoops->header();
 
@@ -51,4 +51,4 @@ 
         $message = _PROFILE_AM_USER_NOT_DEACTIVATED;
     }
 }
-$xoops->redirect($xoops->url('modules/profile/userinfo.php?uid=' . $user->getVar('uid')), 3, $message);
+$xoops->redirect($xoops->url('modules/profile/userinfo.php?uid='.$user->getVar('uid')), 3, $message);

htdocs/modules/profile/admin/user.php

Spacing +7 added lines, -7 removed lines

@@ -21,7 +21,7 @@ 
  * @author          Jan Pedersen
  * @author          Taiwen Jiang <phppp@users.sourceforge.net>
  */
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 
 $xoops = Xoops::getInstance();
 $xoops->header();
@@ -51,7 +51,7 @@ 
 
     case "new":
         $xoops->loadLanguage("main", $xoops->module->getVar('dirname', 'n'));
-        include_once dirname(__DIR__) . '/include/forms.php';
+        include_once dirname(__DIR__).'/include/forms.php';
         $obj = $handler->createUser();
         $obj->setGroups(array(FixedGroups::USERS));
         $form = profile_getUserForm($obj);
@@ -65,7 +65,7 @@ 
             // If not webmaster trying to edit a webmaster - disallow
             $xoops->redirect("user.php", 3, XoopsLocale::E_NO_ACTION_PERMISSION);
         }
-        include_once dirname(__DIR__) . '/include/forms.php';
+        include_once dirname(__DIR__).'/include/forms.php';
         $form = profile_getUserForm($obj);
         $form->display();
         break;
@@ -76,7 +76,7 @@ 
             $xoops->redirect(
                 'user.php',
                 3,
-                XoopsLocale::E_NO_ACTION_PERMISSION . "<br />"
+                XoopsLocale::E_NO_ACTION_PERMISSION."<br />"
                 . implode('<br />', $xoops->security()->getErrors())
             );
             exit;
@@ -195,7 +195,7 @@ 
             }
         }
         $user->setGroups($new_groups);
-        include_once dirname(__DIR__) . '/include/forms.php';
+        include_once dirname(__DIR__).'/include/forms.php';
         echo $user->getHtmlErrors();
         $form = profile_getUserForm($user, $profile);
         $form->display();
@@ -222,7 +222,7 @@ 
                     $xoops->redirect(
                         'user.php',
                         3,
-                        sprintf(_PROFILE_AM_DELETEDSUCCESS, $obj->getVar('uname') . " (" . $obj->getVar('email') . ")"),
+                        sprintf(_PROFILE_AM_DELETEDSUCCESS, $obj->getVar('uname')." (".$obj->getVar('email').")"),
                         false
                     );
                 } else {
@@ -236,7 +236,7 @@ 
             echo $xoops->confirm(
                 array('ok' => 1, 'id' => $_REQUEST['id'], 'op' => 'delete'),
                 $_SERVER['REQUEST_URI'],
-                sprintf(_PROFILE_AM_RUSUREDEL, $obj->getVar('uname') . " (" . $obj->getVar('email') . ")")
+                sprintf(_PROFILE_AM_RUSUREDEL, $obj->getVar('uname')." (".$obj->getVar('email').")")
             );
         }
         break;

htdocs/modules/profile/admin/header.php

Spacing +1 added lines, -1 removed lines

@@ -19,5 +19,5 @@
  * @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';
 XoopsLoad::load('system', 'system');

htdocs/modules/profile/xoops_version.php

Spacing +1 added lines, -1 removed lines

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