Skip to content

Commit c431343

Browse files
magento-teammagento-team
committed
Merged from the original repository.
1 parent 4bdbf6b commit c431343

File tree

51 files changed

+1052
-449
lines changed

Some content is hidden

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

51 files changed

+1052
-449
lines changed

‎app/code/community/Phoenix/Moneybookers/etc/adminhtml.xml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
<?xml version="1.0"?>
2+
<!--
3+
/**
4+
* Magento
5+
*
6+
* NOTICE OF LICENSE
7+
*
8+
* This source file is subject to the Open Software License (OSL 3.0)
9+
* that is bundled with this package in the file LICENSE.txt.
10+
* It is also available through the world-wide-web at this URL:
11+
* http://opensource.org/licenses/osl-3.0.php
12+
* If you did not receive a copy of the license and are unable to
13+
* obtain it through the world-wide-web, please send an email
14+
* to license@magentocommerce.com so we can send you a copy immediately.
15+
*
16+
* @category Phoenix
17+
* @package Phoenix_Moneybookers
18+
* @copyright Copyright (c) 2009 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
19+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
20+
*/
21+
-->
22+
<config>
23+
<acl>
24+
<resources>
25+
<admin>
26+
<children>
27+
<system>
28+
<children>
29+
<config>
30+
<children>
31+
<moneybookers translate="title" module="Phoenix_Moneybookers">
32+
<title>Moneybookers Settings</title>
33+
</moneybookers>
34+
</children>
35+
</config>
36+
</children>
37+
</system>
38+
</children>
39+
</admin>
40+
</resources>
41+
</acl>
42+
</config>

‎app/code/community/Phoenix/Moneybookers/etc/config.xml

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -112,25 +112,6 @@
112112
</moneybookers>
113113
</updates>
114114
</layout>
115-
<acl>
116-
<resources>
117-
<admin>
118-
<children>
119-
<system>
120-
<children>
121-
<config>
122-
<children>
123-
<moneybookers translate="title" module="Phoenix_Moneybookers">
124-
<title>Moneybookers Settings</title>
125-
</moneybookers>
126-
</children>
127-
</config>
128-
</children>
129-
</system>
130-
</children>
131-
</admin>
132-
</resources>
133-
</acl>
134115
</adminhtml>
135116
<phoenix>
136117
<moneybookers>

‎app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Wishlist.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ protected function _prepareCollection()
5959
$collection = $wishlist->loadByCustomer(Mage::registry('current_customer'))
6060
->setSharedStoreIds($wishlist->getSharedStoreIds(false))
6161
->getItemCollection()
62-
->addDaysInWishlist(true)
62+
->addDaysInWishlist()
6363
->addStoreData()
6464
->setInStockFilter(true);
6565

‎app/code/core/Mage/Adminhtml/view/adminhtml/admin/forgotpassword.phtml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,11 @@
3434
<link rel="icon" href="<?php echo $this->getSkinUrl('Mage_Page::favicon.ico'); ?>" type="image/x-icon" />
3535
<link rel="shortcut icon" href="<?php echo $this->getSkinUrl('Mage_Page::favicon.ico'); ?>" type="image/x-icon" />
3636

37-
<script type="text/javascript" src="<?php echo $this->getSkinUrl('index.php'); ?>/x.js?f=prototype/prototype.js,prototype/validation.js,mage/adminhtml/events.js,mage/adminhtml/form.js,scriptaculous/effects.js"></script>
37+
<script type="text/javascript" src="<?php echo $this->getSkinUrl('prototype/prototype.js'); ?>"></script>
38+
<script type="text/javascript" src="<?php echo $this->getSkinUrl('prototype/validation.js'); ?>"></script>
39+
<script type="text/javascript" src="<?php echo $this->getSkinUrl('mage/adminhtml/events.js'); ?>"></script>
40+
<script type="text/javascript" src="<?php echo $this->getSkinUrl('mage/adminhtml/form.js'); ?>"></script>
41+
<script type="text/javascript" src="<?php echo $this->getSkinUrl('scriptaculous/effects.js'); ?>"></script>
3842

3943
<!--[if IE]> <link rel="stylesheet" href="<?php echo $this->getSkinUrl('iestyles.css'); ?>" type="text/css" media="all" /> <![endif]-->
4044
<!--[if lt IE 7]> <link rel="stylesheet" href="<?php echo $this->getSkinUrl('below_ie7.css'); ?>" type="text/css" media="all" /> <![endif]-->

‎app/code/core/Mage/Adminhtml/view/email/password_reset_confirmation.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!--@vars
33
{"store url=\"\"":"Store Url",
44
"skin url=\"images/logo_email.gif\" _area='frontend'":"Email Logo Image",
5-
"htmlescape var=$user.name":"Admin Name",
5+
"escapehtml var=$user.name":"Admin Name",
66
"store url=\"adminhtml/index/resetpassword/\" _query_id=$user.id _query_token=$user.rp_token":"Reset Password URL",
77
"store url=\"adminhtml/system_account/\"":"Admin Account Url"}
88
@-->
@@ -24,7 +24,7 @@
2424
</tr>
2525
<tr>
2626
<td valign="top">
27-
<h1 style="font-size: 22px; font-weight: normal; line-height: 22px; margin: 0 0 11px 0;">Dear {{htmlescape var=$user.name}},</h1>
27+
<h1 style="font-size: 22px; font-weight: normal; line-height: 22px; margin: 0 0 11px 0;">Dear {{escapehtml var=$user.name}},</h1>
2828
<p style="font-size: 12px; line-height: 16px; margin: 0 0 8px 0;">There was recently a request to change the password for your account.</p>
2929
<p style="font-size: 12px; line-height: 16px; margin: 0;">If you requested this password change, please click on the following link to reset your password: <a href="{{store url="adminhtml/index/resetpassword/" _query_id=$user.id _query_token=$user.rp_token}}" style="color:#1E7EC8;">{{store url="adminhtml/index/resetpassword/" _query_id=$user.id _query_token=$user.rp_token}}</a></p>
3030
<p style="font-size: 12px; line-height: 16px; margin: 0;">If clicking the link does not work, please copy and paste the URL into your browser instead.</p>

‎app/code/core/Mage/Core/Model/Email/Template/Filter.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ public function storeDirective($construction)
320320
* @param array $construction
321321
* @return string
322322
*/
323-
public function htmlescapeDirective($construction)
323+
public function escapehtmlDirective($construction)
324324
{
325325
$params = $this->_getIncludeParameters($construction[2]);
326326
if (!isset($params['var'])) {

‎shell/abstract.php renamed to ‎app/code/core/Mage/Core/Model/Shell/Abstract.php

Lines changed: 48 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -31,77 +31,74 @@
3131
* @package Mage_Shell
3232
* @author Magento Core Team <core@magentocommerce.com>
3333
*/
34-
abstract class Mage_Shell_Abstract
34+
abstract class Mage_Core_Model_Shell_Abstract
3535
{
3636
/**
37-
* Is include Mage and initialize application
37+
* Raw arguments, that should be parsed
3838
*
39-
* @var bool
39+
* @var array
4040
*/
41-
protected $_includeMage = true;
41+
protected $_rawArgs = array();
4242

4343
/**
44-
* Magento Root path
44+
* Parsed input arguments
4545
*
46-
* @var string
46+
* @var array
4747
*/
48-
protected $_rootPath;
48+
protected $_args = array();
4949

5050
/**
51-
* Initialize application with code (store, website code)
51+
* Entry point - script filename that is executed
5252
*
5353
* @var string
5454
*/
55-
protected $_appCode = 'admin';
55+
protected $_entryPoint = null;
5656

5757
/**
58-
* Initialize application code type (store, website, store_group)
58+
* Initializes application and parses input parameters
5959
*
60-
* @var string
60+
* @var string $entryPoint
6161
*/
62-
protected $_appType = 'store';
62+
public function __construct($entryPoint)
63+
{
64+
if (isset($_SERVER['REQUEST_METHOD'])) {
65+
throw new Exception('This script cannot be run from Browser. This is the shell script.');
66+
}
6367

64-
/**
65-
* Input arguments
66-
*
67-
* @var array
68-
*/
69-
protected $_args = array();
68+
$this->_entryPoint = $entryPoint;
69+
$this->_rawArgs = $_SERVER['argv'];
70+
$this->_applyPhpVariables();
71+
$this->_parseArgs();
72+
}
7073

7174
/**
72-
* Initialize application and parse input parameters
75+
* Sets raw arguments to be parsed
7376
*
77+
* @param array $args
78+
* @return Mage_Core_Model_Shell_Abstract
7479
*/
75-
public function __construct()
80+
public function setRawArgs($args)
7681
{
77-
if ($this->_includeMage) {
78-
require_once $this->_getRootPath() . 'app' . DIRECTORY_SEPARATOR . 'bootstrap.php';
79-
Mage::app($this->_appCode, $this->_appType);
80-
}
81-
82-
$this->_applyPhpVariables();
82+
$this->_rawArgs = $args;
8383
$this->_parseArgs();
84-
$this->_construct();
85-
$this->_validate();
86-
$this->_showHelp();
84+
return $this;
8785
}
8886

87+
8988
/**
90-
* Get Magento Root path (with last directory separator)
89+
* Gets Magento root path (with last directory separator)
9190
*
9291
* @return string
9392
*/
9493
protected function _getRootPath()
9594
{
96-
if (is_null($this->_rootPath)) {
97-
$this->_rootPath = dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR;
98-
}
99-
return $this->_rootPath;
95+
return Mage::getBaseDir() . '/../';
10096
}
10197

10298
/**
103-
* Parse .htaccess file and apply php settings to shell script
99+
* Parses .htaccess file and apply php settings to shell script
104100
*
101+
* @return Mage_Core_Model_Shell_Abstract
105102
*/
106103
protected function _applyPhpVariables()
107104
{
@@ -123,17 +120,18 @@ protected function _applyPhpVariables()
123120
}
124121
}
125122
}
123+
return $this;
126124
}
127125

128126
/**
129-
* Parse input arguments
127+
* Parses input arguments
130128
*
131-
* @return Mage_Shell_Abstract
129+
* @return Mage_Core_Model_Shell_Abstract
132130
*/
133131
protected function _parseArgs()
134132
{
135133
$current = null;
136-
foreach ($_SERVER['argv'] as $arg) {
134+
foreach ($this->_rawArgs as $arg) {
137135
$match = array();
138136
if (preg_match('#^--([\w\d_-]{1,})$#', $arg, $match) || preg_match('#^-([\w\d_]{1,})$#', $arg, $match)) {
139137
$current = $match[1];
@@ -150,59 +148,43 @@ protected function _parseArgs()
150148
}
151149

152150
/**
153-
* Additional initialize instruction
154-
*
155-
* @return Mage_Shell_Abstract
156-
*/
157-
protected function _construct()
158-
{
159-
return $this;
160-
}
161-
162-
/**
163-
* Validate arguments
164-
*
165-
*/
166-
protected function _validate()
167-
{
168-
if (isset($_SERVER['REQUEST_METHOD'])) {
169-
die('This script cannot be run from Browser. This is the shell script.');
170-
}
171-
}
172-
173-
/**
174-
* Run script
151+
* Runs script
175152
*
153+
* @return Mage_Core_Model_Shell_Abstract
176154
*/
177155
abstract public function run();
178156

179157
/**
180-
* Check is show usage help
158+
* Shows usage help, if requested
181159
*
160+
* @return bool
182161
*/
183162
protected function _showHelp()
184163
{
185164
if (isset($this->_args['h']) || isset($this->_args['help'])) {
186-
die($this->usageHelp());
165+
echo $this->getUsageHelp();
166+
return true;
187167
}
168+
return false;
188169
}
189170

190171
/**
191-
* Retrieve Usage Help Message
172+
* Retrieves usage help message
192173
*
174+
* @return string
193175
*/
194-
public function usageHelp()
176+
public function getUsageHelp()
195177
{
196178
return <<<USAGE
197-
Usage: php -f script.php -- [options]
179+
Usage: php -f {$this->_entryPoint} -- [options]
198180
199181
-h Short alias for help
200182
help This help
201183
USAGE;
202184
}
203185

204186
/**
205-
* Retrieve argument value by name or false
187+
* Retrieves argument value by name. If argument is not found - returns FALSE.
206188
*
207189
* @param string $name the argument name
208190
* @return mixed

‎app/code/core/Mage/Customer/view/email/account_new.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
<!--@vars
33
{"store url=\"\"":"Store Url",
44
"skin url=\"images/logo_email.gif\" _area='frontend'":"Email Logo Image",
5-
"htmlescape var=$customer.name":"Customer Name",
5+
"escapehtml var=$customer.name":"Customer Name",
66
"store url=\"customer/account/\"":"Customer Account Url",
77
"var customer.email":"Customer Email",
8-
"htmlescape var=$customer.password":"Customer Password"}
8+
"escapehtml var=$customer.password":"Customer Password"}
99
@-->
1010

1111
<!--@styles
@@ -26,12 +26,12 @@
2626
<!-- [ middle starts here] -->
2727
<tr>
2828
<td valign="top">
29-
<h1 style="font-size:22px; font-weight:normal; line-height:22px; margin:0 0 11px 0;"">Dear {{htmlescape var=$customer.name}},</h1>
29+
<h1 style="font-size:22px; font-weight:normal; line-height:22px; margin:0 0 11px 0;"">Dear {{escapehtml var=$customer.name}},</h1>
3030
<p style="font-size:12px; line-height:16px; margin:0 0 16px 0;">Welcome to {{var store.getFrontendName()}}. To log in when visiting our site just click <a href="{{store url="customer/account/"}}" style="color:#1E7EC8;">Login</a> or <a href="{{store url="customer/account/"}}" style="color:#1E7EC8;">My Account</a> at the top of every page, and then enter your e-mail address and password.</p>
3131
<p style="border:1px solid #E0E0E0; font-size:12px; line-height:16px; margin:0; padding:13px 18px; background:#f9f9f9;">
3232
Use the following values when prompted to log in:<br/>
3333
<strong>E-mail</strong>: {{var customer.email}}<br/>
34-
<strong>Password</strong>: {{htmlescape var=$customer.password}}<p>
34+
<strong>Password</strong>: {{escapehtml var=$customer.password}}<p>
3535
<p style="font-size:12px; line-height:16px; margin:0 0 8px 0;">When you log in to your account, you will be able to do the following:</p>
3636
<ul style="font-size:12px; line-height:16px; margin:0 0 16px 0; padding:0;">
3737
<li style="list-style:none inside; padding:0 0 0 10px;">&ndash; Proceed through checkout faster when making a purchase</li>
@@ -52,4 +52,4 @@ <h1 style="font-size:22px; font-weight:normal; line-height:22px; margin:0 0 11px
5252
</tr>
5353
</table>
5454
</div>
55-
</body>
55+
</body>

‎app/code/core/Mage/Customer/view/email/account_new_confirmation.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
{"store url=\"\"":"Store Url",
44
"skin url=\"images/logo_email.gif\" _area='frontend'":"Email Logo Image",
55
"store url=\"customer/account/\"":"Customer Account Url",
6-
"htmlescape var=$customer.name":"Customer Name",
6+
"escapehtml var=$customer.name":"Customer Name",
77
"var customer.email":"Customer Email",
88
"store url=\"customer/account/confirm/\" _query_id=$customer.id _query_key=$customer.confirmation _query_back_url=$back_url":"Confirmation Url",
9-
"htmlescape var=$customer.password":"Customer password"}
9+
"escapehtml var=$customer.password":"Customer password"}
1010
@-->
1111

1212
<!--@styles
@@ -28,13 +28,13 @@
2828
<!-- [ middle starts here] -->
2929
<tr>
3030
<td valign="top">
31-
<h1 style="font-size:22px; font-weight:normal; line-height:22px; margin:0 0 11px 0;">Dear {{htmlescape var=$customer.name}},</h1>
31+
<h1 style="font-size:22px; font-weight:normal; line-height:22px; margin:0 0 11px 0;">Dear {{escapehtml var=$customer.name}},</h1>
3232
<p style="font-size:12px; line-height:16px; margin:0 0 16px 0;">Your e-mail {{var customer.email}} must be confirmed before using it to log in to our store.</p>
3333
<p style="font-size:12px; line-height:16px; margin:0 0 8px 0;">To confirm the e-mail and instantly log in, please, use <a href="{{store url="customer/account/confirm/" _query_id=$customer.id _query_key=$customer.confirmation _query_back_url=$back_url}}" style="color:#1E7EC8;">this confirmation link</a>. This link is valid only once.</p>
3434
<p style="border:1px solid #E0E0E0; font-size:12px; line-height:16px; margin:0 0 16px 0; padding:13px 18px; background:#f9f9f9;">
3535
Use the following values when prompted to log in:<br/>
3636
<strong>E-mail:</strong> {{var customer.email}}<br/>
37-
<strong>Password:</strong> {{htmlescape var=$customer.password}}<p>
37+
<strong>Password:</strong> {{escapehtml var=$customer.password}}<p>
3838
<p style="font-size:12px; line-height:16px; margin:0;">If you have any questions about your account or any other matter, please feel free to contact us at <a href="mailto:{{config path='trans_email/ident_support/email'}}" style="color:#1E7EC8;">{{config path='trans_email/ident_support/email'}}</a> or by phone at {{config path='general/store_information/phone'}}.</p>
3939
</td>
4040
</tr>
@@ -46,4 +46,4 @@ <h1 style="font-size:22px; font-weight:normal; line-height:22px; margin:0 0 11px
4646
</tr>
4747
</table>
4848
</div>
49-
</body>
49+
</body>

0 commit comments

Comments
 (0)