Merge branch '295121_Settings_Modules' into 'foreall'

E-ALL Settings_Modules

See merge request vtiger/vtigercrm!1226

layouts/v7/modules/Settings/ExtensionStore/CardSetupModals.tpl

@@ -15,8 +15,8 @@
 		{assign var=HEADER_TITLE value={vtranslate('LBL_SETUP_CARD', $QUALIFIED_MODULE)}}
 		{include file="ModalHeader.tpl"|vtemplate_path:$MODULE TITLE=$HEADER_TITLE}
 		<form class="form-horizontal setUpCardForm">
-			<input type="hidden" name="customerId" value="{$CUSTOMER_PROFILE['id']}" />
-			<input type="hidden" name="customerCardId" value="{$CUSTOMER_PROFILE['CustomerCardId']}" />
+			<input type="hidden" name="customerId" value="{(isset($CUSTOMER_PROFILE['id'])) ? $CUSTOMER_PROFILE['id'] : ''}" />
+			<input type="hidden" name="customerCardId" value="{(isset($CUSTOMER_PROFILE['CustomerCardId'])) ? $CUSTOMER_PROFILE['CustomerCardId'] : ''}" />
 			<input type="hidden" name="module" value="ExtensionStore" />
 			<input type="hidden" name="parent" value="Settings" />
 			<input type="hidden" name="action" value="Basic" />
@@ -84,13 +84,13 @@
 				<div class="col-sm-3 col-xs-3">
 					{vtranslate('LBL_CARD_NUMBER', $QUALIFIED_MODULE)}
 				</div>
-				<div class="col-sm-4 col-xs-4 cardNumber">{$CUSTOMER_CARD_INFO['number']}</div>
+				<div class="col-sm-4 col-xs-4 cardNumber">{(isset($CUSTOMER_CARD_INFO['number'])) ? $CUSTOMER_CARD_INFO['number'] : ''}</div>
 			</div>
 			<div class="row marginBottom10px">
 				<div class="col-sm-3 col-xs-3">
 					{vtranslate('LBL_EXPIRY_DATE', $QUALIFIED_MODULE)}
 				</div>
-				<div class="col-sm-4 col-xs-4 expiryDate">{$CUSTOMER_CARD_INFO['expmonth']}&nbsp;-&nbsp;{$CUSTOMER_CARD_INFO['expyear']}</div>
+				<div class="col-sm-4 col-xs-4 expiryDate">{(isset($CUSTOMER_CARD_INFO['expmonth'])) ? $CUSTOMER_CARD_INFO['expmonth'] : ''}&nbsp;-&nbsp;{(isset($CUSTOMER_CARD_INFO['expyear'])) ? $CUSTOMER_CARD_INFO['expyear'] : ''}</div>
 			</div>
 			<div class="row marginBottom10px">
 				<div class="col-sm-3 col-xs-3 securityCode">

layouts/v7/modules/Settings/ModuleManager/ImportUserModuleStep2.tpl

@@ -12,7 +12,7 @@
 		<div>
 			<div class="row">
 				<div id="vtlib_modulemanager_import_div">
-					{if $MODULEIMPORT_FAILED neq ''}
+					{if isset ($MODULEIMPORT_FAILED) && $MODULEIMPORT_FAILED neq ''}
 						<div class="col-lg-2"></div>
 						<div class="col-lg-10">
 							<b>{vtranslate('LBL_FAILED', $QUALIFIED_MODULE)}</b>
@@ -87,10 +87,10 @@
 		<div class="modal-overlay-footer clearfix">
 			<div class="row clearfix">
 				<div class="textAlignCenter col-lg-12 col-md-12 col-sm-12">
-					{if $MODULEIMPORT_FAILED neq ''}
+					{if isset($MODULEIMPORT_FAILED) && $MODULEIMPORT_FAILED neq ''}
 						<button class="btn btn-success finishButton" type="submit"><strong>{vtranslate('LBL_FINISH', $QUALIFIED_MODULE)}</strong></button>
 					{else if $MODULEIMPORT_EXISTS eq 'true' || $MODULEIMPORT_DIR_EXISTS eq 'true'}
-						<button class="btn btn-success updateModule" name="saveButton" {if $need_license_agreement eq 'true'} disabled {/if}>{vtranslate('LBL_UPDATE_NOW', $QUALIFIED_MODULE)}</button>
+						<button class="btn btn-success updateModule" name="saveButton" {if isset($need_license_agreement) && $need_license_agreement eq 'true'} disabled {/if}>{vtranslate('LBL_UPDATE_NOW', $QUALIFIED_MODULE)}</button>
 					{else}
 						<button class="btn btn-success importModule" name="saveButton" {if $need_license_agreement eq 'true'} disabled {/if}><strong>{vtranslate('LBL_IMPORT_NOW', $QUALIFIED_MODULE)}</strong></button>
 					{/if}

modules/Settings/ModuleManager/models/Extension.php

@@ -19,6 +19,7 @@ class Settings_ModuleManager_Extension_Model extends Vtiger_Base_Model {
 	var $fileName;
 
 	public static function getUploadDirectory($isChild = false) {
+		if(!isset($uploadDir ))$uploadDir ='';
 		$uploadDir .= 'test/vtlib';
 		if ($isChild) {
 			$uploadDir = '../'.$uploadDir;