mambax7 / altsys

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

Spacing +15 added lines, -15 removed lines

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

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

Switch Indentation +61 added lines, -61 removed lines

@@ -46,42 +46,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 ;
     }
     }
 
@@ -165,31 +165,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 +101 added lines, -101 removed lines

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

xoops_trust_path/libs/altsys/onuninstall.php

Spacing +15 added lines, -15 removed lines

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

xoops_trust_path/libs/altsys/oninstall.php

Spacing +53 added lines, -53 removed lines

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

xoops_trust_path/libs/altsys/blocks/block_functions.php

Spacing +51 added lines, -51 removed lines

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

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

Spacing +31 added lines, -31 removed lines

@@ -2,7 +2,7 @@ 
 
 // notification handler for D3 modules
 
-require_once XOOPS_ROOT_PATH . '/include/notification_functions.php' ;
+require_once XOOPS_ROOT_PATH.'/include/notification_functions.php';
 
 class D3NotificationHandler
 {
@@ -10,59 +10,59 @@ 
 //function &getInstance( $conn = null )
 public static function &getInstance($conn = null)
 {
-    static $instance ;
-    if (! isset($instance)) {
-        $instance = new D3NotificationHandler() ;
+    static $instance;
+    if (!isset($instance)) {
+        $instance = new D3NotificationHandler();
     }
-    return $instance ;
+    return $instance;
 }
 
 
     public function getMailTemplateDir($mydirname, $mytrustdirname = '')
     {
-        global $xoopsConfig ;
+        global $xoopsConfig;
 
-        $mydirpath = XOOPS_ROOT_PATH.'/modules/'.$mydirname ;
-        $mytrustdirpath = XOOPS_TRUST_PATH.'/modules/'.$mytrustdirname ;
-        $language = empty($xoopsConfig['language']) ? 'english' : $xoopsConfig['language'] ;
+        $mydirpath = XOOPS_ROOT_PATH.'/modules/'.$mydirname;
+        $mytrustdirpath = XOOPS_TRUST_PATH.'/modules/'.$mytrustdirname;
+        $language = empty($xoopsConfig['language']) ? 'english' : $xoopsConfig['language'];
 
         $search_paths = array(
-        "$mydirpath/language/$language/mail_template/" ,
-        "$mytrustdirpath/language/$language/mail_template/" ,
-        "$mydirpath/language/english/mail_template/" ,
+        "$mydirpath/language/$language/mail_template/",
+        "$mytrustdirpath/language/$language/mail_template/",
+        "$mydirpath/language/english/mail_template/",
         "$mytrustdirpath/language/english/mail_template/"
-    ) ;
+    );
 
-        $mail_template_dir = "$mytrustdirpath/language/english/mail_template/" ;
+        $mail_template_dir = "$mytrustdirpath/language/english/mail_template/";
         foreach ($search_paths as $path) {
             if (file_exists($path)) {
-                $mail_template_dir = $path ;
-                break ;
+                $mail_template_dir = $path;
+                break;
             }
         }
 
-        return $mail_template_dir ;
+        return $mail_template_dir;
     }
 
 
-    public function triggerEvent($mydirname, $mytrustdirname, $category, $item_id, $event, $extra_tags=array(), $user_list=array(), $omit_user_id=null)
+    public function triggerEvent($mydirname, $mytrustdirname, $category, $item_id, $event, $extra_tags = array(), $user_list = array(), $omit_user_id = null)
     {
-        $module_handler = xoops_getHandler('module') ;
-        $module = $module_handler->getByDirname($mydirname) ;
+        $module_handler = xoops_getHandler('module');
+        $module = $module_handler->getByDirname($mydirname);
 
-        $notification_handler = xoops_getHandler('notification') ;
-        $mail_template_dir = $this->getMailTemplateDir($mydirname, $mytrustdirname) ;
+        $notification_handler = xoops_getHandler('notification');
+        $mail_template_dir = $this->getMailTemplateDir($mydirname, $mytrustdirname);
 
     // calling a delegate before
     if (class_exists('XCube_DelegateUtils')) {
-        $force_return = false ;
-        XCube_DelegateUtils::raiseEvent('D3NotificationHandler.Trigger', new XCube_Ref($category), new XCube_Ref($event), new XCube_Ref($item_id), new XCube_Ref($extra_tags), new XCube_Ref($module), new XCube_Ref($user_list), new XCube_Ref($omit_user_id), $module->getInfo('notification'), new XCube_Ref($force_return), new XCube_Ref($mail_template_dir), $mydirname, $mytrustdirname) ;
+        $force_return = false;
+        XCube_DelegateUtils::raiseEvent('D3NotificationHandler.Trigger', new XCube_Ref($category), new XCube_Ref($event), new XCube_Ref($item_id), new XCube_Ref($extra_tags), new XCube_Ref($module), new XCube_Ref($user_list), new XCube_Ref($omit_user_id), $module->getInfo('notification'), new XCube_Ref($force_return), new XCube_Ref($mail_template_dir), $mydirname, $mytrustdirname);
         if ($force_return) {
-            return ;
+            return;
         }
     }
 
-        $mid = $module->getVar('mid') ;
+        $mid = $module->getVar('mid');
 
     // Check if event is enabled
     $config_handler = xoops_getHandler('config');
@@ -70,8 +70,8 @@ 
         if (empty($mod_config['notification_enabled'])) {
             return false;
         }
-        $category_info =& notificationCategoryInfo($category, $mid);
-        $event_info =& notificationEventInfo($category, $event, $mid);
+        $category_info = & notificationCategoryInfo($category, $mid);
+        $event_info = & notificationEventInfo($category, $event, $mid);
         if (!in_array(notificationGenerateConfig($category_info, $event_info, 'option_name'), $mod_config['notification_events']) && empty($event_info['invisible'])) {
             return false;
         }
@@ -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);

html/preload/SetupAltsysLangMgr.class.php

Spacing +33 added lines, -33 removed lines

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