소스 검색

Added notice about changing password for non-internal auth types
formatting of settings.php file - including typos

causefx 7 년 전
부모
커밋
215caedeb6
3개의 변경된 파일53개의 추가작업 그리고 29개의 파일을 삭제
  1. 2 1
      api/functions/organizr-functions.php
  2. 10 26
      api/pages/settings.php
  3. 41 2
      js/functions.js

+ 2 - 1
api/functions/organizr-functions.php

@@ -69,7 +69,8 @@ function organizrSpecialSettings()
 			'return' => isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : false,
 			'authDebug' => $GLOBALS['authDebug'],
 			'minimalLoginScreen' => $GLOBALS['minimalLoginScreen'],
-			'unsortedTabs' => $GLOBALS['unsortedTabs']
+			'unsortedTabs' => $GLOBALS['unsortedTabs'],
+			'authBackend' => $GLOBALS['authBackend']
 		)
 	);
 }

+ 10 - 26
api/pages/settings.php

@@ -26,7 +26,7 @@ if (file_exists('config' . DIRECTORY_SEPARATOR . 'config.php')) {
     </div>
     <!--.row-->
     <div class="row">
-        <!-- Tabstyle start -->
+        <!-- Tab style start -->
         <section class="">
             <div class="sttabs tabs-style-flip">
                 <nav>
@@ -194,11 +194,12 @@ if (file_exists('config' . DIRECTORY_SEPARATOR . 'config.php')) {
     											<li><a href="https://github.com/causefx/organizr" target="_blank"><i class="mdi mdi-github-box mdi-24px"></i></a></li>
     										</ul>
     									</div>
-    									<div class="well bg-org">
-                                            <h4 lang="en">Want to help translate?</h4>
-                                            <p lang="en">Head on over to POEditor and help us translate Organizr into your language</p>
-                                            <button class="fcbtn btn btn-primary btn-outline btn-1b"><a href="https://poeditor.com/join/project/T6l68hksTE" target="_blank" lang="en">I Want to Help</a></button>
-                                        </div>
+    									<a href="https://poeditor.com/join/project/T6l68hksTE" target="_blank">
+	                                        <div class="well bg-org">
+	                                            <h4 lang="en">Want to help translate?</h4>
+	                                            <p lang="en">Head on over to POEditor and help us translate Organizr into your language</p>
+	                                        </div>
+	                                    </a>
     								</div>
                                     <div class="col-lg-6 col-sm-12 col-md-6">
                                         <div class="white-box bg-org">
@@ -212,41 +213,24 @@ if (file_exists('config' . DIRECTORY_SEPARATOR . 'config.php')) {
                                                 <li><div class="bg-info"><i class="mdi mdi-package-variant-closed mdi-24px text-white"></i></div><span class="text-muted hidden-xs" lang="en">Webserver Version</span> ' . $_SERVER['SERVER_SOFTWARE'] . '</li>
                                                 <hr class="m-t-10">
                                                 <li><div class="bg-info"><i class="mdi mdi-account-card-details mdi-24px text-white"></i></div><span class="text-muted hidden-xs" lang="en">License</span> ' . ucwords($GLOBALS['license']) . '</li>
-
                                             </ul>
                                         </div>
                                     </div>
     							</div>
-    							
-    							
     							<div class="row">
-	                            	
 	                                <div class="col-lg-12">
 							            <div class="panel panel-default">
-											
 											<div class="panel-heading bg-org p-t-10 p-b-10">
 												<span class="pull-left m-t-5"><span lang="en">Sponsors</span></span>
-												
-										
 												<div class="clearfix"></div>
 											</div>
-									
 							                <div class="panel-wrapper p-b-0 collapse in bg-org">
-												
-							                	<div id="sponsorList" class="owl-carousel owl-theme sponsor-items">
-							                	
-											        
-
-							        			</div>
+							                	<div id="sponsorList" class="owl-carousel owl-theme sponsor-items"></div>
 							        			<div id="sponsorListModals"></div>
-											
-										
 							                </div>
 							            </div>
 							        </div>
-    							
     							</div>
-
                                 <div class="clearfix"></div>
                             </div>
                             <div role="tabpanel" class="tab-pane fade" id="settings-settings-donate">
@@ -268,7 +252,7 @@ if (file_exists('config' . DIRECTORY_SEPARATOR . 'config.php')) {
                                         </ul>
                                         <div class="tab-content">
                                             <div class="tab-pane active" id="donate-paypal">
-                                                <blockquote>I have choosen to go with PayPal Pools so everyone can see how much people have donated.<br/>Please click the button to continue.</blockquote>
+                                                <blockquote>I have chosen to go with PayPal Pools so everyone can see how much people have donated.<br/>Please click the button to continue.</blockquote>
                                                 <button onclick="window.open(\'https://paypal.me/pools/c/83JNaMBESR\', \'_blank\')" class="btn btn-primary btn-rounded waves-effect waves-light" type="button"><span class="btn-label"><i class="fa fa-link"></i></span><span lang="en">Continue To Website</span></button>
                                             </div>
                                             <div class="tab-pane" id="donate-square">
@@ -295,7 +279,7 @@ if (file_exists('config' . DIRECTORY_SEPARATOR . 'config.php')) {
                                                 <div class="clearfix"></div>
                                             </div>
                                             <div class="tab-pane" id="donate-patreon">
-                                                <blockquote>Need specialized support or just want to support Orgainzr?  If so head to Pateron...<br/>Please click the button to continue.</blockquote>
+                                                <blockquote>Need specialized support or just want to support Organizr?  If so head to Patreon...<br/>Please click the button to continue.</blockquote>
                                                 <button onclick="window.open(\'https://www.patreon.com/bePatron?u=8370887\', \'_blank\')" class="btn btn-primary btn-rounded waves-effect waves-light" type="button"><span class="btn-label"><i class="fa fa-link"></i></span><span lang="en">Continue To Website</span></button>
                                             </div>
                                         </div>

+ 41 - 2
js/functions.js

@@ -1552,6 +1552,46 @@ function updateUserInformation(){
 	}
 }
 function accountManager(user){
+    var passwordMessage = '';
+    switch(activeInfo.settings.misc.authBackend){
+        case 'plex':
+            passwordMessage = `
+                <div class="col-lg-12">
+                    <div class="panel panel-info">
+                        <div class="panel-heading"> <span lang="en">Password Notice</span>
+                            <div class="pull-right"><a href="#" data-perform="panel-collapse"><i class="ti-minus"></i></a> <a href="#" data-perform="panel-dismiss"><i class="ti-close"></i></a> </div>
+                        </div>
+                        <div class="panel-wrapper collapse in" aria-expanded="true">
+                            <div class="panel-body bg-org">
+                                <p lang="en">If you signed in with a Plex Acct... Please use the following link to change your password there:</p><br>
+                                <p><a href="https://app.plex.tv/auth#?resetPassword" target="_blank">Change Password on Plex Website</a></p>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            `;
+            break;
+        case 'emby':
+            passwordMessage = `
+                <div class="col-lg-12">
+                    <div class="panel panel-info">
+                        <div class="panel-heading"> <span lang="en">Password Notice</span>
+                            <div class="pull-right"><a href="#" data-perform="panel-collapse"><i class="ti-minus"></i></a> <a href="#" data-perform="panel-dismiss"><i class="ti-close"></i></a> </div>
+                        </div>
+                        <div class="panel-wrapper collapse in" aria-expanded="true">
+                            <div class="panel-body bg-org">
+                                <p lang="en">If you signed in with a Emby Acct... Please use the following link to change your password there:</p><br>
+                                <p><a href="https://emby.media/community/index.php?app=core&module=global&section=lostpass" target="_blank">Change Password on Emby Website</a></p>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            `;
+            break;
+        default:
+            passwordMessage = '';
+            break;
+    }
 	if (user.data.user.loggedin === true) {
 		var accountDiv = `
 		<div id="account-area" class="white-popup mfp-with-anim mfp-hide">
@@ -1562,11 +1602,9 @@ function accountManager(user){
 							<div class="panel-heading">
 								<span lang="en">Account Information</span>
 								<div class="btn-group pull-right">
-
 									<button class="btn btn-info waves-effect waves-light" type="button" onclick="updateUserInformation();">
 										<i class="fa fa-save"></i>
 									</button>
-
 								</div>
 							</div>
 							<div class="panel-wrapper collapse in main-email-panel" aria-expanded="true">
@@ -1596,6 +1634,7 @@ function accountManager(user){
 													<label class="control-label" lang="en">Verify Password</label>
 													<input type="password" id="accountPassword2" class="form-control"></div>
 											</div>
+											`+passwordMessage+`
 										</div>
 										<!--/row-->
 									</div>