XOOPS / XoopsCore

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'), ParameterType::INTEGER)
+                                ->setParameter(
+                                    ':avatar',
+                                    'avatars/' . $uploader_avatars_img->getSavedFileName(),
+                                    ParameterType::STRING
+                                )
+                                ->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'), ParameterType::INTEGER)
-                            ->setParameter(
-                                ':avatar',
-                                'avatars/' . $uploader_avatars_img->getSavedFileName(),
-                                ParameterType::STRING
-                            )
-                            ->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 @@ 
  * @author    Mage Grégory (AKA Mage)
  */
 
-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'), ParameterType::INTEGER)
                             ->setParameter(
                                 ':avatar',
-                                'avatars/' . $uploader_avatars_img->getSavedFileName(),
+                                'avatars/'.$uploader_avatars_img->getSavedFileName(),
                                 ParameterType::STRING
                             )
                             ->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/system/blocks/info.php

Spacing +5 added lines, -5 removed lines

@@ -51,7 +51,7 @@ 
             while ($userinfo = $result->fetch(FetchMode::ASSOCIATIVE)) {
                 $response = $xoops->service("Avatar")->getAvatarUrl($userinfo);
                 $avatar = $response->getValue();
-                $avatar = empty($avatar) ? \XoopsBaseConfig::get('uploads-url') . '/blank.gif' : $avatar;
+                $avatar = empty($avatar) ? \XoopsBaseConfig::get('uploads-url').'/blank.gif' : $avatar;
                 if ($prev_caption != $userinfo['groupname']) {
                     $prev_caption = $userinfo['groupname'];
                     $block['groups'][$i]['name'] = $myts->htmlSpecialChars($userinfo['groupname']);
@@ -60,7 +60,7 @@ 
                     $block['groups'][$i]['users'][] = array(
                         'id'      => $userinfo['uid'],
                         'name'    => $myts->htmlSpecialChars($userinfo['uname']),
-                        'pm_link' => \XoopsBaseConfig::get('url') . "/pmlite.php?send2=1&to_userid=" . $userinfo['uid'],
+                        'pm_link' => \XoopsBaseConfig::get('url')."/pmlite.php?send2=1&to_userid=".$userinfo['uid'],
                         'avatar'  => $avatar
                     );
                 } else {
@@ -84,8 +84,8 @@ 
     } else {
         $block['showgroups'] = false;
     }
-    $block['logourl'] = \XoopsBaseConfig::get('url') . '/images/' . $options[2];
-    $block['recommendlink'] = "<a href=\"javascript:openWithSelfMain('" . \XoopsBaseConfig::get('url') . "/misc.php?action=showpopups&amp;type=friend&amp;op=sendform&amp;t=" . time() . "','friend'," . $options[0] . "," . $options[1] . ")\">" . SystemLocale::RECOMMEND_US . "</a>";
+    $block['logourl'] = \XoopsBaseConfig::get('url').'/images/'.$options[2];
+    $block['recommendlink'] = "<a href=\"javascript:openWithSelfMain('".\XoopsBaseConfig::get('url')."/misc.php?action=showpopups&amp;type=friend&amp;op=sendform&amp;t=".time()."','friend',".$options[0].",".$options[1].")\">".SystemLocale::RECOMMEND_US."</a>";
     return $block;
 }
 
@@ -94,7 +94,7 @@ 
     $block_form = new Xoops\Form\BlockForm();
     $block_form->addElement(new Xoops\Form\Text(SystemLocale::POPUP_WINDOW_WIDTH, 'options[0]', 1, 3, $options[0]), true);
     $block_form->addElement(new Xoops\Form\Text(SystemLocale::POPUP_WINDOW_HEIGHT, 'options[1]', 1, 3, $options[1]), true);
-    $block_form->addElement(new Xoops\Form\Text(sprintf(SystemLocale::F_LOGO_IMAGE_FILE_IS_LOCATED_UNDER, \XoopsBaseConfig::get('url') . "/images/"), 'options[2]', 5, 100, $options[2]), true);
+    $block_form->addElement(new Xoops\Form\Text(sprintf(SystemLocale::F_LOGO_IMAGE_FILE_IS_LOCATED_UNDER, \XoopsBaseConfig::get('url')."/images/"), 'options[2]', 5, 100, $options[2]), true);
     $block_form->addElement(new Xoops\Form\RadioYesNo(SystemLocale::SHOW_ADMIN_GROUPS, 'options[3]', $options[3]));
     return $block_form->render();
 }

htdocs/modules/page/class/plugin/search.php

Spacing +6 added lines, -6 removed lines

@@ -44,7 +44,7 @@ 
      */
     public function search($queryArray, $andor, $limit, $offset, $userid)
     {
-        $andor = strtolower($andor)==='and' ? 'and' : 'or';
+        $andor = strtolower($andor) === 'and' ? 'and' : 'or';
 
         $qb = \Xoops::getInstance()->db()->createXoopsQueryBuilder();
         $eb = $qb->expr();
@@ -57,8 +57,8 @@ 
         if (is_array($queryArray) && !empty($queryArray)) {
             $queryParts = array();
             foreach ($queryArray as $i => $q) {
-                $qterm = ':qterm' . $i;
-                $qb->setParameter($qterm, '%' . $q . '%', ParameterType::STRING);
+                $qterm = ':qterm'.$i;
+                $qb->setParameter($qterm, '%'.$q.'%', ParameterType::STRING);
                 $queryParts[] = $eb -> orX(
                     $eb->like('content_title', $qterm),
                     $eb->like('content_text', $qterm),
@@ -71,7 +71,7 @@ 
                 $qb->andWhere(call_user_func_array(array($eb, "orX"), $queryParts));
             }
         } else {
-            $qb->setParameter(':uid', (int) $userid, ParameterType::INTEGER);
+            $qb->setParameter(':uid', (int)$userid, ParameterType::INTEGER);
             $qb->andWhere($eb->eq('content_author', ':uid'));
         }
 
@@ -79,12 +79,12 @@ 
         $items = array();
         $result = $qb->execute();
         while ($myrow = $result->fetch(FetchMode::ASSOCIATIVE)) {
-            $content = $myrow["content_shorttext"] . "<br /><br />" . $myrow["content_text"];
+            $content = $myrow["content_shorttext"]."<br /><br />".$myrow["content_text"];
             $content = $myts->displayTarea($content);
             $items[] = array(
                 'title' => $myrow['content_title'],
                 'content' => Metagen::getSearchSummary($content, $queryArray),
-                'link' => "viewpage.php?id=" . $myrow["content_id"],
+                'link' => "viewpage.php?id=".$myrow["content_id"],
                 'time' => $myrow['content_create'],
                 'uid' => $myrow['content_author'],
                 'image' => 'images/logo_small.png',

htdocs/modules/smilies/include/install.php

Spacing +17 added lines, -17 removed lines

@@ -31,23 +31,23 @@
 function xoops_module_install_smilies(&$module)
 {
     $data = array(
-        array(':-D',      'smilies/smil3dbd4d4e4c4f2.gif', 'Very Happy',           1),
-        array(':-)',      'smilies/smil3dbd4d6422f04.gif', 'Smile',                1),
-        array(':-(',      'smilies/smil3dbd4d75edb5e.gif', 'Sad',                  1),
-        array(':-o',      'smilies/smil3dbd4d8676346.gif', 'Surprised',            1),
-        array(':-?',      'smilies/smil3dbd4d99c6eaa.gif', 'Confused',             1),
-        array('8-)',      'smilies/smil3dbd4daabd491.gif', 'Cool',                 1),
-        array(':lol:',    'smilies/smil3dbd4dbc14f3f.gif', 'Laughing',             1),
-        array(':-x',      'smilies/smil3dbd4dcd7b9f4.gif', 'Mad',                  1),
-        array(':-P',      'smilies/smil3dbd4ddd6835f.gif', 'Razz',                 1),
-        array(':oops:',   'smilies/smil3dbd4df1944ee.gif', 'Embaressed',           0),
-        array(':cry:',    'smilies/smil3dbd4e02c5440.gif', 'Crying (very sad)',    0),
-        array(':evil:',   'smilies/smil3dbd4e1748cc9.gif', 'Evil or Very Mad',     0),
-        array(':roll:',   'smilies/smil3dbd4e29bbcc7.gif', 'Rolling Eyes',         0),
-        array(';-)',      'smilies/smil3dbd4e398ff7b.gif', 'Wink',                 0),
-        array(':pint:',   'smilies/smil3dbd4e4c2e742.gif', 'Another pint of beer', 0),
-        array(':hammer:', 'smilies/smil3dbd4e5e7563a.gif', 'ToolTimes at work',    0),
-        array(':idea:',   'smilies/smil3dbd4e7853679.gif', 'I have an idea',       0),
+        array(':-D', 'smilies/smil3dbd4d4e4c4f2.gif', 'Very Happy', 1),
+        array(':-)', 'smilies/smil3dbd4d6422f04.gif', 'Smile', 1),
+        array(':-(', 'smilies/smil3dbd4d75edb5e.gif', 'Sad', 1),
+        array(':-o', 'smilies/smil3dbd4d8676346.gif', 'Surprised', 1),
+        array(':-?', 'smilies/smil3dbd4d99c6eaa.gif', 'Confused', 1),
+        array('8-)', 'smilies/smil3dbd4daabd491.gif', 'Cool', 1),
+        array(':lol:', 'smilies/smil3dbd4dbc14f3f.gif', 'Laughing', 1),
+        array(':-x', 'smilies/smil3dbd4dcd7b9f4.gif', 'Mad', 1),
+        array(':-P', 'smilies/smil3dbd4ddd6835f.gif', 'Razz', 1),
+        array(':oops:', 'smilies/smil3dbd4df1944ee.gif', 'Embaressed', 0),
+        array(':cry:', 'smilies/smil3dbd4e02c5440.gif', 'Crying (very sad)', 0),
+        array(':evil:', 'smilies/smil3dbd4e1748cc9.gif', 'Evil or Very Mad', 0),
+        array(':roll:', 'smilies/smil3dbd4e29bbcc7.gif', 'Rolling Eyes', 0),
+        array(';-)', 'smilies/smil3dbd4e398ff7b.gif', 'Wink', 0),
+        array(':pint:', 'smilies/smil3dbd4e4c2e742.gif', 'Another pint of beer', 0),
+        array(':hammer:', 'smilies/smil3dbd4e5e7563a.gif', 'ToolTimes at work', 0),
+        array(':idea:', 'smilies/smil3dbd4e7853679.gif', 'I have an idea', 0),
     );
     $types = array(ParameterType::STRING, ParameterType::STRING, ParameterType::STRING, ParameterType::INTEGER);
     $db = \Xoops::getInstance()->db();

htdocs/modules/publisher/admin/permissions.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 use XoopsModules\Publisher;
 use Doctrine\DBAL\FetchMode;
 
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 
 $xoops = Xoops::getInstance();
 $myts = Sanitizer::getInstance();

htdocs/modules/publisher/src/PermissionHandler.php

Spacing +2 added lines, -2 removed lines

@@ -29,7 +29,7 @@ 
  * @author          trabis <lusopoemas@gmail.com>
  * @author          The SmartFactory <www.smartfactory.ca>
  */
-require_once \dirname(__DIR__) . '/include/common.php';
+require_once \dirname(__DIR__).'/include/common.php';
 
 /**
  * Class PermissionHandler
@@ -164,7 +164,7 @@ 
         // Save the new permissions
         if (\count($groups) > 0) {
             foreach ($groups as $group_id) {
-                echo $group_id . '-';
+                echo $group_id.'-';
                 echo $gpermHandler->addRight($perm_name, $itemid, $group_id, $module_id);
             }
         }

htdocs/modules/publisher/src/ItemHandler.php

Indentation +3 added lines, -3 removed lines

@@ -655,9 +655,9 @@
             'c.parentid',
             'ASC'
         )->addOrderBy(
-                                                                                                                                                                                                                                                                              'i.categoryid',
-                                                                                                                                                                                                                                                                              'ASC'
-                                                                                                                                                                                                                                                                          );
+                                                                                                                                                                                                                                                                                'i.categoryid',
+                                                                                                                                                                                                                                                                                'ASC'
+                                                                                                                                                                                                                                                                            );
         if ((int)$cat_id > 0) {
             $qb->andWhere($qb->expr()->eq('i.categoryid', ':catid'))->setParameter(':catid', $cat_id, ParameterType::INTEGER);
         }

Spacing +13 added lines, -13 removed lines

@@ -32,7 +32,7 @@ 
  * @author          trabis <lusopoemas@gmail.com>
  * @author          The SmartFactory <www.smartfactory.ca>
  */
-require_once \dirname(__DIR__) . '/include/common.php';
+require_once \dirname(__DIR__).'/include/common.php';
 
 /**
  * Items handler class.
@@ -210,7 +210,7 @@ 
             // Categories for which user has access
             $categoriesGranted = $this->helper->getPermissionHandler()->getGrantedItems('category_read');
             if (!empty($categoriesGranted)) {
-                $grantedCategories = new Criteria('categoryid', '(' . \implode(',', $categoriesGranted) . ')', 'IN');
+                $grantedCategories = new Criteria('categoryid', '('.\implode(',', $categoriesGranted).')', 'IN');
                 $criteriaPermissions->add($grantedCategories, 'AND');
             } else {
                 return 0;
@@ -357,7 +357,7 @@ 
             // Categories for which user has access
             $categoriesGranted = $this->helper->getPermissionHandler()->getGrantedItems('category_read');
             if (!empty($categoriesGranted)) {
-                $grantedCategories = new Criteria('categoryid', '(' . \implode(',', $categoriesGranted) . ')', 'IN');
+                $grantedCategories = new Criteria('categoryid', '('.\implode(',', $categoriesGranted).')', 'IN');
                 $criteriaPermissions->add($grantedCategories, 'AND');
             } else {
                 return [];
@@ -495,7 +495,7 @@ 
         if (\is_array($userid) && \count($userid) > 0) {
             $userid = \array_map('\intval', $userid);
             $criteriaUser = new CriteriaCompo();
-            $criteriaUser->add(new Criteria('uid', '(' . \implode(',', $userid) . ')', 'IN'), 'OR');
+            $criteriaUser->add(new Criteria('uid', '('.\implode(',', $userid).')', 'IN'), 'OR');
         } elseif (\is_numeric($userid) && $userid > 0) {
             $criteriaUser = new CriteriaCompo();
             $criteriaUser->add(new Criteria('uid', $userid), 'OR');
@@ -506,19 +506,19 @@ 
             foreach ($queryarray as $iValue) {
                 $criteriaKeyword = new CriteriaCompo();
                 if (\in_array('title', $searchin)) {
-                    $criteriaKeyword->add(new Criteria('title', '%' . $iValue . '%', 'LIKE'), 'OR');
+                    $criteriaKeyword->add(new Criteria('title', '%'.$iValue.'%', 'LIKE'), 'OR');
                 }
                 if (\in_array('subtitle', $searchin)) {
-                    $criteriaKeyword->add(new Criteria('subtitle', '%' . $iValue . '%', 'LIKE'), 'OR');
+                    $criteriaKeyword->add(new Criteria('subtitle', '%'.$iValue.'%', 'LIKE'), 'OR');
                 }
                 if (\in_array('body', $searchin)) {
-                    $criteriaKeyword->add(new Criteria('body', '%' . $iValue . '%', 'LIKE'), 'OR');
+                    $criteriaKeyword->add(new Criteria('body', '%'.$iValue.'%', 'LIKE'), 'OR');
                 }
                 if (\in_array('summary', $searchin)) {
-                    $criteriaKeyword->add(new Criteria('summary', '%' . $iValue . '%', 'LIKE'), 'OR');
+                    $criteriaKeyword->add(new Criteria('summary', '%'.$iValue.'%', 'LIKE'), 'OR');
                 }
                 if (\in_array('meta_keywords', $searchin)) {
-                    $criteriaKeyword->add(new Criteria('meta_keywords', '%' . $iValue . '%', 'LIKE'), 'OR');
+                    $criteriaKeyword->add(new Criteria('meta_keywords', '%'.$iValue.'%', 'LIKE'), 'OR');
                 }
                 $criteriaKeywords->add($criteriaKeyword, $andor);
                 unset($criteriaKeyword);
@@ -534,11 +534,11 @@ 
             if (0 == \count($categoriesGranted)) {
                 return $ret;
             }
-            $grantedCategories = new Criteria('categoryid', '(' . \implode(',', $categoriesGranted) . ')', 'IN');
+            $grantedCategories = new Criteria('categoryid', '('.\implode(',', $categoriesGranted).')', 'IN');
             $criteriaPermissions->add($grantedCategories, 'AND');
         } elseif (\count($categories) > 0) {
             $criteriaPermissions = new CriteriaCompo();
-            $grantedCategories = new Criteria('categoryid', '(' . \implode(',', $categories) . ')', 'IN');
+            $grantedCategories = new Criteria('categoryid', '('.\implode(',', $categories).')', 'IN');
             $criteriaPermissions->add($grantedCategories, 'AND');
         }
         $criteriaItemsStatus = new CriteriaCompo();
@@ -603,7 +603,7 @@ 
 
         $subqb = $this->db2->createXoopsQueryBuilder();
         $subqb->select('categoryid', 'MAX(datesub) AS date')->fromPrefix('publisher_items', '')->where($subqb->expr()->in('status', $status))->andWhere($subqb->expr()->in('categoryid', $catIds))->groupBy('categoryid');
-        $subquery = '(' . $subqb->getSQL() . ')';
+        $subquery = '('.$subqb->getSQL().')';
 
         $qb->from($subquery, 'mo')->joinPrefix('mo', 'publisher_items', 'mi', 'mi.datesub = mo.date');
 
@@ -626,7 +626,7 @@ 
      */
     public function countArticlesByCat($parentid, &$catsCount, $spaces = '', $resultCatCounts = []): int
     {
-        $newspaces = $spaces . '--';
+        $newspaces = $spaces.'--';
         $thecount = 0;
         foreach ($catsCount[$parentid] as $subCatId => $count) {
             $thecount = $thecount + $count;

htdocs/modules/userrank/class/UserRankProvider.php

Spacing +5 added lines, -5 removed lines

@@ -63,9 +63,9 @@ 
      */
     public function getUserRank(Response $response, $userinfo)
     {
-        $uid = isset($userinfo['uid']) ? (int) $userinfo['uid'] : null;
-        $posts = isset($userinfo['posts']) ? (int) $userinfo['posts'] : null;
-        $rank = isset($userinfo['rank']) ? (int) $userinfo['rank'] : null;
+        $uid = isset($userinfo['uid']) ? (int)$userinfo['uid'] : null;
+        $posts = isset($userinfo['posts']) ? (int)$userinfo['posts'] : null;
+        $rank = isset($userinfo['rank']) ? (int)$userinfo['rank'] : null;
         if ($uid === null || $posts === null || $rank === null) {
             $response->setSuccess(false)->addErrorMessage('User info is invalid');
             return;
@@ -91,8 +91,8 @@ 
         $rank = $result->fetch(FetchMode::ASSOCIATIVE);
 
         $rank['title'] = isset($rank['title']) ? $myts->htmlSpecialChars($rank['title']) : '';
-        $rank['image'] = \XoopsBaseConfig::get('uploads-url') .
-            (isset($rank['image']) ? '/' . $rank['image'] : '/blank.gif');
+        $rank['image'] = \XoopsBaseConfig::get('uploads-url').
+            (isset($rank['image']) ? '/'.$rank['image'] : '/blank.gif');
 
         $response->setValue($rank);
     }

xoops_lib/Xoops/Core/Logger.php

Spacing +22 added lines, -22 removed lines

@@ -101,7 +101,7 @@ 
             // if an error occurs before a locale is established,
             // we still need messages, so check and deal with it
 
-            $msg = ': ' . sprintf(
+            $msg = ': '.sprintf(
                     (class_exists('\XoopsLocale', false) ? \XoopsLocale::EF_LOGGER_FILELINE : "%s in file %s line %s"),
                     $this->sanitizePath($errorString),
                     $this->sanitizePath($errorFile),
@@ -110,23 +110,23 @@ 
 
             switch ($errorNumber) {
                 case E_USER_NOTICE:
-                    $msg = (class_exists('\XoopsLocale', false) ? \XoopsLocale::E_LOGGER_ERROR : '*Error:') . $msg;
+                    $msg = (class_exists('\XoopsLocale', false) ? \XoopsLocale::E_LOGGER_ERROR : '*Error:').$msg;
                     $this->log(LogLevel::NOTICE, $msg);
                     break;
                 case E_NOTICE:
-                    $msg = (class_exists('\XoopsLocale', false) ? \XoopsLocale::E_LOGGER_NOTICE : '*Notice:') . $msg;
+                    $msg = (class_exists('\XoopsLocale', false) ? \XoopsLocale::E_LOGGER_NOTICE : '*Notice:').$msg;
                     $this->log(LogLevel::NOTICE, $msg);
                     break;
                 case E_WARNING:
-                    $msg = (class_exists('\XoopsLocale', false) ? \XoopsLocale::E_LOGGER_WARNING : '*Warning:') . $msg;
+                    $msg = (class_exists('\XoopsLocale', false) ? \XoopsLocale::E_LOGGER_WARNING : '*Warning:').$msg;
                     $this->log(LogLevel::WARNING, $msg);
                     break;
                 case E_STRICT:
-                    $msg = (class_exists('\XoopsLocale', false) ? \XoopsLocale::E_LOGGER_STRICT : '*Strict:') . $msg;
+                    $msg = (class_exists('\XoopsLocale', false) ? \XoopsLocale::E_LOGGER_STRICT : '*Strict:').$msg;
                     $this->log(LogLevel::WARNING, $msg);
                     break;
                 case E_USER_ERROR:
-                    $msg = (class_exists('\XoopsLocale', false) ? \XoopsLocale::E_LOGGER_ERROR : '*Error:') . $msg;
+                    $msg = (class_exists('\XoopsLocale', false) ? \XoopsLocale::E_LOGGER_ERROR : '*Error:').$msg;
                     @$this->log(LogLevel::CRITICAL, $msg);
                     break;
                 case E_USER_DEPRECATED:
@@ -134,7 +134,7 @@ 
                     \Xoops::getInstance()->events()->triggerEvent('core.deprecated', array($msg));
                     break;
                 default:
-                    $msg = $this->getReadableErrorType($errorNumber) . $msg;
+                    $msg = $this->getReadableErrorType($errorNumber).$msg;
                     $this->log(LogLevel::ERROR, $msg);
                     break;
             }
@@ -157,7 +157,7 @@ 
                         }
                     }
                 } else {
-                    echo "<div style='color:#f0f0f0;background-color:#f0f0f0'>" . _XOOPS_FATAL_BACKTRACE . ":<br />";
+                    echo "<div style='color:#f0f0f0;background-color:#f0f0f0'>"._XOOPS_FATAL_BACKTRACE.":<br />";
                     foreach ($trace as $step) {
                         if (isset($step['file'])) {
                             printf("%s (%d)\n<br />", $this->sanitizePath($step['file']), $step['line']);
@@ -239,7 +239,7 @@ 
      */
     private function reportFatalError($msg)
     {
-        $msg=$this->sanitizePath($msg);
+        $msg = $this->sanitizePath($msg);
         if ('cli' === php_sapi_name()) {
             fprintf(STDERR, "\nError : %s\n", $msg);
         } else {
@@ -262,18 +262,18 @@ 
     public function sanitizePath($message)
     {
         $cleaners = [
-            ['\\', '/',],
-            [\XoopsBaseConfig::get('var-path'), 'VAR',],
-            [str_replace('\\', '/', realpath(\XoopsBaseConfig::get('var-path'))), 'VAR',],
-            [\XoopsBaseConfig::get('lib-path'), 'LIB',],
-            [str_replace('\\', '/', realpath(\XoopsBaseConfig::get('lib-path'))), 'LIB',],
-            [\XoopsBaseConfig::get('root-path'), 'ROOT',],
-            [str_replace('\\', '/', realpath(\XoopsBaseConfig::get('root-path'))), 'ROOT',],
-            [\XoopsBaseConfig::get('db-name') . '.', '',],
-            [\XoopsBaseConfig::get('db-name'), '',],
-            [\XoopsBaseConfig::get('db-prefix') . '_', '',],
-            [\XoopsBaseConfig::get('db-user'), '***',],
-            [\XoopsBaseConfig::get('db-pass'), '***',],
+            ['\\', '/', ],
+            [\XoopsBaseConfig::get('var-path'), 'VAR', ],
+            [str_replace('\\', '/', realpath(\XoopsBaseConfig::get('var-path'))), 'VAR', ],
+            [\XoopsBaseConfig::get('lib-path'), 'LIB', ],
+            [str_replace('\\', '/', realpath(\XoopsBaseConfig::get('lib-path'))), 'LIB', ],
+            [\XoopsBaseConfig::get('root-path'), 'ROOT', ],
+            [str_replace('\\', '/', realpath(\XoopsBaseConfig::get('root-path'))), 'ROOT', ],
+            [\XoopsBaseConfig::get('db-name').'.', '', ],
+            [\XoopsBaseConfig::get('db-name'), '', ],
+            [\XoopsBaseConfig::get('db-prefix').'_', '', ],
+            [\XoopsBaseConfig::get('db-user'), '***', ],
+            [\XoopsBaseConfig::get('db-pass'), '***', ],
         ];
         $stringsToClean = array_column($cleaners, 0);
         $replacementStings = array_column($cleaners, 1);
@@ -478,7 +478,7 @@ 
     {
         $this->deprecatedMessage();
         // legacy compatibility: turn off logger display for $xoopsLogger->activated = false; usage
-        if ($var==='activated' && !$val) {
+        if ($var === 'activated' && !$val) {
             $this->quiet();
         }