mambax7 / altsys

xoops_trust_path/libs/altsys/include/tpls_functions.php

Spacing +61 added lines, -61 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);
@@ -137,33 +137,33 @@ 
 
     if (defined('ALTSYS_TPLSADMIN_BASEPATH')) {
         // Special hook
-        $path = ALTSYS_TPLSADMIN_BASEPATH.'/'.substr($tpl_file, strlen($dirname) + 1) ;
-    } elseif ($mytrustdirname || @include XOOPS_ROOT_PATH . '/modules/' . $dirname . '/mytrustdirname.php') {
+        $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/mygrouppermform.php

Spacing +27 added lines, -27 removed lines

@@ -17,8 +17,8 @@ 
  * @author       XOOPS Development Team, Kazumi Ono (AKA onokazu)
  */
 
-if (! defined('XOOPS_ROOT_PATH')) {
-    exit ;
+if (!defined('XOOPS_ROOT_PATH')) {
+    exit;
 }
 
 require_once XOOPS_ROOT_PATH.'/class/xoopsform/formelement.php';
@@ -48,7 +48,7 @@ 
      * Tree structure of items
      * @var array
      */
-    public $_itemTree = array() ;
+    public $_itemTree = array();
     /**
      * Name of permission
      * @var string
@@ -63,7 +63,7 @@ 
      * Appendix
      * @var array ('permname'=>,'itemid'=>,'itemname'=>,'selected'=>)
      */
-    public $_appendix = array() ;
+    public $_appendix = array();
 
     /**
      * Constructor
@@ -103,7 +103,7 @@ 
      */
     public function addAppendix($permName, $itemId, $itemName)
     {
-        $this->_appendix[] = array('permname'=>$permName,'itemid'=>$itemId,'itemname'=>$itemName,'selected'=>false);
+        $this->_appendix[] = array('permname'=>$permName, 'itemid'=>$itemId, 'itemname'=>$itemName, 'selected'=>false);
     }
 
     /**
@@ -137,7 +137,7 @@ 
      */
     public function render()
     {
-        global $xoopsGTicket ;
+        global $xoopsGTicket;
 
         // load all child ids for javascript codes
         foreach (array_keys($this->_itemTree) as $item_id) {
@@ -154,11 +154,11 @@ 
             $ele->setOptionTree($this->_itemTree);
 
             // GIJ start
-            $ele->setDescription('<input type="checkbox" onclick="with(document.groupperm_form){for(i=0;i<length;i++){if(elements[i].name.match(/^perms\[(module_admin|module_read|block_read)\]\[groups\]\['.$i.'\]/)){elements[i].checked=this.checked;}}};">') ;
+            $ele->setDescription('<input type="checkbox" onclick="with(document.groupperm_form){for(i=0;i<length;i++){if(elements[i].name.match(/^perms\[(module_admin|module_read|block_read)\]\[groups\]\['.$i.'\]/)){elements[i].checked=this.checked;}}};">');
             // GIJ_end
 
             foreach ($this->_appendix as $key => $append) {
-                $this->_appendix[$key]['selected'] = $gperm_handler->checkRight($append['permname'], $append['itemid'], $i, $this->_modid) ;
+                $this->_appendix[$key]['selected'] = $gperm_handler->checkRight($append['permname'], $append['itemid'], $i, $this->_modid);
             }
             $ele->setAppendix($this->_appendix);
             $this->addElement($ele);
@@ -168,11 +168,11 @@ 
         // GIJ start
         $jstray = new XoopsFormElementTray(' &nbsp; ');
         $jsuncheckbutton = new XoopsFormButton('', 'none', _NONE, 'button');
-        $jsuncheckbutton->setExtra("onclick=\"with(document.groupperm_form){for(i=0;i<length;i++){if(elements[i].type=='checkbox'){elements[i].checked=false;}}}\"") ;
+        $jsuncheckbutton->setExtra("onclick=\"with(document.groupperm_form){for(i=0;i<length;i++){if(elements[i].type=='checkbox'){elements[i].checked=false;}}}\"");
         $jscheckbutton = new XoopsFormButton('', 'all', _ALL, 'button');
-        $jscheckbutton->setExtra("onclick=\"with(document.groupperm_form){for(i=0;i<length;i++){if(elements[i].type=='checkbox' && (elements[i].name.indexOf('module_admin')<0 || elements[i].name.indexOf('[groups][1]')>=0)){elements[i].checked=true;}}}\"") ;
-        $jstray->addElement($jsuncheckbutton) ;
-        $jstray->addElement($jscheckbutton) ;
+        $jscheckbutton->setExtra("onclick=\"with(document.groupperm_form){for(i=0;i<length;i++){if(elements[i].type=='checkbox' && (elements[i].name.indexOf('module_admin')<0 || elements[i].name.indexOf('[groups][1]')>=0)){elements[i].checked=true;}}}\"");
+        $jstray->addElement($jsuncheckbutton);
+        $jstray->addElement($jscheckbutton);
         $this->addElement($jstray);
         // GIJ end
 
@@ -183,7 +183,7 @@ 
 
         $ret = '<h4>'.$this->getTitle().'</h4>'.$this->_permDesc.'<br />';
         $ret .= "<form name='".$this->getName()."' id='".$this->getName()."' action='".$this->getAction()."' method='".$this->getMethod()."'".$this->getExtra().">\n<table width='100%' class='outer' cellspacing='1'>\n";
-        $elements =& $this->getElements();
+        $elements = & $this->getElements();
         foreach (array_keys($elements) as $i) {
             if (!is_object($elements[$i])) {
                 $ret .= $elements[$i];
@@ -199,7 +199,7 @@ 
                 $ret .= $elements[$i]->render();
             }
         }
-        $ret .= '</table>' . $xoopsGTicket->getTicketHtml(__LINE__, 1800, 'myblocksadmin') . '</form>';
+        $ret .= '</table>'.$xoopsGTicket->getTicketHtml(__LINE__, 1800, 'myblocksadmin').'</form>';
         return $ret;
     }
 }
@@ -235,7 +235,7 @@ 
      * Appendix
      * @var array ('permname'=>,'itemid'=>,'itemname'=>,'selected'=>)
      */
-    public $_appendix = array() ;
+    public $_appendix = array();
 
     /**
      * Constructor
@@ -285,7 +285,7 @@ 
      */
     public function setAppendix($appendix)
     {
-        $this->_appendix = $appendix ;
+        $this->_appendix = $appendix;
     }
 
     /**
@@ -296,7 +296,7 @@ 
      */
     public function render()
     {
-        $ret = '' ;
+        $ret = '';
 
         if (count($this->_appendix) > 0) {
             $ret .= '<table class="outer"><tr>';
@@ -306,11 +306,11 @@ 
                     $ret .= '</tr><tr>';
                     $cols = 1;
                 }
-                $checked = $append['selected'] ? 'checked="checked"' : '' ;
-                $name = 'perms['.$append['permname'].']' ;
-                $itemid = $append['itemid'] ;
-                $itemid = $append['itemid'] ;
-                $ret .= "<td class=\"odd\"><input type=\"checkbox\" name=\"{$name}[groups][$this->_groupId][$itemid]\" id=\"{$name}[groups][$this->_groupId][$itemid]\" value=\"1\" $checked />{$append['itemname']}<input type=\"hidden\" name=\"{$name}[parents][$itemid]\" value=\"\" /><input type=\"hidden\" name=\"{$name}[itemname][$itemid]\" value=\"{$append['itemname']}\" /><br /></td>" ;
+                $checked = $append['selected'] ? 'checked="checked"' : '';
+                $name = 'perms['.$append['permname'].']';
+                $itemid = $append['itemid'];
+                $itemid = $append['itemid'];
+                $ret .= "<td class=\"odd\"><input type=\"checkbox\" name=\"{$name}[groups][$this->_groupId][$itemid]\" id=\"{$name}[groups][$this->_groupId][$itemid]\" value=\"1\" $checked />{$append['itemname']}<input type=\"hidden\" name=\"{$name}[parents][$itemid]\" value=\"\" /><input type=\"hidden\" name=\"{$name}[itemname][$itemid]\" value=\"{$append['itemname']}\" /><br /></td>";
                 $cols++;
             }
             $ret .= '</tr></table>';
@@ -318,7 +318,7 @@ 
 
         $ret .= '<table class="outer"><tr>';
         $cols = 1;
-        if (! empty($this->_optionTree[0]['children'])) {
+        if (!empty($this->_optionTree[0]['children'])) {
             foreach ($this->_optionTree[0]['children'] as $topitem) {
                 if ($cols > 4) {
                     $ret .= '</tr><tr>';
@@ -346,8 +346,8 @@ 
      */
     public function _renderOptionTree(&$tree, $option, $prefix, $parentIds = array())
     {
-        $tree .= $prefix."<input type=\"checkbox\" name=\"".$this->getName() . '[groups][' . $this->_groupId . '][' . $option['id'] . "]\" id=\"" . $this->getName() . '[groups][' . $this->_groupId . ']['
-                 . $option['id'] . "]\" onclick=\"";
+        $tree .= $prefix."<input type=\"checkbox\" name=\"".$this->getName().'[groups]['.$this->_groupId.']['.$option['id']."]\" id=\"".$this->getName().'[groups]['.$this->_groupId.']['
+                 . $option['id']."]\" onclick=\"";
         // If there are parent elements, add javascript that will
         // make them selecteded when this element is checked to make
         // sure permissions to parent items are added as well.
@@ -367,8 +367,8 @@ 
         if (isset($this->_value) && in_array($option['id'], $this->_value)) {
             $tree .= ' checked="checked"';
         }
-        $tree .= ' />' . $option['name'] . "<input type=\"hidden\" name=\"" . $this->getName() . '[parents][' . $option['id'] . "]\" value=\"" . implode(':', $parentIds) . "\" /><input type=\"hidden\" name=\"" . $this->getName() . '[itemname]['
-                 . $option['id'] . "]\" value=\"" . htmlspecialchars($option['name']) . "\" /><br />\n";
+        $tree .= ' />'.$option['name']."<input type=\"hidden\" name=\"".$this->getName().'[parents]['.$option['id']."]\" value=\"".implode(':', $parentIds)."\" /><input type=\"hidden\" name=\"".$this->getName().'[itemname]['
+                 . $option['id']."]\" value=\"".htmlspecialchars($option['name'])."\" /><br />\n";
         if (isset($option['children'])) {
             foreach ($option['children'] as $child) {
                 array_push($parentIds, $option['id']);

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/admin_in_theme_header.inc.php

Spacing +47 added lines, -47 removed lines

@@ -19,7 +19,7 @@ 
 
 // This is a mimic file from header.php of 2.0.16-JP
 
-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;
@@ -48,7 +48,7 @@ 
 //HACK by domifara
     if (defined('XOOPS_CUBE_LEGACY')) {
         $handler = xoops_getHandler('block');
-        $xoopsblock = $handler->create(false) ;
+        $xoopsblock = $handler->create(false);
     } else {
         $xoopsblock = new XoopsBlock();
     }
@@ -58,46 +58,46 @@ 
     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') ;
-                $target_module = $module_handler->get((int)$_GET['mod']) ;
+            if ($xoopsModule->getVar('mid') == 1 && @$_GET['fct'] == 'preferences' && @$_GET['op'] == 'showmod' && !empty($_GET['mod'])) {
+                $module_handler = xoops_getHandler('module');
+                $target_module = $module_handler->get((int)$_GET['mod']);
             } else {
-                $target_module = $xoopsModule ;
+                $target_module = $xoopsModule;
             }
 
             // set page title
             $xoopsTpl->assign(array('xoops_pagetitle' => $target_module->getVar('name'), 'xoops_modulename' => $target_module->getVar('name'), 'xoops_dirname' => $target_module->getVar('dirname')));
 
             // xoops_breadcrumbs
-            $breadcrumbsObj = AltsysBreadcrumbs::getInstance() ;
+            $breadcrumbsObj = AltsysBreadcrumbs::getInstance();
             if ($breadcrumbsObj->hasPaths()) {
-                $xoops_breadcrumbs = $breadcrumbsObj->getXoopsBreadcrumbs() ;
+                $xoops_breadcrumbs = $breadcrumbsObj->getXoopsBreadcrumbs();
             } else {
-                $mod_url = XOOPS_URL.'/modules/'.$target_module->getVar('dirname') ;
-                $mod_path = XOOPS_ROOT_PATH.'/modules/'.$target_module->getVar('dirname') ;
-                $modinfo =& $target_module->getInfo() ;
-                $xoops_breadcrumbs = array() ;
-                if (! empty($modinfo['hasMain'])) {
+                $mod_url = XOOPS_URL.'/modules/'.$target_module->getVar('dirname');
+                $mod_path = XOOPS_ROOT_PATH.'/modules/'.$target_module->getVar('dirname');
+                $modinfo = & $target_module->getInfo();
+                $xoops_breadcrumbs = array();
+                if (!empty($modinfo['hasMain'])) {
                     $xoops_breadcrumbs[] = array(
-                        'url' => $mod_url.'/' ,
+                        'url' => $mod_url.'/',
                         'name' => sprintf(_MD_A_AINTHEME_FMT_PUBLICTOP, $target_module->getVar('name'))
-                    ) ;
+                    );
                 }
-                if (! empty($modinfo['adminindex'])) {
+                if (!empty($modinfo['adminindex'])) {
                     $xoops_breadcrumbs[] = array(
-                        'url' => $mod_url.'/'.$modinfo['adminindex'] ,
+                        'url' => $mod_url.'/'.$modinfo['adminindex'],
                         'name' => sprintf(_MD_A_AINTHEME_FMT_ADMINTOP, $target_module->getVar('name'))
-                    ) ;
+                    );
                 }
-                if (! empty($GLOBALS['altsysAdminPageTitle'])) {
-                    $xoops_breadcrumbs[] = array( 'name' => htmlspecialchars($GLOBALS['altsysAdminPageTitle'], ENT_QUOTES) ) ;
-                } elseif (! empty($modinfo['adminmenu'])) {
-                    @include $mod_path.'/'.$modinfo['adminmenu'] ;
+                if (!empty($GLOBALS['altsysAdminPageTitle'])) {
+                    $xoops_breadcrumbs[] = array('name' => htmlspecialchars($GLOBALS['altsysAdminPageTitle'], ENT_QUOTES));
+                } elseif (!empty($modinfo['adminmenu'])) {
+                    @include $mod_path.'/'.$modinfo['adminmenu'];
                     if (is_array(@$adminmenu)) {
                         foreach ($adminmenu as $eachmenu) {
                             if (strstr($_SERVER['REQUEST_URI'], $eachmenu['link'])) {
-                                $xoops_breadcrumbs[] = array( 'name' => $eachmenu['title'] ) ;
-                                break ;
+                                $xoops_breadcrumbs[] = array('name' => $eachmenu['title']);
+                                break;
                             }
                         }
                     }
@@ -106,21 +106,21 @@ 
 
             //$block_arr =& $xoopsblock->getAllByGroupModule($xoopsUser->getGroups(), $target_module->getVar('mid'), false, XOOPS_BLOCK_VISIBLE);
         } else {
-            $xoopsTpl->assign(array( 'xoops_pagetitle' => _CPHOME )) ;
+            $xoopsTpl->assign(array('xoops_pagetitle' => _CPHOME));
             $xoops_breadcrumbs = array(
                 array(
-                    'url' => XOOPS_URL.'/admin.php' ,
+                    'url' => XOOPS_URL.'/admin.php',
                     'name' => _CPHOME
                 )
-            ) ;
+            );
         }
     } else {
-        exit ;
+        exit;
     }
 
     // get block_arr
-    $db = XoopsDatabaseFactory::getDatabaseConnection() ;
-    $sql = 'SELECT DISTINCT gperm_itemid FROM ' . $db->prefix('group_permission') . " WHERE gperm_name = 'block_read' AND gperm_modid = 1 AND gperm_groupid IN (" . implode(',', $xoopsUser->getGroups()) . ')';
+    $db = XoopsDatabaseFactory::getDatabaseConnection();
+    $sql = 'SELECT DISTINCT gperm_itemid FROM '.$db->prefix('group_permission')." WHERE gperm_name = 'block_read' AND gperm_modid = 1 AND gperm_groupid IN (".implode(',', $xoopsUser->getGroups()).')';
     $result = $db->query($sql);
 
     $blockids = array();
@@ -128,30 +128,30 @@ 
         $blockids[] = (int)$blockid;
     }
 
-    global $block_arr , $i ; // for piCal :-)
-    $block_arr = array() ;
+    global $block_arr, $i; // for piCal :-)
+    $block_arr = array();
     if (!empty($blockids)) {
-        $sql = 'SELECT b.* FROM '.$db->prefix('newblocks').' b, '.$db->prefix('block_module_link').' m WHERE m.block_id=b.bid AND b.isactive=1 AND b.visible=1 AND m.module_id=' . (int)$altsysModuleId
-               . ' AND b.bid IN (' . implode(',', $blockids) . ') ORDER BY b.weight,b.bid' ;
+        $sql = 'SELECT b.* FROM '.$db->prefix('newblocks').' b, '.$db->prefix('block_module_link').' m WHERE m.block_id=b.bid AND b.isactive=1 AND b.visible=1 AND m.module_id='.(int)$altsysModuleId
+               . ' AND b.bid IN ('.implode(',', $blockids).') ORDER BY b.weight,b.bid';
         $result = $db->query($sql);
         while ($myrow = $db->fetchArray($result)) {
 
 //HACK by domifara
             if (defined('XOOPS_CUBE_LEGACY')) {
-                $block = $handler->create(false) ;
+                $block = $handler->create(false);
                 $block->assignVars($myrow);
             } else {
-                $block = new XoopsBlock($myrow) ;
+                $block = new XoopsBlock($myrow);
             }
 
-            $block_arr[ $myrow['bid'] ] = $block ;
+            $block_arr[$myrow['bid']] = $block;
         }
     }
 
-    $adminmenublock_exists = false ;
+    $adminmenublock_exists = false;
     foreach (array_keys($block_arr) as $i) {
         if ($block_arr[$i]->getVar('show_func') == 'b_altsys_admin_menu_show') {
-            $adminmenublock_exists = true ;
+            $adminmenublock_exists = true;
         }
         $bcachetime = $block_arr[$i]->getVar('bcachetime');
         if (empty($bcachetime)) {
@@ -232,15 +232,15 @@ 
     }
 
     // FALLBACK inserting admin_menu_block in admin side
-    if (! $adminmenublock_exists) {
-        require_once XOOPS_ROOT_PATH.'/modules/altsys/blocks/blocks.php' ;
-        $admin_menu_block = array( b_altsys_admin_menu_show(array( 'altsys' )) ) ;
-        $admin_menu_block[0]['title'] = 'Admin Menu' ;
-        $lblocks =& $xoopsTpl->get_template_vars('xoops_lblocks') ;
-        if (! is_array($lblocks)) {
-            $lblocks = array() ;
+    if (!$adminmenublock_exists) {
+        require_once XOOPS_ROOT_PATH.'/modules/altsys/blocks/blocks.php';
+        $admin_menu_block = array(b_altsys_admin_menu_show(array('altsys')));
+        $admin_menu_block[0]['title'] = 'Admin Menu';
+        $lblocks = & $xoopsTpl->get_template_vars('xoops_lblocks');
+        if (!is_array($lblocks)) {
+            $lblocks = array();
         }
-        $xoopsTpl->assign('xoops_lblocks', array_merge($admin_menu_block, $lblocks)) ;
+        $xoopsTpl->assign('xoops_lblocks', array_merge($admin_menu_block, $lblocks));
     }
 
     //unset($block_arr);

xoops_trust_path/libs/altsys/myblocksadmin.php

Spacing +32 added lines, -32 removed lines

@@ -5,56 +5,56 @@ 
 //                       GIJOE <http://www.peak.ne.jp/>                      //
 // ------------------------------------------------------------------------- //
 
-require_once __DIR__.'/class/AltsysBreadcrumbs.class.php' ;
-require_once __DIR__.'/include/gtickets.php' ;
-include_once __DIR__.'/include/altsys_functions.php' ;
-include_once __DIR__.'/include/mygrouppermform.php' ;
-include_once XOOPS_ROOT_PATH.'/class/xoopsblock.php' ;
+require_once __DIR__.'/class/AltsysBreadcrumbs.class.php';
+require_once __DIR__.'/include/gtickets.php';
+include_once __DIR__.'/include/altsys_functions.php';
+include_once __DIR__.'/include/mygrouppermform.php';
+include_once XOOPS_ROOT_PATH.'/class/xoopsblock.php';
 
 // language file
-altsys_include_language_file('myblocksadmin') ;
+altsys_include_language_file('myblocksadmin');
 
 // fork by core types
 switch (altsys_get_core_type()) {
     case ALTSYS_CORE_TYPE_X22:
-        include_once __DIR__.'/class/MyBlocksAdminForX22.class.php' ;
-        $myba = MyBlocksAdminForX22::getInstance() ;
-        break ;
+        include_once __DIR__.'/class/MyBlocksAdminForX22.class.php';
+        $myba = MyBlocksAdminForX22::getInstance();
+        break;
     case ALTSYS_CORE_TYPE_X25:
-        include_once __DIR__.'/class/MyBlocksAdminForX25.class.php' ;
-        $myba = MyBlocksAdminForX25::getInstance() ;
-        break ;
+        include_once __DIR__.'/class/MyBlocksAdminForX25.class.php';
+        $myba = MyBlocksAdminForX25::getInstance();
+        break;
     case ALTSYS_CORE_TYPE_XCL21:
-        include_once __DIR__.'/class/MyBlocksAdminForXCL21.class.php' ;
-        $myba = MyBlocksAdminForXCL21::getInstance() ;
-        break ;
+        include_once __DIR__.'/class/MyBlocksAdminForXCL21.class.php';
+        $myba = MyBlocksAdminForXCL21::getInstance();
+        break;
     case ALTSYS_CORE_TYPE_ICMS:
-        include_once __DIR__.'/class/MyBlocksAdminForICMS.class.php' ;
-        $myba = MyBlocksAdminForICMS::getInstance() ;
-        break ;
+        include_once __DIR__.'/class/MyBlocksAdminForICMS.class.php';
+        $myba = MyBlocksAdminForICMS::getInstance();
+        break;
     case ALTSYS_CORE_TYPE_X20S:
     case ALTSYS_CORE_TYPE_X23P:
-        include_once __DIR__.'/class/MyBlocksAdminForX20S.class.php' ;
-        $myba = MyBlocksAdminForX20S::getInstance() ;
-        break ;
+        include_once __DIR__.'/class/MyBlocksAdminForX20S.class.php';
+        $myba = MyBlocksAdminForX20S::getInstance();
+        break;
     default:
-        include_once __DIR__.'/class/MyBlocksAdmin.class.php' ;
-        $myba = MyBlocksAdmin::getInstance() ;
-        break ;
+        include_once __DIR__.'/class/MyBlocksAdmin.class.php';
+        $myba = MyBlocksAdmin::getInstance();
+        break;
 }
 // permission
-$myba->checkPermission() ;
+$myba->checkPermission();
 
 // set parameters target_mid , target_dirname etc.
-$myba->init($xoopsModule) ;
+$myba->init($xoopsModule);
 
 
 //
 // transaction stage
 //
 
-if (! empty($_POST)) {
-    $myba->processPost() ;
+if (!empty($_POST)) {
+    $myba->processPost();
 }
 
 //
@@ -62,12 +62,12 @@ 
 //
 
 // header
-xoops_cp_header() ;
+xoops_cp_header();
 
 // mymenu
-altsys_include_mymenu() ;
+altsys_include_mymenu();
 
-$myba->processGet() ;
+$myba->processGet();
 
 // footer
-xoops_cp_footer() ;
+xoops_cp_footer();

xoops_trust_path/libs/altsys/index.php

Spacing +23 added lines, -23 removed lines

@@ -1,51 +1,51 @@
 <?php
 
-if (! defined('XOOPS_MODULE_PATH')) {
-    define('XOOPS_MODULE_PATH', XOOPS_ROOT_PATH . '/modules');
+if (!defined('XOOPS_MODULE_PATH')) {
+    define('XOOPS_MODULE_PATH', XOOPS_ROOT_PATH.'/modules');
 }
-if (! defined('XOOPS_MODULE_URL')) {
-    define('XOOPS_MODULE_URL', XOOPS_URL . '/modules');
+if (!defined('XOOPS_MODULE_URL')) {
+    define('XOOPS_MODULE_URL', XOOPS_URL.'/modules');
 }
 
  
-require_once __DIR__.'/class/AltsysBreadcrumbs.class.php' ;
-require_once __DIR__.'/include/altsys_functions.php' ;
+require_once __DIR__.'/class/AltsysBreadcrumbs.class.php';
+require_once __DIR__.'/include/altsys_functions.php';
 
 
 if (empty($xoopsModule)) {
-    $moduleperm_handler = xoops_getHandler('module') ;
-    $xoopsModule = $moduleperm_handler->getByDirname('altsys') ;
+    $moduleperm_handler = xoops_getHandler('module');
+    $xoopsModule = $moduleperm_handler->getByDirname('altsys');
 }
 
-require XOOPS_ROOT_PATH.'/include/cp_functions.php' ;
+require XOOPS_ROOT_PATH.'/include/cp_functions.php';
 
 // breadcrumbs
-$breadcrumbsObj = AltsysBreadcrumbs::getInstance() ;
-$breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php', $GLOBALS['xoopsModule']->getVar('name')) ;
+$breadcrumbsObj = AltsysBreadcrumbs::getInstance();
+$breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php', $GLOBALS['xoopsModule']->getVar('name'));
 
 // get page
-$page = preg_replace('/[^a-zA-Z0-9_-]/', '', @$_GET['page']) ;
-require __DIR__.'/controllers.php' ;
-if (! in_array($page, $controllers)) {
-    $_GET['page'] = $page = 'myblocksadmin' ;
-    $_SERVER['REQUEST_URI'] = '/admin/index.php?mode=admin&lib=altsys&page=myblocksadmin' ;
+$page = preg_replace('/[^a-zA-Z0-9_-]/', '', @$_GET['page']);
+require __DIR__.'/controllers.php';
+if (!in_array($page, $controllers)) {
+    $_GET['page'] = $page = 'myblocksadmin';
+    $_SERVER['REQUEST_URI'] = '/admin/index.php?mode=admin&lib=altsys&page=myblocksadmin';
 }
 
 
 // half measure ... (TODO)
 if (empty($_GET['dirname'])) {
-    $module_handler = xoops_getHandler('module') ;
-    list($top_module) = $module_handler->getObjects(new Criteria('isactive', 1)) ;
-    $_GET['dirname'] = $top_module->getVar('dirname') ;
+    $module_handler = xoops_getHandler('module');
+    list($top_module) = $module_handler->getObjects(new Criteria('isactive', 1));
+    $_GET['dirname'] = $top_module->getVar('dirname');
 }
 
 // language file
-altsys_include_language_file($page) ;
+altsys_include_language_file($page);
 
 // branch to each pages
-$mytrustdirpath = __DIR__ ;
+$mytrustdirpath = __DIR__;
 if (file_exists(XOOPS_TRUST_PATH.'/libs/altsys/'.$page.'.php')) {
-    include XOOPS_TRUST_PATH.'/libs/altsys/'.$page.'.php' ;
+    include XOOPS_TRUST_PATH.'/libs/altsys/'.$page.'.php';
 } else {
-    die('wrong request') ;
+    die('wrong request');
 }

xoops_trust_path/libs/altsys/mypreferences.php

Spacing +36 added lines, -36 removed lines

@@ -5,33 +5,33 @@ 
 //                     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() ;
+(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() ;
+    $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');
@@ -39,30 +39,30 @@ 
     $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,9 +72,9 @@ 
         //  $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();
@@ -155,25 +155,25 @@ 
             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, $ele, $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();
@@ -185,10 +185,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
@@ -209,7 +209,7 @@ 
     if ($count > 0) {
         for ($i = 0; $i < $count; $i++) {
             $config = $config_handler->getConfig($conf_ids[$i]);
-            $new_value =& $_POST[$config->getVar('conf_name')];
+            $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') {
@@ -238,13 +238,13 @@ 
                         // generate compiled files for the new theme
                         // block files only for now..
                         $tplfile_handler = xoops_getHandler('tplfile');
-                        $dtemplates =& $tplfile_handler->find('default', 'block');
+                        $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);
@@ -259,7 +259,7 @@ 
 
                         // 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);
+                        $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 {
@@ -272,9 +272,9 @@ 
                 }
 
                 // 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') {
+                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();
+                    $groups = & $member_handler->getGroupList();
                     $moduleperm_handler = xoops_getHandler('groupperm');
                     $module_handler = xoops_getHandler('module');
                     $module = $module_handler->getByDirname($new_value);
@@ -293,5 +293,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/class/SetupAltsysLangMgr.class.php

Spacing +31 added lines, -31 removed lines

@@ -1,15 +1,15 @@ 
 <?php
 
-if (! defined('XOOPS_ROOT_PATH')) {
-    exit ;
+if (!defined('XOOPS_ROOT_PATH')) {
+    exit;
 }
 
-if (! defined('XOOPS_TRUST_PATH') || XOOPS_TRUST_PATH == '') {
-    header('Location: '.XOOPS_URL.'/modules/altsys/setup_xoops_trust_path.php') ;
-    exit ;
+if (!defined('XOOPS_TRUST_PATH') || XOOPS_TRUST_PATH == '') {
+    header('Location: '.XOOPS_URL.'/modules/altsys/setup_xoops_trust_path.php');
+    exit;
 }
 
-define('ALTSYS_MYLANGUAGE_ROOT_PATH', XOOPS_ROOT_PATH . '/my_language');
+define('ALTSYS_MYLANGUAGE_ROOT_PATH', XOOPS_ROOT_PATH.'/my_language');
 
 
 class SetupAltsysLangMgr extends XCube_ActionFilter
@@ -26,23 +26,23 @@ 
 }
 
 
-require_once XOOPS_ROOT_PATH . '/core/XCube_LanguageManager.class.php';
-require_once XOOPS_ROOT_PATH . '/modules/legacy/kernel/Legacy_LanguageManager.class.php';
+require_once XOOPS_ROOT_PATH.'/core/XCube_LanguageManager.class.php';
+require_once XOOPS_ROOT_PATH.'/modules/legacy/kernel/Legacy_LanguageManager.class.php';
 
 class AltsysLangMgr_LanguageManager extends Legacy_LanguageManager
 {
-    public $langman = null ;
-    public $theme_lang_checked = false ;
+    public $langman = null;
+    public $theme_lang_checked = false;
 
     public function prepare()
     {
-        $langmanpath = XOOPS_TRUST_PATH.'/libs/altsys/class/D3LanguageManager.class.php' ;
-        if (! file_exists($langmanpath)) {
-            die('install the latest altsys') ;
+        $langmanpath = XOOPS_TRUST_PATH.'/libs/altsys/class/D3LanguageManager.class.php';
+        if (!file_exists($langmanpath)) {
+            die('install the latest altsys');
         }
         require_once $langmanpath;
-        $this->langman = D3LanguageManager::getInstance() ;
-        $this->langman->language = $this->mLanguageName ;
+        $this->langman = D3LanguageManager::getInstance();
+        $this->langman->language = $this->mLanguageName;
 
         parent::prepare();
     }
@@ -50,40 +50,40 @@ 
     public function _loadLanguage($dirname, $fileBodyName)
     {
         // read/check once (selected_theme)/language/(lang).php
-        if (! $this->theme_lang_checked) {
-            $root = XCube_Root::getSingleton() ;
-            if (! empty($root->mContext->mXoopsConfig['theme_set'])) {
-                $langdir = XOOPS_THEME_PATH.'/'.$root->mContext->mXoopsConfig['theme_set'].'/language' ;
+        if (!$this->theme_lang_checked) {
+            $root = XCube_Root::getSingleton();
+            if (!empty($root->mContext->mXoopsConfig['theme_set'])) {
+                $langdir = XOOPS_THEME_PATH.'/'.$root->mContext->mXoopsConfig['theme_set'].'/language';
                 if (file_exists($langdir)) {
-                    $langfile = $langdir.'/'.$this->mLanguageName.'.php' ;
-                    $engfile = $langdir.'/english.php' ;
+                    $langfile = $langdir.'/'.$this->mLanguageName.'.php';
+                    $engfile = $langdir.'/english.php';
                     if (file_exists($langfile)) {
-                        require_once $langfile ;
+                        require_once $langfile;
                     } elseif (file_exists($engfile)) {
-                        require_once $engfile ;
+                        require_once $engfile;
                     }
                 }
-                $this->theme_lang_checked = true ;
+                $this->theme_lang_checked = true;
             }
         }
 
         // read normal
-        $this->langman->read($fileBodyName.'.php', $dirname) ;
+        $this->langman->read($fileBodyName.'.php', $dirname);
     }
 
     public function loadPageTypeMessageCatalog($type)
     {
         // I dare not to use langman...
         if (strpos($type, '.') === false && $this->langman->my_language) {
-            $mylang_file = $this->langman->my_language.'/'.$this->mLanguageName.'/'.$type.'.php' ;
+            $mylang_file = $this->langman->my_language.'/'.$this->mLanguageName.'/'.$type.'.php';
             if (file_exists($mylang_file)) {
-                require_once $mylang_file ;
+                require_once $mylang_file;
             }
         }
-        $original_error_level = error_reporting() ;
-        error_reporting($original_error_level & ~ E_NOTICE) ;
+        $original_error_level = error_reporting();
+        error_reporting($original_error_level & ~ E_NOTICE);
         parent::loadPageTypeMessageCatalog($type);
-        error_reporting($original_error_level) ;
+        error_reporting($original_error_level);
     }
 
     public function loadGlobalMessageCatalog()
@@ -91,7 +91,7 @@ 
         /* if (!$this->_loadFile(XOOPS_ROOT_PATH . "/modules/legacy/language/" . $this->mLanguageName . "/global.php")) {
             $this->_loadFile(XOOPS_ROOT_PATH . "/modules/legacy/language/english/global.php");
         } */
-        $this->_loadLanguage('legacy', 'global') ;
+        $this->_loadLanguage('legacy', 'global');
 
         //
         // Now, if XOOPS_USE_MULTIBYTES isn't defined, set zero to it.

xoops_trust_path/libs/altsys/class/MyBlocksAdminForXCL21.class.php

Spacing +9 added lines, -9 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 // $Id: MyBlocksAdminForXCL21.class.php ,ver 0.0.7.1 2011/01/27 16:10:00 domifara Exp $
 
-require_once __DIR__.'/MyBlocksAdmin.class.php' ;
+require_once __DIR__.'/MyBlocksAdmin.class.php';
 
 class MyBlocksAdminForXCL21 extends MyBlocksAdmin
 {
@@ -16,7 +16,7 @@ 
     static $instance;
     if (!isset($instance)) {
         $instance = new MyBlocksAdminForXCL21();
-        $instance->construct() ;
+        $instance->construct();
     }
     return $instance;
 }
@@ -27,8 +27,8 @@ 
 public function renderCell4BlockOptions($block_data)
 {
     if ($this->target_dirname && substr($this->target_dirname, 0, 1) != '_') {
-        $langman = D3LanguageManager::getInstance() ;
-        $langman->read('admin.php', $this->target_dirname) ;
+        $langman = D3LanguageManager::getInstance();
+        $langman->read('admin.php', $this->target_dirname);
     }
 
     $bid = (int)$block_data['bid'];
@@ -36,15 +36,15 @@ 
 //HACK by domifara
 //	$block = new XoopsBlock( $bid ) ;
     $handler = xoops_getHandler('block');
-    $block = $handler->create(false) ;
-    $block->load($bid) ;
+    $block = $handler->create(false);
+    $block->load($bid);
 
-    $legacy_block = Legacy_Utils::createBlockProcedure($block) ;
-    return $legacy_block->getOptionForm() ;
+    $legacy_block = Legacy_Utils::createBlockProcedure($block);
+    return $legacy_block->getOptionForm();
 }
 
     public function checkFck()
     {
-        return (! altsysUtils::isInstalledXclHtmleditor() && file_exists(XOOPS_ROOT_PATH.'/common/fckeditor/fckeditor.js'));
+        return (!altsysUtils::isInstalledXclHtmleditor() && file_exists(XOOPS_ROOT_PATH.'/common/fckeditor/fckeditor.js'));
     }
 }