Inspection of "Merge pull request #2 from mambax7/master" - XoopsModules25x/groupmanager - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( 410bf5...5bae2d )

by Michael

created 2020-01-26 06:17 UTC

Status

Spacing +15 added lines, -15 removed lines patch added patch discarded remove patch

@@ -24,7 +24,7 @@  discard block
 block discarded – undo
 
 //defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
 
-require_once dirname(dirname(dirname(dirname(__DIR__)))) . '/mainfile.php';
+require_once dirname(dirname(dirname(dirname(__DIR__)))).'/mainfile.php';
 $moduleDirName      = basename(dirname(dirname(__DIR__)));
 $moduleDirNameUpper = mb_strtoupper($moduleDirName);
 xoops_loadLanguage('directorychecker', $moduleDirName);
@@ -56,38 +56,38 @@  discard block
 block discarded – undo
         $moduleDirNameUpper = mb_strtoupper($moduleDirName);
         if (!@is_dir($path)) {
             $path_status = "<img src='$pathIcon16/0.png' >";
-            $path_status .= "$path (" . constant('CO_' . $moduleDirNameUpper . '_' . 'DC_NOTAVAILABLE') . ') ';
-            $path_status .= "<form action='" . $_SERVER['SCRIPT_NAME'] . "' method='post'>";
+            $path_status .= "$path (".constant('CO_'.$moduleDirNameUpper.'_'.'DC_NOTAVAILABLE').') ';
+            $path_status .= "<form action='".$_SERVER['SCRIPT_NAME']."' method='post'>";
             $path_status .= "<input type='hidden' name='op' value='createdir'>";
             $path_status .= "<input type='hidden' name='path' value='$path'>";
             $path_status .= "<input type='hidden' name='redirect' value='$redirectFile'>";
-            $path_status .= "<button class='submit' onClick='this.form.submit();'>" . constant('CO_' . $moduleDirNameUpper . '_' . 'DC_CREATETHEDIR') . '</button>';
+            $path_status .= "<button class='submit' onClick='this.form.submit();'>".constant('CO_'.$moduleDirNameUpper.'_'.'DC_CREATETHEDIR').'</button>';
             $path_status .= '</form>';
         } elseif (@is_writable($path)) {
             $path_status = "<img src='$pathIcon16/1.png' >";
-            $path_status .= "$path (" . constant('CO_' . $moduleDirNameUpper . '_' . 'DC_AVAILABLE') . ') ';
+            $path_status .= "$path (".constant('CO_'.$moduleDirNameUpper.'_'.'DC_AVAILABLE').') ';
             $currentMode = mb_substr(decoct(fileperms($path)), 2);
             if ($currentMode != decoct($mode)) {
                 $path_status = "<img src='$pathIcon16/0.png' >";
-                $path_status .= $path . sprintf(constant('CO_' . $moduleDirNameUpper . '_' . 'DC_NOTWRITABLE'), decoct($mode), $currentMode);
-                $path_status .= "<form action='" . $_SERVER['SCRIPT_NAME'] . "' method='post'>";
+                $path_status .= $path.sprintf(constant('CO_'.$moduleDirNameUpper.'_'.'DC_NOTWRITABLE'), decoct($mode), $currentMode);
+                $path_status .= "<form action='".$_SERVER['SCRIPT_NAME']."' method='post'>";
                 $path_status .= "<input type='hidden' name='op' value='setdirperm'>";
                 $path_status .= "<input type='hidden' name='mode' value='$mode'>";
                 $path_status .= "<input type='hidden' name='path' value='$path'>";
                 $path_status .= "<input type='hidden' name='redirect' value='$redirectFile'>";
-                $path_status .= "<button class='submit' onClick='this.form.submit();'>" . constant('CO_' . $moduleDirNameUpper . '_' . 'DC_SETMPERM') . '</button>';
+                $path_status .= "<button class='submit' onClick='this.form.submit();'>".constant('CO_'.$moduleDirNameUpper.'_'.'DC_SETMPERM').'</button>';
                 $path_status .= '</form>';
             }
         } else {
             $currentMode = mb_substr(decoct(fileperms($path)), 2);
             $path_status = "<img src='$pathIcon16/0.png' >";
-            $path_status .= $path . sprintf(constant('CO_' . $moduleDirNameUpper . '_' . 'DC_NOTWRITABLE'), decoct($mode), $currentMode);
-            $path_status .= "<form action='" . $_SERVER['SCRIPT_NAME'] . "' method='post'>";
+            $path_status .= $path.sprintf(constant('CO_'.$moduleDirNameUpper.'_'.'DC_NOTWRITABLE'), decoct($mode), $currentMode);
+            $path_status .= "<form action='".$_SERVER['SCRIPT_NAME']."' method='post'>";
             $path_status .= "<input type='hidden' name='op' value='setdirperm'>";
             $path_status .= "<input type='hidden' name='mode' value='$mode'>";
             $path_status .= "<input type='hidden' name='path' value='$path'>";
             $path_status .= "<input type='hidden' name='redirect' value='$redirectFile'>";
-            $path_status .= "<button class='submit' onClick='this.form.submit();'>" . constant('CO_' . $moduleDirNameUpper . '_' . 'DC_SETMPERM') . '</button>';
+            $path_status .= "<button class='submit' onClick='this.form.submit();'>".constant('CO_'.$moduleDirNameUpper.'_'.'DC_SETMPERM').'</button>';
             $path_status .= '</form>';
         }
 
@@ -141,8 +141,8 @@  discard block
 block discarded – undo
         if (\Xmf\Request::hasVar('redirect', 'POST')) {
             $redirect = $_POST['redirect'];
         }
-        $msg = DirectoryChecker::createDirectory($path) ? constant('CO_' . $moduleDirNameUpper . '_' . 'DC_DIRCREATED') : constant('CO_' . $moduleDirNameUpper . '_' . 'DC_DIRNOTCREATED');
-        redirect_header($redirect, 2, $msg . ': ' . $path);
+        $msg = DirectoryChecker::createDirectory($path) ? constant('CO_'.$moduleDirNameUpper.'_'.'DC_DIRCREATED') : constant('CO_'.$moduleDirNameUpper.'_'.'DC_DIRNOTCREATED');
+        redirect_header($redirect, 2, $msg.': '.$path);
         break;
     case 'setdirperm':
         if (\Xmf\Request::hasVar('path', 'POST')) {
@@ -154,7 +154,7 @@  discard block
 block discarded – undo
         if (\Xmf\Request::hasVar('mode', 'POST')) {
             $mode = $_POST['mode'];
         }
-        $msg = DirectoryChecker::setDirectoryPermissions($path, $mode) ? constant('CO_' . $moduleDirNameUpper . '_' . 'DC_PERMSET') : constant('CO_' . $moduleDirNameUpper . '_' . 'DC_PERMNOTSET');
-        redirect_header($redirect, 2, $msg . ': ' . $path);
+        $msg = DirectoryChecker::setDirectoryPermissions($path, $mode) ? constant('CO_'.$moduleDirNameUpper.'_'.'DC_PERMSET') : constant('CO_'.$moduleDirNameUpper.'_'.'DC_PERMNOTSET');
+        redirect_header($redirect, 2, $msg.': '.$path);
         break;
 }

Please login to merge, or discard this patch.

class/Common/FilesManagement.php 1 patch

Spacing +11 added lines, -11 removed lines patch added patch discarded remove patch

@@ -34,7 +34,7 @@  discard block
 block discarded – undo
                     throw new \RuntimeException(sprintf('Unable to create the %s directory', $folder));
                 }
 
-                file_put_contents($folder . '/index.html', '<script>history.go(-1);</script>');
+                file_put_contents($folder.'/index.html', '<script>history.go(-1);</script>');
             }
         } catch (\Exception $e) {
             echo 'Caught exception: ', $e->getMessage(), '<br>';
@@ -60,14 +60,14 @@  discard block
 block discarded – undo
         $dir = opendir($src);
         //        @mkdir($dst);
         if (!@mkdir($dst) && !is_dir($dst)) {
-            throw new \RuntimeException('The directory ' . $dst . ' could not be created.');
+            throw new \RuntimeException('The directory '.$dst.' could not be created.');
         }
         while (false !== ($file = readdir($dir))) {
             if (('.' !== $file) && ('..' !== $file)) {
-                if (is_dir($src . '/' . $file)) {
-                    self::recurseCopy($src . '/' . $file, $dst . '/' . $file);
+                if (is_dir($src.'/'.$file)) {
+                    self::recurseCopy($src.'/'.$file, $dst.'/'.$file);
                 } else {
-                    copy($src . '/' . $file, $dst . '/' . $file);
+                    copy($src.'/'.$file, $dst.'/'.$file);
                 }
             }
         }
@@ -203,7 +203,7 @@  discard block
 block discarded – undo
                 self::rrmdir($fObj->getPathname());
             }
         }
-        $iterator = null;   // clear iterator Obj to close file/directory
+        $iterator = null; // clear iterator Obj to close file/directory
         return rmdir($src); // remove the directory & return results
     }
 
@@ -236,14 +236,14 @@  discard block
 block discarded – undo
         $iterator = new \DirectoryIterator($src);
         foreach ($iterator as $fObj) {
             if ($fObj->isFile()) {
-                rename($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
+                rename($fObj->getPathname(), "{$dest}/".$fObj->getFilename());
             } elseif (!$fObj->isDot() && $fObj->isDir()) {
                 // Try recursively on directory
-                self::rmove($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
+                self::rmove($fObj->getPathname(), "{$dest}/".$fObj->getFilename());
                 //                rmdir($fObj->getPath()); // now delete the directory
             }
         }
-        $iterator = null;   // clear iterator Obj to close file/directory
+        $iterator = null; // clear iterator Obj to close file/directory
         return rmdir($src); // remove the directory & return results
     }
 
@@ -279,9 +279,9 @@  discard block
 block discarded – undo
         $iterator = new \DirectoryIterator($src);
         foreach ($iterator as $fObj) {
             if ($fObj->isFile()) {
-                copy($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
+                copy($fObj->getPathname(), "{$dest}/".$fObj->getFilename());
             } elseif (!$fObj->isDot() && $fObj->isDir()) {
-                self::rcopy($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
+                self::rcopy($fObj->getPathname(), "{$dest}/".$fObj->getFilename());
             }
         }
 

Please login to merge, or discard this patch.

class/Common/VersionChecks.php 1 patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -40,13 +40,13 @@  discard block
 block discarded – undo
         //check for minimum XOOPS version
         $currentVer = mb_substr(XOOPS_VERSION, 6); // get the numeric part of string
         if (null === $requiredVer) {
-            $requiredVer = '' . $module->getInfo('min_xoops'); //making sure it's a string
+            $requiredVer = ''.$module->getInfo('min_xoops'); //making sure it's a string
         }
         $success = true;
 
         if (version_compare($currentVer, $requiredVer, '<')) {
             $success = false;
-            $module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_XOOPS'), $requiredVer, $currentVer));
+            $module->setErrors(sprintf(constant('CO_'.$moduleDirNameUpper.'_ERROR_BAD_XOOPS'), $requiredVer, $currentVer));
         }
 
         return $success;
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
 
         if (false !== $reqVer && '' !== $reqVer && !is_array($reqVer)) {
             if (version_compare($verNum, $reqVer, '<')) {
-                $module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_PHP'), $reqVer, $verNum));
+                $module->setErrors(sprintf(constant('CO_'.$moduleDirNameUpper.'_ERROR_BAD_PHP'), $reqVer, $verNum));
                 $success = false;
             }
         }
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
         $moduleDirName      = basename(dirname(dirname(__DIR__)));
         $moduleDirNameUpper = mb_strtoupper($moduleDirName);
         $update             = '';
-        $repository         = 'XoopsModules25x/' . $moduleDirName;
+        $repository         = 'XoopsModules25x/'.$moduleDirName;
         //        $repository         = 'XoopsModules25x/publisher'; //for testing only
         $ret             = '';
         $infoReleasesUrl = "https://api.github.com/repos/$repository/releases";
@@ -113,14 +113,14 @@  discard block
 block discarded – undo
                 if (false === $curlReturn) {
                     trigger_error(curl_error($curlHandle));
                 } elseif (false !== mb_strpos($curlReturn, 'Not Found')) {
-                    trigger_error('Repository Not Found: ' . $infoReleasesUrl);
+                    trigger_error('Repository Not Found: '.$infoReleasesUrl);
                 } else {
                     $file              = json_decode($curlReturn, false);
                     $latestVersionLink = sprintf("https://github.com/$repository/archive/%s.zip", $file ? reset($file)->tag_name : $default);
                     $latestVersion     = $file[0]->tag_name;
                     $prerelease        = $file[0]->prerelease;
                     if ('master' !== $latestVersionLink) {
-                        $update = constant('CO_' . $moduleDirNameUpper . '_' . 'NEW_VERSION') . $latestVersion;
+                        $update = constant('CO_'.$moduleDirNameUpper.'_'.'NEW_VERSION').$latestVersion;
                     }
                     //"PHP-standardized" version
                     $latestVersion = mb_strtolower($latestVersion);
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
                         $latestVersion = str_replace('_', '', mb_strtolower($latestVersion));
                         $latestVersion = str_replace('final', '', mb_strtolower($latestVersion));
                     }
-                    $moduleVersion = ($helper->getModule()->getInfo('version') . '_' . $helper->getModule()->getInfo('module_status'));
+                    $moduleVersion = ($helper->getModule()->getInfo('version').'_'.$helper->getModule()->getInfo('module_status'));
                     //"PHP-standardized" version
                     $moduleVersion = str_replace(' ', '', mb_strtolower($moduleVersion));
                     //                    $moduleVersion = '1.0'; //for testing only

Please login to merge, or discard this patch.

class/Common/FileChecker.php 1 patch

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

@@ -24,7 +24,7 @@  discard block
 block discarded – undo
 
 //defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
 
-require_once dirname(dirname(dirname(dirname(__DIR__)))) . '/mainfile.php';
+require_once dirname(dirname(dirname(dirname(__DIR__)))).'/mainfile.php';
 $moduleDirName      = basename(dirname(dirname(__DIR__)));
 $moduleDirNameUpper = mb_strtoupper($moduleDirName);
 xoops_loadLanguage('filechecker', $moduleDirName);
@@ -56,24 +56,24 @@  discard block
 block discarded – undo
         if (null === $original_file_path) {
             if (self::fileExists($file_path)) {
                 $path_status = "<img src='$pathIcon16/1.png' >";
-                $path_status .= "$file_path (" . constant('CO_' . $moduleDirNameUpper . '_' . 'FC_AVAILABLE') . ') ';
+                $path_status .= "$file_path (".constant('CO_'.$moduleDirNameUpper.'_'.'FC_AVAILABLE').') ';
             } else {
                 $path_status = "<img src='$pathIcon16/0.png' >";
-                $path_status .= "$file_path (" . constant('CO_' . $moduleDirNameUpper . '_' . 'FC_NOTAVAILABLE') . ') ';
+                $path_status .= "$file_path (".constant('CO_'.$moduleDirNameUpper.'_'.'FC_NOTAVAILABLE').') ';
             }
         } else {
             if (self::compareFiles($file_path, $original_file_path)) {
                 $path_status = "<img src='$pathIcon16/1.png' >";
-                $path_status .= "$file_path (" . constant('CO_' . $moduleDirNameUpper . '_' . 'FC_AVAILABLE') . ') ';
+                $path_status .= "$file_path (".constant('CO_'.$moduleDirNameUpper.'_'.'FC_AVAILABLE').') ';
             } else {
                 $path_status = "<img src='$pathIcon16/0.png' >";
-                $path_status .= "$file_path (" . constant('CO_' . $moduleDirNameUpper . '_' . 'FC_NOTAVAILABLE') . ') ';
-                $path_status .= "<form action='" . $_SERVER['SCRIPT_NAME'] . "' method='post'>";
+                $path_status .= "$file_path (".constant('CO_'.$moduleDirNameUpper.'_'.'FC_NOTAVAILABLE').') ';
+                $path_status .= "<form action='".$_SERVER['SCRIPT_NAME']."' method='post'>";
                 $path_status .= "<input type='hidden' name='op' value='copyfile'>";
                 $path_status .= "<input type='hidden' name='file_path' value='$file_path'>";
                 $path_status .= "<input type='hidden' name='original_file_path' value='$original_file_path'>";
                 $path_status .= "<input type='hidden' name='redirect' value='$redirectFile'>";
-                $path_status .= "<button class='submit' onClick='this.form.submit();'>" . constant('CO_' . $moduleDirNameUpper . '_' . 'FC_CREATETHEFILE') . '</button>';
+                $path_status .= "<button class='submit' onClick='this.form.submit();'>".constant('CO_'.$moduleDirNameUpper.'_'.'FC_CREATETHEFILE').'</button>';
                 $path_status .= '</form>';
             }
         }
@@ -154,7 +154,7 @@  discard block
 block discarded – undo
         if (\Xmf\Request::hasVar('redirect', 'POST')) {
             $redirect = $_POST['redirect'];
         }
-        $msg = FileChecker::copyFile($original_file_path, $file_path) ? constant('CO_' . $moduleDirNameUpper . '_' . 'FC_FILECOPIED') : constant('CO_' . $moduleDirNameUpper . '_' . 'FC_FILENOTCOPIED');
-        redirect_header($redirect, 2, $msg . ': ' . $file_path);
+        $msg = FileChecker::copyFile($original_file_path, $file_path) ? constant('CO_'.$moduleDirNameUpper.'_'.'FC_FILECOPIED') : constant('CO_'.$moduleDirNameUpper.'_'.'FC_FILENOTCOPIED');
+        redirect_header($redirect, 2, $msg.': '.$file_path);
         break;
 }

Please login to merge, or discard this patch.

class/Common/Configurator.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -51,7 +51,7 @@
 block discarded – undo
         //        require dirname(dirname(__DIR__)) . '/config/config.php';
         //        $config = getConfig();
 
-        $config = include dirname(dirname(__DIR__)) . '/config/config.php';
+        $config = include dirname(dirname(__DIR__)).'/config/config.php';
 
         $this->name            = $config->name;
         $this->paths           = $config->paths;

Please login to merge, or discard this patch.

class/Common/ModuleFeedback.php 1 patch

Spacing +15 added lines, -15 removed lines patch added patch discarded remove patch

@@ -71,29 +71,29 @@  discard block
 block discarded – undo
         $moduleDirNameUpper = mb_strtoupper($moduleDirName);
         // Get Theme Form
         xoops_load('XoopsFormLoader');
-        $form = new \XoopsThemeForm(constant('CO_' . $moduleDirNameUpper . '_' . 'FB_FORM_TITLE'), 'formfeedback', 'feedback.php', 'post', true);
+        $form = new \XoopsThemeForm(constant('CO_'.$moduleDirNameUpper.'_'.'FB_FORM_TITLE'), 'formfeedback', 'feedback.php', 'post', true);
         $form->setExtra('enctype="multipart/form-data"');
 
-        $recipient = new \XoopsFormText(constant('CO_' . $moduleDirNameUpper . '_' . 'FB_RECIPIENT'), 'recipient', 50, 255, $GLOBALS['xoopsModule']->getInfo('author_mail'));
+        $recipient = new \XoopsFormText(constant('CO_'.$moduleDirNameUpper.'_'.'FB_RECIPIENT'), 'recipient', 50, 255, $GLOBALS['xoopsModule']->getInfo('author_mail'));
         $recipient->setExtra('disabled="disabled"');
         $form->addElement($recipient);
-        $your_name = new \XoopsFormText(constant('CO_' . $moduleDirNameUpper . '_' . 'FB_NAME'), 'your_name', 50, 255, $this->name);
-        $your_name->setExtra('placeholder="' . constant('CO_' . $moduleDirNameUpper . '_' . 'FB_NAME_PLACEHOLER') . '"');
+        $your_name = new \XoopsFormText(constant('CO_'.$moduleDirNameUpper.'_'.'FB_NAME'), 'your_name', 50, 255, $this->name);
+        $your_name->setExtra('placeholder="'.constant('CO_'.$moduleDirNameUpper.'_'.'FB_NAME_PLACEHOLER').'"');
         $form->addElement($your_name);
-        $your_site = new \XoopsFormText(constant('CO_' . $moduleDirNameUpper . '_' . 'FB_SITE'), 'your_site', 50, 255, $this->site);
-        $your_site->setExtra('placeholder="' . constant('CO_' . $moduleDirNameUpper . '_' . 'FB_SITE_PLACEHOLER') . '"');
+        $your_site = new \XoopsFormText(constant('CO_'.$moduleDirNameUpper.'_'.'FB_SITE'), 'your_site', 50, 255, $this->site);
+        $your_site->setExtra('placeholder="'.constant('CO_'.$moduleDirNameUpper.'_'.'FB_SITE_PLACEHOLER').'"');
         $form->addElement($your_site);
-        $your_mail = new \XoopsFormText(constant('CO_' . $moduleDirNameUpper . '_' . 'FB_MAIL'), 'your_mail', 50, 255, $this->email);
-        $your_mail->setExtra('placeholder="' . constant('CO_' . $moduleDirNameUpper . '_' . 'FB_MAIL_PLACEHOLER') . '"');
+        $your_mail = new \XoopsFormText(constant('CO_'.$moduleDirNameUpper.'_'.'FB_MAIL'), 'your_mail', 50, 255, $this->email);
+        $your_mail->setExtra('placeholder="'.constant('CO_'.$moduleDirNameUpper.'_'.'FB_MAIL_PLACEHOLER').'"');
         $form->addElement($your_mail);
 
-        $fbtypeSelect = new \XoopsFormSelect(constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE'), 'fb_type', $this->type);
+        $fbtypeSelect = new \XoopsFormSelect(constant('CO_'.$moduleDirNameUpper.'_'.'FB_TYPE'), 'fb_type', $this->type);
         $fbtypeSelect->addOption('', '');
-        $fbtypeSelect->addOption(constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_SUGGESTION'), constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_SUGGESTION'));
-        $fbtypeSelect->addOption(constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_BUGS'), constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_BUGS'));
-        $fbtypeSelect->addOption(constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_TESTIMONIAL'), constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_TESTIMONIAL'));
-        $fbtypeSelect->addOption(constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_FEATURES'), constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_FEATURES'));
-        $fbtypeSelect->addOption(constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_OTHERS'), constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_OTHERS'));
+        $fbtypeSelect->addOption(constant('CO_'.$moduleDirNameUpper.'_'.'FB_TYPE_SUGGESTION'), constant('CO_'.$moduleDirNameUpper.'_'.'FB_TYPE_SUGGESTION'));
+        $fbtypeSelect->addOption(constant('CO_'.$moduleDirNameUpper.'_'.'FB_TYPE_BUGS'), constant('CO_'.$moduleDirNameUpper.'_'.'FB_TYPE_BUGS'));
+        $fbtypeSelect->addOption(constant('CO_'.$moduleDirNameUpper.'_'.'FB_TYPE_TESTIMONIAL'), constant('CO_'.$moduleDirNameUpper.'_'.'FB_TYPE_TESTIMONIAL'));
+        $fbtypeSelect->addOption(constant('CO_'.$moduleDirNameUpper.'_'.'FB_TYPE_FEATURES'), constant('CO_'.$moduleDirNameUpper.'_'.'FB_TYPE_FEATURES'));
+        $fbtypeSelect->addOption(constant('CO_'.$moduleDirNameUpper.'_'.'FB_TYPE_OTHERS'), constant('CO_'.$moduleDirNameUpper.'_'.'FB_TYPE_OTHERS'));
         $form->addElement($fbtypeSelect, true);
 
         $editorConfigs           = [];
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
         $configHandler           = xoops_getHandler('config');
         $config                  = $configHandler->getConfigsByCat(0, $module->getVar('mid'));
         $editorConfigs['editor'] = $config['general_editor'];
-        $editor                  = new \XoopsFormEditor(constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_CONTENT'), 'fb_content', $editorConfigs);
+        $editor                  = new \XoopsFormEditor(constant('CO_'.$moduleDirNameUpper.'_'.'FB_TYPE_CONTENT'), 'fb_content', $editorConfigs);
         $form->addElement($editor, true);
 
         $form->addElement(new \XoopsFormHidden('op', 'send'));

Please login to merge, or discard this patch.

admin/admin_header.php 1 patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -17,11 +17,11 @@
 block discarded – undo
  * @since
  * @author       XOOPS Development Team
  */
-include dirname(__DIR__) . '/preloads/autoloader.php';
+include dirname(__DIR__).'/preloads/autoloader.php';
 
-require dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
+require dirname(dirname(dirname(__DIR__))).'/include/cp_header.php';
 //require $GLOBALS['xoops']->path('www/class/xoopsformloader.php');
-require dirname(__DIR__) . '/include/common.php';
+require dirname(__DIR__).'/include/common.php';
 
 $moduleDirName = basename(dirname(__DIR__));
 

Please login to merge, or discard this patch.

admin/menu.php 1 patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -17,7 +17,7 @@  discard block
 block discarded – undo
  * @since
  * @author       XOOPS Development Team
  */
-include dirname(__DIR__) . '/preloads/autoloader.php';
+include dirname(__DIR__).'/preloads/autoloader.php';
 
 $moduleDirName      = basename(dirname(__DIR__));
 $moduleDirNameUpper = mb_strtoupper($moduleDirName);
@@ -36,23 +36,23 @@  discard block
 block discarded – undo
 $adminmenu[] = [
     'title' => _MI_GROUPS_MENU_HOME,
     'link'  => 'admin/index.php',
-    'icon'  => $pathIcon32 . '/home.png',
+    'icon'  => $pathIcon32.'/home.png',
 ];
 
 $adminmenu[] = [
     'title' => _MI_GROUPS_MENU_01,
     'link'  => 'admin/main.php',
-    'icon'  => $pathIcon32 . '/manage.png',
+    'icon'  => $pathIcon32.'/manage.png',
 ];
 
 $adminmenu[] = [
     'title' => _MI_GROUPS_MENU_02,
     'link'  => 'admin/perm.php',
-    'icon'  => $pathIcon32 . '/permissions.png',
+    'icon'  => $pathIcon32.'/permissions.png',
 ];
 
 $adminmenu[] = [
     'title' => _MI_GROUPS_MENU_ABOUT,
     'link'  => 'admin/about.php',
-    'icon'  => $pathIcon32 . '/about.png',
+    'icon'  => $pathIcon32.'/about.png',
 ];

Please login to merge, or discard this patch.

admin/main0.php 1 patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -26,10 +26,10 @@  discard block
 block discarded – undo
 //  ------------------------------------------------------------------------ //
 //
 
-require_once dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
-require_once __DIR__ . '/admin_header.php';
+require_once dirname(dirname(dirname(__DIR__))).'/include/cp_header.php';
+require_once __DIR__.'/admin_header.php';
 
-require_once XOOPS_ROOT_PATH . '/class/template.php';
+require_once XOOPS_ROOT_PATH.'/class/template.php';
 if (!isset($xoopsTpl)) {
     $xoopsTpl = new XoopsTpl();
 }
@@ -40,12 +40,12 @@  discard block
 block discarded – undo
 // CHECK IF SUBMIT WAS PRESSED
 if (isset($_POST['add_x']) || isset($_POST['del_x'])) {
     if (isset($_POST['add_x'])) {
-        $memberHandler    = xoops_getHandler('member');
+        $memberHandler = xoops_getHandler('member');
         $membership = $memberHandler->addUserToGroup($_POST['groupid'], $_POST['all']);
     }
 
     if (isset($_POST['del_x'])) {
-        $memberHandler    = xoops_getHandler('member');
+        $memberHandler = xoops_getHandler('member');
         $membership = $memberHandler->removeUsersFromGroup($_POST['groupid'], [$_POST['curr']]);
     }
 }
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
     //----------------*/
 
     $uids     = $memberHandler->getUsersByGroup($id);
-    $criteria = new Criteria('uid', '(' . implode(',', $uids) . ')', 'IN');
+    $criteria = new Criteria('uid', '('.implode(',', $uids).')', 'IN');
     $criteria->setSort('uname');
     $users = $memberHandler->getUserList($criteria);
 
@@ -136,5 +136,5 @@  discard block
 block discarded – undo
 
 $xoopsTpl->display('db:gm_main.tpl');
 
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';
 //xoops_cp_footer();

Please login to merge, or discard this patch.

		@@ -34,7 +34,7 @@ discard block
		block discarded – undo
34	34	throw new \RuntimeException(sprintf('Unable to create the %s directory', $folder));
35	35	}
36	36
37		- file_put_contents($folder . '/index.html', '<script>history.go(-1);</script>');
	37	+ file_put_contents($folder.'/index.html', '<script>history.go(-1);</script>');
38	38	}
39	39	} catch (\Exception $e) {
40	40	echo 'Caught exception: ', $e->getMessage(), '<br>';
		@@ -60,14 +60,14 @@ discard block
		block discarded – undo
60	60	$dir = opendir($src);
61	61	// @mkdir($dst);
62	62	if (!@mkdir($dst) && !is_dir($dst)) {
63		- throw new \RuntimeException('The directory ' . $dst . ' could not be created.');
	63	+ throw new \RuntimeException('The directory '.$dst.' could not be created.');
64	64	}
65	65	while (false !== ($file = readdir($dir))) {
66	66	if (('.' !== $file) && ('..' !== $file)) {
67		- if (is_dir($src . '/' . $file)) {
68		- self::recurseCopy($src . '/' . $file, $dst . '/' . $file);
	67	+ if (is_dir($src.'/'.$file)) {
	68	+ self::recurseCopy($src.'/'.$file, $dst.'/'.$file);
69	69	} else {
70		- copy($src . '/' . $file, $dst . '/' . $file);
	70	+ copy($src.'/'.$file, $dst.'/'.$file);
71	71	}
72	72	}
73	73	}
		@@ -203,7 +203,7 @@ discard block
		block discarded – undo
203	203	self::rrmdir($fObj->getPathname());
204	204	}
205	205	}
206		- $iterator = null; // clear iterator Obj to close file/directory
	206	+ $iterator = null; // clear iterator Obj to close file/directory
207	207	return rmdir($src); // remove the directory & return results
208	208	}
209	209
		@@ -236,14 +236,14 @@ discard block
		block discarded – undo
236	236	$iterator = new \DirectoryIterator($src);
237	237	foreach ($iterator as $fObj) {
238	238	if ($fObj->isFile()) {
239		- rename($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
	239	+ rename($fObj->getPathname(), "{$dest}/".$fObj->getFilename());
240	240	} elseif (!$fObj->isDot() && $fObj->isDir()) {
241	241	// Try recursively on directory
242		- self::rmove($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
	242	+ self::rmove($fObj->getPathname(), "{$dest}/".$fObj->getFilename());
243	243	// rmdir($fObj->getPath()); // now delete the directory
244	244	}
245	245	}
246		- $iterator = null; // clear iterator Obj to close file/directory
	246	+ $iterator = null; // clear iterator Obj to close file/directory
247	247	return rmdir($src); // remove the directory & return results
248	248	}
249	249
		@@ -279,9 +279,9 @@ discard block
		block discarded – undo
279	279	$iterator = new \DirectoryIterator($src);
280	280	foreach ($iterator as $fObj) {
281	281	if ($fObj->isFile()) {
282		- copy($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
	282	+ copy($fObj->getPathname(), "{$dest}/".$fObj->getFilename());
283	283	} elseif (!$fObj->isDot() && $fObj->isDir()) {
284		- self::rcopy($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
	284	+ self::rcopy($fObj->getPathname(), "{$dest}/".$fObj->getFilename());
285	285	}
286	286	}
287	287

		@@ -40,13 +40,13 @@ discard block
		block discarded – undo
40	40	//check for minimum XOOPS version
41	41	$currentVer = mb_substr(XOOPS_VERSION, 6); // get the numeric part of string
42	42	if (null === $requiredVer) {
43		- $requiredVer = '' . $module->getInfo('min_xoops'); //making sure it's a string
	43	+ $requiredVer = ''.$module->getInfo('min_xoops'); //making sure it's a string
44	44	}
45	45	$success = true;
46	46
47	47	if (version_compare($currentVer, $requiredVer, '<')) {
48	48	$success = false;
49		- $module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_XOOPS'), $requiredVer, $currentVer));
	49	+ $module->setErrors(sprintf(constant('CO_'.$moduleDirNameUpper.'_ERROR_BAD_XOOPS'), $requiredVer, $currentVer));
50	50	}
51	51
52	52	return $success;
		@@ -77,7 +77,7 @@ discard block
		block discarded – undo
77	77
78	78	if (false !== $reqVer && '' !== $reqVer && !is_array($reqVer)) {
79	79	if (version_compare($verNum, $reqVer, '<')) {
80		- $module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_PHP'), $reqVer, $verNum));
	80	+ $module->setErrors(sprintf(constant('CO_'.$moduleDirNameUpper.'_ERROR_BAD_PHP'), $reqVer, $verNum));
81	81	$success = false;
82	82	}
83	83	}
		@@ -99,7 +99,7 @@ discard block
		block discarded – undo
99	99	$moduleDirName = basename(dirname(dirname(__DIR__)));
100	100	$moduleDirNameUpper = mb_strtoupper($moduleDirName);
101	101	$update = '';
102		- $repository = 'XoopsModules25x/' . $moduleDirName;
	102	+ $repository = 'XoopsModules25x/'.$moduleDirName;
103	103	// $repository = 'XoopsModules25x/publisher'; //for testing only
104	104	$ret = '';
105	105	$infoReleasesUrl = "https://api.github.com/repos/$repository/releases";
		@@ -113,14 +113,14 @@ discard block
		block discarded – undo
113	113	if (false === $curlReturn) {
114	114	trigger_error(curl_error($curlHandle));
115	115	} elseif (false !== mb_strpos($curlReturn, 'Not Found')) {
116		- trigger_error('Repository Not Found: ' . $infoReleasesUrl);
	116	+ trigger_error('Repository Not Found: '.$infoReleasesUrl);
117	117	} else {
118	118	$file = json_decode($curlReturn, false);
119	119	$latestVersionLink = sprintf("https://github.com/$repository/archive/%s.zip", $file ? reset($file)->tag_name : $default);
120	120	$latestVersion = $file[0]->tag_name;
121	121	$prerelease = $file[0]->prerelease;
122	122	if ('master' !== $latestVersionLink) {
123		- $update = constant('CO_' . $moduleDirNameUpper . '_' . 'NEW_VERSION') . $latestVersion;
	123	+ $update = constant('CO_'.$moduleDirNameUpper.'_'.'NEW_VERSION').$latestVersion;
124	124	}
125	125	//"PHP-standardized" version
126	126	$latestVersion = mb_strtolower($latestVersion);
		@@ -128,7 +128,7 @@ discard block
		block discarded – undo
128	128	$latestVersion = str_replace('_', '', mb_strtolower($latestVersion));
129	129	$latestVersion = str_replace('final', '', mb_strtolower($latestVersion));
130	130	}
131		- $moduleVersion = ($helper->getModule()->getInfo('version') . '_' . $helper->getModule()->getInfo('module_status'));
	131	+ $moduleVersion = ($helper->getModule()->getInfo('version').'_'.$helper->getModule()->getInfo('module_status'));
132	132	//"PHP-standardized" version
133	133	$moduleVersion = str_replace(' ', '', mb_strtolower($moduleVersion));
134	134	// $moduleVersion = '1.0'; //for testing only

		@@ -24,7 +24,7 @@ discard block
		block discarded – undo
24	24
25	25	//defined('XOOPS_ROOT_PATH') \|\| die('XOOPS root path not defined');
26	26
27		-require_once dirname(dirname(dirname(dirname(__DIR__)))) . '/mainfile.php';
	27	+require_once dirname(dirname(dirname(dirname(__DIR__)))).'/mainfile.php';
28	28	$moduleDirName = basename(dirname(dirname(__DIR__)));
29	29	$moduleDirNameUpper = mb_strtoupper($moduleDirName);
30	30	xoops_loadLanguage('directorychecker', $moduleDirName);
		@@ -56,38 +56,38 @@ discard block
		block discarded – undo
56	56	$moduleDirNameUpper = mb_strtoupper($moduleDirName);
57	57	if (!@is_dir($path)) {
58	58	$path_status = "<img src='$pathIcon16/0.png' >";
59		- $path_status .= "$path (" . constant('CO_' . $moduleDirNameUpper . '_' . 'DC_NOTAVAILABLE') . ') ';
60		- $path_status .= "<form action='" . $_SERVER['SCRIPT_NAME'] . "' method='post'>";
	59	+ $path_status .= "$path (".constant('CO_'.$moduleDirNameUpper.'_'.'DC_NOTAVAILABLE').') ';
	60	+ $path_status .= "<form action='".$_SERVER['SCRIPT_NAME']."' method='post'>";
61	61	$path_status .= "<input type='hidden' name='op' value='createdir'>";
62	62	$path_status .= "<input type='hidden' name='path' value='$path'>";
63	63	$path_status .= "<input type='hidden' name='redirect' value='$redirectFile'>";
64		- $path_status .= "<button class='submit' onClick='this.form.submit();'>" . constant('CO_' . $moduleDirNameUpper . '_' . 'DC_CREATETHEDIR') . '</button>';
	64	+ $path_status .= "<button class='submit' onClick='this.form.submit();'>".constant('CO_'.$moduleDirNameUpper.'_'.'DC_CREATETHEDIR').'</button>';
65	65	$path_status .= '</form>';
66	66	} elseif (@is_writable($path)) {
67	67	$path_status = "<img src='$pathIcon16/1.png' >";
68		- $path_status .= "$path (" . constant('CO_' . $moduleDirNameUpper . '_' . 'DC_AVAILABLE') . ') ';
	68	+ $path_status .= "$path (".constant('CO_'.$moduleDirNameUpper.'_'.'DC_AVAILABLE').') ';
69	69	$currentMode = mb_substr(decoct(fileperms($path)), 2);
70	70	if ($currentMode != decoct($mode)) {
71	71	$path_status = "<img src='$pathIcon16/0.png' >";
72		- $path_status .= $path . sprintf(constant('CO_' . $moduleDirNameUpper . '_' . 'DC_NOTWRITABLE'), decoct($mode), $currentMode);
73		- $path_status .= "<form action='" . $_SERVER['SCRIPT_NAME'] . "' method='post'>";
	72	+ $path_status .= $path.sprintf(constant('CO_'.$moduleDirNameUpper.'_'.'DC_NOTWRITABLE'), decoct($mode), $currentMode);
	73	+ $path_status .= "<form action='".$_SERVER['SCRIPT_NAME']."' method='post'>";
74	74	$path_status .= "<input type='hidden' name='op' value='setdirperm'>";
75	75	$path_status .= "<input type='hidden' name='mode' value='$mode'>";
76	76	$path_status .= "<input type='hidden' name='path' value='$path'>";
77	77	$path_status .= "<input type='hidden' name='redirect' value='$redirectFile'>";
78		- $path_status .= "<button class='submit' onClick='this.form.submit();'>" . constant('CO_' . $moduleDirNameUpper . '_' . 'DC_SETMPERM') . '</button>';
	78	+ $path_status .= "<button class='submit' onClick='this.form.submit();'>".constant('CO_'.$moduleDirNameUpper.'_'.'DC_SETMPERM').'</button>';
79	79	$path_status .= '</form>';
80	80	}
81	81	} else {
82	82	$currentMode = mb_substr(decoct(fileperms($path)), 2);
83	83	$path_status = "<img src='$pathIcon16/0.png' >";
84		- $path_status .= $path . sprintf(constant('CO_' . $moduleDirNameUpper . '_' . 'DC_NOTWRITABLE'), decoct($mode), $currentMode);
85		- $path_status .= "<form action='" . $_SERVER['SCRIPT_NAME'] . "' method='post'>";
	84	+ $path_status .= $path.sprintf(constant('CO_'.$moduleDirNameUpper.'_'.'DC_NOTWRITABLE'), decoct($mode), $currentMode);
	85	+ $path_status .= "<form action='".$_SERVER['SCRIPT_NAME']."' method='post'>";
86	86	$path_status .= "<input type='hidden' name='op' value='setdirperm'>";
87	87	$path_status .= "<input type='hidden' name='mode' value='$mode'>";
88	88	$path_status .= "<input type='hidden' name='path' value='$path'>";
89	89	$path_status .= "<input type='hidden' name='redirect' value='$redirectFile'>";
90		- $path_status .= "<button class='submit' onClick='this.form.submit();'>" . constant('CO_' . $moduleDirNameUpper . '_' . 'DC_SETMPERM') . '</button>';
	90	+ $path_status .= "<button class='submit' onClick='this.form.submit();'>".constant('CO_'.$moduleDirNameUpper.'_'.'DC_SETMPERM').'</button>';
91	91	$path_status .= '</form>';
92	92	}
93	93
		@@ -141,8 +141,8 @@ discard block
		block discarded – undo
141	141	if (\Xmf\Request::hasVar('redirect', 'POST')) {
142	142	$redirect = $_POST['redirect'];
143	143	}
144		- $msg = DirectoryChecker::createDirectory($path) ? constant('CO_' . $moduleDirNameUpper . '_' . 'DC_DIRCREATED') : constant('CO_' . $moduleDirNameUpper . '_' . 'DC_DIRNOTCREATED');
145		- redirect_header($redirect, 2, $msg . ': ' . $path);
	144	+ $msg = DirectoryChecker::createDirectory($path) ? constant('CO_'.$moduleDirNameUpper.'_'.'DC_DIRCREATED') : constant('CO_'.$moduleDirNameUpper.'_'.'DC_DIRNOTCREATED');
	145	+ redirect_header($redirect, 2, $msg.': '.$path);
146	146	break;
147	147	case 'setdirperm':
148	148	if (\Xmf\Request::hasVar('path', 'POST')) {
		@@ -154,7 +154,7 @@ discard block
		block discarded – undo
154	154	if (\Xmf\Request::hasVar('mode', 'POST')) {
155	155	$mode = $_POST['mode'];
156	156	}
157		- $msg = DirectoryChecker::setDirectoryPermissions($path, $mode) ? constant('CO_' . $moduleDirNameUpper . '_' . 'DC_PERMSET') : constant('CO_' . $moduleDirNameUpper . '_' . 'DC_PERMNOTSET');
158		- redirect_header($redirect, 2, $msg . ': ' . $path);
	157	+ $msg = DirectoryChecker::setDirectoryPermissions($path, $mode) ? constant('CO_'.$moduleDirNameUpper.'_'.'DC_PERMSET') : constant('CO_'.$moduleDirNameUpper.'_'.'DC_PERMNOTSET');
	158	+ redirect_header($redirect, 2, $msg.': '.$path);
159	159	break;
160	160	}

		@@ -51,7 +51,7 @@
		block discarded – undo
51	51	// require dirname(dirname(__DIR__)) . '/config/config.php';
52	52	// $config = getConfig();
53	53
54		- $config = include dirname(dirname(__DIR__)) . '/config/config.php';
	54	+ $config = include dirname(dirname(__DIR__)).'/config/config.php';
55	55
56	56	$this->name = $config->name;
57	57	$this->paths = $config->paths;

		@@ -71,29 +71,29 @@ discard block
		block discarded – undo
71	71	$moduleDirNameUpper = mb_strtoupper($moduleDirName);
72	72	// Get Theme Form
73	73	xoops_load('XoopsFormLoader');
74		- $form = new \XoopsThemeForm(constant('CO_' . $moduleDirNameUpper . '_' . 'FB_FORM_TITLE'), 'formfeedback', 'feedback.php', 'post', true);
	74	+ $form = new \XoopsThemeForm(constant('CO_'.$moduleDirNameUpper.'_'.'FB_FORM_TITLE'), 'formfeedback', 'feedback.php', 'post', true);
75	75	$form->setExtra('enctype="multipart/form-data"');
76	76
77		- $recipient = new \XoopsFormText(constant('CO_' . $moduleDirNameUpper . '_' . 'FB_RECIPIENT'), 'recipient', 50, 255, $GLOBALS['xoopsModule']->getInfo('author_mail'));
	77	+ $recipient = new \XoopsFormText(constant('CO_'.$moduleDirNameUpper.'_'.'FB_RECIPIENT'), 'recipient', 50, 255, $GLOBALS['xoopsModule']->getInfo('author_mail'));
78	78	$recipient->setExtra('disabled="disabled"');
79	79	$form->addElement($recipient);
80		- $your_name = new \XoopsFormText(constant('CO_' . $moduleDirNameUpper . '_' . 'FB_NAME'), 'your_name', 50, 255, $this->name);
81		- $your_name->setExtra('placeholder="' . constant('CO_' . $moduleDirNameUpper . '_' . 'FB_NAME_PLACEHOLER') . '"');
	80	+ $your_name = new \XoopsFormText(constant('CO_'.$moduleDirNameUpper.'_'.'FB_NAME'), 'your_name', 50, 255, $this->name);
	81	+ $your_name->setExtra('placeholder="'.constant('CO_'.$moduleDirNameUpper.'_'.'FB_NAME_PLACEHOLER').'"');
82	82	$form->addElement($your_name);
83		- $your_site = new \XoopsFormText(constant('CO_' . $moduleDirNameUpper . '_' . 'FB_SITE'), 'your_site', 50, 255, $this->site);
84		- $your_site->setExtra('placeholder="' . constant('CO_' . $moduleDirNameUpper . '_' . 'FB_SITE_PLACEHOLER') . '"');
	83	+ $your_site = new \XoopsFormText(constant('CO_'.$moduleDirNameUpper.'_'.'FB_SITE'), 'your_site', 50, 255, $this->site);
	84	+ $your_site->setExtra('placeholder="'.constant('CO_'.$moduleDirNameUpper.'_'.'FB_SITE_PLACEHOLER').'"');
85	85	$form->addElement($your_site);
86		- $your_mail = new \XoopsFormText(constant('CO_' . $moduleDirNameUpper . '_' . 'FB_MAIL'), 'your_mail', 50, 255, $this->email);
87		- $your_mail->setExtra('placeholder="' . constant('CO_' . $moduleDirNameUpper . '_' . 'FB_MAIL_PLACEHOLER') . '"');
	86	+ $your_mail = new \XoopsFormText(constant('CO_'.$moduleDirNameUpper.'_'.'FB_MAIL'), 'your_mail', 50, 255, $this->email);
	87	+ $your_mail->setExtra('placeholder="'.constant('CO_'.$moduleDirNameUpper.'_'.'FB_MAIL_PLACEHOLER').'"');
88	88	$form->addElement($your_mail);
89	89
90		- $fbtypeSelect = new \XoopsFormSelect(constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE'), 'fb_type', $this->type);
	90	+ $fbtypeSelect = new \XoopsFormSelect(constant('CO_'.$moduleDirNameUpper.'_'.'FB_TYPE'), 'fb_type', $this->type);
91	91	$fbtypeSelect->addOption('', '');
92		- $fbtypeSelect->addOption(constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_SUGGESTION'), constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_SUGGESTION'));
93		- $fbtypeSelect->addOption(constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_BUGS'), constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_BUGS'));
94		- $fbtypeSelect->addOption(constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_TESTIMONIAL'), constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_TESTIMONIAL'));
95		- $fbtypeSelect->addOption(constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_FEATURES'), constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_FEATURES'));
96		- $fbtypeSelect->addOption(constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_OTHERS'), constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_OTHERS'));
	92	+ $fbtypeSelect->addOption(constant('CO_'.$moduleDirNameUpper.'_'.'FB_TYPE_SUGGESTION'), constant('CO_'.$moduleDirNameUpper.'_'.'FB_TYPE_SUGGESTION'));
	93	+ $fbtypeSelect->addOption(constant('CO_'.$moduleDirNameUpper.'_'.'FB_TYPE_BUGS'), constant('CO_'.$moduleDirNameUpper.'_'.'FB_TYPE_BUGS'));
	94	+ $fbtypeSelect->addOption(constant('CO_'.$moduleDirNameUpper.'_'.'FB_TYPE_TESTIMONIAL'), constant('CO_'.$moduleDirNameUpper.'_'.'FB_TYPE_TESTIMONIAL'));
	95	+ $fbtypeSelect->addOption(constant('CO_'.$moduleDirNameUpper.'_'.'FB_TYPE_FEATURES'), constant('CO_'.$moduleDirNameUpper.'_'.'FB_TYPE_FEATURES'));
	96	+ $fbtypeSelect->addOption(constant('CO_'.$moduleDirNameUpper.'_'.'FB_TYPE_OTHERS'), constant('CO_'.$moduleDirNameUpper.'_'.'FB_TYPE_OTHERS'));
97	97	$form->addElement($fbtypeSelect, true);
98	98
99	99	$editorConfigs = [];
		@@ -110,7 +110,7 @@ discard block
		block discarded – undo
110	110	$configHandler = xoops_getHandler('config');
111	111	$config = $configHandler->getConfigsByCat(0, $module->getVar('mid'));
112	112	$editorConfigs['editor'] = $config['general_editor'];
113		- $editor = new \XoopsFormEditor(constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_CONTENT'), 'fb_content', $editorConfigs);
	113	+ $editor = new \XoopsFormEditor(constant('CO_'.$moduleDirNameUpper.'_'.'FB_TYPE_CONTENT'), 'fb_content', $editorConfigs);
114	114	$form->addElement($editor, true);
115	115
116	116	$form->addElement(new \XoopsFormHidden('op', 'send'));

		@@ -17,11 +17,11 @@
		block discarded – undo
17	17	* @since
18	18	* @author XOOPS Development Team
19	19	*/
20		-include dirname(__DIR__) . '/preloads/autoloader.php';
	20	+include dirname(__DIR__).'/preloads/autoloader.php';
21	21
22		-require dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
	22	+require dirname(dirname(dirname(__DIR__))).'/include/cp_header.php';
23	23	//require $GLOBALS['xoops']->path('www/class/xoopsformloader.php');
24		-require dirname(__DIR__) . '/include/common.php';
	24	+require dirname(__DIR__).'/include/common.php';
25	25
26	26	$moduleDirName = basename(dirname(__DIR__));
27	27

		@@ -17,7 +17,7 @@ discard block
		block discarded – undo
17	17	* @since
18	18	* @author XOOPS Development Team
19	19	*/
20		-include dirname(__DIR__) . '/preloads/autoloader.php';
	20	+include dirname(__DIR__).'/preloads/autoloader.php';
21	21
22	22	$moduleDirName = basename(dirname(__DIR__));
23	23	$moduleDirNameUpper = mb_strtoupper($moduleDirName);
		@@ -36,23 +36,23 @@ discard block
		block discarded – undo
36	36	$adminmenu[] = [
37	37	'title' => _MI_GROUPS_MENU_HOME,
38	38	'link' => 'admin/index.php',
39		- 'icon' => $pathIcon32 . '/home.png',
	39	+ 'icon' => $pathIcon32.'/home.png',
40	40	];
41	41
42	42	$adminmenu[] = [
43	43	'title' => _MI_GROUPS_MENU_01,
44	44	'link' => 'admin/main.php',
45		- 'icon' => $pathIcon32 . '/manage.png',
	45	+ 'icon' => $pathIcon32.'/manage.png',
46	46	];
47	47
48	48	$adminmenu[] = [
49	49	'title' => _MI_GROUPS_MENU_02,
50	50	'link' => 'admin/perm.php',
51		- 'icon' => $pathIcon32 . '/permissions.png',
	51	+ 'icon' => $pathIcon32.'/permissions.png',
52	52	];
53	53
54	54	$adminmenu[] = [
55	55	'title' => _MI_GROUPS_MENU_ABOUT,
56	56	'link' => 'admin/about.php',
57		- 'icon' => $pathIcon32 . '/about.png',
	57	+ 'icon' => $pathIcon32.'/about.png',
58	58	];

		@@ -26,10 +26,10 @@ discard block
		block discarded – undo
26	26	// ------------------------------------------------------------------------ //
27	27	//
28	28
29		-require_once dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
30		-require_once __DIR__ . '/admin_header.php';
	29	+require_once dirname(dirname(dirname(__DIR__))).'/include/cp_header.php';
	30	+require_once __DIR__.'/admin_header.php';
31	31
32		-require_once XOOPS_ROOT_PATH . '/class/template.php';
	32	+require_once XOOPS_ROOT_PATH.'/class/template.php';
33	33	if (!isset($xoopsTpl)) {
34	34	$xoopsTpl = new XoopsTpl();
35	35	}
		@@ -40,12 +40,12 @@ discard block
		block discarded – undo
40	40	// CHECK IF SUBMIT WAS PRESSED
41	41	if (isset($_POST['add_x']) \|\| isset($_POST['del_x'])) {
42	42	if (isset($_POST['add_x'])) {
43		- $memberHandler = xoops_getHandler('member');
	43	+ $memberHandler = xoops_getHandler('member');
44	44	$membership = $memberHandler->addUserToGroup($_POST['groupid'], $_POST['all']);
45	45	}
46	46
47	47	if (isset($_POST['del_x'])) {
48		- $memberHandler = xoops_getHandler('member');
	48	+ $memberHandler = xoops_getHandler('member');
49	49	$membership = $memberHandler->removeUsersFromGroup($_POST['groupid'], [$_POST['curr']]);
50	50	}
51	51	}
		@@ -108,7 +108,7 @@ discard block
		block discarded – undo
108	108	//----------------*/
109	109
110	110	$uids = $memberHandler->getUsersByGroup($id);
111		- $criteria = new Criteria('uid', '(' . implode(',', $uids) . ')', 'IN');
	111	+ $criteria = new Criteria('uid', '('.implode(',', $uids).')', 'IN');
112	112	$criteria->setSort('uname');
113	113	$users = $memberHandler->getUserList($criteria);
114	114
		@@ -136,5 +136,5 @@ discard block
		block discarded – undo
136	136
137	137	$xoopsTpl->display('db:gm_main.tpl');
138	138
139		-require_once __DIR__ . '/admin_footer.php';
	139	+require_once __DIR__.'/admin_footer.php';
140	140	//xoops_cp_footer();

XoopsModules25x / groupmanager

Push — master ( 410bf5...5bae2d )

Status

Category

Spacing +15 added lines, -15 removed lines patch added patch discarded remove patch

Spacing +11 added lines, -11 removed lines patch added patch discarded remove patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +15 added lines, -15 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch