#904 autoinstall without ftp, change some UI

modules/autoinstall/autoinstall.admin.model.php

@@ -316,7 +316,7 @@ class autoinstallAdminModel extends autoinstall
 				}
 			}
 
-			$installedPackage = $oModel->getInstalledPackage($package_srl);
+			$installedPackage = $oModel->getInstalledPackage($packageSrl);
 			if($installedPackage)
 			{
 				$package->installed = TRUE;
@@ -386,7 +386,7 @@ class autoinstallAdminModel extends autoinstall
 
 		while($path_list)
 		{
-			$check_path = $real_path . implode('/', $path_list);
+			$check_path = realpath($real_path . implode('/', $path_list));
 			if(FileHandler::isDir($check_path))
 			{
 				break;

modules/autoinstall/autoinstall.admin.view.php

@@ -369,6 +369,10 @@ class autoinstallAdminView extends autoinstall
 		}
 
 		$output = $oAdminModel->checkUseDirectModuleInstall($package);
+		if($output->toBool()==TRUE)
+		{
+			Context::set('show_ftp_note', FALSE);
+		}
 		Context::set('directModuleInstall', $output);
 
 		$this->setTemplateFile('install');
@@ -534,6 +538,10 @@ class autoinstallAdminView extends autoinstall
 		}
 
 		$output = $oAdminModel->checkUseDirectModuleInstall($installedPackage);
+		if($output->toBool()==TRUE)
+		{
+			Context::set('show_ftp_note', FALSE);
+		}
 		Context::set('directModuleInstall', $output);
 
 		$params["act"] = "getResourceapiPackages";

modules/autoinstall/tpl/index.html

@@ -9,6 +9,7 @@
 <div cond="$XE_VALIDATOR_MESSAGE && isset($from_id[$XE_VALIDATOR_ID])" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
 	<p>{$XE_VALIDATOR_MESSAGE}</p>
 </div>
+<!--
 <form action="" method="post">
 	<input type="hidden" name="module" value="autoinstall" />
 	<input type="hidden" name="act" value="procAutoinstallAdminUpdateinfo" />
@@ -22,4 +23,5 @@
 		{sprintf($lang->description_update, $btnUpdate)}
 	</p>
 </form>
+-->
 <include target="list.html" />

modules/autoinstall/tpl/install.html

@@ -6,11 +6,12 @@
 	<h4>{$lang->msg_update_core_title}</h4>
 	<p>{$lang->msg_update_core}</p>
 </div>
-<div class="x_well">
+<div cond="$package->installed" class="x_well">
-	<p cond="$package->installed">{$lang->current_version}: {$package->cur_version} <block cond="$package->need_update">({$lang->require_update})</block></p>
+	<p>{$lang->current_version}: {$package->cur_version} <block cond="$package->need_update">({$lang->require_update})</block></p>
-	<p cond="!$package->installed">{$lang->require_installation}</p>
+</div>
-	<block cond="$package->depends">
+<div cond="$package->depends && (!$package->installed || $package->need_update)" class="x_well">
 	<p>{$lang->about_depending_programs}</p>
+	<p>{$lang->description_install}</p>
 	<ul>
 		<li loop="$package->depends => $dep">
 			{$dep->title} ver. {$dep->version} -
@@ -21,15 +22,21 @@
 			</block>
 		</li>
 	</ul>
-		<p>{$lang->description_install}</p>
-	</block>
 </div>
 
 <block cond="!$package->installed || $package->need_update">
-	<div cond="$show_ftp_note" class="x_well x_clearfix">
+	<div cond="!$directModuleInstall->toBool() || $show_ftp_note" class="x_well x_clearfix">
+		<block cond="!$directModuleInstall->toBool()">
+			<p>{$lang->msg_direct_install_not_supported}</p>
+			<ul>
+				<li loop="$directModuleInstall->get('path') => $path">{$path}</li>
+			</ul>
+		</block>
+		<block cond="$show_ftp_note" >
 			<p>{$lang->description_download}. (<a href="{getUrl('', 'module', 'admin', 'act', 'dispAdminConfigFtp')}">FTP Setup</a>)</p>
 			<p>{$lang->path}: {$package->path}</p>
 			<p><a class="x_btn x_btn-primary x_pull-right" href="{_XE_DOWNLOAD_SERVER_}?module=resourceapi&act=procResourceapiDownload&package_srl={$package->package_srl}">{$lang->cmd_download}</a>
+		</block>
 	</div>
 	<div cond="!$show_ftp_note">
 		<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/autoinstall/tpl/install/1'" class="message error">
@@ -52,12 +59,6 @@
 					</div>
 				</div>
 			</block>
-			<block cond="!$directModuleInstall->toBool()">
-				<p>{$lang->msg_direct_install_not_supported}</p>
-				<ul>
-					<li loop="$directModuleInstall->get('path') => $path">{$path}</li>
-				</ul>
-			</block>
 			<div class="x_clearfix btnArea">
 				<div class="x_pull-right">
 					<input class="x_btn x_btn-primary" type="submit" value="{$package->installed?$lang->update:$lang->install}" />

modules/autoinstall/tpl/uninstall.html

@@ -8,7 +8,19 @@
 	<div class="x_alert x_alert-block">
 		<p>{$lang->description_uninstall}</p>
 	</div>
+	<div class="x_well x_clearfix">
+		<block cond="!$directModuleInstall->toBool()">
+			<p>{$lang->msg_direct_install_not_supported}</p>
+			<ul>
+				<li loop="$directModuleInstall->get('path') => $path">{$path}</li>
+			</ul>
+		</block>
+		<block cond="$show_ftp_note">
+			<p>{$lang->ftp_form_title}. (<a href="{getUrl('', 'module', 'admin', 'act', 'dispAdminConfigFtp')}">FTP Setup</a>)</p>
+		</block>
+	</div>
 
+	<div cond="!$show_ftp_note">
 		<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/autoinstall/tpl/uninstall/1'" class="message error">
 			<p>{$XE_VALIDATOR_MESSAGE}</p>
 		</div>
@@ -29,27 +41,22 @@
 					</div>
 				</div>
 			</block>
-		<block cond="!$directModuleInstall->toBool()">
-			<p>{$lang->msg_direct_install_not_supported}</p>
-			<ul>
-				<li loop="$directModuleInstall->get('path') => $path">{$path}</li>
-			</ul>
-		</block>
 			<div class="x_clearfix btnArea">
 				<div class="x_pull-right">
 					<input class="x_btn x_btn-primary" type="submit" value="{$lang->cmd_delete}" />
 				</div>
 			</div>
 		</form>
+	</div>
 </block>
 <block cond="!$package->avail_remove">
 	<div class="x_alert x_alert-error">
 		<p cond="$package->deps">{$lang->msg_dependency_package}</p>
 		<p cond="!$package->deps">{$lang->msg_does_not_support_delete}</p>
 	</div>
-	<div class="x_well">
+	<div cond="$package->deps" class="x_well">
-		<p cond="$package->deps">{$lang->dependant_list}:</p>
+		<p>{$lang->dependant_list}:</p>
-		<ul cond="$package->deps">
+		<ul>
 			<li loop="$package->deps => $dep_package_srl">{$installed[$dep_package_srl]->title}</li>
 		</ul>
 	</div>