Przeglądaj źródła

Set more info on folder paths being writable in settings
Add logout message

causefx 7 lat temu
rodzic
commit
5d1842d7ca

+ 11 - 0
api/functions/organizr-functions.php

@@ -2007,4 +2007,15 @@ function settingsDocker()
 {
 	$type = ($GLOBALS['docker']) ? 'Official Docker' : 'Native';
 	return '<li><div class="bg-info"><i class="mdi mdi-flag mdi-24px text-white"></i></div><span class="text-muted hidden-xs m-t-10" lang="en">Install Type</span> ' . $type . '</li>';
+}
+
+function settingsPathChecks()
+{
+	$items = '';
+	$type = (array_search(false, pathsWritable($GLOBALS['paths']))) ? 'Not Writable' : 'Writable';
+	$result = '<li class="mouse" onclick="toggleWritableFolders();"><div class="bg-info"><i class="mdi mdi-folder mdi-24px text-white"></i></div><span class="text-muted hidden-xs m-t-10" lang="en">Organizr Paths</span> ' . $type . '</li>';
+	foreach (pathsWritable($GLOBALS['paths']) as $k => $v) {
+		$items .= '<li class="folders-writable hidden"><div class="bg-info"><i class="mdi mdi-folder mdi-24px text-white"></i></div><span class="text-muted hidden-xs m-t-10" lang="en">' . $k . '</span> ' . (($v) ? 'Writable' : 'Not Writable') . '</li>';
+	}
+	return $result . $items;
 }

+ 2 - 2
api/functions/static-globals.php

@@ -14,8 +14,8 @@ $GLOBALS['defaultConfigPath'] = dirname(__DIR__, 1) . DIRECTORY_SEPARATOR . 'con
 $GLOBALS['currentTime'] = gmdate("Y-m-d\TH:i:s\Z");
 $GLOBALS['docker'] = (file_exists(dirname(__DIR__, 2) . DIRECTORY_SEPARATOR . 'Docker.txt')) ? true : false;
 $GLOBALS['paths'] = array(
-	'main' => dirname(__DIR__, 2) . DIRECTORY_SEPARATOR,
-	'api' => dirname(__DIR__, 1) . DIRECTORY_SEPARATOR
+	'Root Folder' => dirname(__DIR__, 2) . DIRECTORY_SEPARATOR,
+	'API Folder' => dirname(__DIR__, 1) . DIRECTORY_SEPARATOR
 );
 // Quick function for plugins
 function pluginFiles($type)

+ 1 - 1
api/pages/settings.php

@@ -214,7 +214,7 @@ if (file_exists('config' . DIRECTORY_SEPARATOR . 'config.php')) {
                                                 <li><div class="bg-info"><i class="mdi mdi-webpack mdi-24px text-white"></i></div><span class="text-muted hidden-xs m-t-10" lang="en">Organizr Version</span> ' . $GLOBALS['installedVersion'] . '</li>
                                                 <li><div class="bg-info"><i class="mdi mdi-github-box mdi-24px text-white"></i></div><span class="text-muted hidden-xs m-t-10" lang="en">Organizr Branch</span> ' . $GLOBALS['branch'] . '</li>
                                                 <li><div class="bg-info"><i class="mdi mdi-database mdi-24px text-white"></i></div><span class="text-muted hidden-xs m-t-10" lang="en">Database Location</span> ' . $GLOBALS['dbLocation'] . $GLOBALS['dbName'] . '</li>
-                                                ' . settingsDocker() . '
+                                                ' . settingsDocker() . settingsPathChecks() . '
                                                 <hr class="m-t-10">
                                                 <li><div class="bg-info"><i class="mdi mdi-language-php mdi-24px text-white"></i></div><span class="text-muted hidden-xs m-t-10" lang="en">PHP Version</span> ' . phpversion() . '</li>
                                                 <li><div class="bg-info"><i class="mdi mdi-package-variant-closed mdi-24px text-white"></i></div><span class="text-muted hidden-xs m-t-10" lang="en">Webserver Version</span> ' . $_SERVER['SERVER_SOFTWARE'] . '</li>

+ 4 - 0
js/functions.js

@@ -360,6 +360,7 @@ function logout(){
 	organizrAPI('GET','api/?v1/logout').success(function(data) {
 		var html = JSON.parse(data);
 		if(html.data == true){
+            local('set','message','Goodbye|Logout Successful|success');
 			location.reload();
 		}else{
 			message('Logout Error',' An Error Occured',activeInfo.settings.notifications.position,'#FFF','warning','10000');
@@ -5962,6 +5963,9 @@ function clickPath(type,path=null){
             return null;
     }
 }
+function toggleWritableFolders(){
+    $('.folders-writable').toggleClass('hidden');
+}
 function launch(){
 	organizrConnect('api/?v1/launch_organizr').success(function (data) {
         try {