mambax7 / altsys

xoops_trust_path/libs/altsys/blocks.php

Spacing +8 added lines, -8 removed lines

@@ -1,21 +1,21 @@
 <?php
 
-$mytrustdirname = basename(dirname(__FILE__)) ;
-$mytrustdirpath = dirname(__FILE__) ;
+$mytrustdirname = basename(dirname(__FILE__));
+$mytrustdirpath = dirname(__FILE__);
 
 // language files
-$language = empty($GLOBALS['xoopsConfig']['language']) ? 'english' : $GLOBALS['xoopsConfig']['language'] ;
+$language = empty($GLOBALS['xoopsConfig']['language']) ? 'english' : $GLOBALS['xoopsConfig']['language'];
 if (file_exists("$mydirpath/language/$language/blocks.php")) {
     // user customized language file (already read by class/xoopsblock.php etc)
     // include_once "$mydirpath/language/$language/blocks.php" ;
 } elseif (file_exists("$mytrustdirpath/language/$language/blocks_common.php")) {
     // default language file
-    include_once "$mytrustdirpath/language/$language/blocks_common.php" ;
-    include "$mytrustdirpath/language/$language/blocks_each.php" ;
+    include_once "$mytrustdirpath/language/$language/blocks_common.php";
+    include "$mytrustdirpath/language/$language/blocks_each.php";
 } else {
     // fallback english
-    include_once "$mytrustdirpath/language/english/blocks_common.php" ;
-    include "$mytrustdirpath/language/english/blocks_each.php" ;
+    include_once "$mytrustdirpath/language/english/blocks_common.php";
+    include "$mytrustdirpath/language/english/blocks_each.php";
 }
 
-require_once "$mytrustdirpath/blocks/block_functions.php" ;
+require_once "$mytrustdirpath/blocks/block_functions.php";

xoops_trust_path/libs/altsys/myblocksadmin.php

Spacing +32 added lines, -32 removed lines

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

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

Spacing +124 added lines, -124 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-require_once dirname(__FILE__).'/MyBlocksAdmin.class.php' ;
+require_once dirname(__FILE__).'/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;
 }
@@ -33,14 +33,14 @@ 
 // visible and side
 public function renderCell4BlockPosition($block_data)
 {
-    $bid = intval($block_data['bid']) ;
-    $side = intval($block_data['side']) ;
-    $visible = intval($block_data['visible']) ;
+    $bid = intval($block_data['bid']);
+    $side = intval($block_data['side']);
+    $visible = intval($block_data['visible']);
 
     $sseln = $ssel0 = $ssel1 = $ssel3 = $ssel4 = $ssel5 = $ssel7 = $ssel8 = $ssel9 = "";
     $scoln = $scol0 = $scol1 = $scol3 = $scol4 = $scol5 = $scol7 = $scol8 = $scol9 = "unselected";
-    $stextbox = "unselected" ;
-    $value4extra_side = '' ;
+    $stextbox = "unselected";
+    $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 ;
-            $stextbox = "selected" ;
-            break ;
+            $value4extra_side = $side;
+            $stextbox = "selected";
+            break;
     }
     }
 
@@ -152,56 +152,56 @@ 
 
     public function form_edit($bid, $mode = 'edit')
     {
-        $bid = intval($bid) ;
+        $bid = intval($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,56 +210,56 @@ 
     }
 */
     $block_data = $this->preview_request + array(
-        'bid' => $bid ,
-        'name' => $block->getVar('name', 'n') ,
-        'title' => $block->getVar('title', 'n') ,
-        'weight' => intval($block->getVar('weight')) ,
-        'bcachetime' => intval($block->getVar('bcachetime')) ,
-        'side' => intval($block->getVar('side')) ,
-        'visible' => intval($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') ,
-        'ctype' => $block->getVar('c_type') ,
-    ) ;
+        'bid' => $bid,
+        'name' => $block->getVar('name', 'n'),
+        'title' => $block->getVar('title', 'n'),
+        'weight' => intval($block->getVar('weight')),
+        'bcachetime' => intval($block->getVar('bcachetime')),
+        'side' => intval($block->getVar('side')),
+        'visible' => intval($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'),
+        '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) ,
-        'content_preview' => $this->previewContent($block_data) ,
-    ) + $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;
 
     // 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();
-            $editor_configs["name"] ="content_block";
+        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;
             $editor_configs["cols"] = 100;
             $editor_configs["width"] = "100%";
             $editor_configs["height"] = "400px";
             $editor_configs["editor"] = xoops_getModuleOption('blocks_editor', 'system');
-            $form= new XoopsFormEditor('', "textarea_content", $editor_configs);
+            $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 = intval($bid) ;
-        (method_exists('MyTextSanitizer', 'sGetInstance') and $myts =& MyTextSanitizer::sGetInstance()) || $myts =& MyTextSanitizer::getInstance() ;
+        $bid = intval($bid);
+        (method_exists('MyTextSanitizer', 'sGetInstance') and $myts = & MyTextSanitizer::sGetInstance()) || $myts = & MyTextSanitizer::getInstance();
 
         if (@$_POST['extra_sides'][$bid] > 0) {
-            $_POST['sides'][$bid] = intval($_POST['extra_sides'][$bid]) ;
+            $_POST['sides'][$bid] = intval($_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 ,
-        'side' => intval(@$_POST['sides'][$bid]) ,
-        'weight' => intval(@$_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]) ,
-        'bcachetime' => intval(@$_POST['bcachetimes'][$bid]) ,
-        '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() ,
-    ) ;
+        'bid' => $bid,
+        'side' => intval(@$_POST['sides'][$bid]),
+        'weight' => intval(@$_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]),
+        'bcachetime' => intval(@$_POST['bcachetimes'][$bid]),
+        '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 = intval($block_data['bid']) ;
+        $bid = intval($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/MyBlocksAdminForICMS.class.php

Spacing +44 added lines, -44 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 
-require_once dirname(__FILE__).'/MyBlocksAdmin.class.php' ;
+require_once dirname(__FILE__).'/MyBlocksAdmin.class.php';
 
 class MyBlocksAdminForICMS extends MyBlocksAdmin
 {
 
-    public $block_positions = array() ;
+    public $block_positions = array();
 
     public function MyBlocksAadminForICMS()
     {
@@ -14,14 +14,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+
@@ -31,7 +31,7 @@ 
     static $instance;
     if (!isset($instance)) {
         $instance = new MyBlocksAdminForICMS();
-        $instance->construct() ;
+        $instance->construct();
     }
     return $instance;
 }
@@ -41,28 +41,28 @@ 
 // link blocks - modules - pages
 public function renderCell4BlockModuleLink($block_data)
 {
-    $bid = intval($block_data['bid']) ;
+    $bid = intval($block_data['bid']);
 
     // 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[] = intval($mid) . '-' . intval($pid) ;
+            $selected_pages[] = intval($mid).'-'.intval($pid);
         }
     }
 
-    $page_handler =& xoops_gethandler('page');
+    $page_handler = & xoops_gethandler('page');
     $ret = "
 				<select name='bmodules[$bid][]' size='5' multiple='multiple'>
 					".$page_handler->getPageSelOptions($selected_pages)."
 				</select>" ;
 
-    return $ret ;
+    return $ret;
 }
 
 
@@ -94,68 +94,68 @@ 
 // private
 public function renderRadio4BlockPosition($target_side, $block_data)
 {
-    $bid = intval($block_data['bid']) ;
-    $visible = intval($block_data['visible']) ;
-    $current_side = $visible ? intval($block_data['side']) : -1 ;
+    $bid = intval($block_data['bid']);
+    $visible = intval($block_data['visible']);
+    $current_side = $visible ? intval($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'" ;
-        $divstyle = $target_side == -1 ? "disabled" : "selected" ;
+        $checked = "checked='checked'";
+        $divstyle = $target_side == -1 ? "disabled" : "selected";
     } else {
-        $checked = "" ;
-        $divstyle = "unselected" ;
+        $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>";
 }
 
 
 // private
 public function renderRadio4BlockPositions($block_data, $skip_sides = array())
 {
-    $bid = intval($block_data['bid']) ;
-    $visible = intval($block_data['visible']) ;
-    $current_side = $visible ? intval($block_data['side']) : -1 ;
+    $bid = intval($block_data['bid']);
+    $visible = intval($block_data['visible']);
+    $current_side = $visible ? intval($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'" ;
-            $divstyle = $target_side == -1 ? "disabled" : "selected" ;
+            $checked = "checked='checked'";
+            $divstyle = $target_side == -1 ? "disabled" : "selected";
         } else {
-            $checked = "" ;
-            $divstyle = "unselected" ;
+            $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;
 }
 
 
 // virtual
 public function updateBlockModuleLink($bid, $bmodules)
 {
-    $bid = intval($bid) ;
-    $table = $this->db->prefix("block_module_link") ;
+    $bid = intval($bid);
+    $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) ;
-        $module_id = intval(@$regs[0]) ;
-        $page_id = intval(@$regs[1]) ;
-        $sql = "INSERT INTO `$table` (`block_id`,`module_id`,`page_id`) VALUES ($bid,$module_id,$page_id)" ;
-        $this->db->query($sql) ;
+        $regs = explode('-', $mid);
+        $module_id = intval(@$regs[0]);
+        $page_id = intval(@$regs[1]);
+        $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/d3utilities.php

Spacing +109 added lines, -109 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(dirname(__FILE__))) ;
-        $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 = intval($module->getVar('mid')) ;
+        $db = & XoopsDatabaseFactory::getDatabaseConnection();
+
+        $this->dirname = basename(dirname(dirname(__FILE__)));
+        $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 = intval($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,23 +45,23 @@ 
         switch ($col['type']) {
             case 'text' :
             case 'blob' :
-                $length = empty($col['length']) ? 65535 : intval($col['length']) ;
-                return "`{$col['name']}`='".addslashes(xoops_substr($value, 0, $length))."'" ;
+                $length = empty($col['length']) ? 65535 : intval($col['length']);
+                return "`{$col['name']}`='".addslashes(xoops_substr($value, 0, $length))."'";
             case 'char' :
             case 'varchar' :
             case 'string' :
-                $length = empty($col['length']) ? 255 : intval($col['length']) ;
-                return "`{$col['name']}`='".addslashes(xoops_substr($value, 0, $length))."'" ;
+                $length = empty($col['length']) ? 255 : intval($col['length']);
+                return "`{$col['name']}`='".addslashes(xoops_substr($value, 0, $length))."'";
             case 'int' :
             case 'integer' :
-                $value = intval($value) ;
-                if (! empty($col['max'])) {
-                    $value = min($value, intval($col['max'])) ;
+                $value = intval($value);
+                if (!empty($col['max'])) {
+                    $value = min($value, intval($col['max']));
                 }
-                if (! empty($col['min'])) {
-                    $value = max($value, intval($col['min'])) ;
+                if (!empty($col['min'])) {
+                    $value = max($value, intval($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 = intval($id) ;    // primary_key should be 'integer'
-            $set4sql = '' ;
+            $id = intval($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 = intval($id) ;    // primary_key should be 'integer'
-            $result = $db->query("SELECT * FROM $this->table WHERE $this->primary_key=$id") ;
+            $id = intval($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 = intval($_GET['id']) ;
-            $rs = $db->query("SELECT * FROM $this->table WHERE $this->primary_key=$id") ;
+            $id = intval($_GET['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 : intval($col['edit_size']) ;
-                    $length = empty($col['length']) ? 255 : intval($col['length']) ;
-                    $lines[ $col['name'] ] = "<input type='text' name='{$col['name']}' size='$size' maxlength='$length' value='".htmlspecialchars($col['default_value'], ENT_QUOTES)."' />" ;
-                    break ;
+                    $size = empty($col['edit_size']) ? 32 : intval($col['edit_size']);
+                    $length = empty($col['length']) ? 255 : intval($col['length']);
+                    $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" ;
+            $selected = $val == $current_value ? "selected='selected'" : "";
+            $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/MyBlocksAdminForX20S.class.php

Spacing +24 added lines, -24 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 
-require_once dirname(__FILE__).'/MyBlocksAdmin.class.php' ;
+require_once dirname(__FILE__).'/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 ,
-        9 => _AM_CBBOTTOM ,
-    ) ;
+        -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;
 }
@@ -71,20 +71,20 @@ 
 // private
 public function renderRadio4BlockPosition($target_side, $block_data)
 {
-    $bid = intval($block_data['bid']) ;
-    $visible = intval($block_data['visible']) ;
-    $current_side = $visible ? intval($block_data['side']) : -1 ;
+    $bid = intval($block_data['bid']);
+    $visible = intval($block_data['visible']);
+    $current_side = $visible ? intval($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'" ;
-        $divstyle = $target_side == -1 ? "disabled" : "selected" ;
+        $checked = "checked='checked'";
+        $divstyle = $target_side == -1 ? "disabled" : "selected";
     } else {
-        $checked = "" ;
-        $divstyle = "unselected" ;
+        $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/D3LanguageManager.class.php

Spacing +38 added lines, -38 removed lines

@@ -3,102 +3,102 @@ 
 class D3LanguageManager
 {
 
-    public $default_language = 'english' ;
-    public $language = 'english' ;
-    public $salt ;
-    public $cache_path ;
-    public $cache_prefix = 'lang' ;
-    public $my_language = false ;
+    public $default_language = 'english';
+    public $language = 'english';
+    public $salt;
+    public $cache_path;
+    public $cache_prefix = 'lang';
+    public $my_language = false;
 
 
 //HACK by domifara
 //public function D3LanguageManager()
 public function __construct()
 {
-    $this->language = preg_replace('/[^0-9a-zA-Z_-]/', '', @$GLOBALS['xoopsConfig']['language']) ;
-    $this->salt = substr(md5(XOOPS_ROOT_PATH . XOOPS_DB_USER . XOOPS_DB_PREFIX), 0, 6) ;
-    $this->cache_path = XOOPS_TRUST_PATH.'/cache' ;
+    $this->language = preg_replace('/[^0-9a-zA-Z_-]/', '', @$GLOBALS['xoopsConfig']['language']);
+    $this->salt = substr(md5(XOOPS_ROOT_PATH.XOOPS_DB_USER.XOOPS_DB_PREFIX), 0, 6);
+    $this->cache_path = XOOPS_TRUST_PATH.'/cache';
 
     if (defined('ALTSYS_MYLANGUAGE_ROOT_PATH') && file_exists(ALTSYS_MYLANGUAGE_ROOT_PATH)) {
-        $this->my_language = ALTSYS_MYLANGUAGE_ROOT_PATH ;
+        $this->my_language = ALTSYS_MYLANGUAGE_ROOT_PATH;
     }
 }
 //HACK by domifara for php5.3+
 //function &getInstance( $conn = null )
 public static function &getInstance($conn = null)
 {
-    static $instance ;
-    if (! isset($instance)) {
-        $instance = new D3LanguageManager() ;
+    static $instance;
+    if (!isset($instance)) {
+        $instance = new D3LanguageManager();
     }
-    return $instance ;
+    return $instance;
 }
 
 
     public function read($resource, $mydirname, $mytrustdirname = null, $read_once = true)
     {
-        $d3file = XOOPS_ROOT_PATH.'/modules/'.$mydirname.'/mytrustdirname.php' ;
+        $d3file = XOOPS_ROOT_PATH.'/modules/'.$mydirname.'/mytrustdirname.php';
 
         if (empty($mytrustdirname) && file_exists($d3file)) {
-            require $d3file ;
+            require $d3file;
         }
 
         if (empty($this->language)) {
-            $this->language = preg_replace('/[^0-9a-zA-Z_-]/', '', @$GLOBALS['xoopsConfig']['language']) ;
+            $this->language = preg_replace('/[^0-9a-zA-Z_-]/', '', @$GLOBALS['xoopsConfig']['language']);
         }
 
-        $cache_file = $this->getCacheFileName($resource, $mydirname) ;
-        $root_file = XOOPS_ROOT_PATH.'/modules/'.$mydirname.'/language/'.$this->language.'/'.$resource ;
+        $cache_file = $this->getCacheFileName($resource, $mydirname);
+        $root_file = XOOPS_ROOT_PATH.'/modules/'.$mydirname.'/language/'.$this->language.'/'.$resource;
 
     // language overriding by XOOPS_ROOT_PATH/my_language
     if ($this->my_language) {
-        $mylang_file = $this->my_language.'/modules/'.$mydirname.'/'.$this->language.'/'.$resource ;
+        $mylang_file = $this->my_language.'/modules/'.$mydirname.'/'.$this->language.'/'.$resource;
         if (file_exists($mylang_file)) {
-            require_once $mylang_file ;
+            require_once $mylang_file;
         }
-        $original_error_level = error_reporting() ;
-        error_reporting($original_error_level & ~ E_NOTICE) ;
+        $original_error_level = error_reporting();
+        error_reporting($original_error_level & ~ E_NOTICE);
     }
 
         if (empty($mytrustdirname)) {
             // conventional module
-        $default_file = XOOPS_ROOT_PATH.'/modules/'.$mydirname.'/language/'.$this->default_language.'/'.$resource ;
+        $default_file = XOOPS_ROOT_PATH.'/modules/'.$mydirname.'/language/'.$this->default_language.'/'.$resource;
 
             if (file_exists($cache_file)) {
-                require_once $cache_file ;
+                require_once $cache_file;
             } elseif (file_exists($root_file)) {
-                require_once $root_file ;
+                require_once $root_file;
             } elseif (file_exists($default_file)) {
                 // fall back english
-            require_once $default_file ;
+            require_once $default_file;
             }
         } else {
             // D3 modules
-        $trust_file = XOOPS_TRUST_PATH.'/modules/'.$mytrustdirname.'/language/'.$this->language.'/'.$resource ;
-            $default_file = XOOPS_TRUST_PATH.'/modules/'.$mytrustdirname.'/language/'.$this->default_language.'/'.$resource ;
+        $trust_file = XOOPS_TRUST_PATH.'/modules/'.$mytrustdirname.'/language/'.$this->language.'/'.$resource;
+            $default_file = XOOPS_TRUST_PATH.'/modules/'.$mytrustdirname.'/language/'.$this->default_language.'/'.$resource;
 
             if (file_exists($cache_file)) {
-                require_once $cache_file ;
+                require_once $cache_file;
             } elseif (file_exists($root_file)) {
-                require_once $root_file ;
+                require_once $root_file;
             } elseif (file_exists($trust_file)) {
                 if ($read_once) {
-                    require_once $trust_file ;
+                    require_once $trust_file;
                 } else {
-                    require $trust_file ;
+                    require $trust_file;
                 }
             } elseif (file_exists($default_file)) {
                 // fall back english
             if ($read_once) {
-                require_once $default_file ;
+                require_once $default_file;
             } else {
-                require $default_file ;
+                require $default_file;
             }
             }
         }
 
         if ($this->my_language) {
-            error_reporting($original_error_level) ;
+            error_reporting($original_error_level);
         }
     }
 
@@ -106,8 +106,8 @@ 
     public function getCacheFileName($resource, $mydirname, $language = null)
     {
         if (empty($language)) {
-            $language = $this->language ;
+            $language = $this->language;
         }
-        return $this->cache_path . '/' . $this->cache_prefix . '_' . $this->salt . '_' . $mydirname . '_' . $language . '_' . $resource ;
+        return $this->cache_path.'/'.$this->cache_prefix.'_'.$this->salt.'_'.$mydirname.'_'.$language.'_'.$resource;
     }
 }

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

Spacing +11 added lines, -11 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 dirname(__FILE__).'/MyBlocksAdmin.class.php' ;
+require_once dirname(__FILE__).'/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 = intval($block_data['bid']) ;
+    $bid = intval($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'));
     }
 }

xoops_trust_path/libs/altsys/class/D3Tpl.class.php

Spacing +7 added lines, -7 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
-require_once XOOPS_ROOT_PATH.'/class/template.php' ;
-require_once XOOPS_TRUST_PATH.'/libs/altsys/include/altsys_functions.php' ;
+require_once XOOPS_ROOT_PATH.'/class/template.php';
+require_once XOOPS_TRUST_PATH.'/libs/altsys/include/altsys_functions.php';
 
 class D3Tpl extends XoopsTpl
 {
@@ -10,13 +10,13 @@ 
 //	public function D3Tpl()
     public function __construct()
     {
-        parent::__construct() ;
-        if (in_array(altsys_get_core_type(), array( ALTSYS_CORE_TYPE_X20S, ALTSYS_CORE_TYPE_X23P ))) {
-            array_unshift($this->plugins_dir, XOOPS_TRUST_PATH.'/libs/altsys/smarty_plugins') ;
+        parent::__construct();
+        if (in_array(altsys_get_core_type(), array(ALTSYS_CORE_TYPE_X20S, ALTSYS_CORE_TYPE_X23P))) {
+            array_unshift($this->plugins_dir, XOOPS_TRUST_PATH.'/libs/altsys/smarty_plugins');
         }
 
         // for RTL users
-        @define('_GLOBAL_LEFT', @_ADM_USE_RTL == 1 ? 'right' : 'left') ;
-        @define('_GLOBAL_RIGHT', @_ADM_USE_RTL == 1 ? 'left' : 'right') ;
+        @define('_GLOBAL_LEFT', @_ADM_USE_RTL == 1 ? 'right' : 'left');
+        @define('_GLOBAL_RIGHT', @_ADM_USE_RTL == 1 ? 'left' : 'right');
     }
 }