pimcore · tomFlidr · Mar 3, 2012 · Mar 3, 2012 · Mar 3, 2012 · Mar 3, 2012
diff --git a/.htaccess b/.htaccess
@@ -1,3 +1,9 @@
+
+# mime types
+AddType video/mp4 .mp4
+AddType video/webm .webm
+
+# rewrites
 RewriteEngine On
 
 # ASSETS: check if request method is GET (because of WebDAV) and if the requested file (asset) exists on the filesystem, if both match, deliver the asset directly 
@@ -19,6 +25,7 @@ RewriteRule ^plugins/.*$ / [F,L]
 RewriteRule ^pimcore/.*$ / [F,L]
 
 # basic zend-framework setup see: http://framework.zend.com/manual/en/zend.controller.html
+RewriteCond %{REQUEST_FILENAME} -d [OR]
 RewriteCond %{REQUEST_FILENAME} -s [OR]
 RewriteCond %{REQUEST_FILENAME} -l [OR]
 RewriteCond %{REQUEST_FILENAME} -f

diff --git a/README.txt b/README.txt
@@ -24,4 +24,4 @@ Issue-Tracker:
 http://www.pimcore.org/issues/
 
 Community:
-http://www.pimcore.org/forum/
+http://www.pimcore.org/board/
diff --git a/index.php b/index.php
@@ -7,12 +7,11 @@
  * This source file is subject to the new BSD license that is bundled
  * with this package in the file LICENSE.txt.
  * It is also available through the world-wide-web at this URL:
- * http://www.pimcore.org/license dsf sdaf asdf asdf
+ * http://www.pimcore.org/license
  *
  * @copyright  Copyright (c) 2009-2010 elements.at New Media Solutions GmbH (http://www.elements.at)
  * @license    http://www.pimcore.org/license     New BSD License
  */
-
 include_once("pimcore/config/startup.php");
 
 try {

diff --git a/pimcore/cli/maintenance.php b/pimcore/cli/maintenance.php
@@ -18,8 +18,9 @@
 
 try {
     $opts = new Zend_Console_Getopt(array(
-        'job|j=s' => 'call just a specific job(s), use "," (comma) to execute more than one job (valid options: scheduledtasks, youtubepreview, logmaintenance, sanitycheck, cleanupoldpidfiles, versioncleanup, and plugin classes if you want to call a plugin maintenance)',
+        'job|j=s' => 'call just a specific job(s), use "," (comma) to execute more than one job (valid options: scheduledtasks, logmaintenance, sanitycheck, cleanupoldpidfiles, versioncleanup, redirectcleanup, cleanupbrokenviews, and plugin classes if you want to call a plugin maintenance)',
         'manager|m=s' => 'force a specific manager (valid options: procedural, daemon)',
+        'ignore-maintenance-mode' => 'forces the script execution even when the maintenance mode is activated',
         'verbose|v' => 'show detailed information during the maintenance (for debug, ...)',
         'help|h' => 'display this help'
     ));
@@ -74,11 +75,13 @@
 
 // register scheduled tasks
 $manager->registerJob(new Schedule_Maintenance_Job("scheduledtasks", new Schedule_Task_Executor(), "execute"));
-$manager->registerJob(new Schedule_Maintenance_Job("youtubepreview", new Asset_Video_Youtube(), "maintenanceupload"));
-$manager->registerJob(new Schedule_Maintenance_Job("logmaintenance", new Pimcore_Log_Maintenance(), "execute"));
-$manager->registerJob(new Schedule_Maintenance_Job("sanitycheck", "Element_Service", "runSanityCheck",array(false)));
+$manager->registerJob(new Schedule_Maintenance_Job("logmaintenance", new Pimcore_Log_Maintenance(), "mail"));
+$manager->registerJob(new Schedule_Maintenance_Job("httperrorlog", new Pimcore_Log_Maintenance(), "httpErrorLogCleanup"));
+$manager->registerJob(new Schedule_Maintenance_Job("sanitycheck", "Element_Service", "runSanityCheck"));
 $manager->registerJob(new Schedule_Maintenance_Job("cleanupoldpidfiles", "Schedule_Manager_Factory", "cleanupOldPidFiles"), true);
 $manager->registerJob(new Schedule_Maintenance_Job("versioncleanup", new Version(), "maintenanceCleanUp"));
+$manager->registerJob(new Schedule_Maintenance_Job("redirectcleanup", "Redirect", "maintenanceCleanUp"));
+$manager->registerJob(new Schedule_Maintenance_Job("cleanupbrokenviews", "Pimcore_Resource", "cleanupBrokenViews"));
 
 // call plugins
 $plugins = Pimcore_API_Plugin_Broker::getInstance()->getPlugins();
@@ -100,6 +103,6 @@
 
 }
 
+
 $manager->run();
 
-?>
diff --git a/pimcore/cli/mysql-tools.php b/pimcore/cli/mysql-tools.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ * Pimcore
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://www.pimcore.org/license
+ *
+ * @copyright  Copyright (c) 2009-2010 elements.at New Media Solutions GmbH (http://www.elements.at)
+ * @license    http://www.pimcore.org/license     New BSD License
+ */
+
+include_once("startup.php");
+
+try {
+    $opts = new Zend_Console_Getopt(array(
+        'verbose|v' => 'show detailed information (for debug, ...)',
+        'help|h' => 'display this help',
+        "mode|m=s" => "optimize,warmup"
+    ));
+} catch (Exception $e) {
+    echo $e->getMessage();
+}
+
+try {
+    $opts->parse();
+} catch (Zend_Console_Getopt_Exception $e) {
+    echo $e->getMessage();
+}
+
+
+// display help message
+if($opts->getOption("help")) {
+    echo $opts->getUsageMessage();
+    exit;
+}
+
+// display error message
+if(!$opts->getOption("mode")) {
+    echo "Please specify the mode! See: \n";
+    echo $opts->getUsageMessage();
+    exit;
+}
+
+
+if($opts->getOption("verbose")) {
+    $writer = new Zend_Log_Writer_Stream('php://output');
+    $logger = new Zend_Log($writer);
+    Logger::addLogger($logger);
+
+    // set all priorities
+    Logger::setPriorities(array(
+        Zend_Log::DEBUG,
+        Zend_Log::INFO,
+        Zend_Log::NOTICE,
+        Zend_Log::WARN,
+        Zend_Log::ERR,
+        Zend_Log::CRIT,
+        Zend_Log::ALERT,
+        Zend_Log::EMERG
+    ));
+}
+
+$db = Pimcore_Resource::get();
+
+if($opts->getOption("mode") == "optimize") {
+    $tables = $db->fetchAll("SHOW TABLES");
+
+    foreach ($tables as $table) {
+        $t = current($table);
+        try {
+            Logger::debug("Running: OPTIMIZE TABLE " . $t);
+            $db->query("OPTIMIZE TABLE " . $t);
+        } catch (Exception $e) {
+            Logger::error($e);
+        }
+    }
+} else if ($opts->getOption("mode") == "warmup") {
+    $tables = $db->fetchAll("SHOW TABLES");
+
+    foreach ($tables as $table) {
+        $t = current($table);
+        try {
+            Logger::debug("Running: SELECT COUNT(*) FROM $t");
+            $res = $db->fetchOne("SELECT COUNT(*) FROM $t");
+            Logger::debug("Result: " . $res);
+        } catch (Exception $e) {
+            Logger::error($e);
+        }
+    }
+}
diff --git a/pimcore/cli/search-backend-reindex.php b/pimcore/cli/search-backend-reindex.php
@@ -0,0 +1,56 @@
+<?php 
+/**
+ * Pimcore
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://www.pimcore.org/license
+ *
+ * @copyright  Copyright (c) 2009-2010 elements.at New Media Solutions GmbH (http://www.elements.at)
+ * @license    http://www.pimcore.org/license     New BSD License
+ */
+
+include_once("startup.php");
+
+// clear all data
+$db = Pimcore_Resource::get();
+$db->query("TRUNCATE `search_backend_data`;");
+
+$elementsPerLoop = 100;
+$types = array("asset","document","object");
+
+foreach ($types as $type) {
+    $listClassName = ucfirst($type) . "_List";
+    $list = new $listClassName();
+    $elementsTotal = $list->getTotalCount();
+
+    for($i=0; $i<(ceil($elementsTotal/$elementsPerLoop)); $i++) {
+        $list->setLimit($elementsPerLoop);
+        $list->setOffset($i*$elementsPerLoop);
+
+        echo "Processing " .$type . ": " . ($list->getOffset()+$elementsPerLoop) . "/" . $elementsTotal . "\n";
+
+        $elements = $list->load();
+        foreach ($elements as $element) {
+            try {
+                $searchEntry = Search_Backend_Data::getForElement($element);
+                if($searchEntry instanceof Search_Backend_Data and $searchEntry->getId() instanceof Search_Backend_Data_Id ) {
+                    $searchEntry->setDataFromElement($element);
+                } else {
+                    $searchEntry = new Search_Backend_Data($element);
+                }
+
+                $searchEntry->save();
+            } catch (Exception $e) {
+                Logger::err($e);
+            }
+        }
+        Pimcore::collectGarbage();
+    }
+}
+
+$db->query("OPTIMIZE TABLE search_backend_data;");
+
diff --git a/pimcore/cli/startup.php b/pimcore/cli/startup.php
@@ -19,6 +19,21 @@
 include_once("../config/startup.php");
 chdir($workingDirectory);
 
+
+// CLI Zend_Controller_Front Setup, this is required to make it possible to make use of all rendering features
+// this includes $this->action() in templates, ...
+$front = Zend_Controller_Front::getInstance();
+Pimcore::initControllerFront($front);
+
+$request = new Zend_Controller_Request_Http();
+$request->setModuleName(PIMCORE_FRONTEND_MODULE);
+$request->setControllerName("default");
+$request->setActionName("default");
+$front->setRequest($request);
+$front->setResponse(new Zend_Controller_Response_Cli());
+
+// generic pimcore setup
+Pimcore::setSystemRequirements();
 Pimcore::initAutoloader();
 Pimcore::initConfiguration();
 Pimcore::setupFramework();
@@ -35,6 +50,10 @@
 // Error reporting is enabled in CLI
 @ini_set("display_errors", "On");
 @ini_set("display_startup_errors", "On");
-error_reporting(E_ALL ^ E_NOTICE);
+error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT);
 
-?>
+// skip if maintenance mode is on and the flag is not set
+// we cannot use Zend_Console_Getopt here because it doesn't allow to be called twice (unrecognized parameter, ...)
+if(Pimcore_Tool_Admin::isInMaintenanceMode() && !in_array("--ignore-maintenance-mode", $_SERVER['argv'])) {
+    die("in maintenance mode -> skip\nset the falg --ignore-maintenance-mode to force execution \n");
+}
diff --git a/pimcore/cli/video-converter.php b/pimcore/cli/video-converter.php
@@ -0,0 +1,18 @@
+<?php 
+/**
+ * Pimcore
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://www.pimcore.org/license
+ *
+ * @copyright  Copyright (c) 2009-2010 elements.at New Media Solutions GmbH (http://www.elements.at)
+ * @license    http://www.pimcore.org/license     New BSD License
+ */
+
+include_once("startup.php");
+
+Asset_Video_Thumbnail_Processor::execute($argv[1]);
diff --git a/pimcore/config/startup.php b/pimcore/config/startup.php
@@ -13,13 +13,14 @@
  * @license    http://www.pimcore.org/license     New BSD License
  */
 
-error_reporting(E_ALL ^ E_NOTICE);
+error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT);
 
 // configure some constants needed by pimcore
 $pimcoreDocumentRoot = realpath(dirname(__FILE__) . '/../..'); 
 
 if (!defined("PIMCORE_DOCUMENT_ROOT"))  define("PIMCORE_DOCUMENT_ROOT", $pimcoreDocumentRoot);
-if (!defined("PIMCORE_FRONTEND_MODULE"))  define("PIMCORE_FRONTEND_MODULE", "website"); // frontend module, this is the module containing your website, please be sure that the module folder is in PIMCORE_DOCUMENT_ROOT and is named identically with this name
+// frontend module, this is the module containing your website, please be sure that the module folder is in PIMCORE_DOCUMENT_ROOT and is named identically with this name
+if (!defined("PIMCORE_FRONTEND_MODULE"))  define("PIMCORE_FRONTEND_MODULE", "website");
 if (!defined("PIMCORE_PATH"))  define("PIMCORE_PATH", PIMCORE_DOCUMENT_ROOT . "/pimcore");
 if (!defined("PIMCORE_PLUGINS_PATH"))  define("PIMCORE_PLUGINS_PATH", PIMCORE_DOCUMENT_ROOT . "/plugins");
 
@@ -31,25 +32,28 @@
 if (!defined("PIMCORE_ASSET_DIRECTORY"))  define("PIMCORE_ASSET_DIRECTORY", PIMCORE_WEBSITE_PATH . "/var/assets");
 if (!defined("PIMCORE_VERSION_DIRECTORY"))  define("PIMCORE_VERSION_DIRECTORY", PIMCORE_WEBSITE_PATH . "/var/versions");
 if (!defined("PIMCORE_WEBDAV_TEMP"))  define("PIMCORE_WEBDAV_TEMP", PIMCORE_WEBSITE_PATH . "/var/webdav");
-if (!defined("PIMCORE_LOG_DEBUG"))  define("PIMCORE_LOG_DEBUG", PIMCORE_WEBSITE_PATH . "/var/log/debug.log");
-if (!defined("PIMCORE_LOG_MAIL_TEMP"))  define("PIMCORE_LOG_MAIL_TEMP", PIMCORE_WEBSITE_PATH . "/var/log/mail");
+if (!defined("PIMCORE_LOG_DIRECTORY"))  define("PIMCORE_LOG_DIRECTORY", PIMCORE_WEBSITE_PATH . "/var/log");
+if (!defined("PIMCORE_LOG_DEBUG"))  define("PIMCORE_LOG_DEBUG", PIMCORE_LOG_DIRECTORY . "/debug.log");
+if (!defined("PIMCORE_LOG_MAIL_TEMP"))  define("PIMCORE_LOG_MAIL_TEMP", PIMCORE_LOG_DIRECTORY . "/mail");
 if (!defined("PIMCORE_TEMPORARY_DIRECTORY"))  define("PIMCORE_TEMPORARY_DIRECTORY", PIMCORE_WEBSITE_PATH . "/var/tmp");
 if (!defined("PIMCORE_CACHE_DIRECTORY"))  define("PIMCORE_CACHE_DIRECTORY", PIMCORE_WEBSITE_PATH . "/var/cache");
 if (!defined("PIMCORE_CLASS_DIRECTORY"))  define("PIMCORE_CLASS_DIRECTORY", PIMCORE_WEBSITE_PATH . "/var/classes");
 if (!defined("PIMCORE_BACKUP_DIRECTORY"))  define("PIMCORE_BACKUP_DIRECTORY", PIMCORE_WEBSITE_PATH . "/var/backup");
 if (!defined("PIMCORE_RECYCLEBIN_DIRECTORY"))  define("PIMCORE_RECYCLEBIN_DIRECTORY", PIMCORE_WEBSITE_PATH . "/var/recyclebin");
 if (!defined("PIMCORE_SYSTEM_TEMP_DIRECTORY"))  define("PIMCORE_SYSTEM_TEMP_DIRECTORY", PIMCORE_WEBSITE_PATH . "/var/system");
+if (!defined("PIMCORE_LOG_MAIL_PERMANENT"))  define("PIMCORE_LOG_MAIL_PERMANENT", PIMCORE_WEBSITE_PATH . "/var/email");
 
-// setup include pathes
+// setup include paths
+// include paths defined in php.ini are ignored because they're causing problems with open_basedir, see PIMCORE-1233
+// it also improves the performance when reducing the amount of include paths, you can of course add additional paths anywhere in your code (/website)
 $includePaths = array(
     PIMCORE_PATH . "/lib",
     PIMCORE_PATH . "/models",
     PIMCORE_WEBSITE_PATH . "/lib",
     PIMCORE_WEBSITE_PATH . "/models",
     PIMCORE_PATH . "/modules/searchadmin/models",
     PIMCORE_CLASS_DIRECTORY,
-    PIMCORE_PATH . "/lib/_deprecated",  // depricated libraries and classes
-    get_include_path()
+    PIMCORE_PATH . "/lib/_deprecated",  // deprecated libraries and classes
 );
 set_include_path(implode(PATH_SEPARATOR, $includePaths));
 
@@ -64,12 +68,14 @@
 
 $autoloader = Zend_Loader_Autoloader::getInstance();
 $autoloader->registerNamespace('Pimcore');
-
-$autoloader->suppressNotFoundWarnings(true);
-
+$autoloader->suppressNotFoundWarnings(false);
 
 // do some general stuff
+$websiteStartup = PIMCORE_CONFIGURATION_DIRECTORY . "/startup.php";
+if(@is_file($websiteStartup)) {
+    include_once($websiteStartup);
+}
 
 // on pimcore shutdown
-register_shutdown_function("Pimcore::shutdown");
+register_shutdown_function("Pimcore::shutdownHandler");