mambax7 / altsys

xoops_trust_path/libs/altsys/include/tpls_functions.php

Spacing +60 added lines, -60 removed lines

@@ -1,41 +1,41 @@ 
 <?php
 
 include_once XOOPS_ROOT_PATH.'/class/template.php';
-include_once __DIR__.'/altsys_functions.php' ;
+include_once __DIR__.'/altsys_functions.php';
 
 function tplsadmin_import_data($tplset, $tpl_file, $tpl_source, $lastmodified = 0)
 {
-    $db = XoopsDatabaseFactory::getDatabaseConnection() ;
+    $db = XoopsDatabaseFactory::getDatabaseConnection();
 
     // check the file is valid template
-    list($count) = $db->fetchRow($db->query('SELECT COUNT(*) FROM ' . $db->prefix('tplfile') . " WHERE tpl_tplset='default' AND tpl_file='" . addslashes($tpl_file) . "'")) ;
-    if (! $count) {
-        return false ;
+    list($count) = $db->fetchRow($db->query('SELECT COUNT(*) FROM '.$db->prefix('tplfile')." WHERE tpl_tplset='default' AND tpl_file='".addslashes($tpl_file)."'"));
+    if (!$count) {
+        return false;
     }
 
     // check the template exists in the tplset
     if ($tplset != 'default') {
-        list($count) = $db->fetchRow($db->query('SELECT COUNT(*) FROM ' . $db->prefix('tplfile') . " WHERE tpl_tplset='" . addslashes($tplset) . "' AND tpl_file='" . addslashes($tpl_file) . "'")) ;
+        list($count) = $db->fetchRow($db->query('SELECT COUNT(*) FROM '.$db->prefix('tplfile')." WHERE tpl_tplset='".addslashes($tplset)."' AND tpl_file='".addslashes($tpl_file)."'"));
         if ($count <= 0) {
             // copy from 'default' to the tplset
-            $result = $db->query('SELECT * FROM ' . $db->prefix('tplfile') . " WHERE tpl_tplset='default' AND tpl_file='" . addslashes($tpl_file) . "'") ;
+            $result = $db->query('SELECT * FROM '.$db->prefix('tplfile')." WHERE tpl_tplset='default' AND tpl_file='".addslashes($tpl_file)."'");
             while ($row = $db->fetchArray($result)) {
-                $db->queryF('INSERT INTO ' . $db->prefix('tplfile') . " SET tpl_refid='" . addslashes($row['tpl_refid']) . "',tpl_module='" . addslashes($row['tpl_module']) . "',tpl_tplset='" . addslashes($tplset) . "',tpl_file='" . addslashes($tpl_file) . "',tpl_desc='" . addslashes($row['tpl_desc']) . "',tpl_type='" . addslashes($row['tpl_type']) . "'") ;
-                $tpl_id = $db->getInsertId() ;
-                $db->queryF('INSERT INTO ' . $db->prefix('tplsource') . " SET tpl_id='$tpl_id', tpl_source=''") ;
+                $db->queryF('INSERT INTO '.$db->prefix('tplfile')." SET tpl_refid='".addslashes($row['tpl_refid'])."',tpl_module='".addslashes($row['tpl_module'])."',tpl_tplset='".addslashes($tplset)."',tpl_file='".addslashes($tpl_file)."',tpl_desc='".addslashes($row['tpl_desc'])."',tpl_type='".addslashes($row['tpl_type'])."'");
+                $tpl_id = $db->getInsertId();
+                $db->queryF('INSERT INTO '.$db->prefix('tplsource')." SET tpl_id='$tpl_id', tpl_source=''");
             }
         }
     }
 
     // UPDATE just tpl_lastmodified and tpl_source
-    $drs = $db->query('SELECT tpl_id FROM ' . $db->prefix('tplfile') . " WHERE tpl_tplset='" . addslashes($tplset) . "' AND tpl_file='" . addslashes($tpl_file) . "'") ;
+    $drs = $db->query('SELECT tpl_id FROM '.$db->prefix('tplfile')." WHERE tpl_tplset='".addslashes($tplset)."' AND tpl_file='".addslashes($tpl_file)."'");
     while (list($tpl_id) = $db->fetchRow($drs)) {
-        $db->queryF('UPDATE ' . $db->prefix('tplfile') . " SET tpl_lastmodified='" . addslashes($lastmodified) . "',tpl_lastimported=UNIX_TIMESTAMP() WHERE tpl_id='$tpl_id'") ;
-        $db->queryF('UPDATE ' . $db->prefix('tplsource') . " SET tpl_source='" . addslashes($tpl_source) . "' WHERE tpl_id='$tpl_id'") ;
-        altsys_template_touch($tpl_id) ;
+        $db->queryF('UPDATE '.$db->prefix('tplfile')." SET tpl_lastmodified='".addslashes($lastmodified)."',tpl_lastimported=UNIX_TIMESTAMP() WHERE tpl_id='$tpl_id'");
+        $db->queryF('UPDATE '.$db->prefix('tplsource')." SET tpl_source='".addslashes($tpl_source)."' WHERE tpl_id='$tpl_id'");
+        altsys_template_touch($tpl_id);
     }
 
-    return true ;
+    return true;
 }
 
 
@@ -43,46 +43,46 @@ 
 
 function tplsadmin_get_fingerprint($lines)
 {
-    $str = '' ;
+    $str = '';
     foreach ($lines as $line) {
         if (trim($line)) {
-            $str .= md5(trim($line)) ;
+            $str .= md5(trim($line));
         }
     }
-    return md5($str) ;
+    return md5($str);
 }
 
 
 
 function tplsadmin_copy_templates_db2db($tplset_from, $tplset_to, $whr_append = '1')
 {
-    global $db ;
+    global $db;
 
     // get tplfile and tplsource
-    $result = $db->query("SELECT tpl_refid,tpl_module,'".addslashes($tplset_to)."',tpl_file,tpl_desc,tpl_lastmodified,tpl_lastimported,tpl_type,tpl_source FROM ".$db->prefix('tplfile') . ' NATURAL LEFT JOIN '
-                         . $db->prefix('tplsource') . " WHERE tpl_tplset='" . addslashes($tplset_from) . "' AND ($whr_append)") ;
+    $result = $db->query("SELECT tpl_refid,tpl_module,'".addslashes($tplset_to)."',tpl_file,tpl_desc,tpl_lastmodified,tpl_lastimported,tpl_type,tpl_source FROM ".$db->prefix('tplfile').' NATURAL LEFT JOIN '
+                         . $db->prefix('tplsource')." WHERE tpl_tplset='".addslashes($tplset_from)."' AND ($whr_append)");
 
     while ($row = $db->fetchArray($result)) {
-        $tpl_source = array_pop($row) ;
+        $tpl_source = array_pop($row);
 
-        $drs = $db->query('SELECT tpl_id FROM ' . $db->prefix('tplfile') . " WHERE tpl_tplset='" . addslashes($tplset_to) . "' AND ($whr_append) AND tpl_file='" . addslashes($row['tpl_file']) . "' AND tpl_refid='" . addslashes($row['tpl_refid']) . "'") ;
+        $drs = $db->query('SELECT tpl_id FROM '.$db->prefix('tplfile')." WHERE tpl_tplset='".addslashes($tplset_to)."' AND ($whr_append) AND tpl_file='".addslashes($row['tpl_file'])."' AND tpl_refid='".addslashes($row['tpl_refid'])."'");
 
-        if (! $db->getRowsNum($drs)) {
+        if (!$db->getRowsNum($drs)) {
             // INSERT mode
-            $sql = 'INSERT INTO ' . $db->prefix('tplfile') . ' (tpl_refid,tpl_module,tpl_tplset,tpl_file,tpl_desc,tpl_lastmodified,tpl_lastimported,tpl_type) VALUES (';
+            $sql = 'INSERT INTO '.$db->prefix('tplfile').' (tpl_refid,tpl_module,tpl_tplset,tpl_file,tpl_desc,tpl_lastmodified,tpl_lastimported,tpl_type) VALUES (';
             foreach ($row as $colval) {
-                $sql .= "'".addslashes($colval)."'," ;
+                $sql .= "'".addslashes($colval)."',";
             }
-            $db->query(substr($sql, 0, -1) . ')') ;
-            $tpl_id = $db->getInsertId() ;
-            $db->query('INSERT INTO ' . $db->prefix('tplsource') . " SET tpl_id='$tpl_id', tpl_source='" . addslashes($tpl_source) . "'") ;
-            altsys_template_touch($tpl_id) ;
+            $db->query(substr($sql, 0, -1).')');
+            $tpl_id = $db->getInsertId();
+            $db->query('INSERT INTO '.$db->prefix('tplsource')." SET tpl_id='$tpl_id', tpl_source='".addslashes($tpl_source)."'");
+            altsys_template_touch($tpl_id);
         } else {
             while (list($tpl_id) = $db->fetchRow($drs)) {
                 // UPDATE mode
-                $db->query('UPDATE ' . $db->prefix('tplfile') . " SET tpl_refid='" . addslashes($row['tpl_refid']) . "',tpl_desc='" . addslashes($row['tpl_desc']) . "',tpl_lastmodified='" . addslashes($row['tpl_lastmodified']) . "',tpl_lastimported='" . addslashes($row['tpl_lastimported']) . "',tpl_type='" . addslashes($row['tpl_type']) . "' WHERE tpl_id='$tpl_id'") ;
-                $db->query('UPDATE ' . $db->prefix('tplsource') . " SET tpl_source='" . addslashes($tpl_source) . "' WHERE tpl_id='$tpl_id'") ;
-                altsys_template_touch($tpl_id) ;
+                $db->query('UPDATE '.$db->prefix('tplfile')." SET tpl_refid='".addslashes($row['tpl_refid'])."',tpl_desc='".addslashes($row['tpl_desc'])."',tpl_lastmodified='".addslashes($row['tpl_lastmodified'])."',tpl_lastimported='".addslashes($row['tpl_lastimported'])."',tpl_type='".addslashes($row['tpl_type'])."' WHERE tpl_id='$tpl_id'");
+                $db->query('UPDATE '.$db->prefix('tplsource')." SET tpl_source='".addslashes($tpl_source)."' WHERE tpl_id='$tpl_id'");
+                altsys_template_touch($tpl_id);
             }
         }
     }
@@ -92,31 +92,31 @@ 
 
 function tplsadmin_copy_templates_f2db($tplset_to, $whr_append = '1')
 {
-    global $db ;
+    global $db;
 
     // get tplsource
-    $result = $db->query('SELECT * FROM ' . $db->prefix('tplfile') . "  WHERE tpl_tplset='default' AND ($whr_append)") ;
+    $result = $db->query('SELECT * FROM '.$db->prefix('tplfile')."  WHERE tpl_tplset='default' AND ($whr_append)");
 
     while ($row = $db->fetchArray($result)) {
-        $basefilepath = tplsadmin_get_basefilepath($row['tpl_module'], $row['tpl_type'], $row['tpl_file']) ;
-        $tpl_source = rtrim(implode('', file($basefilepath))) ;
-        $lastmodified = filemtime($basefilepath) ;
+        $basefilepath = tplsadmin_get_basefilepath($row['tpl_module'], $row['tpl_type'], $row['tpl_file']);
+        $tpl_source = rtrim(implode('', file($basefilepath)));
+        $lastmodified = filemtime($basefilepath);
 
-        $drs = $db->query('SELECT tpl_id FROM ' . $db->prefix('tplfile') . " WHERE tpl_tplset='" . addslashes($tplset_to) . "' AND ($whr_append) AND tpl_file='" . addslashes($row['tpl_file']) . "' AND tpl_refid='" . addslashes($row['tpl_refid']) . "'") ;
+        $drs = $db->query('SELECT tpl_id FROM '.$db->prefix('tplfile')." WHERE tpl_tplset='".addslashes($tplset_to)."' AND ($whr_append) AND tpl_file='".addslashes($row['tpl_file'])."' AND tpl_refid='".addslashes($row['tpl_refid'])."'");
 
-        if (! $db->getRowsNum($drs)) {
+        if (!$db->getRowsNum($drs)) {
             // INSERT mode
-            $sql = 'INSERT INTO ' . $db->prefix('tplfile') . " SET tpl_refid='" . addslashes($row['tpl_refid']) . "',tpl_desc='" . addslashes($row['tpl_desc']) . "',tpl_lastmodified='" . addslashes($lastmodified) . "',tpl_type='" . addslashes($row['tpl_type']) . "',tpl_tplset='" . addslashes($tplset_to) . "',tpl_file='" . addslashes($row['tpl_file']) . "',tpl_module='" . addslashes($row['tpl_module']) . "'" ;
-            $db->query($sql) ;
-            $tpl_id = $db->getInsertId() ;
-            $db->query('INSERT INTO ' . $db->prefix('tplsource') . " SET tpl_id='$tpl_id', tpl_source='" . addslashes($tpl_source) . "'") ;
-            altsys_template_touch($tpl_id) ;
+            $sql = 'INSERT INTO '.$db->prefix('tplfile')." SET tpl_refid='".addslashes($row['tpl_refid'])."',tpl_desc='".addslashes($row['tpl_desc'])."',tpl_lastmodified='".addslashes($lastmodified)."',tpl_type='".addslashes($row['tpl_type'])."',tpl_tplset='".addslashes($tplset_to)."',tpl_file='".addslashes($row['tpl_file'])."',tpl_module='".addslashes($row['tpl_module'])."'";
+            $db->query($sql);
+            $tpl_id = $db->getInsertId();
+            $db->query('INSERT INTO '.$db->prefix('tplsource')." SET tpl_id='$tpl_id', tpl_source='".addslashes($tpl_source)."'");
+            altsys_template_touch($tpl_id);
         } else {
             while (list($tpl_id) = $db->fetchRow($drs)) {
                 // UPDATE mode
-                $db->query('UPDATE ' . $db->prefix('tplfile') . " SET tpl_lastmodified='" . addslashes($lastmodified) . "' WHERE tpl_id='$tpl_id'") ;
-                $db->query('UPDATE ' . $db->prefix('tplsource') . " SET tpl_source='" . addslashes($tpl_source) . "' WHERE tpl_id='$tpl_id'") ;
-                altsys_template_touch($tpl_id) ;
+                $db->query('UPDATE '.$db->prefix('tplfile')." SET tpl_lastmodified='".addslashes($lastmodified)."' WHERE tpl_id='$tpl_id'");
+                $db->query('UPDATE '.$db->prefix('tplsource')." SET tpl_source='".addslashes($tpl_source)."' WHERE tpl_id='$tpl_id'");
+                altsys_template_touch($tpl_id);
             }
         }
     }
@@ -127,7 +127,7 @@ 
 function tplsadmin_get_basefilepath($dirname, $type, $tpl_file)
 {
     // module instance
-    $path = $basefilepath = XOOPS_ROOT_PATH.'/modules/'.$dirname.'/templates/'.($type=='block'?'blocks/':'').$tpl_file ;
+    $path = $basefilepath = XOOPS_ROOT_PATH.'/modules/'.$dirname.'/templates/'.($type == 'block' ? 'blocks/' : '').$tpl_file;
 
     if (is_callable('Legacy_Utils::getTrustDirnameByDirname')) {
         $mytrustdirname = Legacy_Utils::getTrustDirnameByDirname($dirname);
@@ -135,33 +135,33 @@ 
 
     if (defined('ALTSYS_TPLSADMIN_BASEPATH')) {
         // Special hook
-        $path = ALTSYS_TPLSADMIN_BASEPATH.'/'.substr($tpl_file, strlen($dirname) + 1) ;
+        $path = ALTSYS_TPLSADMIN_BASEPATH.'/'.substr($tpl_file, strlen($dirname) + 1);
     } elseif ($mytrustdirname || @include(XOOPS_ROOT_PATH.'/modules/'.$dirname.'/mytrustdirname.php')) {
         // D3 module base
-        if (! empty($mytrustdirname)) {
-            $mid_path = $mytrustdirname == 'altsys' ? '/libs/' : '/modules/' ;
+        if (!empty($mytrustdirname)) {
+            $mid_path = $mytrustdirname == 'altsys' ? '/libs/' : '/modules/';
 
-            $path = XOOPS_TRUST_PATH.$mid_path.$mytrustdirname.'/templates/'.($type=='block'?'blocks/':'').substr($tpl_file, strlen($dirname) + 1) ;
+            $path = XOOPS_TRUST_PATH.$mid_path.$mytrustdirname.'/templates/'.($type == 'block' ? 'blocks/' : '').substr($tpl_file, strlen($dirname) + 1);
             //new for xcck etc.other trust_module
-            if (! file_exists($path)) {
-                $path = XOOPS_TRUST_PATH.$mid_path.$mytrustdirname.'/templates/'.($type=='block'?'blocks/':'').$tpl_file ;
-                if (! file_exists($path)) {
+            if (!file_exists($path)) {
+                $path = XOOPS_TRUST_PATH.$mid_path.$mytrustdirname.'/templates/'.($type == 'block' ? 'blocks/' : '').$tpl_file;
+                if (!file_exists($path)) {
                     $path = $basefilepath;
                 }
             }
         }
     }
 
-    return $path ;
+    return $path;
 }
 
 
 function tplsadmin_die($msg, $target_dirname = '', $wait = 2)
 {
     if (strtolower($_SERVER['REQUEST_METHOD']) === 'post') {
-        redirect_header('?mode=admin&lib=altsys&page=mytplsadmin&dirname='.$target_dirname, $wait, $msg) ;
-        exit ;
+        redirect_header('?mode=admin&lib=altsys&page=mytplsadmin&dirname='.$target_dirname, $wait, $msg);
+        exit;
     } else {
-        die($msg) ;
+        die($msg);
     }
 }

xoops_trust_path/libs/altsys/include/admin_in_theme.inc.php

Spacing +11 added lines, -11 removed lines

@@ -2,29 +2,29 @@
 
 // render admin in theme.html
 if (is_object($xoopsUser)) {
-    $xoops_subpath = substr($_SERVER['REQUEST_URI'], strpos(strrev(XOOPS_URL), strrev($_SERVER['HTTP_HOST']))) ;
+    $xoops_subpath = substr($_SERVER['REQUEST_URI'], strpos(strrev(XOOPS_URL), strrev($_SERVER['HTTP_HOST'])));
     if (preg_match('#(^/admin.php|^/modules/system/|^/modules/[a-zA-Z0-9_.-]+/admin/)#', $xoops_subpath)) {
         // The request looks like admin
-        require_once __DIR__.'/altsys_functions.php' ;
-        if (! empty($GLOBALS['altsysModuleConfig']['admin_in_theme']) && file_exists(XOOPS_THEME_PATH.'/'.$GLOBALS['altsysModuleConfig']['admin_in_theme'].'/theme.html')) {
+        require_once __DIR__.'/altsys_functions.php';
+        if (!empty($GLOBALS['altsysModuleConfig']['admin_in_theme']) && file_exists(XOOPS_THEME_PATH.'/'.$GLOBALS['altsysModuleConfig']['admin_in_theme'].'/theme.html')) {
             // configs OK
-            require_once __DIR__.'/admin_in_theme_functions.php' ;
+            require_once __DIR__.'/admin_in_theme_functions.php';
 
             // for security with register_globals=1
-            unset($GLOBALS['altsysAdminPageTitle'], /* $GLOBALS['altsysXoopsBreadcrumbs'] ,*/ $GLOBALS['xoops_admin_contents']) ;
+            unset($GLOBALS['altsysAdminPageTitle'], /* $GLOBALS['altsysXoopsBreadcrumbs'] ,*/ $GLOBALS['xoops_admin_contents']);
 
             // disable error handler without XOOPS 2.0.14/15/16
-            if (! (is_object(@$xoopsLogger) && method_exists($xoopsLogger, 'render') && in_array($xoopsConfig['debug_mode'], array( 1, 2 )))) {
-                restore_error_handler() ;
+            if (!(is_object(@$xoopsLogger) && method_exists($xoopsLogger, 'render') && in_array($xoopsConfig['debug_mode'], array(1, 2)))) {
+                restore_error_handler();
             }
 
             // to prepend Notice with 2.0.14/15/16 with PHP4
-            if (! defined('E_STRICT')) {
-                define('E_STRICT', 2048) ;
+            if (!defined('E_STRICT')) {
+                define('E_STRICT', 2048);
             }
 
-            register_shutdown_function('altsys_admin_in_theme_in_last') ;
-            ob_start('altsys_admin_in_theme') ;
+            register_shutdown_function('altsys_admin_in_theme_in_last');
+            ob_start('altsys_admin_in_theme');
         }
     }
 }

xoops_trust_path/libs/altsys/include/admin_in_theme_header.inc.php

Spacing +8 added lines, -8 removed lines

@@ -29,7 +29,7 @@ 
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA //
 //  ------------------------------------------------------------------------ //
 
-require_once dirname(__DIR__).'/class/AltsysBreadcrumbs.class.php' ;
+require_once dirname(__DIR__).'/class/AltsysBreadcrumbs.class.php';
 include_once XOOPS_ROOT_PATH.'/class/xoopsblock.php';
 
     $xoopsOption['theme_use_smarty'] = 1;
@@ -42,7 +42,7 @@ 
     }
     $xoopsTpl->assign(array('xoops_theme' => $xoopsConfig['theme_set'], 'xoops_imageurl' => XOOPS_THEME_URL.'/'.$xoopsConfig['theme_set'].'/', 'xoops_themecss'=> xoops_getcss($xoopsConfig['theme_set']), 'xoops_requesturi' => htmlspecialchars($GLOBALS['xoopsRequestUri'], ENT_QUOTES), 'xoops_sitename' => htmlspecialchars($xoopsConfig['sitename'], ENT_QUOTES), 'xoops_slogan' => htmlspecialchars($xoopsConfig['slogan'], ENT_QUOTES)));
     // Meta tags
-    $config_handler =& xoops_gethandler('config');
+    $config_handler = & xoops_gethandler('config');
     $criteria = new CriteriaCompo(new Criteria('conf_modid', 0));
     $criteria->add(new Criteria('conf_catid', XOOPS_CONF_METAFOOTER));
     $config = $config_handler->getConfigs($criteria, true);
@@ -57,8 +57,8 @@ 
 
 //HACK by domifara
     if (defined('XOOPS_CUBE_LEGACY')) {
-        $handler =& xoops_gethandler('block');
-        $xoopsblock =& $handler->create(false) ;
+        $handler = & xoops_gethandler('block');
+        $xoopsblock = & $handler->create(false);
     } else {
         $xoopsblock = new XoopsBlock();
     }
@@ -68,9 +68,9 @@ 
     if (is_object($xoopsUser)) {
         $xoopsTpl->assign(array('xoops_isuser' => true, 'xoops_userid' => $xoopsUser->getVar('uid'), 'xoops_uname' => $xoopsUser->getVar('uname'), 'xoops_isadmin' => $xoopsUserIsAdmin));
         if (is_object(@$xoopsModule)) {
-            if ($xoopsModule->getVar('mid') == 1 && @$_GET['fct'] == 'preferences' && @$_GET['op'] == 'showmod' && ! empty($_GET['mod'])) {
-                $module_handler =& xoops_gethandler('module') ;
-<<<<<<< HEAD
+            if ($xoopsModule->getVar('mid') == 1 && @$_GET['fct'] == 'preferences' && @$_GET['op'] == 'showmod' && !empty($_GET['mod'])) {
+                $module_handler = & xoops_gethandler('module');
+<< << <<< HEAD
                 $target_module = $module_handler->get(intval($_GET['mod'])) ;
 =======
                 $target_module = $module_handler->get((int)$_GET['mod']) ;
@@ -268,4 +268,4 @@ 
         $xoopsTpl->assign('xoops_showcblock', 0);
     }
 
-    $xoopsTpl->xoops_setCaching(0);
+    $xoopsTpl->xoops_setCaching
\ No newline at end of file

xoops_trust_path/libs/altsys/include/mygroupperm.php

Spacing +22 added lines, -22 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
-if (! defined('XOOPS_ROOT_PATH')) {
-    exit ;
+if (!defined('XOOPS_ROOT_PATH')) {
+    exit;
 }
 
 function myDeleteByModule($DB, $gperm_modid, $gperm_name = null, $gperm_itemid = null)
@@ -13,7 +13,7 @@ 
             $criteria->add(new Criteria('gperm_itemid', (int)$gperm_itemid));
         }
     }
-    $sql = 'DELETE FROM ' . $DB->prefix('group_permission') . ' ' . $criteria->renderWhere();
+    $sql = 'DELETE FROM '.$DB->prefix('group_permission').' '.$criteria->renderWhere();
     if (!$result = $DB->query($sql)) {
         return false;
     }
@@ -27,47 +27,47 @@ 
 
 if ($modid == 1) {
     // check by the permission of eather 'altsys' or 'system'
-    $module_handler =& xoops_gethandler('module') ;
-    $module =& $module_handler->getByDirname('altsys') ;
-    if (! is_object($module)) {
-        $module =& $module_handler->getByDirname('system') ;
-        if (! is_object($module)) {
-            die('there is no altsys nor system.') ;
+    $module_handler = & xoops_gethandler('module');
+    $module = & $module_handler->getByDirname('altsys');
+    if (!is_object($module)) {
+        $module = & $module_handler->getByDirname('system');
+        if (!is_object($module)) {
+            die('there is no altsys nor system.');
         }
     }
-    $moduleperm_handler =& xoops_gethandler('groupperm') ;
-    if (! is_object(@$GLOBALS['xoopsUser']) || ! $moduleperm_handler->checkRight('module_admin', $module->getVar('mid'), $GLOBALS['xoopsUser']->getGroups())) {
-        die('only admin of altsys can access this area') ;
+    $moduleperm_handler = & xoops_gethandler('groupperm');
+    if (!is_object(@$GLOBALS['xoopsUser']) || !$moduleperm_handler->checkRight('module_admin', $module->getVar('mid'), $GLOBALS['xoopsUser']->getGroups())) {
+        die('only admin of altsys can access this area');
     }
 } else {
     // check the permission of 'module_admin' of the module
     if ($modid <= 0 || !is_object($GLOBALS['xoopsUser']) || !$GLOBALS['xoopsUser']->isAdmin($modid)) {
-        die(_NOPERM) ;
+        die(_NOPERM);
     }
-    $module_handler =& xoops_gethandler('module');
-    $module =& $module_handler->get($modid);
+    $module_handler = & xoops_gethandler('module');
+    $module = & $module_handler->get($modid);
     if (!is_object($module) || !$module->getVar('isactive')) {
-        die(_MODULENOEXIST) ;
+        die(_MODULENOEXIST);
     }
 }
 
-$member_handler =& xoops_gethandler('member');
+$member_handler = & xoops_gethandler('member');
 $group_list = $member_handler->getGroupList();
 if (!empty($_POST['perms']) && is_array($_POST['perms'])) {
-    $gperm_handler =& xoops_gethandler('groupperm');
+    $gperm_handler = & xoops_gethandler('groupperm');
     foreach ($_POST['perms'] as $perm_name => $perm_data) {
-        foreach ($perm_data['itemname' ] as $item_id => $item_name) {
+        foreach ($perm_data['itemname'] as $item_id => $item_name) {
             // checking code
             // echo "<pre>" ;
             // var_dump( $_POST['perms'] ) ;
             // exit ;
             if (false != myDeleteByModule($gperm_handler->db, $modid, $perm_name, $item_id)) {
                 if (empty($perm_data['groups'])) {
-                    continue ;
+                    continue;
                 }
                 foreach ($perm_data['groups'] as $group_id => $item_ids) {
                     //              foreach ($item_ids as $item_id => $selected) {
-                    $selected = isset($item_ids[ $item_id ]) ? $item_ids[ $item_id ] : 0 ;
+                    $selected = isset($item_ids[$item_id]) ? $item_ids[$item_id] : 0;
                     if ($selected == 1) {
                         // make sure that all parent ids are selected as well
                         if ($perm_data['parents'][$item_id] != '') {
@@ -80,7 +80,7 @@ 
                                 }
                             }
                         }
-                        $gperm =& $gperm_handler->create();
+                        $gperm = & $gperm_handler->create();
                         $gperm->setVar('gperm_groupid', $group_id);
                         $gperm->setVar('gperm_name', $perm_name);
                         $gperm->setVar('gperm_modid', $modid);

xoops_trust_path/libs/altsys/include/autoupdate_from_module.inc.php

Spacing +10 added lines, -15 removed lines

@@ -1,26 +1,26 @@ 
 <?php
 
-if (! $xoopsConfig['theme_fromfile']) {
-    return ;
+if (!$xoopsConfig['theme_fromfile']) {
+    return;
 }
 
 // templates/ under modules
 // $tplsadmin_autoupdate_path = XOOPS_THEME_PATH . '/' . $xoopsConfig['theme_set'] . '/templates' ;
 
-if (! is_array(@$tplsadmin_autoupdate_dirnames)) {
-    return ;
+if (!is_array(@$tplsadmin_autoupdate_dirnames)) {
+    return;
 }
 
 foreach ($tplsadmin_autoupdate_dirnames as $dirname) {
-    $dirname = preg_replace('/[^a-zA-Z0-9_-]/', '', $dirname) ;
-    $tplsadmin_autoupdate_path = XOOPS_ROOT_PATH . '/modules/' . $dirname . '/templates' ;
+    $dirname = preg_replace('/[^a-zA-Z0-9_-]/', '', $dirname);
+    $tplsadmin_autoupdate_path = XOOPS_ROOT_PATH.'/modules/'.$dirname.'/templates';
 
     // modules
-    if ($handler = @opendir($tplsadmin_autoupdate_path . '/')) {
+    if ($handler = @opendir($tplsadmin_autoupdate_path.'/')) {
         while (($file = readdir($handler)) !== false) {
-            $file_path = $tplsadmin_autoupdate_path . '/' . $file ;
+            $file_path = $tplsadmin_autoupdate_path.'/'.$file;
             if (is_file($file_path) && substr($file, -5) == '.html') {
-<<<<<<< HEAD
+<< << <<< HEAD
                 $mtime = intval(@filemtime($file_path)) ;
                 list($count) = $xoopsDB->fetchRow($xoopsDB->query('SELECT COUNT(*) FROM ' . $xoopsDB->prefix('tplfile') . " WHERE tpl_tplset='" . addslashes($xoopsConfig['template_set']) . "' AND tpl_file='" . addslashes($file) . "' AND tpl_lastmodified >= $mtime")) ;
 =======
@@ -49,9 +49,4 @@ 
 >>>>>>> feature/intval
                 if ($count <= 0) {
                     include_once XOOPS_TRUST_PATH.'/libs/altsys/include/tpls_functions.php' ;
-                    tplsadmin_import_data($xoopsConfig['template_set'], $file, implode('', file($file_path)), $mtime) ;
-                }
-            }
-        }
-    }
-}
+                    tplsadmin_import_data($xoopsConfig['template_set'], $file, implode('', file($file_path)), $mtime
\ No newline at end of file

xoops_trust_path/libs/altsys/include/admin_in_theme_functions.php

Spacing +44 added lines, -44 removed lines

@@ -2,94 +2,94 @@ 
 
 function altsys_admin_in_theme($s)
 {
-    global $xoops_admin_contents ;
+    global $xoops_admin_contents;
 
-    $xoops_admin_contents = '' ;
+    $xoops_admin_contents = '';
 
     if (defined('ALTSYS_DONT_USE_ADMIN_IN_THEME')) {
-        return $s ;
+        return $s;
     }
 
     // check whether cp_functions.php is loaded
-    if (! defined('XOOPS_CPFUNC_LOADED')) {
-        define('ALTSYS_DONT_USE_ADMIN_IN_THEME', 1) ;
-        return $s ;
+    if (!defined('XOOPS_CPFUNC_LOADED')) {
+        define('ALTSYS_DONT_USE_ADMIN_IN_THEME', 1);
+        return $s;
     }
 
     // redirect
     if (strstr($s, '<meta http-equiv="Refresh" ')) {
-        define('ALTSYS_DONT_USE_ADMIN_IN_THEME', 1) ;
-        return $s ;
+        define('ALTSYS_DONT_USE_ADMIN_IN_THEME', 1);
+        return $s;
     }
 
     // outputs before cp_header()
-    @list($former_outputs, $tmp_s) = explode('<!DOCTYPE', $s, 2) ;
+    @list($former_outputs, $tmp_s) = explode('<!DOCTYPE', $s, 2);
     if (empty($tmp_s)) {
-        $tmp_s = $s ;
+        $tmp_s = $s;
     }
 
-    @list(, $tmp_s) = explode("<div class='content'>", $tmp_s, 2) ;
+    @list(, $tmp_s) = explode("<div class='content'>", $tmp_s, 2);
     if (empty($tmp_s)) {
-        define('ALTSYS_DONT_USE_ADMIN_IN_THEME', 1) ;
-        return $s ;
+        define('ALTSYS_DONT_USE_ADMIN_IN_THEME', 1);
+        return $s;
     }
 
-    list($tmp_s, $tmp_after) = explode("<td width='1%' background='".XOOPS_URL."/modules/system/images/bg_content.gif'>", $tmp_s) ;
+    list($tmp_s, $tmp_after) = explode("<td width='1%' background='".XOOPS_URL."/modules/system/images/bg_content.gif'>", $tmp_s);
     if (empty($tmp_after)) {
-        define('ALTSYS_DONT_USE_ADMIN_IN_THEME', 1) ;
-        return $s ;
+        define('ALTSYS_DONT_USE_ADMIN_IN_THEME', 1);
+        return $s;
     }
 
-    $xoops_admin_contents = $former_outputs . substr(strrev(strstr(strrev($tmp_s), strrev('</div>'))), 0, -6) ;
+    $xoops_admin_contents = $former_outputs.substr(strrev(strstr(strrev($tmp_s), strrev('</div>'))), 0, -6);
 
-    return '' ;
+    return '';
 }
 
 
 function altsys_admin_in_theme_in_last($contents = null)
 {
-    global $xoops_admin_contents , $xoopsConfig , $xoopsModule , $xoopsUser , $xoopsUserIsAdmin , $xoopsLogger , $altsysModuleConfig , $altsysModuleId ;
+    global $xoops_admin_contents, $xoopsConfig, $xoopsModule, $xoopsUser, $xoopsUserIsAdmin, $xoopsLogger, $altsysModuleConfig, $altsysModuleId;
 
-    if (! isset($contents)) {
+    if (!isset($contents)) {
         while (ob_get_level()) {
-            ob_end_flush() ;
+            ob_end_flush();
         }
     } else {
-        $xoops_admin_contents = $contents ;
+        $xoops_admin_contents = $contents;
     }
 
-    if (! isset($xoops_admin_contents)) {
-        return ;
+    if (!isset($xoops_admin_contents)) {
+        return;
     }
     if (defined('ALTSYS_DONT_USE_ADMIN_IN_THEME')) {
-        return ;
+        return;
     }
 
-    if (! is_object($xoopsUser)) {
-        exit ;
+    if (!is_object($xoopsUser)) {
+        exit;
     }
 
     // language files
     if (file_exists(dirname(__DIR__).'/language/'.$xoopsConfig['language'].'/admin_in_theme.php')) {
-        include_once dirname(__DIR__).'/language/'.$xoopsConfig['language'].'/admin_in_theme.php' ;
+        include_once dirname(__DIR__).'/language/'.$xoopsConfig['language'].'/admin_in_theme.php';
     } else {
-        include_once dirname(__DIR__).'/language/english/admin_in_theme.php' ;
+        include_once dirname(__DIR__).'/language/english/admin_in_theme.php';
     }
 
     // set the theme
-    $xoopsConfig['theme_set'] = $altsysModuleConfig['admin_in_theme'] ;
+    $xoopsConfig['theme_set'] = $altsysModuleConfig['admin_in_theme'];
 
     // language files under the theme
-    $original_error_level = error_reporting() ;
-    error_reporting($original_error_level & ~ E_NOTICE) ;
+    $original_error_level = error_reporting();
+    error_reporting($original_error_level & ~ E_NOTICE);
     if (file_exists(XOOPS_THEME_PATH.'/'.$xoopsConfig['theme_set'].'/language/'.$xoopsConfig['language'].'.php')) {
-        include_once XOOPS_THEME_PATH.'/'.$xoopsConfig['theme_set'].'/language/'.$xoopsConfig['language'].'.php' ;
+        include_once XOOPS_THEME_PATH.'/'.$xoopsConfig['theme_set'].'/language/'.$xoopsConfig['language'].'.php';
     } elseif (file_exists(XOOPS_THEME_PATH.'/'.$xoopsConfig['theme_set'].'/language/english.php')) {
-        include_once XOOPS_THEME_PATH.'/'.$xoopsConfig['theme_set'].'/language/english.php' ;
+        include_once XOOPS_THEME_PATH.'/'.$xoopsConfig['theme_set'].'/language/english.php';
     }
-    error_reporting($original_error_level) ;
+    error_reporting($original_error_level);
 
-    include __DIR__.'/admin_in_theme_header.inc.php' ;
+    include __DIR__.'/admin_in_theme_header.inc.php';
 
 /*	// include adminmenu
     include XOOPS_CACHE_PATH.'/adminmenu.php' ;
@@ -125,11 +125,11 @@ 
         function shutdown() {'.implode("\n",$xoops_admin_menu_sd).'}' ; */
 
     // appendix (core specific css etc)
-    $xoops_module_header = '' ;
+    $xoops_module_header = '';
     if (altsys_get_core_type() == ALTSYS_CORE_TYPE_XCL21) {
-        $xoops_module_header .= '<link rel="stylesheet" type="text/css" media="all" href="'.XOOPS_URL.'/modules/legacyRender/admin/css.php?file=style.css" />'."\n" ;
+        $xoops_module_header .= '<link rel="stylesheet" type="text/css" media="all" href="'.XOOPS_URL.'/modules/legacyRender/admin/css.php?file=style.css" />'."\n";
         if (is_object(@$xoopsModule)) {
-            $xoops_module_header .= '<link rel="stylesheet" type="text/css" media="all" href="'.XOOPS_URL.'/modules/legacyRender/admin/css.php?file=module.css&amp;dirname='.$xoopsModule->getVar('dirname').'" />'."\n" ;
+            $xoops_module_header .= '<link rel="stylesheet" type="text/css" media="all" href="'.XOOPS_URL.'/modules/legacyRender/admin/css.php?file=module.css&amp;dirname='.$xoopsModule->getVar('dirname').'" />'."\n";
         }
     }
 
@@ -148,14 +148,14 @@ 
         'xoops_slogan' => htmlspecialchars($xoopsConfig['slogan'], ENT_QUOTES),
         'xoops_contents' => $xoops_admin_contents, //. '<div id="adminmenu_layers">' . $xoops_admin_menu_dv . '</div>' ,
         'xoops_module_header' => $xoops_module_header
-    )) ;
+    ));
 
     // rendering
-    $xoopsTpl->display($xoopsConfig['theme_set'].'/theme.html') ;
+    $xoopsTpl->display($xoopsConfig['theme_set'].'/theme.html');
 
     // for XOOPS 2.0.14/15/16 from xoops.org
-    if (is_object(@$xoopsLogger) && method_exists($xoopsLogger, 'render') && in_array($xoopsConfig['debug_mode'], array( 1, 2 ))) {
-        $xoopsLogger->activated = true ;
-        echo $xoopsLogger->render('') ;
+    if (is_object(@$xoopsLogger) && method_exists($xoopsLogger, 'render') && in_array($xoopsConfig['debug_mode'], array(1, 2))) {
+        $xoopsLogger->activated = true;
+        echo $xoopsLogger->render('');
     }
 }

xoops_trust_path/libs/altsys/include/altsys_functions.php

Spacing +56 added lines, -56 removed lines

@@ -1,46 +1,46 @@ 
 <?php
 
-altsys_set_module_config() ;
+altsys_set_module_config();
 
 function altsys_set_module_config()
 {
-    global $altsysModuleConfig , $altsysModuleId ;
+    global $altsysModuleConfig, $altsysModuleId;
 
-    $module_handler =& xoops_gethandler('module') ;
-    $module =& $module_handler->getByDirname('altsys') ;
+    $module_handler = & xoops_gethandler('module');
+    $module = & $module_handler->getByDirname('altsys');
     if (is_object($module)) {
-        $config_handler =& xoops_gethandler('config') ;
-        $altsysModuleConfig = $config_handler->getConfigList($module->getVar('mid')) ;
-        $altsysModuleId = $module->getVar('mid') ;
+        $config_handler = & xoops_gethandler('config');
+        $altsysModuleConfig = $config_handler->getConfigList($module->getVar('mid'));
+        $altsysModuleId = $module->getVar('mid');
     } else {
-        $altsysModuleConfig = array() ;
-        $altsysModuleId = 0 ;
+        $altsysModuleConfig = array();
+        $altsysModuleId = 0;
     }
 
     // for RTL users
-    @define('_GLOBAL_LEFT', @_ADM_USE_RTL == 1 ? 'right' : 'left') ;
-    @define('_GLOBAL_RIGHT', @_ADM_USE_RTL == 1 ? 'left' : 'right') ;
+    @define('_GLOBAL_LEFT', @_ADM_USE_RTL == 1 ? 'right' : 'left');
+    @define('_GLOBAL_RIGHT', @_ADM_USE_RTL == 1 ? 'left' : 'right');
 }
 
 
 function altsys_include_mymenu()
 {
-    global $xoopsModule , $xoopsConfig , $mydirname , $mydirpath , $mytrustdirname , $mytrustdirpath , $mymenu_fake_uri ;
+    global $xoopsModule, $xoopsConfig, $mydirname, $mydirpath, $mytrustdirname, $mytrustdirpath, $mymenu_fake_uri;
 
     $mymenu_find_paths = array(
-        $mydirpath.'/admin/mymenu.php' ,
-        $mydirpath.'/mymenu.php' ,
-        $mytrustdirpath.'/admin/mymenu.php' ,
+        $mydirpath.'/admin/mymenu.php',
+        $mydirpath.'/mymenu.php',
+        $mytrustdirpath.'/admin/mymenu.php',
         $mytrustdirpath.'/mymenu.php'
-    ) ;
+    );
 
     foreach ($mymenu_find_paths as $mymenu_find_path) {
         if (file_exists($mymenu_find_path)) {
-            include $mymenu_find_path ;
-            include_once __DIR__.'/adminmenu_functions.php' ;
-            altsys_adminmenu_insert_mymenu($xoopsModule) ;
-            altsys_adminmenu_hack_ft() ;
-            break ;
+            include $mymenu_find_path;
+            include_once __DIR__.'/adminmenu_functions.php';
+            altsys_adminmenu_insert_mymenu($xoopsModule);
+            altsys_adminmenu_hack_ft();
+            break;
         }
     }
 }
@@ -48,58 +48,58 @@ 
 
 function altsys_include_language_file($type)
 {
-    $mylang = $GLOBALS['xoopsConfig']['language'] ;
+    $mylang = $GLOBALS['xoopsConfig']['language'];
 
     if (file_exists(XOOPS_ROOT_PATH.'/modules/altsys/language/'.$mylang.'/'.$type.'.php')) {
-        include_once XOOPS_ROOT_PATH.'/modules/altsys/language/'.$mylang.'/'.$type.'.php' ;
+        include_once XOOPS_ROOT_PATH.'/modules/altsys/language/'.$mylang.'/'.$type.'.php';
     } elseif (file_exists(XOOPS_TRUST_PATH.'/libs/altsys/language/'.$mylang.'/'.$type.'.php')) {
-        include_once XOOPS_TRUST_PATH.'/libs/altsys/language/'.$mylang.'/'.$type.'.php' ;
+        include_once XOOPS_TRUST_PATH.'/libs/altsys/language/'.$mylang.'/'.$type.'.php';
     } elseif (file_exists(XOOPS_ROOT_PATH.'/modules/altsys/language/english/'.$type.'.php')) {
-        include_once XOOPS_ROOT_PATH.'/modules/altsys/language/english/'.$type.'.php' ;
+        include_once XOOPS_ROOT_PATH.'/modules/altsys/language/english/'.$type.'.php';
     } elseif (file_exists(XOOPS_TRUST_PATH.'/libs/altsys/language/english/'.$type.'.php')) {
-        include_once XOOPS_TRUST_PATH.'/libs/altsys/language/english/'.$type.'.php' ;
+        include_once XOOPS_TRUST_PATH.'/libs/altsys/language/english/'.$type.'.php';
     }
 }
 
 
-define('ALTSYS_CORE_TYPE_X20', 1) ; // 2.0.0-2.0.13 and 2.0.x-JP
-define('ALTSYS_CORE_TYPE_X20S', 2) ; // 2.0.14- from xoops.org (Skalpa's S)
-define('ALTSYS_CORE_TYPE_ORE', 4) ; // ORETEKI by marijuana
-define('ALTSYS_CORE_TYPE_X22', 8) ; // 2.2 from xoops.org
-define('ALTSYS_CORE_TYPE_X23P', 10) ; // 2.3 from xoops.org (phppp's P)
-define('ALTSYS_CORE_TYPE_X25', 11) ; // 2.5 from xoops.org
-define('ALTSYS_CORE_TYPE_ICMS', 12) ; // ImpressCMS
-define('ALTSYS_CORE_TYPE_XCL21', 16) ; // XOOPS Cube 2.1 Legacy
+define('ALTSYS_CORE_TYPE_X20', 1); // 2.0.0-2.0.13 and 2.0.x-JP
+define('ALTSYS_CORE_TYPE_X20S', 2); // 2.0.14- from xoops.org (Skalpa's S)
+define('ALTSYS_CORE_TYPE_ORE', 4); // ORETEKI by marijuana
+define('ALTSYS_CORE_TYPE_X22', 8); // 2.2 from xoops.org
+define('ALTSYS_CORE_TYPE_X23P', 10); // 2.3 from xoops.org (phppp's P)
+define('ALTSYS_CORE_TYPE_X25', 11); // 2.5 from xoops.org
+define('ALTSYS_CORE_TYPE_ICMS', 12); // ImpressCMS
+define('ALTSYS_CORE_TYPE_XCL21', 16); // XOOPS Cube 2.1 Legacy
 
 function altsys_get_core_type()
 {
-    static $result = null ;
+    static $result = null;
 
     if (empty($result)) {
         if (defined('XOOPS_ORETEKI')) {
-            $result = ALTSYS_CORE_TYPE_ORE ;
+            $result = ALTSYS_CORE_TYPE_ORE;
         } elseif (defined('XOOPS_CUBE_LEGACY')) {
-            $result = ALTSYS_CORE_TYPE_XCL21 ;
+            $result = ALTSYS_CORE_TYPE_XCL21;
         } elseif (defined('ICMS_VERSION_NAME')) {
-            $result = ALTSYS_CORE_TYPE_ICMS ;
+            $result = ALTSYS_CORE_TYPE_ICMS;
         } elseif (strstr(XOOPS_VERSION, 'JP')) {
-            $result = ALTSYS_CORE_TYPE_X20 ;
+            $result = ALTSYS_CORE_TYPE_X20;
         } else {
-            $versions = array_map('intval', explode('.', preg_replace('/[^0-9.]/', '', XOOPS_VERSION))) ;
+            $versions = array_map('intval', explode('.', preg_replace('/[^0-9.]/', '', XOOPS_VERSION)));
             if ($versions[0] == 2 && $versions[1] == 2) {
-                $result = ALTSYS_CORE_TYPE_X22 ;
+                $result = ALTSYS_CORE_TYPE_X22;
             } elseif ($versions[0] == 2 && $versions[1] == 0 && $versions[2] > 13) {
-                $result = ALTSYS_CORE_TYPE_X20S ;
+                $result = ALTSYS_CORE_TYPE_X20S;
             } elseif ($versions[0] == 2 && $versions[1] >= 5) {
-                $result = ALTSYS_CORE_TYPE_X25 ;
+                $result = ALTSYS_CORE_TYPE_X25;
             } elseif ($versions[0] == 2 && $versions[1] > 2) {
-                $result = ALTSYS_CORE_TYPE_X23P ;
+                $result = ALTSYS_CORE_TYPE_X23P;
             } else {
-                $result = ALTSYS_CORE_TYPE_X20 ;
+                $result = ALTSYS_CORE_TYPE_X20;
             }
         }
     }
-    return $result ;
+    return $result;
 }
 
 
@@ -113,36 +113,36 @@ 
         case ALTSYS_CORE_TYPE_X23P :
         case ALTSYS_CORE_TYPE_ICMS :
         default :
-            return XOOPS_URL.'/modules/system/admin.php?fct=preferences&op=showmod&mod='.$mid ;
+            return XOOPS_URL.'/modules/system/admin.php?fct=preferences&op=showmod&mod='.$mid;
         case ALTSYS_CORE_TYPE_XCL21 :
-            return XOOPS_URL.'/modules/legacy/admin/index.php?action=PreferenceEdit&confmod_id='.$mid ;
+            return XOOPS_URL.'/modules/legacy/admin/index.php?action=PreferenceEdit&confmod_id='.$mid;
     }
 }
 
 
 function altsys_template_touch($tpl_id)
 {
-    if (in_array(altsys_get_core_type(), array( ALTSYS_CORE_TYPE_X20S, ALTSYS_CORE_TYPE_X23P, ALTSYS_CORE_TYPE_X25 ))) {
+    if (in_array(altsys_get_core_type(), array(ALTSYS_CORE_TYPE_X20S, ALTSYS_CORE_TYPE_X23P, ALTSYS_CORE_TYPE_X25))) {
         // need to delete all files under templates_c/
-        altsys_clear_templates_c() ;
+        altsys_clear_templates_c();
     } else {
         // just touch the template
-        xoops_template_touch($tpl_id) ;
+        xoops_template_touch($tpl_id);
     }
 }
 
 
 function altsys_clear_templates_c()
 {
-    $dh = opendir(XOOPS_COMPILE_PATH) ;
+    $dh = opendir(XOOPS_COMPILE_PATH);
     while ($file = readdir($dh)) {
         if (substr($file, 0, 1) == '.') {
-            continue ;
+            continue;
         }
         if (substr($file, -4) != '.php') {
-            continue ;
+            continue;
         }
-        @unlink(XOOPS_COMPILE_PATH.'/'.$file) ;
+        @unlink(XOOPS_COMPILE_PATH.'/'.$file);
     }
-    closedir($dh) ;
+    closedir($dh);
 }

xoops_trust_path/libs/altsys/include/autoupdate_from_d3module.inc.php

Spacing +14 added lines, -14 removed lines

@@ -1,33 +1,33 @@
 <?php
 
-if (! $xoopsConfig['theme_fromfile']) {
-    return ;
+if (!$xoopsConfig['theme_fromfile']) {
+    return;
 }
 
 // templates/ under modules
 // $tplsadmin_autoupdate_path = XOOPS_THEME_PATH . '/' . $xoopsConfig['theme_set'] . '/templates' ;
 
-if (! is_array(@$tplsadmin_autoupdate_mydirnames)) {
-    return ;
+if (!is_array(@$tplsadmin_autoupdate_mydirnames)) {
+    return;
 }
 
 foreach ($tplsadmin_autoupdate_mydirnames as $tplsadmin_mydirname) {
-    $tplsadmin_mydirname = preg_replace('/[^a-zA-Z0-9_-]/', '', $tplsadmin_mydirname) ;
-    require XOOPS_ROOT_PATH . '/modules/' . $tplsadmin_mydirname . '/mytrustdirname.php' ;
-    $altsys_mid_path = $mytrustdirname == 'altsys' ? '/libs/' : '/modules/' ;
-    $tplsadmin_autoupdate_path = XOOPS_TRUST_PATH . $altsys_mid_path . $mytrustdirname . '/templates' ;
+    $tplsadmin_mydirname = preg_replace('/[^a-zA-Z0-9_-]/', '', $tplsadmin_mydirname);
+    require XOOPS_ROOT_PATH.'/modules/'.$tplsadmin_mydirname.'/mytrustdirname.php';
+    $altsys_mid_path = $mytrustdirname == 'altsys' ? '/libs/' : '/modules/';
+    $tplsadmin_autoupdate_path = XOOPS_TRUST_PATH.$altsys_mid_path.$mytrustdirname.'/templates';
 
     // modules
-    if ($handler = @opendir($tplsadmin_autoupdate_path . '/')) {
+    if ($handler = @opendir($tplsadmin_autoupdate_path.'/')) {
         while (($file = readdir($handler)) !== false) {
-            $file_path = $tplsadmin_autoupdate_path . '/' . $file ;
+            $file_path = $tplsadmin_autoupdate_path.'/'.$file;
             if (is_file($file_path)) {
                 $mtime = (int)(@filemtime($file_path));
-                $tpl_file = $tplsadmin_mydirname . '_' . $file ;
-                list($count) = $xoopsDB->fetchRow($xoopsDB->query('SELECT COUNT(*) FROM ' . $xoopsDB->prefix('tplfile') . " WHERE tpl_tplset='" . addslashes($xoopsConfig['template_set']) . "' AND tpl_file='" . addslashes($tpl_file) . "' AND tpl_lastmodified >= $mtime")) ;
+                $tpl_file = $tplsadmin_mydirname.'_'.$file;
+                list($count) = $xoopsDB->fetchRow($xoopsDB->query('SELECT COUNT(*) FROM '.$xoopsDB->prefix('tplfile')." WHERE tpl_tplset='".addslashes($xoopsConfig['template_set'])."' AND tpl_file='".addslashes($tpl_file)."' AND tpl_lastmodified >= $mtime"));
                 if ($count <= 0) {
-                    include_once XOOPS_TRUST_PATH.'/libs/altsys/include/tpls_functions.php' ;
-                    tplsadmin_import_data($xoopsConfig['template_set'], $tpl_file, implode('', file($file_path)), $mtime) ;
+                    include_once XOOPS_TRUST_PATH.'/libs/altsys/include/tpls_functions.php';
+                    tplsadmin_import_data($xoopsConfig['template_set'], $tpl_file, implode('', file($file_path)), $mtime);
                 }
             }
         }

xoops_trust_path/libs/altsys/include/gtickets.php

Spacing +104 added lines, -104 removed lines

@@ -2,147 +2,147 @@ 
 // GIJOE's Ticket Class (based on Marijuana's Oreteki XOOPS)
 // nobunobu's suggestions are applied
 
-if (! class_exists('XoopsGTicket')) {
+if (!class_exists('XoopsGTicket')) {
     class XoopsGTicket
     {
 
-        public $_errors = array() ;
-        public $_latest_token = '' ;
-        public $messages = array() ;
+        public $_errors = array();
+        public $_latest_token = '';
+        public $messages = array();
 
         public function __construct()
         {
-            global $xoopsConfig ;
+            global $xoopsConfig;
 
         // language file
-        if (defined('XOOPS_ROOT_PATH') && ! empty($xoopsConfig['language']) && ! strstr($xoopsConfig['language'], '/')) {
-            if (file_exists(dirname(__DIR__) . '/language/' . $xoopsConfig['language'] . '/gticket_messages.phtml')) {
-                include dirname(__DIR__) . '/language/' . $xoopsConfig['language'] . '/gticket_messages.phtml' ;
+        if (defined('XOOPS_ROOT_PATH') && !empty($xoopsConfig['language']) && !strstr($xoopsConfig['language'], '/')) {
+            if (file_exists(dirname(__DIR__).'/language/'.$xoopsConfig['language'].'/gticket_messages.phtml')) {
+                include dirname(__DIR__).'/language/'.$xoopsConfig['language'].'/gticket_messages.phtml';
             }
         }
 
         // default messages
         if (empty($this->messages)) {
             $this->messages = array(
-            'err_general' => 'GTicket Error' ,
-            'err_nostubs' => 'No stubs found' ,
-            'err_noticket' => 'No ticket found' ,
-            'err_nopair' => 'No valid ticket-stub pair found' ,
-            'err_timeout' => 'Time out' ,
-            'err_areaorref' => 'Invalid area or referer' ,
-            'fmt_prompt4repost' => 'error(s) found:<br /><span style="background-color:red;font-weight:bold;color:white;">%s</span><br />Confirm it.<br />And do you want to post again?' ,
+            'err_general' => 'GTicket Error',
+            'err_nostubs' => 'No stubs found',
+            'err_noticket' => 'No ticket found',
+            'err_nopair' => 'No valid ticket-stub pair found',
+            'err_timeout' => 'Time out',
+            'err_areaorref' => 'Invalid area or referer',
+            'fmt_prompt4repost' => 'error(s) found:<br /><span style="background-color:red;font-weight:bold;color:white;">%s</span><br />Confirm it.<br />And do you want to post again?',
             'btn_repost' => 'repost'
-        ) ;
+        );
         }
         }
 
     // render form as plain html
     public function getTicketHtml($salt = '', $timeout = 1800, $area = '')
     {
-        return '<input type="hidden" name="XOOPS_G_TICKET" value="'.$this->issue($salt, $timeout, $area).'" />' ;
+        return '<input type="hidden" name="XOOPS_G_TICKET" value="'.$this->issue($salt, $timeout, $area).'" />';
     }
 
     // returns an object of XoopsFormHidden including theh ticket
     public function getTicketXoopsForm($salt = '', $timeout = 1800, $area = '')
     {
-        return new XoopsFormHidden('XOOPS_G_TICKET', $this->issue($salt, $timeout, $area)) ;
+        return new XoopsFormHidden('XOOPS_G_TICKET', $this->issue($salt, $timeout, $area));
     }
 
     // add a ticket as Hidden Element into XoopsForm
     public function addTicketXoopsFormElement(&$form, $salt = '', $timeout = 1800, $area = '')
     {
-        $form->addElement(new XoopsFormHidden('XOOPS_G_TICKET', $this->issue($salt, $timeout, $area))) ;
+        $form->addElement(new XoopsFormHidden('XOOPS_G_TICKET', $this->issue($salt, $timeout, $area)));
     }
 
     // returns an array for xoops_confirm() ;
     public function getTicketArray($salt = '', $timeout = 1800, $area = '')
     {
-        return array( 'XOOPS_G_TICKET' => $this->issue($salt, $timeout, $area) ) ;
+        return array('XOOPS_G_TICKET' => $this->issue($salt, $timeout, $area));
     }
 
     // return GET parameter string.
-    public function getTicketParamString($salt = '', $noamp = false, $timeout=1800, $area = '')
+    public function getTicketParamString($salt = '', $noamp = false, $timeout = 1800, $area = '')
     {
-        return ($noamp ? '' : '&amp;') . 'XOOPS_G_TICKET=' . $this->issue($salt, $timeout, $area) ;
+        return ($noamp ? '' : '&amp;').'XOOPS_G_TICKET='.$this->issue($salt, $timeout, $area);
     }
 
     // issue a ticket
     public function issue($salt = '', $timeout = 1800, $area = '')
     {
-        global $xoopsModule ;
+        global $xoopsModule;
 
         // create a token
-        list($usec, $sec) = explode(' ', microtime()) ;
-        $appendix_salt = empty($_SERVER['PATH']) ? XOOPS_DB_NAME : $_SERVER['PATH'] ;
-        $token = crypt($salt . $usec . $appendix_salt . $sec, XOOPS_DB_PREFIX) ;
-        $this->_latest_token = $token ;
+        list($usec, $sec) = explode(' ', microtime());
+        $appendix_salt = empty($_SERVER['PATH']) ? XOOPS_DB_NAME : $_SERVER['PATH'];
+        $token = crypt($salt.$usec.$appendix_salt.$sec, XOOPS_DB_PREFIX);
+        $this->_latest_token = $token;
 
         if (empty($_SESSION['XOOPS_G_STUBS'])) {
-            $_SESSION['XOOPS_G_STUBS'] = array() ;
+            $_SESSION['XOOPS_G_STUBS'] = array();
         }
 
         // limit max stubs 10
         if (count($_SESSION['XOOPS_G_STUBS']) > 10) {
-            $_SESSION['XOOPS_G_STUBS'] = array_slice($_SESSION['XOOPS_G_STUBS'], -10) ;
+            $_SESSION['XOOPS_G_STUBS'] = array_slice($_SESSION['XOOPS_G_STUBS'], -10);
         }
 
         // record referer if browser send it
-        $referer = empty($_SERVER['HTTP_REFERER']) ? '' : $_SERVER['REQUEST_URI'] ;
+        $referer = empty($_SERVER['HTTP_REFERER']) ? '' : $_SERVER['REQUEST_URI'];
 
         // area as module's dirname
-        if (! $area && is_object(@$xoopsModule)) {
-            $area = $xoopsModule->getVar('dirname') ;
+        if (!$area && is_object(@$xoopsModule)) {
+            $area = $xoopsModule->getVar('dirname');
         }
 
         // store stub
         $_SESSION['XOOPS_G_STUBS'][] = array(
-            'expire' => time() + $timeout ,
-            'referer' => $referer ,
-            'area' => $area ,
+            'expire' => time() + $timeout,
+            'referer' => $referer,
+            'area' => $area,
             'token' => $token
-        ) ;
+        );
 
         // paid md5ed token as a ticket
-        return md5($token . XOOPS_DB_PREFIX) ;
+        return md5($token.XOOPS_DB_PREFIX);
     }
 
     // check a ticket
     public function check($post = true, $area = '', $allow_repost = true)
     {
-        global $xoopsModule ;
+        global $xoopsModule;
 
-        $this->_errors = array() ;
+        $this->_errors = array();
 
         // CHECK: stubs are not stored in session
-        if (! is_array(@$_SESSION['XOOPS_G_STUBS'])) {
-            $this->_errors[] = $this->messages['err_nostubs'] ;
-            $_SESSION['XOOPS_G_STUBS'] = array() ;
+        if (!is_array(@$_SESSION['XOOPS_G_STUBS'])) {
+            $this->_errors[] = $this->messages['err_nostubs'];
+            $_SESSION['XOOPS_G_STUBS'] = array();
         }
 
         // get key&val of the ticket from a user's query
-        $ticket = $post ? @$_POST['XOOPS_G_TICKET'] : @$_GET['XOOPS_G_TICKET'] ;
+        $ticket = $post ? @$_POST['XOOPS_G_TICKET'] : @$_GET['XOOPS_G_TICKET'];
 
         // CHECK: no tickets found
         if (empty($ticket)) {
-            $this->_errors[] = $this->messages['err_noticket'] ;
+            $this->_errors[] = $this->messages['err_noticket'];
         }
 
         // gargage collection & find a right stub
-        $stubs_tmp = $_SESSION['XOOPS_G_STUBS'] ;
-        $_SESSION['XOOPS_G_STUBS'] = array() ;
+        $stubs_tmp = $_SESSION['XOOPS_G_STUBS'];
+        $_SESSION['XOOPS_G_STUBS'] = array();
         foreach ($stubs_tmp as $stub) {
             // default lifetime 30min
             if ($stub['expire'] >= time()) {
-                if (md5($stub['token'] . XOOPS_DB_PREFIX) === $ticket) {
-                    $found_stub = $stub ;
+                if (md5($stub['token'].XOOPS_DB_PREFIX) === $ticket) {
+                    $found_stub = $stub;
                 } else {
                     // store the other valid stubs into session
-                    $_SESSION['XOOPS_G_STUBS'][] = $stub ;
+                    $_SESSION['XOOPS_G_STUBS'][] = $stub;
                 }
             } else {
-                if (md5($stub['token'] . XOOPS_DB_PREFIX) === $ticket) {
+                if (md5($stub['token'].XOOPS_DB_PREFIX) === $ticket) {
                     // not CSRF but Time-Out
-                    $timeout_flag = true ;
+                    $timeout_flag = true;
                 }
             }
         }
@@ -150,40 +150,40 @@ 
         // CHECK: the right stub found or not
         if (empty($found_stub)) {
             if (empty($timeout_flag)) {
-                $this->_errors[] = $this->messages['err_nopair'] ;
+                $this->_errors[] = $this->messages['err_nopair'];
             } else {
-                $this->_errors[] = $this->messages['err_timeout'] ;
+                $this->_errors[] = $this->messages['err_timeout'];
             }
         } else {
 
             // set area if necessary
             // area as module's dirname
-            if (! $area && is_object(@$xoopsModule)) {
-                $area = $xoopsModule->getVar('dirname') ;
+            if (!$area && is_object(@$xoopsModule)) {
+                $area = $xoopsModule->getVar('dirname');
             }
 
             // check area or referer
             if (@$found_stub['area'] == $area) {
-                $area_check = true ;
+                $area_check = true;
             }
-            if (! empty($found_stub['referer']) && strstr(@$_SERVER['HTTP_REFERER'], $found_stub['referer'])) {
-                $referer_check = true ;
+            if (!empty($found_stub['referer']) && strstr(@$_SERVER['HTTP_REFERER'], $found_stub['referer'])) {
+                $referer_check = true;
             }
 
             if (empty($area_check) && empty($referer_check)) { // loose
-                $this->_errors[] = $this->messages['err_areaorref'] ;
+                $this->_errors[] = $this->messages['err_areaorref'];
             }
         }
 
-        if (! empty($this->_errors)) {
+        if (!empty($this->_errors)) {
             if ($allow_repost) {
                 // repost form
-                $this->draw_repost_form($area) ;
-                exit ;
+                $this->draw_repost_form($area);
+                exit;
             } else {
                 // failed
-                $this->clear() ;
-                return false ;
+                $this->clear();
+                return false;
             }
         } else {
             // all green
@@ -196,78 +196,78 @@ 
     {
         // Notify which file is broken
         if (headers_sent()) {
-            restore_error_handler() ;
-            set_error_handler(array( &$this, 'errorHandler4FindOutput' )) ;
-            header('Dummy: for warning') ;
-            restore_error_handler() ;
-            exit ;
+            restore_error_handler();
+            set_error_handler(array(&$this, 'errorHandler4FindOutput'));
+            header('Dummy: for warning');
+            restore_error_handler();
+            exit;
         }
 
-        $table = '<table>' ;
-        $form = '<form action="?'.htmlspecialchars(@$_SERVER['QUERY_STRING'], ENT_QUOTES).'" method="post" >' ;
+        $table = '<table>';
+        $form = '<form action="?'.htmlspecialchars(@$_SERVER['QUERY_STRING'], ENT_QUOTES).'" method="post" >';
         foreach ($_POST as $key => $val) {
             if ($key == 'XOOPS_G_TICKET') {
-                continue ;
+                continue;
             }
             if (get_magic_quotes_gpc()) {
-                $key = stripslashes($key) ;
+                $key = stripslashes($key);
             }
             if (is_array($val)) {
-                list($tmp_table, $tmp_form) = $this->extract_post_recursive(htmlspecialchars($key, ENT_QUOTES), $val) ;
-                $table .= $tmp_table ;
-                $form .= $tmp_form ;
+                list($tmp_table, $tmp_form) = $this->extract_post_recursive(htmlspecialchars($key, ENT_QUOTES), $val);
+                $table .= $tmp_table;
+                $form .= $tmp_form;
             } else {
                 if (get_magic_quotes_gpc()) {
-                    $val = stripslashes($val) ;
+                    $val = stripslashes($val);
                 }
-                $table .= '<tr><th>'.htmlspecialchars($key, ENT_QUOTES).'</th><td>'.htmlspecialchars($val, ENT_QUOTES).'</td></tr>'."\n" ;
-                $form .= '<input type="hidden" name="'.htmlspecialchars($key, ENT_QUOTES).'" value="'.htmlspecialchars($val, ENT_QUOTES).'" />'."\n" ;
+                $table .= '<tr><th>'.htmlspecialchars($key, ENT_QUOTES).'</th><td>'.htmlspecialchars($val, ENT_QUOTES).'</td></tr>'."\n";
+                $form .= '<input type="hidden" name="'.htmlspecialchars($key, ENT_QUOTES).'" value="'.htmlspecialchars($val, ENT_QUOTES).'" />'."\n";
             }
         }
-        $table .= '</table>' ;
-        $form .= $this->getTicketHtml(__LINE__, 300, $area).'<input type="submit" value="'.$this->messages['btn_repost'].'" /></form>' ;
+        $table .= '</table>';
+        $form .= $this->getTicketHtml(__LINE__, 300, $area).'<input type="submit" value="'.$this->messages['btn_repost'].'" /></form>';
 
-        error_reporting(0) ;
+        error_reporting(0);
         while (@ob_get_level() && @ob_end_clean());
 
-        echo '<html><head><title>'.$this->messages['err_general'].'</title><style>table,td,th {border:solid black 1px; border-collapse:collapse;}</style></head><body>' . sprintf($this->messages['fmt_prompt4repost'], $this->getErrors()) . $table . $form . '</body></html>' ;
+        echo '<html><head><title>'.$this->messages['err_general'].'</title><style>table,td,th {border:solid black 1px; border-collapse:collapse;}</style></head><body>'.sprintf($this->messages['fmt_prompt4repost'], $this->getErrors()).$table.$form.'</body></html>';
     }
 
         public function extract_post_recursive($key_name, $tmp_array)
         {
-            $table = '' ;
-            $form = '' ;
+            $table = '';
+            $form = '';
             foreach ($tmp_array as $key => $val) {
                 if (get_magic_quotes_gpc()) {
-                    $key = stripslashes($key) ;
+                    $key = stripslashes($key);
                 }
                 if (is_array($val)) {
-                    list($tmp_table, $tmp_form) = $this->extract_post_recursive($key_name.'['.htmlspecialchars($key, ENT_QUOTES).']', $val) ;
-                    $table .= $tmp_table ;
-                    $form .= $tmp_form ;
+                    list($tmp_table, $tmp_form) = $this->extract_post_recursive($key_name.'['.htmlspecialchars($key, ENT_QUOTES).']', $val);
+                    $table .= $tmp_table;
+                    $form .= $tmp_form;
                 } else {
                     if (get_magic_quotes_gpc()) {
-                        $val = stripslashes($val) ;
+                        $val = stripslashes($val);
                     }
-                    $table .= '<tr><th>'.$key_name.'['.htmlspecialchars($key, ENT_QUOTES).']</th><td>'.htmlspecialchars($val, ENT_QUOTES).'</td></tr>'."\n" ;
-                    $form .= '<input type="hidden" name="'.$key_name.'['.htmlspecialchars($key, ENT_QUOTES).']" value="'.htmlspecialchars($val, ENT_QUOTES).'" />'."\n" ;
+                    $table .= '<tr><th>'.$key_name.'['.htmlspecialchars($key, ENT_QUOTES).']</th><td>'.htmlspecialchars($val, ENT_QUOTES).'</td></tr>'."\n";
+                    $form .= '<input type="hidden" name="'.$key_name.'['.htmlspecialchars($key, ENT_QUOTES).']" value="'.htmlspecialchars($val, ENT_QUOTES).'" />'."\n";
                 }
             }
-            return array( $table , $form ) ;
+            return array($table, $form);
         }
 
 
     // clear all stubs
     public function clear()
     {
-        $_SESSION['XOOPS_G_STUBS'] = array() ;
+        $_SESSION['XOOPS_G_STUBS'] = array();
     }
 
 
     // Ticket Using
     public function using()
     {
-        if (! empty($_SESSION['XOOPS_G_STUBS'])) {
+        if (!empty($_SESSION['XOOPS_G_STUBS'])) {
             return true;
         } else {
             return false;
@@ -279,39 +279,39 @@ 
     public function getErrors($ashtml = true)
     {
         if ($ashtml) {
-            $ret = '' ;
+            $ret = '';
             foreach ($this->_errors as $msg) {
-                $ret .= "$msg<br />\n" ;
+                $ret .= "$msg<br />\n";
             }
         } else {
-            $ret = $this->_errors ;
+            $ret = $this->_errors;
         }
-        return $ret ;
+        return $ret;
     }
 
         public function errorHandler4FindOutput($errNo, $errStr, $errFile, $errLine)
         {
             if (preg_match('?'.preg_quote(XOOPS_ROOT_PATH).'([^:]+)\:(\d+)?', $errStr, $regs)) {
-                echo 'Irregular output! check the file ' . htmlspecialchars($regs[1]) . ' line ' . htmlspecialchars($regs[2]) ;
+                echo 'Irregular output! check the file '.htmlspecialchars($regs[1]).' line '.htmlspecialchars($regs[2]);
             } else {
                 echo 'Irregular output! check language files etc.';
             }
-            return ;
+            return;
         }
 // end of class
     }
 
 // create a instance in global scope
-$GLOBALS['xoopsGTicket'] = new XoopsGTicket() ;
+$GLOBALS['xoopsGTicket'] = new XoopsGTicket();
 }
 
-if (! function_exists('admin_refcheck')) {
+if (!function_exists('admin_refcheck')) {
 
 //Admin Referer Check By Marijuana(Rev.011)
 function admin_refcheck($chkref = '')
 {
     if (empty($_SERVER['HTTP_REFERER'])) {
-        return true ;
+        return true;
     } else {
         $ref = $_SERVER['HTTP_REFERER'];
     }