// Fix controllers file names + add missing files in override/ + ControllerFactory class is now deprecated, use Controller instead + fix NoticationCore

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8621 b9a71923-0436-4b27-9f14-aed3839534dd

404.php

@@ -39,4 +39,4 @@ elseif (in_array(substr($_SERVER['REQUEST_URI'], -3), array('.js', 'css')))
 	die('');
 
 require_once(dirname(__FILE__).'/config/config.inc.php');
-ControllerFactory::getController('PageNotFoundController')->run();
+Controller::getController('PageNotFoundController')->run();

admin-dev/get-file-admin.php

@@ -27,4 +27,4 @@
 
 define('PS_ADMIN_DIR', getcwd());
 require(dirname(dirname(__FILE__)).'/config/config.inc.php');
-ControllerFactory::getController('getFileController')->run();
+Controller::getController('getFileController')->run();

cache/class_index.php

@@ -54,6 +54,8 @@
   'Contact' => 'override/classes/Contact.php',
   'ContextCore' => 'classes/Context.php',
   'Context' => 'override/classes/Context.php',
+  'ControllerCore' => 'classes/Controller.php',
+  'Controller' => 'override/classes/Controller.php',
   'ControllerFactoryCore' => 'classes/ControllerFactory.php',
   'ControllerFactory' => 'override/classes/ControllerFactory.php',
   'CookieCore' => 'classes/Cookie.php',
@@ -93,13 +95,13 @@
   'FileLoggerCore' => 'classes/FileLogger.php',
   'FileLogger' => 'override/classes/FileLogger.php',
   'FileUploaderCore' => 'classes/FileUploader.php',
-  'FileUploader' => '',
+  'FileUploader' => 'override/classes/FileUploader.php',
   'FrontControllerCore' => 'classes/FrontController.php',
   'FrontController' => 'override/classes/FrontController.php',
   'GenderCore' => 'classes/Gender.php',
   'Gender' => 'override/classes/Gender.php',
   'GroupCore' => 'classes/Group.php',
-  'Group' => '',
+  'Group' => 'override/classes/Group.php',
   'GroupReductionCore' => 'classes/GroupReduction.php',
   'GroupReduction' => 'override/classes/GroupReduction.php',
   'GuestCore' => 'classes/Guest.php',
@@ -146,7 +148,8 @@
   'ModuleGridEngine' => 'override/classes/ModuleGridEngine.php',
   'MySQLCore' => 'classes/MySQL.php',
   'MySQL' => 'override/classes/MySQL.php',
-  'Notification' => 'classes/Notification.php',
+  'NotificationCore' => 'classes/Notification.php',
+  'Notification' => 'override/classes/Notification.php',
   'ObjectModelCore' => 'classes/ObjectModel.php',
   'ObjectModel' => 'override/classes/ObjectModel.php',
   'OrderCore' => 'classes/Order.php',
@@ -271,4 +274,84 @@
   'TaxRulesTaxManagerCore' => 'classes/tax/TaxRulesTaxManager.php',
   'TaxRulesTaxManager' => 'override/classes/tax/TaxRulesTaxManager.php',
   'FB' => 'override/classes/fb.php',
+  'AddressControllerCore' => 'controllers/AddressController.php',
+  'AddressController' => 'override/controllers/AddressController.php',
+  'AddressesControllerCore' => 'controllers/AddressesController.php',
+  'AddressesController' => 'override/controllers/AddressesController.php',
+  'AttachmentControllerCore' => 'controllers/AttachmentController.php',
+  'AttachmentController' => 'override/controllers/AttachmentController.php',
+  'AuthControllerCore' => 'controllers/AuthController.php',
+  'AuthController' => 'override/controllers/AuthController.php',
+  'BestSalesControllerCore' => 'controllers/BestSalesController.php',
+  'BestSalesController' => 'override/controllers/BestSalesController.php',
+  'CartControllerCore' => 'controllers/CartController.php',
+  'CartController' => 'override/controllers/CartController.php',
+  'CategoryControllerCore' => 'controllers/CategoryController.php',
+  'CategoryController' => 'override/controllers/CategoryController.php',
+  'ChangeCurrencyControllerCore' => 'controllers/ChangeCurrencyController.php',
+  'ChangeCurrencyController' => 'override/controllers/ChangeCurrencyController.php',
+  'CmsControllerCore' => 'controllers/CmsController.php',
+  'CmsController' => 'override/controllers/CmsController.php',
+  'CompareControllerCore' => 'controllers/CompareController.php',
+  'CompareController' => 'override/controllers/CompareController.php',
+  'ContactControllerCore' => 'controllers/ContactController.php',
+  'ContactController' => 'override/controllers/ContactController.php',
+  'DiscountControllerCore' => 'controllers/DiscountController.php',
+  'DiscountController' => 'override/controllers/DiscountController.php',
+  'GetFileControllerCore' => 'controllers/GetFileController.php',
+  'GetFileController' => 'override/controllers/GetFileController.php',
+  'GuestTrackingControllerCore' => 'controllers/GuestTrackingController.php',
+  'GuestTrackingController' => 'override/controllers/GuestTrackingController.php',
+  'HistoryControllerCore' => 'controllers/HistoryController.php',
+  'HistoryController' => 'override/controllers/HistoryController.php',
+  'IdentityControllerCore' => 'controllers/IdentityController.php',
+  'IdentityController' => 'override/controllers/IdentityController.php',
+  'IndexControllerCore' => 'controllers/IndexController.php',
+  'IndexController' => 'override/controllers/IndexController.php',
+  'ManufacturerControllerCore' => 'controllers/ManufacturerController.php',
+  'ManufacturerController' => 'override/controllers/ManufacturerController.php',
+  'MyAccountControllerCore' => 'controllers/MyAccountController.php',
+  'MyAccountController' => 'override/controllers/MyAccountController.php',
+  'NewProductsControllerCore' => 'controllers/NewProductsController.php',
+  'NewProductsController' => 'override/controllers/NewProductsController.php',
+  'OrderConfirmationControllerCore' => 'controllers/OrderConfirmationController.php',
+  'OrderConfirmationController' => 'override/controllers/OrderConfirmationController.php',
+  'OrderControllerCore' => 'controllers/OrderController.php',
+  'OrderController' => 'override/controllers/OrderController.php',
+  'OrderDetailControllerCore' => 'controllers/OrderDetailController.php',
+  'OrderDetailController' => 'override/controllers/OrderDetailController.php',
+  'OrderFollowControllerCore' => 'controllers/OrderFollowController.php',
+  'OrderFollowController' => 'override/controllers/OrderFollowController.php',
+  'OrderOpcControllerCore' => 'controllers/OrderOpcController.php',
+  'OrderOpcController' => 'override/controllers/OrderOpcController.php',
+  'OrderReturnControllerCore' => 'controllers/OrderReturnController.php',
+  'OrderReturnController' => 'override/controllers/OrderReturnController.php',
+  'OrderSlipControllerCore' => 'controllers/OrderSlipController.php',
+  'OrderSlipController' => 'override/controllers/OrderSlipController.php',
+  'PageNotFoundControllerCore' => 'controllers/PageNotFoundController.php',
+  'PageNotFoundController' => 'override/controllers/PageNotFoundController.php',
+  'ParentOrderControllerCore' => 'controllers/ParentOrderController.php',
+  'ParentOrderController' => 'override/controllers/ParentOrderController.php',
+  'PasswordControllerCore' => 'controllers/PasswordController.php',
+  'PasswordController' => 'override/controllers/PasswordController.php',
+  'PdfInvoiceControllerCore' => 'controllers/PdfInvoiceController.php',
+  'PdfInvoiceController' => 'override/controllers/PdfInvoiceController.php',
+  'PdfOrderReturnControllerCore' => 'controllers/PdfOrderReturnController.php',
+  'PdfOrderReturnController' => 'override/controllers/pdfOrderReturnController.php',
+  'PdfOrderSlipControllerCore' => 'controllers/PdfOrderSlipController.php',
+  'PdfOrderSlipController' => 'override/controllers/pdfOrderSlipController.php',
+  'PricesDropControllerCore' => 'controllers/PricesDropController.php',
+  'PricesDropController' => 'override/controllers/PricesDropController.php',
+  'ProductControllerCore' => 'controllers/ProductController.php',
+  'ProductController' => 'override/controllers/ProductController.php',
+  'SearchControllerCore' => 'controllers/SearchController.php',
+  'SearchController' => 'override/controllers/SearchController.php',
+  'SitemapControllerCore' => 'controllers/SitemapController.php',
+  'SitemapController' => 'override/controllers/SitemapController.php',
+  'StatisticsControllerCore' => 'controllers/StatisticsController.php',
+  'StatisticsController' => 'override/controllers/StatisticsController.php',
+  'StoresControllerCore' => 'controllers/StoresController.php',
+  'StoresController' => 'override/controllers/StoresController.php',
+  'SupplierControllerCore' => 'controllers/SupplierController.php',
+  'SupplierController' => 'override/controllers/SupplierController.php',
 );

classes/Autoload.php

@@ -122,8 +122,10 @@ class Autoload
 	public function generateIndex()
 	{
 		$classes = array_merge(
-							$this->getClassesFromDir('classes/', true),
+							$this->getClassesFromDir('classes/'),
-							$this->getClassesFromDir('override/classes/', false)
+							$this->getClassesFromDir('override/classes/'),
+							$this->getClassesFromDir('controllers/'),
+							$this->getClassesFromDir('override/controllers/')
 						);
 		$content = '<?php return '.var_export($classes, true).';';
 

classes/ControllerFactory.php

@@ -25,10 +25,18 @@
 *  International Registered Trademark & Property of PrestaShop SA
 */
 
+/**
+ * @deprecated since 1.5.0
+ */
 class ControllerFactoryCore
 {
+	/**
+	 * @deprecated since 1.5.0
+	 */
 	public static function includeController($className)
 	{
+		Tools::displayAsDeprecated();
+
 		if (!class_exists($className, false))
 		{
 			require_once(dirname(__FILE__).'/../controllers/'.$className.'.php');
@@ -45,6 +53,9 @@ class ControllerFactoryCore
 		}
 	}
 
+	/**
+	 * @deprecated since 1.5.0
+	 */
 	public static function getController($className, $auth = false, $ssl = false)
 	{
 		ControllerFactory::includeController($className);

classes/Dispatcher.php

@@ -193,7 +193,7 @@ class DispatcherCore
 			$this->controller = 'index';
 		if (!isset($controllers[$this->controller]))
 			$this->controller = 'pagenotfound';
-		ControllerFactory::getController($controllers[$this->controller])->run();
+		Controller::getController($controllers[$this->controller])->run();
 	}
 
 	/**

classes/FrontController.php

@@ -25,7 +25,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 */
 
-class FrontControllerCore
+class FrontControllerCore extends ControllerCore
 {
 	public $errors = array();
 	/**

classes/Notification.php

@@ -25,7 +25,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 */
 
-class Notification
+class NotificationCore
 {
 	public $types;
 

controllers/CmsController.php

@@ -20,7 +20,7 @@
 *
 *  @author PrestaShop SA <contact@prestashop.com>
 *  @copyright  2007-2011 PrestaShop SA
-*  @version  Release: $Revision: 7331 $
+*  @version  Release: $Revision$
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 */

controllers/GetFileController.php

@@ -25,7 +25,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 */
 
-class getFileControllerCore extends FrontController
+class GetFileControllerCore extends FrontController
 {
 	public function run()
 	{

controllers/OrderController.php

@@ -25,8 +25,6 @@
 *  International Registered Trademark & Property of PrestaShop SA
 */
 
-ControllerFactory::includeController('ParentOrderController');
-
 class OrderControllerCore extends ParentOrderController
 {
 	public $step;

controllers/OrderOpcController.php

@@ -25,8 +25,6 @@
 *  International Registered Trademark & Property of PrestaShop SA
 */
 
-ControllerFactory::includeController('ParentOrderController');
-
 class OrderOpcControllerCore extends ParentOrderController
 {
 	public $php_self = 'order-opc';

controllers/PdfOrderReturnController.php

@@ -20,7 +20,7 @@
 *
 *  @author PrestaShop SA <contact@prestashop.com>
 *  @copyright  2007-2011 PrestaShop SA
-*  @version  Release: $Revision: 7104 $
+*  @version  Release: $Revision$
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 */

controllers/PdfOrderSlipController.php

@@ -20,7 +20,7 @@
 *
 *  @author PrestaShop SA <contact@prestashop.com>
 *  @copyright  2007-2011 PrestaShop SA
-*  @version  Release: $Revision: 7104 $
+*  @version  Release: $Revision$
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 */

override/classes/Controller.php

@@ -0,0 +1,7 @@
+<?php
+
+abstract class Controller extends ControllerCore
+{
+
+}
+

override/classes/FileUploader.php

@@ -0,0 +1,7 @@
+<?php
+
+class FileUploader extends FileUploaderCore
+{
+
+}
+

override/classes/Group.php

@@ -0,0 +1,7 @@
+<?php
+
+class Group extends GroupCore
+{
+
+}
+

override/classes/Notification.php

@@ -0,0 +1,7 @@
+<?php
+
+class Notification extends NotificationCore
+{
+
+}
+

override/controllers/CMSController.php

@@ -1,7 +0,0 @@
-<?php
-
-class CMSController extends CMSControllerCore
-{
-
-}
-

override/controllers/CmsController.php

@@ -0,0 +1,7 @@
+<?php
+
+class CmsController extends CmsControllerCore
+{
+
+}
+

override/controllers/pdfOrderReturnController.php

@@ -1,6 +1,6 @@
 <?php
 
-class pdfOrderReturnController extends pdfOrderReturnControllerCore
+class PdfOrderReturnController extends PdfOrderReturnControllerCore
 {
 
 }

override/controllers/pdfOrderSlipController.php

@@ -1,6 +1,6 @@
 <?php
 
-class pdfOrderSlipController extends pdfOrderSlipControllerCore
+class PdfOrderSlipController extends PdfOrderSlipControllerCore
 {
 
 }