mambax7 / altsys

xoops_trust_path/libs/altsys/mypreferences.php

Spacing +35 added lines, -35 removed lines

@@ -5,33 +5,33 @@ 
 //                     GIJOE <http://www.peak.ne.jp/>                        //
 // ------------------------------------------------------------------------- //
 
-require_once __DIR__.'/class/AltsysBreadcrumbs.class.php' ;
-include_once __DIR__.'/include/gtickets.php' ;
-include_once __DIR__.'/include/altsys_functions.php' ;
+require_once __DIR__.'/class/AltsysBreadcrumbs.class.php';
+include_once __DIR__.'/include/gtickets.php';
+include_once __DIR__.'/include/altsys_functions.php';
 
 // check access right (needs module_admin of this module)
-if (! is_object($xoopsUser) || ! is_object($xoopsModule) || ! $xoopsUser->isAdmin($xoopsModule->mid())) {
-    die('Access Denied') ;
+if (!is_object($xoopsUser) || !is_object($xoopsModule) || !$xoopsUser->isAdmin($xoopsModule->mid())) {
+    die('Access Denied');
 }
 
 
 // initials
 $db = XoopsDatabaseFactory::getDatabaseConnection();
-(method_exists('MyTextSanitizer', 'sGetInstance') and $myts = MyTextSanitizer::sGetInstance()) || $myts = MyTextSanitizer::getInstance() ;
+(method_exists('MyTextSanitizer', 'sGetInstance') and $myts = MyTextSanitizer::sGetInstance()) || $myts = MyTextSanitizer::getInstance();
 
 // language file
-altsys_include_language_file('mypreferences') ;
+altsys_include_language_file('mypreferences');
 
 
-$op = empty($_GET['op']) ? 'showmod' : preg_replace('/[^a-zA-Z0-9_-]/', '', $_GET['op']) ;
+$op = empty($_GET['op']) ? 'showmod' : preg_replace('/[^a-zA-Z0-9_-]/', '', $_GET['op']);
 
 if ($op == 'showmod') {
     $config_handler = xoops_getHandler('config');
-    $mod = $xoopsModule->mid() ;
+    $mod = $xoopsModule->mid();
     $config = $config_handler->getConfigs(new Criteria('conf_modid', $mod));
     $count = count($config);
     if ($count < 1) {
-        die('no configs') ;
+        die('no configs');
     }
     include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
     $form = new XoopsThemeForm(_MD_A_MYPREFERENCES_FORMTITLE, 'pref_form', 'index.php?mode=admin&lib=altsys&page=mypreferences&op=save');
@@ -39,30 +39,30 @@ 
     $module = $module_handler->get($mod);
 
     // language
-    $language = empty($xoopsConfig['language']) ? 'english' : $xoopsConfig['language'] ;
+    $language = empty($xoopsConfig['language']) ? 'english' : $xoopsConfig['language'];
 
     // load modinfo.php if necessary (judged by a specific constant is defined)
-    if (! defined('_MYMENU_CONSTANT_IN_MODINFO') || ! defined(_MYMENU_CONSTANT_IN_MODINFO)) {
+    if (!defined('_MYMENU_CONSTANT_IN_MODINFO') || !defined(_MYMENU_CONSTANT_IN_MODINFO)) {
         if (file_exists("$mydirpath/language/$language/modinfo.php")) {
             // user customized language file
-            include_once "$mydirpath/language/$language/modinfo.php" ;
+            include_once "$mydirpath/language/$language/modinfo.php";
         } elseif (file_exists("$mytrustdirpath/language/$language/modinfo.php")) {
             // default language file
-            include_once "$mytrustdirpath/language/$language/modinfo.php" ;
+            include_once "$mytrustdirpath/language/$language/modinfo.php";
         } else {
             // fallback english
-            include_once "$mytrustdirpath/language/english/modinfo.php" ;
+            include_once "$mytrustdirpath/language/english/modinfo.php";
         }
     }
 
     // if has comments feature, need comment lang file
-    if ($module->getVar('hascomments') == 1 && ! defined('_CM_TITLE')) {
+    if ($module->getVar('hascomments') == 1 && !defined('_CM_TITLE')) {
         include_once XOOPS_ROOT_PATH.'/language/'.$xoopsConfig['language'].'/comment.php';
     }
 
     // RMV-NOTIFY
     // if has notification feature, need notification lang file
-    if ($module->getVar('hasnotification') == 1 && ! defined('_NOT_NOTIFICATIONOPTIONS')) {
+    if ($module->getVar('hasnotification') == 1 && !defined('_NOT_NOTIFICATIONOPTIONS')) {
         include_once XOOPS_ROOT_PATH.'/language/'.$xoopsConfig['language'].'/notification.php';
     }
 
@@ -72,9 +72,9 @@ 
         //  $form->addElement(new XoopsFormHidden('redirect', XOOPS_URL.'/modules/'.$module->getVar('dirname').'/'.$module->getInfo('adminindex')));
     // }
     for ($i = 0; $i < $count; $i++) {
-        $title_icon = ($config[$i]->getVar('conf_valuetype') === 'encrypt')? '<img src="'.XOOPS_MODULE_URL.'/legacy/admin/theme/icons/textfield_key.png" alt="Encrypted">' : ''; // support XCL 2.2.3 'encrypt' of 'conf_valuetype'
+        $title_icon = ($config[$i]->getVar('conf_valuetype') === 'encrypt') ? '<img src="'.XOOPS_MODULE_URL.'/legacy/admin/theme/icons/textfield_key.png" alt="Encrypted">' : ''; // support XCL 2.2.3 'encrypt' of 'conf_valuetype'
         $title4tray = (!defined($config[$i]->getVar('conf_desc')) || constant($config[$i]->getVar('conf_desc')) == '') ? (constant($config[$i]->getVar('conf_title')).$title_icon) : (constant($config[$i]->getVar('conf_title')).$title_icon.'<br /><br /><span style="font-weight:normal;">'.constant($config[$i]->getVar('conf_desc')).'</span>'); // GIJ
-        $title = '' ; // GIJ
+        $title = ''; // GIJ
         switch ($config[$i]->getVar('conf_formtype')) {
         case 'textarea':
             (method_exists('MyTextSanitizer', 'sGetInstance') and $myts = MyTextSanitizer::sGetInstance()) || $myts = MyTextSanitizer::getInstance();
@@ -155,25 +155,25 @@ 
             break;
         }
         $hidden = new XoopsFormHidden('conf_ids[]', $config[$i]->getVar('conf_id'));
-        $ele_tray = new XoopsFormElementTray($title4tray, '') ;
+        $ele_tray = new XoopsFormElementTray($title4tray, '');
         $ele_tray->addElement($ele);
         $ele_tray->addElement($hidden);
-        $form->addElement($ele_tray) ;
+        $form->addElement($ele_tray);
         unset($ele_tray, $ele, $hidden);
     }
     // $button_tray->addElement(new XoopsFormHidden('op', 'save'));
-    $xoopsGTicket->addTicketXoopsFormElement($button_tray, __LINE__, 1800, 'mypreferences') ;
+    $xoopsGTicket->addTicketXoopsFormElement($button_tray, __LINE__, 1800, 'mypreferences');
     $button_tray->addElement(new XoopsFormButton('', 'button', _GO, 'submit'));
-    $form->addElement($button_tray) ;
+    $form->addElement($button_tray);
     xoops_cp_header();
 
     // GIJ patch start
-    altsys_include_mymenu() ;
-    $breadcrumbsObj = AltsysBreadcrumbs::getInstance() ;
+    altsys_include_mymenu();
+    $breadcrumbsObj = AltsysBreadcrumbs::getInstance();
     if ($breadcrumbsObj->hasPaths()) {
-        $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&amp;lib=altsys&amp;page=mypreferences', _PREFERENCES) ;
+        $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&amp;lib=altsys&amp;page=mypreferences', _PREFERENCES);
     }
-    echo "<h3 style='text-align:"._GLOBAL_LEFT.";'>".$module->getVar('name').' &nbsp; '._PREFERENCES."</h3>\n" ;
+    echo "<h3 style='text-align:"._GLOBAL_LEFT.";'>".$module->getVar('name').' &nbsp; '._PREFERENCES."</h3>\n";
     // GIJ patch end
 
     $form->display();
@@ -185,10 +185,10 @@ 
     //if ( !admin_refcheck("/modules/$admin_mydirname/admin/") ) {
     //  exit('Invalid referer');
     //}
-    if (! $xoopsGTicket->check(true, 'mypreferences')) {
+    if (!$xoopsGTicket->check(true, 'mypreferences')) {
         redirect_header(XOOPS_URL.'/', 3, $xoopsGTicket->getErrors());
     }
-    require_once XOOPS_ROOT_PATH.'/class/template.php' ;
+    require_once XOOPS_ROOT_PATH.'/class/template.php';
     $xoopsTpl = new XoopsTpl();
 //HACK by domifara for new XOOPS and XCL etc.
 //old xoops
@@ -209,7 +209,7 @@ 
     if ($count > 0) {
         for ($i = 0; $i < $count; $i++) {
             $config = $config_handler->getConfig($conf_ids[$i]);
-            $new_value =& $_POST[$config->getVar('conf_name')];
+            $new_value = & $_POST[$config->getVar('conf_name')];
             if (is_array($new_value) || $new_value != $config->getVar('conf_value')) {
                 // if language has been changed
                 if (!$lang_updated && $config->getVar('conf_catid') == XOOPS_CONF && $config->getVar('conf_name') == 'language') {
@@ -238,13 +238,13 @@ 
                         // generate compiled files for the new theme
                         // block files only for now..
                         $tplfile_handler = xoops_getHandler('tplfile');
-                        $dtemplates =& $tplfile_handler->find('default', 'block');
+                        $dtemplates = & $tplfile_handler->find('default', 'block');
                         $dcount = count($dtemplates);
 
                         // need to do this to pass to xoops_template_touch function
                         $GLOBALS['xoopsConfig']['template_set'] = $newtplset;
 
-                        altsys_clear_templates_c() ;
+                        altsys_clear_templates_c();
 
 /*                      for ($i = 0; $i < $dcount; $i++) {
                             $found =& $tplfile_handler->find($newtplset, 'block', $dtemplates[$i]->getVar('tpl_refid'), null);
@@ -272,9 +272,9 @@ 
                 }
 
                 // add read permission for the start module to all groups
-                if (!$startmod_updated    && $new_value != '--' && $config->getVar('conf_catid') == XOOPS_CONF && $config->getVar('conf_name') == 'startpage') {
+                if (!$startmod_updated && $new_value != '--' && $config->getVar('conf_catid') == XOOPS_CONF && $config->getVar('conf_name') == 'startpage') {
                     $member_handler = xoops_getHandler('member');
-                    $groups =& $member_handler->getGroupList();
+                    $groups = & $member_handler->getGroupList();
                     $moduleperm_handler = xoops_getHandler('groupperm');
                     $module_handler = xoops_getHandler('module');
                     $module = $module_handler->getByDirname($new_value);
@@ -293,5 +293,5 @@ 
         }
     }
 
-    redirect_header('index.php?mode=admin&lib=altsys&page=mypreferences', 2, _MD_A_MYPREFERENCES_UPDATED) ;
+    redirect_header('index.php?mode=admin&lib=altsys&page=mypreferences', 2, _MD_A_MYPREFERENCES_UPDATED);
 }

xoops_trust_path/libs/altsys/class/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.