mambax7 / altsys

xoops_trust_path/libs/altsys/controllers.php

Spacing +3 added lines, -3 removed lines

@@ -5,9 +5,9 @@ 
 //$langman->read( 'modinfo.php' , 'altsys' , 'altsys' ) ;
 
 if (file_exists(__DIR__.'/language/'.$GLOBALS['xoopsConfig']['language'].'/modinfo.php')) {
-    include_once __DIR__.'/language/'.$GLOBALS['xoopsConfig']['language'].'/modinfo.php' ;
+    include_once __DIR__.'/language/'.$GLOBALS['xoopsConfig']['language'].'/modinfo.php';
 } elseif (file_exists(__DIR__.'/language/english/modinfo.php')) {
-    include_once __DIR__.'/language/english/modinfo.php' ;
+    include_once __DIR__.'/language/english/modinfo.php';
 }
 
 $controllers = array(
@@ -20,4 +20,4 @@ 
     'mytplsform',
     'put_templates',
     'mylangadmin'
-) ;
+);

xoops_trust_path/libs/altsys/onupdate.php

Spacing +40 added lines, -40 removed lines

@@ -1,75 +1,75 @@ 
 <?php
 
-eval(' function xoops_module_update_'.$mydirname.'( $module ) { return altsys_onupdate_base( $module , "'.$mydirname.'" ) ; } ') ;
+eval(' function xoops_module_update_'.$mydirname.'( $module ) { return altsys_onupdate_base( $module , "'.$mydirname.'" ) ; } ');
 
 
-if (! function_exists('altsys_onupdate_base')) {
+if (!function_exists('altsys_onupdate_base')) {
     function altsys_onupdate_base($module, $mydirname)
     {
         // transations on module update
 
-    global $msgs ; // TODO :-D
+    global $msgs; // TODO :-D
 
     // for Cube 2.1
     if (defined('XOOPS_CUBE_LEGACY')) {
-        $root =& XCube_Root::getSingleton();
-        $root->mDelegateManager->add('Legacy.Admin.Event.ModuleUpdate.' . ucfirst($mydirname) . '.Success', 'altsys_message_append_onupdate') ;
-        $msgs = array() ;
+        $root = & XCube_Root::getSingleton();
+        $root->mDelegateManager->add('Legacy.Admin.Event.ModuleUpdate.'.ucfirst($mydirname).'.Success', 'altsys_message_append_onupdate');
+        $msgs = array();
     } else {
-        if (! is_array($msgs)) {
-            $msgs = array() ;
+        if (!is_array($msgs)) {
+            $msgs = array();
         }
     }
 
-        $db =& XoopsDatabaseFactory::getDatabaseConnection() ;
-        $mid = $module->getVar('mid') ;
+        $db = & XoopsDatabaseFactory::getDatabaseConnection();
+        $mid = $module->getVar('mid');
 
 
 
     // TABLES (write here ALTER TABLE etc. if necessary)
 
     // configs (Though I know it is not a recommended way...)
-    $check_sql = 'SHOW COLUMNS FROM ' . $db->prefix('config') . " LIKE 'conf_title'" ;
+    $check_sql = 'SHOW COLUMNS FROM '.$db->prefix('config')." LIKE 'conf_title'";
         if (($result = $db->query($check_sql)) && ($myrow = $db->fetchArray($result)) && @$myrow['Type'] == 'varchar(30)') {
-            $db->queryF('ALTER TABLE ' . $db->prefix('config') . " MODIFY `conf_title` varchar(255) NOT NULL default '', MODIFY `conf_desc` varchar(255) NOT NULL default ''") ;
+            $db->queryF('ALTER TABLE '.$db->prefix('config')." MODIFY `conf_title` varchar(255) NOT NULL default '', MODIFY `conf_desc` varchar(255) NOT NULL default ''");
         }
 
     // 0.4 -> 0.5
-    $check_sql = 'SELECT COUNT(*) FROM ' . $db->prefix($mydirname . '_language_constants') ;
-        if (! $db->query($check_sql)) {
-            $db->queryF('CREATE TABLE ' . $db->prefix($mydirname . '_language_constants') . " (mid smallint(5) unsigned NOT NULL default 0,language varchar(32) NOT NULL default '',name varchar(255) NOT NULL default '',value text,PRIMARY KEY (mid,language,name)) ENGINE=MyISAM") ;
+    $check_sql = 'SELECT COUNT(*) FROM '.$db->prefix($mydirname.'_language_constants');
+        if (!$db->query($check_sql)) {
+            $db->queryF('CREATE TABLE '.$db->prefix($mydirname.'_language_constants')." (mid smallint(5) unsigned NOT NULL default 0,language varchar(32) NOT NULL default '',name varchar(255) NOT NULL default '',value text,PRIMARY KEY (mid,language,name)) ENGINE=MyISAM");
         }
 
 
     // TEMPLATES (all templates have been already removed by modulesadmin)
-    $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)) {
                         $msgs[] = '<span style="color:#ff0000;">ERROR: Could not insert template <b>'.htmlspecialchars($mydirname.'_'.$file).'</b> to the database.</span>';
                     } else {
-                        $tplid = $tplfile->getVar('tpl_id') ;
+                        $tplid = $tplfile->getVar('tpl_id');
                         $msgs[] = 'Template <b>'.htmlspecialchars($mydirname.'_'.$file).'</b> added to the database. (ID: <b>'.$tplid.'</b>)';
                     // generate compiled file
-                    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();
                     /*include_once XOOPS_ROOT_PATH.'/class/xoopsblock.php' ;
                     if( ! xoops_template_touch( $tplid ) ) {
                         $msgs[] = '<span style="color:#ff0000;">ERROR: Failed compiling template <b>'.htmlspecialchars($mydirname.'_'.$file).'</b>.</span>';
@@ -79,20 +79,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_onupdate(&$module_obj, &$log)
     {
         if (is_array(@$GLOBALS['msgs'])) {
             foreach ($GLOBALS['msgs'] as $message) {
-                $log->add(strip_tags($message)) ;
+                $log->add(strip_tags($message));
             }
         }
 

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

Switch Indentation +61 added lines, -61 removed lines

@@ -47,42 +47,42 @@ 
         $scoln = 'disabled';
     } else {
         switch ($side) {
-        case XOOPS_SIDEBLOCK_LEFT :
-            $ssel0 = " checked='checked'";
-            $scol0 = 'selected';
-            break ;
-        case XOOPS_SIDEBLOCK_RIGHT :
-            $ssel1 = " checked='checked'";
-            $scol1 = 'selected';
-            break ;
-        case XOOPS_CENTERBLOCK_LEFT :
-            $ssel3 = " checked='checked'";
-            $scol3 = 'selected';
-            break ;
-        case XOOPS_CENTERBLOCK_RIGHT :
-            $ssel4 = " checked='checked'";
-            $scol4 = 'selected';
-            break ;
-        case XOOPS_CENTERBLOCK_CENTER :
-            $ssel5 = " checked='checked'";
-            $scol5 = 'selected';
-            break ;
-        case XOOPS_CENTERBLOCK_BOTTOMLEFT :
-            $ssel7 = " checked='checked'";
-            $scol7 = 'selected';
-            break ;
-        case XOOPS_CENTERBLOCK_BOTTOMRIGHT :
-            $ssel8 = " checked='checked'";
-            $scol8 = 'selected';
-            break ;
-        case XOOPS_CENTERBLOCK_BOTTOM :
-            $ssel9 = " checked='checked'";
-            $scol9 = 'selected';
-            break ;
-        default :
-            $value4extra_side = $side ;
-            $stextbox = 'selected';
-            break ;
+            case XOOPS_SIDEBLOCK_LEFT :
+                $ssel0 = " checked='checked'";
+                $scol0 = 'selected';
+                break ;
+            case XOOPS_SIDEBLOCK_RIGHT :
+                $ssel1 = " checked='checked'";
+                $scol1 = 'selected';
+                break ;
+            case XOOPS_CENTERBLOCK_LEFT :
+                $ssel3 = " checked='checked'";
+                $scol3 = 'selected';
+                break ;
+            case XOOPS_CENTERBLOCK_RIGHT :
+                $ssel4 = " checked='checked'";
+                $scol4 = 'selected';
+                break ;
+            case XOOPS_CENTERBLOCK_CENTER :
+                $ssel5 = " checked='checked'";
+                $scol5 = 'selected';
+                break ;
+            case XOOPS_CENTERBLOCK_BOTTOMLEFT :
+                $ssel7 = " checked='checked'";
+                $scol7 = 'selected';
+                break ;
+            case XOOPS_CENTERBLOCK_BOTTOMRIGHT :
+                $ssel8 = " checked='checked'";
+                $scol8 = 'selected';
+                break ;
+            case XOOPS_CENTERBLOCK_BOTTOM :
+                $ssel9 = " checked='checked'";
+                $scol9 = 'selected';
+                break ;
+            default :
+                $value4extra_side = $side ;
+                $stextbox = 'selected';
+                break ;
     }
     }
 
@@ -166,31 +166,31 @@ 
         }
 
         switch ($mode) {
-        case 'clone' :
-            $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 ;
-        case 'new' :
-            $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 ;
-        case 'edit' :
-        default :
-            $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 ;
+            case 'clone' :
+                $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 ;
+            case 'new' :
+                $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 ;
+            case 'edit' :
+            default :
+                $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 ;
     }
 
         $is_custom = in_array($block->getVar('block_type'), array( 'C', 'E' )) ? true : false ;

Spacing +104 added lines, -104 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-require_once __DIR__.'/MyBlocksAdmin.class.php' ;
+require_once __DIR__.'/MyBlocksAdmin.class.php';
 
 class MyBlocksAdminForX25 extends MyBlocksAdmin
 {
@@ -12,9 +12,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+
@@ -24,7 +24,7 @@ 
     static $instance;
     if (!isset($instance)) {
         $instance = new MyBlocksAdminForX25();
-        $instance->construct() ;
+        $instance->construct();
     }
     return $instance;
 }
@@ -40,7 +40,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'";
@@ -50,39 +50,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;
     }
     }
 
@@ -143,7 +143,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>
@@ -155,53 +155,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' ;
+        $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';
         }
 //HACK by domifara
 /*
@@ -210,41 +210,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;
@@ -254,12 +254,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(
@@ -274,91 +274,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'));
+            (method_exists('MyTextSanitizer', 'sGetInstance') and $myts = & MyTextSanitizer::sGetInstance()) || $myts = & MyTextSanitizer::getInstance();
+            $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'));
+            (method_exists('MyTextSanitizer', 'sGetInstance') and $myts = & MyTextSanitizer::sGetInstance()) || $myts = & MyTextSanitizer::getInstance();
+            $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/MyBlocksAdminForX20S.class.php

Spacing +27 added lines, -27 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 
-require_once __DIR__.'/MyBlocksAdmin.class.php' ;
+require_once __DIR__.'/MyBlocksAdmin.class.php';
 
 class MyBlocksAdminForX20S extends MyBlocksAdmin
 {
 
-    public $block_positions = array() ;
+    public $block_positions = array();
 
     public function MyBlocksAadminForX20S()
     {
@@ -14,20 +14,20 @@ 
 
     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';
         $this->block_positions = array(
-        -1 => _NONE ,
-        0 => _AM_SBLEFT ,
-        1 => _AM_SBRIGHT ,
-        3 => _AM_CBLEFT ,
-        4 => _AM_CBRIGHT ,
-        5 => _AM_CBCENTER ,
-        7 => _AM_CBBOTTOMLEFT ,
-        8 => _AM_CBBOTTOMRIGHT ,
+        -1 => _NONE,
+        0 => _AM_SBLEFT,
+        1 => _AM_SBRIGHT,
+        3 => _AM_CBLEFT,
+        4 => _AM_CBRIGHT,
+        5 => _AM_CBCENTER,
+        7 => _AM_CBBOTTOMLEFT,
+        8 => _AM_CBBOTTOMRIGHT,
         9 => _AM_CBBOTTOM
-    ) ;
+    );
     }
 
 //HACK by domifara for php5.3+
@@ -37,7 +37,7 @@ 
     static $instance;
     if (!isset($instance)) {
         $instance = new MyBlocksAdminForX20S();
-        $instance->construct() ;
+        $instance->construct();
     }
     return $instance;
 }
@@ -50,19 +50,19 @@ 
     return "
 	<table style='width:80px;'>
 		<tr>
-            <td rowspan='2'>".$this->renderRadio4BlockPosition(0, $block_data) . '</td>
-            <td>' . $this->renderRadio4BlockPosition(3, $block_data) . '</td>
-            <td>' . $this->renderRadio4BlockPosition(5, $block_data) . '</td>
-            <td>' . $this->renderRadio4BlockPosition(4, $block_data) . "</td>
-            <td rowspan='2'>".$this->renderRadio4BlockPosition(1, $block_data) . '</td>
+            <td rowspan='2'>".$this->renderRadio4BlockPosition(0, $block_data).'</td>
+            <td>' . $this->renderRadio4BlockPosition(3, $block_data).'</td>
+            <td>' . $this->renderRadio4BlockPosition(5, $block_data).'</td>
+            <td>' . $this->renderRadio4BlockPosition(4, $block_data)."</td>
+            <td rowspan='2'>".$this->renderRadio4BlockPosition(1, $block_data).'</td>
 		</tr>
 		<tr>
-            <td>' . $this->renderRadio4BlockPosition(7, $block_data) . '</td>
-            <td>' . $this->renderRadio4BlockPosition(9, $block_data) . '</td>
-            <td>' . $this->renderRadio4BlockPosition(8, $block_data) . "</td>
+            <td>' . $this->renderRadio4BlockPosition(7, $block_data).'</td>
+            <td>' . $this->renderRadio4BlockPosition(9, $block_data).'</td>
+            <td>' . $this->renderRadio4BlockPosition(8, $block_data)."</td>
 		</tr>
 		<tr>
-            <td colspan='5'>".$this->renderRadio4BlockPosition(-1, $block_data)._NONE . '</td>
+            <td colspan='5'>".$this->renderRadio4BlockPosition(-1, $block_data)._NONE.'</td>
 		</tr>
     </table>';
 }
@@ -73,18 +73,18 @@ 
 {
     $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>";
 }
 }

xoops_trust_path/libs/altsys/class/altsysUtils.class.php

Spacing +3 added lines, -3 removed lines

@@ -5,7 +5,7 @@ 
     {
         $names = array();
         
-        if (! class_exists('XCube_Delegate')) {
+        if (!class_exists('XCube_Delegate')) {
             return $names;
         }
         
@@ -23,7 +23,7 @@ 
                 foreach (array_keys($callbacks) as $priority) {
                     foreach (array_keys($callbacks[$priority]) as $idx) {
                         $callback = $callbacks[$priority][$idx][0];
-                        $_name = (is_array($callback))? ((is_object($callback[0]))? get_class($callback[0]) : $callback[0]) : $callback;
+                        $_name = (is_array($callback)) ? ((is_object($callback[0])) ? get_class($callback[0]) : $callback[0]) : $callback;
                         $names[$priority] = $_name;
                     }
                 }
@@ -60,7 +60,7 @@ 
             return htmlspecialchars($str, $flags, $encoding, $double_encode);
         } else {
             $ret = htmlspecialchars($str, $flags, $encoding);
-            if (! $double_encode) {
+            if (!$double_encode) {
                 $ret = str_replace('&', '&', $ret);
             }
             return $ret;

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

Spacing +34 added lines, -34 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,68 +10,68 @@ 
 //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_hanlder =& xoops_gethandler('module') ;
-        $module =& $module_hanlder->getByDirname($mydirname) ;
+        $module_hanlder = & xoops_gethandler('module');
+        $module = & $module_hanlder->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');
-        $mod_config =& $config_handler->getConfigsByCat(0, $mid);
+    $config_handler = & xoops_gethandler('config');
+        $mod_config = & $config_handler->getConfigsByCat(0, $mid);
         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/class/AltsysBreadcrumbs.class.php

Spacing +15 added lines, -15 removed lines

@@ -4,7 +4,7 @@ 
 class AltsysBreadcrumbs
 {
 
-    public $paths = array() ;
+    public $paths = array();
 
     public function __construct()
     {
@@ -13,29 +13,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
@@ -44,19 +44,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

@@ -3,40 +3,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));
     }
 
 
@@ -46,22 +46,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";
         }
     }
 
@@ -69,29 +69,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');
             }
         }
     }
@@ -100,156 +100,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']);
             }
         }
 
@@ -263,13 +263,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/MyBlocksAdminForXCL21.class.php

Spacing +10 added lines, -10 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
 {
@@ -18,7 +18,7 @@ 
     static $instance;
     if (!isset($instance)) {
         $instance = new MyBlocksAdminForXCL21();
-        $instance->construct() ;
+        $instance->construct();
     }
     return $instance;
 }
@@ -29,24 +29,24 @@ 
 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'];
 
 //HACK by domifara
 //	$block = new XoopsBlock( $bid ) ;
-    $handler =& xoops_gethandler('block');
-    $block =& $handler->create(false) ;
-    $block->load($bid) ;
+    $handler = & xoops_gethandler('block');
+    $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'));
     }
 }