causefx 8 лет назад
Родитель
Сommit
94afaa780f
3 измененных файлов с 14 добавлено и 11 удалено
  1. 10 8
      api/functions/organizr-functions.php
  2. 2 1
      api/plugins/php-mailer.php
  3. 2 2
      js/functions.js

+ 10 - 8
api/functions/organizr-functions.php

@@ -2,22 +2,24 @@
 
 function upgradeCheck() {
     $compare = new Composer\Semver\Comparator;
-	// Upgrade to 1.50
+	// Upgrade check start for vserion below
+	$versionCheck = '2.25.0-alpha.101';
 	$config = loadConfig();
-	if (isset($config['dbLocation']) && (!isset($config['configVersion']) ||  $compare->lessThan($config['configVersion'], '1.25.0-alpha.101'))) {
-        return 'yup';
+	if (isset($config['dbLocation']) && (!isset($config['configVersion']) ||  $compare->lessThan($config['configVersion'], $versionCheck))) {
+		$oldVer = $config['configVersion'];
+        return 'Upgraded Needed - Current Version '.$oldVer.' - New Version: '.$versionCheck;
 		// Upgrade database to latest version
-		//updateSQLiteDB($config['database_Location'],'1.40');
-
+		//updateDB($GLOBALS['dbLocation'],$GLOBALS['dbName'],$oldVer);
 		// Update Version and Commit
-		//$config['CONFIG_VERSION'] = '1.50';
+		//$config['configVersion'] = $versionCheck;
 		//copy('config/config.php', 'config/config['.date('Y-m-d_H-i-s').'][1.40].bak.php');
 		//$createConfigSuccess = createConfig($config);
 		//unset($config);
 	}else{
-        return 'no';
+		//unset($config);
+        return 'No Upgraded Needed - Current Version Above: '.$versionCheck;
     }
-	//return true;
+	return true;
 }
 function wizardConfig($array){
     foreach ($array['data'] as $items) {

+ 2 - 1
api/plugins/php-mailer.php

@@ -99,7 +99,8 @@ function phpmGetSettings(){
 			'type' => 'input',
 			'name' => 'PHPMAILER-smtpHostSenderEmail',
 			'label' => 'Sender Email',
-			'value' => $GLOBALS['PHPMAILER-smtpHostSenderEmail']
+			'value' => $GLOBALS['PHPMAILER-smtpHostSenderEmail'],
+			'placeholder' => 'i.e. same as username'
 		),
 		array(
 			'type' => 'select',

+ 2 - 2
js/functions.js

@@ -511,7 +511,7 @@ function buildFormItem(item){
 			return '<input data-changed="false" lang=en" type="text" class="form-control'+extraClass+'"'+placeholder+value+id+name+disabled+type+' />';
 			break;
 		case 'password':
-			return '<input data-changed="false" lang=en" type="password" class="form-control'+extraClass+'"'+placeholder+value+id+name+disabled+type+' />';
+			return '<input data-changed="false" lang=en" type="password" class="form-control'+extraClass+'"'+placeholder+value+id+name+disabled+type+' autocomplete="new-password" />';
 			break;
 		case 'hidden':
 			return '<input data-changed="false" lang=en" type="hidden" class="form-control'+extraClass+'"'+placeholder+value+id+name+disabled+type+' />';
@@ -536,7 +536,7 @@ function buildPluginsItem(array){
 	$.each(array, function(i,v) {
 		var settingsPage = (v.settings == true) ? `
 		<!-- Plugin Settings Page -->
-		<form id="`+v.idPrefix+`-settings-page" class="mfp-hide white-popup-block mfp-with-anim">
+		<form id="`+v.idPrefix+`-settings-page" class="mfp-hide white-popup-block mfp-with-anim" autocomplete="off">
 			<h1 lang="en">`+v.name+` Settings</h1>
 			<fieldset id="`+v.idPrefix+`-settings-items" style="border:0;"></fieldset>
 			<div class="clearfix"></div>