Skip to content

Commit

Permalink
Import Magento 1.4.0.0-alpha3
Browse files Browse the repository at this point in the history
  • Loading branch information
@LeeSaferite
LeeSaferite committed Dec 31, 2009
1 parent 7d6c516 commit 84a1ea6
Show file tree
Hide file tree
Showing 5,998 changed files with 124,180 additions and 49,064 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
5 changes: 3 additions & 2 deletions app/Mage.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,8 @@ final class Mage
*/
public static function getVersion()
{
return '1.4.0.0-alpha2';
$i = self::getVersionInfo();
return trim("{$i['major']}.{$i['minor']}.{$i['revision']}.{$i['patch']}-{$i['stability']}{$i['number']}", '.-');
}

/**
Expand All @@ -154,7 +155,7 @@ public static function getVersionInfo()
'revision' => '0',
'patch' => '0',
'stability' => 'alpha',
'number' => '2',
'number' => '3',
);
}

Expand Down
10 changes: 5 additions & 5 deletions app/code/core/Mage/Admin/Model/Acl.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/


Expand Down Expand Up @@ -89,4 +89,4 @@ public function addRoleParent($role, $parent)
$this->_getRoleRegistry()->addParent($role, $parent);
return $this;
}
}
}
10 changes: 5 additions & 5 deletions app/code/core/Mage/Admin/Model/Acl/Assert/Ip.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/


Expand Down Expand Up @@ -53,4 +53,4 @@ protected function _isCleanIP($ip)
{
// ...
}
}
}
10 changes: 5 additions & 5 deletions app/code/core/Mage/Admin/Model/Acl/Assert/Time.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/


Expand Down Expand Up @@ -53,4 +53,4 @@ protected function _isCleanTime($time)
{
// ...
}
}
}
10 changes: 5 additions & 5 deletions app/code/core/Mage/Admin/Model/Acl/Resource.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/


Expand All @@ -35,4 +35,4 @@
class Mage_Admin_Model_Acl_Resource extends Zend_Acl_Resource
{

}
}
10 changes: 5 additions & 5 deletions app/code/core/Mage/Admin/Model/Acl/Role.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/


Expand All @@ -35,4 +35,4 @@
class Mage_Admin_Model_Acl_Role extends Varien_Object
{

}
}
10 changes: 5 additions & 5 deletions app/code/core/Mage/Admin/Model/Acl/Role/Generic.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/


Expand All @@ -35,4 +35,4 @@
class Mage_Admin_Model_Acl_Role_Generic extends Zend_Acl_Role
{

}
}
10 changes: 5 additions & 5 deletions app/code/core/Mage/Admin/Model/Acl/Role/Group.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/


Expand All @@ -35,4 +35,4 @@
class Mage_Admin_Model_Acl_Role_Group extends Mage_Admin_Model_Acl_Role_Generic
{

}
}
8 changes: 4 additions & 4 deletions app/code/core/Mage/Admin/Model/Acl/Role/Registry.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/


Expand Down
10 changes: 5 additions & 5 deletions app/code/core/Mage/Admin/Model/Acl/Role/User.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/


Expand All @@ -35,4 +35,4 @@
class Mage_Admin_Model_Acl_Role_User extends Mage_Admin_Model_Acl_Role_Generic
{

}
}
16 changes: 9 additions & 7 deletions app/code/core/Mage/Admin/Model/Config.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/


Expand Down Expand Up @@ -58,12 +58,14 @@ public function __construct()
Mage::getConfig()->loadModulesConfiguration('adminhtml.xml', $adminhtmlConfig);
$this->_adminhtmlConfig = $adminhtmlConfig;

// support back compatibility with base config
/**
* @deprecated after 1.4.0.0-alpha2
* support backwards compatibility with config.xml
*/
$aclConfig = Mage::getConfig()->getNode('adminhtml/acl');
if ($aclConfig) {
$adminhtmlConfig->getNode()->extendChild($aclConfig, true);
}

$menuConfig = Mage::getConfig()->getNode('adminhtml/menu');
if ($menuConfig) {
$adminhtmlConfig->getNode()->extendChild($menuConfig, true);
Expand Down Expand Up @@ -165,4 +167,4 @@ public function getAdminhtmlConfig()
{
return $this->_adminhtmlConfig;
}
}
}
14 changes: 7 additions & 7 deletions app/code/core/Mage/Admin/Model/Mysql4/Acl.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/


Expand Down Expand Up @@ -125,7 +125,7 @@ function loadRoles(Mage_Admin_Model_Acl $acl, array $rolesArr)
*/
function loadRules(Mage_Admin_Model_Acl $acl, array $rulesArr)
{
foreach ($rulesArr as $rule) {
foreach ($rulesArr as $rule) {
$role = $rule['role_type'].$rule['role_id'];
$resource = $rule['resource_id'];
$privileges = !empty($rule['privileges']) ? explode(',', $rule['privileges']) : null;
Expand All @@ -140,9 +140,9 @@ function loadRules(Mage_Admin_Model_Acl $acl, array $rulesArr)
if ($resource === self::ACL_ALL_RULES) {
$acl->allow($role, null, $privileges, $assert);
}
$acl->allow($role, $resource, $privileges, $assert);
$acl->allow($role, $resource, $privileges, $assert);
} else if ( $rule['permission'] == 'deny' ) {
$acl->deny($role, $resource, $privileges, $assert);
$acl->deny($role, $resource, $privileges, $assert);
}
} catch (Exception $e) {
//$m = $e->getMessage();
Expand Down
10 changes: 5 additions & 5 deletions app/code/core/Mage/Admin/Model/Mysql4/Acl/Role.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

/**
Expand Down Expand Up @@ -82,4 +82,4 @@ public function delete()
{

}
}
}
10 changes: 5 additions & 5 deletions app/code/core/Mage/Admin/Model/Mysql4/Acl/Role/Collection.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

/**
Expand All @@ -43,4 +43,4 @@ public function __construct()

$this->setItemObjectClass(Mage::getConfig()->getModelClassName('admin/acl_role'));
}
}
}
8 changes: 4 additions & 4 deletions app/code/core/Mage/Admin/Model/Mysql4/Permissions/Collection.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

class Mage_Admin_Model_Mysql4_Permissions_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract
Expand Down
8 changes: 4 additions & 4 deletions app/code/core/Mage/Admin/Model/Mysql4/Role.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

class Mage_Admin_Model_Mysql4_Role extends Mage_Core_Model_Mysql4_Abstract
Expand Down
8 changes: 4 additions & 4 deletions app/code/core/Mage/Admin/Model/Mysql4/Role/Collection.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

class Mage_Admin_Model_Mysql4_Role_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract
Expand Down
8 changes: 4 additions & 4 deletions app/code/core/Mage/Admin/Model/Mysql4/Roles.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

class Mage_Admin_Model_Mysql4_Roles extends Mage_Core_Model_Mysql4_Abstract
Expand Down
Loading

0 comments on commit 84a1ea6

Please sign in to comment.