XOOPS / XoopsCore

htdocs/modules/avatars/admin/header.php

Spacing +1 added lines, -1 removed lines

@@ -19,4 +19,4 @@
  * @author          Mage Grégory (AKA Mage)
  * @version         $Id$
  */
-require_once dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
+require_once dirname(dirname(dirname(__DIR__))).'/include/cp_header.php';

htdocs/modules/avatars/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 : ' . AvatarsLocale::MODULE_DESC,
+    'item_name'     => 'Donation : '.AvatarsLocale::MODULE_DESC,
     'amount'        => 0,
     'currency_code' => 'USD',
 );

htdocs/modules/avatars/preloads/preload.php

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
     {
         $path = dirname(__DIR__);
         XoopsLoad::addMap(array(
-            'avatars' => $path . '/class/helper.php',
+            'avatars' => $path.'/class/helper.php',
         ));
     }
 
@@ -47,7 +47,7 @@ 
     public static function eventCoreServiceLocateAvatar(Provider $provider)
     {
         if (is_a($provider, '\Xoops\Core\Service\Provider')) {
-            $path = dirname(__DIR__) . '/class/AvatarsProvider.php';
+            $path = dirname(__DIR__).'/class/AvatarsProvider.php';
             require $path;
             $object = new AvatarsProvider();
             $provider->register($object);

htdocs/modules/avatars/include/editavatar.php

Switch Indentation +104 added lines, -104 removed lines

@@ -61,120 +61,120 @@
 }
 
 switch ($op) {
-    case 'list':
-    default:
-        $xoops->tpl()->assign('uid', $xoops->user->getVar("uid"));
-        $xoops->tpl()->assign('info_msg', $xoops->alert('info', $info_msg, XoopsLocale::INFORMATION_FOR_UPLOADS));
-        $oldavatar = $xoops->user->getVar('user_avatar');
-        if (!empty($oldavatar) && $oldavatar !== 'blank.gif') {
-            $warning_msg = '<p>' . AvatarsLocale::ALERT_WARNING_OLD .'</p>';
-            $xoops_upload_url = \XoopsBaseConfig::get('uploads-url');
-            $warning_msg .= "<img src='" . $xoops_upload_url . '/' . $oldavatar ."' alt='&nbsp;' />";
-            $xoops->tpl()->assign('warning_msg', $xoops->alert('warning', $warning_msg, XoopsLocale::WARNING));
-        }
+        case 'list':
+        default:
+            $xoops->tpl()->assign('uid', $xoops->user->getVar("uid"));
+            $xoops->tpl()->assign('info_msg', $xoops->alert('info', $info_msg, XoopsLocale::INFORMATION_FOR_UPLOADS));
+            $oldavatar = $xoops->user->getVar('user_avatar');
+            if (!empty($oldavatar) && $oldavatar !== 'blank.gif') {
+                $warning_msg = '<p>' . AvatarsLocale::ALERT_WARNING_OLD .'</p>';
+                $xoops_upload_url = \XoopsBaseConfig::get('uploads-url');
+                $warning_msg .= "<img src='" . $xoops_upload_url . '/' . $oldavatar ."' alt='&nbsp;' />";
+                $xoops->tpl()->assign('warning_msg', $xoops->alert('warning', $warning_msg, XoopsLocale::WARNING));
+            }
 
-        // Create form
-        $obj = $avatar_Handler->create();
-        $form = $xoops->getModuleForm($obj, 'avatar_user', 'avatars');
-        // Assign form
-        $xoops->tpl()->assign('form', $form->render());
-        break;
+            // Create form
+            $obj = $avatar_Handler->create();
+            $form = $xoops->getModuleForm($obj, 'avatar_user', 'avatars');
+            // Assign form
+            $xoops->tpl()->assign('form', $form->render());
+            break;
 
-    case "save":
-        // Check security
-        if (!$xoops->security()->check()) {
-            $xoops->redirect('/index.php', 3, implode('<br />', $xoops->security()->getErrors()));
-        }
-        $uid = Request::getInt('uid', 0);
-        if (empty($uid) || $xoops->user->getVar('uid') != $uid) {
-            $xoops->redirect('/index.php', 3, XoopsLocale::E_NO_ACCESS_PERMISSION);
-            exit();
-        }
-        $uploader_avatars_img =
-            new XoopsMediaUploader(\XoopsBaseConfig::get('uploads-path') . '/avatars', $mimetypes, $upload_size, $width, $height);
+        case "save":
+            // Check security
+            if (!$xoops->security()->check()) {
+                $xoops->redirect('/index.php', 3, implode('<br />', $xoops->security()->getErrors()));
+            }
+            $uid = Request::getInt('uid', 0);
+            if (empty($uid) || $xoops->user->getVar('uid') != $uid) {
+                $xoops->redirect('/index.php', 3, XoopsLocale::E_NO_ACCESS_PERMISSION);
+                exit();
+            }
+            $uploader_avatars_img =
+                new XoopsMediaUploader(\XoopsBaseConfig::get('uploads-path') . '/avatars', $mimetypes, $upload_size, $width, $height);
 
-        $obj = $avatar_Handler->create();
-        $error_msg = '';
-        if ($uploader_avatars_img->fetchMedia('user_avatar')) {
-            $uploader_avatars_img->setPrefix('savt');
-            $uploader_avatars_img->fetchMedia('user_avatar');
-            if (!$uploader_avatars_img->upload()) {
-                $error_msg .= $uploader_avatars_img->getErrors();
-                $obj->setVar('avatar_file', 'avatars/blank.gif');
-            } else {
-                $obj->setVar('avatar_name', $xoops->user->getVar('uname'));
-                $obj->setVar('avatar_mimetype', $uploader_avatars_img->getMediaType());
-                $obj->setVar('avatar_file', 'avatars/' . $uploader_avatars_img->getSavedFileName());
-                $obj->setVar('avatar_display', 1);
-                $obj->setVar('avatar_type', 'C');
+            $obj = $avatar_Handler->create();
+            $error_msg = '';
+            if ($uploader_avatars_img->fetchMedia('user_avatar')) {
+                $uploader_avatars_img->setPrefix('savt');
+                $uploader_avatars_img->fetchMedia('user_avatar');
+                if (!$uploader_avatars_img->upload()) {
+                    $error_msg .= $uploader_avatars_img->getErrors();
+                    $obj->setVar('avatar_file', 'avatars/blank.gif');
+                } else {
+                    $obj->setVar('avatar_name', $xoops->user->getVar('uname'));
+                    $obj->setVar('avatar_mimetype', $uploader_avatars_img->getMediaType());
+                    $obj->setVar('avatar_file', 'avatars/' . $uploader_avatars_img->getSavedFileName());
+                    $obj->setVar('avatar_display', 1);
+                    $obj->setVar('avatar_type', 'C');
 
-                if ($error_msg == '') {
-                    if ($avatar_Handler->insert($obj)) {
-                        $oldavatar = $xoops->user->getVar('user_avatar');
-                        $criteria = new CriteriaCompo();
-                        $criteria->add(new Criteria('avatar_type', 'C'));
-                        $criteria->add(new Criteria('avatar_file', $oldavatar));
-                        $avatars = $avatar_Handler->getObjects($criteria);
-                        if (! empty($avatars) && count($avatars) == 1 && is_object($avatars[0])) {
-                            $avatar_Handler->delete($avatars[0]);
-                            $xoops_upload_path = \XoopsBaseConfig::get('uploads-path');
-                            $oldavatar_path = realpath($xoops_upload_path . '/' . $oldavatar);
-                            if (0 === strpos($oldavatar_path, realpath($xoops_upload_path))
-                                && is_file($oldavatar_path)
-                            ) {
-                                unlink($oldavatar_path);
+                    if ($error_msg == '') {
+                        if ($avatar_Handler->insert($obj)) {
+                            $oldavatar = $xoops->user->getVar('user_avatar');
+                            $criteria = new CriteriaCompo();
+                            $criteria->add(new Criteria('avatar_type', 'C'));
+                            $criteria->add(new Criteria('avatar_file', $oldavatar));
+                            $avatars = $avatar_Handler->getObjects($criteria);
+                            if (! empty($avatars) && count($avatars) == 1 && is_object($avatars[0])) {
+                                $avatar_Handler->delete($avatars[0]);
+                                $xoops_upload_path = \XoopsBaseConfig::get('uploads-path');
+                                $oldavatar_path = realpath($xoops_upload_path . '/' . $oldavatar);
+                                if (0 === strpos($oldavatar_path, realpath($xoops_upload_path))
+                                    && is_file($oldavatar_path)
+                                ) {
+                                    unlink($oldavatar_path);
+                                }
                             }
+                            $sql = $xoops->db()->createXoopsQueryBuilder()
+                                ->updatePrefix('system_user')
+                                ->set('user_avatar', ':avatar')
+                                ->where('uid = :uid')
+                                ->setParameter(':uid', $xoops->user->getVar('uid'), \PDO::PARAM_INT)
+                                ->setParameter(
+                                    ':avatar',
+                                    'avatars/' . $uploader_avatars_img->getSavedFileName(),
+                                    \PDO::PARAM_STR
+                                )
+                                ->execute();
+                            $avatar_Handler->addUser($obj->getVar('avatar_id'), $xoops->user->getVar('uid'));
+                            $xoops->redirect($xoops->url('userinfo.php?uid=' . $uid), 2, XoopsLocale::S_ITEM_SAVED);
                         }
-                        $sql = $xoops->db()->createXoopsQueryBuilder()
-                            ->updatePrefix('system_user')
-                            ->set('user_avatar', ':avatar')
-                            ->where('uid = :uid')
-                            ->setParameter(':uid', $xoops->user->getVar('uid'), \PDO::PARAM_INT)
-                            ->setParameter(
-                                ':avatar',
-                                'avatars/' . $uploader_avatars_img->getSavedFileName(),
-                                \PDO::PARAM_STR
-                            )
-                            ->execute();
-                        $avatar_Handler->addUser($obj->getVar('avatar_id'), $xoops->user->getVar('uid'));
-                        $xoops->redirect($xoops->url('userinfo.php?uid=' . $uid), 2, XoopsLocale::S_ITEM_SAVED);
+                        $error_msg .= $obj->getHtmlErrors();
                     }
-                    $error_msg .= $obj->getHtmlErrors();
                 }
-            }
-        } else {
-            $user_avatar = Request::getString('user_avatar', 'blank.gif');
-            $oldavatar = $xoops->user->getVar('user_avatar');
-            $xoops->user->setVar('user_avatar', $user_avatar);
-            $member_handler = $xoops->getHandlerMember();
-            if (!$member_handler->insertUser($xoops->user)) {
-                echo $xoops->user->getHtmlErrors();
-            }
-            $criteria = new CriteriaCompo();
-            $criteria->add(new Criteria('avatar_type', 'C'));
-            $criteria->add(new Criteria('avatar_file', $oldavatar));
-            $avatars = $avatar_Handler->getObjects($criteria);
-            if (!empty($avatars) && count($avatars) == 1 && is_object($avatars[0])) {
-                $avatar_Handler->delete($avatars[0]);
-                $xoops_upload_path = \XoopsBaseConfig::get('uploads-path');
-                $oldavatar_path = realpath($xoops_upload_path . '/' . $oldavatar);
-                if (0 === strpos($oldavatar_path, realpath($xoops_upload_path)) && is_file($oldavatar_path)) {
-                    unlink($oldavatar_path);
+            } else {
+                $user_avatar = Request::getString('user_avatar', 'blank.gif');
+                $oldavatar = $xoops->user->getVar('user_avatar');
+                $xoops->user->setVar('user_avatar', $user_avatar);
+                $member_handler = $xoops->getHandlerMember();
+                if (!$member_handler->insertUser($xoops->user)) {
+                    echo $xoops->user->getHtmlErrors();
                 }
-            }
-            if ($user_avatar !== 'blank.gif') {
-                $avatars = $avatar_Handler->getObjects(new Criteria('avatar_file', $user_avatar));
-                if (is_object($avatars[0])) {
-                    $avatar_Handler->addUser($avatars[0]->getVar('avatar_id'), $xoops->user->getVar('uid'));
+                $criteria = new CriteriaCompo();
+                $criteria->add(new Criteria('avatar_type', 'C'));
+                $criteria->add(new Criteria('avatar_file', $oldavatar));
+                $avatars = $avatar_Handler->getObjects($criteria);
+                if (!empty($avatars) && count($avatars) == 1 && is_object($avatars[0])) {
+                    $avatar_Handler->delete($avatars[0]);
+                    $xoops_upload_path = \XoopsBaseConfig::get('uploads-path');
+                    $oldavatar_path = realpath($xoops_upload_path . '/' . $oldavatar);
+                    if (0 === strpos($oldavatar_path, realpath($xoops_upload_path)) && is_file($oldavatar_path)) {
+                        unlink($oldavatar_path);
+                    }
+                }
+                if ($user_avatar !== 'blank.gif') {
+                    $avatars = $avatar_Handler->getObjects(new Criteria('avatar_file', $user_avatar));
+                    if (is_object($avatars[0])) {
+                        $avatar_Handler->addUser($avatars[0]->getVar('avatar_id'), $xoops->user->getVar('uid'));
+                    }
                 }
+                $xoops->redirect($xoops->url('userinfo.php?uid=' . $uid), 2, XoopsLocale::S_ITEM_SAVED);
             }
-            $xoops->redirect($xoops->url('userinfo.php?uid=' . $uid), 2, XoopsLocale::S_ITEM_SAVED);
-        }
-        $xoops->tpl()->assign('uid', $xoops->user->getVar("uid"));
-        $xoops->tpl()->assign('info_msg', $xoops->alert('info', $info_msg, XoopsLocale::INFORMATION_FOR_UPLOADS));
-        $xoops->tpl()->assign('error_msg', $xoops->alert('error', $error_msg, XoopsLocale::ERRORS));
-        $form = $xoops->getModuleForm($obj, 'avatar_user');
-        $xoops->tpl()->assign('form', $form->render());
-        break;
+            $xoops->tpl()->assign('uid', $xoops->user->getVar("uid"));
+            $xoops->tpl()->assign('info_msg', $xoops->alert('info', $info_msg, XoopsLocale::INFORMATION_FOR_UPLOADS));
+            $xoops->tpl()->assign('error_msg', $xoops->alert('error', $error_msg, XoopsLocale::ERRORS));
+            $form = $xoops->getModuleForm($obj, 'avatar_user');
+            $xoops->tpl()->assign('form', $form->render());
+            break;
 }
 $xoops->footer();

Spacing +11 added lines, -11 removed lines

@@ -22,7 +22,7 @@ 
  * @version         $Id$
  */
 
-include dirname(dirname(dirname(__DIR__))) . '/mainfile.php';
+include dirname(dirname(dirname(__DIR__))).'/mainfile.php';
 
 $xoops = Xoops::getInstance();
 $helper = $xoops->getModuleHelper('avatars');
@@ -67,9 +67,9 @@ 
         $xoops->tpl()->assign('info_msg', $xoops->alert('info', $info_msg, XoopsLocale::INFORMATION_FOR_UPLOADS));
         $oldavatar = $xoops->user->getVar('user_avatar');
         if (!empty($oldavatar) && $oldavatar !== 'blank.gif') {
-            $warning_msg = '<p>' . AvatarsLocale::ALERT_WARNING_OLD .'</p>';
+            $warning_msg = '<p>'.AvatarsLocale::ALERT_WARNING_OLD.'</p>';
             $xoops_upload_url = \XoopsBaseConfig::get('uploads-url');
-            $warning_msg .= "<img src='" . $xoops_upload_url . '/' . $oldavatar ."' alt='&nbsp;' />";
+            $warning_msg .= "<img src='".$xoops_upload_url.'/'.$oldavatar."' alt='&nbsp;' />";
             $xoops->tpl()->assign('warning_msg', $xoops->alert('warning', $warning_msg, XoopsLocale::WARNING));
         }
 
@@ -91,7 +91,7 @@ 
             exit();
         }
         $uploader_avatars_img =
-            new XoopsMediaUploader(\XoopsBaseConfig::get('uploads-path') . '/avatars', $mimetypes, $upload_size, $width, $height);
+            new XoopsMediaUploader(\XoopsBaseConfig::get('uploads-path').'/avatars', $mimetypes, $upload_size, $width, $height);
 
         $obj = $avatar_Handler->create();
         $error_msg = '';
@@ -104,7 +104,7 @@ 
             } else {
                 $obj->setVar('avatar_name', $xoops->user->getVar('uname'));
                 $obj->setVar('avatar_mimetype', $uploader_avatars_img->getMediaType());
-                $obj->setVar('avatar_file', 'avatars/' . $uploader_avatars_img->getSavedFileName());
+                $obj->setVar('avatar_file', 'avatars/'.$uploader_avatars_img->getSavedFileName());
                 $obj->setVar('avatar_display', 1);
                 $obj->setVar('avatar_type', 'C');
 
@@ -115,10 +115,10 @@ 
                         $criteria->add(new Criteria('avatar_type', 'C'));
                         $criteria->add(new Criteria('avatar_file', $oldavatar));
                         $avatars = $avatar_Handler->getObjects($criteria);
-                        if (! empty($avatars) && count($avatars) == 1 && is_object($avatars[0])) {
+                        if (!empty($avatars) && count($avatars) == 1 && is_object($avatars[0])) {
                             $avatar_Handler->delete($avatars[0]);
                             $xoops_upload_path = \XoopsBaseConfig::get('uploads-path');
-                            $oldavatar_path = realpath($xoops_upload_path . '/' . $oldavatar);
+                            $oldavatar_path = realpath($xoops_upload_path.'/'.$oldavatar);
                             if (0 === strpos($oldavatar_path, realpath($xoops_upload_path))
                                 && is_file($oldavatar_path)
                             ) {
@@ -132,12 +132,12 @@ 
                             ->setParameter(':uid', $xoops->user->getVar('uid'), \PDO::PARAM_INT)
                             ->setParameter(
                                 ':avatar',
-                                'avatars/' . $uploader_avatars_img->getSavedFileName(),
+                                'avatars/'.$uploader_avatars_img->getSavedFileName(),
                                 \PDO::PARAM_STR
                             )
                             ->execute();
                         $avatar_Handler->addUser($obj->getVar('avatar_id'), $xoops->user->getVar('uid'));
-                        $xoops->redirect($xoops->url('userinfo.php?uid=' . $uid), 2, XoopsLocale::S_ITEM_SAVED);
+                        $xoops->redirect($xoops->url('userinfo.php?uid='.$uid), 2, XoopsLocale::S_ITEM_SAVED);
                     }
                     $error_msg .= $obj->getHtmlErrors();
                 }
@@ -157,7 +157,7 @@ 
             if (!empty($avatars) && count($avatars) == 1 && is_object($avatars[0])) {
                 $avatar_Handler->delete($avatars[0]);
                 $xoops_upload_path = \XoopsBaseConfig::get('uploads-path');
-                $oldavatar_path = realpath($xoops_upload_path . '/' . $oldavatar);
+                $oldavatar_path = realpath($xoops_upload_path.'/'.$oldavatar);
                 if (0 === strpos($oldavatar_path, realpath($xoops_upload_path)) && is_file($oldavatar_path)) {
                     unlink($oldavatar_path);
                 }
@@ -168,7 +168,7 @@ 
                     $avatar_Handler->addUser($avatars[0]->getVar('avatar_id'), $xoops->user->getVar('uid'));
                 }
             }
-            $xoops->redirect($xoops->url('userinfo.php?uid=' . $uid), 2, XoopsLocale::S_ITEM_SAVED);
+            $xoops->redirect($xoops->url('userinfo.php?uid='.$uid), 2, XoopsLocale::S_ITEM_SAVED);
         }
         $xoops->tpl()->assign('uid', $xoops->user->getVar("uid"));
         $xoops->tpl()->assign('info_msg', $xoops->alert('info', $info_msg, XoopsLocale::INFORMATION_FOR_UPLOADS));

htdocs/modules/avatars/include/install.php

Indentation +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
     $dbManager->copyFields($map, 'avatar_user_link', 'avatars_user_link', false);
     */
 
-	$xoops_root_path = \XoopsBaseConfig::get('root-path');
+    $xoops_root_path = \XoopsBaseConfig::get('root-path');
 	
     // create folder "avatars"
     $dir = $xoops_root_path . "/uploads/avatars";

Spacing +7 added lines, -7 removed lines

@@ -62,25 +62,25 @@
 	$xoops_root_path = \XoopsBaseConfig::get('root-path');
 	
     // create folder "avatars"
-    $dir = $xoops_root_path . "/uploads/avatars";
+    $dir = $xoops_root_path."/uploads/avatars";
     if (!is_dir($dir)) {
         mkdir($dir, 0777);
         chmod($dir, 0777);
     }
     //Copy index.html
-    $file = $xoops_root_path . "/uploads/avatars/index.html";
+    $file = $xoops_root_path."/uploads/avatars/index.html";
     if (!is_file($file)) {
-        copy($xoops_root_path . "/modules/avatars/images/index.html", $file);
+        copy($xoops_root_path."/modules/avatars/images/index.html", $file);
     }
     //Copy blank.gif
-    $file = $xoops_root_path . "/uploads/avatars/blank.gif";
+    $file = $xoops_root_path."/uploads/avatars/blank.gif";
     if (!is_file($file)) {
-        copy($xoops_root_path . "/modules/avatars/images/blank.gif", $file);
+        copy($xoops_root_path."/modules/avatars/images/blank.gif", $file);
     }
     //Copy .htaccess
-    $file = $xoops_root_path . "/uploads/avatars/.htaccess";
+    $file = $xoops_root_path."/uploads/avatars/.htaccess";
     if (!is_file($file)) {
-        copy($xoops_root_path . "/uploads/.htaccess", $file);
+        copy($xoops_root_path."/uploads/.htaccess", $file);
     }
     return true;
 }

htdocs/modules/avatars/popup.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
  * @author          Mage Grégory (AKA Mage)
  */
 
-include dirname(dirname(__DIR__)) . '/mainfile.php';
+include dirname(dirname(__DIR__)).'/mainfile.php';
 
 $xoops = Xoops::getInstance();
 $xoops->disableErrorReporting();

htdocs/modules/avatars/class/AvatarsProvider.php

Indentation +5 added lines, -5 removed lines

@@ -26,13 +26,13 @@ 
  */
 class AvatarsProvider extends AbstractContract implements AvatarInterface
 {
-	protected $xoops_url;
-	protected $xoops_upload_url;
+    protected $xoops_url;
+    protected $xoops_upload_url;
 
     public function __construct()
     {
-		$this->xoops_url = \XoopsBaseConfig::get('url');
-		$this->xoops_upload_url = \XoopsBaseConfig::get('uploads-url');
+        $this->xoops_url = \XoopsBaseConfig::get('url');
+        $this->xoops_upload_url = \XoopsBaseConfig::get('uploads-url');
     }
 
     /**
@@ -69,7 +69,7 @@ 
         return (is_object($user)) ? $user : null;
     }
 
-   /**
+    /**
      * getAvatarUrl - given user info return absolute URL to avatar image
      *
      * @param Response $response \Xoops\Core\Service\Response object

Spacing +6 added lines, -6 removed lines

@@ -65,7 +65,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;
     }
 
@@ -86,22 +86,22 @@ 
                 if ($userinfo->getVar('user_avatar')
                     && 'blank.gif' !== $userinfo->getVar('user_avatar')
                 ) {
-                    $response->setValue($this->xoops_upload_url . "/" . $userinfo->getVar('user_avatar'));
+                    $response->setValue($this->xoops_upload_url."/".$userinfo->getVar('user_avatar'));
                 }
                 $noInfo = false;
             }
         } elseif (is_array($userinfo)) {
             if (!empty($userinfo['user_avatar']) && $userinfo['user_avatar'] !== 'blank.gif') {
-                $response->setValue($this->xoops_upload_url . "/" . $userinfo['user_avatar']);
+                $response->setValue($this->xoops_upload_url."/".$userinfo['user_avatar']);
                 $noInfo = false;
             }
         } elseif (is_scalar($userinfo)) {
-            $user = $this->getUserById((int) $userinfo);
+            $user = $this->getUserById((int)$userinfo);
             if (is_object($user) && ($user instanceof XoopsUser)) {
                 if ($user->getVar('user_avatar')
                     && 'blank.gif' !== $user->getVar('user_avatar')
                 ) {
-                    $response->setValue($this->xoops_upload_url . "/" . $user->getVar('user_avatar'));
+                    $response->setValue($this->xoops_upload_url."/".$user->getVar('user_avatar'));
                 }
                 $noInfo = false;
             }
@@ -123,7 +123,7 @@ 
     {
         $noInfo = true;
         if ($userinfo instanceof XoopsUser) {
-            $link = $this->xoops_url . '/modules/avatars/include/editavatar.php';
+            $link = $this->xoops_url.'/modules/avatars/include/editavatar.php';
             $response->setValue($link);
             $noInfo = false;
         }

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')