Skip to content

Commit cabb3b1

Browse files
drobinsondrobinson
committed
Import Magento Release 1.9.2.2
1 parent 3afbb30 commit cabb3b1

File tree

428 files changed

+8314
-22993
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

428 files changed

+8314
-22993
lines changed

‎.htaccess‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,3 +207,28 @@
207207
## http://developer.yahoo.com/performance/rules.html#etags
208208

209209
#FileETag none
210+
211+
###########################################
212+
## Deny access to cron.php
213+
<Files cron.php>
214+
215+
############################################
216+
## uncomment next lines to enable cron access with base HTTP authorization
217+
## http://httpd.apache.org/docs/2.2/howto/auth.html
218+
##
219+
## Warning: .htpasswd file should be placed somewhere not accessible from the web.
220+
## This is so that folks cannot download the password file.
221+
## For example, if your documents are served out of /usr/local/apache/htdocs
222+
## you might want to put the password file(s) in /usr/local/apache/.
223+
224+
#AuthName "Cron auth"
225+
#AuthUserFile ../.htpasswd
226+
#AuthType basic
227+
#Require valid-user
228+
229+
############################################
230+
231+
Order allow,deny
232+
Deny from all
233+
234+
</Files>

‎.htaccess.sample‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,3 +176,27 @@
176176

177177
#FileETag none
178178

179+
###########################################
180+
## Deny access to cron.php
181+
<Files cron.php>
182+
183+
############################################
184+
## uncomment next lines to enable cron access with base HTTP authorization
185+
## http://httpd.apache.org/docs/2.2/howto/auth.html
186+
##
187+
## Warning: .htpasswd file should be placed somewhere not accessible from the web.
188+
## This is so that folks cannot download the password file.
189+
## For example, if your documents are served out of /usr/local/apache/htdocs
190+
## you might want to put the password file(s) in /usr/local/apache/.
191+
192+
#AuthName "Cron auth"
193+
#AuthUserFile ../.htpasswd
194+
#AuthType basic
195+
#Require valid-user
196+
197+
############################################
198+
199+
Order allow,deny
200+
Deny from all
201+
202+
</Files>

‎RELEASE_NOTES.txt‎

Lines changed: 117 additions & 107 deletions
Large diffs are not rendered by default.

‎app/Mage.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ public static function getVersionInfo()
171171
'major' => '1',
172172
'minor' => '9',
173173
'revision' => '2',
174-
'patch' => '1',
174+
'patch' => '2',
175175
'stability' => '',
176176
'number' => '',
177177
);

‎app/code/core/Mage/Admin/Model/Block.php‎

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
<?php
2+
/**
3+
* Magento
4+
*
5+
* NOTICE OF LICENSE
6+
*
7+
* This source file is subject to the Open Software License (OSL 3.0)
8+
* that is bundled with this package in the file LICENSE.txt.
9+
* It is also available through the world-wide-web at this URL:
10+
* http://opensource.org/licenses/osl-3.0.php
11+
* If you did not receive a copy of the license and are unable to
12+
* obtain it through the world-wide-web, please send an email
13+
* to [email protected] so we can send you a copy immediately.
14+
*
15+
* DISCLAIMER
16+
*
17+
* Do not edit or add to this file if you wish to upgrade Magento to newer
18+
* versions in the future. If you wish to customize Magento for your
19+
* needs please refer to http://www.magento.com for more information.
20+
*
21+
* @category Mage
22+
* @package Mage_Admin
23+
* @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
24+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25+
*/
26+
27+
/**
28+
* Class Mage_Admin_Model_Block
29+
*
30+
* @category Mage
31+
* @package Mage_Adminhtml
32+
* @author Magento Core Team <[email protected]>
33+
*/
34+
class Mage_Admin_Model_Block extends Mage_Core_Model_Abstract
35+
{
36+
/**
37+
* Initialize variable model
38+
*/
39+
protected function _construct()
40+
{
41+
$this->_init('admin/block');
42+
}
43+
44+
/**
45+
* @return array|bool
46+
* @throws Exception
47+
* @throws Zend_Validate_Exception
48+
*/
49+
public function validate()
50+
{
51+
$errors = array();
52+
53+
if (!Zend_Validate::is($this->getBlockName(), 'NotEmpty')) {
54+
$errors[] = Mage::helper('adminhtml')->__('Block Name is required field.');
55+
}
56+
if (!Zend_Validate::is($this->getBlockName(), 'Regex', array('/^[-_a-zA-Z0-9\/]*$/'))) {
57+
$errors[] = Mage::helper('adminhtml')->__('Block Name is incorrect.');
58+
}
59+
60+
if (!in_array($this->getIsAllowed(), array('0', '1'))) {
61+
$errors[] = Mage::helper('adminhtml')->__('Is Allowed is required field.');
62+
}
63+
64+
if (empty($errors)) {
65+
return true;
66+
}
67+
return $errors;
68+
}
69+
70+
/**
71+
* Check is block with such type allowed for parsinf via blockDirective method
72+
*
73+
* @param $type
74+
* @return int
75+
*/
76+
public function isTypeAllowed($type)
77+
{
78+
/** @var Mage_Admin_Model_Resource_Block_Collection $collection */
79+
$collection = Mage::getResourceModel('admin/block_collection');
80+
$collection->addFieldToFilter('block_name', array('eq' => $type))
81+
->addFieldToFilter('is_allowed', array('eq' => 1));
82+
return $collection->load()->count();
83+
}
84+
}

‎app/code/core/Mage/Admin/Model/Resource/Block.php‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
<?php
2+
/**
3+
* Magento
4+
*
5+
* NOTICE OF LICENSE
6+
*
7+
* This source file is subject to the Open Software License (OSL 3.0)
8+
* that is bundled with this package in the file LICENSE.txt.
9+
* It is also available through the world-wide-web at this URL:
10+
* http://opensource.org/licenses/osl-3.0.php
11+
* If you did not receive a copy of the license and are unable to
12+
* obtain it through the world-wide-web, please send an email
13+
* to [email protected] so we can send you a copy immediately.
14+
*
15+
* DISCLAIMER
16+
*
17+
* Do not edit or add to this file if you wish to upgrade Magento to newer
18+
* versions in the future. If you wish to customize Magento for your
19+
* needs please refer to http://www.magento.com for more information.
20+
*
21+
* @category Mage
22+
* @package Mage_Admin
23+
* @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
24+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25+
*/
26+
27+
/**
28+
* Class Mage_Admin_Model_Resource_Block
29+
*
30+
* @category Mage
31+
* @package Mage_Adminhtml
32+
* @author Magento Core Team <[email protected]>
33+
*/
34+
class Mage_Admin_Model_Resource_Block extends Mage_Core_Model_Resource_Db_Abstract
35+
{
36+
/**
37+
* Define main table
38+
*
39+
*/
40+
protected function _construct()
41+
{
42+
$this->_init('admin/permission_block', 'block_id');
43+
}
44+
}

‎app/code/core/Mage/Admin/Model/Resource/Block/Collection.php‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
<?php
2+
/**
3+
* Magento
4+
*
5+
* NOTICE OF LICENSE
6+
*
7+
* This source file is subject to the Open Software License (OSL 3.0)
8+
* that is bundled with this package in the file LICENSE.txt.
9+
* It is also available through the world-wide-web at this URL:
10+
* http://opensource.org/licenses/osl-3.0.php
11+
* If you did not receive a copy of the license and are unable to
12+
* obtain it through the world-wide-web, please send an email
13+
* to [email protected] so we can send you a copy immediately.
14+
*
15+
* DISCLAIMER
16+
*
17+
* Do not edit or add to this file if you wish to upgrade Magento to newer
18+
* versions in the future. If you wish to customize Magento for your
19+
* needs please refer to http://www.magento.com for more information.
20+
*
21+
* @category Mage
22+
* @package Mage_Admin
23+
* @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
24+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25+
*/
26+
27+
/**
28+
* Admin permissions block collection
29+
*
30+
* @category Mage
31+
* @package Mage_Adminhtml
32+
* @author Magento Core Team <[email protected]>
33+
*/
34+
class Mage_Admin_Model_Resource_Block_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
35+
{
36+
/**
37+
* Define resource model
38+
*
39+
*/
40+
protected function _construct()
41+
{
42+
$this->_init('admin/block');
43+
}
44+
}

‎app/code/core/Mage/Admin/Model/Resource/Variable.php‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
<?php
2+
/**
3+
* Magento
4+
*
5+
* NOTICE OF LICENSE
6+
*
7+
* This source file is subject to the Open Software License (OSL 3.0)
8+
* that is bundled with this package in the file LICENSE.txt.
9+
* It is also available through the world-wide-web at this URL:
10+
* http://opensource.org/licenses/osl-3.0.php
11+
* If you did not receive a copy of the license and are unable to
12+
* obtain it through the world-wide-web, please send an email
13+
* to [email protected] so we can send you a copy immediately.
14+
*
15+
* DISCLAIMER
16+
*
17+
* Do not edit or add to this file if you wish to upgrade Magento to newer
18+
* versions in the future. If you wish to customize Magento for your
19+
* needs please refer to http://www.magento.com for more information.
20+
*
21+
* @category Mage
22+
* @package Mage_Admin
23+
* @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
24+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25+
*/
26+
27+
/**
28+
* Resource model for manipulate system variables
29+
*
30+
* @category Mage
31+
* @package Mage_Admin
32+
* @author Magento Core Team <[email protected]>
33+
*/
34+
class Mage_Admin_Model_Resource_Variable extends Mage_Core_Model_Resource_Db_Abstract
35+
{
36+
/**
37+
* Define main table
38+
*/
39+
protected function _construct()
40+
{
41+
$this->_init('admin/permission_variable', 'variable_id');
42+
}
43+
}

‎app/code/core/Mage/Admin/Model/Resource/Variable/Collection.php‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
<?php
2+
/**
3+
* Magento
4+
*
5+
* NOTICE OF LICENSE
6+
*
7+
* This source file is subject to the Open Software License (OSL 3.0)
8+
* that is bundled with this package in the file LICENSE.txt.
9+
* It is also available through the world-wide-web at this URL:
10+
* http://opensource.org/licenses/osl-3.0.php
11+
* If you did not receive a copy of the license and are unable to
12+
* obtain it through the world-wide-web, please send an email
13+
* to [email protected] so we can send you a copy immediately.
14+
*
15+
* DISCLAIMER
16+
*
17+
* Do not edit or add to this file if you wish to upgrade Magento to newer
18+
* versions in the future. If you wish to customize Magento for your
19+
* needs please refer to http://www.magento.com for more information.
20+
*
21+
* @category Mage
22+
* @package Mage_Admin
23+
* @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
24+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25+
*/
26+
27+
/**
28+
* Admin permissions variable collection
29+
*
30+
* @category Mage
31+
* @package Mage_Admin
32+
* @author Magento Core Team <[email protected]>
33+
*/
34+
class Mage_Admin_Model_Resource_Variable_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
35+
{
36+
/**
37+
* Define resource model
38+
*
39+
*/
40+
protected function _construct()
41+
{
42+
$this->_init('admin/variable');
43+
}
44+
}

0 commit comments

Comments
 (0)