Skip to content

Commit

Permalink
Import Magento Release 1.7.0.0-beta1
Browse files Browse the repository at this point in the history
  • Loading branch information
@LeeSaferite
LeeSaferite committed Mar 23, 2012
1 parent 7aa9a6f commit e56274a
Show file tree
Hide file tree
Showing 6,512 changed files with 38,419 additions and 14,666 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
6 changes: 6 additions & 0 deletions .htaccess
View file
Expand Up @@ -128,6 +128,12 @@

RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]

############################################
## TRACE and TRACK HTTP methods disabled to prevent XSS attacks

RewriteCond %{REQUEST_METHOD} ^TRAC[EK]
RewriteRule .* - [L,R=405]

############################################
## always send 404 on missing files in these folders

Expand Down
292 changes: 292 additions & 0 deletions RELEASE_NOTES.txt
View file

Large diffs are not rendered by default.

77 changes: 72 additions & 5 deletions app/Mage.php
View file
Expand Up @@ -129,6 +129,22 @@ final class Mage
*/
static private $_isInstalled;

/**
* Magento edition constants
*/
const EDITION_COMMUNITY = 'Community';
const EDITION_ENTERPRISE = 'Enterprise';
const EDITION_PROFESSIONAL = 'Professional';
const EDITION_GO = 'Go';

/**
* Current Magento edition.
*
* @var string
* @static
*/
static private $_currentEdition = self::EDITION_COMMUNITY;

/**
* Gets the current Magento version string
* @link http://www.magentocommerce.com/blog/new-community-edition-release-process/
Expand All @@ -155,11 +171,22 @@ public static function getVersionInfo()
'minor' => '7',
'revision' => '0',
'patch' => '0',
'stability' => 'alpha',
'stability' => 'beta',
'number' => '1',
);
}

/**
* Get current Magento edition
*
* @static
* @return string
*/
public static function getEdition()
{
return self::$_currentEdition;
}

/**
* Set all my static data to defaults
*
Expand Down Expand Up @@ -522,7 +549,7 @@ public static function helper($name)
}

/**
* Retreive resource helper object
* Retrieve resource helper object
*
* @param string $moduleName
* @return Mage_Core_Model_Resource_Helper_Abstract
Expand Down Expand Up @@ -580,7 +607,8 @@ public static function app($code = '', $type = 'store', $options = array())
self::$_app = new Mage_Core_Model_App();
self::setRoot();
self::$_events = new Varien_Event_Collection();
self::$_config = new Mage_Core_Model_Config($options);
self::_setIsInstalled($options);
self::_setConfigModel($options);

Varien_Profiler::start('self::app::init');
self::$_app->init($code, $type, $options);
Expand All @@ -602,7 +630,8 @@ public static function init($code = '', $type = 'store', $options = array(), $mo
try {
self::setRoot();
self::$_app = new Mage_Core_Model_App();
self::$_config = new Mage_Core_Model_Config();
self::_setIsInstalled($options);
self::_setConfigModel($options);

if (!empty($modules)) {
self::$_app->initSpecified($code, $type, $options, $modules);
Expand Down Expand Up @@ -633,6 +662,9 @@ public static function run($code = '', $type = 'store', $options = array())
try {
Varien_Profiler::start('mage');
self::setRoot();
if (isset($options['edition'])) {
self::$_currentEdition = $options['edition'];
}
self::$_app = new Mage_Core_Model_App();
if (isset($options['request'])) {
self::$_app->setRequest($options['request']);
Expand All @@ -641,7 +673,8 @@ public static function run($code = '', $type = 'store', $options = array())
self::$_app->setResponse($options['response']);
}
self::$_events = new Varien_Event_Collection();
self::$_config = new Mage_Core_Model_Config($options);
self::_setIsInstalled($options);
self::_setConfigModel($options);
self::$_app->run(array(
'scope_code' => $code,
'scope_type' => $type,
Expand Down Expand Up @@ -672,6 +705,40 @@ public static function run($code = '', $type = 'store', $options = array())
}
}

/**
* Set application isInstalled flag based on given options
*
* @param array $options
*/
protected static function _setIsInstalled($options = array())
{
if (isset($options['is_installed']) && $options['is_installed']) {
self::$_isInstalled = true;
}
}

/**
* Set application Config model
*
* @param array $options
*/
protected static function _setConfigModel($options = array())
{
if (isset($options['config_model']) && class_exists($options['config_model'])) {
$alternativeConfigModelName = $options['config_model'];
unset($options['config_model']);
$alternativeConfigModel = new $alternativeConfigModelName($options);
} else {
$alternativeConfigModel = null;
}

if (!is_null($alternativeConfigModel) && ($alternativeConfigModel instanceof Mage_Core_Model_Config)) {
self::$_config = $alternativeConfigModel;
} else {
self::$_config = new Mage_Core_Model_Config($options);
}
}

/**
* Retrieve application installation flag
*
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Phoenix/Moneybookers/Block/Form.php
View file
Expand Up @@ -14,7 +14,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
* @copyright Copyright (c) 2011 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Block_Form extends Mage_Payment_Block_Form
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Phoenix/Moneybookers/Block/Info.php
View file
Expand Up @@ -14,7 +14,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
* @copyright Copyright (c) 2011 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Block_Info extends Mage_Payment_Block_Info
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Phoenix/Moneybookers/Block/Jsinit.php
View file
Expand Up @@ -14,7 +14,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
* @copyright Copyright (c) 2011 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Block_Jsinit extends Mage_Adminhtml_Block_Template
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Phoenix/Moneybookers/Block/Payment.php
View file
Expand Up @@ -14,7 +14,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
* @copyright Copyright (c) 2011 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Block_Payment extends Mage_Core_Block_Template
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Phoenix/Moneybookers/Block/Placeform.php
View file
Expand Up @@ -14,7 +14,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
* @copyright Copyright (c) 2011 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Block_Placeform extends Mage_Core_Block_Template
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Phoenix/Moneybookers/Block/Redirect.php
View file
Expand Up @@ -14,7 +14,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
* @copyright Copyright (c) 2011 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Block_Redirect extends Mage_Core_Block_Template
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Phoenix/Moneybookers/Helper/Data.php
View file
Expand Up @@ -14,7 +14,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
* @copyright Copyright (c) 2011 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Helper_Data extends Mage_Payment_Helper_Data
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Phoenix/Moneybookers/Model/Abstract.php
View file
Expand Up @@ -14,7 +14,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
* @copyright Copyright (c) 2011 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
abstract class Phoenix_Moneybookers_Model_Abstract extends Mage_Payment_Model_Method_Abstract
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Phoenix/Moneybookers/Model/Acc.php
View file
Expand Up @@ -14,7 +14,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
* @copyright Copyright (c) 2011 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Model_Acc extends Phoenix_Moneybookers_Model_Abstract
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Phoenix/Moneybookers/Model/Csi.php
View file
Expand Up @@ -14,7 +14,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
* @copyright Copyright (c) 2011 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Model_Csi extends Phoenix_Moneybookers_Model_Abstract
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Phoenix/Moneybookers/Model/Did.php
View file
Expand Up @@ -14,7 +14,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
* @copyright Copyright (c) 2011 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Model_Did extends Phoenix_Moneybookers_Model_Abstract
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Phoenix/Moneybookers/Model/Dnk.php
View file
Expand Up @@ -14,7 +14,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
* @copyright Copyright (c) 2011 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Model_Dnk extends Phoenix_Moneybookers_Model_Abstract
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Phoenix/Moneybookers/Model/Ebt.php
View file
Expand Up @@ -14,7 +14,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
* @copyright Copyright (c) 2011 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Model_Ebt extends Phoenix_Moneybookers_Model_Abstract
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Phoenix/Moneybookers/Model/Ent.php
View file
Expand Up @@ -14,7 +14,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
* @copyright Copyright (c) 2011 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Model_Ent extends Phoenix_Moneybookers_Model_Abstract
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Phoenix/Moneybookers/Model/Event.php
View file
Expand Up @@ -14,7 +14,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
* @copyright Copyright (c) 2011 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Phoenix/Moneybookers/Model/Gcb.php
View file
Expand Up @@ -14,7 +14,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
* @copyright Copyright (c) 2011 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Model_Gcb extends Phoenix_Moneybookers_Model_Abstract
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Phoenix/Moneybookers/Model/Gir.php
View file
Expand Up @@ -14,7 +14,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
* @copyright Copyright (c) 2011 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Model_Gir extends Phoenix_Moneybookers_Model_Abstract
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Phoenix/Moneybookers/Model/Idl.php
View file
Expand Up @@ -14,7 +14,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
* @copyright Copyright (c) 2011 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Model_Idl extends Phoenix_Moneybookers_Model_Abstract
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Phoenix/Moneybookers/Model/Lsr.php
View file
Expand Up @@ -14,7 +14,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
* @copyright Copyright (c) 2011 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Model_Lsr extends Phoenix_Moneybookers_Model_Abstract
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Phoenix/Moneybookers/Model/Mae.php
View file
Expand Up @@ -14,7 +14,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
* @copyright Copyright (c) 2011 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Model_Mae extends Phoenix_Moneybookers_Model_Abstract
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Phoenix/Moneybookers/Model/Npy.php
View file
Expand Up @@ -14,7 +14,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
* @copyright Copyright (c) 2011 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Model_Npy extends Phoenix_Moneybookers_Model_Abstract
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Phoenix/Moneybookers/Model/Obt.php
View file
Expand Up @@ -14,7 +14,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
* @copyright Copyright (c) 2011 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Model_Obt extends Phoenix_Moneybookers_Model_Abstract
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Phoenix/Moneybookers/Model/Pli.php
View file
Expand Up @@ -14,7 +14,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
* @copyright Copyright (c) 2011 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Model_Pli extends Phoenix_Moneybookers_Model_Abstract
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Phoenix/Moneybookers/Model/Psp.php
View file
Expand Up @@ -14,7 +14,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
* @copyright Copyright (c) 2011 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Model_Psp extends Phoenix_Moneybookers_Model_Abstract
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Phoenix/Moneybookers/Model/Pwy.php
View file
Expand Up @@ -14,7 +14,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
* @copyright Copyright (c) 2011 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Model_Pwy extends Phoenix_Moneybookers_Model_Abstract
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Phoenix/Moneybookers/Model/Sft.php
View file
Expand Up @@ -14,7 +14,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
* @copyright Copyright (c) 2011 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Model_Sft extends Phoenix_Moneybookers_Model_Abstract
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Phoenix/Moneybookers/Model/So2.php
View file
Expand Up @@ -14,7 +14,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
* @copyright Copyright (c) 2011 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Model_So2 extends Phoenix_Moneybookers_Model_Abstract
Expand Down

0 comments on commit e56274a

Please sign in to comment.