Permalink
Browse files

Import Magento Release 1.3.0

  • Loading branch information...
1 parent 4cf6b33 commit c6d0972885a76513dd44f9d732ca956876b148e0 @LeeSaferite LeeSaferite committed Apr 1, 2009
Showing 620 changed files with 37,309 additions and 15,883 deletions.
View
@@ -55,10 +55,10 @@
# disable user agent verification to not break multiple image upload
php_flag suhosin.session.cryptua off
-
+
###########################################
# turn off compatibility with PHP4 when dealing with objects
-
+
php_flag zend.ze1_compatibility_mode Off
</IfModule>
@@ -77,8 +77,10 @@
## enable apache served files compression
## http://developer.yahoo.com/performance/rules.html#gzip
- # Insert filter
- #SetOutputFilter DEFLATE
+ # Insert filter on all content
+ ###SetOutputFilter DEFLATE
+ # Insert filter on selected content types only
+ #AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css text/javascript
# Netscape 4.x has some problems...
#BrowserMatch ^Mozilla/4 gzip-only-text/html
@@ -88,6 +90,7 @@
# MSIE masquerades as Netscape, but it is fine
#BrowserMatch \bMSIE !no-gzip !gzip-only-text/html
+
# Don't compress images
#SetEnvIfNoCase Request_URI \.(?:gif|jpe?g|png)$ no-gzip dont-vary
View
@@ -54,12 +54,12 @@
# disable user agent verification to not break multiple image upload
php_flag suhosin.session.cryptua off
-
+
###########################################
# turn off compatibility with PHP4 when dealing with objects
-
+
php_flag zend.ze1_compatibility_mode Off
-
+
</IfModule>
<IfModule mod_security.c>
@@ -76,8 +76,10 @@
## enable apache served files compression
## http://developer.yahoo.com/performance/rules.html#gzip
- # Insert filter
- #SetOutputFilter DEFLATE
+ # Insert filter on all content
+ ###SetOutputFilter DEFLATE
+ # Insert filter on selected content types only
+ #AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css text/javascript
# Netscape 4.x has some problems...
#BrowserMatch ^Mozilla/4 gzip-only-text/html
@@ -87,6 +89,7 @@
# MSIE masquerades as Netscape, but it is fine
#BrowserMatch \bMSIE !no-gzip !gzip-only-text/html
+
# Don't compress images
#SetEnvIfNoCase Request_URI \.(?:gif|jpe?g|png)$ no-gzip dont-vary
View
@@ -82,7 +82,7 @@
public static function getVersion()
{
- return '1.2.1.2';
+ return '1.3.0';
}
/**
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Mage
- * @package Mage_Permissions
+ * @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)
*/
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Mage
- * @package Mage_Permissions
+ * @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)
*/
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Mage
- * @package Mage_Permissions
+ * @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)
*/
@@ -35,7 +35,7 @@ protected function _construct()
* Enter description here...
*
* @param int $userId
- * @return Mage_Permissions_Model_Mysql4_Role_Collection
+ * @return Mage_Admin_Model_Mysql4_Role_Collection
*/
public function setUserFilter($userId)
{
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Mage
- * @package Mage_Permissions
+ * @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)
*/
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Mage
- * @package Mage_Permissions
+ * @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)
*/
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Mage
- * @package Mage_Permissions
+ * @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)
*/
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Mage
- * @package Mage_Permissions
+ * @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)
*/
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Mage
- * @package Mage_Permissions
+ * @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)
*/
@@ -201,7 +201,7 @@ public function _saveRelations(Mage_Core_Model_Abstract $user)
}
}
- public function _getRoles(Mage_Core_Model_Abstract $user)
+ public function getRoles(Mage_Core_Model_Abstract $user)
{
if ( !$user->getId() ) {
return array();
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Mage
- * @package Mage_Permissions
+ * @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)
*/
@@ -55,7 +55,13 @@ public function actionPreDispatchAdmin($event)
$user = $session->login($username, $password, $request);
}
if (!$request->getParam('forwarded')) {
- if($request->getParam('isAjax')) {
+ if ($request->getParam('isIframe')) {
+ $request->setParam('forwarded', true)
+ ->setControllerName('index')
+ ->setActionName('deniedIframe')
+ ->setDispatched(false);
+ }
+ elseif($request->getParam('isAjax')) {
$request->setParam('forwarded', true)
->setControllerName('index')
->setActionName('deniedJson')
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Mage
- * @package Mage_Permissions
+ * @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)
*/
@@ -26,6 +26,11 @@
class Mage_Admin_Model_Roles extends Mage_Core_Model_Abstract
{
+ /**
+ * @var string
+ */
+ protected $_eventPrefix = 'admin_roles';
+
protected function _construct()
{
$this->_init('admin/roles');
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Mage
- * @package Mage_Permissions
+ * @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)
*/
Oops, something went wrong.

0 comments on commit c6d0972

Please sign in to comment.