XOOPS / XoopsCore

htdocs/modules/system/class/module.php

Spacing +126 added lines, -126 removed lines

@@ -107,20 +107,20 @@ 
                     $module->setInfo('warning_update', true);
                 }
                 if (XoopsLoad::fileExists(
-                    \XoopsBaseConfig::get('root-path') . '/modules/' . $module->getVar('dirname') . '/icons/logo_small.png'
+                    \XoopsBaseConfig::get('root-path').'/modules/'.$module->getVar('dirname').'/icons/logo_small.png'
                 )) {
                     $module->setInfo(
                         'logo_small',
-                        \XoopsBaseConfig::get('url') . '/modules/' . $module->getVar('dirname') . '/icons/logo_small.png'
+                        \XoopsBaseConfig::get('url').'/modules/'.$module->getVar('dirname').'/icons/logo_small.png'
                     );
                 } else {
-                    $module->setInfo('logo_small', \XoopsBaseConfig::get('url') . '/media/xoops/images/icons/16/default.png');
+                    $module->setInfo('logo_small', \XoopsBaseConfig::get('url').'/media/xoops/images/icons/16/default.png');
                 }
                 $module->setInfo('version', round($module->getVar('version') / 100, 2));
                 $module->setInfo('update', XoopsLocale::formatTimestamp($module->getVar('last_update'), 's'));
                 $module->setInfo(
                     'link_admin',
-                    \XoopsBaseConfig::get('url') . '/modules/' . $module->getVar('dirname') . '/' . $module->getInfo('adminindex')
+                    \XoopsBaseConfig::get('url').'/modules/'.$module->getVar('dirname').'/'.$module->getInfo('adminindex')
                 );
 
                 if ($module->getVar('isactive')) {
@@ -142,7 +142,7 @@ 
                 ) {
                     $module->setInfo(
                         'link_pref',
-                        \XoopsBaseConfig::get('url') . '/modules/system/admin.php?fct=preferences&op=showmod&mod='
+                        \XoopsBaseConfig::get('url').'/modules/system/admin.php?fct=preferences&op=showmod&mod='
                         . $module->getVar('mid')
                     );
                 }
@@ -167,7 +167,7 @@ 
         $ret = array();
         $i = 0;
         foreach ($this->modulesList as $file) {
-            if (XoopsLoad::fileExists(\XoopsBaseConfig::get('root-path') . '/modules/' . $file . '/xoops_version.php')) {
+            if (XoopsLoad::fileExists(\XoopsBaseConfig::get('root-path').'/modules/'.$file.'/xoops_version.php')) {
                 clearstatcache();
                 $file = trim($file);
                 if (!in_array($file, $this->modulesDirnames)) {
@@ -215,7 +215,7 @@ 
             $this->addTemporaryAutoloader($module);
             $install_script = $module->getInfo('onInstall');
             if ($install_script && trim($install_script) != '') {
-                XoopsLoad::loadFile($xoops->path('modules/' . $mod . '/' . trim($install_script)));
+                XoopsLoad::loadFile($xoops->path('modules/'.$mod.'/'.trim($install_script)));
             }
             $func = "xoops_module_pre_install_{$mod}";
             // If pre install function is defined, execute
@@ -236,7 +236,7 @@ 
                 $schema_file = $module->getInfo('schema');
                 $sql_file = $module->getInfo('sqlfile');
                 if (!empty($schema_file)) {
-                    $schema_file_path = \XoopsBaseConfig::get('root-path') . '/modules/' . $mod . '/' . $schema_file;
+                    $schema_file_path = \XoopsBaseConfig::get('root-path').'/modules/'.$mod.'/'.$schema_file;
                     if (!XoopsLoad::fileExists($schema_file_path)) {
                         $this->error[] =
                             sprintf(SystemLocale::EF_SQL_FILE_NOT_FOUND, "<strong>{$schema_file}</strong>");
@@ -249,7 +249,7 @@ 
                 } elseif (is_array($sql_file) && !empty($sql_file[\XoopsBaseConfig::get('db-type')])) {
                     $xoops->deprecated('Install SQL files are deprecated since 2.6.0. Convert to portable Schemas');
 
-                    $sql_file_path = \XoopsBaseConfig::get('root-path') . '/modules/' . $mod . '/' . $sql_file[\XoopsBaseConfig::get('db-type')];
+                    $sql_file_path = \XoopsBaseConfig::get('root-path').'/modules/'.$mod.'/'.$sql_file[\XoopsBaseConfig::get('db-type')];
                     if (!XoopsLoad::fileExists($sql_file_path)) {
                         $this->error[] =
                             sprintf(SystemLocale::EF_SQL_FILE_NOT_FOUND, "<strong>{$sql_file_path}</strong>");
@@ -266,10 +266,10 @@ 
                             // [4] contains unprefixed table name
                             $prefixed_query = SqlUtility::prefixQuery($piece, $xoops->db()->prefix());
                             if (!$prefixed_query) {
-                                $this->error[]['sub'] = '<span class="red">' . sprintf(
+                                $this->error[]['sub'] = '<span class="red">'.sprintf(
                                     XoopsLocale::EF_INVALID_SQL,
-                                    '<strong>' . $piece . '</strong>'
-                                ) . '</span>';
+                                    '<strong>'.$piece.'</strong>'
+                                ).'</span>';
                                 break;
                             }
                             // check if the table name is reserved
@@ -279,7 +279,7 @@ 
                                     $result = $xoops->db()->query($prefixed_query[0]);
                                 } catch (Exception $e) {
                                     $xoops->events()->triggerEvent('core.exception', $e);
-                                    $result=false;
+                                    $result = false;
                                 }
 
                                 if (!$result) {
@@ -289,13 +289,13 @@ 
                                     if (!in_array($prefixed_query[4], $created_tables)) {
                                         $this->trace[]['sub'] = sprintf(
                                             XoopsLocale::SF_TABLE_CREATED,
-                                            '<strong>' . $xoops->db()->prefix($prefixed_query[4]) . '</strong>'
+                                            '<strong>'.$xoops->db()->prefix($prefixed_query[4]).'</strong>'
                                         );
                                         $created_tables[] = $prefixed_query[4];
                                     } else {
                                         $this->trace[]['sub'] = sprintf(
                                             XoopsLocale::SF_DATA_INSERTED_TO_TABLE,
-                                            '<strong>' . $xoops->db()->prefix($prefixed_query[4]) . '</strong>'
+                                            '<strong>'.$xoops->db()->prefix($prefixed_query[4]).'</strong>'
                                         );
                                     }
                                 }
@@ -303,7 +303,7 @@ 
                                 // the table name is reserved, so halt the installation
                                 $this->error[]['sub'] = sprintf(
                                     SystemLocale::EF_TABLE_IS_RESERVED,
-                                    '<strong>' . $prefixed_query[4] . '</strong>'
+                                    '<strong>'.$prefixed_query[4].'</strong>'
                                 );
                                 break;
                             }
@@ -313,7 +313,7 @@ 
                         if (count($this->error) > 0) {
                             foreach ($created_tables as $table) {
                                 try {
-                                    $xoops->db()->query('DROP TABLE ' . $xoops->db()->prefix($table));
+                                    $xoops->db()->query('DROP TABLE '.$xoops->db()->prefix($table));
                                 } catch (Exception $e) {
                                     $xoops->events()->triggerEvent('core.exception', $e);
                                 }
@@ -328,25 +328,25 @@ 
                 if (!$module_handler->insertModule($module)) {
                     $this->error[] = sprintf(
                         XoopsLocale::EF_NOT_INSERTED_TO_DATABASE,
-                        '<strong>' . $module->getVar('name') . '</strong>'
+                        '<strong>'.$module->getVar('name').'</strong>'
                     );
                     foreach ($created_tables as $ct) {
                         try {
-                            $xoops->db()->query('DROP TABLE ' . $xoops->db()->prefix($ct));
+                            $xoops->db()->query('DROP TABLE '.$xoops->db()->prefix($ct));
                         } catch (Exception $e) {
                             $xoops->events()->triggerEvent('core.exception', $e);
                         }
                     }
-                    $this->error[] = sprintf(XoopsLocale::EF_NOT_INSTALLED, "<strong>" . $module->name() . "</strong>");
+                    $this->error[] = sprintf(XoopsLocale::EF_NOT_INSTALLED, "<strong>".$module->name()."</strong>");
                     $this->error[] = XoopsLocale::C_ERRORS;
                     unset($module);
                     unset($created_tables);
                     return false;
                 }
                 unset($created_tables);
-                $this->trace[] = XoopsLocale::S_DATA_INSERTED . sprintf(
+                $this->trace[] = XoopsLocale::S_DATA_INSERTED.sprintf(
                     SystemLocale::F_MODULE_ID,
-                    '<strong>' . $module->getVar('mid') . '</strong>'
+                    '<strong>'.$module->getVar('mid').'</strong>'
                 );
                 $xoops->db()->beginTransaction();
                 // install Templates
@@ -378,14 +378,14 @@ 
                         $mperm->setVar('gperm_name', 'module_admin');
                         $mperm->setVar('gperm_modid', 1);
                         if (!$gperm_handler->insert($mperm)) {
-                            $this->trace[]['sub'] = '<span class="red">' . sprintf(
+                            $this->trace[]['sub'] = '<span class="red">'.sprintf(
                                 SystemLocale::EF_GROUP_ID_ADMIN_ACCESS_RIGHT_NOT_ADDED,
-                                '<strong>' . $mygroup . '</strong>'
-                            ) . '</span>';
+                                '<strong>'.$mygroup.'</strong>'
+                            ).'</span>';
                         } else {
                             $this->trace[]['sub'] = sprintf(
                                 SystemLocale::SF_GROUP_ID_ADMIN_ACCESS_RIGHT_ADDED,
-                                '<strong>' . $mygroup . '</strong>'
+                                '<strong>'.$mygroup.'</strong>'
                             );
                         }
                         unset($mperm);
@@ -396,14 +396,14 @@ 
                     $mperm->setVar('gperm_name', 'module_read');
                     $mperm->setVar('gperm_modid', 1);
                     if (!$gperm_handler->insert($mperm)) {
-                        $this->trace[]['sub'] = '<span class="red">' . sprintf(
+                        $this->trace[]['sub'] = '<span class="red">'.sprintf(
                             SystemLocale::EF_GROUP_ID_USER_ACCESS_RIGHT_NOT_ADDED,
-                            '<strong>' . $mygroup . '</strong>'
-                        ) . '</span>';
+                            '<strong>'.$mygroup.'</strong>'
+                        ).'</span>';
                     } else {
                         $this->trace[]['sub'] = sprintf(
                             SystemLocale::SF_GROUP_ID_USER_ACCESS_RIGHT_ADDED,
-                            '<strong>' . $mygroup . '</strong>'
+                            '<strong>'.$mygroup.'</strong>'
                         );
                     }
                     unset($mperm);
@@ -415,12 +415,12 @@ 
                         $bperm->setVar('gperm_modid', 1);
                         if (!$gperm_handler->insert($bperm)) {
                             $this->trace[]['sub'] = '<span class="red">'
-                            . SystemLocale::E_BLOCK_ACCESS_NOT_ADDED . ' Block ID: <strong>'
-                            . $blc . '</strong> Group ID: <strong>' . $mygroup . '</strong></span>';
+                            . SystemLocale::E_BLOCK_ACCESS_NOT_ADDED.' Block ID: <strong>'
+                            . $blc.'</strong> Group ID: <strong>'.$mygroup.'</strong></span>';
                         } else {
                             $this->trace[]['sub'] = SystemLocale::S_BLOCK_ACCESS_ADDED
-                                . sprintf(SystemLocale::F_BLOCK_ID, "<strong>" . $blc . "</strong>")
-                                . sprintf(SystemLocale::F_GROUP_ID, "<strong>" . $mygroup . "</strong>");
+                                . sprintf(SystemLocale::F_BLOCK_ID, "<strong>".$blc."</strong>")
+                                . sprintf(SystemLocale::F_GROUP_ID, "<strong>".$mygroup."</strong>");
                         }
                         unset($bperm);
                     }
@@ -444,7 +444,7 @@ 
 
                 $this->trace[] = sprintf(
                     XoopsLocale::SF_INSTALLED,
-                    '<strong>' . $module->getVar('name', 's') . '</strong>'
+                    '<strong>'.$module->getVar('name', 's').'</strong>'
                 );
                 unset($blocks);
 
@@ -456,8 +456,8 @@ 
         } else {
             $this->error[] = sprintf(
                 XoopsLocale::EF_NOT_INSTALLED,
-                '<strong>' . $mod . '</strong>'
-            ) . "&nbsp;" . XoopsLocale::C_ERRORS;
+                '<strong>'.$mod.'</strong>'
+            )."&nbsp;".XoopsLocale::C_ERRORS;
             return false;
         }
         return false;
@@ -480,22 +480,22 @@ 
         if ($module->getVar('dirname') === 'system') {
             $this->error[] = sprintf(
                 XoopsLocale::EF_NOT_UNINSTALLED,
-                '<strong>' . $module->getVar('name') . '</strong>'
-            ) . "&nbsp;" . XoopsLocale::C_ERRORS;
-            $this->error[] = " - " . SystemLocale::E_SYSTEM_MODULE_CANNOT_BE_DEACTIVATED;
+                '<strong>'.$module->getVar('name').'</strong>'
+            )."&nbsp;".XoopsLocale::C_ERRORS;
+            $this->error[] = " - ".SystemLocale::E_SYSTEM_MODULE_CANNOT_BE_DEACTIVATED;
             return false;
         } elseif ($module->getVar('dirname') == $xoops->getConfig('startpage')) {
             $this->error[] = sprintf(
                 XoopsLocale::EF_NOT_UNINSTALLED,
-                '<strong>' . $module->getVar('name') . '</strong>'
-            ) . "&nbsp;" . XoopsLocale::C_ERRORS;
-            $this->error[] = " - " . SystemLocale::E_THIS_MODULE_IS_SET_AS_DEFAULT_START_PAGE;
+                '<strong>'.$module->getVar('name').'</strong>'
+            )."&nbsp;".XoopsLocale::C_ERRORS;
+            $this->error[] = " - ".SystemLocale::E_THIS_MODULE_IS_SET_AS_DEFAULT_START_PAGE;
             return false;
         } else {
             // Load module specific install script if any
             $uninstall_script = $module->getInfo('onUninstall');
             if ($uninstall_script && trim($uninstall_script) != '') {
-                XoopsLoad::loadFile($xoops->path('modules/' . $mod . '/' . trim($uninstall_script)));
+                XoopsLoad::loadFile($xoops->path('modules/'.$mod.'/'.trim($uninstall_script)));
             }
             $func = "xoops_module_pre_uninstall_{$mod}";
             // If pre uninstall function is defined, execute
@@ -505,8 +505,8 @@ 
                     $this->error[] = sprintf(XoopsLocale::EF_NOT_EXECUTED, $func);
                     $this->error[] = sprintf(
                         XoopsLocale::EF_NOT_UNINSTALLED,
-                        '<strong>' . $module->getVar('name') . '</strong>'
-                    ) . "&nbsp;" . XoopsLocale::C_ERRORS;
+                        '<strong>'.$module->getVar('name').'</strong>'
+                    )."&nbsp;".XoopsLocale::C_ERRORS;
                     $this->error = array_merge($this->error, $module->getErrors());
                     return false;
                 } else {
@@ -540,13 +540,13 @@ 
                             $toSchema->dropTable($xoops->db()->prefix($table));
                             $this->trace[]['sub'] = sprintf(
                                 XoopsLocale::SF_TABLE_DROPPED,
-                                '<strong>' . $xoops->db()->prefix($table) . '</strong>'
+                                '<strong>'.$xoops->db()->prefix($table).'</strong>'
                             );
                         } else {
-                            $this->trace[]['sub'] = '<span class="red">' . sprintf(
+                            $this->trace[]['sub'] = '<span class="red">'.sprintf(
                                 XoopsLocale::EF_TABLE_DROP_NOT_ALLOWED,
-                                '<strong>' . $xoops->db()->prefix($table) . '</strong>'
-                            ) . '</span>';
+                                '<strong>'.$xoops->db()->prefix($table).'</strong>'
+                            ).'</span>';
                         }
                     }
                     $synchronizer = new SingleDatabaseSynchronizer($xoops->db());
@@ -556,7 +556,7 @@ 
                 // delete permissions if any
                 $gperm_handler = $xoops->getHandlerGroupPermission();
                 if (false === $gperm_handler->deleteByModule($module->getVar('mid'))) {
-                    $this->trace[] = '<span class="red">' . SystemLocale::E_GROUP_PERMISSIONS_NOT_DELETED . '</span>';
+                    $this->trace[] = '<span class="red">'.SystemLocale::E_GROUP_PERMISSIONS_NOT_DELETED.'</span>';
                 } else {
                     $this->trace[] = SystemLocale::S_GROUP_PERMISSIONS_DELETED;
                 }
@@ -565,7 +565,7 @@ 
                 $this->deleteConfigs($module);
 
                 // execute module specific install script if any
-                $func = 'xoops_module_uninstall_' . $mod;
+                $func = 'xoops_module_uninstall_'.$mod;
                 if (function_exists($func)) {
                     $result = $func($module);
                     if (!$result) {
@@ -578,7 +578,7 @@ 
                 }
                 $this->trace[] = sprintf(
                     XoopsLocale::SF_UNINSTALLED,
-                    '<strong>' . $module->getVar('name') . '</strong>'
+                    '<strong>'.$module->getVar('name').'</strong>'
                 );
                 $xoops->events()->triggerEvent('system.module.uninstall', $module);
                 return $module;
@@ -609,14 +609,14 @@ 
         $this->addTemporaryAutoloader($module);
 
         if (!$module_handler->insertModule($module)) {
-            $this->error[] = sprintf(XoopsLocale::EF_NOT_UPDATED, "<strong>" . $module->getVar('name') . "</strong>");
+            $this->error[] = sprintf(XoopsLocale::EF_NOT_UPDATED, "<strong>".$module->getVar('name')."</strong>");
             return false;
         } else {
             // execute module specific preupdate script if any
             $update_script = $module->getInfo('onUpdate');
             if (false != $update_script && trim($update_script) != '') {
-                XoopsLoad::loadFile($xoops->path('modules/' . $mod . '/' . trim($update_script)));
-                $func = 'xoops_module_pre_update_' . $mod;
+                XoopsLoad::loadFile($xoops->path('modules/'.$mod.'/'.trim($update_script)));
+                $func = 'xoops_module_pre_update_'.$mod;
                 if (function_exists($func)) {
                     $result = $func($module, $prev_version);
                     if (!$result) {
@@ -632,7 +632,7 @@ 
             // update schema
             $schema_file = $module->getInfo('schema');
             if (!empty($schema_file)) {
-                $schema_file_path = \XoopsBaseConfig::get('root-path') . '/modules/' . $mod . '/' . $schema_file;
+                $schema_file_path = \XoopsBaseConfig::get('root-path').'/modules/'.$mod.'/'.$schema_file;
                 if (!XoopsLoad::fileExists($schema_file_path)) {
                     $this->error[] =
                         sprintf(SystemLocale::EF_SQL_FILE_NOT_FOUND, "<strong>{$schema_file}</strong>");
@@ -665,8 +665,8 @@ 
             // execute module specific update script if any
             $update_script = $module->getInfo('onUpdate');
             if (false != $update_script && trim($update_script) != '') {
-                XoopsLoad::loadFile($xoops->path('modules/' . $mod . '/' . trim($update_script)));
-                $func = 'xoops_module_update_' . $mod;
+                XoopsLoad::loadFile($xoops->path('modules/'.$mod.'/'.trim($update_script)));
+                $func = 'xoops_module_update_'.$mod;
                 if (function_exists($func)) {
                     $result = $func($module, $prev_version);
                     if (!$result) {
@@ -678,7 +678,7 @@ 
                     }
                 }
             }
-            $this->trace[] = sprintf(XoopsLocale::SF_UPDATED, '<strong>' . $module->getVar('name', 's') . '</strong>');
+            $this->trace[] = sprintf(XoopsLocale::SF_UPDATED, '<strong>'.$module->getVar('name', 's').'</strong>');
             return $module;
         }
     }
@@ -699,10 +699,10 @@ 
         switch ($type) {
             case 'blocks':
             case 'admin':
-                $path = $xoops->path('modules/' . $dirname . '/templates/' . $type . '/' . $template);
+                $path = $xoops->path('modules/'.$dirname.'/templates/'.$type.'/'.$template);
                 break;
             default:
-                $path = $xoops->path('modules/' . $dirname . '/templates/' . $template);
+                $path = $xoops->path('modules/'.$dirname.'/templates/'.$template);
                 break;
         }
         if (!XoopsLoad::fileExists($path)) {
@@ -755,39 +755,39 @@ 
                     $tplfile->setVar('tpl_file', $tpl['file']);
                     $tplfile->setVar('tpl_desc', $tpl['description']);
                     if (!$tplfile_handler->insertTpl($tplfile)) {
-                        $this->trace[]['sub'] = '<span class="red">' . sprintf(
+                        $this->trace[]['sub'] = '<span class="red">'.sprintf(
                             SystemLocale::EF_TEMPLATE_NOT_ADDED_TO_DATABASE,
-                            '<strong>' . $tpl['file'] . '</strong>'
-                        ) . '</span>';
+                            '<strong>'.$tpl['file'].'</strong>'
+                        ).'</span>';
                     } else {
                         $newid = $tplfile->getVar('tpl_id');
                         $this->trace[]['sub'] = sprintf(
                             SystemLocale::SF_TEMPLATE_ADDED,
-                            '<strong>' . $tpl['file'] . '</strong>'
+                            '<strong>'.$tpl['file'].'</strong>'
                         );
                         if ($module->getVar('dirname') === 'system') {
                             if (!$xoops->templateTouch($newid)) {
-                                $this->trace[]['sub'] = '<span class="red">' . sprintf(
+                                $this->trace[]['sub'] = '<span class="red">'.sprintf(
                                     SystemLocale::EF_TEMPLATE_NOT_RECOMPILED,
-                                    '<strong>' . $tpl['file'] . '</strong>'
-                                ) . '</span>';
+                                    '<strong>'.$tpl['file'].'</strong>'
+                                ).'</span>';
                             } else {
                                 $this->trace[]['sub'] = sprintf(
                                     SystemLocale::SF_TEMPLATE_RECOMPILED,
-                                    '<strong>' . $tpl['file'] . '</strong>'
+                                    '<strong>'.$tpl['file'].'</strong>'
                                 );
                             }
                         } else {
                             if ($xoops->config['template_set'] === 'default') {
                                 if (!$xoops->templateTouch($newid)) {
-                                    $this->trace[]['sub'] = '<span class="red">' . sprintf(
+                                    $this->trace[]['sub'] = '<span class="red">'.sprintf(
                                         SystemLocale::EF_TEMPLATE_NOT_RECOMPILED,
-                                        '<strong>' . $tpl['file'] . '</strong>'
-                                    ) . '</span>';
+                                        '<strong>'.$tpl['file'].'</strong>'
+                                    ).'</span>';
                                 } else {
                                     $this->trace[]['sub'] = sprintf(
                                         SystemLocale::SF_TEMPLATE_RECOMPILED,
-                                        '<strong>' . $tpl['file'] . '</strong>'
+                                        '<strong>'.$tpl['file'].'</strong>'
                                     );
                                 }
                             }
@@ -795,10 +795,10 @@ 
                     }
                     unset($tpldata);
                 } else {
-                    $this->trace[]['sub'] = '<span class="red">' . sprintf(
+                    $this->trace[]['sub'] = '<span class="red">'.sprintf(
                         SystemLocale::EF_TEMPLATE_NOT_DELETED,
-                        '<strong>' . $tpl['file'] . '</strong>'
-                    ) . '</span>';
+                        '<strong>'.$tpl['file'].'</strong>'
+                    ).'</span>';
                 }
             }
         }
@@ -887,17 +887,17 @@ 
                     $block_obj[0]->setVar('last_modified', time());
 
                     if (!$block_handler->insert($block_obj[0])) {
-                        $this->trace[]['sub'] = '<span class="red">' . sprintf(
+                        $this->trace[]['sub'] = '<span class="red">'.sprintf(
                             XoopsLocale::EF_NOT_UPDATED,
                             $block_obj[0]->getVar('name')
-                        ) . '</span>';
+                        ).'</span>';
                     } else {
                         $this->trace[]['sub'] = sprintf(
                             SystemLocale::SF_BLOCK_UPDATED,
-                            '<strong>' . $block_obj[0]->getVar('name')
-                        ) . '</strong>' . sprintf(
+                            '<strong>'.$block_obj[0]->getVar('name')
+                        ).'</strong>'.sprintf(
                             SystemLocale::F_BLOCK_ID,
-                            '<strong>' . $block_obj[0]->getVar('bid') . '</strong>'
+                            '<strong>'.$block_obj[0]->getVar('bid').'</strong>'
                         );
 
                         if (0 == $blockmodulelink_handler->getCount(new Criteria('block_id', $block_obj[0]->getVar('bid')))) {
@@ -926,38 +926,38 @@ 
                             $tplfile_new->setVar('tpl_lastmodified', time());
                             $tplfile_new->setVar('tpl_lastimported', 0);
                             if (!$tplfile_handler->insertTpl($tplfile_new)) {
-                                $this->trace[]['sub'] = '<span class="red">' . sprintf(
+                                $this->trace[]['sub'] = '<span class="red">'.sprintf(
                                     SystemLocale::EF_TEMPLATE_NOT_UPDATED,
-                                    '<strong>' . $block['template'] . '</strong>'
-                                ) . '</span>';
+                                    '<strong>'.$block['template'].'</strong>'
+                                ).'</span>';
                             } else {
                                 $this->trace[]['sub'] = sprintf(
                                     SystemLocale::SF_TEMPLATE_UPDATED,
-                                    '<strong>' . $block['template'] . '</strong>'
+                                    '<strong>'.$block['template'].'</strong>'
                                 );
                                 if ($module->getVar('dirname') === 'system') {
                                     if (!$xoops->templateTouch($tplfile_new->getVar('tpl_id'))) {
-                                        $this->trace[]['sub'] = '<span class="red">' . sprintf(
+                                        $this->trace[]['sub'] = '<span class="red">'.sprintf(
                                             SystemLocale::EF_TEMPLATE_NOT_RECOMPILED,
-                                            '<strong>' . $block['template'] . '</strong>'
-                                        ) . '</span>';
+                                            '<strong>'.$block['template'].'</strong>'
+                                        ).'</span>';
                                     } else {
                                         $this->trace[]['sub'] = sprintf(
                                             SystemLocale::SF_TEMPLATE_RECOMPILED,
-                                            '<strong>' . $block['template'] . '</strong>'
+                                            '<strong>'.$block['template'].'</strong>'
                                         );
                                     }
                                 } else {
                                     if ($xoops->config['template_set'] === 'default') {
                                         if (!$xoops->templateTouch($tplfile_new->getVar('tpl_id'))) {
-                                            $this->trace[]['sub'] = '<span class="red">' . sprintf(
+                                            $this->trace[]['sub'] = '<span class="red">'.sprintf(
                                                 SystemLocale::EF_TEMPLATE_NOT_RECOMPILED,
-                                                '<strong>' . $block['template'] . '</strong>'
-                                            ) . '</span>';
+                                                '<strong>'.$block['template'].'</strong>'
+                                            ).'</span>';
                                         } else {
                                             $this->trace[]['sub'] = sprintf(
                                                 SystemLocale::SF_TEMPLATE_RECOMPILED,
-                                                '<strong>' . $block['template'] . '</strong>'
+                                                '<strong>'.$block['template'].'</strong>'
                                             );
                                         }
                                     }
@@ -975,20 +975,20 @@ 
                 || !in_array($block->getVar('func_file'), $funcfiles)
             ) {
                 if (!$block_handler->delete($block)) {
-                    $this->trace[]['sub'] = '<span class="red">' . sprintf(
+                    $this->trace[]['sub'] = '<span class="red">'.sprintf(
                         SystemLocale::EF_BLOCK_NOT_DELETED,
-                        "<strong>" . $block->getVar('name') . "</strong>"
-                    ) . sprintf(
+                        "<strong>".$block->getVar('name')."</strong>"
+                    ).sprintf(
                         SystemLocale::F_BLOCK_ID,
-                        "<strong>" . $block->getVar('bid') . "</strong>"
-                    ) . '</span>';
+                        "<strong>".$block->getVar('bid')."</strong>"
+                    ).'</span>';
                 } else {
                     $this->trace[]['sub'] = sprintf(
                         SystemLocale::SF_BLOCK_DELETED,
-                        '<strong>' . $block->getVar('name') . '</strong>'
-                    ) . '&nbsp;' . sprintf(
+                        '<strong>'.$block->getVar('name').'</strong>'
+                    ).'&nbsp;'.sprintf(
                         SystemLocale::F_BLOCK_ID,
-                        '<strong>' . $block->getVar('bid') . '</strong>'
+                        '<strong>'.$block->getVar('bid').'</strong>'
                     );
                     if ($block->getVar('template') != '') {
                         $tplfiles = $tplfile_handler->find(null, 'block', $block->getVar('bid'));
@@ -998,11 +998,11 @@ 
                                 if (!$tplfile_handler->deleteTpl($tplfile)) {
                                     $this->trace[]['sub'] = '<span class="red">'
                                         . SystemLocale::E_BLOCK_TEMPLATE_DEPRECATED_NOT_REMOVED
-                                        . '(ID: <strong>' . $tplfile->getVar('tpl_id') . '</strong>)</span>';
+                                        . '(ID: <strong>'.$tplfile->getVar('tpl_id').'</strong>)</span>';
                                 } else {
                                     $this->trace[]['sub'] = sprintf(
                                         SystemLocale::SF_BLOCK_TEMPLATE_DEPRECATED,
-                                        "<strong>" . $tplfile->getVar('tpl_file') . "</strong>"
+                                        "<strong>".$tplfile->getVar('tpl_file')."</strong>"
                                     );
                                 }
                             }
@@ -1031,20 +1031,20 @@ 
             /* @var $block XoopsBlock */
             foreach ($blocks as $block) {
                 if (false === $block_handler->deleteBlock($block)) {
-                    $this->trace[]['sub'] = '<span class="red">' . sprintf(
+                    $this->trace[]['sub'] = '<span class="red">'.sprintf(
                         SystemLocale::EF_BLOCK_NOT_DELETED,
-                        "<strong>" . $block->getVar('name') . "</strong>"
-                    ) . sprintf(
+                        "<strong>".$block->getVar('name')."</strong>"
+                    ).sprintf(
                         SystemLocale::F_BLOCK_ID,
-                        "<strong>" . $block->getVar('bid') . "</strong>"
-                    ) . '</span>';
+                        "<strong>".$block->getVar('bid')."</strong>"
+                    ).'</span>';
                 } else {
                     $this->trace[]['sub'] = sprintf(
                         SystemLocale::SF_BLOCK_DELETED,
-                        "<strong>" . $block->getVar('name') . "</strong>"
-                    ) . sprintf(
+                        "<strong>".$block->getVar('name')."</strong>"
+                    ).sprintf(
                         SystemLocale::F_BLOCK_ID,
-                        "<strong>" . $block->getVar('bid') . "</strong>"
+                        "<strong>".$block->getVar('bid')."</strong>"
                     );
                 }
                 if ($block->getVar('template') != '') {
@@ -1052,20 +1052,20 @@ 
                     /* @var $template XoopsTplFile */
                     foreach ($templates as $template) {
                         if (!$tplfile_handler->delete($template)) {
-                            $this->trace[]['sub'] = '<span class="red">' . sprintf(
+                            $this->trace[]['sub'] = '<span class="red">'.sprintf(
                                 SystemLocale::EF_BLOCK_TEMPLATE_NOT_DELETED,
                                 $template->getVar('tpl_file')
-                            ) . sprintf(
+                            ).sprintf(
                                 SystemLocale::F_TEMPLATE_ID,
-                                "<strong>" . $template->getVar('tpl_id') . "</strong>"
-                            ) . '</span>';
+                                "<strong>".$template->getVar('tpl_id')."</strong>"
+                            ).'</span>';
                         } else {
                             $this->trace[]['sub'] = sprintf(
                                 SystemLocale::SF_BLOCK_TEMPLATE_DELETED,
-                                "<strong>" . $template->getVar('tpl_file') . "</strong>"
-                            ) . sprintf(
+                                "<strong>".$template->getVar('tpl_file')."</strong>"
+                            ).sprintf(
                                 SystemLocale::F_TEMPLATE_ID,
-                                "<strong>" . $template->getVar('tpl_id') . "</strong>"
+                                "<strong>".$template->getVar('tpl_id')."</strong>"
                             );
                         }
                     }
@@ -1095,7 +1095,7 @@ 
                 if (!$config_handler->deleteConfig($config)) {
                     $this->trace[]['sub'] = '<span class="red">'
                         . SystemLocale::E_CONFIG_DATA_NOT_DELETED
-                        . sprintf(SystemLocale::F_CONFIG_ID, "<strong>" . $config->getVar('conf_id') . "</strong>")
+                        . sprintf(SystemLocale::F_CONFIG_ID, "<strong>".$config->getVar('conf_id')."</strong>")
                         . '</span>';
                     // save the name of config failed to delete for later use
                     $this->config_delng[] = $config->getVar('conf_name');
@@ -1104,7 +1104,7 @@ 
                     $this->config_old[$config->getVar('conf_name')]['formtype'] = $config->getVar('conf_formtype');
                     $this->config_old[$config->getVar('conf_name')]['valuetype'] = $config->getVar('conf_valuetype');
                     $this->trace[]['sub'] = SystemLocale::S_CONFIG_DATA_DELETED
-                        . sprintf(SystemLocale::F_CONFIG_ID, "<strong>" . $config->getVar('conf_id') . "</strong>");
+                        . sprintf(SystemLocale::F_CONFIG_ID, "<strong>".$config->getVar('conf_id')."</strong>");
                 }
             }
         }
@@ -1170,7 +1170,7 @@ 
                             $confop_msgs .= ' <strong>'
                                 . \Xoops\Locale::translate($key, $module->getVar('dirname'))
                                 . '</strong> ';
-                            $confop_msgs .= XoopsLocale::C_VALUE . ' <strong>' . $value . '</strong> ';
+                            $confop_msgs .= XoopsLocale::C_VALUE.' <strong>'.$value.'</strong> ';
                             unset($confop);
                         }
                     }
@@ -1178,11 +1178,11 @@ 
                     if (false != $config_handler->insertConfig($confobj)) {
                         $this->trace[]['sub'] = sprintf(
                             SystemLocale::SF_CONFIG_ADDED,
-                            "<strong>" . $config['name'] . "</strong>"
-                        ) . $confop_msgs;
+                            "<strong>".$config['name']."</strong>"
+                        ).$confop_msgs;
                     } else {
                         $this->trace[]['sub'] = '<span class="red">'
-                            . sprintf(SystemLocale::EF_CONFIG_NOT_ADDED, "<strong>" . $config['name'] . "</strong>")
+                            . sprintf(SystemLocale::EF_CONFIG_NOT_ADDED, "<strong>".$config['name']."</strong>")
                             . '</span>';
                     }
                     unset($confobj);
@@ -1210,7 +1210,7 @@ 
             return;
         }
         $xoops = Xoops::getInstance();
-        $base_dir = $xoops->path('modules/' . $module->getVar('dirname') . '/src');
+        $base_dir = $xoops->path('modules/'.$module->getVar('dirname').'/src');
         $loader = new Psr4ClassLoader;
         $loader->register();
         $loader->addNamespace($prefix, $base_dir);

htdocs/include/common.php

Spacing +16 added lines, -16 removed lines

@@ -28,27 +28,27 @@ 
  * Temporarily try and fix, but set up a (delayed) warning
  */
 if (!class_exists('XoopsLoad', false)) {
-    require_once dirname(__DIR__). '/class/XoopsBaseConfig.php';
+    require_once dirname(__DIR__).'/class/XoopsBaseConfig.php';
     XoopsBaseConfig::bootstrapTransition();
     $delayedWarning = 'Patch mainfile.php for XoopsBaseConfig';
 }
 
 global $xoops;
-$GLOBALS['xoops'] =& $xoops;
+$GLOBALS['xoops'] = & $xoops;
 
 //Legacy support
 global $xoopsDB;
-$GLOBALS['xoopsDB'] =& $xoopsDB;
+$GLOBALS['xoopsDB'] = & $xoopsDB;
 /**
  * YOU SHOULD NEVER USE THE FOLLOWING TO CONSTANTS, THEY WILL BE REMOVED
  */
 defined('DS') or define('DS', DIRECTORY_SEPARATOR);
-defined('NWLINE')or define('NWLINE', "\n");
+defined('NWLINE') or define('NWLINE', "\n");
 
 /**
  * Include files with definitions
  */
-include_once __DIR__ . '/defines.php';
+include_once __DIR__.'/defines.php';
 // include_once __DIR__ . '/version.php';
 
 /**
@@ -64,7 +64,7 @@ 
  */
 $xoops = Xoops::getInstance();
 
-$xoops->option =& $GLOBALS['xoopsOption'];
+$xoops->option = & $GLOBALS['xoopsOption'];
 
 /**
  * Create Instance Xoops\Core\Logger Object, the logger manager
@@ -86,7 +86,7 @@ 
 //$xoops->cache()->delete($key);
 $autoloadPrefixDirList = $xoops->cache()->cacheRead(
     $key,
-    function () use ($xoops) {
+    function() use ($xoops) {
         try {
             $criteria = new CriteriaCompo(new Criteria('isactive', 1));
             $criteria->add(new Criteria('namespace', '', '!='));
@@ -99,7 +99,7 @@ 
         /** @var XoopsObject $almod */
         foreach ($autoloadModules as $almod) {
             $prefix = $almod->getVar('namespace');
-            $base_dir = $xoops->path('modules/' . $almod->getVar('dirname') . '/src');
+            $base_dir = $xoops->path('modules/'.$almod->getVar('dirname').'/src');
             $autoloadPrefixDirList[] = [$prefix, $base_dir];
         }
         return $autoloadPrefixDirList;
@@ -158,7 +158,7 @@ 
  * Requires functions and database loaded
  */
 $xoops->getConfigs();
-$xoopsConfig =& $xoops->config;
+$xoopsConfig = & $xoops->config;
 
 /**
  * Merge file and db configs.
@@ -167,7 +167,7 @@ 
     $xoops->addConfigs(include $file);
     unset($file);
 } else {
-    trigger_error('File Path Error: ' . 'var/configs/system_configs.php' . ' does not exist.');
+    trigger_error('File Path Error: '.'var/configs/system_configs.php'.' does not exist.');
 }
 
 $xoops->events()->triggerEvent('core.include.common.configs.success');
@@ -184,7 +184,7 @@ 
 $xFrameOptions = $xoopsConfig['xFrameOptions'] ?? 'sameorigin';
 $xoops->events()->triggerEvent('core.include.common.xframeoption');
 if (!headers_sent() && !empty($xFrameOptions)) {
-    header('X-Frame-Options: ' .$xFrameOptions);
+    header('X-Frame-Options: '.$xFrameOptions);
 }
 
 /**
@@ -265,7 +265,7 @@ 
     } else {
         if (!$moduleperm_handler->checkRight('module_read', $xoops->module->getVar('mid'), FixedGroups::ANONYMOUS)) {
             $xoops->redirect(
-                $xoops_url . '/user.php?from=' . $xoops->module->getVar('dirname', 'n'),
+                $xoops_url.'/user.php?from='.$xoops->module->getVar('dirname', 'n'),
                 1,
                 XoopsLocale::E_NO_ACCESS_PERMISSION
             );
@@ -291,10 +291,10 @@ 
 
 $xoopsTpl = $xoops->tpl();
 $xoTheme = null;
-$xoopsUser =& $xoops->user;
-$xoopsModule =& $xoops->module;
-$xoopsUserIsAdmin =& $xoops->userIsAdmin;
-$xoopsModuleConfig =& $xoops->moduleConfig;
+$xoopsUser = & $xoops->user;
+$xoopsModule = & $xoops->module;
+$xoopsUserIsAdmin = & $xoops->userIsAdmin;
+$xoopsModuleConfig = & $xoops->moduleConfig;
 
 //Creates 'system_modules_active' cache file if it has been deleted.
 $xoops->getActiveModules();

xoops_lib/Xoops/Core/Kernel/Handlers/XoopsModule.php

Spacing +11 added lines, -11 removed lines

@@ -105,12 +105,12 @@ 
         $this->setVar('version', (int)(100 * ($this->modinfo['version'] + 0.001)));
         $this->setVar('dirname', $this->modinfo['dirname']);
 
-        $this->setVar('hasmain', (bool) $modInfoArray->get('hasmain', false));
-        $this->setVar('hasadmin', (bool) $modInfoArray->get('hasadmin', false));
-        $this->setVar('hassearch', (bool) $modInfoArray->get('hassearch', false));
-        $this->setVar('hasconfig', ($modInfoArray->has('config') && is_array($modInfoArray->get('config'))) || (bool) $modInfoArray->get('hascomments', false));
-        $this->setVar('hascomments', (bool) $modInfoArray->get('hascomments', false));
-        $this->setVar('hasnotification', (bool) $modInfoArray->get('hasnotification', false));
+        $this->setVar('hasmain', (bool)$modInfoArray->get('hasmain', false));
+        $this->setVar('hasadmin', (bool)$modInfoArray->get('hasadmin', false));
+        $this->setVar('hassearch', (bool)$modInfoArray->get('hassearch', false));
+        $this->setVar('hasconfig', ($modInfoArray->has('config') && is_array($modInfoArray->get('config'))) || (bool)$modInfoArray->get('hascomments', false));
+        $this->setVar('hascomments', (bool)$modInfoArray->get('hascomments', false));
+        $this->setVar('hasnotification', (bool)$modInfoArray->get('hasnotification', false));
         $this->setVar('namespace', $modInfoArray->get('namespace'));
         $this->setVar('category', $modInfoArray->get('category'));
     }
@@ -185,8 +185,8 @@ 
     public function mainLink()
     {
         if ($this->getVar('hasmain') == 1) {
-            $ret = '<a href="' . $this->xoops_url . '/modules/' . $this->getVar('dirname') . '/">'
-                . $this->getVar('name') . '</a>';
+            $ret = '<a href="'.$this->xoops_url.'/modules/'.$this->getVar('dirname').'/">'
+                . $this->getVar('name').'</a>';
             return $ret;
         }
         return false;
@@ -203,7 +203,7 @@ 
         if ($this->getInfo('sub') && is_array($this->getInfo('sub'))) {
             foreach ($this->getInfo('sub') as $submenu) {
                 $ret[] = array(
-                    'name' => $submenu['name'] ,
+                    'name' => $submenu['name'],
                     'url' => $submenu['url']);
             }
         }
@@ -217,7 +217,7 @@ 
      */
     public function loadAdminMenu()
     {
-        $file = $this->xoops_root_path . '/modules/' . $this->getInfo('dirname') . '/' . $this->getInfo('adminmenu');
+        $file = $this->xoops_root_path.'/modules/'.$this->getInfo('dirname').'/'.$this->getInfo('adminmenu');
         if ($this->getInfo('adminmenu') && $this->getInfo('adminmenu') != '' && \XoopsLoad::fileExists($file)) {
             $adminmenu = array();
             include $file;
@@ -264,7 +264,7 @@ 
         $xoops->loadLanguage('modinfo', $dirname);
         $xoops->loadLocale($dirname);
 
-        if (!\XoopsLoad::fileExists($file = $xoops->path('modules/' . $dirname . '/xoops_version.php'))) {
+        if (!\XoopsLoad::fileExists($file = $xoops->path('modules/'.$dirname.'/xoops_version.php'))) {
             if (false != $verbose) {
                 echo "Module File for $dirname Not Found!";
             }