mambax7 / altsys

xoops_trust_path/libs/altsys/mymenusub/myblocksadmin.php

Spacing +25 added lines, -25 removed lines

@@ -1,61 +1,61 @@
 <?php
 
-if (! defined('XOOPS_ROOT_PATH')) {
-    exit ;
+if (!defined('XOOPS_ROOT_PATH')) {
+    exit;
 }
 
-$core_type = altsys_get_core_type() ;
-$db =& XoopsDatabaseFactory::getDatabaseConnection() ;
+$core_type = altsys_get_core_type();
+$db = & XoopsDatabaseFactory::getDatabaseConnection();
 
-$current_dirname = preg_replace('/[^0-9a-zA-Z_-]/', '', @$_GET['dirname']) ;
+$current_dirname = preg_replace('/[^0-9a-zA-Z_-]/', '', @$_GET['dirname']);
 if ($current_dirname == '__CustomBlocks__') {
-    return ;
+    return;
 }
 
-    $module_handler4menu =& xoops_gethandler('module');
+    $module_handler4menu = & xoops_gethandler('module');
     $criteria4menu = new CriteriaCompo(new Criteria('isactive', 1));
     //$criteria4menu->add(new Criteria('hasmain', 1));
     $criteria4menu->add(new Criteria('mid', '1', '>'));
-    $modules4menu =& $module_handler4menu->getObjects($criteria4menu, true);
-    $system_module =& $module_handler4menu->get(1) ;
+    $modules4menu = & $module_handler4menu->getObjects($criteria4menu, true);
+    $system_module = & $module_handler4menu->get(1);
     if (is_object($system_module)) {
-        array_unshift($modules4menu, $system_module) ;
+        array_unshift($modules4menu, $system_module);
     }
 
-$adminmenu = array() ;
+$adminmenu = array();
 foreach ($modules4menu as $m4menu) {
     // get block info
     if ($core_type != ALTSYS_CORE_TYPE_X22) {
-        list($block_count_all) = $db->fetchRow($db->query('SELECT COUNT(*) FROM ' . $db->prefix('newblocks') . ' WHERE mid=' . $m4menu->getVar('mid'))) ;
-        list($block_count_visible) = $db->fetchRow($db->query('SELECT COUNT(*) FROM ' . $db->prefix('newblocks') . ' WHERE mid=' . $m4menu->getVar('mid') . ' AND visible>0')) ;
+        list($block_count_all) = $db->fetchRow($db->query('SELECT COUNT(*) FROM '.$db->prefix('newblocks').' WHERE mid='.$m4menu->getVar('mid')));
+        list($block_count_visible) = $db->fetchRow($db->query('SELECT COUNT(*) FROM '.$db->prefix('newblocks').' WHERE mid='.$m4menu->getVar('mid').' AND visible>0'));
         // $block_desc = " $block_count_all($block_count_visible)" ;
-        $block_desc = " ($block_count_visible/$block_count_all)" ;
+        $block_desc = " ($block_count_visible/$block_count_all)";
     } else {
-        $block_desc = '' ;
+        $block_desc = '';
     }
 
     if ($m4menu->getVar('dirname') == $current_dirname) {
         $adminmenu[] = array(
-            'selected' => true ,
-            'title' => $m4menu->getVar('name', 'n') . $block_desc ,
+            'selected' => true,
+            'title' => $m4menu->getVar('name', 'n').$block_desc,
             'link' => '?mode=admin&lib=altsys&page=myblocksadmin&dirname='.$m4menu->getVar('dirname', 'n')
-        ) ;
+        );
         //$GLOBALS['altsysXoopsBreadcrumbs'][] = array( 'name' => $m4menu->getVar('name') ) ;
     } else {
         $adminmenu[] = array(
-            'selected' => false ,
-            'title' => $m4menu->getVar('name', 'n') . $block_desc ,
+            'selected' => false,
+            'title' => $m4menu->getVar('name', 'n').$block_desc,
             'link' => '?mode=admin&lib=altsys&page=myblocksadmin&dirname='.$m4menu->getVar('dirname', 'n')
-        ) ;
+        );
     }
 }
 
 
 // display
-require_once XOOPS_TRUST_PATH.'/libs/altsys/class/D3Tpl.class.php' ;
-$tpl = new D3Tpl() ;
+require_once XOOPS_TRUST_PATH.'/libs/altsys/class/D3Tpl.class.php';
+$tpl = new D3Tpl();
 $tpl->assign(array(
     'adminmenu' => $adminmenu,
     'mypage' => 'myblocksadmin'
-)) ;
-$tpl->display('db:altsys_inc_mymenusub.html') ;
+));
+$tpl->display('db:altsys_inc_mymenusub.html');

xoops_trust_path/libs/altsys/mymenusub/mylangadmin.php

Spacing +16 added lines, -16 removed lines

@@ -1,37 +1,37 @@
 <?php
 
-if (! defined('XOOPS_ROOT_PATH')) {
-    exit ;
+if (!defined('XOOPS_ROOT_PATH')) {
+    exit;
 }
 
-$current_dirname = preg_replace('/[^0-9a-zA-Z_-]/', '', @$_GET['dirname']) ;
+$current_dirname = preg_replace('/[^0-9a-zA-Z_-]/', '', @$_GET['dirname']);
 
-$db =& XoopsDatabaseFactory::getDatabaseConnection() ;
-$mrs = $db->query('SELECT m.name,m.dirname,COUNT(l.mid) FROM ' . $db->prefix('modules') . ' m LEFT JOIN ' . $db->prefix('altsys_language_constants') . ' l ON m.mid=l.mid WHERE m.isactive GROUP BY m.mid ORDER BY m.weight,m.mid') ;
+$db = & XoopsDatabaseFactory::getDatabaseConnection();
+$mrs = $db->query('SELECT m.name,m.dirname,COUNT(l.mid) FROM '.$db->prefix('modules').' m LEFT JOIN '.$db->prefix('altsys_language_constants').' l ON m.mid=l.mid WHERE m.isactive GROUP BY m.mid ORDER BY m.weight,m.mid');
 
-$adminmenu = array() ;
+$adminmenu = array();
 while (list($name, $dirname, $count) = $db->fetchRow($mrs)) {
     if ($dirname == $current_dirname) {
         $adminmenu[] = array(
-            'selected' => true ,
-            'title' => $name . " ($count)" ,
+            'selected' => true,
+            'title' => $name." ($count)",
             'link' => '?mode=admin&lib=altsys&page=mylangadmin&dirname='.$dirname
-        ) ;
+        );
         //$GLOBALS['altsysXoopsBreadcrumbs'][] = array( 'name' => htmlspecialchars( $name , ENT_QUOTES ) ) ;
     } else {
         $adminmenu[] = array(
-            'selected' => false ,
-            'title' => $name . " ($count)" ,
+            'selected' => false,
+            'title' => $name." ($count)",
             'link' => '?mode=admin&lib=altsys&page=mylangadmin&dirname='.$dirname
-        ) ;
+        );
     }
 }
 
 // display
-require_once XOOPS_TRUST_PATH.'/libs/altsys/class/D3Tpl.class.php' ;
-$tpl = new D3Tpl() ;
+require_once XOOPS_TRUST_PATH.'/libs/altsys/class/D3Tpl.class.php';
+$tpl = new D3Tpl();
 $tpl->assign(array(
     'adminmenu' => $adminmenu,
     'mypage' => 'mylangadmin'
-)) ;
-$tpl->display('db:altsys_inc_mymenusub.html') ;
+));
+$tpl->display('db:altsys_inc_mymenusub.html');

xoops_trust_path/libs/altsys/mymenusub/mytplsadmin.php

Spacing +21 added lines, -21 removed lines

@@ -1,56 +1,56 @@
 <?php
 
-if (! defined('XOOPS_ROOT_PATH')) {
-    exit ;
+if (!defined('XOOPS_ROOT_PATH')) {
+    exit;
 }
 
-$current_dirname = preg_replace('/[^0-9a-zA-Z_-]/', '', @$_GET['dirname']) ;
+$current_dirname = preg_replace('/[^0-9a-zA-Z_-]/', '', @$_GET['dirname']);
 
-$db =& XoopsDatabaseFactory::getDatabaseConnection() ;
+$db = & XoopsDatabaseFactory::getDatabaseConnection();
 
 // get custom templates
-list($count) = $db->fetchRow($db->query('SELECT COUNT(t.tpl_module) AS tpl_count FROM ' . $db->prefix('tplfile') . " t WHERE t.tpl_type='custom'")) ;
+list($count) = $db->fetchRow($db->query('SELECT COUNT(t.tpl_module) AS tpl_count FROM '.$db->prefix('tplfile')." t WHERE t.tpl_type='custom'"));
 if ($current_dirname == '_custom') {
     //	$GLOBALS['altsysXoopsBreadcrumbs'][] = array( 'name' => _MYTPLSADMIN_CUSTOMTEMPLATE ) ;
-    $custom_selected = true ;
+    $custom_selected = true;
 } else {
-    $custom_selected = false ;
+    $custom_selected = false;
 }
 
 $adminmenu = array(
     array(
-        'selected' => $custom_selected ,
-        'title' => _MYTPLSADMIN_CUSTOMTEMPLATE . " ($count)" ,
+        'selected' => $custom_selected,
+        'title' => _MYTPLSADMIN_CUSTOMTEMPLATE." ($count)",
         'link' => '?mode=admin&lib=altsys&page=mytplsadmin&dirname=_custom'
     )
-) ;
+);
 
 // get modules/templates
-$mrs = $db->query('SELECT m.name,m.dirname,COUNT(t.tpl_module) AS tpl_count FROM ' . $db->prefix('modules') . ' m LEFT JOIN ' . $db->prefix('tplfile') . ' t ON m.dirname=t.tpl_module WHERE m.isactive GROUP BY m.mid HAVING tpl_count>0 ORDER BY m.weight,m.mid') ;
+$mrs = $db->query('SELECT m.name,m.dirname,COUNT(t.tpl_module) AS tpl_count FROM '.$db->prefix('modules').' m LEFT JOIN '.$db->prefix('tplfile').' t ON m.dirname=t.tpl_module WHERE m.isactive GROUP BY m.mid HAVING tpl_count>0 ORDER BY m.weight,m.mid');
 
 // module loop
 while (list($name, $dirname, $count) = $db->fetchRow($mrs)) {
     if ($dirname == $current_dirname) {
         $adminmenu[] = array(
-            'selected' => true ,
-            'title' => $name . " ($count)" ,
+            'selected' => true,
+            'title' => $name." ($count)",
             'link' => '?mode=admin&lib=altsys&page=mytplsadmin&dirname='.$dirname
-        ) ;
+        );
         //$GLOBALS['altsysXoopsBreadcrumbs'][] = array( 'name' => htmlspecialchars( $name , ENT_QUOTES ) ) ;
     } else {
         $adminmenu[] = array(
-            'selected' => false ,
-            'title' => $name . " ($count)" ,
+            'selected' => false,
+            'title' => $name." ($count)",
             'link' => '?mode=admin&lib=altsys&page=mytplsadmin&dirname='.$dirname
-        ) ;
+        );
     }
 }
 
 // display
-require_once XOOPS_TRUST_PATH.'/libs/altsys/class/D3Tpl.class.php' ;
-$tpl = new D3Tpl() ;
+require_once XOOPS_TRUST_PATH.'/libs/altsys/class/D3Tpl.class.php';
+$tpl = new D3Tpl();
 $tpl->assign(array(
     'adminmenu' => $adminmenu,
     'mypage' => 'mytplsadmin'
-)) ;
-$tpl->display('db:altsys_inc_mymenusub.html') ;
+));
+$tpl->display('db:altsys_inc_mymenusub.html');

xoops_trust_path/libs/altsys/put_templates.php

Spacing +37 added lines, -37 removed lines

@@ -5,25 +5,25 @@ 
 //                        GIJOE <http://www.peak.ne.jp/>                     //
 // ------------------------------------------------------------------------- //
 
-include_once __DIR__.'/include/gtickets.php' ;
-include_once __DIR__.'/include/altsys_functions.php' ;
-include_once __DIR__.'/include/tpls_functions.php' ;
+include_once __DIR__.'/include/gtickets.php';
+include_once __DIR__.'/include/altsys_functions.php';
+include_once __DIR__.'/include/tpls_functions.php';
 
 
 // this page can be called only from altsys
 if ($xoopsModule->getVar('dirname') != 'altsys') {
-    die('this page can be called only from altsys') ;
+    die('this page can be called only from altsys');
 }
 
 
 // language file
-altsys_include_language_file('compilehookadmin') ;
+altsys_include_language_file('compilehookadmin');
 
 
-$db =& XoopsDatabaseFactory::getDatabaseConnection() ;
+$db = & XoopsDatabaseFactory::getDatabaseConnection();
 
-if (empty($_FILES['tplset_archive']['tmp_name']) || ! is_uploaded_file($_FILES['tplset_archive']['tmp_name'])) {
-    die(_TPLSADMIN_ERR_NOTUPLOADED) ;
+if (empty($_FILES['tplset_archive']['tmp_name']) || !is_uploaded_file($_FILES['tplset_archive']['tmp_name'])) {
+    die(_TPLSADMIN_ERR_NOTUPLOADED);
 }
 //fix for mb_http_output setting and for add any browsers
     if (function_exists('mb_http_output')) {
@@ -32,7 +32,7 @@ 
 //ob_buffer over flow
 //HACK by suin & nao-pon 2012/01/06
     while (ob_get_level() > 0) {
-        if (! ob_end_clean()) {
+        if (!ob_end_clean()) {
             break;
         }
     }
@@ -41,62 +41,62 @@ 
 // EXTRACT STAGE
 //
 
-$orig_filename4check = strtolower($_FILES['tplset_archive']['name']) ;
+$orig_filename4check = strtolower($_FILES['tplset_archive']['name']);
 if (strtolower(substr($orig_filename4check, -4)) == '.zip') {
 
     // zip
-    require_once __DIR__.'/include/Archive_Zip.php' ;
-    $reader = new Archive_Zip($_FILES['tplset_archive']['tmp_name']) ;
-    $files = $reader->extract(array( 'extract_as_string' => true )) ;
-    if (! is_array(@$files)) {
-        die($reader->errorName()) ;
+    require_once __DIR__.'/include/Archive_Zip.php';
+    $reader = new Archive_Zip($_FILES['tplset_archive']['tmp_name']);
+    $files = $reader->extract(array('extract_as_string' => true));
+    if (!is_array(@$files)) {
+        die($reader->errorName());
     }
-    $do_upload = true ;
+    $do_upload = true;
 } elseif (substr($orig_filename4check, -4) == '.tgz' || substr($orig_filename4check, -7) == '.tar.gz') {
 
     // tar.gz
-    require_once XOOPS_ROOT_PATH.'/class/class.tar.php' ;
-    $tar = new tar() ;
-    $tar->openTAR($_FILES['tplset_archive']['tmp_name']) ;
-    $files = array() ;
+    require_once XOOPS_ROOT_PATH.'/class/class.tar.php';
+    $tar = new tar();
+    $tar->openTAR($_FILES['tplset_archive']['tmp_name']);
+    $files = array();
     foreach ($tar->files as $id => $info) {
         $files[] = array(
-            'filename' => $info['name'] ,
-            'mtime' => $info['time'] ,
+            'filename' => $info['name'],
+            'mtime' => $info['time'],
             'content' => $info['file']
-        ) ;
+        );
     }
     if (empty($files)) {
-        die(_TPLSADMIN_ERR_INVALIDARCHIVE) ;
+        die(_TPLSADMIN_ERR_INVALIDARCHIVE);
     }
-    $do_upload = true ;
+    $do_upload = true;
 }
 
 if (empty($do_upload)) {
-    die(_TPLSADMIN_ERR_EXTENSION) ;
+    die(_TPLSADMIN_ERR_EXTENSION);
 }
 
 //
 // IMPORT STAGE
 //
 
-$tplset = @$_POST['tplset'] ;
-if (! preg_match('/^[0-9A-Za-z_-]{1,16}$/', $tplset)) {
-    die(_TPLSADMIN_ERR_INVALIDTPLSET) ;
+$tplset = @$_POST['tplset'];
+if (!preg_match('/^[0-9A-Za-z_-]{1,16}$/', $tplset)) {
+    die(_TPLSADMIN_ERR_INVALIDTPLSET);
 }
 
-$imported = 0 ;
+$imported = 0;
 foreach ($files as $file) {
-    if (! empty($file['folder'])) {
-        continue ;
+    if (!empty($file['folder'])) {
+        continue;
     }
-    $pos = strrpos($file['filename'], '/') ;
-    $tpl_file = $pos === false ? $file['filename'] : substr($file['filename'], $pos + 1) ;
+    $pos = strrpos($file['filename'], '/');
+    $tpl_file = $pos === false ? $file['filename'] : substr($file['filename'], $pos + 1);
 
     if (tplsadmin_import_data($tplset, $tpl_file, rtrim($file['content']), $file['mtime'])) {
-        $imported ++ ;
+        $imported++;
     }
 }
 
-redirect_header('?mode=admin&lib=altsys&page=compilehookadmin', 3, sprintf(_TPLSADMIN_FMT_MSG_PUTTEMPLATES, $imported)) ;
-exit ;
+redirect_header('?mode=admin&lib=altsys&page=compilehookadmin', 3, sprintf(_TPLSADMIN_FMT_MSG_PUTTEMPLATES, $imported));
+exit;

xoops_trust_path/libs/altsys/onuninstall.php

Spacing +16 added lines, -16 removed lines

@@ -1,35 +1,35 @@ 
 <?php
 
-eval(' function xoops_module_uninstall_'.$mydirname.'( $module ) { return altsys_onuninstall_base( $module , "'.$mydirname.'" ) ; } ') ;
+eval(' function xoops_module_uninstall_'.$mydirname.'( $module ) { return altsys_onuninstall_base( $module , "'.$mydirname.'" ) ; } ');
 
 
-if (! function_exists('altsys_onuninstall_base')) {
+if (!function_exists('altsys_onuninstall_base')) {
     function altsys_onuninstall_base($module, $mydirname)
     {
         // transations on module uninstall
 
-    global $ret ; // TODO :-D
+    global $ret; // TODO :-D
 
     // for Cube 2.1
     if (defined('XOOPS_CUBE_LEGACY')) {
-        $root =& XCube_Root::getSingleton();
-        $root->mDelegateManager->add('Legacy.Admin.Event.ModuleUninstall.' . ucfirst($mydirname) . '.Success', 'altsys_message_append_onuninstall') ;
-        $ret = array() ;
+        $root = & XCube_Root::getSingleton();
+        $root->mDelegateManager->add('Legacy.Admin.Event.ModuleUninstall.'.ucfirst($mydirname).'.Success', 'altsys_message_append_onuninstall');
+        $ret = array();
     } else {
-        if (! is_array($ret)) {
-            $ret = array() ;
+        if (!is_array($ret)) {
+            $ret = array();
         }
     }
 
-        $db =& XoopsDatabaseFactory::getDatabaseConnection() ;
-        $mid = $module->getVar('mid') ;
+        $db = & XoopsDatabaseFactory::getDatabaseConnection();
+        $mid = $module->getVar('mid');
 
     // TABLES (loading mysql.sql)
-    $sql_file_path = __DIR__.'/sql/mysql.sql' ;
-        $prefix_mod = $db->prefix() . '_' . $mydirname ;
+    $sql_file_path = __DIR__.'/sql/mysql.sql';
+        $prefix_mod = $db->prefix().'_'.$mydirname;
         if (file_exists($sql_file_path)) {
-            $ret[] = 'SQL file found at <b>' . htmlspecialchars($sql_file_path) . '</b>.<br  /> Deleting tables...<br />';
-            $sql_lines = file($sql_file_path) ;
+            $ret[] = 'SQL file found at <b>'.htmlspecialchars($sql_file_path).'</b>.<br  /> Deleting tables...<br />';
+            $sql_lines = file($sql_file_path);
             foreach ($sql_lines as $sql_line) {
                 if (preg_match('/^CREATE TABLE \`?([a-zA-Z0-9_-]+)\`? /i', $sql_line, $regs)) {
                     $sql = 'DROP TABLE '.addslashes($prefix_mod.'_'.$regs[1]);
@@ -59,14 +59,14 @@ 
     unset($templates); */
 
 
-    return true ;
+    return true;
     }
 
     function altsys_message_append_onuninstall(&$module_obj, &$log)
     {
         if (is_array(@$GLOBALS['ret'])) {
             foreach ($GLOBALS['ret'] as $message) {
-                $log->add(strip_tags($message)) ;
+                $log->add(strip_tags($message));
             }
         }
 

xoops_trust_path/libs/altsys/mypreferences.php

Spacing +54 added lines, -54 removed lines

@@ -5,64 +5,64 @@ 
 //                     GIJOE <http://www.peak.ne.jp/>                        //
 // ------------------------------------------------------------------------- //
 
-require_once __DIR__.'/class/AltsysBreadcrumbs.class.php' ;
-include_once __DIR__.'/include/gtickets.php' ;
-include_once __DIR__.'/include/altsys_functions.php' ;
+require_once __DIR__.'/class/AltsysBreadcrumbs.class.php';
+include_once __DIR__.'/include/gtickets.php';
+include_once __DIR__.'/include/altsys_functions.php';
 
 // check access right (needs module_admin of this module)
-if (! is_object($xoopsUser) || ! is_object($xoopsModule) || ! $xoopsUser->isAdmin($xoopsModule->mid())) {
-    die('Access Denied') ;
+if (!is_object($xoopsUser) || !is_object($xoopsModule) || !$xoopsUser->isAdmin($xoopsModule->mid())) {
+    die('Access Denied');
 }
 
 
 // initials
-$db =& XoopsDatabaseFactory::getDatabaseConnection();
-(method_exists('MyTextSanitizer', 'sGetInstance') and $myts =& MyTextSanitizer::sGetInstance()) || $myts =& MyTextSanitizer::getInstance() ;
+$db = & XoopsDatabaseFactory::getDatabaseConnection();
+(method_exists('MyTextSanitizer', 'sGetInstance') and $myts = & MyTextSanitizer::sGetInstance()) || $myts = & MyTextSanitizer::getInstance();
 
 // language file
-altsys_include_language_file('mypreferences') ;
+altsys_include_language_file('mypreferences');
 
 
-$op = empty($_GET['op']) ? 'showmod' : preg_replace('/[^a-zA-Z0-9_-]/', '', $_GET['op']) ;
+$op = empty($_GET['op']) ? 'showmod' : preg_replace('/[^a-zA-Z0-9_-]/', '', $_GET['op']);
 
 if ($op == 'showmod') {
-    $config_handler =& xoops_gethandler('config');
-    $mod = $xoopsModule->mid() ;
-    $config =& $config_handler->getConfigs(new Criteria('conf_modid', $mod));
+    $config_handler = & xoops_gethandler('config');
+    $mod = $xoopsModule->mid();
+    $config = & $config_handler->getConfigs(new Criteria('conf_modid', $mod));
     $count = count($config);
     if ($count < 1) {
-        die('no configs') ;
+        die('no configs');
     }
     include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
     $form = new XoopsThemeForm(_MD_A_MYPREFERENCES_FORMTITLE, 'pref_form', 'index.php?mode=admin&lib=altsys&page=mypreferences&op=save');
-    $module_handler =& xoops_gethandler('module');
-    $module =& $module_handler->get($mod);
+    $module_handler = & xoops_gethandler('module');
+    $module = & $module_handler->get($mod);
 
     // language
-    $language = empty($xoopsConfig['language']) ? 'english' : $xoopsConfig['language'] ;
+    $language = empty($xoopsConfig['language']) ? 'english' : $xoopsConfig['language'];
 
     // load modinfo.php if necessary (judged by a specific constant is defined)
-    if (! defined('_MYMENU_CONSTANT_IN_MODINFO') || ! defined(_MYMENU_CONSTANT_IN_MODINFO)) {
+    if (!defined('_MYMENU_CONSTANT_IN_MODINFO') || !defined(_MYMENU_CONSTANT_IN_MODINFO)) {
         if (file_exists("$mydirpath/language/$language/modinfo.php")) {
             // user customized language file
-            include_once "$mydirpath/language/$language/modinfo.php" ;
+            include_once "$mydirpath/language/$language/modinfo.php";
         } elseif (file_exists("$mytrustdirpath/language/$language/modinfo.php")) {
             // default language file
-            include_once "$mytrustdirpath/language/$language/modinfo.php" ;
+            include_once "$mytrustdirpath/language/$language/modinfo.php";
         } else {
             // fallback english
-            include_once "$mytrustdirpath/language/english/modinfo.php" ;
+            include_once "$mytrustdirpath/language/english/modinfo.php";
         }
     }
 
     // if has comments feature, need comment lang file
-    if ($module->getVar('hascomments') == 1 && ! defined('_CM_TITLE')) {
+    if ($module->getVar('hascomments') == 1 && !defined('_CM_TITLE')) {
         include_once XOOPS_ROOT_PATH.'/language/'.$xoopsConfig['language'].'/comment.php';
     }
 
     // RMV-NOTIFY
     // if has notification feature, need notification lang file
-    if ($module->getVar('hasnotification') == 1 && ! defined('_NOT_NOTIFICATIONOPTIONS')) {
+    if ($module->getVar('hasnotification') == 1 && !defined('_NOT_NOTIFICATIONOPTIONS')) {
         include_once XOOPS_ROOT_PATH.'/language/'.$xoopsConfig['language'].'/notification.php';
     }
 
@@ -72,12 +72,12 @@ 
         //	$form->addElement(new XoopsFormHidden('redirect', XOOPS_URL.'/modules/'.$module->getVar('dirname').'/'.$module->getInfo('adminindex')));
     // }
     for ($i = 0; $i < $count; $i++) {
-        $title_icon = ($config[$i]->getVar('conf_valuetype') === 'encrypt')? '<img src="'.XOOPS_MODULE_URL.'/legacy/admin/theme/icons/textfield_key.png" alt="Encrypted">' : ''; // support XCL 2.2.3 'encrypt' of 'conf_valuetype'
+        $title_icon = ($config[$i]->getVar('conf_valuetype') === 'encrypt') ? '<img src="'.XOOPS_MODULE_URL.'/legacy/admin/theme/icons/textfield_key.png" alt="Encrypted">' : ''; // support XCL 2.2.3 'encrypt' of 'conf_valuetype'
         $title4tray = (!defined($config[$i]->getVar('conf_desc')) || constant($config[$i]->getVar('conf_desc')) == '') ? (constant($config[$i]->getVar('conf_title')).$title_icon) : (constant($config[$i]->getVar('conf_title')).$title_icon.'<br /><br /><span style="font-weight:normal;">'.constant($config[$i]->getVar('conf_desc')).'</span>'); // GIJ
-        $title = '' ; // GIJ
+        $title = ''; // GIJ
         switch ($config[$i]->getVar('conf_formtype')) {
         case 'textarea':
-            (method_exists('MyTextSanitizer', 'sGetInstance') and $myts =& MyTextSanitizer::sGetInstance()) || $myts =& MyTextSanitizer::getInstance();
+            (method_exists('MyTextSanitizer', 'sGetInstance') and $myts = & MyTextSanitizer::sGetInstance()) || $myts = & MyTextSanitizer::getInstance();
             if ($config[$i]->getVar('conf_valuetype') == 'array') {
                 // this is exceptional.. only when value type is arrayneed a smarter way for this
                 $ele = ($config[$i]->getVar('conf_value') != '') ? new XoopsFormTextArea($title, $config[$i]->getVar('conf_name'), $myts->htmlspecialchars(implode('|', $config[$i]->getConfValueForOutput())), 5, 50) : new XoopsFormTextArea($title, $config[$i]->getVar('conf_name'), '', 5, 50);
@@ -94,7 +94,7 @@ 
                 $ele = new XoopsFormRadio($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput());
                 $addBr = '<br />';
             }
-            $options =& $config_handler->getConfigOptions(new Criteria('conf_id', $config[$i]->getVar('conf_id')));
+            $options = & $config_handler->getConfigOptions(new Criteria('conf_id', $config[$i]->getVar('conf_id')));
             $opcount = count($options);
             for ($j = 0; $j < $opcount; $j++) {
                 $optval = defined($options[$j]->getVar('confop_value')) ? constant($options[$j]->getVar('confop_value')) : $options[$j]->getVar('confop_value');
@@ -111,7 +111,7 @@ 
                 $ele = new XoopsFormCheckBox($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput());
                 $addBr = '<br />';
             }
-            $options =& $config_handler->getConfigOptions(new Criteria('conf_id', $config[$i]->getVar('conf_id')));
+            $options = & $config_handler->getConfigOptions(new Criteria('conf_id', $config[$i]->getVar('conf_id')));
             $opcount = count($options);
             for ($j = 0; $j < $opcount; $j++) {
                 $optval = defined($options[$j]->getVar('confop_value')) ? constant($options[$j]->getVar('confop_value')) : $options[$j]->getVar('confop_value');
@@ -145,37 +145,37 @@ 
             $ele = new XoopsFormSelectUser($title, $config[$i]->getVar('conf_name'), false, $config[$i]->getConfValueForOutput(), 5, true);
             break;
         case 'password':
-            (method_exists('MyTextSanitizer', 'sGetInstance') and $myts =& MyTextSanitizer::sGetInstance()) || $myts =& MyTextSanitizer::getInstance();
+            (method_exists('MyTextSanitizer', 'sGetInstance') and $myts = & MyTextSanitizer::sGetInstance()) || $myts = & MyTextSanitizer::getInstance();
             $ele = new XoopsFormPassword($title, $config[$i]->getVar('conf_name'), 50, 255, $myts->htmlspecialchars($config[$i]->getConfValueForOutput()));
             break;
         case 'textbox':
         default:
-            (method_exists('MyTextSanitizer', 'sGetInstance') and $myts =& MyTextSanitizer::sGetInstance()) || $myts =& MyTextSanitizer::getInstance();
+            (method_exists('MyTextSanitizer', 'sGetInstance') and $myts = & MyTextSanitizer::sGetInstance()) || $myts = & MyTextSanitizer::getInstance();
             $ele = new XoopsFormText($title, $config[$i]->getVar('conf_name'), 50, 255, $myts->htmlspecialchars($config[$i]->getConfValueForOutput()));
             break;
         }
         $hidden = new XoopsFormHidden('conf_ids[]', $config[$i]->getVar('conf_id'));
-        $ele_tray = new XoopsFormElementTray($title4tray, '') ;
+        $ele_tray = new XoopsFormElementTray($title4tray, '');
         $ele_tray->addElement($ele);
         $ele_tray->addElement($hidden);
-        $form->addElement($ele_tray) ;
+        $form->addElement($ele_tray);
         unset($ele_tray);
         unset($ele);
         unset($hidden);
     }
     // $button_tray->addElement(new XoopsFormHidden('op', 'save'));
-    $xoopsGTicket->addTicketXoopsFormElement($button_tray, __LINE__, 1800, 'mypreferences') ;
+    $xoopsGTicket->addTicketXoopsFormElement($button_tray, __LINE__, 1800, 'mypreferences');
     $button_tray->addElement(new XoopsFormButton('', 'button', _GO, 'submit'));
-    $form->addElement($button_tray) ;
+    $form->addElement($button_tray);
     xoops_cp_header();
 
     // GIJ patch start
-    altsys_include_mymenu() ;
-    $breadcrumbsObj =& AltsysBreadcrumbs::getInstance() ;
+    altsys_include_mymenu();
+    $breadcrumbsObj = & AltsysBreadcrumbs::getInstance();
     if ($breadcrumbsObj->hasPaths()) {
-        $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&amp;lib=altsys&amp;page=mypreferences', _PREFERENCES) ;
+        $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&amp;lib=altsys&amp;page=mypreferences', _PREFERENCES);
     }
-    echo "<h3 style='text-align:"._GLOBAL_LEFT.";'>".$module->getvar('name').' &nbsp; '._PREFERENCES."</h3>\n" ;
+    echo "<h3 style='text-align:"._GLOBAL_LEFT.";'>".$module->getvar('name').' &nbsp; '._PREFERENCES."</h3>\n";
     // GIJ patch end
 
     $form->display();
@@ -187,10 +187,10 @@ 
     //if ( !admin_refcheck("/modules/$admin_mydirname/admin/") ) {
     //	exit('Invalid referer');
     //}
-    if (! $xoopsGTicket->check(true, 'mypreferences')) {
+    if (!$xoopsGTicket->check(true, 'mypreferences')) {
         redirect_header(XOOPS_URL.'/', 3, $xoopsGTicket->getErrors());
     }
-    require_once XOOPS_ROOT_PATH.'/class/template.php' ;
+    require_once XOOPS_ROOT_PATH.'/class/template.php';
     $xoopsTpl = new XoopsTpl();
 //HACK by domifara for new XOOPS and XCL etc.
 //old xoops
@@ -210,8 +210,8 @@ 
     $lang_updated = false;
     if ($count > 0) {
         for ($i = 0; $i < $count; $i++) {
-            $config =& $config_handler->getConfig($conf_ids[$i]);
-            $new_value =& $_POST[$config->getVar('conf_name')];
+            $config = & $config_handler->getConfig($conf_ids[$i]);
+            $new_value = & $_POST[$config->getVar('conf_name')];
             if (is_array($new_value) || $new_value != $config->getVar('conf_value')) {
                 // if language has been changed
                 if (!$lang_updated && $config->getVar('conf_catid') == XOOPS_CONF && $config->getVar('conf_name') == 'language') {
@@ -223,7 +223,7 @@ 
 
                 // if default theme has been changed
                 if (!$theme_updated && $config->getVar('conf_catid') == XOOPS_CONF && $config->getVar('conf_name') == 'theme_set') {
-                    $member_handler =& xoops_gethandler('member');
+                    $member_handler = & xoops_gethandler('member');
                     $member_handler->updateUsersByField('theme', $_POST[$config->getVar('conf_name')]);
                     $theme_updated = true;
                 }
@@ -239,14 +239,14 @@ 
 
                         // generate compiled files for the new theme
                         // block files only for now..
-                        $tplfile_handler =& xoops_gethandler('tplfile');
-                        $dtemplates =& $tplfile_handler->find('default', 'block');
+                        $tplfile_handler = & xoops_gethandler('tplfile');
+                        $dtemplates = & $tplfile_handler->find('default', 'block');
                         $dcount = count($dtemplates);
 
                         // need to do this to pass to xoops_template_touch function
                         $GLOBALS['xoopsConfig']['template_set'] = $newtplset;
 
-                        altsys_clear_templates_c() ;
+                        altsys_clear_templates_c();
 
 /*						for ($i = 0; $i < $dcount; $i++) {
                             $found =& $tplfile_handler->find($newtplset, 'block', $dtemplates[$i]->getVar('tpl_refid'), null);
@@ -260,8 +260,8 @@ 
                         }*/
 
                         // generate image cache files from image binary data, save them under cache/
-                        $image_handler =& xoops_gethandler('imagesetimg');
-                        $imagefiles =& $image_handler->getObjects(new Criteria('tplset_name', $newtplset), true);
+                        $image_handler = & xoops_gethandler('imagesetimg');
+                        $imagefiles = & $image_handler->getObjects(new Criteria('tplset_name', $newtplset), true);
                         foreach (array_keys($imagefiles) as $i) {
                             if (!$fp = fopen(XOOPS_CACHE_PATH.'/'.$newtplset.'_'.$imagefiles[$i]->getVar('imgsetimg_file'), 'wb')) {
                             } else {
@@ -274,12 +274,12 @@ 
                 }
 
                 // add read permission for the start module to all groups
-                if (!$startmod_updated    && $new_value != '--' && $config->getVar('conf_catid') == XOOPS_CONF && $config->getVar('conf_name') == 'startpage') {
-                    $member_handler =& xoops_gethandler('member');
-                    $groups =& $member_handler->getGroupList();
-                    $moduleperm_handler =& xoops_gethandler('groupperm');
-                    $module_handler =& xoops_gethandler('module');
-                    $module =& $module_handler->getByDirname($new_value);
+                if (!$startmod_updated && $new_value != '--' && $config->getVar('conf_catid') == XOOPS_CONF && $config->getVar('conf_name') == 'startpage') {
+                    $member_handler = & xoops_gethandler('member');
+                    $groups = & $member_handler->getGroupList();
+                    $moduleperm_handler = & xoops_gethandler('groupperm');
+                    $module_handler = & xoops_gethandler('module');
+                    $module = & $module_handler->getByDirname($new_value);
                     foreach ($groups as $groupid => $groupname) {
                         if (!$moduleperm_handler->checkRight('module_read', $module->getVar('mid'), $groupid)) {
                             $moduleperm_handler->addRight('module_read', $module->getVar('mid'), $groupid);
@@ -295,5 +295,5 @@ 
         }
     }
 
-    redirect_header('index.php?mode=admin&lib=altsys&page=mypreferences', 2, _MD_A_MYPREFERENCES_UPDATED) ;
+    redirect_header('index.php?mode=admin&lib=altsys&page=mypreferences', 2, _MD_A_MYPREFERENCES_UPDATED);
 }

xoops_trust_path/libs/altsys/admin_menu.php

Spacing +18 added lines, -18 removed lines

@@ -1,35 +1,35 @@ 
 <?php
 
-if (! defined('XOOPS_ROOT_PATH')) {
-    exit ;
+if (!defined('XOOPS_ROOT_PATH')) {
+    exit;
 }
 
 $adminmenu = array(
     array(
-        'title' => _MI_ALTSYS_MENU_CUSTOMBLOCKS ,
+        'title' => _MI_ALTSYS_MENU_CUSTOMBLOCKS,
         'link' => 'admin/index.php?mode=admin&lib=altsys&page=myblocksadmin&dirname=__CustomBlocks__'
-    ) ,
+    ),
     array(
-        'title' => _MI_ALTSYS_MENU_NEWCUSTOMBLOCK ,
-        'link' => 'admin/index.php?mode=admin&lib=altsys&page=myblocksadmin&dirname=__CustomBlocks__&op=edit' ,
+        'title' => _MI_ALTSYS_MENU_NEWCUSTOMBLOCK,
+        'link' => 'admin/index.php?mode=admin&lib=altsys&page=myblocksadmin&dirname=__CustomBlocks__&op=edit',
         'show' => false
-    ) ,
+    ),
     array(
-        'title' => _MI_ALTSYS_MENU_MYBLOCKSADMIN ,
+        'title' => _MI_ALTSYS_MENU_MYBLOCKSADMIN,
         'link' => 'admin/index.php?mode=admin&lib=altsys&page=myblocksadmin'
-    ) ,
+    ),
     array(
-        'title' => _MI_ALTSYS_MENU_MYTPLSADMIN ,
+        'title' => _MI_ALTSYS_MENU_MYTPLSADMIN,
         'link' => 'admin/index.php?mode=admin&lib=altsys&page=mytplsadmin'
-    ) ,
+    ),
     array(
-        'title' => _MI_ALTSYS_MENU_COMPILEHOOKADMIN ,
+        'title' => _MI_ALTSYS_MENU_COMPILEHOOKADMIN,
         'link' => 'admin/index.php?mode=admin&lib=altsys&page=compilehookadmin'
-    ) ,
+    ),
     array(
-        'title' => _MI_ALTSYS_MENU_MYLANGADMIN ,
+        'title' => _MI_ALTSYS_MENU_MYLANGADMIN,
         'link' => 'admin/index.php?mode=admin&lib=altsys&page=mylangadmin'
-    ) ,
+    ),
 /*  array(
         'title' => _MI_ALTSYS_MENU_MYAVATAR ,
         'link' => 'index.php?mode=admin&lib=altsys&page=myavatar' ,
@@ -38,11 +38,11 @@ 
         'title' => _MI_ALTSYS_MENU_MYSMILEY ,
         'link' => 'index.php?mode=admin&lib=altsys&page=mysmiley' ,
     ) ,*/
-) ;
+);
 
 $adminmenu4altsys = array(
     array(
-        'title' => 'ALTSYS '._PREFERENCES ,
+        'title' => 'ALTSYS '._PREFERENCES,
         'link' => 'admin/index.php?mode=admin&lib=altsys&page=mypreferences'
     )
-) ;
+);

xoops_trust_path/libs/altsys/xoops_version.php

Spacing +56 added lines, -56 removed lines

@@ -1,14 +1,14 @@ 
 <?php
 
-include_once __DIR__.'/include/altsys_functions.php' ;
+include_once __DIR__.'/include/altsys_functions.php';
 
 // language file (modinfo.php)
-altsys_include_language_file('modinfo') ;
+altsys_include_language_file('modinfo');
 
-$modversion['name'] = _MI_ALTSYS_MODULENAME ;
-$modversion['version'] = '0.82' ;
-$modversion['detailed_version'] = '0.82.5' ;
-$modversion['description'] = _MI_ALTSYS_MODULEDESC ;
+$modversion['name'] = _MI_ALTSYS_MODULENAME;
+$modversion['version'] = '0.82';
+$modversion['detailed_version'] = '0.82.5';
+$modversion['description'] = _MI_ALTSYS_MODULEDESC;
 $modversion['credits'] = 'PEAK Corp.';
 $modversion['author'] = 'GIJ=CHECKMATE<br />PEAK Corp.(http://www.peak.ne.jp/), XOOPS X Distribution(https://github.com/XoopsX)';
 $modversion['license'] = 'GPL see LICENSE';
@@ -22,18 +22,18 @@ 
 $modversion['adminmenu'] = 'admin/admin_menu.php';
 
 // All Templates can't be touched by modulesadmin.
-$modversion['templates'] = array() ;
+$modversion['templates'] = array();
 
 // Blocks
 $modversion['blocks'][1] = array(
-    'file'            => 'blocks.php' ,
-    'name'            => _MI_ALTSYS_BNAME_ADMIN_MENU ,
-    'description'    => '' ,
-    'show_func'        => 'b_altsys_admin_menu_show' ,
-    'edit_func'        => 'b_altsys_admin_menu_edit' ,
-    'options'        => "$mydirname" ,
-    'template'        => '' , // use "module" template instead
-) ;
+    'file'            => 'blocks.php',
+    'name'            => _MI_ALTSYS_BNAME_ADMIN_MENU,
+    'description'    => '',
+    'show_func'        => 'b_altsys_admin_menu_show',
+    'edit_func'        => 'b_altsys_admin_menu_edit',
+    'options'        => "$mydirname",
+    'template'        => '', // use "module" template instead
+);
 
 // Menu
 $modversion['hasMain'] = 1;
@@ -46,64 +46,64 @@ 
 
 // Configurations
 $modversion['config'][1] = array(
-    'name'            => 'adminmenu_hack_ft' ,
-    'title'            => '_MI_ALTSYS_ADMINMENU_HFT' ,
-    'description'    => '_MI_ALTSYS_ADMINMENU_HFTDSC' ,
-    'formtype'        => 'select' ,
-    'valuetype'        => 'int' ,
-    'default'        => 0 ,
-    'options'        => array( '_NONE' => 0 , '_MI_ALTSYS_AMHFT_OPT_2COL' => 1 , '_MI_ALTSYS_AMHFT_OPT_NOIMG' => 2 , '_MI_ALTSYS_AMHFT_OPT_XCSTY' => 3 )
-) ;
+    'name'            => 'adminmenu_hack_ft',
+    'title'            => '_MI_ALTSYS_ADMINMENU_HFT',
+    'description'    => '_MI_ALTSYS_ADMINMENU_HFTDSC',
+    'formtype'        => 'select',
+    'valuetype'        => 'int',
+    'default'        => 0,
+    'options'        => array('_NONE' => 0, '_MI_ALTSYS_AMHFT_OPT_2COL' => 1, '_MI_ALTSYS_AMHFT_OPT_NOIMG' => 2, '_MI_ALTSYS_AMHFT_OPT_XCSTY' => 3)
+);
 
 $modversion['config'][] = array(
-    'name'            => 'adminmenu_insert_mymenu' ,
-    'title'            => '_MI_ALTSYS_ADMINMENU_IM' ,
-    'description'    => '_MI_ALTSYS_ADMINMENU_IMDSC' ,
-    'formtype'        => 'yesno' ,
-    'valuetype'        => 'int' ,
-    'default'        => 0 ,
+    'name'            => 'adminmenu_insert_mymenu',
+    'title'            => '_MI_ALTSYS_ADMINMENU_IM',
+    'description'    => '_MI_ALTSYS_ADMINMENU_IMDSC',
+    'formtype'        => 'yesno',
+    'valuetype'        => 'int',
+    'default'        => 0,
     'options'        => array()
-) ;
+);
 
 $modversion['config'][] = array(
-    'name'            => 'admin_in_theme' ,
-    'title'            => '_MI_ALTSYS_ADMIN_IN_THEME' ,
-    'description'    => '_MI_ALTSYS_ADMIN_IN_THEMEDSC' ,
-    'formtype'        => 'textbox' ,
-    'valuetype'        => 'text' ,
-    'default'        => 'default' ,
+    'name'            => 'admin_in_theme',
+    'title'            => '_MI_ALTSYS_ADMIN_IN_THEME',
+    'description'    => '_MI_ALTSYS_ADMIN_IN_THEMEDSC',
+    'formtype'        => 'textbox',
+    'valuetype'        => 'text',
+    'default'        => 'default',
     'options'        => array()
-) ;
+);
 
 $modversion['config'][] = array(
-    'name'            => 'enable_force_clone' ,
-    'title'            => '_MI_ALTSYS_ENABLEFORCECLONE' ,
-    'description'    => '_MI_ALTSYS_ENABLEFORCECLONEDSC' ,
-    'formtype'        => 'yesno' ,
-    'valuetype'        => 'int' ,
-    'default'        => 1 ,
+    'name'            => 'enable_force_clone',
+    'title'            => '_MI_ALTSYS_ENABLEFORCECLONE',
+    'description'    => '_MI_ALTSYS_ENABLEFORCECLONEDSC',
+    'formtype'        => 'yesno',
+    'valuetype'        => 'int',
+    'default'        => 1,
     'options'        => array()
-) ;
+);
 
 $modversion['config'][] = array(
-    'name'            => 'images_dir' ,
-    'title'            => '_MI_ALTSYS_IMAGES_DIR' ,
-    'description'    => '_MI_ALTSYS_IMAGES_DIRDSC' ,
-    'formtype'        => 'textbox' ,
-    'valuetype'        => 'text' ,
-    'default'        => 'images' ,
+    'name'            => 'images_dir',
+    'title'            => '_MI_ALTSYS_IMAGES_DIR',
+    'description'    => '_MI_ALTSYS_IMAGES_DIRDSC',
+    'formtype'        => 'textbox',
+    'valuetype'        => 'text',
+    'default'        => 'images',
     'options'        => array()
-) ;
+);
 
 // Notification
 
 $modversion['hasNotification'] = 0;
 
-$modversion['onInstall'] = 'include/oninstall.php' ;
-$modversion['onUpdate'] = 'include/onupdate.php' ;
-$modversion['onUninstall'] = 'include/onuninstall.php' ;
+$modversion['onInstall'] = 'include/oninstall.php';
+$modversion['onUpdate'] = 'include/onupdate.php';
+$modversion['onUninstall'] = 'include/onuninstall.php';
 
 // keep block's options
-if (! defined('XOOPS_CUBE_LEGACY') && substr(XOOPS_VERSION, 6, 3) < 2.1 && ! empty($_POST['fct']) && ! empty($_POST['op']) && $_POST['fct'] == 'modulesadmin' && $_POST['op'] == 'update_ok' && $_POST['dirname'] == $modversion['dirname']) {
-    include __DIR__.'/include/x20_keepblockoptions.inc.php' ;
+if (!defined('XOOPS_CUBE_LEGACY') && substr(XOOPS_VERSION, 6, 3) < 2.1 && !empty($_POST['fct']) && !empty($_POST['op']) && $_POST['fct'] == 'modulesadmin' && $_POST['op'] == 'update_ok' && $_POST['dirname'] == $modversion['dirname']) {
+    include __DIR__.'/include/x20_keepblockoptions.inc.php';
 }

xoops_trust_path/libs/altsys/blocks/block_functions.php

Spacing +11 added lines, -12 removed lines

@@ -1,29 +1,29 @@ 
 <?php
 
-require_once dirname(__DIR__).'/include/altsys_functions.php' ;
+require_once dirname(__DIR__).'/include/altsys_functions.php';
 
 function b_altsys_admin_menu_show($options)
 {
-    global $xoopsUser ;
+    global $xoopsUser;
 
-    $mydirname = empty($options[0]) ? 'altsys' : $options[0] ;
-    $this_template = empty($options[1]) ? 'db:'.$mydirname.'_block_admin_menu.html' : trim($options[1]) ;
+    $mydirname = empty($options[0]) ? 'altsys' : $options[0];
+    $this_template = empty($options[1]) ? 'db:'.$mydirname.'_block_admin_menu.html' : trim($options[1]);
 
     if (preg_match('/[^0-9a-zA-Z_-]/', $mydirname)) {
-        die('Invalid mydirname') ;
+        die('Invalid mydirname');
     }
-    if (! is_object(@$xoopsUser)) {
-        return array() ;
+    if (!is_object(@$xoopsUser)) {
+        return array();
     }
 
     // coretype
-    $coretype = altsys_get_core_type() ;
+    $coretype = altsys_get_core_type();
 
     // mid_selected
     if (is_object(@$GLOBALS['xoopsModule'])) {
-        $mid_selected = $GLOBALS['xoopsModule']->getVar('mid') ;
+        $mid_selected = $GLOBALS['xoopsModule']->getVar('mid');
         // for system->preferences
-<<<<<<< HEAD
+<< << <<< HEAD
         if ($mid_selected == 1 && @$_GET['fct'] == 'preferences' && @$_GET['op'] == 'showmod' && ! empty($_GET['mod'])) {
             $mid_selected = intval($_GET['mod']) ;
 =======
@@ -156,5 +156,4 @@ 
 		<br />
 	\n" ;
 
-    return $form;
-}
+    return $form
\ No newline at end of file