mambax7 / altsys

xoops_trust_path/libs/altsys/class/AltsysBreadcrumbs.class.php

Spacing +15 added lines, -15 removed lines

@@ -3,7 +3,7 @@ 
 // singleton for xoops_breadcrumbs
 class AltsysBreadcrumbs
 {
-    public $paths = array() ;
+    public $paths = array();
 
     public function __construct()
     {
@@ -12,29 +12,29 @@ 
 //function &getInstance()
 public static function &getInstance()
 {
-    static $instance ;
-    if (! isset($instance)) {
-        $instance = new AltsysBreadcrumbs() ;
+    static $instance;
+    if (!isset($instance)) {
+        $instance = new AltsysBreadcrumbs();
     }
-    return $instance ;
+    return $instance;
 }
 
     public function getXoopsBreadcrumbs()
     {
-        $ret = array() ;
+        $ret = array();
         foreach ($this->paths as $val) {
             // delayed language constant
         if (substr($val['name'], 0, 1) == '_' && defined($val['name'])) {
             $ret[] = array(
-                'url' => $val['url'] ,
+                'url' => $val['url'],
                 'name' => constant($val['name'])
-            ) ;
+            );
         } else {
-            $ret[] = $val ;
+            $ret[] = $val;
         }
         }
-        unset($ret[count($ret) - 1 ]['url']) ;
-        return $ret ;
+        unset($ret[count($ret) - 1]['url']);
+        return $ret;
     }
 
 // all data should be escaped
@@ -43,19 +43,19 @@ 
     if (is_array($url_or_path)) {
         if (empty($url_or_path['name'])) {
             // multiple paths
-            $this->paths = array_merge($this->paths, $url_or_path) ;
+            $this->paths = array_merge($this->paths, $url_or_path);
         } else {
             // array format (just a path)
-            $this->paths[] = $url_or_path ;
+            $this->paths[] = $url_or_path;
         }
     } else {
         // separate format
-        $this->paths[] = array( 'url' => $url_or_path , 'name' => $name ) ;
+        $this->paths[] = array('url' => $url_or_path, 'name' => $name);
     }
 }
 
     public function hasPaths()
     {
-        return ! empty($this->paths) ;
+        return !empty($this->paths);
     }
 }

xoops_trust_path/libs/altsys/class/d3utilities.php

Spacing +101 added lines, -101 removed lines

@@ -2,40 +2,40 @@ 
 
 class d3utilities
 {
-    public $dirname = '' ; // directory name under xoops_trust_path
-    public $mydirname = '' ; // each directory name under xoops_root_path
-    public $mid = 0 ; // id of each module instance
-    public $table = '' ; // table with prefix and dirname
-    public $primary_key = '' ; // column for primary_key
-    public $cols = array() ; // settings of each columns
-    public $form_mode = 'new' ; // 'new','edit' are available
-    public $page_name = '' ; // controller's name  eg) page=(controller) in URI
-    public $action_base_hiddens = array() ;
+    public $dirname = ''; // directory name under xoops_trust_path
+    public $mydirname = ''; // each directory name under xoops_root_path
+    public $mid = 0; // id of each module instance
+    public $table = ''; // table with prefix and dirname
+    public $primary_key = ''; // column for primary_key
+    public $cols = array(); // settings of each columns
+    public $form_mode = 'new'; // 'new','edit' are available
+    public $page_name = ''; // controller's name  eg) page=(controller) in URI
+    public $action_base_hiddens = array();
 
 //HACK by domifara
 //	public function D3Utilities( $mydirname , $table_body , $primary_key , $cols , $page_name , $action_base_hiddens )
     public function __construct($mydirname, $table_body, $primary_key, $cols, $page_name, $action_base_hiddens)
     {
-        $db = XoopsDatabaseFactory::getDatabaseConnection() ;
-
-        $this->dirname = basename(dirname(__DIR__)) ;
-        $this->mydirname = $mydirname ;
-        $this->table = $db->prefix($mydirname ? $mydirname . '_' . $table_body : $table_body) ;
-        $this->primary_key = $primary_key ;
-        $this->cols = $cols ;
-        $module_handler = xoops_getHandler('module') ;
-        $module = $module_handler->getByDirname($this->mydirname) ;
-        if (! empty($module)) {
+        $db = XoopsDatabaseFactory::getDatabaseConnection();
+
+        $this->dirname = basename(dirname(__DIR__));
+        $this->mydirname = $mydirname;
+        $this->table = $db->prefix($mydirname ? $mydirname.'_'.$table_body : $table_body);
+        $this->primary_key = $primary_key;
+        $this->cols = $cols;
+        $module_handler = xoops_getHandler('module');
+        $module = $module_handler->getByDirname($this->mydirname);
+        if (!empty($module)) {
             $this->mid = (int)$module->getVar('mid');
         }
-        $this->page_name = $page_name ;
-        $this->action_base_hiddens = $action_base_hiddens ;
+        $this->page_name = $page_name;
+        $this->action_base_hiddens = $action_base_hiddens;
     }
 
 
     public function get_language_constant($name)
     {
-        return constant(strtoupper('_MD_A_' . $this->dirname . '_' . $this->page_name . '_' . $name)) ;
+        return constant(strtoupper('_MD_A_'.$this->dirname.'_'.$this->page_name.'_'.$name));
     }
 
 
@@ -45,22 +45,22 @@ 
             case 'text':
             case 'blob':
                 $length = empty($col['length']) ? 65535 : (int)$col['length'];
-                return "`{$col['name']}`='".addslashes(xoops_substr($value, 0, $length))."'" ;
+                return "`{$col['name']}`='".addslashes(xoops_substr($value, 0, $length))."'";
             case 'char':
             case 'varchar':
             case 'string':
                 $length = empty($col['length']) ? 255 : (int)$col['length'];
-                return "`{$col['name']}`='".addslashes(xoops_substr($value, 0, $length))."'" ;
+                return "`{$col['name']}`='".addslashes(xoops_substr($value, 0, $length))."'";
             case 'int':
             case 'integer':
                 $value = (int)$value;
-                if (! empty($col['max'])) {
-                    $value = min($value, (int)$col['max']) ;
+                if (!empty($col['max'])) {
+                    $value = min($value, (int)$col['max']);
                 }
-                if (! empty($col['min'])) {
-                    $value = max($value, (int)$col['min']) ;
+                if (!empty($col['min'])) {
+                    $value = max($value, (int)$col['min']);
                 }
-                return "`{$col['name']}`=$value" ;
+                return "`{$col['name']}`=$value";
         }
     }
 
@@ -68,29 +68,29 @@ 
     // single update or insert
     public function insert()
     {
-        $db = XoopsDatabaseFactory::getDatabaseConnection() ;
+        $db = XoopsDatabaseFactory::getDatabaseConnection();
 
-        $id = $this->init_default_values() ;
+        $id = $this->init_default_values();
 
-        $set4sql = '' ;
+        $set4sql = '';
         foreach ($this->cols as $col) {
             if (empty($col['edit_edit'])) {
-                continue ;
+                continue;
             }
             if ($col['name'] == $this->primary_key) {
-                continue ;
+                continue;
             }
-            $set4sql .= $this->get_set4sql(@$_POST[ $col['name'] ], $col) . ',' ;
+            $set4sql .= $this->get_set4sql(@$_POST[$col['name']], $col).',';
         }
-        if (! empty($set4sql)) {
+        if (!empty($set4sql)) {
             if ($id > 0) {
                 // UPDATE
-                $db->queryF("UPDATE $this->table SET ".substr($set4sql, 0, -1)." WHERE $this->primary_key='".addslashes($id)."'") ;
-                return array( $id , 'update' ) ;
+                $db->queryF("UPDATE $this->table SET ".substr($set4sql, 0, -1)." WHERE $this->primary_key='".addslashes($id)."'");
+                return array($id, 'update');
             } else {
                 // INSERT
-                $db->queryF("INSERT INTO $this->table SET ".substr($set4sql, 0, -1)) ;
-                return array( $db->getInsertId() , 'insert' ) ;
+                $db->queryF("INSERT INTO $this->table SET ".substr($set4sql, 0, -1));
+                return array($db->getInsertId(), 'insert');
             }
         }
     }
@@ -99,156 +99,156 @@ 
     // multiple update
     public function update()
     {
-        $db = XoopsDatabaseFactory::getDatabaseConnection() ;
+        $db = XoopsDatabaseFactory::getDatabaseConnection();
 
         // search appropriate column for getting primary_key
         foreach ($this->cols as $col) {
-            if (in_array(@$col['list_edit'], array( 'text', 'textarea', 'hidden' ))) {
-                $column4key = $col['name'] ;
-                break ;
+            if (in_array(@$col['list_edit'], array('text', 'textarea', 'hidden'))) {
+                $column4key = $col['name'];
+                break;
             }
         }
         if (empty($column4key)) {
-            $column4key = $this->cols[0]['name'] ;
+            $column4key = $this->cols[0]['name'];
         }
 
-        $ret = array() ;
+        $ret = array();
         foreach (array_keys($_POST[$column4key]) as $id) {
-            $id = (int)$id;    // primary_key should be 'integer'
-            $set4sql = '' ;
+            $id = (int)$id; // primary_key should be 'integer'
+            $set4sql = '';
             foreach ($this->cols as $col) {
                 if (empty($col['list_edit'])) {
-                    continue ;
+                    continue;
                 }
                 if ($col['name'] == $this->primary_key) {
-                    continue ;
+                    continue;
                 }
-                $set4sql .= $this->get_set4sql(@$_POST[ $col['name'] ][$id], $col) . ',' ;
+                $set4sql .= $this->get_set4sql(@$_POST[$col['name']][$id], $col).',';
             }
-            if (! empty($set4sql)) {
-                $result = $db->query("SELECT * FROM $this->table WHERE $this->primary_key=$id") ;
+            if (!empty($set4sql)) {
+                $result = $db->query("SELECT * FROM $this->table WHERE $this->primary_key=$id");
                 if ($db->getRowsNum($result) == 1) {
-                    $db->queryF("UPDATE $this->table SET ".substr($set4sql, 0, -1)." WHERE $this->primary_key=$id") ;
+                    $db->queryF("UPDATE $this->table SET ".substr($set4sql, 0, -1)." WHERE $this->primary_key=$id");
                     if ($db->getAffectedRows() == 1) {
-                        $ret[ $id ] = $db->fetchArray($result) ;
+                        $ret[$id] = $db->fetchArray($result);
                     }
                 }
             }
         }
 
-        return $ret ;
+        return $ret;
     }
 
 
     public function delete($delete_comments = false, $delete_notifications = false)
     {
-        $db = XoopsDatabaseFactory::getDatabaseConnection() ;
+        $db = XoopsDatabaseFactory::getDatabaseConnection();
 
-        $ret = array() ;
+        $ret = array();
         foreach (array_keys($_POST['admin_main_checkboxes']) as $id) {
-            $id = (int)$id;    // primary_key should be 'integer'
-            $result = $db->query("SELECT * FROM $this->table WHERE $this->primary_key=$id") ;
+            $id = (int)$id; // primary_key should be 'integer'
+            $result = $db->query("SELECT * FROM $this->table WHERE $this->primary_key=$id");
             if ($db->getRowsNum($result) == 1) {
-                $ret[ $id ] = $db->fetchArray($result) ;
+                $ret[$id] = $db->fetchArray($result);
 
-                $db->queryF("DELETE FROM $this->table WHERE $this->primary_key=$id") ;
+                $db->queryF("DELETE FROM $this->table WHERE $this->primary_key=$id");
                 if ($delete_comments) {
                     // remove comments
-                    $db->queryF('DELETE FROM ' . $db->prefix('xoopscomments') . " WHERE com_modid=$this->mid AND com_itemid=$id") ;
+                    $db->queryF('DELETE FROM '.$db->prefix('xoopscomments')." WHERE com_modid=$this->mid AND com_itemid=$id");
                 }
 
                 if ($delete_notifications) {
                     // remove notifications
-                    $db->queryF('DELETE FROM ' . $db->prefix('xoopsnotifications') . " WHERE not_modid=$this->mid AND not_itemid=$id") ;
+                    $db->queryF('DELETE FROM '.$db->prefix('xoopsnotifications')." WHERE not_modid=$this->mid AND not_itemid=$id");
                 }
             }
         }
 
-        return $ret ;
+        return $ret;
     }
 
 
     public function init_default_values()
     {
-        $db = XoopsDatabaseFactory::getDatabaseConnection() ;
+        $db = XoopsDatabaseFactory::getDatabaseConnection();
 
         if (@$_GET['id']) {
             $id = (int)$_GET['id'];
-            $rs = $db->query("SELECT * FROM $this->table WHERE $this->primary_key=$id") ;
+            $rs = $db->query("SELECT * FROM $this->table WHERE $this->primary_key=$id");
             if ($db->getRowsNum($rs) == 1) {
-                $row = $db->fetchArray($rs) ;
+                $row = $db->fetchArray($rs);
                 foreach (array_keys($this->cols) as $key) {
                     if (empty($this->cols[$key]['edit_show'])) {
-                        continue ;
+                        continue;
                     }
-                    $this->cols[$key]['default_value'] = $row[ $this->cols[$key]['name'] ] ;
+                    $this->cols[$key]['default_value'] = $row[$this->cols[$key]['name']];
                 }
-                $this->form_mode = 'edit' ;
-                return $id ;
+                $this->form_mode = 'edit';
+                return $id;
             }
         }
 
-        $this->form_mode = 'new' ;
-        return 0 ;
+        $this->form_mode = 'new';
+        return 0;
     }
 
 
     public function get_view_edit()
     {
-        $id = $this->init_default_values() ;
+        $id = $this->init_default_values();
 
-        $lines = array() ;
+        $lines = array();
         foreach ($this->cols as $col) {
             if (empty($col['edit_show'])) {
-                continue ;
+                continue;
             }
-            if (! isset($col['default_value'])) {
+            if (!isset($col['default_value'])) {
                 switch ($col['type']) {
                     case 'int':
                     case 'integer':
-                        $col['default_value'] = 0 ;
-                        break ;
+                        $col['default_value'] = 0;
+                        break;
                     default:
-                        $col['default_value'] = '' ;
-                        break ;
+                        $col['default_value'] = '';
+                        break;
                 }
             }
             switch ($col['edit_edit']) {
                 case 'checkbox':
-                    $checked = empty($col['default_value']) ? '' : "checked='checked'" ;
-                    $value = empty($col['checkbox_value']) ? 1 : htmlspecialchars($col['checkbox_value'], ENT_QUOTES) ;
+                    $checked = empty($col['default_value']) ? '' : "checked='checked'";
+                    $value = empty($col['checkbox_value']) ? 1 : htmlspecialchars($col['checkbox_value'], ENT_QUOTES);
 
-                    $lines[ $col['name'] ] = "<input type='checkbox' name='{$col['name']}' value='$value' $checked />" ;
-                    break ;
+                    $lines[$col['name']] = "<input type='checkbox' name='{$col['name']}' value='$value' $checked />";
+                    break;
                 case 'text':
                 default:
                     $size = empty($col['edit_size']) ? 32 : (int)$col['edit_size'];
                     $length = empty($col['length']) ? 255 : (int)$col['length'];
-                    $lines[ $col['name'] ] = "<input type='text' name='{$col['name']}' size='$size' maxlength='$length' value='".htmlspecialchars($col['default_value'], ENT_QUOTES)."' />" ;
-                    break ;
+                    $lines[$col['name']] = "<input type='text' name='{$col['name']}' size='$size' maxlength='$length' value='".htmlspecialchars($col['default_value'], ENT_QUOTES)."' />";
+                    break;
                 case false:
-                    $lines[ $col['name'] ] = htmlspecialchars($col['default_value'], ENT_QUOTES) ;
-                    break ;
+                    $lines[$col['name']] = htmlspecialchars($col['default_value'], ENT_QUOTES);
+                    break;
             }
         }
 
-        return array( $id , $lines ) ;
+        return array($id, $lines);
     }
 
 
     public function get_control_form($controllers)
     {
-        $hiddens = '' ;
+        $hiddens = '';
         foreach ($this->action_base_hiddens as $key => $val) {
-            $key4disp = htmlspecialchars($key, ENT_QUOTES) ;
-            $val4disp = htmlspecialchars($val, ENT_QUOTES) ;
-            $hiddens .= "<input type='hidden' name='$key4disp' value='$val4disp' />\n" ;
+            $key4disp = htmlspecialchars($key, ENT_QUOTES);
+            $val4disp = htmlspecialchars($val, ENT_QUOTES);
+            $hiddens .= "<input type='hidden' name='$key4disp' value='$val4disp' />\n";
         }
 
-        $controllers_html = '' ;
+        $controllers_html = '';
         foreach ($controllers as $type => $body) {
             if ($type == 'num') {
-                $controllers_html .= $this->get_select('num', $body, $GLOBALS['num']) ;
+                $controllers_html .= $this->get_select('num', $body, $GLOBALS['num']);
             }
         }
 
@@ -262,13 +262,13 @@ 
 
     public function get_select($name, $options, $current_value)
     {
-        $ret = "<select name='".htmlspecialchars($name, ENT_QUOTES)."'>\n" ;
+        $ret = "<select name='".htmlspecialchars($name, ENT_QUOTES)."'>\n";
         foreach ($options as $key => $val) {
             $selected = $val == $current_value ? "selected='selected'" : '';
-            $ret .= "<option value='".htmlspecialchars($key, ENT_QUOTES)."' $selected>".htmlspecialchars($val, ENT_QUOTES)."</option>\n" ;
+            $ret .= "<option value='".htmlspecialchars($key, ENT_QUOTES)."' $selected>".htmlspecialchars($val, ENT_QUOTES)."</option>\n";
         }
-        $ret .= "</select>\n" ;
+        $ret .= "</select>\n";
 
-        return $ret ;
+        return $ret;
     }
 }

xoops_trust_path/libs/altsys/class/MyBlocksAdminForICMS.class.php

Spacing +39 added lines, -39 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 
-require_once __DIR__.'/MyBlocksAdmin.class.php' ;
+require_once __DIR__.'/MyBlocksAdmin.class.php';
 
 class MyBlocksAdminForICMS extends MyBlocksAdmin
 {
-    public $block_positions = array() ;
+    public $block_positions = array();
 
     public function MyBlocksAadminForICMS()
     {
@@ -13,14 +13,14 @@ 
 
     public function construct()
     {
-        parent::construct() ;
+        parent::construct();
 
-        @include_once XOOPS_ROOT_PATH.'/modules/system/language/'.$this->lang.'/admin/blocksadmin.php' ;
-        $result = $this->db->query('SELECT id,pname,title FROM ' . $this->db->prefix('block_positions')) ;
+        @include_once XOOPS_ROOT_PATH.'/modules/system/language/'.$this->lang.'/admin/blocksadmin.php';
+        $result = $this->db->query('SELECT id,pname,title FROM '.$this->db->prefix('block_positions'));
         while (list($id, $pname, $title) = $this->db->fetchRow($result)) {
-            $this->block_positions[ $id ] = defined($title) ? constant($title) : $title ;
+            $this->block_positions[$id] = defined($title) ? constant($title) : $title;
         }
-        $this->block_positions[ -1 ] = _NONE ;
+        $this->block_positions[ -1] = _NONE;
     }
 
 //HACK by domifara for php5.3+
@@ -30,7 +30,7 @@ 
     static $instance;
     if (!isset($instance)) {
         $instance = new MyBlocksAdminForICMS();
-        $instance->construct() ;
+        $instance->construct();
     }
     return $instance;
 }
@@ -45,23 +45,23 @@ 
     // get selected targets
     if (is_array(@$block_data['bmodule'])) {
         // bmodule origined from request (preview etc.)
-        $selected_pages = $block_data['bmodule'] ;
+        $selected_pages = $block_data['bmodule'];
     } else {
         // origined from the table of `block_module_link`
-        $result = $this->db->query('SELECT module_id,page_id FROM ' . $this->db->prefix('block_module_link') . " WHERE block_id='$bid'") ;
+        $result = $this->db->query('SELECT module_id,page_id FROM '.$this->db->prefix('block_module_link')." WHERE block_id='$bid'");
         $selected_pages = array();
         while (list($mid, $pid) = $this->db->fetchRow($result)) {
-            $selected_pages[] = (int)$mid . '-' . (int)$pid;
+            $selected_pages[] = (int)$mid.'-'.(int)$pid;
         }
     }
 
     $page_handler = xoops_getHandler('page');
     $ret = "
 				<select name='bmodules[$bid][]' size='5' multiple='multiple'>
-					".$page_handler->getPageSelOptions($selected_pages) . '
+					".$page_handler->getPageSelOptions($selected_pages).'
 				</select>';
 
-    return $ret ;
+    return $ret;
 }
 
 
@@ -72,19 +72,19 @@ 
     return "
 	<table>
 		<tr>
-			<td rowspan='2'>".$this->renderRadio4BlockPosition(1, $block_data) . '</td>
-			<td>' . $this->renderRadio4BlockPosition(3, $block_data) . '</td>
-			<td>' . $this->renderRadio4BlockPosition(4, $block_data) . '</td>
-			<td>' . $this->renderRadio4BlockPosition(5, $block_data) . "</td>
-			<td rowspan='2'>".$this->renderRadio4BlockPosition(2, $block_data) . '</td>
+			<td rowspan='2'>".$this->renderRadio4BlockPosition(1, $block_data).'</td>
+			<td>' . $this->renderRadio4BlockPosition(3, $block_data).'</td>
+			<td>' . $this->renderRadio4BlockPosition(4, $block_data).'</td>
+			<td>' . $this->renderRadio4BlockPosition(5, $block_data)."</td>
+			<td rowspan='2'>".$this->renderRadio4BlockPosition(2, $block_data).'</td>
 		</tr>
 		<tr>
-			<td>' . $this->renderRadio4BlockPosition(6, $block_data) . '</td>
-			<td>' . $this->renderRadio4BlockPosition(7, $block_data) . '</td>
-			<td>' . $this->renderRadio4BlockPosition(8, $block_data) . "</td>
+			<td>' . $this->renderRadio4BlockPosition(6, $block_data).'</td>
+			<td>' . $this->renderRadio4BlockPosition(7, $block_data).'</td>
+			<td>' . $this->renderRadio4BlockPosition(8, $block_data)."</td>
 		</tr>
 		<tr>
-			<td colspan='5'>".$this->renderRadio4BlockPositions($block_data, array(1, 2, 3, 4, 5, 6, 7, 8)) . '</td>
+			<td colspan='5'>".$this->renderRadio4BlockPositions($block_data, array(1, 2, 3, 4, 5, 6, 7, 8)).'</td>
 		</tr>
 	</table>';
 }
@@ -95,19 +95,19 @@ 
 {
     $bid = (int)$block_data['bid'];
     $visible = (int)$block_data['visible'];
-    $current_side = $visible ? (int)$block_data['side'] : -1 ;
+    $current_side = $visible ? (int)$block_data['side'] : -1;
 
-    $label4disp = htmlspecialchars($this->block_positions[ $target_side ], ENT_QUOTES) ;
+    $label4disp = htmlspecialchars($this->block_positions[$target_side], ENT_QUOTES);
 
     if ($current_side == $target_side) {
-        $checked = "checked='checked'" ;
+        $checked = "checked='checked'";
         $divstyle = $target_side == -1 ? 'disabled' : 'selected';
     } else {
         $checked = '';
         $divstyle = 'unselected';
     }
 
-    return "<div class='blockposition $divstyle' title='$label4disp'><input type='radio' name='sides[$bid]' value='$target_side' class='blockposition' $checked /></div>" ;
+    return "<div class='blockposition $divstyle' title='$label4disp'><input type='radio' name='sides[$bid]' value='$target_side' class='blockposition' $checked /></div>";
 }
 
 
@@ -116,28 +116,28 @@ 
 {
     $bid = (int)$block_data['bid'];
     $visible = (int)$block_data['visible'];
-    $current_side = $visible ? (int)$block_data['side'] : -1 ;
+    $current_side = $visible ? (int)$block_data['side'] : -1;
 
-    $ret = '' ;
+    $ret = '';
     foreach ($this->block_positions as $target_side => $label) {
         if (in_array($target_side, $skip_sides)) {
-            continue ;
+            continue;
         }
 
-        $label4disp = htmlspecialchars($label, ENT_QUOTES) ;
+        $label4disp = htmlspecialchars($label, ENT_QUOTES);
 
         if ($current_side == $target_side) {
-            $checked = "checked='checked'" ;
+            $checked = "checked='checked'";
             $divstyle = $target_side == -1 ? 'disabled' : 'selected';
         } else {
             $checked = '';
             $divstyle = 'unselected';
         }
 
-        $ret .= "<div style='clear:both;'><div class='blockposition $divstyle' title='$label4disp'><input type='radio' name='sides[$bid]' id='sides_{$bid}_{$target_side}' value='$target_side' class='blockposition' $checked /></div><label for='sides_{$bid}_{$target_side}'>$label4disp</label></label></div>" ;
+        $ret .= "<div style='clear:both;'><div class='blockposition $divstyle' title='$label4disp'><input type='radio' name='sides[$bid]' id='sides_{$bid}_{$target_side}' value='$target_side' class='blockposition' $checked /></div><label for='sides_{$bid}_{$target_side}'>$label4disp</label></label></div>";
     }
 
-    return $ret ;
+    return $ret;
 }
 
 
@@ -145,16 +145,16 @@ 
 public function updateBlockModuleLink($bid, $bmodules)
 {
     $bid = (int)$bid;
-    $table = $this->db->prefix('block_module_link') ;
+    $table = $this->db->prefix('block_module_link');
 
-    $sql = "DELETE FROM `$table` WHERE `block_id`=$bid" ;
-    $this->db->query($sql) ;
+    $sql = "DELETE FROM `$table` WHERE `block_id`=$bid";
+    $this->db->query($sql);
     foreach ($bmodules as $mid) {
-        $regs = explode('-', $mid) ;
+        $regs = explode('-', $mid);
         $module_id = (int)(@$regs[0]);
         $page_id = (int)(@$regs[1]);
-        $sql = "INSERT INTO `$table` (`block_id`,`module_id`,`page_id`) VALUES ($bid,$module_id,$page_id)" ;
-        $this->db->query($sql) ;
+        $sql = "INSERT INTO `$table` (`block_id`,`module_id`,`page_id`) VALUES ($bid,$module_id,$page_id)";
+        $this->db->query($sql);
     }
 }
 }

xoops_trust_path/libs/altsys/class/MyBlocksAdminForX25.class.php

Spacing +101 added lines, -101 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-require_once __DIR__.'/MyBlocksAdmin.class.php' ;
+require_once __DIR__.'/MyBlocksAdmin.class.php';
 
 class MyBlocksAdminForX25 extends MyBlocksAdmin
 {
@@ -11,9 +11,9 @@ 
 
     public function construct()
     {
-        parent::construct() ;
+        parent::construct();
 
-        @include_once XOOPS_ROOT_PATH.'/modules/system/language/'.$this->lang.'/admin/blocksadmin.php' ;
+        @include_once XOOPS_ROOT_PATH.'/modules/system/language/'.$this->lang.'/admin/blocksadmin.php';
     }
 
 //HACK by domifara for php5.3+
@@ -23,7 +23,7 @@ 
     static $instance;
     if (!isset($instance)) {
         $instance = new MyBlocksAdminForX25();
-        $instance->construct() ;
+        $instance->construct();
     }
     return $instance;
 }
@@ -39,7 +39,7 @@ 
     $sseln = $ssel0 = $ssel1 = $ssel3 = $ssel4 = $ssel5 = $ssel7 = $ssel8 = $ssel9 = '';
     $scoln = $scol0 = $scol1 = $scol3 = $scol4 = $scol5 = $scol7 = $scol8 = $scol9 = 'unselected';
     $stextbox = 'unselected';
-    $value4extra_side = '' ;
+    $value4extra_side = '';
 
     if ($visible != 1) {
         $sseln = " checked='checked'";
@@ -49,39 +49,39 @@ 
         case XOOPS_SIDEBLOCK_LEFT:
             $ssel0 = " checked='checked'";
             $scol0 = 'selected';
-            break ;
+            break;
         case XOOPS_SIDEBLOCK_RIGHT:
             $ssel1 = " checked='checked'";
             $scol1 = 'selected';
-            break ;
+            break;
         case XOOPS_CENTERBLOCK_LEFT:
             $ssel3 = " checked='checked'";
             $scol3 = 'selected';
-            break ;
+            break;
         case XOOPS_CENTERBLOCK_RIGHT:
             $ssel4 = " checked='checked'";
             $scol4 = 'selected';
-            break ;
+            break;
         case XOOPS_CENTERBLOCK_CENTER:
             $ssel5 = " checked='checked'";
             $scol5 = 'selected';
-            break ;
+            break;
         case XOOPS_CENTERBLOCK_BOTTOMLEFT:
             $ssel7 = " checked='checked'";
             $scol7 = 'selected';
-            break ;
+            break;
         case XOOPS_CENTERBLOCK_BOTTOMRIGHT:
             $ssel8 = " checked='checked'";
             $scol8 = 'selected';
-            break ;
+            break;
         case XOOPS_CENTERBLOCK_BOTTOM:
             $ssel9 = " checked='checked'";
             $scol9 = 'selected';
-            break ;
+            break;
         default:
-            $value4extra_side = $side ;
+            $value4extra_side = $side;
             $stextbox = 'selected';
-            break ;
+            break;
     }
     }
 
@@ -142,7 +142,7 @@ 
 				<div class='blockposition $scoln'>
 					<input type='radio' name='sides[$bid]' value='-1' class='blockposition' $sseln onclick='document.getElementById(\"extra_side_$bid\").value=-1;' />
 				</div>
-                <div style='float:"._GLOBAL_LEFT.";'>"._NONE . '</div>
+                <div style='float:"._GLOBAL_LEFT.";'>"._NONE.'</div>
 			</td>
 		</tr>
 	</table>
@@ -154,53 +154,53 @@ 
         $bid = (int)$bid;
 
 //HACK by domifara
-    $block = new XoopsBlock($bid) ;
+    $block = new XoopsBlock($bid);
 
-        if (! $block->getVar('bid')) {
+        if (!$block->getVar('bid')) {
             // new defaults
-        $bid = 0 ;
-            $mode = 'new' ;
-            $block->setVar('mid', 0) ;
-            $block->setVar('block_type', 'C') ;
+        $bid = 0;
+            $mode = 'new';
+            $block->setVar('mid', 0);
+            $block->setVar('block_type', 'C');
         }
 
         switch ($mode) {
         case 'clone':
-            $form_title = _MD_A_MYBLOCKSADMIN_CLONEFORM ;
-            $button_value = _MD_A_MYBLOCKSADMIN_BTN_CLONE ;
-            $next_op = 'clone_ok' ;
+            $form_title = _MD_A_MYBLOCKSADMIN_CLONEFORM;
+            $button_value = _MD_A_MYBLOCKSADMIN_BTN_CLONE;
+            $next_op = 'clone_ok';
             // breadcrumbs
-            $breadcrumbsObj = AltsysBreadcrumbs::getInstance() ;
-            $breadcrumbsObj->appendPath('', _MD_A_MYBLOCKSADMIN_CLONEFORM) ;
-            break ;
+            $breadcrumbsObj = AltsysBreadcrumbs::getInstance();
+            $breadcrumbsObj->appendPath('', _MD_A_MYBLOCKSADMIN_CLONEFORM);
+            break;
         case 'new':
-            $form_title = _MD_A_MYBLOCKSADMIN_NEWFORM ;
-            $button_value = _MD_A_MYBLOCKSADMIN_BTN_NEW ;
-            $next_op = 'new_ok' ;
+            $form_title = _MD_A_MYBLOCKSADMIN_NEWFORM;
+            $button_value = _MD_A_MYBLOCKSADMIN_BTN_NEW;
+            $next_op = 'new_ok';
             // breadcrumbs
-            $breadcrumbsObj = AltsysBreadcrumbs::getInstance() ;
-            $breadcrumbsObj->appendPath('', _MD_A_MYBLOCKSADMIN_NEWFORM) ;
-            break ;
+            $breadcrumbsObj = AltsysBreadcrumbs::getInstance();
+            $breadcrumbsObj->appendPath('', _MD_A_MYBLOCKSADMIN_NEWFORM);
+            break;
         case 'edit':
         default:
-            $form_title = _MD_A_MYBLOCKSADMIN_EDITFORM ;
-            $button_value = _MD_A_MYBLOCKSADMIN_BTN_EDIT ;
-            $next_op = 'edit_ok' ;
+            $form_title = _MD_A_MYBLOCKSADMIN_EDITFORM;
+            $button_value = _MD_A_MYBLOCKSADMIN_BTN_EDIT;
+            $next_op = 'edit_ok';
             // breadcrumbs
-            $breadcrumbsObj = AltsysBreadcrumbs::getInstance() ;
-            $breadcrumbsObj->appendPath('', _MD_A_MYBLOCKSADMIN_EDITFORM) ;
-            break ;
+            $breadcrumbsObj = AltsysBreadcrumbs::getInstance();
+            $breadcrumbsObj->appendPath('', _MD_A_MYBLOCKSADMIN_EDITFORM);
+            break;
     }
 
-        $is_custom = in_array($block->getVar('block_type'), array( 'C', 'E' )) ? true : false ;
-        $block_template =& $block->getVar('template', 'n') ;
-        $block_template_tplset = '' ;
+        $is_custom = in_array($block->getVar('block_type'), array('C', 'E')) ? true : false;
+        $block_template = & $block->getVar('template', 'n');
+        $block_template_tplset = '';
 
-        if (! $is_custom && $block_template) {
+        if (!$is_custom && $block_template) {
             // find template of the block
         $tplfile_handler = xoops_getHandler('tplfile');
-            $found_templates = $tplfile_handler->find($GLOBALS['xoopsConfig']['template_set'], 'block', null, null, $block_template) ;
-            $block_template_tplset = count($found_templates) > 0 ? $GLOBALS['xoopsConfig']['template_set'] : 'default' ;
+            $found_templates = $tplfile_handler->find($GLOBALS['xoopsConfig']['template_set'], 'block', null, null, $block_template);
+            $block_template_tplset = count($found_templates) > 0 ? $GLOBALS['xoopsConfig']['template_set'] : 'default';
         }
 //HACK by domifara
 /*
@@ -209,41 +209,41 @@ 
     }
 */
     $block_data = $this->preview_request + array(
-        'bid' => $bid ,
-        'name' => $block->getVar('name', 'n') ,
-        'title' => $block->getVar('title', 'n') ,
+        'bid' => $bid,
+        'name' => $block->getVar('name', 'n'),
+        'title' => $block->getVar('title', 'n'),
             'weight' => (int)$block->getVar('weight'),
             'bcachetime' => (int)$block->getVar('bcachetime'),
             'side' => (int)$block->getVar('side'),
             'visible' => (int)$block->getVar('visible'),
-        'template' => $block_template ,
-        'template_tplset' => $block_template_tplset ,
-        'options' => $block->getVar('options') ,
-        'content' => $block->getVar('content', 'n') ,
-        'is_custom' => $is_custom ,
-        'type' => $block->getVar('block_type') ,
+        'template' => $block_template,
+        'template_tplset' => $block_template_tplset,
+        'options' => $block->getVar('options'),
+        'content' => $block->getVar('content', 'n'),
+        'is_custom' => $is_custom,
+        'type' => $block->getVar('block_type'),
         'ctype' => $block->getVar('c_type')
-    ) ;
+    );
 
         $block4assign = array(
-        'name_raw' => $block_data['name'] ,
-        'title_raw' => $block_data['title'] ,
-        'content_raw' => $block_data['content'] ,
-        'cell_position' => $this->renderCell4BlockPosition($block_data) ,
-        'cell_module_link' => $this->renderCell4BlockModuleLink($block_data) ,
-        'cell_group_perm' =>  $this->renderCell4BlockReadGroupPerm($block_data) ,
-        'cell_options' => $this->renderCell4BlockOptions($block_data) ,
+        'name_raw' => $block_data['name'],
+        'title_raw' => $block_data['title'],
+        'content_raw' => $block_data['content'],
+        'cell_position' => $this->renderCell4BlockPosition($block_data),
+        'cell_module_link' => $this->renderCell4BlockModuleLink($block_data),
+        'cell_group_perm' =>  $this->renderCell4BlockReadGroupPerm($block_data),
+        'cell_options' => $this->renderCell4BlockOptions($block_data),
         'content_preview' => $this->previewContent($block_data)
-    ) + $block_data ;
+    ) + $block_data;
 
     // display
-    require_once XOOPS_TRUST_PATH.'/libs/altsys/class/D3Tpl.class.php' ;
-        $tpl = new D3Tpl() ;
+    require_once XOOPS_TRUST_PATH.'/libs/altsys/class/D3Tpl.class.php';
+        $tpl = new D3Tpl();
 //dhtml
     include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
 
-        if ($block_data['ctype']=='H' || empty($block_data['ctype'])) {
-            $editor_configs=array();
+        if ($block_data['ctype'] == 'H' || empty($block_data['ctype'])) {
+            $editor_configs = array();
             $editor_configs['name']   = 'content_block';
             $editor_configs['value']  = $block_data['content'];
             $editor_configs['rows']   = 20;
@@ -253,12 +253,12 @@ 
             $editor_configs['editor'] = xoops_getModuleOption('blocks_editor', 'system');
             $form                     = new XoopsFormEditor('', 'textarea_content', $editor_configs);
             $rendered = $form->render();
-            $tpl->assign('altsys_x25_dhtmltextarea', $rendered) ;
+            $tpl->assign('altsys_x25_dhtmltextarea', $rendered);
         } else {
             $form = new XoopsFormDhtmlTextArea('', 'textarea_content', $block_data['content'], 80, 20);
             $rendered = $form->render();
-            $rendered = '<div id="textarea_content_bbcode_buttons_pre" style="display:block;">'.str_replace(array( '<textarea', '</textarea><br />' ), array( '</div><textarea', '</textarea><div id="textarea_content_bbcode_buttons_post" style="display:block;">' ), $rendered) . '</div>' ;
-            $tpl->assign('altsys_x25_dhtmltextarea', $rendered) ;
+            $rendered = '<div id="textarea_content_bbcode_buttons_pre" style="display:block;">'.str_replace(array('<textarea', '</textarea><br />'), array('</div><textarea', '</textarea><div id="textarea_content_bbcode_buttons_post" style="display:block;">'), $rendered).'</div>';
+            $tpl->assign('altsys_x25_dhtmltextarea', $rendered);
         }
 
         $tpl->assign(array(
@@ -273,91 +273,91 @@ 
         'submit_button' => $button_value,
         'common_fck_installed' => file_exists(XOOPS_ROOT_PATH.'/common/fckeditor/fckeditor.js'),
         'gticket_hidden' => $GLOBALS['xoopsGTicket']->getTicketHtml(__LINE__, 1800, 'myblocksadmin')
-    )) ;
+    ));
 //HACK by domifara
-    $tpl->display('db:altsys_main_myblocksadmin_edit_4x25.html') ;
+    $tpl->display('db:altsys_main_myblocksadmin_edit_4x25.html');
 
-        return ;
+        return;
     }
     public function fetchRequest4Block($bid)
     {
         $bid = (int)$bid;
-        (method_exists('MyTextSanitizer', 'sGetInstance') and $myts = MyTextSanitizer::sGetInstance()) || $myts = MyTextSanitizer::getInstance() ;
+        (method_exists('MyTextSanitizer', 'sGetInstance') and $myts = MyTextSanitizer::sGetInstance()) || $myts = MyTextSanitizer::getInstance();
 
         if (@$_POST['extra_sides'][$bid] > 0) {
             $_POST['sides'][$bid] = (int)$_POST['extra_sides'][$bid];
         }
 
         if (@$_POST['sides'][$bid] < 0) {
-            $visible = 0 ;
-            $_POST['sides'][$bid] = -1 ;
+            $visible = 0;
+            $_POST['sides'][$bid] = -1;
         } else {
-            $visible = 1 ;
+            $visible = 1;
         }
 
         return array(
-        'bid' => $bid ,
+        'bid' => $bid,
             'side' => (int)(@$_POST['sides'][$bid]),
             'weight' => (int)(@$_POST['weights'][$bid]),
-        'visible' => $visible ,
-        'title' => $myts->stripSlashesGPC(@$_POST['titles'][$bid]) ,
-        'content' => $myts->stripSlashesGPC(@$_POST['textarea_content']) ,
-        'ctype' => preg_replace('/[^A-Z]/', '', @$_POST['ctypes'][$bid]) ,
+        'visible' => $visible,
+        'title' => $myts->stripSlashesGPC(@$_POST['titles'][$bid]),
+        'content' => $myts->stripSlashesGPC(@$_POST['textarea_content']),
+        'ctype' => preg_replace('/[^A-Z]/', '', @$_POST['ctypes'][$bid]),
             'bcachetime' => (int)(@$_POST['bcachetimes'][$bid]),
-        'bmodule' => is_array(@$_POST['bmodules'][$bid]) ? $_POST['bmodules'][$bid] : array( 0 ) ,
-        'bgroup' => is_array(@$_POST['bgroups'][$bid]) ? $_POST['bgroups'][$bid] : array() ,
+        'bmodule' => is_array(@$_POST['bmodules'][$bid]) ? $_POST['bmodules'][$bid] : array(0),
+        'bgroup' => is_array(@$_POST['bgroups'][$bid]) ? $_POST['bgroups'][$bid] : array(),
         'options' => is_array(@$_POST['options'][$bid]) ? $_POST['options'][$bid] : array()
-    ) ;
+    );
     }
 
     public function previewContent($block_data)
     {
         $bid = (int)$block_data['bid'];
 
-        if (! $block_data['is_custom']) {
-            return '' ;
+        if (!$block_data['is_custom']) {
+            return '';
         }
         if (empty($this->preview_request)) {
-            return '' ;
+            return '';
         }
 
 //HACK by domifara
 //TODO : need no hook block at this
-    $block = new XoopsBlock($bid) ;
+    $block = new XoopsBlock($bid);
 
         if ($block->getVar('mid')) {
-            return '' ;
+            return '';
         }
 
-        $block->setVar('title', $block_data['title']) ;
-        $block->setVar('content', $block_data['content']) ;
+        $block->setVar('title', $block_data['title']);
+        $block->setVar('content', $block_data['content']);
 
-        restore_error_handler() ;
-        $original_level = error_reporting(E_ALL) ;
+        restore_error_handler();
+        $original_level = error_reporting(E_ALL);
 
 //	$ret = $block->getContent( 'S' , $block_data['ctype'] ) ;
 
     $c_type = $block_data['ctype'];
         if ($c_type == 'H') {
-            $ret = str_replace('{X_SITEURL}', XOOPS_URL . '/', $block->getVar('content', 'N'));
+            $ret = str_replace('{X_SITEURL}', XOOPS_URL.'/', $block->getVar('content', 'N'));
         } elseif ($c_type == 'P') {
             ob_start();
             echo eval($block->getVar('content', 'N'));
             $content = ob_get_contents();
             ob_end_clean();
-            $ret = str_replace('{X_SITEURL}', XOOPS_URL . '/', $content);
+            $ret = str_replace('{X_SITEURL}', XOOPS_URL.'/', $content);
         } elseif ($c_type == 'S') {
             (method_exists('MyTextSanitizer', 'sGetInstance') and $myts = MyTextSanitizer::sGetInstance()) || $myts = MyTextSanitizer::getInstance();
-            $content = str_replace('{X_SITEURL}', XOOPS_URL . '/', $block->getVar('content', 'N'));
+            $content = str_replace('{X_SITEURL}', XOOPS_URL.'/', $block->getVar('content', 'N'));
             $ret = $myts->displayTarea($content, 1, 1);
         } else {
             (method_exists('MyTextSanitizer', 'sGetInstance') and $myts = MyTextSanitizer::sGetInstance()) || $myts = MyTextSanitizer::getInstance();
-            $content = str_replace('{X_SITEURL}', XOOPS_URL . '/', $block->getVar('content', 'N'));
+            $content = str_replace('{X_SITEURL}', XOOPS_URL.'/', $block->getVar('content', 'N'));
             $ret = $myts->displayTarea($content, 1, 0);
         }
 
-        error_reporting($original_level) ;
+        error_reporting($original_level);
 
-        return $ret ;
+        return $ret;
     }
 }

xoops_trust_path/libs/altsys/class/D3NotificationHandler.class.php

Spacing +32 added lines, -32 removed lines

@@ -2,7 +2,7 @@ 
 
 // notification handler for D3 modules
 
-require_once XOOPS_ROOT_PATH . '/include/notification_functions.php' ;
+require_once XOOPS_ROOT_PATH.'/include/notification_functions.php';
 
 class D3NotificationHandler
 {
@@ -10,59 +10,59 @@ 
 //function &getInstance( $conn = null )
 public static function &getInstance($conn = null)
 {
-    static $instance ;
-    if (! isset($instance)) {
-        $instance = new D3NotificationHandler() ;
+    static $instance;
+    if (!isset($instance)) {
+        $instance = new D3NotificationHandler();
     }
-    return $instance ;
+    return $instance;
 }
 
 
     public function getMailTemplateDir($mydirname, $mytrustdirname = '')
     {
-        global $xoopsConfig ;
+        global $xoopsConfig;
 
-        $mydirpath = XOOPS_ROOT_PATH.'/modules/'.$mydirname ;
-        $mytrustdirpath = XOOPS_TRUST_PATH.'/modules/'.$mytrustdirname ;
-        $language = empty($xoopsConfig['language']) ? 'english' : $xoopsConfig['language'] ;
+        $mydirpath = XOOPS_ROOT_PATH.'/modules/'.$mydirname;
+        $mytrustdirpath = XOOPS_TRUST_PATH.'/modules/'.$mytrustdirname;
+        $language = empty($xoopsConfig['language']) ? 'english' : $xoopsConfig['language'];
 
         $search_paths = array(
-        "$mydirpath/language/$language/mail_template/" ,
-        "$mytrustdirpath/language/$language/mail_template/" ,
-        "$mydirpath/language/english/mail_template/" ,
+        "$mydirpath/language/$language/mail_template/",
+        "$mytrustdirpath/language/$language/mail_template/",
+        "$mydirpath/language/english/mail_template/",
         "$mytrustdirpath/language/english/mail_template/"
-    ) ;
+    );
 
-        $mail_template_dir = "$mytrustdirpath/language/english/mail_template/" ;
+        $mail_template_dir = "$mytrustdirpath/language/english/mail_template/";
         foreach ($search_paths as $path) {
             if (file_exists($path)) {
-                $mail_template_dir = $path ;
-                break ;
+                $mail_template_dir = $path;
+                break;
             }
         }
 
-        return $mail_template_dir ;
+        return $mail_template_dir;
     }
 
 
-    public function triggerEvent($mydirname, $mytrustdirname, $category, $item_id, $event, $extra_tags=array(), $user_list=array(), $omit_user_id=null)
+    public function triggerEvent($mydirname, $mytrustdirname, $category, $item_id, $event, $extra_tags = array(), $user_list = array(), $omit_user_id = null)
     {
-        $module_handler = xoops_getHandler('module') ;
-        $module = $module_handler->getByDirname($mydirname) ;
+        $module_handler = xoops_getHandler('module');
+        $module = $module_handler->getByDirname($mydirname);
 
-        $notification_handler = xoops_getHandler('notification') ;
-        $mail_template_dir = $this->getMailTemplateDir($mydirname, $mytrustdirname) ;
+        $notification_handler = xoops_getHandler('notification');
+        $mail_template_dir = $this->getMailTemplateDir($mydirname, $mytrustdirname);
 
     // calling a delegate before
     if (class_exists('XCube_DelegateUtils')) {
-        $force_return = false ;
-        XCube_DelegateUtils::raiseEvent('D3NotificationHandler.Trigger', new XCube_Ref($category), new XCube_Ref($event), new XCube_Ref($item_id), new XCube_Ref($extra_tags), new XCube_Ref($module), new XCube_Ref($user_list), new XCube_Ref($omit_user_id), $module->getInfo('notification'), new XCube_Ref($force_return), new XCube_Ref($mail_template_dir), $mydirname, $mytrustdirname) ;
+        $force_return = false;
+        XCube_DelegateUtils::raiseEvent('D3NotificationHandler.Trigger', new XCube_Ref($category), new XCube_Ref($event), new XCube_Ref($item_id), new XCube_Ref($extra_tags), new XCube_Ref($module), new XCube_Ref($user_list), new XCube_Ref($omit_user_id), $module->getInfo('notification'), new XCube_Ref($force_return), new XCube_Ref($mail_template_dir), $mydirname, $mytrustdirname);
         if ($force_return) {
-            return ;
+            return;
         }
     }
 
-        $mid = $module->getVar('mid') ;
+        $mid = $module->getVar('mid');
 
     // Check if event is enabled
     $config_handler = xoops_getHandler('config');
@@ -70,8 +70,8 @@ 
         if (empty($mod_config['notification_enabled'])) {
             return false;
         }
-        $category_info =& notificationCategoryInfo($category, $mid);
-        $event_info =& notificationEventInfo($category, $event, $mid);
+        $category_info = & notificationCategoryInfo($category, $mid);
+        $event_info = & notificationEventInfo($category, $event, $mid);
         if (!in_array(notificationGenerateConfig($category_info, $event_info, 'option_name'), $mod_config['notification_events']) && empty($event_info['invisible'])) {
             return false;
         }
@@ -94,7 +94,7 @@ 
         $mode_criteria->add(new Criteria('not_mode', XOOPS_NOTIFICATION_MODE_SENDONCETHENDELETE), 'OR');
         $mode_criteria->add(new Criteria('not_mode', XOOPS_NOTIFICATION_MODE_SENDONCETHENWAIT), 'OR');
         $criteria->add($mode_criteria);
-        $notifications =& $notification_handler->getObjects($criteria);
+        $notifications = & $notification_handler->getObjects($criteria);
         if (empty($notifications)) {
             return;
         }
@@ -103,11 +103,11 @@ 
     $tags = array();
     // {X_ITEM_NAME} {X_ITEM_URL} {X_ITEM_TYPE} from lookup_func are disabled
     $tags['X_MODULE'] = $module->getVar('name', 'n');
-        $tags['X_MODULE_URL'] = XOOPS_URL . '/modules/' . $module->getVar('dirname') . '/';
+        $tags['X_MODULE_URL'] = XOOPS_URL.'/modules/'.$module->getVar('dirname').'/';
         $tags['X_NOTIFY_CATEGORY'] = $category;
         $tags['X_NOTIFY_EVENT'] = $event;
 
-        $template = $event_info['mail_template'] . '.tpl';
+        $template = $event_info['mail_template'].'.tpl';
         $subject = $event_info['mail_subject'];
 
         if ($user_list) {
@@ -121,7 +121,7 @@ 
                 // user-specific tags
             //$tags['X_UNSUBSCRIBE_URL'] = 'TODO';
             // TODO: don't show unsubscribe link if it is 'one-time' ??
-            $tags['X_UNSUBSCRIBE_URL'] = XOOPS_URL . '/notifications.php';
+            $tags['X_UNSUBSCRIBE_URL'] = XOOPS_URL.'/notifications.php';
                 $tags = array_merge($tags, $extra_tags);
 
                 $notification->notifyUser($mail_template_dir, $template, $subject, $tags);

xoops_trust_path/libs/altsys/mytplsform.php

Spacing +113 added lines, -113 removed lines

@@ -5,36 +5,36 @@ 
 //                       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' ;
-include_once __DIR__ . '/include/tpls_functions.php';
-include_once __DIR__.'/include/Text_Diff.php' ;
-include_once __DIR__.'/include/Text_Diff_Renderer.php' ;
-include_once __DIR__.'/include/Text_Diff_Renderer_unified.php' ;
+require_once __DIR__.'/class/AltsysBreadcrumbs.class.php';
+include_once __DIR__.'/include/gtickets.php';
+include_once __DIR__.'/include/altsys_functions.php';
+include_once __DIR__.'/include/tpls_functions.php';
+include_once __DIR__.'/include/Text_Diff.php';
+include_once __DIR__.'/include/Text_Diff_Renderer.php';
+include_once __DIR__.'/include/Text_Diff_Renderer_unified.php';
 
 
 // only groups have 'module_admin' of 'altsys' can do that.
-$module_handler = xoops_getHandler('module') ;
-$module = $module_handler->getByDirname('altsys') ;
-$moduleperm_handler = xoops_getHandler('groupperm') ;
-if (! is_object(@$xoopsUser) || ! $moduleperm_handler->checkRight('module_admin', $module->getVar('mid'), $xoopsUser->getGroups())) {
-    die('only admin of altsys can access this area') ;
+$module_handler = xoops_getHandler('module');
+$module = $module_handler->getByDirname('altsys');
+$moduleperm_handler = xoops_getHandler('groupperm');
+if (!is_object(@$xoopsUser) || !$moduleperm_handler->checkRight('module_admin', $module->getVar('mid'), $xoopsUser->getGroups())) {
+    die('only admin of altsys can access this area');
 }
 
 //$xoops_system_path = XOOPS_ROOT_PATH . '/modules/system' ;
 
 // 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('mytplsform') ;
-altsys_include_language_file('mytplsadmin') ;
+altsys_include_language_file('mytplsform');
+altsys_include_language_file('mytplsadmin');
 
 // check $xoopsModule
-if (! is_object($xoopsModule)) {
-    redirect_header(XOOPS_URL.'/user.php', 1, _NOPERM) ;
+if (!is_object($xoopsModule)) {
+    redirect_header(XOOPS_URL.'/user.php', 1, _NOPERM);
 }
 
 // check access right (needs system_admin of tplset)
@@ -42,128 +42,128 @@ 
 //if (!$sysperm_handler->checkRight('system_admin', XOOPS_SYSTEM_TPLSET, $xoopsUser->getGroups())) redirect_header( XOOPS_URL.'/user.php' , 1 , _NOPERM ) ;
 
 // tpl_file from $_GET
-$tpl_tplset = $myts->stripSlashesGPC(@$_GET['tpl_tplset']) ;
-if (! $tpl_tplset) {
-    $tpl_tplset = $xoopsConfig['template_set'] ;
+$tpl_tplset = $myts->stripSlashesGPC(@$_GET['tpl_tplset']);
+if (!$tpl_tplset) {
+    $tpl_tplset = $xoopsConfig['template_set'];
 }
-$tpl_tplset4sql = addslashes($tpl_tplset) ;
+$tpl_tplset4sql = addslashes($tpl_tplset);
 
 if (empty($_GET['tpl_file']) || $_GET['tpl_file'] == '_custom') {
-    $edit_mode = 'create' ;
-    $tpl_file = '_custom' ;
+    $edit_mode = 'create';
+    $tpl_file = '_custom';
     $tpl = array(
-        'tpl_id' => 0 ,
-        'tpl_refid' => 0 ,
-        'tpl_module' => '_custom' ,
-        'tpl_tplset' => $tpl_tplset ,
-        'tpl_file' => '_custom_'.substr(date('YmdHis'), 2, -2).'.html' ,
-        'tpl_desc' => '' ,
-        'tpl_lastmodified' => 0 ,
-        'tpl_lastimported' => 0 ,
-        'tpl_type' => 'custom' ,
+        'tpl_id' => 0,
+        'tpl_refid' => 0,
+        'tpl_module' => '_custom',
+        'tpl_tplset' => $tpl_tplset,
+        'tpl_file' => '_custom_'.substr(date('YmdHis'), 2, -2).'.html',
+        'tpl_desc' => '',
+        'tpl_lastmodified' => 0,
+        'tpl_lastimported' => 0,
+        'tpl_type' => 'custom',
         'tpl_source' => ''
-    ) ;
+    );
 
     // breadcrumbs
-    $breadcrumbsObj = AltsysBreadcrumbs::getInstance() ;
-    $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&amp;lib=altsys&amp;page=mytplsadmin', '_MI_ALTSYS_MENU_MYTPLSADMIN') ;
-    $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&amp;lib=altsys&amp;page=mytplsadmin&amp;dirname=_custom', _MYTPLSADMIN_CUSTOMTEMPLATE) ;
-    $breadcrumbsObj->appendPath('', '_MYTPLSADMIN_CREATENEWCUSTOMTEMPLATE') ;
+    $breadcrumbsObj = AltsysBreadcrumbs::getInstance();
+    $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&amp;lib=altsys&amp;page=mytplsadmin', '_MI_ALTSYS_MENU_MYTPLSADMIN');
+    $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&amp;lib=altsys&amp;page=mytplsadmin&amp;dirname=_custom', _MYTPLSADMIN_CUSTOMTEMPLATE);
+    $breadcrumbsObj->appendPath('', '_MYTPLSADMIN_CREATENEWCUSTOMTEMPLATE');
     $target_mname = _MYTPLSADMIN_CUSTOMTEMPLATE;
 } else {
     // tpl_file from $_GET
-    $edit_mode = 'modify' ;
-    $tpl_file = $myts->stripSlashesGPC(@$_GET['tpl_file']) ;
-    $tpl_file = str_replace('db:', '', $tpl_file) ;
-    $tpl_file4sql = addslashes($tpl_file) ;
+    $edit_mode = 'modify';
+    $tpl_file = $myts->stripSlashesGPC(@$_GET['tpl_file']);
+    $tpl_file = str_replace('db:', '', $tpl_file);
+    $tpl_file4sql = addslashes($tpl_file);
 
     // get information from tplfile table
-    $sql = 'SELECT * FROM ' . $db->prefix('tplfile') . ' f NATURAL LEFT JOIN ' . $db->prefix('tplsource') . " s WHERE f.tpl_file='$tpl_file4sql' ORDER BY f.tpl_tplset='$tpl_tplset4sql' DESC,f.tpl_tplset='default' DESC" ;
-    $tpl = $db->fetchArray($db->query($sql)) ;
+    $sql = 'SELECT * FROM '.$db->prefix('tplfile').' f NATURAL LEFT JOIN '.$db->prefix('tplsource')." s WHERE f.tpl_file='$tpl_file4sql' ORDER BY f.tpl_tplset='$tpl_tplset4sql' DESC,f.tpl_tplset='default' DESC";
+    $tpl = $db->fetchArray($db->query($sql));
 
     // get module info
     if ($tpl['tpl_module'] == '_custom') {
-        $target_module = null ;
-        $target_mname = _MYTPLSADMIN_CUSTOMTEMPLATE ;
+        $target_module = null;
+        $target_mname = _MYTPLSADMIN_CUSTOMTEMPLATE;
     } else {
-        $module_handler = xoops_getHandler('module') ;
-        $target_module = $module_handler->getByDirname($tpl['tpl_module']) ;
-        $target_mname = is_object($target_module) ? $target_module->getVar('name') : '' ;
+        $module_handler = xoops_getHandler('module');
+        $target_module = $module_handler->getByDirname($tpl['tpl_module']);
+        $target_mname = is_object($target_module) ? $target_module->getVar('name') : '';
     }
 
     // breadcrumbs
-    $breadcrumbsObj = AltsysBreadcrumbs::getInstance() ;
+    $breadcrumbsObj = AltsysBreadcrumbs::getInstance();
     if ($mydirname != 'altsys' && is_object($target_module)) {
         // mytplsform in each modules
-        $mod_url = XOOPS_URL.'/modules/'.$target_module->getVar('dirname') ;
-        $modinfo = $target_module->getInfo() ;
-        $breadcrumbsObj->appendPath($mod_url.'/'.@$modinfo['adminindex'], $target_mname) ;
-        $breadcrumbsObj->appendPath($mod_url.'/admin/index.php?mode=admin&amp;lib=altsys&amp;page=mytplsadmin', _MD_A_MYTPLSFORM_TPLSADMIN) ;
+        $mod_url = XOOPS_URL.'/modules/'.$target_module->getVar('dirname');
+        $modinfo = $target_module->getInfo();
+        $breadcrumbsObj->appendPath($mod_url.'/'.@$modinfo['adminindex'], $target_mname);
+        $breadcrumbsObj->appendPath($mod_url.'/admin/index.php?mode=admin&amp;lib=altsys&amp;page=mytplsadmin', _MD_A_MYTPLSFORM_TPLSADMIN);
     } else {
         // mytplsform in altsys
-        $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&amp;lib=altsys&amp;page=mytplsadmin', '_MI_ALTSYS_MENU_MYTPLSADMIN') ;
-        $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&amp;lib=altsys&amp;page=mytplsadmin&amp;dirname='.htmlspecialchars($tpl['tpl_module']), $target_mname) ;
+        $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&amp;lib=altsys&amp;page=mytplsadmin', '_MI_ALTSYS_MENU_MYTPLSADMIN');
+        $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&amp;lib=altsys&amp;page=mytplsadmin&amp;dirname='.htmlspecialchars($tpl['tpl_module']), $target_mname);
     }
-    $breadcrumbsObj->appendPath('', _MD_A_MYTPLSFORM_EDIT) ;
+    $breadcrumbsObj->appendPath('', _MD_A_MYTPLSFORM_EDIT);
 }
 
 // error in specifying tpl_file
 if (empty($tpl)) {
     if (strncmp($tpl_file, 'file:', 5) === 0) {
-        die('Not DB template') ;
+        die('Not DB template');
     } else {
-        die('Invalid tpl_file.') ;
+        die('Invalid tpl_file.');
     }
 }
 
 //****************//
 // TRANSACT stage //
 //****************//
-if (! empty($_POST['do_modifycont']) || ! empty($_POST['do_modify'])) {
+if (!empty($_POST['do_modifycont']) || !empty($_POST['do_modify'])) {
     // Ticket Check
-    if (! $xoopsGTicket->check(true, 'altsys_tplsform')) {
+    if (!$xoopsGTicket->check(true, 'altsys_tplsform')) {
         redirect_header(XOOPS_URL.'/', 3, $xoopsGTicket->getErrors());
     }
 
-    $result = $db->query('SELECT tpl_id FROM ' . $db->prefix('tplfile') . " WHERE tpl_file='$tpl_file4sql' AND tpl_tplset='" . addslashes($tpl['tpl_tplset']) . "'") ;
+    $result = $db->query('SELECT tpl_id FROM '.$db->prefix('tplfile')." WHERE tpl_file='$tpl_file4sql' AND tpl_tplset='".addslashes($tpl['tpl_tplset'])."'");
     while (list($tpl_id) = $db->fetchRow($result)) {
-        $sql = 'UPDATE ' . $db->prefix('tplsource') . " SET tpl_source='" . addslashes($myts->stripSlashesGPC($_POST['tpl_source'])) . "' WHERE tpl_id=$tpl_id" ;
-        if (! $db->query($sql)) {
-            die('SQL Error') ;
+        $sql = 'UPDATE '.$db->prefix('tplsource')." SET tpl_source='".addslashes($myts->stripSlashesGPC($_POST['tpl_source']))."' WHERE tpl_id=$tpl_id";
+        if (!$db->query($sql)) {
+            die('SQL Error');
         }
-        $db->query('UPDATE ' . $db->prefix('tplfile') . " SET tpl_lastmodified=UNIX_TIMESTAMP() WHERE tpl_id=$tpl_id") ;
-        altsys_template_touch($tpl_id) ;
+        $db->query('UPDATE '.$db->prefix('tplfile')." SET tpl_lastmodified=UNIX_TIMESTAMP() WHERE tpl_id=$tpl_id");
+        altsys_template_touch($tpl_id);
     }
 
     // continue or end ?
-    if (! empty($_POST['do_modifycont'])) {
-        redirect_header('index.php?mode=admin&lib=altsys&page=mytplsform&tpl_file='.$tpl_file.'&tpl_tplset='.$tpl_tplset.'&dirname='.$tpl['tpl_module'].'#altsys_tplsform_top', 1, _MD_A_MYTPLSFORM_UPDATED) ;
+    if (!empty($_POST['do_modifycont'])) {
+        redirect_header('index.php?mode=admin&lib=altsys&page=mytplsform&tpl_file='.$tpl_file.'&tpl_tplset='.$tpl_tplset.'&dirname='.$tpl['tpl_module'].'#altsys_tplsform_top', 1, _MD_A_MYTPLSFORM_UPDATED);
     } else {
-        redirect_header('index.php?mode=admin&lib=altsys&page=mytplsadmin&dirname='.$tpl['tpl_module'], 1, _MD_A_MYTPLSFORM_UPDATED) ;
+        redirect_header('index.php?mode=admin&lib=altsys&page=mytplsadmin&dirname='.$tpl['tpl_module'], 1, _MD_A_MYTPLSFORM_UPDATED);
     }
-    exit ;
+    exit;
 }
 
-if (! empty($_POST['do_create'])) {
+if (!empty($_POST['do_create'])) {
     // Ticket Check
-    if (! $xoopsGTicket->check(true, 'altsys_tplsform')) {
+    if (!$xoopsGTicket->check(true, 'altsys_tplsform')) {
         redirect_header(XOOPS_URL.'/', 3, $xoopsGTicket->getErrors());
     }
 
-    $sql = 'INSERT INTO ' . $db->prefix('tplfile') . " SET tpl_file='" . addslashes($myts->stripSlashesGPC($_POST['tpl_file'])) . "',tpl_refid=0,tpl_module='" . addslashes($tpl['tpl_module']) . "',tpl_tplset='" . addslashes($tpl['tpl_tplset']) . "',tpl_lastmodified=UNIX_TIMESTAMP(),tpl_type='" . addslashes($tpl['tpl_type']) . "'" ;
-    if (! $db->query($sql)) {
-        die('SQL Error'.__LINE__) ;
+    $sql = 'INSERT INTO '.$db->prefix('tplfile')." SET tpl_file='".addslashes($myts->stripSlashesGPC($_POST['tpl_file']))."',tpl_refid=0,tpl_module='".addslashes($tpl['tpl_module'])."',tpl_tplset='".addslashes($tpl['tpl_tplset'])."',tpl_lastmodified=UNIX_TIMESTAMP(),tpl_type='".addslashes($tpl['tpl_type'])."'";
+    if (!$db->query($sql)) {
+        die('SQL Error'.__LINE__);
     }
     $tpl_id = (int)$db->getInsertId();
-    $sql = 'INSERT INTO ' . $db->prefix('tplsource') . " SET tpl_id=$tpl_id,tpl_source='" . addslashes($myts->stripSlashesGPC($_POST['tpl_source'])) . "'" ;
-    if (! $db->query($sql)) {
-        die('SQL Error'.__LINE__) ;
+    $sql = 'INSERT INTO '.$db->prefix('tplsource')." SET tpl_id=$tpl_id,tpl_source='".addslashes($myts->stripSlashesGPC($_POST['tpl_source']))."'";
+    if (!$db->query($sql)) {
+        die('SQL Error'.__LINE__);
     }
-    altsys_template_touch($tpl_id) ;
+    altsys_template_touch($tpl_id);
 
     // continue or end ?
-    redirect_header('index.php?mode=admin&lib=altsys&page=mytplsadmin&dirname='.$tpl['tpl_module'], 1, _MD_A_MYTPLSFORM_CREATED) ;
-    exit ;
+    redirect_header('index.php?mode=admin&lib=altsys&page=mytplsadmin&dirname='.$tpl['tpl_module'], 1, _MD_A_MYTPLSFORM_CREATED);
+    exit;
 }
 
 
@@ -171,56 +171,56 @@ 
 //****************//
 //   FORM stage   //
 //****************//
-xoops_cp_header() ;
-$mymenu_fake_uri = 'index.php?mode=admin&lib=altsys&page=mytplsadmin&dirname='.$mydirname ;
+xoops_cp_header();
+$mymenu_fake_uri = 'index.php?mode=admin&lib=altsys&page=mytplsadmin&dirname='.$mydirname;
 
 // mymenu
-altsys_include_mymenu() ;
+altsys_include_mymenu();
 
-echo "<h3 style='text-align:"._GLOBAL_LEFT.";'>"._MD_A_MYTPLSFORM_EDIT . ' : ' . htmlspecialchars($tpl['tpl_type'], ENT_QUOTES) . ' : ' . htmlspecialchars($tpl['tpl_file'], ENT_QUOTES) . ' ('
-     . htmlspecialchars($tpl['tpl_tplset'], ENT_QUOTES) . ")</h3>\n" ;
+echo "<h3 style='text-align:"._GLOBAL_LEFT.";'>"._MD_A_MYTPLSFORM_EDIT.' : '.htmlspecialchars($tpl['tpl_type'], ENT_QUOTES).' : '.htmlspecialchars($tpl['tpl_file'], ENT_QUOTES).' ('
+     . htmlspecialchars($tpl['tpl_tplset'], ENT_QUOTES).")</h3>\n";
 
 
 // diff from file to selected DB template
-$basefilepath = tplsadmin_get_basefilepath($tpl['tpl_module'], $tpl['tpl_type'], $tpl['tpl_file']) ;
-$diff_from_file4disp = '' ;
+$basefilepath = tplsadmin_get_basefilepath($tpl['tpl_module'], $tpl['tpl_type'], $tpl['tpl_file']);
+$diff_from_file4disp = '';
 if (file_exists($basefilepath)) {
-    $original_error_level = error_reporting() ;
-    error_reporting($original_error_level & ~ E_NOTICE & ~ E_WARNING) ;
-    $diff = new Text_Diff(file($basefilepath), explode("\n", $tpl['tpl_source'])) ;
+    $original_error_level = error_reporting();
+    error_reporting($original_error_level & ~ E_NOTICE & ~ E_WARNING);
+    $diff = new Text_Diff(file($basefilepath), explode("\n", $tpl['tpl_source']));
     $renderer = new Text_Diff_Renderer_unified();
-    $diff_str = htmlspecialchars($renderer->render($diff), ENT_QUOTES) ;
+    $diff_str = htmlspecialchars($renderer->render($diff), ENT_QUOTES);
     foreach (explode("\n", $diff_str) as $line) {
         if (ord($line) == 0x2d) {
-            $diff_from_file4disp .= "<span style='color:red;'>".$line."</span>\n" ;
+            $diff_from_file4disp .= "<span style='color:red;'>".$line."</span>\n";
         } elseif (ord($line) == 0x2b) {
-            $diff_from_file4disp .= "<span style='color:blue;'>".$line."</span>\n" ;
+            $diff_from_file4disp .= "<span style='color:blue;'>".$line."</span>\n";
         } else {
-            $diff_from_file4disp .= $line."\n" ;
+            $diff_from_file4disp .= $line."\n";
         }
     }
-    error_reporting($original_error_level) ;
+    error_reporting($original_error_level);
 }
 
 // diff from DB-default to selected DB template
-$diff_from_default4disp = '' ;
+$diff_from_default4disp = '';
 if ($tpl['tpl_tplset'] != 'default') {
-    $original_error_level = error_reporting() ;
-    error_reporting($original_error_level & ~ E_NOTICE & ~ E_WARNING) ;
-    list($default_source) = $db->fetchRow($db->query('SELECT tpl_source FROM ' . $db->prefix('tplfile') . ' NATURAL LEFT JOIN ' . $db->prefix('tplsource') . " WHERE tpl_tplset='default' AND tpl_file='" . addslashes($tpl['tpl_file']) . "' AND tpl_module='" . addslashes($tpl['tpl_module']) . "'")) ;
-    $diff = new Text_Diff(explode("\n", $default_source), explode("\n", $tpl['tpl_source'])) ;
+    $original_error_level = error_reporting();
+    error_reporting($original_error_level & ~ E_NOTICE & ~ E_WARNING);
+    list($default_source) = $db->fetchRow($db->query('SELECT tpl_source FROM '.$db->prefix('tplfile').' NATURAL LEFT JOIN '.$db->prefix('tplsource')." WHERE tpl_tplset='default' AND tpl_file='".addslashes($tpl['tpl_file'])."' AND tpl_module='".addslashes($tpl['tpl_module'])."'"));
+    $diff = new Text_Diff(explode("\n", $default_source), explode("\n", $tpl['tpl_source']));
     $renderer = new Text_Diff_Renderer_unified();
-    $diff_str = htmlspecialchars($renderer->render($diff), ENT_QUOTES) ;
+    $diff_str = htmlspecialchars($renderer->render($diff), ENT_QUOTES);
     foreach (explode("\n", $diff_str) as $line) {
         if (ord($line) == 0x2d) {
-            $diff_from_default4disp .= "<span style='color:red;'>".$line."</span>\n" ;
+            $diff_from_default4disp .= "<span style='color:red;'>".$line."</span>\n";
         } elseif (ord($line) == 0x2b) {
-            $diff_from_default4disp .= "<span style='color:blue;'>".$line."</span>\n" ;
+            $diff_from_default4disp .= "<span style='color:blue;'>".$line."</span>\n";
         } else {
-            $diff_from_default4disp .= $line."\n" ;
+            $diff_from_default4disp .= $line."\n";
         }
     }
-    error_reporting($original_error_level) ;
+    error_reporting($original_error_level);
 }
 
 
@@ -228,11 +228,11 @@ 
 	<form name='diff_form' id='diff_form' action='' method='get'>\n" ;
 if ($diff_from_file4disp) {
     echo "<input type='checkbox' name='display_diff2file' value='1' onClick=\"if(this.checked){document.getElementById('diff2file').style.display='block'}else{document.getElementById('diff2file').style.display='none'};\" id='display_diff2file' checked='checked' />&nbsp;<label for='display_diff2file'>diff from file</label>
-	<pre id='diff2file' style='display:block;border:1px solid black;'>$diff_from_file4disp</pre>\n" ;
+	<pre id='diff2file' style='display:block;border:1px solid black;'>$diff_from_file4disp</pre>\n";
 }
 if ($diff_from_default4disp) {
     echo "<input type='checkbox' name='display_diff2default' value='1' onClick=\"if(this.checked){document.getElementById('diff2default').style.display='block'}else{document.getElementById('diff2default').style.display='none'};\" id='display_diff2default' />&nbsp;<label for='display_diff2default'>diff from default</label>
-	<pre id='diff2default' style='display:none;border:1px solid black;'>$diff_from_default4disp</pre>\n" ;
+	<pre id='diff2default' style='display:none;border:1px solid black;'>$diff_from_default4disp</pre>\n";
 }
 echo "
 	</form>\n" ;
@@ -240,10 +240,10 @@ 
 
 echo "
 <a name='altsys_tplsform_top' id='altsys_tplsform_top'></a>
-<form name='MainForm' id='altsys_tplsform' action='?mode=admin&amp;lib=altsys&amp;page=mytplsform&amp;tpl_file=".htmlspecialchars($tpl_file, ENT_QUOTES) . '&amp;tpl_tplset='
-     . htmlspecialchars($tpl['tpl_tplset'], ENT_QUOTES) . '&amp;dirname=' . $target_mname . "' method='post'>
+<form name='MainForm' id='altsys_tplsform' action='?mode=admin&amp;lib=altsys&amp;page=mytplsform&amp;tpl_file=".htmlspecialchars($tpl_file, ENT_QUOTES).'&amp;tpl_tplset='
+     . htmlspecialchars($tpl['tpl_tplset'], ENT_QUOTES).'&amp;dirname='.$target_mname."' method='post'>
 	".$xoopsGTicket->getTicketHtml(__LINE__, 1800, 'altsys_tplsform')."
-    <textarea name='tpl_source' id='altsys_tpl_source' wrap='off' style='width:600px;height:400px;'>".htmlspecialchars($tpl['tpl_source'], ENT_QUOTES) . '</textarea>
+    <textarea name='tpl_source' id='altsys_tpl_source' wrap='off' style='width:600px;height:400px;'>".htmlspecialchars($tpl['tpl_source'], ENT_QUOTES).'</textarea>
 	<br />
 ';
 if ($edit_mode == 'create') {
@@ -251,7 +251,7 @@ 
     echo "
 	<label for='tpl_file'>"._MD_A_MYTPLSFORM_LABEL_TPLFILE."</label>
 	<input type='text' name='tpl_file' id='tpl_file' value='".htmlspecialchars($tpl['tpl_file'], ENT_QUOTES)."' size='64' /><br />
-	<input type='submit' name='do_create' id='do_create' value='"._MD_A_MYTPLSFORM_BTN_CREATE."' />\n" ;
+	<input type='submit' name='do_create' id='do_create' value='"._MD_A_MYTPLSFORM_BTN_CREATE."' />\n";
 } else {
     // modify form
     echo "
@@ -261,4 +261,4 @@ 
 </form>\n" ;
 }
 
-xoops_cp_footer() ;
+xoops_cp_footer();

xoops_trust_path/libs/altsys/onuninstall.php

Spacing +15 added lines, -15 removed lines

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

xoops_trust_path/libs/altsys/oninstall.php

Spacing +53 added lines, -53 removed lines

@@ -1,63 +1,63 @@ 
 <?php
 
-eval(' function xoops_module_install_'.$mydirname.'( $module ) { return altsys_oninstall_base( $module , "'.$mydirname.'" ) ; } ') ;
+eval(' function xoops_module_install_'.$mydirname.'( $module ) { return altsys_oninstall_base( $module , "'.$mydirname.'" ) ; } ');
 
 
-if (! function_exists('altsys_oninstall_base')) {
+if (!function_exists('altsys_oninstall_base')) {
     function altsys_oninstall_base($module, $mydirname)
     {
         // transations on module install
 
-    global $ret ; // TODO :-D
+    global $ret; // TODO :-D
 
     // for Cube 2.1
     if (defined('XOOPS_CUBE_LEGACY')) {
         $root = XCube_Root::getSingleton();
-        $root->mDelegateManager->add('Legacy.Admin.Event.ModuleInstall.' . ucfirst($mydirname) . '.Success', 'altsys_message_append_oninstall') ;
-        $ret = array() ;
+        $root->mDelegateManager->add('Legacy.Admin.Event.ModuleInstall.'.ucfirst($mydirname).'.Success', 'altsys_message_append_oninstall');
+        $ret = array();
     } else {
-        if (! is_array($ret)) {
-            $ret = array() ;
+        if (!is_array($ret)) {
+            $ret = array();
         }
     }
 
-        $db = XoopsDatabaseFactory::getDatabaseConnection() ;
-        $mid = $module->getVar('mid') ;
+        $db = XoopsDatabaseFactory::getDatabaseConnection();
+        $mid = $module->getVar('mid');
 
     /*************** BEGIN ALTSYS SPECIFIC PART ******************/
     // set weight=0
-    $db->queryF('UPDATE ' . $db->prefix('modules') . " SET weight=0 WHERE mid=$mid") ;
+    $db->queryF('UPDATE '.$db->prefix('modules')." SET weight=0 WHERE mid=$mid");
     /*************** END ALTSYS SPECIFIC PART ******************/
 
     // TABLES (loading mysql.sql)
-    $sql_file_path = __DIR__.'/sql/mysql.sql' ;
-        $prefix_mod = $db->prefix() . '_' . $mydirname ;
+    $sql_file_path = __DIR__.'/sql/mysql.sql';
+        $prefix_mod = $db->prefix().'_'.$mydirname;
         if (file_exists($sql_file_path)) {
-            $ret[] = 'SQL file found at <b>' . htmlspecialchars($sql_file_path) . '</b>.<br /> Creating tables...';
+            $ret[] = 'SQL file found at <b>'.htmlspecialchars($sql_file_path).'</b>.<br /> Creating tables...';
 
             if (file_exists(XOOPS_ROOT_PATH.'/class/database/oldsqlutility.php')) {
-                include_once XOOPS_ROOT_PATH.'/class/database/oldsqlutility.php' ;
-                $sqlutil = new OldSqlUtility ;
+                include_once XOOPS_ROOT_PATH.'/class/database/oldsqlutility.php';
+                $sqlutil = new OldSqlUtility;
             } else {
-                include_once XOOPS_ROOT_PATH.'/class/database/sqlutility.php' ;
-                $sqlutil = new SqlUtility ;
+                include_once XOOPS_ROOT_PATH.'/class/database/sqlutility.php';
+                $sqlutil = new SqlUtility;
             }
 
-            $sql_query = trim(file_get_contents($sql_file_path)) ;
-            $sqlutil->splitMySqlFile($pieces, $sql_query) ;
-            $created_tables = array() ;
+            $sql_query = trim(file_get_contents($sql_file_path));
+            $sqlutil->splitMySqlFile($pieces, $sql_query);
+            $created_tables = array();
             foreach ($pieces as $piece) {
-                $prefixed_query = $sqlutil->prefixQuery($piece, $prefix_mod) ;
-                if (! $prefixed_query) {
-                    $ret[] = 'Invalid SQL <b>' . htmlspecialchars($piece) . '</b><br />';
-                    return false ;
+                $prefixed_query = $sqlutil->prefixQuery($piece, $prefix_mod);
+                if (!$prefixed_query) {
+                    $ret[] = 'Invalid SQL <b>'.htmlspecialchars($piece).'</b><br />';
+                    return false;
                 }
-                if (! $db->query($prefixed_query[0])) {
-                    $ret[] = '<b>'.htmlspecialchars($db->error()).'</b><br />' ;
+                if (!$db->query($prefixed_query[0])) {
+                    $ret[] = '<b>'.htmlspecialchars($db->error()).'</b><br />';
                 //var_dump( $db->error() ) ;
-                return false ;
+                return false;
                 } else {
-                    if (! in_array($prefixed_query[4], $created_tables)) {
+                    if (!in_array($prefixed_query[4], $created_tables)) {
                         $ret[] = 'Table <b>'.htmlspecialchars($prefix_mod.'_'.$prefixed_query[4]).'</b> created.<br />';
                         $created_tables[] = $prefixed_query[4];
                     } else {
@@ -68,33 +68,33 @@ 
         }
 
     // TEMPLATES
-    $tplfile_handler = xoops_getHandler('tplfile') ;
-        $tpl_path = __DIR__.'/templates' ;
-        if ($handler = @opendir($tpl_path . '/')) {
+    $tplfile_handler = xoops_getHandler('tplfile');
+        $tpl_path = __DIR__.'/templates';
+        if ($handler = @opendir($tpl_path.'/')) {
             while (($file = readdir($handler)) !== false) {
                 if (substr($file, 0, 1) == '.') {
-                    continue ;
+                    continue;
                 }
-                $file_path = $tpl_path . '/' . $file ;
+                $file_path = $tpl_path.'/'.$file;
                 if (is_file($file_path)) {
                     $mtime = (int)(@filemtime($file_path));
-                    $tplfile = $tplfile_handler->create() ;
-                    $tplfile->setVar('tpl_source', file_get_contents($file_path), true) ;
-                    $tplfile->setVar('tpl_refid', $mid) ;
-                    $tplfile->setVar('tpl_tplset', 'default') ;
-                    $tplfile->setVar('tpl_file', $mydirname . '_' . $file) ;
-                    $tplfile->setVar('tpl_desc', '', true) ;
-                    $tplfile->setVar('tpl_module', $mydirname) ;
-                    $tplfile->setVar('tpl_lastmodified', $mtime) ;
-                    $tplfile->setVar('tpl_lastimported', 0) ;
-                    $tplfile->setVar('tpl_type', 'module') ;
-                    if (! $tplfile_handler->insert($tplfile)) {
+                    $tplfile = $tplfile_handler->create();
+                    $tplfile->setVar('tpl_source', file_get_contents($file_path), true);
+                    $tplfile->setVar('tpl_refid', $mid);
+                    $tplfile->setVar('tpl_tplset', 'default');
+                    $tplfile->setVar('tpl_file', $mydirname.'_'.$file);
+                    $tplfile->setVar('tpl_desc', '', true);
+                    $tplfile->setVar('tpl_module', $mydirname);
+                    $tplfile->setVar('tpl_lastmodified', $mtime);
+                    $tplfile->setVar('tpl_lastimported', 0);
+                    $tplfile->setVar('tpl_type', 'module');
+                    if (!$tplfile_handler->insert($tplfile)) {
                         $ret[] = '<span style="color:#ff0000;">ERROR: Could not insert template <b>'.htmlspecialchars($mydirname.'_'.$file).'</b> to the database.</span><br />';
                     } else {
-                        $tplid = $tplfile->getVar('tpl_id') ;
+                        $tplid = $tplfile->getVar('tpl_id');
                         $ret[] = 'Template <b>'.htmlspecialchars($mydirname.'_'.$file).'</b> added to the database. (ID: <b>'.$tplid.'</b>)<br />';
-                        require_once XOOPS_TRUST_PATH.'/libs/altsys/include/altsys_functions.php' ;
-                        altsys_clear_templates_c() ;
+                        require_once XOOPS_TRUST_PATH.'/libs/altsys/include/altsys_functions.php';
+                        altsys_clear_templates_c();
                     // generate compiled file
                     /*include_once XOOPS_ROOT_PATH.'/class/xoopsblock.php' ;
                     include_once XOOPS_ROOT_PATH.'/class/template.php' ;
@@ -106,20 +106,20 @@ 
                     }
                 }
             }
-            closedir($handler) ;
+            closedir($handler);
         }
-        include_once XOOPS_ROOT_PATH.'/class/xoopsblock.php' ;
-        include_once XOOPS_ROOT_PATH.'/class/template.php' ;
-        xoops_template_clear_module_cache($mid) ;
+        include_once XOOPS_ROOT_PATH.'/class/xoopsblock.php';
+        include_once XOOPS_ROOT_PATH.'/class/template.php';
+        xoops_template_clear_module_cache($mid);
 
-        return true ;
+        return true;
     }
 
     function altsys_message_append_oninstall(&$module_obj, &$log)
     {
         if (is_array(@$GLOBALS['ret'])) {
             foreach ($GLOBALS['ret'] as $message) {
-                $log->add(strip_tags($message)) ;
+                $log->add(strip_tags($message));
             }
         }
 

xoops_trust_path/libs/altsys/blocks/block_functions.php

Spacing +51 added lines, -51 removed lines

@@ -1,33 +1,33 @@ 
 <?php
 
-require_once dirname(__DIR__).'/include/altsys_functions.php' ;
+require_once dirname(__DIR__).'/include/altsys_functions.php';
 
 function b_altsys_admin_menu_show($options)
 {
-    global $xoopsUser ;
+    global $xoopsUser;
 
-    $mydirname = empty($options[0]) ? 'altsys' : $options[0] ;
-    $this_template = empty($options[1]) ? 'db:'.$mydirname.'_block_admin_menu.html' : trim($options[1]) ;
+    $mydirname = empty($options[0]) ? 'altsys' : $options[0];
+    $this_template = empty($options[1]) ? 'db:'.$mydirname.'_block_admin_menu.html' : trim($options[1]);
 
     if (preg_match('/[^0-9a-zA-Z_-]/', $mydirname)) {
-        die('Invalid mydirname') ;
+        die('Invalid mydirname');
     }
-    if (! is_object(@$xoopsUser)) {
-        return array() ;
+    if (!is_object(@$xoopsUser)) {
+        return array();
     }
 
     // coretype
-    $coretype = altsys_get_core_type() ;
+    $coretype = altsys_get_core_type();
 
     // mid_selected
     if (is_object(@$GLOBALS['xoopsModule'])) {
-        $mid_selected = $GLOBALS['xoopsModule']->getVar('mid') ;
+        $mid_selected = $GLOBALS['xoopsModule']->getVar('mid');
         // for system->preferences
-        if ($mid_selected == 1 && @$_GET['fct'] == 'preferences' && @$_GET['op'] == 'showmod' && ! empty($_GET['mod'])) {
+        if ($mid_selected == 1 && @$_GET['fct'] == 'preferences' && @$_GET['op'] == 'showmod' && !empty($_GET['mod'])) {
             $mid_selected = (int)$_GET['mod'];
         }
     } else {
-        $mid_selected = 0 ;
+        $mid_selected = 0;
     }
 
     $db = XoopsDatabaseFactory::getDatabaseConnection();
@@ -36,72 +36,72 @@ 
     $module_handler = xoops_getHandler('module');
     $current_module = $module_handler->getByDirname($mydirname);
     $config_handler = xoops_getHandler('config');
-    $current_configs = $config_handler->getConfigList($current_module->mid()) ;
+    $current_configs = $config_handler->getConfigList($current_module->mid());
     $moduleperm_handler = xoops_getHandler('groupperm');
     $admin_mids = $moduleperm_handler->getItemIds('module_admin', $xoopsUser->getGroups());
-    $modules = $module_handler->getObjects(new Criteria('mid', '('.implode(',', $admin_mids) . ')', 'IN'), true) ;
+    $modules = $module_handler->getObjects(new Criteria('mid', '('.implode(',', $admin_mids).')', 'IN'), true);
 
     $block = array(
-        'mydirname' => $mydirname ,
-        'mod_url' => XOOPS_URL.'/modules/'.$mydirname ,
-        'mod_imageurl' => XOOPS_URL.'/modules/'.$mydirname.'/'.$current_configs['images_dir'] ,
+        'mydirname' => $mydirname,
+        'mod_url' => XOOPS_URL.'/modules/'.$mydirname,
+        'mod_imageurl' => XOOPS_URL.'/modules/'.$mydirname.'/'.$current_configs['images_dir'],
         'mod_config' => $current_configs
-    ) ;
+    );
 
     foreach ($modules as $mod) {
         $mid = (int)$mod->getVar('mid');
-        $dirname = $mod->getVar('dirname') ;
-        $modinfo = $mod->getInfo() ;
-        $submenus4assign = array() ;
-        $adminmenu = array() ;
-        $adminmenu4altsys = array() ;
-        unset($adminmenu_use_altsys) ;
-        @include XOOPS_ROOT_PATH.'/modules/'.$dirname.'/'.@$modinfo['adminmenu'] ;
+        $dirname = $mod->getVar('dirname');
+        $modinfo = $mod->getInfo();
+        $submenus4assign = array();
+        $adminmenu = array();
+        $adminmenu4altsys = array();
+        unset($adminmenu_use_altsys);
+        @include XOOPS_ROOT_PATH.'/modules/'.$dirname.'/'.@$modinfo['adminmenu'];
         // from admin_menu.php etc.
-        $adminmenu = array_merge($adminmenu, $adminmenu4altsys) ;
+        $adminmenu = array_merge($adminmenu, $adminmenu4altsys);
         foreach ($adminmenu as $sub) {
-            $link = empty($sub['altsys_link']) ? $sub['link'] : $sub['altsys_link'] ;
+            $link = empty($sub['altsys_link']) ? $sub['link'] : $sub['altsys_link'];
             if (isset($sub['show']) && $sub['show'] === false) {
-                continue ;
+                continue;
             }
             $submenus4assign[] = array(
-                'title' => $myts->makeTboxData4Show($sub['title']) ,
+                'title' => $myts->makeTboxData4Show($sub['title']),
                 'url' => XOOPS_URL.'/modules/'.$dirname.'/'.htmlspecialchars($link, ENT_QUOTES)
-            ) ;
+            );
         }
 
         // for modules overriding Module.class.php (eg. Analyzer for XC)
-        if (empty($submenus4assign) && defined('XOOPS_CUBE_LEGACY') && ! empty($modinfo['cube_style'])) {
+        if (empty($submenus4assign) && defined('XOOPS_CUBE_LEGACY') && !empty($modinfo['cube_style'])) {
             $module_handler = xoops_getHandler('module');
             $module = $module_handler->get($mid);
             $moduleObj = Legacy_Utils::createModule($module);
-            $modinfo['adminindex'] = $moduleObj->getAdminIndex() ;
-            $modinfo['adminindex_absolute'] = true ;
+            $modinfo['adminindex'] = $moduleObj->getAdminIndex();
+            $modinfo['adminindex_absolute'] = true;
             foreach ($moduleObj->getAdminMenu() as $sub) {
                 if (@$sub['show'] === false) {
-                    continue ;
+                    continue;
                 }
                 $submenus4assign[] = array(
-                    'title' => $myts->makeTboxData4Show($sub['title']) ,
+                    'title' => $myts->makeTboxData4Show($sub['title']),
                     'url' => strncmp($sub['link'], 'http', 4) === 0 ? htmlspecialchars($sub['link'], ENT_QUOTES) : XOOPS_URL.'/modules/'.$dirname.'/'.htmlspecialchars($sub['link'], ENT_QUOTES)
-                ) ;
+                );
             }
         } elseif (empty($adminmenu4altsys)) {
 
             // add preferences
-            if ($mod->getVar('hasconfig') && ! in_array($mod->getVar('dirname'), array( 'system', 'legacy' ))) {
+            if ($mod->getVar('hasconfig') && !in_array($mod->getVar('dirname'), array('system', 'legacy'))) {
                 $submenus4assign[] = array(
-                    'title' => _PREFERENCES ,
+                    'title' => _PREFERENCES,
                     'url' => htmlspecialchars(altsys_get_link2modpreferences($mid, $coretype), ENT_QUOTES)
-                ) ;
+                );
             }
 
             // add help
-            if (defined('XOOPS_CUBE_LEGACY') && ! empty($modinfo['help'])) {
+            if (defined('XOOPS_CUBE_LEGACY') && !empty($modinfo['help'])) {
                 $submenus4assign[] = array(
-                    'title' => _HELP ,
+                    'title' => _HELP,
                     'url' => XOOPS_URL.'/modules/legacy/admin/index.php?action=Help&amp;dirname='.$dirname
-                ) ;
+                );
             }
         }
 
@@ -123,25 +123,25 @@ 
             'submenu' => $submenus4assign,
             'selected' => $mid == $mid_selected,
             'dot_suffix' => $mid == $mid_selected ? 'selected_opened' : 'closed'
-        ) ;
-        $block['modules'][] = $module4assign ;
+        );
+        $block['modules'][] = $module4assign;
     }
 
-    require_once XOOPS_TRUST_PATH.'/libs/altsys/class/D3Tpl.class.php' ;
-    $tpl = new D3Tpl() ;
-    $tpl->assign('block', $block) ;
-    $ret['content'] = $tpl->fetch($this_template) ;
-    return $ret ;
+    require_once XOOPS_TRUST_PATH.'/libs/altsys/class/D3Tpl.class.php';
+    $tpl = new D3Tpl();
+    $tpl->assign('block', $block);
+    $ret['content'] = $tpl->fetch($this_template);
+    return $ret;
 }
 
 
 function b_altsys_admin_menu_edit($options)
 {
-    $mydirname = empty($options[0]) ? 'd3forum' : $options[0] ;
-    $this_template = empty($options[1]) ? 'db:'.$mydirname.'_block_admin_menu.html' : trim($options[1]) ;
+    $mydirname = empty($options[0]) ? 'd3forum' : $options[0];
+    $this_template = empty($options[1]) ? 'db:'.$mydirname.'_block_admin_menu.html' : trim($options[1]);
 
     if (preg_match('/[^0-9a-zA-Z_-]/', $mydirname)) {
-        die('Invalid mydirname') ;
+        die('Invalid mydirname');
     }
 
     $form = "