causefx 8 rokov pred
rodič
commit
4dd625c778

+ 2 - 1
api/config/default.php

@@ -137,6 +137,7 @@ return array(
     'customHTMLtwo' => '',
 	'mediaSearch' => false,
 	'mediaSearchType' => '',
-	'mediaSearchAuth' => '1'
+	'mediaSearchAuth' => '1',
+	'registrationPassword' => ''
 
 );

+ 15 - 7
api/functions/organizr-functions.php

@@ -202,7 +202,7 @@ function getSettingsMain(){
     			'type' => 'button',
     			'label' => 'Force Install Branch',
     			'class' => 'updateNow',
-    			'icon' => 'fa fa-paper-plane',
+    			'icon' => 'fa fa-download',
     			'text' => 'Retrieve'
     		)
         ),
@@ -217,7 +217,7 @@ function getSettingsMain(){
     			'type' => 'button',
     			'label' => 'Generate New API Key',
     			'class' => 'newAPIKey',
-    			'icon' => 'fa fa-paper-plane',
+    			'icon' => 'fa fa-refresh',
     			'text' => 'Generate'
     		)
         ),
@@ -251,7 +251,7 @@ function getSettingsMain(){
     			'type' => 'button',
     			'label' => 'Get Plex Token',
     			'class' => 'popup-with-form getPlexTokenAuth plexAuth switchAuth',
-    			'icon' => 'fa fa-paper-plane',
+    			'icon' => 'fa fa-ticket',
     			'text' => 'Retrieve',
     			'href' => '#auth-plex-token-form',
     			'attr' => 'data-effect="mfp-3d-unfold"'
@@ -268,7 +268,7 @@ function getSettingsMain(){
     			'type' => 'button',
     			'label' => 'Get Plex Machine',
     			'class' => 'popup-with-form getPlexMachineAuth plexAuth switchAuth',
-    			'icon' => 'fa fa-paper-plane',
+    			'icon' => 'fa fa-id-badge',
     			'text' => 'Retrieve',
     			'href' => '#auth-plex-machine-form',
     			'attr' => 'data-effect="mfp-3d-unfold"'
@@ -312,7 +312,15 @@ function getSettingsMain(){
     			'icon' => 'fa fa-paper-plane',
     			'text' => 'Send'
     		)*/
-        )
+        ),
+		'Misc' => array(
+			array(
+    			'type' => 'password-alt',
+    			'name' => 'registrationPassword',
+    			'label' => 'Registration Password',
+    			'value' => $GLOBALS['registrationPassword'],
+    		),
+		)
 	);
 }
 function getSSO(){
@@ -329,7 +337,7 @@ function getSSO(){
     			'type' => 'button',
     			'label' => 'Get Plex Token',
     			'class' => 'popup-with-form getPlexTokenSSO',
-    			'icon' => 'fa fa-paper-plane',
+    			'icon' => 'fa fa-ticket',
     			'text' => 'Retrieve',
     			'href' => '#sso-plex-token-form',
     			'attr' => 'data-effect="mfp-3d-unfold"'
@@ -345,7 +353,7 @@ function getSSO(){
     			'type' => 'button',
     			'label' => 'Get Plex Machine',
     			'class' => 'popup-with-form getPlexMachineSSO',
-    			'icon' => 'fa fa-paper-plane',
+    			'icon' => 'fa fa-id-badge',
     			'text' => 'Retrieve',
     			'href' => '#sso-plex-machine-form',
     			'attr' => 'data-effect="mfp-3d-unfold"'

+ 1 - 0
api/plugins/config/php-mailer.php

@@ -30,6 +30,7 @@ return array(
 	If you need anything, please let me know.<br />
 	',
 	'PHPMAILER-emailTemplateRegisterUserSubject' => 'Thank you For Registering',
+	'PHPMAILER-emailTemplateRegisterUserEnabled' => true,
 	'PHPMAILER-emailTemplateCustom-include-One' => '',
 	'PHPMAILER-emailTemplateCustom-include-OneName' => 'Template #1',
 	'PHPMAILER-emailTemplateCustom-include-OneSubject' => '',

+ 6 - 0
api/plugins/php-mailer.php

@@ -268,6 +268,12 @@ function phpmGetSettings(){
 				'value' => $GLOBALS['PHPMAILER-logo'],
 				'placeholder' => 'Full URL',
 			),
+			array(
+				'type' => 'switch',
+				'name' => 'PHPMAILER-emailTemplateRegisterUserEnabled',
+				'label' => 'Send Welcome E-Mail',
+				'value' => $GLOBALS['PHPMAILER-emailTemplateRegisterUserEnabled'],
+			),
 		),
 		'Templates' => array(
 			array(

+ 2 - 2
index.php

@@ -151,8 +151,8 @@
 	<script src="plugins/bower_components/multiselect/js/jquery.multi-select.js"></script>
 	<script src="https://cdn.plyr.io/3.1.0/plyr.js"></script>
 	<script src="https://apis.google.com/js/client.js?onload=googleApiClientReady"></script>
-	<script src="js/functions.js?v=<?php echo $GLOBALS['installedVersion']; ?>"></script>
-	<script src="js/custom.js?v=<?php echo $GLOBALS['installedVersion']; ?>"></script>
+	<script src="js/functions.js?v=<?php echo $GLOBALS['installedVersion']; ?>" async></script>
+	<script src="js/custom.js?v=<?php echo $GLOBALS['installedVersion']; ?>" async></script>
 	<?php echo pluginFiles('js'); ?>
 </body>
 </html>

BIN
less/icons/themify-icons/fonts/themify.ttf


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
plugins/bower_components/bootstrap-select/bootstrap-select.js.map


Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov