diff --git a/core/src/data/files/AjaXplorer-QuickStart.txt b/core/src/data/files/AjaXplorer-QuickStart.txt deleted file mode 100644 index e007c02d5d..0000000000 --- a/core/src/data/files/AjaXplorer-QuickStart.txt +++ /dev/null @@ -1,90 +0,0 @@ ---------------------------------------------------------------------------- - * Copyright 2007-2013 Charles du Jeu - * This file is part of AjaXplorer. - * - * AjaXplorer is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * AjaXplorer is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with AjaXplorer. If not, see . - * - * The latest code can be found at . ---------------------------------------------------------------------------- - - ------------------------------------------------ -| AjaXplorer Quick Start | - ------------------------------------------------ - - 1 SYSTEM REQUIREMENTS & QUICK INSTALL - - To be able to run this system on your webserver, it must have PHP 5.3 or higher - running, and you must have an FTP access to upload the files on the server. - Just make sure that the "data" folder is (recursively) writeable by the webserver. - - That's all! For the default configuration, no database is needed. But if you want to - store data in a database, it's possible, see the *.sql plugins. - - 2 CONFIGURATION - - The very basic configurations are to be found in the conf/ folder : - - + You should not have to tweak the bootstrap_context.php, unless you want to customize - heavily your installation. - + The bootstrap_repositories.php contains the default workspaces definition. The preferred - way of creating new workspaces is by using the GUI (switch to the "Settings"), but you - can also define them manually in this file if it's more handy for you - - 2.1 WORKSPACES - - In AjaXplorer, a workspace is a folder that you want to browse/modify with - the application. A workspace does not have to be inside the ajaxplorer installation - folder, since you set it with an absolute path on your server. - - You can set as many workspaces as you want : you will be able to switch from one to - another when logged to AjaXplorer, and you can precisely set rights for each users (see - paragraph 2.2) on each workspace. - - By default, the basic workspace is set to the "data/files" folder inside the ajaxplorer - installation folder. You can change it to whatever you want, using absolute path - like : /home/login/www/location, or /C:/myfolder/ on windows. - - Note that a workspace does not have to be accessible to the internet, AjaXplorer will - work as a "proxy" between your files and the web. - - 2.2 USERS MANAGEMENT - - An evoluted users management system has been developed in AjaXplorer. You are encouraged - to use it to secure your data, but it's up to you, you can disable it totally (for example - if you are already working in a very secure zone, and don't need any users profiles). - - You can add / modify / delete users by logging in AjaXplorer as "admin" and switching to the - "Settings" panel. For each user, you will be able to give read and/or right access separately - on each workspace. Note that a user that has no rights on any workspace cannot log in. - - 2.2.1 BASIC USERS CONFIGURATION - - ENABLE_USERS => 1 Users management is enabled - 0 Users management is totally disabled. No logging required and all - users share the same preferences. - - ALLOW_GUEST_BROWSING => 1 In the "Settings" console accessed by admin user, - a "guest" user is created on which you can set - rights on workspaces like any other user. This - user will be automatically logged in if no user - is identified. - 0 When no user is identified, the login screen appears - and no workspace is loaded. - - - 2.3 FURTHER CONFIGURATION - - Switch to the "Settings" panel, and browse the various "Global Configurations" : particularly, - you should have a look at the "Core" options, as well as the Plugins > Gui > Client Plugin (gui.ajax) - where you can do some basic customization for your interface. diff --git a/core/src/plugins/auth.multi/class.multiAuthDriver.php b/core/src/plugins/auth.multi/class.multiAuthDriver.php index 90a1540e8a..22a5e8f711 100644 --- a/core/src/plugins/auth.multi/class.multiAuthDriver.php +++ b/core/src/plugins/auth.multi/class.multiAuthDriver.php @@ -60,7 +60,7 @@ public function init($options){ throw new Exception("Cannot find plugin $name for type 'auth'"); } $instance->init($options); - if($this->masterSlaveMode && $name != $this->getOption("MASTER_DRIVER")){ + if($name != $this->getOption("MASTER_DRIVER")){ $this->slaveName = $name; } $this->drivers[$name] = $instance; @@ -223,11 +223,11 @@ function listUsers($baseGroup="/"){ return array_merge($masterUsers, $slaveUsers); } if($this->getCurrentDriver()){ - return $this->getCurrentDriver()->listUsers($baseGroup); +// return $this->getCurrentDriver()->listUsers($baseGroup); } $allUsers = array(); foreach($this->drivers as $driver){ - $allUsers = array_merge($driver->listUsers($baseGroup)); + $allUsers = array_merge($allUsers, $driver->listUsers($baseGroup)); } return $allUsers; } diff --git a/core/src/plugins/core.conf/class.AbstractConfDriver.php b/core/src/plugins/core.conf/class.AbstractConfDriver.php index 477bc8122b..62289fbf3c 100644 --- a/core/src/plugins/core.conf/class.AbstractConfDriver.php +++ b/core/src/plugins/core.conf/class.AbstractConfDriver.php @@ -278,7 +278,9 @@ abstract function deleteBinary($context, $ID); * @return AbstractAjxpUser */ function createUserObject($userId){ - $abstractUser = $this->instantiateAbstractUserImpl($userId); + $userId = AuthService::filterUserSensitivity($userId); + + $abstractUser = $this->instantiateAbstractUserImpl($userId); if(!$abstractUser->storageExists()){ AuthService::updateDefaultRights($abstractUser); }