Browse Source

Added auth debug toggle to settings
added check to see if user left auth debug on
added help tip to form framework
updated to smaller version of jquery ui

causefx 7 years ago
parent
commit
8bcae904f4
5 changed files with 28 additions and 10 deletions
  1. 2 1
      api/config/default.php
  2. 9 1
      api/functions/organizr-functions.php
  3. 2 1
      api/pages/settings.php
  4. 13 5
      js/functions.js
  5. 2 2
      js/jquery-ui.min.js

+ 2 - 1
api/config/default.php

@@ -170,5 +170,6 @@ return array(
 	'lockoutMinAuth' => '1',
 	'lockoutMinAuth' => '1',
 	'themeInstalled' => '',
 	'themeInstalled' => '',
 	'themeVersion' => '',
 	'themeVersion' => '',
-	'installedPlugins' => ''
+	'installedPlugins' => '',
+	'authDebug' => false
 );
 );

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

@@ -68,6 +68,7 @@ function organizrSpecialSettings()
 			'themeInstalled' => $GLOBALS['themeInstalled'],
 			'themeInstalled' => $GLOBALS['themeInstalled'],
 			'themeVersion' => $GLOBALS['themeVersion'],
 			'themeVersion' => $GLOBALS['themeVersion'],
 			'return' => isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : false,
 			'return' => isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : false,
+			'authDebug' => $GLOBALS['authDebug']
 		)
 		)
 	);
 	);
 }
 }
@@ -546,6 +547,13 @@ function getSettingsMain()
 				'name' => 'hideRegistration',
 				'name' => 'hideRegistration',
 				'label' => 'Hide Registration',
 				'label' => 'Hide Registration',
 				'value' => $GLOBALS['hideRegistration']
 				'value' => $GLOBALS['hideRegistration']
+			),
+			array(
+				'type' => 'switch',
+				'name' => 'authDebug',
+				'label' => 'Nginx Auth Debug',
+				'help' => 'Important! Do not keep this enabled for too long as this opens up Authentication while testing.',
+				'value' => $GLOBALS['authDebug']
 			)
 			)
 		),
 		),
 		'Ping' => array(
 		'Ping' => array(
@@ -1137,7 +1145,7 @@ function editPlugins($array)
 
 
 function auth()
 function auth()
 {
 {
-	$debug = false; // CAREFUL WHEN SETTING TO TRUE AS THIS OPENS AUTH UP
+	$debug = $GLOBALS['authDebug']; // CAREFUL WHEN SETTING TO TRUE AS THIS OPENS AUTH UP
 	$ban = isset($_GET['ban']) ? strtoupper($_GET['ban']) : "";
 	$ban = isset($_GET['ban']) ? strtoupper($_GET['ban']) : "";
 	$whitelist = isset($_GET['whitelist']) ? $_GET['whitelist'] : false;
 	$whitelist = isset($_GET['whitelist']) ? $_GET['whitelist'] : false;
 	$blacklist = isset($_GET['blacklist']) ? $_GET['blacklist'] : false;
 	$blacklist = isset($_GET['blacklist']) ? $_GET['blacklist'] : false;

+ 2 - 1
api/pages/settings.php

@@ -4,6 +4,7 @@ if (file_exists('config' . DIRECTORY_SEPARATOR . 'config.php')) {
 <script>
 <script>
     (function() {
     (function() {
         updateCheck();
         updateCheck();
+        authDebugCheck();
         [].slice.call(document.querySelectorAll(\'.sttabs\')).forEach(function(el) {
         [].slice.call(document.querySelectorAll(\'.sttabs\')).forEach(function(el) {
             new CBPFWTabs(el);
             new CBPFWTabs(el);
         });
         });
@@ -34,7 +35,7 @@ if (file_exists('config' . DIRECTORY_SEPARATOR . 'config.php')) {
                         <li onclick="changeSettingsMenu(\'Settings::User Management\')"><a href="#settings-main-user-management" class="sticon ti-user"><span lang="en">User Management</span></a></li>
                         <li onclick="changeSettingsMenu(\'Settings::User Management\')"><a href="#settings-main-user-management" class="sticon ti-user"><span lang="en">User Management</span></a></li>
                         <li onclick="changeSettingsMenu(\'Settings::Image Manager\');loadSettingsPage(\'api/?v1/settings/image/manager/view\',\'#settings-image-manager-view\',\'Image Viewer\');"><a href="#settings-main-image-manager" class="sticon ti-image"><span lang="en">Image Manager</span></a></li>
                         <li onclick="changeSettingsMenu(\'Settings::Image Manager\');loadSettingsPage(\'api/?v1/settings/image/manager/view\',\'#settings-image-manager-view\',\'Image Viewer\');"><a href="#settings-main-image-manager" class="sticon ti-image"><span lang="en">Image Manager</span></a></li>
     					<li onclick="changeSettingsMenu(\'Settings::Plugins\');loadSettingsPage(\'api/?v1/settings/plugins\',\'#settings-main-plugins\',\'Plugins\');"><a href="#settings-main-plugins" class="sticon ti-plug"><span lang="en">Plugins</span></a></li>
     					<li onclick="changeSettingsMenu(\'Settings::Plugins\');loadSettingsPage(\'api/?v1/settings/plugins\',\'#settings-main-plugins\',\'Plugins\');"><a href="#settings-main-plugins" class="sticon ti-plug"><span lang="en">Plugins</span></a></li>
-                        <li onclick="changeSettingsMenu(\'Settings::System Settings\')"><a href="#settings-main-system-settings" class="sticon ti-settings"><span lang="en">System Settings</span></a></li>
+                        <li onclick="changeSettingsMenu(\'Settings::System Settings\');authDebugCheck();"><a href="#settings-main-system-settings" class="sticon ti-settings"><span lang="en">System Settings</span></a></li>
                     </ul>
                     </ul>
                 </nav>
                 </nav>
                 <div class="content-wrap">
                 <div class="content-wrap">

+ 13 - 5
js/functions.js

@@ -603,10 +603,11 @@ function buildFormItem(item){
 	var attr = (item.attr) ? ' '+item.attr : '';
 	var attr = (item.attr) ? ' '+item.attr : '';
 	var disabled = (item.disabled) ? ' disabled' : '';
 	var disabled = (item.disabled) ? ' disabled' : '';
 	var href = (item.href) ? ' href="'+item.href+'"' : '';
 	var href = (item.href) ? ' href="'+item.href+'"' : '';
-	var smallLabel = (item.smallLabel) ? '<label langl="en">'+item.smallLabel+'</label>' : '';
-	var pwd1 = createRandomString(3);
-	var pwd2 = createRandomString(3);
-	var pwd3 = createRandomString(3);
+	var pwd1 = createRandomString(6);
+	var pwd2 = createRandomString(6);
+	var pwd3 = createRandomString(6);
+	var helpInfo = (item.help) ? '<div class="collapse" id="help-info-'+item.name+'">'+item.help+'</div>' : '';
+    var smallLabel = (item.smallLabel) ? '<label><span lang="en">'+item.smallLabel+'</span>`+helpTip+`</label>'+helpInfo : ''+helpInfo;
 	var pwgMgr = `
 	var pwgMgr = `
 	<input name="disable-pwd-mgr-`+pwd1+`" type="password" id="disable-pwd-mgr-`+pwd1+`" style="display: none;" value="disable-pwd-mgr-`+pwd1+`" />
 	<input name="disable-pwd-mgr-`+pwd1+`" type="password" id="disable-pwd-mgr-`+pwd1+`" style="display: none;" value="disable-pwd-mgr-`+pwd1+`" />
 	<input name="disable-pwd-mgr-`+pwd2+`" type="password" id="disable-pwd-mgr-`+pwd2+`" style="display: none;" value="disable-pwd-mgr-`+pwd2+`" />
 	<input name="disable-pwd-mgr-`+pwd2+`" type="password" id="disable-pwd-mgr-`+pwd2+`" style="display: none;" value="disable-pwd-mgr-`+pwd2+`" />
@@ -1124,11 +1125,13 @@ function buildFormGroup(array){
                 if (count % 2 !== 0) {
                 if (count % 2 !== 0) {
                     group += '<div class="row start">';
                     group += '<div class="row start">';
                 }
                 }
+                var helpID = '#help-info-'+v.name;
+                var helpTip = (v.help) ? '<a class="get-code" data-toggle="collapse" href="'+helpID+'" aria-expanded="true"><i class="fa fa-question-circle text-primary" title="Help" data-toggle="tooltip"></i></a>' : '';
                 group += `
                 group += `
 					<!-- INPUT BOX -->
 					<!-- INPUT BOX -->
 					<div class="col-md-`+override+` p-b-10">
 					<div class="col-md-`+override+` p-b-10">
 						<div class="form-group">
 						<div class="form-group">
-							<label class="control-label col-md-12" lang="en">`+v.label+`</label>
+							<label class="control-label col-md-12"><span lang="en">`+v.label+`</span>`+helpTip+`</label>
 							<div class="col-md-12">
 							<div class="col-md-12">
 								`+buildFormItem(v)+`
 								`+buildFormItem(v)+`
 							</div>
 							</div>
@@ -4749,6 +4752,11 @@ function blockDev(e) {
         evtobj.preventDefault();
         evtobj.preventDefault();
     }
     }
 }
 }
+function authDebugCheck(){
+    if(activeInfo.settings.misc.authDebug == true){
+        message('REMINDER','Auth Debug is still enabled',activeInfo.settings.notifications.position,'#FFF','warning','20000');
+    }
+}
 function lock(){
 function lock(){
     organizrAPI('POST','api/?v1/lock','').success(function(data) {
     organizrAPI('POST','api/?v1/lock','').success(function(data) {
         var html = JSON.parse(data);
         var html = JSON.parse(data);

File diff suppressed because it is too large
+ 2 - 2
js/jquery-ui.min.js


Some files were not shown because too many files changed in this diff