Typo + Templates + credits Tohokuaiki

xoopscube · Nov 23, 2022 · 7c53753 · 7c53753
1 parent f3f5f51
commit 7c53753
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 16 deletions.
diff --git a/html/modules/altsys/setup_xoops_trust_path.php b/html/modules/altsys/setup_xoops_trust_path.php
@@ -19,7 +19,7 @@
 }
 
 
-// show the hint if password mathes
+// show the hint if password matches
 $hint = '' ;
 if (@$_POST['dbpassword'] == XOOPS_DB_PASS) {
     // find XOOPS_TRUST_PATH

diff --git a/xoops_trust_path/libs/altsys/blocks/block_functions.php b/xoops_trust_path/libs/altsys/blocks/block_functions.php
@@ -27,7 +27,7 @@ function b_altsys_admin_menu_show($options)
         return [];
     }
 
-    // coretype
+    // core type
     $coretype = altsys_get_core_type();
 
     // mid_selected
@@ -155,7 +155,8 @@ function b_altsys_admin_menu_show($options)
             'adminindex' => htmlspecialchars(@$modinfo['adminindex'], ENT_QUOTES),
             'adminindex_absolute' => @$modinfo['adminindex_absolute'],
             'submenu' => $submenus4assign,
-            'selected' => $mid == $mid_selected ? true : false,
+            //'selected' => $mid == $mid_selected ? true : false, TODO gigamaster check
+            'selected' => $mid == $mid_selected,
             'dot_suffix' => $mid == $mid_selected ? 'selected_opened' : 'closed',
         ];
         $block['modules'][] = $module4assign;

diff --git a/xoops_trust_path/libs/altsys/include/admin_in_theme.inc.php b/xoops_trust_path/libs/altsys/include/admin_in_theme.inc.php
@@ -18,7 +18,8 @@
 		require_once __DIR__ . '/altsys_functions.php';
 
 		if ( ! empty( $GLOBALS['altsysModuleConfig']['admin_in_theme'] ) && file_exists( XOOPS_THEME_PATH . '/' . $GLOBALS['altsysModuleConfig']['admin_in_theme'] . '/theme.html' ) ) {
-			// configs OK
+
+            // configs OK
 			require_once __DIR__ . '/admin_in_theme_functions.php';
 
 			// for security with register_globals=1

diff --git a/xoops_trust_path/libs/altsys/include/admin_in_theme_functions.php b/xoops_trust_path/libs/altsys/include/admin_in_theme_functions.php
@@ -29,8 +29,8 @@ function altsys_admin_in_theme( $s ) {
 	//!Fix redirect
 	//strpos - Find the position of the first occurrence of a substring in a string
 	//mb_strstr - Finds first occurrence of a string within another
-	//if (strpos($s, '<meta http-equiv="Refresh" ') !== false) {
-	if ( mb_strstr( $s, '<meta http-equiv="Refresh" ' ) ) {
+	if (strpos($s, '<meta http-equiv="Refresh" ') !== false) {
+	//if ( mb_strstr( $s, '<meta http-equiv="Refresh" ' ) ) {
 		define( 'ALTSYS_DONT_USE_ADMIN_IN_THEME', 1 );
 
 		return $s;
@@ -49,7 +49,7 @@ function altsys_admin_in_theme( $s ) {
 		return $s;
 	}
 
-	[ $tmp_s, $tmp_after ] = explode( "<td width='1%'>", $tmp_s );
+	[ $tmp_s, $tmp_after ] = explode( "<div width='1%'>", $tmp_s );
 	if ( empty( $tmp_after ) ) {
 		define( 'ALTSYS_DONT_USE_ADMIN_IN_THEME', 1 );
 

diff --git a/xoops_trust_path/libs/altsys/include/autoupdate_from_module.inc.php b/xoops_trust_path/libs/altsys/include/autoupdate_from_module.inc.php
@@ -30,6 +30,11 @@
 	if ( $handler = @opendir( $tplsadmin_autoupdate_path . '/' ) ) {
 		while ( false !== ( $file = readdir( $handler ) ) ) {
 			$file_path = $tplsadmin_autoupdate_path . '/' . $file;
+            /**
+             * Import CSS
+             * proposed by tohokuaiki
+             * ! if( is_file( $file_path ) && (substr( $file , -5 ) == '.html'||substr( $file , -4 ) == '.css') ) {
+             */
 			if ( is_file( $file_path ) && '.html' == substr( $file, - 5 ) ) {
 				$mtime = (int) @filemtime( $file_path );
 				list( $count ) = $xoopsDB->fetchRow( $xoopsDB->query( 'SELECT COUNT(*) FROM ' . $xoopsDB->prefix( 'tplfile' ) . " WHERE tpl_tplset='" . addslashes( $xoopsConfig['template_set'] ) . "' AND tpl_file='" . addslashes( $file ) . "' AND tpl_lastmodified >= $mtime" ) );

diff --git a/xoops_trust_path/libs/altsys/mylangadmin.php b/xoops_trust_path/libs/altsys/mylangadmin.php
@@ -30,7 +30,7 @@
 }
 
 
-// initials
+// initial
 $db = XoopsDatabaseFactory::getDatabaseConnection();
 ( method_exists( 'MyTextSanitizer', 'sGetInstance' ) and $myts = MyTextSanitizer::sGetInstance() ) || $myts =& MyTextSanitizer::getInstance();
 $langman = D3LanguageManager::getInstance();

diff --git a/xoops_trust_path/libs/altsys/mytplsadmin.php b/xoops_trust_path/libs/altsys/mytplsadmin.php
@@ -303,7 +303,7 @@ function altsys_mytpladmin_check_copy_submit(msg, id, selcheck) {
     . $xoopsGTicket->getTicketHtml( __LINE__ ) ;
 
 ////— ACTION-CONTROL —\\\\
-echo '<section layout="row center-justify" class="action-control">
+echo '<section data-layout="row center-justify" class="action-control">
         <div>' . _MYTPLSADMIN_CREATE_NEW_TPLSET . ' : ' . _MYTPLSADMIN_CAPTION_BASE . ':
 			<select name="clone_tplset_from">'. $tplset_options .'
 			<option value="_blank_">' . _MYTPLSADMIN_OPT_BLANKSET . '</option>

diff --git a/xoops_trust_path/libs/altsys/templates/main_blocks_admin_list.html b/xoops_trust_path/libs/altsys/templates/main_blocks_admin_list.html
@@ -9,7 +9,7 @@ <h2 class="admintitle"><{$smarty.const._MD_A_MYBLOCKSADMIN_BLOCKADMIN}> » <{$ta
 
 
 <{* ////— ACTION-CONTROL —\\\\ *}>
-<section layout="row center-justify" class="action-control">
+<section data-layout="row center-justify" class="action-control">
 
     <a class="button" href="index.php?mode=admin&lib=altsys&page=myblocksadmin&dirname=__CustomBlocks__&op=edit"><{$smarty.const._MI_ALTSYS_MENU_NEWCUSTOMBLOCK}></a>
 
@@ -93,8 +93,8 @@ <h2 class="admintitle"><{$smarty.const._MD_A_MYBLOCKSADMIN_BLOCKADMIN}> » <{$ta
 
 		<div class="ui-card-block-content">
 
-			<div layout="rows column">
-			<div class="ui-card-block-item" layout="rows">
+			<div data-layout="rows column">
+			<div class="ui-card-block-item" data-layout="rows">
 				<label for="weights[<{$block.bid}>]" aria-label="<{$smarty.const._MD_A_MYBLOCKSADMIN_WEIGHT}>">
 				<input type="text" name="weights[<{$block.bid}>]" value="<{$block.weight}>" size="1" maxlength="5">
 				</label>
@@ -149,7 +149,7 @@ <h2 class="admintitle"><{$smarty.const._MD_A_MYBLOCKSADMIN_BLOCKADMIN}> » <{$ta
 </div><{* ui-data-render *}>
 
 
-<div layout="row centered" class="adminnavi">
+<div data-layout="row centered" class="adminnavi">
 	<input type="hidden" name="fct" value="blocksadmin">
 	<input type="hidden" name="op" value="order">
 	<{$gticket_hidden}>

diff --git a/xoops_trust_path/libs/altsys/templates/main_lang_admin.html b/xoops_trust_path/libs/altsys/templates/main_lang_admin.html
@@ -20,7 +20,7 @@ <h2 class="admintitle"><{$smarty.const._MYLANGADMIN_H3_MODULE}> » <{$target_mna
 
 
 <{* ////— ACTION-CONTROL —\\\\ *}>
-<section layout="row center-justify" class="action-control">
+<section data-layout="row center-justify" class="action-control">
 
     <form name="SelectLangFile" action="index.php" method="get">
         <input type="hidden" name="mode" value="admin">

diff --git a/xoops_trust_path/libs/altsys/xoops_version.php b/xoops_trust_path/libs/altsys/xoops_version.php
@@ -18,7 +18,7 @@
 $modversion['dirname']          = 'altsys';
 $modversion['name']             = _MI_ALTSYS_MODULENAME;
 $modversion['version']          = '2.31';
-$modversion['detailed_version'] = '2.31.3';
+$modversion['detailed_version'] = '2.31.4';
 $modversion['description']      = _MI_ALTSYS_MODULEDESC;
 $modversion['author']           = 'GIJ=CHECKMATE<br>PEAK Corp.(https://www.peak.ne.jp/)';
 $modversion['credits']          = 'PEAK Corp., Gigamaster (XCL/PHP7)';
@@ -84,7 +84,7 @@
 	'description' => '_MI_ALTSYS_ADMIN_IN_THEMEDSC',
 	'formtype'    => 'textbox',
 	'valuetype'   => 'text',
-	'default'     => 'default',
+	'default'     => 'xcl_default',
 	'options'     => []
 ];