pydio
diff --git a/‎README.md
Lines changed: 26 additions & 1 deletion b/‎README.md
Lines changed: 26 additions & 1 deletion
diff --git a/‎core/src/.gitignore
Lines changed: 9 additions & 1 deletion b/‎core/src/.gitignore
Lines changed: 9 additions & 1 deletion
diff --git a/‎core/src/.htaccess
Lines changed: 2 additions & 10 deletions b/‎core/src/.htaccess
Lines changed: 2 additions & 10 deletions
diff --git a/‎core/src/base.conf.php
Lines changed: 1 addition & 1 deletion b/‎core/src/base.conf.php
Lines changed: 1 addition & 1 deletion
diff --git a/‎core/src/cmd.php
Lines changed: 14 additions & 221 deletions b/‎core/src/cmd.php
Lines changed: 14 additions & 221 deletions
diff --git a/‎core/src/conf/bootstrap_conf.php
Lines changed: 1 addition & 1 deletion b/‎core/src/conf/bootstrap_conf.php
Lines changed: 1 addition & 1 deletion
@@ -8,7 +8,7 @@
 
 This is the main source code repository of Pydio (formerly AjaXplorer), containing all the PHP server and HTML5 Web GUI.
 
-* Latest Stable release : 6.4.1
+* Latest Stable release : 6.4.2
 * Latest Dev release : 6.3.1 (was RC for Pydio 6.4)
 * License: [AGPLv3](https://www.gnu.org/licenses/agpl.html)
 * Lead developer  : Charles du Jeu (cdujeu): [Github](https://github.com/cdujeu) | [Twitter](https://twitter.com/Pydio)
@@ -20,6 +20,31 @@ Please DO NOT send emails to Charles, but use the forum located on https://pydio
 
 ### How to contribute / Developer Resources
 
+#### Setting up your dev environment
+
+Pydio 7 requires **PHP5.6** and upper. 
+
+The web root of the application is located in ***core/src/***. Create a virtual host to point to this folder, set up your webserver to use index.php as default page. This is generally done by default. 
+
+Pydio uses Composer and NPM to manage dependencies respectively in PHP and JS. It uses Grunt to build javascript sources. In order to start Pydio locally after a fresh `git clone`, you will first have to run these tools in both the core and in many plugins. 
+
+ - First install Composer (see https://getcomposer.org) and NPM (https://docs.npmjs.com/getting-started/installing-node)
+ - Install Grunt globally by running `npm install -g grunt-cli``
+ - Inside the core folder (under webroot, i.e. core/src/core/ from root of git repository), run `composer install`
+ - For each plugin that contains a composer.json file, run `composer install` as well.
+ - For each plugin tat contains a package.json file, run
+   - `npm install`
+   - `grunt`
+
+On a unix-based machine, this can be achieved by the following command (from the webroot directory):  
+```
+find . -maxdepth 5 -name Gruntfile.js -execdir bash -c "npm install && grunt" \;  
+find . -maxdepth 5 -name composer.json -execdir composer install \;
+```
+
+You should be good to go. When modifying JS files that require transpilation, there is generally a `grunt watch` task available to automatically run grunt on each file change.
+
+
 #### Coding guidelines
 
 To enforce some coding standards, please run scripts in
 
@@ -1,7 +1,14 @@
+/plugins/access.ajxp_user/build
+/plugins/core.mq/vendor
+/plugins/action.scheduler/vendor
+/plugins/access.s3/aws-v3.phar
+/plugins/access.s3/aws.phar
+/plugins/index.elasticsearch/vendor
 /plugins/access.ajxp_home/res/build
 /plugins/access.inbox/res/build
 /plugins/core.mailer/js/build
 /plugins/gui.ajax/res/js/ui/reactjs/build/
+/plugins/core.tasks/vendor
 .idea/
 data/cache/*
 data/files/*
@@ -15,4 +22,5 @@ node_modules/
 .jshintignore
 .jshintrc
 /plugins/gui.ajax/res/mui/mui-sources
-.validate.json
+.validate.json
+composer.lock
@@ -8,14 +8,6 @@ RewriteEngine on
 RewriteBase /
 RewriteCond %{REQUEST_FILENAME} !-f
 RewriteCond %{REQUEST_FILENAME} !-d
-RewriteRule ^shares ./dav.php [L]
-RewriteRule ^api ./rest.php [L]
-RewriteRule ^ocs/ ./opencollab.php [L]
-RewriteRule ^ocs-provider/ ./opencollab.php [L]
-RewriteRule ^user ./index.php?get_action=user_access_point [L]
-RewriteCond %{REQUEST_URI} !^/index
-RewriteCond %{REQUEST_URI} !^/plugins
-RewriteCond %{REQUEST_URI} ^/dashboard|^/settings|^/welcome|^/ws-
 RewriteRule (.*) index.php [L]
 
 #Following lines seem to be necessary if PHP is working
@@ -29,8 +21,8 @@ RewriteRule (.*) index.php [L]
 # to make sure that authorization is transmitted.
 # Just remove the # at the beginning of the line
 
-#SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1
+SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1
 
 </IfModule>
 
-AddType application/json .json
+AddType application/json .json
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  *
  * This is the main configuration file for configuring the core of the application.
  * In a standard usage, you should not have to change any variables.
 
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
  * This file is part of Pydio.
  *
  * Pydio is free software: you can redistribute it and/or modify
@@ -16,235 +16,28 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  *
  * Description : Command line access of the framework.
  */
 if (php_sapi_name() !== "cli") {
     die("This is the command line version of the framework, you are not allowed to access this page");
 }
+include_once ("base.conf.php");
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\Services\AuthService;
+use Symfony\Component\Console\Application;
+use Pydio\Core\Http\Cli\Command;
 
-include_once("base.conf.php");
-
-header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
-header("Cache-Control: no-cache, must-revalidate");
-header("Pragma: no-cache");
-//set_error_handler(array("AJXP_XMLWriter", "catchError"), E_ALL & ~E_NOTICE );
-//set_exception_handler(array("AJXP_XMLWriter", "catchException"));
+ConfService::$useSession = false;
+AuthService::$useSession = false;
 
 ConfService::init();
 ConfService::start();
 
-$confStorageDriver = ConfService::getConfStorageImpl();
-require_once($confStorageDriver->getUserClassFileName());
-//session_name("AjaXplorer");
-//session_start();
-
-
-$optArgs = array();
-$options = array();
-$regex = '/^-(-?)([a-zA-z0-9_]*)=(.*)/';
-foreach ($argv as $key => $argument) {
-    //echo("$key => $argument \n");
-    if (preg_match($regex, $argument, $matches)) {
-        if ($matches[1] == "-") {
-            $optArgs[trim($matches[2])] = SystemTextEncoding::toUTF8(trim($matches[3]));
-        } else {
-            $options[trim($matches[2])] = SystemTextEncoding::toUTF8(trim($matches[3]));
-        }
-    }
-}
-
-$optUser = $options["u"];
-if (!empty($optUser)) {
-
-    if (isSet($options["p"])) {
-        $optPass = $options["p"];
-    } else {
-        // Consider "u" is a crypted version of u:p
-        $optToken = $options["t"];
-        $cKey = ConfService::getCoreConf("AJXP_CLI_SECRET_KEY", "conf");
-        if(empty($cKey)) $cKey = "\1CDAFx¨op#";
-        $optUser = trim(mcrypt_decrypt(MCRYPT_RIJNDAEL_256, md5($optToken.$cKey), base64_decode($optUser), MCRYPT_MODE_ECB), "\0");
-        $env = getenv("AJXP_SAFE_CREDENTIALS");
-        if(!empty($env)){
-            $array = AJXP_Safe::getCredentialsFromEncodedString($env);
-            if(isSet($array["user"]) && $array["user"] == $optUser){
-                unset($optToken);
-                $optPass = $array["password"];
-            }
-        }
-    }
-    if (strpos($optUser,",") !== false) {
-        $originalOptUser = $optUser;
-        $nextUsers = explode(",", $optUser);
-        $optUser = array_shift($nextUsers);
-        $nextUsers = implode(",",$nextUsers);
-    } else if (strpos($optUser, "queue:") === 0) {
-        $optUserQueue = substr($optUser, strlen("queue:"));
-        $optUser = false;
-        //echo("QUEUE : ".$optUserQueue);
-        if (is_file($optUserQueue)) {
-            $lines = file($optUserQueue);
-            if (count($lines) && !empty($lines[0])) {
-                $allUsers = explode(",", $lines[0]);
-                $optUser = array_shift($allUsers);
-                file_put_contents($optUserQueue, implode(",", $allUsers));
-            }
-        }
-        if ($optUser === false) {
-            if (is_file($optUserQueue)) {
-                unlink($optUserQueue);
-            }
-            die("No more users inside queue");
-        }
-    }
-}
 
-
-$optStatusFile = $options["s"] OR false;
-$optAction = $options["a"];
-$optRepoId = $options["r"] OR false;
-if (strpos($optRepoId,",") !== false) {
-    $nextRepositories = explode(",", $optRepoId);
-    $optRepoId = array_shift($nextRepositories);
-    $nextRepositories = implode(",", $nextRepositories);
-}
-
-//echo("REPOSITORY : ".$optRepoId." USER : ".$optUser."\n");
-
-$optDetectUser = $options["detect_user"] OR false;
-$detectedUser = false;
-
-if ($optRepoId !== false) {
-    $repository = ConfService::getRepositoryById($optRepoId);
-    if ($repository == null) {
-        $repository = ConfService::getRepositoryByAlias($optRepoId);
-        if ($repository != null) {
-            $optRepoId =($repository->isWriteable()?$repository->getUniqueId():$repository->getId());
-        }
-    }
-    if ($optDetectUser != false) {
-        $path = $repository->getOption("PATH", true);
-        if (strpos($path, "AJXP_USER") !== false) {
-            $path = str_replace(
-                array("AJXP_INSTALL_PATH", "AJXP_DATA_PATH", "/"),
-                array(AJXP_INSTALL_PATH, AJXP_DATA_PATH, DIRECTORY_SEPARATOR),
-                $path
-            );
-            $parts = explode("AJXP_USER", $path);
-            if(count($parts) == 1) $parts[1] = "";
-            $first = str_replace("\\", "\\\\", $parts[0]);
-            $last = str_replace("\\", "\\\\", $parts[1]);
-            if (preg_match("/$first(.*)$last.*/", $optDetectUser, $matches)) {
-                $detectedUser = $matches[1];
-            }
-        }
-    }
-    try{
-        ConfService::switchRootDir($optRepoId, true);
-    }catch(AJXP_Exception $e){}
-} else {
-    if ($optStatusFile) {
-        file_put_contents($optStatusFile, "ERROR:You must pass a -r argument specifying either a repository id or alias");
-    }
-    die("You must pass a -r argument specifying either a repository id or alias");
-}
-
-if (AuthService::usersEnabled() && !empty($optUser)) {
-    $seed = AuthService::generateSeed();
-    if ($seed != -1) {
-        $optPass = md5(md5($optPass).$seed);
-    }
-    $loggingResult = AuthService::logUser($optUser, $optPass, isSet($optToken), false, $seed);
-    // Check that current user can access current repository, try to switch otherwise.
-    $loggedUser = AuthService::getLoggedUser();
-    if ($loggedUser != null && $detectedUser !== false && $loggedUser->isAdmin()) {
-        AuthService::disconnect();
-        AuthService::logUser($detectedUser, "empty", true, false, "");
-        $loggedUser = AuthService::getLoggedUser();
-    }
-
-    if ($loggedUser != null) {
-        ConfService::switchRootDir($optRepoId, true);
-        /*
-        $res = ConfService::switchUserToActiveRepository($loggedUser, $optRepoId);
-        if (!$res) {
-            AuthService::disconnect();
-            $requireAuth = true;
-        }
-        */
-    }
-    if (isset($loggingResult) && $loggingResult != 1) {
-        AJXP_XMLWriter::header();
-        AJXP_XMLWriter::loggingResult($loggingResult, false, false, "");
-        AJXP_XMLWriter::close();
-        if ($optStatusFile) {
-            file_put_contents($optStatusFile, "ERROR:No user logged");
-        }
-    }
-} else {
-    AJXP_Logger::debug(ConfService::getCurrentRepositoryId());
-}
-
-//Set language
-$loggedUser = AuthService::getLoggedUser();
-if($loggedUser != null && $loggedUser->getPref("lang") != "") ConfService::setLanguage($loggedUser->getPref("lang"));
-else if(isSet($_COOKIE["AJXP_lang"])) ConfService::setLanguage($_COOKIE["AJXP_lang"]);
-$mess = ConfService::getMessages();
-
-// THIS FIRST DRIVERS DO NOT NEED ID CHECK
-//$ajxpDriver = AJXP_PluginsService::findPlugin("gui", "ajax");
-$authDriver = ConfService::getAuthDriverImpl();
-// DRIVERS BELOW NEED IDENTIFICATION CHECK
-if (!AuthService::usersEnabled() || ConfService::getCoreConf("ALLOW_GUEST_BROWSING", "auth") || AuthService::getLoggedUser()!=null) {
-    $confDriver = ConfService::getConfStorageImpl();
-    $loadRepo = ConfService::getRepository();
-    $Driver = ConfService::loadDriverForRepository($loadRepo);
-}
-AJXP_PluginsService::getInstance()->initActivePlugins();
-require_once(AJXP_BIN_FOLDER."/class.AJXP_Controller.php");
-$xmlResult = AJXP_Controller::findActionAndApply($optAction, $optArgs, array());
-if ($xmlResult !== false && $xmlResult != "") {
-    AJXP_XMLWriter::header();
-    print($xmlResult);
-    AJXP_XMLWriter::close();
-} else if (isset($requireAuth) && AJXP_Controller::$lastActionNeedsAuth) {
-    AJXP_XMLWriter::header();
-    AJXP_XMLWriter::requireAuth();
-    AJXP_XMLWriter::close();
-}
-//echo("NEXT REPO ".$nextRepositories." (".$options["r"].")\n");
-//echo("NEXT USERS ".$nextUsers." ( ".$originalOptUser." )\n");
-if (!empty($nextUsers) || !empty($nextRepositories) || !empty($optUserQueue) ) {
-
-    if (!empty($nextUsers)) {
-        sleep(1);
-        $process = AJXP_Controller::applyActionInBackground($options["r"], $optAction, $optArgs, $nextUsers, $optStatusFile);
-        if ($process != null && is_a($process, "UnixProcess") && isSet($optStatusFile)) {
-            file_put_contents($optStatusFile, "RUNNING:".$process->getPid());
-        }
-    }
-    if (!empty($optUserQueue)) {
-        sleep(1);
-        //echo("Should go to next with $optUserQueue");
-        $process = AJXP_Controller::applyActionInBackground($options["r"], $optAction, $optArgs, "queue:".$optUserQueue, $optStatusFile);
-        if ($process != null && is_a($process, "UnixProcess") && isSet($optStatusFile)) {
-            file_put_contents($optStatusFile, "RUNNING:".$process->getPid());
-        }
-    }
-    if (!empty($nextRepositories)) {
-        sleep(1);
-        $process = AJXP_Controller::applyActionInBackground($nextRepositories, $optAction, $optArgs, $originalOptUser, $optStatusFile);
-        if ($process != null && is_a($process, "UnixProcess") && isSet($optStatusFile)) {
-            file_put_contents($optStatusFile, "RUNNING:".$process->getPid());
-        }
-    }
-
-} else if (isSet($optStatusFile)) {
-
-    $status = explode(":", file_get_contents($optStatusFile));
-    file_put_contents($optStatusFile, "FINISHED".(in_array("QUEUED", $status)?":QUEUED":""));
-
-}
+$input = new \Pydio\Core\Http\Cli\FreeArgvOptions();
+$application = new Application();
+$application->add(new Command());
+$application->setDefaultCommand("pydio");
+$application->run($input);
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  *
  * These configuration must be set at the very root loading of the framework
  */
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`* You should have received a copy of the GNU Affero General Public License`
`17`	`17`	`* along with Pydio. If not, see <http://www.gnu.org/licenses/>.`
`18`	`18`	`*`
`19`		`- * The latest code can be found at <http://pyd.io/>.`
	`19`	`+ * The latest code can be found at <https://pydio.com>.`
`20`	`20`	`*`
`21`	`21`	`* This is the main configuration file for configuring the core of the application.`
`22`	`22`	`* In a standard usage, you should not have to change any variables.`