XoopsModules25x / myiframe

class/Common/FilesManagement.php

Spacing +11 added lines, -11 removed lines

@@ -32,7 +32,7 @@ 
                     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 (\Throwable $e) {
             echo 'Caught exception: ', $e->getMessage(), "\n", '<br>';
@@ -57,14 +57,14 @@ 
         $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);
                 }
             }
         }
@@ -154,7 +154,7 @@ 
                 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
     }
@@ -188,14 +188,14 @@ 
         $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
     }
@@ -232,9 +232,9 @@ 
         $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());
             }
         }
 

class/Common/Configurator.php

Spacing +3 added lines, -3 removed lines

@@ -43,7 +43,7 @@ 
      */
     public function __construct()
     {
-        $config = require \dirname(__DIR__, 2) . '/config/config.php';
+        $config = require \dirname(__DIR__, 2).'/config/config.php';
 
         $this->name            = $config->name;
         $this->paths           = $config->paths;
@@ -58,7 +58,7 @@ 
         $this->moduleStats     = $config->moduleStats;
         $this->modCopyright    = $config->modCopyright;
 
-        $this->icons = require \dirname(__DIR__, 2) . '/config/icons.php';
-        $this->paths = require \dirname(__DIR__, 2) . '/config/paths.php';
+        $this->icons = require \dirname(__DIR__, 2).'/config/icons.php';
+        $this->paths = require \dirname(__DIR__, 2).'/config/paths.php';
     }
 }

class/MyiframeBase.php

Spacing +3 added lines, -3 removed lines

@@ -8,7 +8,7 @@ 
  * Copyright (c) Hervé Thouzard of Instant Zero (https://www.instant-zero.com)
  * ****************************************************************************
  */
-require_once XOOPS_ROOT_PATH . '/kernel/object.php';
+require_once XOOPS_ROOT_PATH.'/kernel/object.php';
 
 /**
  * Class Myiframe
@@ -42,7 +42,7 @@ 
             if (\is_array($id)) {
                 $this->assignVars($id);
             } else {
-                $this->load((int)$id);
+                $this->load((int) $id);
             }
         } else {
             $this->setNew();
@@ -54,7 +54,7 @@ 
      */
     public function load($id): void
     {
-        $sql   = 'SELECT * FROM ' . $this->db->prefix('myiframe') . ' WHERE frame_frameid=' . (int)$id;
+        $sql   = 'SELECT * FROM '.$this->db->prefix('myiframe').' WHERE frame_frameid='.(int) $id;
         $myrow = $this->db->fetchArray($this->db->query($sql));
         $this->assignVars($myrow);
         if (!$myrow) {

index.php

Spacing +11 added lines, -11 removed lines

@@ -11,8 +11,8 @@ 
 /** @var Helper $helper */
 
 $GLOBALS['xoopsOption']['template_main'] = 'myiframe.tpl';
-require __DIR__ . '/header.php';
-require_once XOOPS_ROOT_PATH . '/header.php';
+require __DIR__.'/header.php';
+require_once XOOPS_ROOT_PATH.'/header.php';
 
 $tblalign = [];
 
@@ -20,7 +20,7 @@ 
 if (isset($_GET)) {
     foreach ($_GET as $k => $v) {
         if ('IFRAMEID' !== \mb_strtoupper(trim($k))) {
-            $suplparam .= $k . '=' . $v . '&';
+            $suplparam .= $k.'='.$v.'&';
         }
     }
 }
@@ -33,7 +33,7 @@ 
 $iframeHandler = $helper->getHandler('MyiframeBase');
 
 if (Request::hasVar('iframeid', 'GET')) {
-    $tblalign     = [
+    $tblalign = [
         'top',
         'middle',
         'bottom',
@@ -45,7 +45,7 @@ 
         'no',
         'auto',
     ];
-    $frameid      = Request::getInt('iframeid', 0, 'GET');
+    $frameid = Request::getInt('iframeid', 0, 'GET');
 
     $frame = $iframeHandler->get($frameid);
 
@@ -55,13 +55,13 @@ 
         $xoopsTpl->assign('longdesc', $frame->getVar('frame_description'));
         $xoopsTpl->assign('width', $frame->getVar('frame_width'));
         $xoopsTpl->assign('height', $frame->getVar('frame_height'));
-        $xoopsTpl->assign('align', $tblalign[(string)($frame->getVar('frame_align') - 1)]);
+        $xoopsTpl->assign('align', $tblalign[(string) ($frame->getVar('frame_align')-1)]);
         $xoopsTpl->assign('frameborder', $frame->getVar('frame_frameborder'));
         $xoopsTpl->assign('marginwidth', $frame->getVar('frame_marginwidth'));
         $xoopsTpl->assign('marginheight', $frame->getVar('frame_marginheight'));
-        $xoopsTpl->assign('scrolling', $tblscrolling[(string)($frame->getVar('frame_scrolling') - 1)]);
+        $xoopsTpl->assign('scrolling', $tblscrolling[(string) ($frame->getVar('frame_scrolling')-1)]);
         if ('' !== xoops_trim($suplparam)) {
-            $xoopsTpl->assign('url', $frame->getVar('frame_url') . '?' . $suplparam);
+            $xoopsTpl->assign('url', $frame->getVar('frame_url').'?'.$suplparam);
         } else {
             $xoopsTpl->assign('url', $frame->getVar('frame_url'));
         }
@@ -73,7 +73,7 @@ 
     }
 } else {
     if (myiframe_getmoduleoption('showlist')) {
-        $baseurl = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/index.php';
+        $baseurl = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/index.php';
         $frarray = [];
         $critere = new \Criteria('1', '1', '=');
         $critere->setSort('frame_description');
@@ -84,7 +84,7 @@ 
                 if ('' === xoops_trim($frame->getVar('frame_description'))) {
                     $liendesc = $frame->getVar('frame_url');
                 } else {
-                    $liendesc = "<a href='" . $baseurl . '?iframeid=' . $frame->getVar('frame_frameid') . "'>" . $frame->getVar('frame_description') . '</a>';
+                    $liendesc = "<a href='".$baseurl.'?iframeid='.$frame->getVar('frame_frameid')."'>".$frame->getVar('frame_description').'</a>';
                 }
                 $iframe['list'] = $liendesc;
                 $xoopsTpl->append('iframes', $iframe);
@@ -95,4 +95,4 @@ 
         $xoopsTpl->assign('frame_error', _MYIFRAME_FRAME_ERROR);
     }
 }
-require_once XOOPS_ROOT_PATH . '/footer.php';
+require_once XOOPS_ROOT_PATH.'/footer.php';

xoops_version.php

Spacing +6 added lines, -6 removed lines

@@ -8,7 +8,7 @@ 
  */
 defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined.');
 
-require_once __DIR__ . '/preloads/autoloader.php';
+require_once __DIR__.'/preloads/autoloader.php';
 
 $moduleDirName      = \basename(__DIR__);
 $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
@@ -72,15 +72,15 @@ 
 
 if (is_object($xoopsModule) && $xoopsModule->getVar('dirname') == $modversion['dirname'] && $xoopsModule->getVar('isactive')) {
     $i = 0;
-    require_once XOOPS_ROOT_PATH . '/modules/myiframe/include/functions.php';
+    require_once XOOPS_ROOT_PATH.'/modules/myiframe/include/functions.php';
     $myts = \MyTextSanitizer::getInstance();
     if (myiframe_getmoduleoption('showinmenu')) {
-        $sql    = 'SELECT * FROM ' . $GLOBALS['xoopsDB']->prefix('myiframe') . ' ORDER BY frame_description';
+        $sql    = 'SELECT * FROM '.$GLOBALS['xoopsDB']->prefix('myiframe').' ORDER BY frame_description';
         $result = $GLOBALS['xoopsDB']->query($sql);
         while (false !== ($myrow = $GLOBALS['xoopsDB']->fetchArray($result))) {
             if ('' !== xoops_trim($myrow['frame_description'])) {
                 $modversion['sub'][$i]['name'] = htmlspecialchars($myrow['frame_description'], ENT_QUOTES | ENT_HTML5);
-                $modversion['sub'][$i]['url']  = 'index.php?iframeid=' . (int)$myrow['frame_frameid'];
+                $modversion['sub'][$i]['url']  = 'index.php?iframeid='.(int) $myrow['frame_frameid'];
                 $i++;
             }
         }
@@ -107,8 +107,8 @@ 
 // Make Sample button visible?
 $modversion['config'][] = [
     'name'        => 'displaySampleButton',
-    'title'       => 'CO_' . $moduleDirNameUpper . '_' . 'SHOW_SAMPLE_BUTTON',
-    'description' => 'CO_' . $moduleDirNameUpper . '_' . 'SHOW_SAMPLE_BUTTON_DESC',
+    'title'       => 'CO_'.$moduleDirNameUpper.'_'.'SHOW_SAMPLE_BUTTON',
+    'description' => 'CO_'.$moduleDirNameUpper.'_'.'SHOW_SAMPLE_BUTTON_DESC',
     'formtype'    => 'yesno',
     'valuetype'   => 'int',
     'default'     => 1,

admin/admin_header.php

Spacing +3 added lines, -3 removed lines

@@ -26,11 +26,11 @@
 /** @var Admin $adminObject */
 /** @var Helper $helper */
 
-require dirname(__DIR__) . '/preloads/autoloader.php';
+require dirname(__DIR__).'/preloads/autoloader.php';
 
-require dirname(__DIR__, 3) . '/include/cp_header.php';
+require dirname(__DIR__, 3).'/include/cp_header.php';
 //require dirname(__DIR__, 3) . '/class/xoopsformloader.php';
-require dirname(__DIR__) . '/include/common.php';
+require dirname(__DIR__).'/include/common.php';
 
 $moduleDirName      = \basename(\dirname(__DIR__));
 $moduleDirNameUpper = mb_strtoupper($moduleDirName);

admin/manage.php

Spacing +40 added lines, -40 removed lines

@@ -10,25 +10,25 @@ 
 use Xmf\Module\Admin;
 use Xmf\Request;
 
-require_once __DIR__ . '/admin_header.php';
-require_once XOOPS_ROOT_PATH . '/modules/myiframe/include/functions.php';
+require_once __DIR__.'/admin_header.php';
+require_once XOOPS_ROOT_PATH.'/modules/myiframe/include/functions.php';
 
 // Verify if the table is up to date
 if (!myiframe_FieldExists('frame_frameid', $GLOBALS['xoopsDB']->prefix('myiframe'))) {
-    $result = $GLOBALS['xoopsDB']->queryF('ALTER TABLE ' . $GLOBALS['xoopsDB']->prefix('myiframe') . ' CHANGE `frameid` `frame_frameid` INT( 8 ) NOT NULL AUTO_INCREMENT');
-    $result = $GLOBALS['xoopsDB']->queryF('ALTER TABLE ' . $GLOBALS['xoopsDB']->prefix('myiframe') . " CHANGE `created` `frame_created` INT( 10 ) UNSIGNED NOT NULL DEFAULT '0'");
-    $result = $GLOBALS['xoopsDB']->queryF('ALTER TABLE ' . $GLOBALS['xoopsDB']->prefix('myiframe') . " CHANGE `uid` `frame_uid` MEDIUMINT( 8 ) UNSIGNED NOT NULL DEFAULT '0'");
-    $result = $GLOBALS['xoopsDB']->queryF('ALTER TABLE ' . $GLOBALS['xoopsDB']->prefix('myiframe') . ' CHANGE `longdesc` `frame_description` VARCHAR( 255 ) NOT NULL');
-    $result = $GLOBALS['xoopsDB']->queryF('ALTER TABLE ' . $GLOBALS['xoopsDB']->prefix('myiframe') . ' CHANGE `width` `frame_width` VARCHAR( 15 ) NOT NULL');
-    $result = $GLOBALS['xoopsDB']->queryF('ALTER TABLE ' . $GLOBALS['xoopsDB']->prefix('myiframe') . ' CHANGE `height` `frame_height` VARCHAR( 15 ) NOT NULL');
-    $result = $GLOBALS['xoopsDB']->queryF('ALTER TABLE ' . $GLOBALS['xoopsDB']->prefix('myiframe') . " CHANGE `align` `frame_align` SMALLINT( 2 ) NOT NULL DEFAULT '0'");
-    $result = $GLOBALS['xoopsDB']->queryF('ALTER TABLE ' . $GLOBALS['xoopsDB']->prefix('myiframe') . " CHANGE `frameborder` `frame_frameborder` SMALLINT( 3 ) NOT NULL DEFAULT '0'");
-    $result = $GLOBALS['xoopsDB']->queryF('ALTER TABLE ' . $GLOBALS['xoopsDB']->prefix('myiframe') . " CHANGE `marginwidth` `frame_marginwidth` SMALLINT( 3 ) NOT NULL DEFAULT '0'");
-    $result = $GLOBALS['xoopsDB']->queryF('ALTER TABLE ' . $GLOBALS['xoopsDB']->prefix('myiframe') . " CHANGE `marginheight` `frame_marginheight` SMALLINT( 3 ) NOT NULL DEFAULT '0'");
-    $result = $GLOBALS['xoopsDB']->queryF('ALTER TABLE ' . $GLOBALS['xoopsDB']->prefix('myiframe') . " CHANGE `scrolling` `frame_scrolling` SMALLINT( 1 ) NOT NULL DEFAULT '0'");
-    $result = $GLOBALS['xoopsDB']->queryF('ALTER TABLE ' . $GLOBALS['xoopsDB']->prefix('myiframe') . " CHANGE `hits` `frame_hits` INT( 8 ) UNSIGNED NOT NULL DEFAULT '0'");
-    $result = $GLOBALS['xoopsDB']->queryF('ALTER TABLE ' . $GLOBALS['xoopsDB']->prefix('myiframe') . ' CHANGE `url` `frame_url` VARCHAR( 255 ) NOT NULL');
-    header('Location : ' . XOOPS_URL . '/modules/system/admin.php?fct=modulesadmin&op=update&module=myiframe');
+    $result = $GLOBALS['xoopsDB']->queryF('ALTER TABLE '.$GLOBALS['xoopsDB']->prefix('myiframe').' CHANGE `frameid` `frame_frameid` INT( 8 ) NOT NULL AUTO_INCREMENT');
+    $result = $GLOBALS['xoopsDB']->queryF('ALTER TABLE '.$GLOBALS['xoopsDB']->prefix('myiframe')." CHANGE `created` `frame_created` INT( 10 ) UNSIGNED NOT NULL DEFAULT '0'");
+    $result = $GLOBALS['xoopsDB']->queryF('ALTER TABLE '.$GLOBALS['xoopsDB']->prefix('myiframe')." CHANGE `uid` `frame_uid` MEDIUMINT( 8 ) UNSIGNED NOT NULL DEFAULT '0'");
+    $result = $GLOBALS['xoopsDB']->queryF('ALTER TABLE '.$GLOBALS['xoopsDB']->prefix('myiframe').' CHANGE `longdesc` `frame_description` VARCHAR( 255 ) NOT NULL');
+    $result = $GLOBALS['xoopsDB']->queryF('ALTER TABLE '.$GLOBALS['xoopsDB']->prefix('myiframe').' CHANGE `width` `frame_width` VARCHAR( 15 ) NOT NULL');
+    $result = $GLOBALS['xoopsDB']->queryF('ALTER TABLE '.$GLOBALS['xoopsDB']->prefix('myiframe').' CHANGE `height` `frame_height` VARCHAR( 15 ) NOT NULL');
+    $result = $GLOBALS['xoopsDB']->queryF('ALTER TABLE '.$GLOBALS['xoopsDB']->prefix('myiframe')." CHANGE `align` `frame_align` SMALLINT( 2 ) NOT NULL DEFAULT '0'");
+    $result = $GLOBALS['xoopsDB']->queryF('ALTER TABLE '.$GLOBALS['xoopsDB']->prefix('myiframe')." CHANGE `frameborder` `frame_frameborder` SMALLINT( 3 ) NOT NULL DEFAULT '0'");
+    $result = $GLOBALS['xoopsDB']->queryF('ALTER TABLE '.$GLOBALS['xoopsDB']->prefix('myiframe')." CHANGE `marginwidth` `frame_marginwidth` SMALLINT( 3 ) NOT NULL DEFAULT '0'");
+    $result = $GLOBALS['xoopsDB']->queryF('ALTER TABLE '.$GLOBALS['xoopsDB']->prefix('myiframe')." CHANGE `marginheight` `frame_marginheight` SMALLINT( 3 ) NOT NULL DEFAULT '0'");
+    $result = $GLOBALS['xoopsDB']->queryF('ALTER TABLE '.$GLOBALS['xoopsDB']->prefix('myiframe')." CHANGE `scrolling` `frame_scrolling` SMALLINT( 1 ) NOT NULL DEFAULT '0'");
+    $result = $GLOBALS['xoopsDB']->queryF('ALTER TABLE '.$GLOBALS['xoopsDB']->prefix('myiframe')." CHANGE `hits` `frame_hits` INT( 8 ) UNSIGNED NOT NULL DEFAULT '0'");
+    $result = $GLOBALS['xoopsDB']->queryF('ALTER TABLE '.$GLOBALS['xoopsDB']->prefix('myiframe').' CHANGE `url` `frame_url` VARCHAR( 255 ) NOT NULL');
+    header('Location : '.XOOPS_URL.'/modules/system/admin.php?fct=modulesadmin&op=update&module=myiframe');
 }
 
 $module_id = $xoopsModule->getVar('mid');
@@ -53,10 +53,10 @@ 
  */
 function addEditForm($frameid, $Action, $FormTitle, $longdesc, $width, $height, $align, $frameborder, $marginwidth, $marginheight, $scrolling, $url, $LabelSubmitButton): void
 {
-    require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+    require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
     global $xoopsModule;
 
-    $sform = new \XoopsThemeForm($FormTitle, 'indexform', XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/admin/manage.php');
+    $sform = new \XoopsThemeForm($FormTitle, 'indexform', XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/admin/manage.php');
     $sform->addElement(new \XoopsFormText(_AM_MYIFRAME_DESC, 'longdesc', 50, 255, $longdesc), false);
     $sform->addElement(new \XoopsFormText(_AM_MYIFRAME_WIDTH, 'width', 10, 15, $width), false);
     $sform->addElement(new \XoopsFormText(_AM_MYIFRAME_HEIGHT, 'height', 10, 15, $height), false);
@@ -94,7 +94,7 @@ 
     $buttonTray->addElement($cancel_btn);
     $sform->addElement($buttonTray);
     $sform->display();
-    require_once __DIR__ . '/admin_footer.php';
+    require_once __DIR__.'/admin_footer.php';
 }
 
 // ******************************************************************************************************************************************
@@ -112,10 +112,10 @@ 
                 $adminObject->displayNavigation(basename(__FILE__));
                 echo "<table width='100%' border='0' cellspacing='1' class='outer'>\n";
                 echo '<tr><td class="odd">';
-                echo "<a href='manage.php'><h4>" . _AM_MYIFRAME_CONFIG . '</h4></a>';
-                echo _AM_MYIFRAME_ERROR_ADD_INDEX . ' 1';
+                echo "<a href='manage.php'><h4>"._AM_MYIFRAME_CONFIG.'</h4></a>';
+                echo _AM_MYIFRAME_ERROR_ADD_INDEX.' 1';
                 echo '</td></tr></table>';
-                require_once __DIR__ . '/admin_footer.php';
+                require_once __DIR__.'/admin_footer.php';
                 xoops_cp_footer();
                 exit();
             }
@@ -168,10 +168,10 @@ 
             $adminObject->displayNavigation(basename(__FILE__));
             echo "<table width='100%' border='0' cellspacing='1' class='outer'>\n";
             echo '<tr><td class="odd">';
-            echo "<a href='manage.php'><h4>" . _AM_MYIFRAME_CONFIG . '</h4></a>';
-            echo _AM_MYIFRAME_ERROR_ADD_INDEX . ' 2';
+            echo "<a href='manage.php'><h4>"._AM_MYIFRAME_CONFIG.'</h4></a>';
+            echo _AM_MYIFRAME_ERROR_ADD_INDEX.' 2';
             echo "</td></tr></table>\n";
-            require_once __DIR__ . '/admin_footer.php';
+            require_once __DIR__.'/admin_footer.php';
             xoops_cp_footer();
             exit();
         }
@@ -181,7 +181,7 @@ 
             xoops_cp_header();
             $adminObject = Admin::getInstance();
             $adminObject->displayNavigation(basename(__FILE__));
-            echo '<h4>' . _AM_MYIFRAME_CONFIG . '</h4>';
+            echo '<h4>'._AM_MYIFRAME_CONFIG.'</h4>';
             xoops_confirm(
                 [
                     'op'      => 'delete',
@@ -191,10 +191,10 @@ 
                 'manage.php',
                 _AM_MYIFRAME_RUSUREDEL
             );
-            require_once __DIR__ . '/admin_footer.php';
+            require_once __DIR__.'/admin_footer.php';
         } else {
             if (empty($_POST['frameid'])) {
-                redirect_header('manage.php', 2, _AM_MYIFRAME_ERROR_ADD_INDEX . ' 3');
+                redirect_header('manage.php', 2, _AM_MYIFRAME_ERROR_ADD_INDEX.' 3');
             }
             $frameid = Request::getInt('frameid', 0, 'POST');
             $critere = new \Criteria('frame_frameid', $frameid, '=');
@@ -210,10 +210,10 @@ 
                 $adminObject->displayNavigation(basename(__FILE__));
                 echo "<table width='100%' border='0' cellspacing='1' class='outer'>\n";
                 echo '<tr><td class="odd">';
-                echo "<a href='manage.php'><h4>" . _AM_MYIFRAME_CONFIG . '</h4></a>';
-                echo _AM_MYIFRAME_ERROR_ADD_INDEX . ' 4';
+                echo "<a href='manage.php'><h4>"._AM_MYIFRAME_CONFIG.'</h4></a>';
+                echo _AM_MYIFRAME_ERROR_ADD_INDEX.' 4';
                 echo "</td></tr></table>\n";
-                require_once __DIR__ . '/admin_footer.php';
+                require_once __DIR__.'/admin_footer.php';
                 xoops_cp_footer();
                 $adminObject = Admin::getInstance();
                 $adminObject->displayNavigation(basename(__FILE__));
@@ -233,7 +233,7 @@ 
             $frame->setVar('frame_uid', $xoopsUser->getVar('uid'));
             $res = $iframeHandler->insert($frame);
             if (!$res) {
-                redirect_header('manage.php', 1, _AM_MYIFRAME_ERROR_ADD_INDEX . ' 5');
+                redirect_header('manage.php', 1, _AM_MYIFRAME_ERROR_ADD_INDEX.' 5');
             }
             redirect_header('manage.php', 1, _AM_MYIFRAME_ADDED_OK);
         }
@@ -249,23 +249,23 @@ 
         xoops_cp_header();
         $adminObject = Admin::getInstance();
         $adminObject->displayNavigation(basename(__FILE__));
-        echo '<h4>' . _AM_MYIFRAME_CONFIG . "</h4><br>\n";
+        echo '<h4>'._AM_MYIFRAME_CONFIG."</h4><br>\n";
         echo "<table width='100%' border='0' cellspacing='1' class='outer'>\n";
-        echo "<tr><th align='center'>" . _AM_MYIFRAME_ID . "</th><th align='center'>" . _AM_MYIFRAME_DESC . "</th><th align='center'>" . _AM_MYIFRAME_CREATED . "</th><th align='center'>" . _AM_MYIFRAME_HITS . "</th><th align='center'>" . _AM_MYIFRAME_ACTION . "</th></tr>\n";
+        echo "<tr><th align='center'>"._AM_MYIFRAME_ID."</th><th align='center'>"._AM_MYIFRAME_DESC."</th><th align='center'>"._AM_MYIFRAME_CREATED."</th><th align='center'>"._AM_MYIFRAME_HITS."</th><th align='center'>"._AM_MYIFRAME_ACTION."</th></tr>\n";
         $critere = new \Criteria('1', '1', '=');
         $critere->setSort('frame_description');
         $frarray = $iframeHandler->getObjects($critere);
         $class   = 'even';
-        $baseurl = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/admin/manage.php';
+        $baseurl = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/admin/manage.php';
         if (count($frarray) > 0) {
             /** @var Myiframe $frame */
             foreach ($frarray as $frame) {
-                $action_edit   = "<a href='" . $baseurl . '?op=edit&frameid=' . $frame->getVar('frame_frameid') . "'><img src='../assets/images/edit.png' alt='" . _AM_MYIFRAME_EDIT . "'></a>";
-                $action_delete = "<a href='" . $baseurl . '?op=delete&frameid=' . $frame->getVar('frame_frameid') . "'><img src='../assets/images/delete.png' alt='" . _AM_MYIFRAME_DELETE . "'></a>";
+                $action_edit   = "<a href='".$baseurl.'?op=edit&frameid='.$frame->getVar('frame_frameid')."'><img src='../assets/images/edit.png' alt='"._AM_MYIFRAME_EDIT."'></a>";
+                $action_delete = "<a href='".$baseurl.'?op=delete&frameid='.$frame->getVar('frame_frameid')."'><img src='../assets/images/delete.png' alt='"._AM_MYIFRAME_DELETE."'></a>";
                 if ('' === xoops_trim($frame->getVar('frame_description'))) {
                     $liendesc = $frame->getVar('frame_url');
                 } else {
-                    $liendesc = "<a href='" . XOOPS_URL . '/modules/myiframe/index.php?iframeid=' . $frame->getVar('frame_frameid') . "'>" . $frame->getVar('frame_description') . '</a>';
+                    $liendesc = "<a href='".XOOPS_URL.'/modules/myiframe/index.php?iframeid='.$frame->getVar('frame_frameid')."'>".$frame->getVar('frame_description').'</a>';
                 }
                 echo "<tr class='"
                      . $class
@@ -285,9 +285,9 @@ 
                 $class = ('even' === $class) ? 'odd' : 'even';
             }
         }
-        echo "<tr class='" . $class . "'><td colspan='5' align='center'><form name='faddframe' method='post' action='manage.php'><input type='hidden' name='op' value='addframe'><input type='submit' name='submit' value='" . _AM_MYIFRAME_ADD . "'></td></tr>";
+        echo "<tr class='".$class."'><td colspan='5' align='center'><form name='faddframe' method='post' action='manage.php'><input type='hidden' name='op' value='addframe'><input type='submit' name='submit' value='"._AM_MYIFRAME_ADD."'></td></tr>";
         echo '</table>';
-        require_once __DIR__ . '/admin_footer.php';
+        require_once __DIR__.'/admin_footer.php';
         break;
 }
 

include/common.php

Spacing +25 added lines, -25 removed lines

@@ -18,7 +18,7 @@ 
 use Xmf\Module\Admin;
 use XoopsModules\Myiframe;
 
-require_once \dirname(__DIR__) . '/preloads/autoloader.php';
+require_once \dirname(__DIR__).'/preloads/autoloader.php';
 
 $moduleDirName      = \basename(\dirname(__DIR__));
 $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
@@ -37,20 +37,20 @@ 
 //$categoryHandler     = new Myiframe\CategoryHandler($db);
 //$downloadHandler     = new Myiframe\DownloadHandler($db);
 
-if (!defined($moduleDirNameUpper . '_CONSTANTS_DEFINED')) {
-    define($moduleDirNameUpper . '_DIRNAME', basename(dirname(__DIR__)));
-    define($moduleDirNameUpper . '_ROOT_PATH', XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/');
-    define($moduleDirNameUpper . '_PATH', XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/');
-    define($moduleDirNameUpper . '_URL', XOOPS_URL . '/modules/' . $moduleDirName . '/');
-    define($moduleDirNameUpper . '_IMAGE_URL', constant($moduleDirNameUpper . '_URL') . '/assets/images/');
-    define($moduleDirNameUpper . '_IMAGE_PATH', constant($moduleDirNameUpper . '_ROOT_PATH') . '/assets/images');
-    define($moduleDirNameUpper . '_ADMIN_URL', constant($moduleDirNameUpper . '_URL') . '/admin/');
-    define($moduleDirNameUpper . '_ADMIN_PATH', constant($moduleDirNameUpper . '_ROOT_PATH') . '/admin/');
-    define($moduleDirNameUpper . '_ADMIN', constant($moduleDirNameUpper . '_URL') . '/admin/index.php');
-    define($moduleDirNameUpper . '_AUTHOR_LOGOIMG', constant($moduleDirNameUpper . '_URL') . '/assets/images/logoModule.png');
-    define($moduleDirNameUpper . '_UPLOAD_URL', XOOPS_UPLOAD_URL . '/' . $moduleDirName); // WITHOUT Trailing slash
-    define($moduleDirNameUpper . '_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . $moduleDirName); // WITHOUT Trailing slash
-    define($moduleDirNameUpper . '_CONSTANTS_DEFINED', 1);
+if (!defined($moduleDirNameUpper.'_CONSTANTS_DEFINED')) {
+    define($moduleDirNameUpper.'_DIRNAME', basename(dirname(__DIR__)));
+    define($moduleDirNameUpper.'_ROOT_PATH', XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/');
+    define($moduleDirNameUpper.'_PATH', XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/');
+    define($moduleDirNameUpper.'_URL', XOOPS_URL.'/modules/'.$moduleDirName.'/');
+    define($moduleDirNameUpper.'_IMAGE_URL', constant($moduleDirNameUpper.'_URL').'/assets/images/');
+    define($moduleDirNameUpper.'_IMAGE_PATH', constant($moduleDirNameUpper.'_ROOT_PATH').'/assets/images');
+    define($moduleDirNameUpper.'_ADMIN_URL', constant($moduleDirNameUpper.'_URL').'/admin/');
+    define($moduleDirNameUpper.'_ADMIN_PATH', constant($moduleDirNameUpper.'_ROOT_PATH').'/admin/');
+    define($moduleDirNameUpper.'_ADMIN', constant($moduleDirNameUpper.'_URL').'/admin/index.php');
+    define($moduleDirNameUpper.'_AUTHOR_LOGOIMG', constant($moduleDirNameUpper.'_URL').'/assets/images/logoModule.png');
+    define($moduleDirNameUpper.'_UPLOAD_URL', XOOPS_UPLOAD_URL.'/'.$moduleDirName); // WITHOUT Trailing slash
+    define($moduleDirNameUpper.'_UPLOAD_PATH', XOOPS_UPLOAD_PATH.'/'.$moduleDirName); // WITHOUT Trailing slash
+    define($moduleDirNameUpper.'_CONSTANTS_DEFINED', 1);
 }
 
 $pathIcon16 = Admin::iconUrl('', '16');
@@ -59,15 +59,15 @@ 
 //$pathModIcon32 = $helper->getModule()->getInfo('modicons32');
 
 $icons = [
-    'edit'    => "<img src='" . $pathIcon16 . "/edit.png'  alt=" . _EDIT . "' align='middle'>",
-    'delete'  => "<img src='" . $pathIcon16 . "/delete.png' alt='" . _DELETE . "' align='middle'>",
-    'clone'   => "<img src='" . $pathIcon16 . "/editcopy.png' alt='" . _CLONE . "' align='middle'>",
-    'preview' => "<img src='" . $pathIcon16 . "/view.png' alt='" . _PREVIEW . "' align='middle'>",
-    'print'   => "<img src='" . $pathIcon16 . "/printer.png' alt='" . _CLONE . "' align='middle'>",
-    'pdf'     => "<img src='" . $pathIcon16 . "/pdf.png' alt='" . _CLONE . "' align='middle'>",
-    'add'     => "<img src='" . $pathIcon16 . "/add.png' alt='" . _ADD . "' align='middle'>",
-    '0'       => "<img src='" . $pathIcon16 . "/0.png' alt='" . 0 . "' align='middle'>",
-    '1'       => "<img src='" . $pathIcon16 . "/1.png' alt='" . 1 . "' align='middle'>",
+    'edit'    => "<img src='".$pathIcon16."/edit.png'  alt="._EDIT."' align='middle'>",
+    'delete'  => "<img src='".$pathIcon16."/delete.png' alt='"._DELETE."' align='middle'>",
+    'clone'   => "<img src='".$pathIcon16."/editcopy.png' alt='"._CLONE."' align='middle'>",
+    'preview' => "<img src='".$pathIcon16."/view.png' alt='"._PREVIEW."' align='middle'>",
+    'print'   => "<img src='".$pathIcon16."/printer.png' alt='"._CLONE."' align='middle'>",
+    'pdf'     => "<img src='".$pathIcon16."/pdf.png' alt='"._CLONE."' align='middle'>",
+    'add'     => "<img src='".$pathIcon16."/add.png' alt='"._ADD."' align='middle'>",
+    '0'       => "<img src='".$pathIcon16."/0.png' alt='".0."' align='middle'>",
+    '1'       => "<img src='".$pathIcon16."/1.png' alt='".1."' align='middle'>",
 ];
 
 $debug = false;
@@ -88,6 +88,6 @@ 
     $pathModIcon32 = $helper->getModule()
                             ->getInfo('modicons32');
 
-    $GLOBALS['xoopsTpl']->assign('pathModIcon16', XOOPS_URL . '/modules/' . $moduleDirName . '/' . $pathModIcon16);
+    $GLOBALS['xoopsTpl']->assign('pathModIcon16', XOOPS_URL.'/modules/'.$moduleDirName.'/'.$pathModIcon16);
     $GLOBALS['xoopsTpl']->assign('pathModIcon32', $pathModIcon32);
 }

blocks/myiframe_iframe.php

Spacing +7 added lines, -7 removed lines

@@ -15,7 +15,7 @@ 
 
 /** @var Helper $helper */
 
-require_once XOOPS_ROOT_PATH . '/modules/myiframe/include/functions.php';
+require_once XOOPS_ROOT_PATH.'/modules/myiframe/include/functions.php';
 
 /**
  * @param $options
@@ -36,7 +36,7 @@ 
         'left',
         'rigth',
     ];
-    $tblscrolling  = [
+    $tblscrolling = [
         'yes',
         'no',
         'auto',
@@ -48,11 +48,11 @@ 
         $block['longdesc']     = $frame->getVar('frame_description');
         $block['width']        = $frame->getVar('frame_width');
         $block['height']       = $frame->getVar('frame_height');
-        $block['align']        = $tblalign[$frame->getVar('frame_align') - 1];
+        $block['align']        = $tblalign[$frame->getVar('frame_align')-1];
         $block['frameborder']  = $frame->getVar('frame_frameborder');
         $block['marginwidth']  = $frame->getVar('frame_marginwidth');
         $block['marginheight'] = $frame->getVar('frame_marginheight');
-        $block['scrolling']    = $tblscrolling[$frame->getVar('frame_scrolling') - 1];
+        $block['scrolling']    = $tblscrolling[$frame->getVar('frame_scrolling')-1];
         $block['url']          = $frame->getVar('frame_url');
     }
 
@@ -77,14 +77,14 @@ 
     $critere->setSort('frame_description');
     $frarray = $iframeHandler->getObjects($critere);
 
-    $form = '' . _MB_MYIFRAME_IFRAME . "&nbsp;<select name='options[0]'>";
+    $form = ''._MB_MYIFRAME_IFRAME."&nbsp;<select name='options[0]'>";
     /** @var Myiframe $oneframe */
     foreach ($frarray as $oneframe) {
-        $form .= "<option value='" . $oneframe->getVar('frame_frameid') . "'";
+        $form .= "<option value='".$oneframe->getVar('frame_frameid')."'";
         if ($options[0] == $oneframe->getVar('frame_frameid')) {
             $form .= " selected='selected'";
         }
-        $form .= '>' . $oneframe->getVar('frame_description') . '</option>';
+        $form .= '>'.$oneframe->getVar('frame_description').'</option>';
     }
     $form .= "</select>\n";