⚡ 🔨 🎨 Merge XCL 2.31 UIX

xoopscube · Apr 12, 2022 · d75fce2 · d75fce2
1 parent 60bd3c0
commit d75fce2
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git a/xoops_trust_path/modules/xupdate/admin/actions/ModuleViewAction.class.php b/xoops_trust_path/modules/xupdate/admin/actions/ModuleViewAction.class.php
@@ -98,7 +98,7 @@ public function executeViewSuccess( &$render ) {
 			exit();
 		}
 
-		// Check install dirctory
+		// Check installation wizard directory
 		if ( XUPDATE_INSTALLERCHECKER_ACTIVE && is_dir( XOOPS_ROOT_PATH . '/install' ) ) {
 			while ( ob_get_level() && @ ob_end_clean() ) {
 			}

diff --git a/xoops_trust_path/modules/xupdate/admin/templates/admin_module_store_confirm.html b/xoops_trust_path/modules/xupdate/admin/templates/admin_module_store_confirm.html
@@ -43,7 +43,7 @@ <h2 class="admintitle"><{$smarty.const._AD_XUPDATE_LANG_MODULES}> : <{$smarty.co
 
         <tbody>
         <{foreach item=id from=$ids}>
-        <tr';>
+        <tr>
             <td class="legacy_list_id"><{$id}></td>
             <td class="legacy_list_select">
                 <{if $actionForm->get('dirname',$id) == $moduleObjects[$id]->getVar('dirname')}>

diff --git a/xoops_trust_path/modules/xupdate/admin/templates/admin_themefinder_install_confirm.html b/xoops_trust_path/modules/xupdate/admin/templates/admin_themefinder_install_confirm.html
@@ -42,21 +42,21 @@ <h2 class="admintitle"><{$smarty.const._AD_XUPDATE_LANG_THEMES}> <{$smarty.const
                     </thead>
 
                     <tbody>
-                    <tr';>
+                    <tr>
                         <td class="legacy_list_select"><{$smarty.const._MI_XUPDATE_FTP_ADDON_URL}></td>
                         <td class="legacy_list_select">
                             <{xoops_input type=hidden name=addon_url value=$addon_url }>
                             <{$addon_url|xoops_escape:show}>
                         </td>
                     </tr>
-                    <tr';>
+                    <tr>
                         <td class="legacy_list_select">target_key</td>
                         <td class="legacy_list_select">
                             <{xoops_input type=hidden name=target_key value=$target_key }>
                             <{$target_key|xoops_escape:show}>
                         </td>
                     </tr>
-                    <tr';>
+                    <tr>
                         <td class="legacy_list_select"><{$smarty.const._AD_XUPDATE_LANG_TYPE}></td>
                         <td class="legacy_list_select">
                             <{xoops_input type=hidden name=target_type value=$target_type }>

diff --git a/xoops_trust_path/modules/xupdate/admin/templates/include_options_form.html b/xoops_trust_path/modules/xupdate/admin/templates/include_options_form.html
@@ -1,7 +1,7 @@
 <div class="ui-dev-mode"><{$smarty.template}></div>
 
 <{if $options.writable_dir || $options.writable_file || $options.no_overwrite || $options.no_update || $options.delete_dir || $options.delete_file}>
-<tr';>
+<tr>
     <td class="legacy_list_select">options</td>
     <td class="legacy_list_select">
         <table>

diff --git a/xoops_trust_path/modules/xupdate/class/Ftp.class.php b/xoops_trust_path/modules/xupdate/class/Ftp.class.php
@@ -131,7 +131,13 @@ public function app_login( $server = null ) {
 		return $ret;
 	}
 
-	public function uploadNakami( $sourcePath, $targetPath ) {
+    /**
+     * FTP content
+     * @param $sourcePath
+     * @param $targetPath
+     * @return array|bool
+     */
+    public function uploadNakami($sourcePath, $targetPath ) {
 		$this->mes .= ' start FTP put (normal mode) form `' . htmlspecialchars( substr( $sourcePath, strlen( $this->exploredDirPath ) + 1 ), ENT_QUOTES, _CHARSET ) . '` to `' . htmlspecialchars( $targetPath, ENT_QUOTES, _CHARSET ) . "` ..<br>\n";
 		$result    = $this->_ftpPutNakami( $sourcePath, $targetPath );