Browse Source

Guest Notice work and email fix

causefx 8 years ago
parent
commit
b84a8c3749
4 changed files with 59 additions and 1 deletions
  1. 5 0
      config/configDefaults.php
  2. 13 0
      functions.php
  3. 40 0
      settings.php
  4. 1 1
      user.php

+ 5 - 0
config/configDefaults.php

@@ -93,9 +93,13 @@ return array(
 	"smtpHostType" => "tls",
 	"homepageNoticeTitle" => "",
 	"homepageNoticeMessage" => "",
+	"homepageNoticeTitleGuest" => "",
+	"homepageNoticeMessageGuest" => "",
 	"homepageNoticeType" => "success",
+	"homepageNoticeTypeGuest" => "success",
 	"homepageNoticeAuth" => "false",
 	"homepageNoticeLayout" => "elegant",
+	"homepageNoticeLayoutGuest" => "elegant",
 	"ipInfoToken" => "ddd0c072ad5021",
 	"historyRefresh" => "120000",
 	"downloadRefresh" => "30000",
@@ -132,5 +136,6 @@ return array(
 	"homepageOrderembyrecent" => '11',
 	"homepageOrderombi" => '12',
 	"homepageOrdercalendar" => '13',
+	"homepageOrdernoticeguest" => '14',
 	'requestedUserOnly' => 'true',
 );

+ 13 - 0
functions.php

@@ -24,6 +24,7 @@ function homepageOrder(){
 		"homepageOrderembyrecent" => homepageOrderembyrecent,
 		"homepageOrderombi" => homepageOrderombi,
 		"homepageOrdercalendar" => homepageOrdercalendar,
+		"homepageOrdernoticeguest" => homepageOrdernoticeguest,
 	);
 	asort($homepageOrder);
 	return $homepageOrder;
@@ -5187,6 +5188,13 @@ function buildHomepageSettings(){
 					$class .= ' faded';
 				}
 				break;
+			case 'homepageOrdernoticeguest':
+				$class = 'palette-Cyan-A400 bg gray';
+				$image = 'images/pin.png';
+				if(empty(HOMEPAGENOTICETITLEGUEST) && empty(HOMEPAGENOTICEMESSAGEGUEST)){
+					$class .= ' faded';
+				}
+				break;
 			case 'homepageOrderspeedtest':
 				$class = 'red-bg';
 				$image = 'images/settings/full-color/png/64px/speedometer.png';
@@ -5309,6 +5317,11 @@ function buildHomepageItem($homepageItem, $group, $user){
 				$homepageItemBuilt .= buildHomepageNotice(HOMEPAGENOTICELAYOUT, HOMEPAGENOTICETYPE, HOMEPAGENOTICETITLE, HOMEPAGENOTICEMESSAGE);
 			}
 			break;
+		case 'homepageOrdernoticeguest':
+			if ($group == 'guest' && HOMEPAGENOTICETITLEGUEST && HOMEPAGENOTICETYPEGUEST && HOMEPAGENOTICEMESSAGEGUEST && HOMEPAGENOTICELAYOUTGUEST) {
+				$homepageItemBuilt .= buildHomepageNotice(HOMEPAGENOTICELAYOUTGUEST, HOMEPAGENOTICETYPEGUEST, HOMEPAGENOTICETITLEGUEST, HOMEPAGENOTICEMESSAGEGUEST);
+			}
+			break;
 		case 'homepageOrderspeedtest':
 			if(SPEEDTEST == "true" && qualifyUser(SPEEDTESTAUTH)){
 				$homepageItemBuilt .= '

+ 40 - 0
settings.php

@@ -1513,6 +1513,46 @@ echo buildSettings(
 		 				'labelTranslate' => 'NOTICE_MESSAGE',
 						'html' => '<div class="summernote" name="homepageNoticeMessage">'.HOMEPAGENOTICEMESSAGE.'</div>',
 					),
+                    array(
+						'type' => 'custom',
+						'html' => '<h2>Not Logged In/Guest Notice</h2>',
+					),
+                    array(
+						'type' => $userSelectType,
+						'labelTranslate' => 'NOTICE_LAYOUT',
+						'name' => 'homepageNoticeLayoutGuest',
+						'value' => HOMEPAGENOTICELAYOUTGUEST,
+						'options' => array(
+							'Elegant' => 'elegant',
+							'Basic' => 'basic',
+							'Jumbotron' => 'jumbotron',
+						),
+					),
+     				array(
+						'type' => $userSelectType,
+						'labelTranslate' => 'NOTICE_COLOR',
+						'name' => 'homepageNoticeTypeGuest',
+						'value' => HOMEPAGENOTICETYPEGUEST,
+						'options' => array(
+							'Green' => 'success',
+							'Blue' => 'primary',
+							'Gray' => 'gray',
+							'Red' => 'danger',
+							'Yellow' => 'warning',
+							'Light Blue' => 'info',
+						),
+					),
+     				array(
+						'type' => 'text',
+						'labelTranslate' => 'NOTICE_TITLE',
+						'name' => 'homepageNoticeTitleGuest',
+						'value' => HOMEPAGENOTICETITLEGUEST,
+					),
+        			array(
+						'type' => 'custom',
+		 				'labelTranslate' => 'NOTICE_MESSAGE',
+						'html' => '<div class="summernote" name="homepageNoticeMessageGuest">'.HOMEPAGENOTICEMESSAGEGUEST.'</div>',
+					),
 				),
 			),
 			array(

+ 1 - 1
user.php

@@ -136,7 +136,7 @@
             $mail = new PHPMailer;
             $mail->isSMTP();
             $mail->Host = SMTPHOST;
-            $mail->SMTPAuth = SMTPHOSTAUTH;
+            $mail->SMTPAuth = (SMTPHOSTAUTH == "true" || SMTPHOSTAUTH == true) ? true : false;
             $mail->Username = SMTPHOSTUSERNAME;
             $mail->Password = SMTPHOSTPASSWORD;
             $mail->SMTPSecure = SMTPHOSTTYPE;