mambax7 / altsys

xoops_trust_path/libs/altsys/language/french/mypreferences.php

Spacing +2 added lines, -2 removed lines

@@ -1,4 +1,4 @@
 <?php
 
-define('_MD_A_MYPREFERENCES_FORMTITLE', 'Préférences Modules') ;
-define('_MD_A_MYPREFERENCES_UPDATED', 'Mise à jour avec succès des préférences') ;
+define('_MD_A_MYPREFERENCES_FORMTITLE', 'Préférences Modules');
+define('_MD_A_MYPREFERENCES_UPDATED', 'Mise à jour avec succès des préférences');

xoops_trust_path/libs/altsys/language/french/blocks_each.php

Spacing +4 added lines, -4 removed lines

@@ -1,12 +1,12 @@
 <?php
 
 if (defined('FOR_XOOPS_LANG_CHECKER')) {
-    $mydirname = 'd3forum' ;
+    $mydirname = 'd3forum';
 }
-$constpref = '_MB_' . strtoupper($mydirname) ;
+$constpref = '_MB_'.strtoupper($mydirname);
 
-if (defined('FOR_XOOPS_LANG_CHECKER') || ! defined($constpref.'_LOADED')) {
-    define($constpref.'_LOADED', 1) ;
+if (defined('FOR_XOOPS_LANG_CHECKER') || !defined($constpref.'_LOADED')) {
+    define($constpref.'_LOADED', 1);
 
 // definitions for displaying blocks 
 // Since altsys is a singleton moudle, this file has non-sense.

xoops_trust_path/libs/altsys/language/french/mylangadmin.php

Spacing +20 added lines, -20 removed lines

@@ -1,27 +1,27 @@
 <?php
 
-define('_MYLANGADMIN_H3_MODULE', 'Module cible') ;
-define('_MYLANGADMIN_CACHEUPDATED', 'Le fichier de cache a été mis à jour') ;
-define('_MYLANGADMIN_BTN_UPDATE', 'Mise à jour') ;
-define('_MYLANGADMIN_BTN_RESET', 'réinitialiser') ;
+define('_MYLANGADMIN_H3_MODULE', 'Module cible');
+define('_MYLANGADMIN_CACHEUPDATED', 'Le fichier de cache a été mis à jour');
+define('_MYLANGADMIN_BTN_UPDATE', 'Mise à jour');
+define('_MYLANGADMIN_BTN_RESET', 'réinitialiser');
 
-define('_MYLANGADMIN_TH_CONSTANTNAME', 'Nom de la Constante') ;
-define('_MYLANGADMIN_TH_DEFAULTVALUE', 'Valeur par défaut') ;
-define('_MYLANGADMIN_TH_USERVALUE', 'Valeur de Utilisateur') ;
+define('_MYLANGADMIN_TH_CONSTANTNAME', 'Nom de la Constante');
+define('_MYLANGADMIN_TH_DEFAULTVALUE', 'Valeur par défaut');
+define('_MYLANGADMIN_TH_USERVALUE', 'Valeur de Utilisateur');
 
-define('_MYLANGADMIN_NOTE_ADDEDBYMYLANG', '(constante ajoutée par utilisateur)') ;
-define('_MYLANGADMIN_DT_MYLANGFILENAME', 'Reécriture partielle du nom de fichier') ;
+define('_MYLANGADMIN_NOTE_ADDEDBYMYLANG', '(constante ajoutée par utilisateur)');
+define('_MYLANGADMIN_DT_MYLANGFILENAME', 'Reécriture partielle du nom de fichier');
 
-define('_MYLANGADMIN_DT_CACHEFILENAME', 'Nom du fichier en Cache') ;
-define('_MYLANGADMIN_DT_CACHESTATUS', 'Mise en Cache du statut') ;
-define('_MYLANGADMIN_CREATED', 'Créé') ;
-define('_MYLANGADMIN_NOTCREATED', 'N\'a pas été créé pour l\'instant') ;
+define('_MYLANGADMIN_DT_CACHEFILENAME', 'Nom du fichier en Cache');
+define('_MYLANGADMIN_DT_CACHESTATUS', 'Mise en Cache du statut');
+define('_MYLANGADMIN_CREATED', 'Créé');
+define('_MYLANGADMIN_NOTCREATED', 'N\'a pas été créé pour l\'instant');
 
-define('_MYLANGADMIN_ERR_MODNOLANGUAGE', 'Le module sélectionné n\'a pas de dossier de la langue') ;
-define('_MYLANGADMIN_ERR_MODLANGINCOMPATIBLE', 'Le module sélectionné a une structure incompatible') ;
-define('_MYLANGADMIN_ERR_MODEMPTYLANGDIR', 'Le module sélectionné n\'a pas de fichier langue de reécriture') ;
+define('_MYLANGADMIN_ERR_MODNOLANGUAGE', 'Le module sélectionné n\'a pas de dossier de la langue');
+define('_MYLANGADMIN_ERR_MODLANGINCOMPATIBLE', 'Le module sélectionné a une structure incompatible');
+define('_MYLANGADMIN_ERR_MODEMPTYLANGDIR', 'Le module sélectionné n\'a pas de fichier langue de reécriture');
 
-define('_MYLANGADMIN_MSG_D3LANGMANENABLED', 'Le système de reécriture est activé dès maintenant.') ;
-define('_MYLANGADMIN_FMT_HOWTOENABLED3LANGMAN4XCL', 'Le système de reécriture est désormais désactivé. Pour l\'activer, copiez "%s" dans "%s"') ;
-define('_MYLANGADMIN_MSG_HOWTOENABLED3LANGMAN4X2', 'Le système de reécriture ne peut pas fonctionner avec ce noyau de XOOPS, sauf quelques modules D3. Si vous souhaitez l\'activer avec ce noyau, essayez de modifier comme ceci:') ;
-define('_MYLANGADMIN_MSG_NOTICE4ALREADYREAD', 'Puisque ce fichier a déjà été lu par le système, cette colonne représente la valeur actuelle') ;
+define('_MYLANGADMIN_MSG_D3LANGMANENABLED', 'Le système de reécriture est activé dès maintenant.');
+define('_MYLANGADMIN_FMT_HOWTOENABLED3LANGMAN4XCL', 'Le système de reécriture est désormais désactivé. Pour l\'activer, copiez "%s" dans "%s"');
+define('_MYLANGADMIN_MSG_HOWTOENABLED3LANGMAN4X2', 'Le système de reécriture ne peut pas fonctionner avec ce noyau de XOOPS, sauf quelques modules D3. Si vous souhaitez l\'activer avec ce noyau, essayez de modifier comme ceci:');
+define('_MYLANGADMIN_MSG_NOTICE4ALREADYREAD', 'Puisque ce fichier a déjà été lu par le système, cette colonne représente la valeur actuelle');

xoops_trust_path/libs/altsys/language/french/compilehookadmin.php

Spacing +33 added lines, -33 removed lines

@@ -1,50 +1,50 @@
 <?php
 
-define('_TPLSADMIN_FMT_MSG_ENCLOSEBYCOMMENT', '%d template caches have been enclosed by tplsadmin comments') ;
-define('_TPLSADMIN_DT_ENCLOSEBYCOMMENT', 'Implant comments') ;
-define('_TPLSADMIN_DD_ENCLOSEBYCOMMENT', 'Two HTML comments will be implanted in the begging/ending point of each templates. Since this rarely breaks its design, it is recommended to professionals can read HTML itself') ;
-define('_TPLSADMIN_CNF_ENCLOSEBYCOMMENT', 'Compiled template caches will be enclosed by tplsadmin comments. Are you OK?') ;
+define('_TPLSADMIN_FMT_MSG_ENCLOSEBYCOMMENT', '%d template caches have been enclosed by tplsadmin comments');
+define('_TPLSADMIN_DT_ENCLOSEBYCOMMENT', 'Implant comments');
+define('_TPLSADMIN_DD_ENCLOSEBYCOMMENT', 'Two HTML comments will be implanted in the begging/ending point of each templates. Since this rarely breaks its design, it is recommended to professionals can read HTML itself');
+define('_TPLSADMIN_CNF_ENCLOSEBYCOMMENT', 'Compiled template caches will be enclosed by tplsadmin comments. Are you OK?');
 
 
-define('_TPLSADMIN_FMT_MSG_ENCLOSEBYBORDEREDDIV', '%d template caches have been enclosed by div tags') ;
-define('_TPLSADMIN_DT_ENCLOSEBYBORDEREDDIV', 'Implant div tags') ;
-define('_TPLSADMIN_DD_ENCLOSEBYBORDEREDDIV', 'Each templates will be enclosed by black-bordered div tags. A link for editing controller of tplsadmin will be implanted into each templates. Though this often cause destructions in designing, you can edit each templates the most instictively and easily.') ;
-define('_TPLSADMIN_CNF_ENCLOSEBYBORDEREDDIV', 'Compiled template caches will be enclosed by div tags. Are you OK?') ;
+define('_TPLSADMIN_FMT_MSG_ENCLOSEBYBORDEREDDIV', '%d template caches have been enclosed by div tags');
+define('_TPLSADMIN_DT_ENCLOSEBYBORDEREDDIV', 'Implant div tags');
+define('_TPLSADMIN_DD_ENCLOSEBYBORDEREDDIV', 'Each templates will be enclosed by black-bordered div tags. A link for editing controller of tplsadmin will be implanted into each templates. Though this often cause destructions in designing, you can edit each templates the most instictively and easily.');
+define('_TPLSADMIN_CNF_ENCLOSEBYBORDEREDDIV', 'Compiled template caches will be enclosed by div tags. Are you OK?');
 
-define('_TPLSADMIN_FMT_MSG_HOOKSAVEVARS', '%d template caches have been implanted hooking logics to collect template varibles') ;
-define('_TPLSADMIN_DT_HOOKSAVEVARS', 'Implant logics to collect template variables') ;
-define('_TPLSADMIN_DD_HOOKSAVEVARS', 'The first step of getting the informations of template variables in your site. The template vars infos will be collected when public sides of your site is displayed. If all templates you want to edit are displayed, get template vars info by underlying buttons.') ;
-define('_TPLSADMIN_CNF_HOOKSAVEVARS', 'Compiled template caches will be implanted the logics to collect template variables. Are you OK?') ;
+define('_TPLSADMIN_FMT_MSG_HOOKSAVEVARS', '%d template caches have been implanted hooking logics to collect template varibles');
+define('_TPLSADMIN_DT_HOOKSAVEVARS', 'Implant logics to collect template variables');
+define('_TPLSADMIN_DD_HOOKSAVEVARS', 'The first step of getting the informations of template variables in your site. The template vars infos will be collected when public sides of your site is displayed. If all templates you want to edit are displayed, get template vars info by underlying buttons.');
+define('_TPLSADMIN_CNF_HOOKSAVEVARS', 'Compiled template caches will be implanted the logics to collect template variables. Are you OK?');
 
-define('_TPLSADMIN_FMT_MSG_REMOVEHOOKS', '%d template caches have been normalized') ;
-define('_TPLSADMIN_DT_REMOVEHOOKS', 'Normalize compiled template caches') ;
-define('_TPLSADMIN_DD_REMOVEHOOKS', 'This removes comments/div tags/logics implanted by upper operations from each compiled template caches.') ;
-define('_TPLSADMIN_CNF_REMOVEHOOKS', 'Are you OK for normlizing?') ;
+define('_TPLSADMIN_FMT_MSG_REMOVEHOOKS', '%d template caches have been normalized');
+define('_TPLSADMIN_DT_REMOVEHOOKS', 'Normalize compiled template caches');
+define('_TPLSADMIN_DD_REMOVEHOOKS', 'This removes comments/div tags/logics implanted by upper operations from each compiled template caches.');
+define('_TPLSADMIN_CNF_REMOVEHOOKS', 'Are you OK for normlizing?');
 
 
-define('_TPLSADMIN_MSG_CLEARCACHE', 'Template caches are removed') ;
-define('_TPLSADMIN_MSG_CREATECOMPILECACHEFIRST', 'There are no compiled template caches. Create complied template caches by displaying public sides of your site, first') ;
+define('_TPLSADMIN_MSG_CLEARCACHE', 'Template caches are removed');
+define('_TPLSADMIN_MSG_CREATECOMPILECACHEFIRST', 'There are no compiled template caches. Create complied template caches by displaying public sides of your site, first');
 
-define('_TPLSADMIN_CNF_DELETEOK', 'Delete OK?') ;
+define('_TPLSADMIN_CNF_DELETEOK', 'Delete OK?');
 
 
-define('_TPLSADMIN_DT_GETTPLSVARSINFO_DW', 'Get info of template variables as DreamWeaver Extensions') ;
-define('_TPLSADMIN_DD_GETTPLSVARSINFO_DW', 'Open Macromedia Extension Manager, first.<br />Extract the download archive.<br />Execute the files which extensions are .mxi and you will meet installing dialogs.<br />The snippets for template variables of your site will be usable after restarting Dream Weaver.') ;
+define('_TPLSADMIN_DT_GETTPLSVARSINFO_DW', 'Get info of template variables as DreamWeaver Extensions');
+define('_TPLSADMIN_DD_GETTPLSVARSINFO_DW', 'Open Macromedia Extension Manager, first.<br />Extract the download archive.<br />Execute the files which extensions are .mxi and you will meet installing dialogs.<br />The snippets for template variables of your site will be usable after restarting Dream Weaver.');
 
-define('_TPLSADMIN_DT_GETTEMPLATES', 'Download templates') ;
-define('_TPLSADMIN_DD_GETTEMPLATES', 'Select a set before pushing either button') ;
+define('_TPLSADMIN_DT_GETTEMPLATES', 'Download templates');
+define('_TPLSADMIN_DD_GETTEMPLATES', 'Select a set before pushing either button');
 
-define('_TPLSADMIN_FMT_MSG_PUTTEMPLATES', '%d templates are imported.') ;
-define('_TPLSADMIN_DT_PUTTEMPLATES', 'Upload templates') ;
-define('_TPLSADMIN_DD_PUTTEMPLATES', 'Select a set you want to upload/overwrite before uploading zip/tgz archive including template files (.html). You need not to check depths of the paths in the archive.') ;
+define('_TPLSADMIN_FMT_MSG_PUTTEMPLATES', '%d templates are imported.');
+define('_TPLSADMIN_DT_PUTTEMPLATES', 'Upload templates');
+define('_TPLSADMIN_DD_PUTTEMPLATES', 'Select a set you want to upload/overwrite before uploading zip/tgz archive including template files (.html). You need not to check depths of the paths in the archive.');
 
 
-define('_TPLSADMIN_ERR_NOTUPLOADED', 'No files are uploaded.') ;
-define('_TPLSADMIN_ERR_EXTENSION', 'This extension cannot be recognized.') ;
-define('_TPLSADMIN_ERR_INVALIDARCHIVE', 'The archive is not extractable.') ;
-define('_TPLSADMIN_ERR_INVALIDTPLSET', 'Invalid set name has been specified.') ;
+define('_TPLSADMIN_ERR_NOTUPLOADED', 'No files are uploaded.');
+define('_TPLSADMIN_ERR_EXTENSION', 'This extension cannot be recognized.');
+define('_TPLSADMIN_ERR_INVALIDARCHIVE', 'The archive is not extractable.');
+define('_TPLSADMIN_ERR_INVALIDTPLSET', 'Invalid set name has been specified.');
 
-define('_TPLSADMIN_ERR_NOTPLSVARSINFO', 'There are no template vars info files.') ;
+define('_TPLSADMIN_ERR_NOTPLSVARSINFO', 'There are no template vars info files.');
 
-define('_TPLSADMIN_NUMCAP_COMPILEDCACHES', 'Compiled template caches') ;
-define('_TPLSADMIN_NUMCAP_TPLSVARS', 'Template vars info files') ;
+define('_TPLSADMIN_NUMCAP_COMPILEDCACHES', 'Compiled template caches');
+define('_TPLSADMIN_NUMCAP_TPLSVARS', 'Template vars info files');

xoops_trust_path/libs/altsys/language/french/mytplsadmin.php

Spacing +22 added lines, -22 removed lines

@@ -1,27 +1,27 @@
 <?php
 
-define('_MYTPLSADMIN_CREATE_NEW_TPLSET', 'Créer une nouvelle série') ;
-define('_MYTPLSADMIN_CAPTION_BASE', 'Base') ;
-define('_MYTPLSADMIN_CAPTION_SETNAME', 'nom') ;
-define('_MYTPLSADMIN_OPT_BLANKSET', '(vide)') ;
-define('_MYTPLSADMIN_CAPTION_COPYTO', 'à') ;
-define('_MYTPLSADMIN_BTN_COPY', 'COPIER') ;
-define('_MYTPLSADMIN_TITLE_CHECKALL', 'Activer / désactiver toutes les cases de cette ligne') ;
-define('_MYTPLSADMIN_CNF_DELETE_SELECTED_TEMPLATES', 'Tous les templates sélectionnés dans l\'ensemble (ligne) seront supprimés. Voulez-vous confirmer?') ;
-define('_MYTPLSADMIN_CNF_COPY_SELECTED_TEMPLATES', 'Tous les templates sélectionnés dans l\'ensemble (ligne) seront copiés/écrasé dans l\'ensemble sélectionné. Voulez-vous confirmer?') ;
-define('_MYTPLSADMIN_TH_NAME', 'Nom template name') ;
-define('_MYTPLSADMIN_TH_TYPE', 'type') ;
-define('_MYTPLSADMIN_TH_FILE', 'fichier source') ;
-define('_MYTPLSADMIN_ERR_NOTPLFILE', 'Aucun template sélectionné.') ;
-define('_MYTPLSADMIN_ERR_INVALIDTPLSET', "L\'ensemble de destination est le même que la source, ou aucun ensemble de templates n\'a été spécifié.") ;
-define('_MYTPLSADMIN_ERR_CANTREMOVEDEFAULT', "Vous ne pouvez pas supprimer l'ensemble 'default'.") ;
-define('_MYTPLSADMIN_ERR_DUPLICATEDSETNAME', "Ce nom d'ensemble de templates existe déjà.") ;
-define('_MYTPLSADMIN_ERR_INVALIDSETNAME', "un mauvais nom d'ensemble de templates a été spécifié.") ;
+define('_MYTPLSADMIN_CREATE_NEW_TPLSET', 'Créer une nouvelle série');
+define('_MYTPLSADMIN_CAPTION_BASE', 'Base');
+define('_MYTPLSADMIN_CAPTION_SETNAME', 'nom');
+define('_MYTPLSADMIN_OPT_BLANKSET', '(vide)');
+define('_MYTPLSADMIN_CAPTION_COPYTO', 'à');
+define('_MYTPLSADMIN_BTN_COPY', 'COPIER');
+define('_MYTPLSADMIN_TITLE_CHECKALL', 'Activer / désactiver toutes les cases de cette ligne');
+define('_MYTPLSADMIN_CNF_DELETE_SELECTED_TEMPLATES', 'Tous les templates sélectionnés dans l\'ensemble (ligne) seront supprimés. Voulez-vous confirmer?');
+define('_MYTPLSADMIN_CNF_COPY_SELECTED_TEMPLATES', 'Tous les templates sélectionnés dans l\'ensemble (ligne) seront copiés/écrasé dans l\'ensemble sélectionné. Voulez-vous confirmer?');
+define('_MYTPLSADMIN_TH_NAME', 'Nom template name');
+define('_MYTPLSADMIN_TH_TYPE', 'type');
+define('_MYTPLSADMIN_TH_FILE', 'fichier source');
+define('_MYTPLSADMIN_ERR_NOTPLFILE', 'Aucun template sélectionné.');
+define('_MYTPLSADMIN_ERR_INVALIDTPLSET', "L\'ensemble de destination est le même que la source, ou aucun ensemble de templates n\'a été spécifié.");
+define('_MYTPLSADMIN_ERR_CANTREMOVEDEFAULT', "Vous ne pouvez pas supprimer l'ensemble 'default'.");
+define('_MYTPLSADMIN_ERR_DUPLICATEDSETNAME', "Ce nom d'ensemble de templates existe déjà.");
+define('_MYTPLSADMIN_ERR_INVALIDSETNAME', "un mauvais nom d'ensemble de templates a été spécifié.");
 
-define('_MYTPLSADMIN_H3_MODULE', 'Module') ;
-define('_MYTPLSADMIN_BTN_NEWTPLSET', 'créer') ;
+define('_MYTPLSADMIN_H3_MODULE', 'Module');
+define('_MYTPLSADMIN_BTN_NEWTPLSET', 'créer');
 
-define('_MYTPLSADMIN_DBUPDATED', 'Mise à jour avec succès des Templates') ;
+define('_MYTPLSADMIN_DBUPDATED', 'Mise à jour avec succès des Templates');
 
-define('_MYTPLSADMIN_CUSTOMTEMPLATE', 'Template personnalisé') ;
-define('_MYTPLSADMIN_CREATENEWCUSTOMTEMPLATE', 'Créer un nouveau template personnalisé') ;
+define('_MYTPLSADMIN_CUSTOMTEMPLATE', 'Template personnalisé');
+define('_MYTPLSADMIN_CREATENEWCUSTOMTEMPLATE', 'Créer un nouveau template personnalisé');

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

Doc Comments +3 added lines

@@ -69,6 +69,9 @@
 
 
 // private
+/**
+ * @param integer $target_side
+ */
 public function renderRadio4BlockPosition($target_side, $block_data)
 {
     $bid = intval($block_data['bid']) ;

Spacing +39 added lines, -39 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 
-require_once __DIR__.'/MyBlocksAdmin.class.php' ;
+require_once __DIR__.'/MyBlocksAdmin.class.php';
 
 class MyBlocksAdminForICMS extends MyBlocksAdmin
 {
 
-    public $block_positions = array() ;
+    public $block_positions = array();
 
     public function MyBlocksAadminForICMS()
     {
@@ -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;
 }
@@ -46,23 +46,23 @@ 
     // get selected targets
     if (is_array(@$block_data['bmodule'])) {
         // bmodule origined from request (preview etc.)
-        $selected_pages = $block_data['bmodule'] ;
+        $selected_pages = $block_data['bmodule'];
     } else {
         // origined from the table of `block_module_link`
-        $result = $this->db->query('SELECT module_id,page_id FROM ' . $this->db->prefix('block_module_link') . " WHERE block_id='$bid'") ;
+        $result = $this->db->query('SELECT module_id,page_id FROM '.$this->db->prefix('block_module_link')." WHERE block_id='$bid'");
         $selected_pages = array();
         while (list($mid, $pid) = $this->db->fetchRow($result)) {
-            $selected_pages[] = (int)$mid . '-' . (int)$pid;
+            $selected_pages[] = (int)$mid.'-'.(int)$pid;
         }
     }
 
     $page_handler = xoops_gethandler('page');
     $ret = "
 				<select name='bmodules[$bid][]' size='5' multiple='multiple'>
-					".$page_handler->getPageSelOptions($selected_pages) . '
+					".$page_handler->getPageSelOptions($selected_pages).'
 				</select>';
 
-    return $ret ;
+    return $ret;
 }
 
 
@@ -73,19 +73,19 @@ 
     return "
 	<table>
 		<tr>
-			<td rowspan='2'>".$this->renderRadio4BlockPosition(1, $block_data) . '</td>
-			<td>' . $this->renderRadio4BlockPosition(3, $block_data) . '</td>
-			<td>' . $this->renderRadio4BlockPosition(4, $block_data) . '</td>
-			<td>' . $this->renderRadio4BlockPosition(5, $block_data) . "</td>
-			<td rowspan='2'>".$this->renderRadio4BlockPosition(2, $block_data) . '</td>
+			<td rowspan='2'>".$this->renderRadio4BlockPosition(1, $block_data).'</td>
+			<td>' . $this->renderRadio4BlockPosition(3, $block_data).'</td>
+			<td>' . $this->renderRadio4BlockPosition(4, $block_data).'</td>
+			<td>' . $this->renderRadio4BlockPosition(5, $block_data)."</td>
+			<td rowspan='2'>".$this->renderRadio4BlockPosition(2, $block_data).'</td>
 		</tr>
 		<tr>
-			<td>' . $this->renderRadio4BlockPosition(6, $block_data) . '</td>
-			<td>' . $this->renderRadio4BlockPosition(7, $block_data) . '</td>
-			<td>' . $this->renderRadio4BlockPosition(8, $block_data) . "</td>
+			<td>' . $this->renderRadio4BlockPosition(6, $block_data).'</td>
+			<td>' . $this->renderRadio4BlockPosition(7, $block_data).'</td>
+			<td>' . $this->renderRadio4BlockPosition(8, $block_data)."</td>
 		</tr>
 		<tr>
-			<td colspan='5'>".$this->renderRadio4BlockPositions($block_data, array(1, 2, 3, 4, 5, 6, 7, 8)) . '</td>
+			<td colspan='5'>".$this->renderRadio4BlockPositions($block_data, array(1, 2, 3, 4, 5, 6, 7, 8)).'</td>
 		</tr>
 	</table>';
 }
@@ -96,19 +96,19 @@ 
 {
     $bid = (int)$block_data['bid'];
     $visible = (int)$block_data['visible'];
-    $current_side = $visible ? (int)$block_data['side'] : -1 ;
+    $current_side = $visible ? (int)$block_data['side'] : -1;
 
-    $label4disp = htmlspecialchars($this->block_positions[ $target_side ], ENT_QUOTES) ;
+    $label4disp = htmlspecialchars($this->block_positions[$target_side], ENT_QUOTES);
 
     if ($current_side == $target_side) {
-        $checked = "checked='checked'" ;
+        $checked = "checked='checked'";
         $divstyle = $target_side == -1 ? 'disabled' : 'selected';
     } else {
         $checked = '';
         $divstyle = 'unselected';
     }
 
-    return "<div class='blockposition $divstyle' title='$label4disp'><input type='radio' name='sides[$bid]' value='$target_side' class='blockposition' $checked /></div>" ;
+    return "<div class='blockposition $divstyle' title='$label4disp'><input type='radio' name='sides[$bid]' value='$target_side' class='blockposition' $checked /></div>";
 }
 
 
@@ -117,28 +117,28 @@ 
 {
     $bid = (int)$block_data['bid'];
     $visible = (int)$block_data['visible'];
-    $current_side = $visible ? (int)$block_data['side'] : -1 ;
+    $current_side = $visible ? (int)$block_data['side'] : -1;
 
-    $ret = '' ;
+    $ret = '';
     foreach ($this->block_positions as $target_side => $label) {
         if (in_array($target_side, $skip_sides)) {
-            continue ;
+            continue;
         }
 
-        $label4disp = htmlspecialchars($label, ENT_QUOTES) ;
+        $label4disp = htmlspecialchars($label, ENT_QUOTES);
 
         if ($current_side == $target_side) {
-            $checked = "checked='checked'" ;
+            $checked = "checked='checked'";
             $divstyle = $target_side == -1 ? 'disabled' : 'selected';
         } else {
             $checked = '';
             $divstyle = 'unselected';
         }
 
-        $ret .= "<div style='clear:both;'><div class='blockposition $divstyle' title='$label4disp'><input type='radio' name='sides[$bid]' id='sides_{$bid}_{$target_side}' value='$target_side' class='blockposition' $checked /></div><label for='sides_{$bid}_{$target_side}'>$label4disp</label></label></div>" ;
+        $ret .= "<div style='clear:both;'><div class='blockposition $divstyle' title='$label4disp'><input type='radio' name='sides[$bid]' id='sides_{$bid}_{$target_side}' value='$target_side' class='blockposition' $checked /></div><label for='sides_{$bid}_{$target_side}'>$label4disp</label></label></div>";
     }
 
-    return $ret ;
+    return $ret;
 }
 
 
@@ -146,16 +146,16 @@ 
 public function updateBlockModuleLink($bid, $bmodules)
 {
     $bid = (int)$bid;
-    $table = $this->db->prefix('block_module_link') ;
+    $table = $this->db->prefix('block_module_link');
 
-    $sql = "DELETE FROM `$table` WHERE `block_id`=$bid" ;
-    $this->db->query($sql) ;
+    $sql = "DELETE FROM `$table` WHERE `block_id`=$bid";
+    $this->db->query($sql);
     foreach ($bmodules as $mid) {
-        $regs = explode('-', $mid) ;
+        $regs = explode('-', $mid);
         $module_id = (int)(@$regs[0]);
         $page_id = (int)(@$regs[1]);
-        $sql = "INSERT INTO `$table` (`block_id`,`module_id`,`page_id`) VALUES ($bid,$module_id,$page_id)" ;
-        $this->db->query($sql) ;
+        $sql = "INSERT INTO `$table` (`block_id`,`module_id`,`page_id`) VALUES ($bid,$module_id,$page_id)";
+        $this->db->query($sql);
     }
 }
 }

xoops_trust_path/libs/altsys/mytplsform.php

Indentation +2 added lines, -2 removed lines

@@ -178,7 +178,7 @@ 
 altsys_include_mymenu() ;
 
 echo "<h3 style='text-align:"._GLOBAL_LEFT.";'>"._MD_A_MYTPLSFORM_EDIT . ' : ' . htmlspecialchars($tpl['tpl_type'], ENT_QUOTES) . ' : ' . htmlspecialchars($tpl['tpl_file'], ENT_QUOTES) . ' ('
-     . htmlspecialchars($tpl['tpl_tplset'], ENT_QUOTES) . ")</h3>\n" ;
+        . htmlspecialchars($tpl['tpl_tplset'], ENT_QUOTES) . ")</h3>\n" ;
 
 
 // diff from file to selected DB template
@@ -241,7 +241,7 @@ 
 echo "
 <a name='altsys_tplsform_top' id='altsys_tplsform_top'></a>
 <form name='MainForm' id='altsys_tplsform' action='?mode=admin&amp;lib=altsys&amp;page=mytplsform&amp;tpl_file=".htmlspecialchars($tpl_file, ENT_QUOTES) . '&amp;tpl_tplset='
-     . htmlspecialchars($tpl['tpl_tplset'], ENT_QUOTES) . '&amp;dirname=' . $target_mname . "' method='post'>
+        . htmlspecialchars($tpl['tpl_tplset'], ENT_QUOTES) . '&amp;dirname=' . $target_mname . "' method='post'>
 	".$xoopsGTicket->getTicketHtml(__LINE__, 1800, 'altsys_tplsform')."
     <textarea name='tpl_source' id='altsys_tpl_source' wrap='off' style='width:600px;height:400px;'>".htmlspecialchars($tpl['tpl_source'], ENT_QUOTES) . '</textarea>
 	<br />

Spacing +113 added lines, -113 removed lines

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

xoops_trust_path/libs/altsys/put_templates.php

Spacing +37 added lines, -37 removed lines

@@ -5,25 +5,25 @@ 
 //                        GIJOE <http://www.peak.ne.jp/>                     //
 // ------------------------------------------------------------------------- //
 
-include_once __DIR__.'/include/gtickets.php' ;
-include_once __DIR__.'/include/altsys_functions.php' ;
-include_once __DIR__.'/include/tpls_functions.php' ;
+include_once __DIR__.'/include/gtickets.php';
+include_once __DIR__.'/include/altsys_functions.php';
+include_once __DIR__.'/include/tpls_functions.php';
 
 
 // this page can be called only from altsys
 if ($xoopsModule->getVar('dirname') != 'altsys') {
-    die('this page can be called only from altsys') ;
+    die('this page can be called only from altsys');
 }
 
 
 // language file
-altsys_include_language_file('compilehookadmin') ;
+altsys_include_language_file('compilehookadmin');
 
 
-$db = XoopsDatabaseFactory::getDatabaseConnection() ;
+$db = XoopsDatabaseFactory::getDatabaseConnection();
 
-if (empty($_FILES['tplset_archive']['tmp_name']) || ! is_uploaded_file($_FILES['tplset_archive']['tmp_name'])) {
-    die(_TPLSADMIN_ERR_NOTUPLOADED) ;
+if (empty($_FILES['tplset_archive']['tmp_name']) || !is_uploaded_file($_FILES['tplset_archive']['tmp_name'])) {
+    die(_TPLSADMIN_ERR_NOTUPLOADED);
 }
 //fix for mb_http_output setting and for add any browsers
     if (function_exists('mb_http_output')) {
@@ -32,7 +32,7 @@ 
 //ob_buffer over flow
 //HACK by suin & nao-pon 2012/01/06
     while (ob_get_level() > 0) {
-        if (! ob_end_clean()) {
+        if (!ob_end_clean()) {
             break;
         }
     }
@@ -41,62 +41,62 @@ 
 // EXTRACT STAGE
 //
 
-$orig_filename4check = strtolower($_FILES['tplset_archive']['name']) ;
+$orig_filename4check = strtolower($_FILES['tplset_archive']['name']);
 if (strtolower(substr($orig_filename4check, -4)) == '.zip') {
 
     // zip
-    require_once __DIR__.'/include/Archive_Zip.php' ;
-    $reader = new Archive_Zip($_FILES['tplset_archive']['tmp_name']) ;
-    $files = $reader->extract(array( 'extract_as_string' => true )) ;
-    if (! is_array(@$files)) {
-        die($reader->errorName()) ;
+    require_once __DIR__.'/include/Archive_Zip.php';
+    $reader = new Archive_Zip($_FILES['tplset_archive']['tmp_name']);
+    $files = $reader->extract(array('extract_as_string' => true));
+    if (!is_array(@$files)) {
+        die($reader->errorName());
     }
-    $do_upload = true ;
+    $do_upload = true;
 } elseif (substr($orig_filename4check, -4) == '.tgz' || substr($orig_filename4check, -7) == '.tar.gz') {
 
     // tar.gz
-    require_once XOOPS_ROOT_PATH.'/class/class.tar.php' ;
-    $tar = new tar() ;
-    $tar->openTAR($_FILES['tplset_archive']['tmp_name']) ;
-    $files = array() ;
+    require_once XOOPS_ROOT_PATH.'/class/class.tar.php';
+    $tar = new tar();
+    $tar->openTAR($_FILES['tplset_archive']['tmp_name']);
+    $files = array();
     foreach ($tar->files as $id => $info) {
         $files[] = array(
-            'filename' => $info['name'] ,
-            'mtime' => $info['time'] ,
+            'filename' => $info['name'],
+            'mtime' => $info['time'],
             'content' => $info['file']
-        ) ;
+        );
     }
     if (empty($files)) {
-        die(_TPLSADMIN_ERR_INVALIDARCHIVE) ;
+        die(_TPLSADMIN_ERR_INVALIDARCHIVE);
     }
-    $do_upload = true ;
+    $do_upload = true;
 }
 
 if (empty($do_upload)) {
-    die(_TPLSADMIN_ERR_EXTENSION) ;
+    die(_TPLSADMIN_ERR_EXTENSION);
 }
 
 //
 // IMPORT STAGE
 //
 
-$tplset = @$_POST['tplset'] ;
-if (! preg_match('/^[0-9A-Za-z_-]{1,16}$/', $tplset)) {
-    die(_TPLSADMIN_ERR_INVALIDTPLSET) ;
+$tplset = @$_POST['tplset'];
+if (!preg_match('/^[0-9A-Za-z_-]{1,16}$/', $tplset)) {
+    die(_TPLSADMIN_ERR_INVALIDTPLSET);
 }
 
-$imported = 0 ;
+$imported = 0;
 foreach ($files as $file) {
-    if (! empty($file['folder'])) {
-        continue ;
+    if (!empty($file['folder'])) {
+        continue;
     }
-    $pos = strrpos($file['filename'], '/') ;
-    $tpl_file = $pos === false ? $file['filename'] : substr($file['filename'], $pos + 1) ;
+    $pos = strrpos($file['filename'], '/');
+    $tpl_file = $pos === false ? $file['filename'] : substr($file['filename'], $pos + 1);
 
     if (tplsadmin_import_data($tplset, $tpl_file, rtrim($file['content']), $file['mtime'])) {
-        $imported ++ ;
+        $imported++;
     }
 }
 
-redirect_header('?mode=admin&lib=altsys&page=compilehookadmin', 3, sprintf(_TPLSADMIN_FMT_MSG_PUTTEMPLATES, $imported)) ;
-exit ;
+redirect_header('?mode=admin&lib=altsys&page=compilehookadmin', 3, sprintf(_TPLSADMIN_FMT_MSG_PUTTEMPLATES, $imported));
+exit;

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

Spacing +9 added lines, -9 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 // $Id: MyBlocksAdminForXCL21.class.php ,ver 0.0.7.1 2011/01/27 16:10:00 domifara Exp $
 
-require_once __DIR__.'/MyBlocksAdmin.class.php' ;
+require_once __DIR__.'/MyBlocksAdmin.class.php';
 
 class MyBlocksAdminForXCL21 extends MyBlocksAdmin
 {
@@ -18,7 +18,7 @@ 
     static $instance;
     if (!isset($instance)) {
         $instance = new MyBlocksAdminForXCL21();
-        $instance->construct() ;
+        $instance->construct();
     }
     return $instance;
 }
@@ -29,8 +29,8 @@ 
 public function renderCell4BlockOptions($block_data)
 {
     if ($this->target_dirname && substr($this->target_dirname, 0, 1) != '_') {
-        $langman =& D3LanguageManager::getInstance() ;
-        $langman->read('admin.php', $this->target_dirname) ;
+        $langman = & D3LanguageManager::getInstance();
+        $langman->read('admin.php', $this->target_dirname);
     }
 
     $bid = (int)$block_data['bid'];
@@ -38,15 +38,15 @@ 
 //HACK by domifara
 //	$block = new XoopsBlock( $bid ) ;
     $handler = xoops_gethandler('block');
-    $block =& $handler->create(false) ;
-    $block->load($bid) ;
+    $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'));
     }
 }