';
return $html;
}
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset/Modules/DisableOutput.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset/Modules/DisableOutput.php
index ad739ac8b5..ddc3e1b0a5 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset/Modules/DisableOutput.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset/Modules/DisableOutput.php
@@ -18,33 +18,33 @@
* 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_Adminhtml
- * @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_Adminhtml
+ * @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_Adminhtml_Block_System_Config_Form_Fieldset_Modules_DisableOutput
- extends Mage_Adminhtml_Block_System_Config_Form_Fieldset
+ extends Mage_Adminhtml_Block_System_Config_Form_Fieldset
{
- protected $_dummyElement;
- protected $_fieldRenderer;
- protected $_values;
+ protected $_dummyElement;
+ protected $_fieldRenderer;
+ protected $_values;
public function render(Varien_Data_Form_Element_Abstract $element)
{
- $html = $this->_getHeaderHtml($element);
+ $html = $this->_getHeaderHtml($element);
- $modules = array_keys((array)Mage::getConfig()->getNode('modules')->children());
+ $modules = array_keys((array)Mage::getConfig()->getNode('modules')->children());
- sort($modules);
+ sort($modules);
foreach ($modules as $moduleName) {
- if ($moduleName==='Mage_Adminhtml') {
- continue;
- }
- $html.= $this->_getFieldHtml($element, $moduleName);
+ if ($moduleName==='Mage_Adminhtml') {
+ continue;
+ }
+ $html.= $this->_getFieldHtml($element, $moduleName);
}
$html .= $this->_getFooterHtml($element);
@@ -53,38 +53,38 @@ public function render(Varien_Data_Form_Element_Abstract $element)
protected function _getDummyElement()
{
- if (empty($this->_dummyElement)) {
- $this->_dummyElement = new Varien_Object(array('show_in_default'=>1, 'show_in_website'=>1));
- }
- return $this->_dummyElement;
+ if (empty($this->_dummyElement)) {
+ $this->_dummyElement = new Varien_Object(array('show_in_default'=>1, 'show_in_website'=>1));
+ }
+ return $this->_dummyElement;
}
protected function _getFieldRenderer()
{
- if (empty($this->_fieldRenderer)) {
- $this->_fieldRenderer = Mage::getBlockSingleton('adminhtml/system_config_form_field');
- }
- return $this->_fieldRenderer;
+ if (empty($this->_fieldRenderer)) {
+ $this->_fieldRenderer = Mage::getBlockSingleton('adminhtml/system_config_form_field');
+ }
+ return $this->_fieldRenderer;
}
protected function _getValues()
{
- if (empty($this->_values)) {
- $this->_values = array(
- array('label'=>Mage::helper('adminhtml')->__('Enable'), 'value'=>0),
- array('label'=>Mage::helper('adminhtml')->__('Disable'), 'value'=>1),
- );
- }
- return $this->_values;
+ if (empty($this->_values)) {
+ $this->_values = array(
+ array('label'=>Mage::helper('adminhtml')->__('Enable'), 'value'=>0),
+ array('label'=>Mage::helper('adminhtml')->__('Disable'), 'value'=>1),
+ );
+ }
+ return $this->_values;
}
protected function _getFieldHtml($fieldset, $moduleName)
{
- $configData = $this->getConfigData();
- $path = 'advanced/modules_disable_output/'.$moduleName; //TODO: move as property of form
- $data = isset($configData[$path]) ? $configData[$path] : array();
+ $configData = $this->getConfigData();
+ $path = 'advanced/modules_disable_output/'.$moduleName; //TODO: move as property of form
+ $data = isset($configData[$path]) ? $configData[$path] : array();
- $e = $this->_getDummyElement();
+ $e = $this->_getDummyElement();
$field = $fieldset->addField($moduleName, 'select',
array(
@@ -97,6 +97,6 @@ protected function _getFieldHtml($fieldset, $moduleName)
'can_use_website_value' => $this->getForm()->canUseWebsiteValue($e),
))->setRenderer($this->_getFieldRenderer());
- return $field->toHtml();
+ return $field->toHtml();
}
}
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset/Order/Statuses.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset/Order/Statuses.php
index 006f7f7597..779d8bb995 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset/Order/Statuses.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset/Order/Statuses.php
@@ -18,28 +18,28 @@
* 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_Adminhtml
- * @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_Adminhtml
+ * @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_Adminhtml_Block_System_Config_Form_Fieldset_Order_Statuses
- extends Mage_Adminhtml_Block_System_Config_Form_Fieldset
+ extends Mage_Adminhtml_Block_System_Config_Form_Fieldset
{
- protected $_dummyElement;
- protected $_fieldRenderer;
- protected $_values;
+ protected $_dummyElement;
+ protected $_fieldRenderer;
+ protected $_values;
public function render(Varien_Data_Form_Element_Abstract $element)
{
- $html = ''; //$this->_getHeaderHtml($element);
+ $html = ''; //$this->_getHeaderHtml($element);
- $statuses = Mage::getResourceModel('sales/order_status_collection')->load()->toOptionHash();
+ $statuses = Mage::getResourceModel('sales/order_status_collection')->load()->toOptionHash();
foreach ($statuses as $id => $status) {
- $html.= $this->_getFieldHtml($element, $id, $status);
+ $html.= $this->_getFieldHtml($element, $id, $status);
}
#$html .= $this->_getFooterHtml($element);
@@ -48,27 +48,27 @@ public function render(Varien_Data_Form_Element_Abstract $element)
protected function _getDummyElement()
{
- if (empty($this->_dummyElement)) {
- $this->_dummyElement = new Varien_Object(array('show_in_default'=>1, 'show_in_website'=>1));
- }
- return $this->_dummyElement;
+ if (empty($this->_dummyElement)) {
+ $this->_dummyElement = new Varien_Object(array('show_in_default'=>1, 'show_in_website'=>1));
+ }
+ return $this->_dummyElement;
}
protected function _getFieldRenderer()
{
- if (empty($this->_fieldRenderer)) {
- $this->_fieldRenderer = Mage::getBlockSingleton('adminhtml/system_config_form_field');
- }
- return $this->_fieldRenderer;
+ if (empty($this->_fieldRenderer)) {
+ $this->_fieldRenderer = Mage::getBlockSingleton('adminhtml/system_config_form_field');
+ }
+ return $this->_fieldRenderer;
}
protected function _getFieldHtml($fieldset, $id, $status)
{
- $configData = $this->getConfigData();
- $path = 'sales/order_statuses/status_'.$id; //TODO: move as property of form
- $data = isset($configData[$path]) ? $configData[$path] : array();
+ $configData = $this->getConfigData();
+ $path = 'sales/order_statuses/status_'.$id; //TODO: move as property of form
+ $data = isset($configData[$path]) ? $configData[$path] : array();
- $e = $this->_getDummyElement();
+ $e = $this->_getDummyElement();
$field = $fieldset->addField($id, 'text',
array(
@@ -82,7 +82,7 @@ protected function _getFieldHtml($fieldset, $id, $status)
'can_use_website_value' => $this->getForm()->canUseWebsiteValue($e),
))->setRenderer($this->_getFieldRenderer());
- return $field->toHtml();
+ return $field->toHtml();
}
}
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Switcher.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Switcher.php
index dd09e14949..602eb25b69 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Config/Switcher.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Switcher.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
@@ -106,4 +106,4 @@ public function getStoreSelectOptions()
return $options;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Tabs.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Tabs.php
index 9ae68221ec..a02245c4ce 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Config/Tabs.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Tabs.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Xml.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Xml.php
index e69de29bb2..8b13789179 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Config/Xml.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Xml.php
@@ -0,0 +1 @@
+
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui.php
index c3edc74a88..d0d64cddb8 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit.php
index 52e117e442..93c242d818 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Form.php
index ce2518c55f..b5f97d4eb0 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Form.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Form.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/Upload.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/Upload.php
index 5c96ee7766..822db7875f 100755
--- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/Upload.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/Upload.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/View.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/View.php
index 116d3e8d9f..8b5dd6f4dc 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/View.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/View.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -42,7 +42,7 @@ public function initForm()
$fieldset = $form->addFieldset('base_fieldset', array('legend'=>Mage::helper('adminhtml')->__('View Actions XML')));
- $fieldset->addField('actions_xml', 'textarea', array(
+ $fieldset->addField('actions_xml', 'textarea', array(
'name' => 'actions_xml_view',
'label' => Mage::helper('adminhtml')->__('Actions XML'),
'title' => Mage::helper('adminhtml')->__('Actions XML'),
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/Wizard.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/Wizard.php
index 3441854db5..4ff21e2aca 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/Wizard.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/Wizard.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -140,7 +140,7 @@ public function getProductAttributeSetFilterOptions()
$opt = array();
$opt = array(''=>$this->__('Any Attribute Set'));
if ($options) foreach($options as $index => $value) {
- $opt[$index] = $value;
+ $opt[$index] = $value;
}
//array_slice($options, 0, 0, array(''=>$this->__('Any Attribute Set')));
return $opt;
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tabs.php
index ce4f4f838f..c97be4125a 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tabs.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tabs.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Grid.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Grid.php
index 390f8c8fe8..902b1932d4 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Grid.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Grid.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile.php
index d21455b1b4..d9661381cc 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit.php
index 9ea39c356c..b953744965 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Filter/Action.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Filter/Action.php
index 9e721df3e1..1d63e3ee57 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Filter/Action.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Filter/Action.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
@@ -52,4 +52,4 @@ public function getHtml()
$html .= '';
return $html;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Form.php
index 359a9eafcb..29f4d0b920 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Form.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Form.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Renderer/Action.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Renderer/Action.php
index c9b281bea7..b293b7cb5e 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Renderer/Action.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Renderer/Action.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
@@ -45,4 +45,4 @@ public function render(Varien_Object $row)
$value = $row->getData($this->getColumn()->getIndex());
return $values[$value];
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/Edit.php
index 73fe4baeb0..bf89dbf0ef 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/Edit.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -42,14 +42,14 @@ public function initForm()
$fieldset = $form->addFieldset('base_fieldset', array('legend'=>Mage::helper('adminhtml')->__('General Information')));
- $fieldset->addField('name', 'text', array(
+ $fieldset->addField('name', 'text', array(
'name' => 'name',
'label' => Mage::helper('adminhtml')->__('Profile Name'),
'title' => Mage::helper('adminhtml')->__('Profile Name'),
'required' => true,
));
- $fieldset->addField('actions_xml', 'textarea', array(
+ $fieldset->addField('actions_xml', 'textarea', array(
'name' => 'actions_xml',
'label' => Mage::helper('adminhtml')->__('Actions XML'),
'title' => Mage::helper('adminhtml')->__('Actions XML'),
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/History.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/History.php
index c7573f4352..a554fb3b02 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/History.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/History.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/Run.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/Run.php
index 35bd9475ba..28f9cff3c1 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/Run.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/Run.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -94,6 +94,6 @@ public function getParseType()
{
$data = Mage::registry('current_convert_profile')->getGuiData();
if ($data)
- return ($data['parse']['type'] == 'excel_xml') ? 'xml': $data['parse']['type'];
+ return ($data['parse']['type'] == 'excel_xml') ? 'xml': $data['parse']['type'];
}
}
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tabs.php
index 78ba85c0a3..90d7b4acf1 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tabs.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tabs.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Grid.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Grid.php
index d874fd123d..46b377d6ed 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Grid.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Grid.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Run.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Run.php
index 57087425e8..df7a785532 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Run.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Run.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Currency.php b/app/code/core/Mage/Adminhtml/Block/System/Currency.php
index e94c831fc9..210584b631 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Currency.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Currency.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
@@ -70,6 +70,10 @@ protected function _prepareLayout()
$this->getLayout()->createBlock('adminhtml/system_currency_rate_matrix')
);
+ $this->setChild('import_services',
+ $this->getLayout()->createBlock('adminhtml/system_currency_rate_services')
+ );
+
return parent::_prepareLayout();
}
@@ -95,14 +99,7 @@ protected function getImportButtonHtml()
protected function getServicesHtml()
{
- return $this->getLayout()->createBlock('adminhtml/html_select')
- ->setOptions(Mage::getModel('adminhtml/system_config_source_currency_service')->toOptionArray(0))
- ->setId('rate_services')
- ->setName('rate_services')
- ->setValue(Mage::getSingleton('adminhtml/session')->getCurrencyRateService(true))
- ->setTitle(Mage::helper('adminhtml')->__('Import Service'))
- ->toHtml();
-
+ return $this->getChildHtml('import_services');
}
protected function getRatesMatrixHtml()
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Form.php
index c68dbb4fc3..58d2b33794 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Form.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Form.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -47,4 +47,4 @@ protected function _prepareForm()
$this->setForm($form);
return parent::_prepareForm();
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Tab/Main.php b/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Tab/Main.php
index 14a05d45f4..de868984c2 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Tab/Main.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Tab/Main.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -34,4 +34,4 @@
class Mage_Adminhtml_Block_System_Currency_Edit_Tab_Main extends Mage_Adminhtml_Block_Widget_Form
{
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Tab/Rates.php b/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Tab/Rates.php
index 35b9bf29be..183c95b17a 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Tab/Rates.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Tab/Rates.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Tabs.php
index f8804c9edc..20680abb34 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Tabs.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Tabs.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -56,4 +56,4 @@ protected function _beforeToHtml()
return parent::_beforeToHtml();
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Currency/Rate/Matrix.php b/app/code/core/Mage/Adminhtml/Block/System/Currency/Rate/Matrix.php
index 1224cf90e4..d2bd3779ba 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Currency/Rate/Matrix.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Currency/Rate/Matrix.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -82,18 +82,18 @@ protected function _prepareRates($array)
}
foreach ($array as $key => $rate) {
- foreach ($rate as $code => $value) {
- $parts = explode('.', $value);
- if( sizeof($parts) == 2 ) {
- $parts[1] = str_pad(rtrim($parts[1], 0), 4, '0', STR_PAD_RIGHT);
- $array[$key][$code] = join('.', $parts);
- } elseif( $value > 0 ) {
+ foreach ($rate as $code => $value) {
+ $parts = explode('.', $value);
+ if( sizeof($parts) == 2 ) {
+ $parts[1] = str_pad(rtrim($parts[1], 0), 4, '0', STR_PAD_RIGHT);
+ $array[$key][$code] = join('.', $parts);
+ } elseif( $value > 0 ) {
$array[$key][$code] = number_format($value, 4);
- } else {
- $array[$key][$code] = null;
- }
- }
+ } else {
+ $array[$key][$code] = null;
+ }
+ }
}
return $array;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Currency/Rate/Services.php b/app/code/core/Mage/Adminhtml/Block/System/Currency/Rate/Services.php
new file mode 100644
index 0000000000..693420824c
--- /dev/null
+++ b/app/code/core/Mage/Adminhtml/Block/System/Currency/Rate/Services.php
@@ -0,0 +1,67 @@
+
+ */
+class Mage_Adminhtml_Block_System_Currency_Rate_Services extends Mage_Adminhtml_Block_Template
+{
+
+ /**
+ * Set import services template
+ *
+ */
+ protected function _construct()
+ {
+ parent::_construct();
+ $this->setTemplate('system/currency/rate/services.phtml');
+ }
+
+ /**
+ * Create import services form select element
+ *
+ * @return Mage_Core_Block_Abstract
+ */
+ protected function _prepareLayout()
+ {
+ $this->setChild('import_services',
+ $this->getLayout()->createBlock('adminhtml/html_select')
+ ->setOptions(Mage::getModel('adminhtml/system_config_source_currency_service')->toOptionArray(0))
+ ->setId('rate_services')
+ ->setName('rate_services')
+ ->setValue(Mage::getSingleton('adminhtml/session')->getCurrencyRateService(true))
+ ->setTitle(Mage::helper('adminhtml')->__('Import Service'))
+ );
+
+ return parent::_prepareLayout();
+ }
+
+}
\ No newline at end of file
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Design.php b/app/code/core/Mage/Adminhtml/Block/System/Design.php
index ed8ab9e826..d5365b4d7d 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Design.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Design.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
@@ -43,4 +43,4 @@ protected function _prepareLayout()
$this->setChild('grid', $this->getLayout()->createBlock('adminhtml/system_design_grid', 'design.grid'));
return parent::_prepareLayout();
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Design/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Design/Edit.php
index 05307f1823..3370daa17c 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Design/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Design/Edit.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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_Adminhtml_Block_System_Design_Edit extends Mage_Adminhtml_Block_Widget
@@ -94,4 +94,4 @@ public function getHeader()
}
return $header;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Design/Edit/Tab/General.php b/app/code/core/Mage/Adminhtml/Block/System/Design/Edit/Tab/General.php
index 33b039abda..50d8154e07 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Design/Edit/Tab/General.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Design/Edit/Tab/General.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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_Adminhtml_Block_System_Design_Edit_Tab_General extends Mage_Adminhtml_Block_Widget_Form
{
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Design/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/System/Design/Edit/Tabs.php
index 9a21098f77..4547dbd6ed 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Design/Edit/Tabs.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Design/Edit/Tabs.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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_Adminhtml_Block_System_Design_Edit_Tabs extends Mage_Adminhtml_Block_Widget_Tabs
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Design/Grid.php b/app/code/core/Mage/Adminhtml/Block/System/Design/Grid.php
index 6ca67b6dc2..5fdc99dd42 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Design/Grid.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Design/Grid.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Adminhtml
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Email/Template.php b/app/code/core/Mage/Adminhtml/Block/System/Email/Template.php
index faffb1068d..ef4a7a1795 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Email/Template.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Email/Template.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -34,25 +34,61 @@
class Mage_Adminhtml_Block_System_Email_Template extends Mage_Adminhtml_Block_Template
{
- public function __construct()
+ /**
+ * Set transactional emails grid template
+ *
+ */
+ protected function _construct()
{
- parent::__construct();
+ parent::_construct();
$this->setTemplate('system/email/template/list.phtml');
}
+ /**
+ * Create add button and grid blocks
+ *
+ * @return Mage_Core_Block_Abstract
+ */
protected function _prepareLayout()
{
+ $this->setChild('add_button',
+ $this->getLayout()->createBlock('adminhtml/widget_button')
+ ->setData(array(
+ 'label' => Mage::helper('adminhtml')->__('Add New Template'),
+ 'onclick' => "window.location='" . $this->getCreateUrl() . "'",
+ 'class' => 'add'
+ )));
$this->setChild('grid', $this->getLayout()->createBlock('adminhtml/system_email_template_grid', 'email.template.grid'));
return parent::_prepareLayout();
}
+ /**
+ * Get URL for create new email template
+ *
+ * @return string
+ */
public function getCreateUrl()
{
return $this->getUrl('*/*/new');
}
+ /**
+ * Get transactional emails page header text
+ *
+ * @return string
+ */
public function getHeaderText()
{
return Mage::helper('adminhtml')->__('Transactional Emails');
}
+
+ /**
+ * Get Add New Template button html
+ *
+ * @return string
+ */
+ protected function getAddButtonHtml()
+ {
+ return $this->getChildHtml('add_button');
+ }
}
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit.php
index 13cc76d3c4..922662390b 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit/Form.php
index 36ce88cc1f..43bfeaa2c1 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit/Form.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit/Form.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -58,12 +58,12 @@ protected function _prepareForm()
$fieldset->addField('template_text', 'editor', array(
'name'=>'template_text',
- 'wysiwyg' => !Mage::registry('email_template')->isPlain(),
+ 'wysiwyg' => false, //!Mage::registry('email_template')->isPlain(),
'label' => Mage::helper('adminhtml')->__('Template Content'),
'required' => true,
'theme' => 'advanced',
'state' => 'html',
- 'style' => 'height:24em;',
+ 'style' => 'height:24em;',
));
if (Mage::registry('email_template')->getId()) {
@@ -71,7 +71,7 @@ protected function _prepareForm()
}
if ($values = Mage::getSingleton('adminhtml/session')->getData('email_template_form_data', true)) {
- $form->setValues($values);
+ $form->setValues($values);
}
$this->setForm($form);
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid.php b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid.php
index 8596d76e4e..f4d2441394 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -52,8 +52,8 @@ protected function _prepareColumns()
{
$this->addColumn('template_id',
array(
- 'header'=>Mage::helper('adminhtml')->__('ID'),
- 'index'=>'template_id'
+ 'header'=>Mage::helper('adminhtml')->__('ID'),
+ 'index'=>'template_id'
)
);
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Filter/Type.php b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Filter/Type.php
index 0647c3e803..d80c2b3432 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Filter/Type.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Filter/Type.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -34,31 +34,31 @@
class Mage_Adminhtml_Block_System_Email_Template_Grid_Filter_Type extends Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Select
{
- protected static $_types = array(
- null => null,
- Mage_Newsletter_Model_Template::TYPE_HTML => 'HTML',
- Mage_Newsletter_Model_Template::TYPE_TEXT => 'Text',
- );
+ protected static $_types = array(
+ null => null,
+ Mage_Newsletter_Model_Template::TYPE_HTML => 'HTML',
+ Mage_Newsletter_Model_Template::TYPE_TEXT => 'Text',
+ );
- protected function _getOptions()
- {
- $result = array();
- foreach (self::$_types as $code=>$label) {
- $result[] = array('value'=>$code, 'label'=>Mage::helper('adminhtml')->__($label));
- }
+ protected function _getOptions()
+ {
+ $result = array();
+ foreach (self::$_types as $code=>$label) {
+ $result[] = array('value'=>$code, 'label'=>Mage::helper('adminhtml')->__($label));
+ }
- return $result;
- }
+ return $result;
+ }
- public function getCondition()
- {
- if(is_null($this->getValue())) {
- return null;
- }
+ public function getCondition()
+ {
+ if(is_null($this->getValue())) {
+ return null;
+ }
- return array('eq'=>$this->getValue());
- }
+ return array('eq'=>$this->getValue());
+ }
}// Class Mage_Adminhtml_Block_Newsletter_Queue_Grid_Filter_Status END
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Renderer/Action.php b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Renderer/Action.php
index ab43cb28c9..37a692159f 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Renderer/Action.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Renderer/Action.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -36,32 +36,32 @@ class Mage_Adminhtml_Block_System_Email_Template_Grid_Renderer_Action extends Ma
{
public function render(Varien_Object $row)
{
- $actions = array();
+ $actions = array();
- $actions[] = array(
- 'url' => $this->getUrl('*/*/preview', array('id'=>$row->getId())),
- 'popup' => true,
- 'caption' => $this->__('Preview')
- );
+ $actions[] = array(
+ 'url' => $this->getUrl('*/*/preview', array('id'=>$row->getId())),
+ 'popup' => true,
+ 'caption' => $this->__('Preview')
+ );
$this->getColumn()->setActions($actions);
- return parent::render($row);
+ return parent::render($row);
}
protected function _getEscapedValue($value)
{
- return addcslashes(htmlspecialchars($value),'\\\'');
+ return addcslashes(htmlspecialchars($value),'\\\'');
}
protected function _actionsToHtml(array $actions)
{
- $html = array();
- $attributesObject = new Varien_Object();
- foreach ($actions as $action) {
- $attributesObject->setData($action['@']);
- $html[] = 'serialize() . '>' . $action['#'] . '';
- }
- return implode(' | ', $html);
+ $html = array();
+ $attributesObject = new Varien_Object();
+ foreach ($actions as $action) {
+ $attributesObject->setData($action['@']);
+ $html[] = 'serialize() . '>' . $action['#'] . '';
+ }
+ return implode(' | ', $html);
}
}
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Renderer/Sender.php b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Renderer/Sender.php
index cc1b785c69..9dfa63c3f2 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Renderer/Sender.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Renderer/Sender.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -52,4 +52,4 @@ public function render(Varien_Object $row)
return $str;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Renderer/Type.php b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Renderer/Type.php
index ad97878056..19fd969f80 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Renderer/Type.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Renderer/Type.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -34,10 +34,10 @@
class Mage_Adminhtml_Block_System_Email_Template_Grid_Renderer_Type extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract
{
- protected static $_types = array(
- Mage_Newsletter_Model_Template::TYPE_HTML => 'HTML',
- Mage_Newsletter_Model_Template::TYPE_TEXT => 'Text',
- );
+ protected static $_types = array(
+ Mage_Newsletter_Model_Template::TYPE_HTML => 'HTML',
+ Mage_Newsletter_Model_Template::TYPE_TEXT => 'Text',
+ );
public function render(Varien_Object $row)
{
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Preview.php b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Preview.php
index 28c8e795ab..9c1ba01468 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Preview.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Preview.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Delete.php
index 7d263966b2..82ffa0c558 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Delete.php
@@ -1,100 +1,100 @@
-
- */
-class Mage_Adminhtml_Block_System_Store_Delete extends Mage_Adminhtml_Block_Widget_Form_Container
-{
-
- /**
- * Class constructor
- *
- */
- public function __construct()
- {
- $this->_objectId = 'item_id';
- $this->_mode = 'delete';
- $this->_controller = 'system_store';
-
- parent::__construct();
-
- $this->_removeButton('save');
- $this->_removeButton('reset');
-
- $this->_updateButton('delete', 'area', 'footer');
- $this->_updateButton('delete', 'onclick', 'editForm.submit();');
-
- $this->_addButton('cancel', array(
- 'label' => Mage::helper('adminhtml')->__('Cancel'),
- 'onclick' => 'setLocation(\'' . $this->getBackUrl() . '\')',
- ), 2, 100, 'footer');
-
- }
-
- /**
- * Get edit form container header text
- *
- * @return string
- */
- public function getHeaderText()
- {
- return Mage::helper('adminhtml')->__("Delete %s '%s'", $this->getStoreTypeTitle(),
- $this->htmlEscape($this->getChild('form')->getDataObject()->getName()));
- }
-
- /**
- * Set store type title
- *
- * @param string $title
- * @return Mage_Adminhtml_Block_System_Store_Delete
- */
- public function setStoreTypeTitle($title)
- {
- $this->_updateButton('delete', 'label', Mage::helper('adminhtml')->__('Delete %s', $title));
- return $this->setData('store_type_title', $title);
- }
-
- /**
- * Set back URL for "Cancel" and "Back" buttons
- *
- * @param string $url
- * @return Mage_Adminhtml_Block_System_Store_Delete
- */
- public function setBackUrl($url)
- {
- $this->setData('back_url', $url);
- $this->_updateButton('cancel', 'onclick', "setLocation('" . $url . "')");
- $this->_updateButton('back', 'onclick', "setLocation('" . $url . "')");
- return $this;
- }
-
-}
+
+ */
+class Mage_Adminhtml_Block_System_Store_Delete extends Mage_Adminhtml_Block_Widget_Form_Container
+{
+
+ /**
+ * Class constructor
+ *
+ */
+ public function __construct()
+ {
+ $this->_objectId = 'item_id';
+ $this->_mode = 'delete';
+ $this->_controller = 'system_store';
+
+ parent::__construct();
+
+ $this->_removeButton('save');
+ $this->_removeButton('reset');
+
+ $this->_updateButton('delete', 'area', 'footer');
+ $this->_updateButton('delete', 'onclick', 'editForm.submit();');
+
+ $this->_addButton('cancel', array(
+ 'label' => Mage::helper('adminhtml')->__('Cancel'),
+ 'onclick' => 'setLocation(\'' . $this->getBackUrl() . '\')',
+ ), 2, 100, 'footer');
+
+ }
+
+ /**
+ * Get edit form container header text
+ *
+ * @return string
+ */
+ public function getHeaderText()
+ {
+ return Mage::helper('adminhtml')->__("Delete %s '%s'", $this->getStoreTypeTitle(),
+ $this->htmlEscape($this->getChild('form')->getDataObject()->getName()));
+ }
+
+ /**
+ * Set store type title
+ *
+ * @param string $title
+ * @return Mage_Adminhtml_Block_System_Store_Delete
+ */
+ public function setStoreTypeTitle($title)
+ {
+ $this->_updateButton('delete', 'label', Mage::helper('adminhtml')->__('Delete %s', $title));
+ return $this->setData('store_type_title', $title);
+ }
+
+ /**
+ * Set back URL for "Cancel" and "Back" buttons
+ *
+ * @param string $url
+ * @return Mage_Adminhtml_Block_System_Store_Delete
+ */
+ public function setBackUrl($url)
+ {
+ $this->setData('back_url', $url);
+ $this->_updateButton('cancel', 'onclick', "setLocation('" . $url . "')");
+ $this->_updateButton('back', 'onclick', "setLocation('" . $url . "')");
+ return $this;
+ }
+
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Form.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Form.php
index 8aeda2f40d..8c79bdd864 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Form.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Form.php
@@ -1,80 +1,80 @@
-
- */
-class Mage_Adminhtml_Block_System_Store_Delete_Form extends Mage_Adminhtml_Block_Widget_Form
-{
-
- /**
- * Init form
- */
- public function __construct()
- {
- parent::__construct();
- $this->setId('store_delete_form');
- $this->setTitle(Mage::helper('cms')->__('Block Information'));
- }
-
- protected function _prepareForm()
- {
- $dataObject = $this->getDataObject();
-
- $form = new Varien_Data_Form(array('id' => 'edit_form', 'action' => $this->getData('action'), 'method' => 'post'));
-
- $form->setHtmlIdPrefix('store_');
-
- $fieldset = $form->addFieldset('base_fieldset', array('legend' => Mage::helper('core')->__('Backup options'), 'class' => 'fieldset-wide'));
-
- $fieldset->addField('item_id', 'hidden', array(
- 'name' => 'item_id',
- 'value' => $dataObject->getId(),
- ));
-
- $fieldset->addField('create_backup', 'select', array(
- 'label' => Mage::helper('adminhtml')->__('Create DB Backup'),
- 'title' => Mage::helper('adminhtml')->__('Create DB Backup'),
- 'name' => 'create_backup',
- 'options' => array(
- '1' => Mage::helper('adminhtml')->__('Yes'),
- '0' => Mage::helper('adminhtml')->__('No'),
- ),
- 'value' => '1',
- ));
-
- $form->setUseContainer(true);
- $this->setForm($form);
-
- return parent::_prepareForm();
- }
-
-}
+
+ */
+class Mage_Adminhtml_Block_System_Store_Delete_Form extends Mage_Adminhtml_Block_Widget_Form
+{
+
+ /**
+ * Init form
+ */
+ public function __construct()
+ {
+ parent::__construct();
+ $this->setId('store_delete_form');
+ $this->setTitle(Mage::helper('cms')->__('Block Information'));
+ }
+
+ protected function _prepareForm()
+ {
+ $dataObject = $this->getDataObject();
+
+ $form = new Varien_Data_Form(array('id' => 'edit_form', 'action' => $this->getData('action'), 'method' => 'post'));
+
+ $form->setHtmlIdPrefix('store_');
+
+ $fieldset = $form->addFieldset('base_fieldset', array('legend' => Mage::helper('core')->__('Backup options'), 'class' => 'fieldset-wide'));
+
+ $fieldset->addField('item_id', 'hidden', array(
+ 'name' => 'item_id',
+ 'value' => $dataObject->getId(),
+ ));
+
+ $fieldset->addField('create_backup', 'select', array(
+ 'label' => Mage::helper('adminhtml')->__('Create DB Backup'),
+ 'title' => Mage::helper('adminhtml')->__('Create DB Backup'),
+ 'name' => 'create_backup',
+ 'options' => array(
+ '1' => Mage::helper('adminhtml')->__('Yes'),
+ '0' => Mage::helper('adminhtml')->__('No'),
+ ),
+ 'value' => '1',
+ ));
+
+ $form->setUseContainer(true);
+ $this->setForm($form);
+
+ return parent::_prepareForm();
+ }
+
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Group.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Group.php
index aeddce6a8e..d3593e6b96 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Group.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Group.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -67,4 +67,4 @@ protected function _prepareLayout()
);
return parent::_prepareLayout();
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Website.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Website.php
index 4bd0d38f1c..0ccf656749 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Website.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Website.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Edit.php
index 9a93fa9670..158d391d2d 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Store/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Edit.php
@@ -1,103 +1,103 @@
-
- */
-
-class Mage_Adminhtml_Block_System_Store_Edit extends Mage_Adminhtml_Block_Widget_Form_Container
-{
- /**
- * Init class
- *
- */
- public function __construct()
- {
- switch (Mage::registry('store_type')) {
- case 'website':
- $this->_objectId = 'website_id';
- $saveLabel = Mage::helper('core')->__('Save Website');
- $deleteLabel = Mage::helper('core')->__('Delete Website');
- $deleteUrl = $this->getUrl('*/*/deleteWebsite', array('item_id' => Mage::registry('store_data')->getId()));
- break;
- case 'group':
- $this->_objectId = 'group_id';
- $saveLabel = Mage::helper('core')->__('Save Store');
- $deleteLabel = Mage::helper('core')->__('Delete Store');
- $deleteUrl = $this->getUrl('*/*/deleteGroup', array('item_id' => Mage::registry('store_data')->getId()));
- break;
- case 'store':
- $this->_objectId = 'store_id';
- $saveLabel = Mage::helper('core')->__('Save Store View');
- $deleteLabel = Mage::helper('core')->__('Delete Store View');
- $deleteUrl = $this->getUrl('*/*/deleteStore', array('item_id' => Mage::registry('store_data')->getId()));
- break;
- }
- $this->_controller = 'system_store';
-
- parent::__construct();
-
- $this->_updateButton('save', 'label', $saveLabel);
- $this->_updateButton('delete', 'label', $deleteLabel);
- $this->_updateButton('delete', 'onclick', 'setLocation(\''.$deleteUrl.'\');');
-
- if (!Mage::registry('store_data')->isCanDelete()) {
- $this->_removeButton('delete');
- }
- if (Mage::registry('store_data')->isReadOnly()) {
- $this->_removeButton('save')->_removeButton('reset');
- }
- }
-
- /**
- * Get Header text
- *
- * @return string
- */
- public function getHeaderText()
- {
- switch (Mage::registry('store_type')) {
- case 'website':
- $editLabel = Mage::helper('core')->__('Edit Website');
- $addLabel = Mage::helper('core')->__('New Website');
- break;
- case 'group':
- $editLabel = Mage::helper('core')->__('Edit Store');
- $addLabel = Mage::helper('core')->__('New Store');
- break;
- case 'store':
- $editLabel = Mage::helper('core')->__('Edit Store View');
- $addLabel = Mage::helper('core')->__('New Store View');
- break;
- }
-
- return Mage::registry('store_action') == 'add' ? $addLabel : $editLabel;
- }
-}
+
+ */
+
+class Mage_Adminhtml_Block_System_Store_Edit extends Mage_Adminhtml_Block_Widget_Form_Container
+{
+ /**
+ * Init class
+ *
+ */
+ public function __construct()
+ {
+ switch (Mage::registry('store_type')) {
+ case 'website':
+ $this->_objectId = 'website_id';
+ $saveLabel = Mage::helper('core')->__('Save Website');
+ $deleteLabel = Mage::helper('core')->__('Delete Website');
+ $deleteUrl = $this->getUrl('*/*/deleteWebsite', array('item_id' => Mage::registry('store_data')->getId()));
+ break;
+ case 'group':
+ $this->_objectId = 'group_id';
+ $saveLabel = Mage::helper('core')->__('Save Store');
+ $deleteLabel = Mage::helper('core')->__('Delete Store');
+ $deleteUrl = $this->getUrl('*/*/deleteGroup', array('item_id' => Mage::registry('store_data')->getId()));
+ break;
+ case 'store':
+ $this->_objectId = 'store_id';
+ $saveLabel = Mage::helper('core')->__('Save Store View');
+ $deleteLabel = Mage::helper('core')->__('Delete Store View');
+ $deleteUrl = $this->getUrl('*/*/deleteStore', array('item_id' => Mage::registry('store_data')->getId()));
+ break;
+ }
+ $this->_controller = 'system_store';
+
+ parent::__construct();
+
+ $this->_updateButton('save', 'label', $saveLabel);
+ $this->_updateButton('delete', 'label', $deleteLabel);
+ $this->_updateButton('delete', 'onclick', 'setLocation(\''.$deleteUrl.'\');');
+
+ if (!Mage::registry('store_data')->isCanDelete()) {
+ $this->_removeButton('delete');
+ }
+ if (Mage::registry('store_data')->isReadOnly()) {
+ $this->_removeButton('save')->_removeButton('reset');
+ }
+ }
+
+ /**
+ * Get Header text
+ *
+ * @return string
+ */
+ public function getHeaderText()
+ {
+ switch (Mage::registry('store_type')) {
+ case 'website':
+ $editLabel = Mage::helper('core')->__('Edit Website');
+ $addLabel = Mage::helper('core')->__('New Website');
+ break;
+ case 'group':
+ $editLabel = Mage::helper('core')->__('Edit Store');
+ $addLabel = Mage::helper('core')->__('New Store');
+ break;
+ case 'store':
+ $editLabel = Mage::helper('core')->__('Edit Store View');
+ $addLabel = Mage::helper('core')->__('New Store View');
+ break;
+ }
+
+ return Mage::registry('store_action') == 'add' ? $addLabel : $editLabel;
+ }
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Edit/Form.php
index 1d590f9d09..59d1551053 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Store/Edit/Form.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Edit/Form.php
@@ -1,340 +1,340 @@
-
- */
-class Mage_Adminhtml_Block_System_Store_Edit_Form extends Mage_Adminhtml_Block_Widget_Form
-{
-
- /**
- * Class constructor
- *
- */
- public function __construct()
- {
- parent::__construct();
- $this->setId('coreStoreForm');
- }
-
- /**
- * Prepare form data
- *
- * return Mage_Adminhtml_Block_Widget_Form
- */
- protected function _prepareForm()
- {
- if (Mage::registry('store_type') == 'website') {
- $websiteModel = Mage::registry('store_data');
- $showWebsiteFieldset = true;
- $showGroupFieldset = $showStoreFieldset = false;
- } elseif (Mage::registry('store_type') == 'group') {
- $groupModel = Mage::registry('store_data');
- $showGroupFieldset = true;
- $showWebsiteFieldset = $showStoreFieldset = false;
- } elseif (Mage::registry('store_type') == 'store') {
- $storeModel = Mage::registry('store_data');
- $showWebsiteFieldset = $showGroupFieldset = false;
- $showStoreFieldset = true;
- }
-
- /* @var $websiteModel Mage_Core_Model_Website */
- /* @var $groupModel Mage_Core_Model_Store_Group */
- /* @var $storeModel Mage_Core_Model_Store */
-
- $form = new Varien_Data_Form(array(
- 'id' => 'edit_form',
- 'action' => $this->getData('action'),
- 'method' => 'post'
- ));
-
- if ($showWebsiteFieldset) {
- if ($postData = Mage::registry('store_post_data')) {
- $websiteModel->setData($postData['website']);
- }
- $fieldset = $form->addFieldset('website_fieldset', array(
- 'legend' => Mage::helper('core')->__('Website Information')
- ));
- /* @var $fieldset Varien_Data_Form */
-
- $fieldset->addField('website_name', 'text', array(
- 'name' => 'website[name]',
- 'label' => Mage::helper('core')->__('Name'),
- 'value' => $websiteModel->getName(),
- 'required' => true,
- 'disabled' => $websiteModel->isReadOnly(),
- ));
-
- $fieldset->addField('website_code', 'text', array(
- 'name' => 'website[code]',
- 'label' => Mage::helper('core')->__('Code'),
- 'value' => $websiteModel->getCode(),
- 'required' => true,
- 'disabled' => $websiteModel->isReadOnly(),
- ));
-
- $fieldset->addField('website_sort_order', 'text', array(
- 'name' => 'website[sort_order]',
- 'label' => Mage::helper('core')->__('Sort order'),
- 'value' => $websiteModel->getSortOrder(),
- 'required' => false,
- 'disabled' => $websiteModel->isReadOnly(),
- ));
-
- if (Mage::registry('store_action') == 'edit') {
- $groups = Mage::getModel('core/store_group')->getCollection()->addWebsiteFilter($websiteModel->getId())->toOptionArray();
- //array_unshift($groups, array('label'=>'', 'value'=>0));
- $fieldset->addField('website_default_group_id', 'select', array(
- 'name' => 'website[default_group_id]',
- 'label' => Mage::helper('core')->__('Default Store'),
- 'value' => $websiteModel->getDefaultGroupId(),
- 'values' => $groups,
- 'required' => false,
- 'disabled' => $websiteModel->isReadOnly(),
- ));
- }
-
- if (!$websiteModel->getIsDefault() && $websiteModel->getStoresCount()) {
- $fieldset->addField('is_default', 'checkbox', array(
- 'name' => 'website[is_default]',
- 'label' => Mage::helper('core')->__('Set as default'),
- 'value' => 1,
- 'disabled' => $websiteModel->isReadOnly(),
- ));
- }
- else {
- $fieldset->addField('is_default', 'hidden', array(
- 'name' => 'website[is_default]',
- 'value' => $websiteModel->getIsDefault()
- ));
- }
-
- $fieldset->addField('website_website_id', 'hidden', array(
- 'name' => 'website[website_id]',
- 'value' => $websiteModel->getId()
- ));
- }
-
- if ($showGroupFieldset) {
- if ($postData = Mage::registry('store_post_data')) {
- $groupModel->setData($postData['group']);
- }
- $fieldset = $form->addFieldset('group_fieldset', array(
- 'legend' => Mage::helper('core')->__('Store Information')
- ));
-
- if (Mage::registry('store_action') == 'edit'
- || (Mage::registry('store_action') == 'add' && Mage::registry('store_type') == 'group')) {
- $websites = Mage::getModel('core/website')->getCollection()->toOptionArray();
- $fieldset->addField('group_website_id', 'select', array(
- 'name' => 'group[website_id]',
- 'label' => Mage::helper('core')->__('Website'),
- 'value' => $groupModel->getWebsiteId(),
- 'values' => $websites,
- 'required' => true,
- 'disabled' => $groupModel->isReadOnly(),
- ));
-
- if ($groupModel->getId() && $groupModel->getWebsite()->getDefaultGroupId() == $groupModel->getId()) {
- if ($groupModel->getWebsite()->getIsDefault() || $groupModel->getWebsite()->getGroupsCount() == 1) {
- $form->getElement('group_website_id')->setDisabled(true);
-
- $fieldset->addField('group_hidden_website_id', 'hidden', array(
- 'name' => 'group[website_id]',
- 'no_span' => true,
- 'value' => $groupModel->getWebsiteId()
- ));
- }
- else {
- $fieldset->addField('group_original_website_id', 'hidden', array(
- 'name' => 'group[original_website_id]',
- 'no_span' => true,
- 'value' => $groupModel->getWebsiteId()
- ));
- }
- }
- }
-
- $fieldset->addField('group_name', 'text', array(
- 'name' => 'group[name]',
- 'label' => Mage::helper('core')->__('Name'),
- 'value' => $groupModel->getName(),
- 'required' => true,
- 'disabled' => $groupModel->isReadOnly(),
- ));
-
- $categories = Mage::getModel('adminhtml/system_config_source_category')->toOptionArray();
-
- $fieldset->addField('group_root_category_id', 'select', array(
- 'name' => 'group[root_category_id]',
- 'label' => Mage::helper('core')->__('Root Category'),
- 'value' => $groupModel->getRootCategoryId(),
- 'values' => $categories,
- 'required' => true,
- 'disabled' => $groupModel->isReadOnly(),
- ));
-
- if (Mage::registry('store_action') == 'edit') {
- $stores = Mage::getModel('core/store')->getCollection()->addGroupFilter($groupModel->getId())->toOptionArray();
- //array_unshift($stores, array('label'=>'', 'value'=>0));
- $fieldset->addField('group_default_store_id', 'select', array(
- 'name' => 'group[default_store_id]',
- 'label' => Mage::helper('core')->__('Default Store View'),
- 'value' => $groupModel->getDefaultStoreId(),
- 'values' => $stores,
- 'required' => false,
- 'disabled' => $groupModel->isReadOnly(),
- ));
- }
-
- $fieldset->addField('group_group_id', 'hidden', array(
- 'name' => 'group[group_id]',
- 'no_span' => true,
- 'value' => $groupModel->getId()
- ));
- }
-
- if ($showStoreFieldset) {
- if ($postData = Mage::registry('store_post_data')) {
- $storeModel->setData($postData['store']);
- }
- $fieldset = $form->addFieldset('store_fieldset', array(
- 'legend' => Mage::helper('core')->__('Store View Information')
- ));
-
- if (Mage::registry('store_action') == 'edit'
- || Mage::registry('store_action') == 'add' && Mage::registry('store_type') == 'store') {
- $websites = Mage::getModel('core/website')->getCollection();
- $allgroups = Mage::getModel('core/store_group')->getCollection();
- $groups = array();
- foreach ($websites as $website) {
- $values = array();
- foreach ($allgroups as $group) {
- if ($group->getWebsiteId() == $website->getId()) {
- $values[] = array('label'=>$group->getName(),'value'=>$group->getId());
- }
- }
- $groups[] = array('label'=>$website->getName(),'value'=>$values);
- }
- $fieldset->addField('store_group_id', 'select', array(
- 'name' => 'store[group_id]',
- 'label' => Mage::helper('core')->__('Store'),
- 'value' => $storeModel->getGroupId(),
- 'values' => $groups,
- 'required' => true,
- 'disabled' => $storeModel->isReadOnly(),
- ));
- if ($storeModel->getId() && $storeModel->getGroup()->getDefaultStoreId() == $storeModel->getId()) {
- if ($storeModel->getGroup() && $storeModel->getGroup()->getStoresCount() > 1) {
- $form->getElement('store_group_id')->setDisabled(true);
-
- $fieldset->addField('store_hidden_group_id', 'hidden', array(
- 'name' => 'store[group_id]',
- 'no_span' => true,
- 'value' => $storeModel->getGroupId()
- ));
- }
- else {
- $fieldset->addField('store_original_group_id', 'hidden', array(
- 'name' => 'store[original_group_id]',
- 'no_span' => true,
- 'value' => $storeModel->getGroupId()
- ));
- }
- }
- }
-
- $fieldset->addField('store_name', 'text', array(
- 'name' => 'store[name]',
- 'label' => Mage::helper('core')->__('Name'),
- 'value' => $storeModel->getName(),
- 'required' => true,
- 'disabled' => $storeModel->isReadOnly(),
- ));
- $fieldset->addField('store_code', 'text', array(
- 'name' => 'store[code]',
- 'label' => Mage::helper('core')->__('Code'),
- 'value' => $storeModel->getCode(),
- 'required' => true,
- 'disabled' => $storeModel->isReadOnly(),
- ));
-
- $fieldset->addField('store_is_active', 'select', array(
- 'name' => 'store[is_active]',
- 'label' => Mage::helper('core')->__('Status'),
- 'value' => $storeModel->getIsActive(),
- 'options' => array(
- 0 => Mage::helper('adminhtml')->__('Disabled'),
- 1 => Mage::helper('adminhtml')->__('Enabled')),
- 'required' => true,
- 'disabled' => $storeModel->isReadOnly(),
- ));
-
- $fieldset->addField('store_sort_order', 'text', array(
- 'name' => 'store[sort_order]',
- 'label' => Mage::helper('core')->__('Sort order'),
- 'value' => $storeModel->getSortOrder(),
- 'required' => false,
- 'disabled' => $storeModel->isReadOnly(),
- ));
-
- $fieldset->addField('store_is_default', 'hidden', array(
- 'name' => 'store[is_default]',
- 'no_span' => true,
- 'value' => $storeModel->getIsDefault(),
- ));
-
- $fieldset->addField('store_store_id', 'hidden', array(
- 'name' => 'store[store_id]',
- 'no_span' => true,
- 'value' => $storeModel->getId(),
- 'disabled' => $storeModel->isReadOnly(),
- ));
- }
-
- $form->addField('store_type', 'hidden', array(
- 'name' => 'store_type',
- 'no_span' => true,
- 'value' => Mage::registry('store_type')
- ));
-
- $form->addField('store_action', 'hidden', array(
- 'name' => 'store_action',
- 'no_span' => true,
- 'value' => Mage::registry('store_action')
- ));
-
- $form->setAction($this->getUrl('*/*/save'));
- $form->setUseContainer(true);
- $this->setForm($form);
-
- return parent::_prepareForm();
- }
-}
+
+ */
+class Mage_Adminhtml_Block_System_Store_Edit_Form extends Mage_Adminhtml_Block_Widget_Form
+{
+
+ /**
+ * Class constructor
+ *
+ */
+ public function __construct()
+ {
+ parent::__construct();
+ $this->setId('coreStoreForm');
+ }
+
+ /**
+ * Prepare form data
+ *
+ * return Mage_Adminhtml_Block_Widget_Form
+ */
+ protected function _prepareForm()
+ {
+ if (Mage::registry('store_type') == 'website') {
+ $websiteModel = Mage::registry('store_data');
+ $showWebsiteFieldset = true;
+ $showGroupFieldset = $showStoreFieldset = false;
+ } elseif (Mage::registry('store_type') == 'group') {
+ $groupModel = Mage::registry('store_data');
+ $showGroupFieldset = true;
+ $showWebsiteFieldset = $showStoreFieldset = false;
+ } elseif (Mage::registry('store_type') == 'store') {
+ $storeModel = Mage::registry('store_data');
+ $showWebsiteFieldset = $showGroupFieldset = false;
+ $showStoreFieldset = true;
+ }
+
+ /* @var $websiteModel Mage_Core_Model_Website */
+ /* @var $groupModel Mage_Core_Model_Store_Group */
+ /* @var $storeModel Mage_Core_Model_Store */
+
+ $form = new Varien_Data_Form(array(
+ 'id' => 'edit_form',
+ 'action' => $this->getData('action'),
+ 'method' => 'post'
+ ));
+
+ if ($showWebsiteFieldset) {
+ if ($postData = Mage::registry('store_post_data')) {
+ $websiteModel->setData($postData['website']);
+ }
+ $fieldset = $form->addFieldset('website_fieldset', array(
+ 'legend' => Mage::helper('core')->__('Website Information')
+ ));
+ /* @var $fieldset Varien_Data_Form */
+
+ $fieldset->addField('website_name', 'text', array(
+ 'name' => 'website[name]',
+ 'label' => Mage::helper('core')->__('Name'),
+ 'value' => $websiteModel->getName(),
+ 'required' => true,
+ 'disabled' => $websiteModel->isReadOnly(),
+ ));
+
+ $fieldset->addField('website_code', 'text', array(
+ 'name' => 'website[code]',
+ 'label' => Mage::helper('core')->__('Code'),
+ 'value' => $websiteModel->getCode(),
+ 'required' => true,
+ 'disabled' => $websiteModel->isReadOnly(),
+ ));
+
+ $fieldset->addField('website_sort_order', 'text', array(
+ 'name' => 'website[sort_order]',
+ 'label' => Mage::helper('core')->__('Sort order'),
+ 'value' => $websiteModel->getSortOrder(),
+ 'required' => false,
+ 'disabled' => $websiteModel->isReadOnly(),
+ ));
+
+ if (Mage::registry('store_action') == 'edit') {
+ $groups = Mage::getModel('core/store_group')->getCollection()->addWebsiteFilter($websiteModel->getId())->toOptionArray();
+ //array_unshift($groups, array('label'=>'', 'value'=>0));
+ $fieldset->addField('website_default_group_id', 'select', array(
+ 'name' => 'website[default_group_id]',
+ 'label' => Mage::helper('core')->__('Default Store'),
+ 'value' => $websiteModel->getDefaultGroupId(),
+ 'values' => $groups,
+ 'required' => false,
+ 'disabled' => $websiteModel->isReadOnly(),
+ ));
+ }
+
+ if (!$websiteModel->getIsDefault() && $websiteModel->getStoresCount()) {
+ $fieldset->addField('is_default', 'checkbox', array(
+ 'name' => 'website[is_default]',
+ 'label' => Mage::helper('core')->__('Set as default'),
+ 'value' => 1,
+ 'disabled' => $websiteModel->isReadOnly(),
+ ));
+ }
+ else {
+ $fieldset->addField('is_default', 'hidden', array(
+ 'name' => 'website[is_default]',
+ 'value' => $websiteModel->getIsDefault()
+ ));
+ }
+
+ $fieldset->addField('website_website_id', 'hidden', array(
+ 'name' => 'website[website_id]',
+ 'value' => $websiteModel->getId()
+ ));
+ }
+
+ if ($showGroupFieldset) {
+ if ($postData = Mage::registry('store_post_data')) {
+ $groupModel->setData($postData['group']);
+ }
+ $fieldset = $form->addFieldset('group_fieldset', array(
+ 'legend' => Mage::helper('core')->__('Store Information')
+ ));
+
+ if (Mage::registry('store_action') == 'edit'
+ || (Mage::registry('store_action') == 'add' && Mage::registry('store_type') == 'group')) {
+ $websites = Mage::getModel('core/website')->getCollection()->toOptionArray();
+ $fieldset->addField('group_website_id', 'select', array(
+ 'name' => 'group[website_id]',
+ 'label' => Mage::helper('core')->__('Website'),
+ 'value' => $groupModel->getWebsiteId(),
+ 'values' => $websites,
+ 'required' => true,
+ 'disabled' => $groupModel->isReadOnly(),
+ ));
+
+ if ($groupModel->getId() && $groupModel->getWebsite()->getDefaultGroupId() == $groupModel->getId()) {
+ if ($groupModel->getWebsite()->getIsDefault() || $groupModel->getWebsite()->getGroupsCount() == 1) {
+ $form->getElement('group_website_id')->setDisabled(true);
+
+ $fieldset->addField('group_hidden_website_id', 'hidden', array(
+ 'name' => 'group[website_id]',
+ 'no_span' => true,
+ 'value' => $groupModel->getWebsiteId()
+ ));
+ }
+ else {
+ $fieldset->addField('group_original_website_id', 'hidden', array(
+ 'name' => 'group[original_website_id]',
+ 'no_span' => true,
+ 'value' => $groupModel->getWebsiteId()
+ ));
+ }
+ }
+ }
+
+ $fieldset->addField('group_name', 'text', array(
+ 'name' => 'group[name]',
+ 'label' => Mage::helper('core')->__('Name'),
+ 'value' => $groupModel->getName(),
+ 'required' => true,
+ 'disabled' => $groupModel->isReadOnly(),
+ ));
+
+ $categories = Mage::getModel('adminhtml/system_config_source_category')->toOptionArray();
+
+ $fieldset->addField('group_root_category_id', 'select', array(
+ 'name' => 'group[root_category_id]',
+ 'label' => Mage::helper('core')->__('Root Category'),
+ 'value' => $groupModel->getRootCategoryId(),
+ 'values' => $categories,
+ 'required' => true,
+ 'disabled' => $groupModel->isReadOnly(),
+ ));
+
+ if (Mage::registry('store_action') == 'edit') {
+ $stores = Mage::getModel('core/store')->getCollection()->addGroupFilter($groupModel->getId())->toOptionArray();
+ //array_unshift($stores, array('label'=>'', 'value'=>0));
+ $fieldset->addField('group_default_store_id', 'select', array(
+ 'name' => 'group[default_store_id]',
+ 'label' => Mage::helper('core')->__('Default Store View'),
+ 'value' => $groupModel->getDefaultStoreId(),
+ 'values' => $stores,
+ 'required' => false,
+ 'disabled' => $groupModel->isReadOnly(),
+ ));
+ }
+
+ $fieldset->addField('group_group_id', 'hidden', array(
+ 'name' => 'group[group_id]',
+ 'no_span' => true,
+ 'value' => $groupModel->getId()
+ ));
+ }
+
+ if ($showStoreFieldset) {
+ if ($postData = Mage::registry('store_post_data')) {
+ $storeModel->setData($postData['store']);
+ }
+ $fieldset = $form->addFieldset('store_fieldset', array(
+ 'legend' => Mage::helper('core')->__('Store View Information')
+ ));
+
+ if (Mage::registry('store_action') == 'edit'
+ || Mage::registry('store_action') == 'add' && Mage::registry('store_type') == 'store') {
+ $websites = Mage::getModel('core/website')->getCollection();
+ $allgroups = Mage::getModel('core/store_group')->getCollection();
+ $groups = array();
+ foreach ($websites as $website) {
+ $values = array();
+ foreach ($allgroups as $group) {
+ if ($group->getWebsiteId() == $website->getId()) {
+ $values[] = array('label'=>$group->getName(),'value'=>$group->getId());
+ }
+ }
+ $groups[] = array('label'=>$website->getName(),'value'=>$values);
+ }
+ $fieldset->addField('store_group_id', 'select', array(
+ 'name' => 'store[group_id]',
+ 'label' => Mage::helper('core')->__('Store'),
+ 'value' => $storeModel->getGroupId(),
+ 'values' => $groups,
+ 'required' => true,
+ 'disabled' => $storeModel->isReadOnly(),
+ ));
+ if ($storeModel->getId() && $storeModel->getGroup()->getDefaultStoreId() == $storeModel->getId()) {
+ if ($storeModel->getGroup() && $storeModel->getGroup()->getStoresCount() > 1) {
+ $form->getElement('store_group_id')->setDisabled(true);
+
+ $fieldset->addField('store_hidden_group_id', 'hidden', array(
+ 'name' => 'store[group_id]',
+ 'no_span' => true,
+ 'value' => $storeModel->getGroupId()
+ ));
+ }
+ else {
+ $fieldset->addField('store_original_group_id', 'hidden', array(
+ 'name' => 'store[original_group_id]',
+ 'no_span' => true,
+ 'value' => $storeModel->getGroupId()
+ ));
+ }
+ }
+ }
+
+ $fieldset->addField('store_name', 'text', array(
+ 'name' => 'store[name]',
+ 'label' => Mage::helper('core')->__('Name'),
+ 'value' => $storeModel->getName(),
+ 'required' => true,
+ 'disabled' => $storeModel->isReadOnly(),
+ ));
+ $fieldset->addField('store_code', 'text', array(
+ 'name' => 'store[code]',
+ 'label' => Mage::helper('core')->__('Code'),
+ 'value' => $storeModel->getCode(),
+ 'required' => true,
+ 'disabled' => $storeModel->isReadOnly(),
+ ));
+
+ $fieldset->addField('store_is_active', 'select', array(
+ 'name' => 'store[is_active]',
+ 'label' => Mage::helper('core')->__('Status'),
+ 'value' => $storeModel->getIsActive(),
+ 'options' => array(
+ 0 => Mage::helper('adminhtml')->__('Disabled'),
+ 1 => Mage::helper('adminhtml')->__('Enabled')),
+ 'required' => true,
+ 'disabled' => $storeModel->isReadOnly(),
+ ));
+
+ $fieldset->addField('store_sort_order', 'text', array(
+ 'name' => 'store[sort_order]',
+ 'label' => Mage::helper('core')->__('Sort order'),
+ 'value' => $storeModel->getSortOrder(),
+ 'required' => false,
+ 'disabled' => $storeModel->isReadOnly(),
+ ));
+
+ $fieldset->addField('store_is_default', 'hidden', array(
+ 'name' => 'store[is_default]',
+ 'no_span' => true,
+ 'value' => $storeModel->getIsDefault(),
+ ));
+
+ $fieldset->addField('store_store_id', 'hidden', array(
+ 'name' => 'store[store_id]',
+ 'no_span' => true,
+ 'value' => $storeModel->getId(),
+ 'disabled' => $storeModel->isReadOnly(),
+ ));
+ }
+
+ $form->addField('store_type', 'hidden', array(
+ 'name' => 'store_type',
+ 'no_span' => true,
+ 'value' => Mage::registry('store_type')
+ ));
+
+ $form->addField('store_action', 'hidden', array(
+ 'name' => 'store_action',
+ 'no_span' => true,
+ 'value' => Mage::registry('store_action')
+ ));
+
+ $form->setAction($this->getUrl('*/*/save'));
+ $form->setUseContainer(true);
+ $this->setForm($form);
+
+ return parent::_prepareForm();
+ }
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Grid.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Grid.php
index 019bcca40c..8469e03473 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Store/Grid.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Grid.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Group.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Group.php
index 4ddad90963..1714733a35 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Group.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Group.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -41,4 +41,4 @@ public function render(Varien_Object $row)
}
return '' . $row->getData($this->getColumn()->getIndex()) . '';
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Store.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Store.php
index 79843eec9c..b172cd4a08 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Store.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Store.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -41,4 +41,4 @@ public function render(Varien_Object $row)
}
return '' . $row->getData($this->getColumn()->getIndex()) . '';
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Website.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Website.php
index fe9b36fc3a..1e5f4ada25 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Website.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Website.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Store.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Store.php
index 0915938349..e80c13e931 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Store/Store.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Store.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -72,4 +72,4 @@ public function getAddNewButtonHtml()
$this->getChildHtml('add_new_store')
));
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/Tag.php b/app/code/core/Mage/Adminhtml/Block/Tag.php
index b07a8bacfa..138f253dd3 100644
--- a/app/code/core/Mage/Adminhtml/Block/Tag.php
+++ b/app/code/core/Mage/Adminhtml/Block/Tag.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Assigned/Grid.php b/app/code/core/Mage/Adminhtml/Block/Tag/Assigned/Grid.php
index 79a63b7f19..b12c8ef602 100644
--- a/app/code/core/Mage/Adminhtml/Block/Tag/Assigned/Grid.php
+++ b/app/code/core/Mage/Adminhtml/Block/Tag/Assigned/Grid.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Customer.php b/app/code/core/Mage/Adminhtml/Block/Tag/Customer.php
index 751f885a61..780df52b91 100644
--- a/app/code/core/Mage/Adminhtml/Block/Tag/Customer.php
+++ b/app/code/core/Mage/Adminhtml/Block/Tag/Customer.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Customer/Grid.php b/app/code/core/Mage/Adminhtml/Block/Tag/Customer/Grid.php
index 43a022f1c0..a848b32afe 100644
--- a/app/code/core/Mage/Adminhtml/Block/Tag/Customer/Grid.php
+++ b/app/code/core/Mage/Adminhtml/Block/Tag/Customer/Grid.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Edit.php b/app/code/core/Mage/Adminhtml/Block/Tag/Edit.php
index 1a8c691e2e..2a30ac6937 100644
--- a/app/code/core/Mage/Adminhtml/Block/Tag/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/Tag/Edit.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -144,6 +144,6 @@ public function getSaveUrl()
*/
public function getSaveAndContinueUrl()
{
- return $this->getUrl('*/*/save', array('_current' => true, 'ret' => 'edit'));
+ return $this->getUrl('*/*/save', array('_current' => true, 'ret' => 'edit', 'store' => Mage::registry('current_tag')->getStoreId()));
}
}
diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Edit/Accordion.php b/app/code/core/Mage/Adminhtml/Block/Tag/Edit/Accordion.php
index 97a5354b34..ae5d367e49 100644
--- a/app/code/core/Mage/Adminhtml/Block/Tag/Edit/Accordion.php
+++ b/app/code/core/Mage/Adminhtml/Block/Tag/Edit/Accordion.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Edit/Assigned.php b/app/code/core/Mage/Adminhtml/Block/Tag/Edit/Assigned.php
index 74af7ba2a9..cd6da7841c 100644
--- a/app/code/core/Mage/Adminhtml/Block/Tag/Edit/Assigned.php
+++ b/app/code/core/Mage/Adminhtml/Block/Tag/Edit/Assigned.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Tag/Edit/Form.php
index fe436354d9..58ee290c2c 100644
--- a/app/code/core/Mage/Adminhtml/Block/Tag/Edit/Form.php
+++ b/app/code/core/Mage/Adminhtml/Block/Tag/Edit/Form.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Grid/All.php b/app/code/core/Mage/Adminhtml/Block/Tag/Grid/All.php
index 648af97b23..cd965f273f 100644
--- a/app/code/core/Mage/Adminhtml/Block/Tag/Grid/All.php
+++ b/app/code/core/Mage/Adminhtml/Block/Tag/Grid/All.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -102,4 +102,4 @@ public function getRowUrl($row)
return $this->getUrl('*/*/products', array('tag_id' => $row->getId()));
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Grid/Customers.php b/app/code/core/Mage/Adminhtml/Block/Tag/Grid/Customers.php
index ccc303e9cb..9be138d905 100644
--- a/app/code/core/Mage/Adminhtml/Block/Tag/Grid/Customers.php
+++ b/app/code/core/Mage/Adminhtml/Block/Tag/Grid/Customers.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Grid/Pending.php b/app/code/core/Mage/Adminhtml/Block/Tag/Grid/Pending.php
index f15a6dd7bb..f569b86257 100644
--- a/app/code/core/Mage/Adminhtml/Block/Tag/Grid/Pending.php
+++ b/app/code/core/Mage/Adminhtml/Block/Tag/Grid/Pending.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Grid/Products.php b/app/code/core/Mage/Adminhtml/Block/Tag/Grid/Products.php
index 969de55d5b..d2c82209f6 100644
--- a/app/code/core/Mage/Adminhtml/Block/Tag/Grid/Products.php
+++ b/app/code/core/Mage/Adminhtml/Block/Tag/Grid/Products.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Pending.php b/app/code/core/Mage/Adminhtml/Block/Tag/Pending.php
index 18015b3913..254a67be66 100644
--- a/app/code/core/Mage/Adminhtml/Block/Tag/Pending.php
+++ b/app/code/core/Mage/Adminhtml/Block/Tag/Pending.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Product.php b/app/code/core/Mage/Adminhtml/Block/Tag/Product.php
index c5c47a4219..5d25688020 100644
--- a/app/code/core/Mage/Adminhtml/Block/Tag/Product.php
+++ b/app/code/core/Mage/Adminhtml/Block/Tag/Product.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Product/Grid.php b/app/code/core/Mage/Adminhtml/Block/Tag/Product/Grid.php
index 03dffcf868..36bbbe525f 100644
--- a/app/code/core/Mage/Adminhtml/Block/Tag/Product/Grid.php
+++ b/app/code/core/Mage/Adminhtml/Block/Tag/Product/Grid.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Store/Switcher.php b/app/code/core/Mage/Adminhtml/Block/Tag/Store/Switcher.php
index 5c72a50451..8ff55653e5 100644
--- a/app/code/core/Mage/Adminhtml/Block/Tag/Store/Switcher.php
+++ b/app/code/core/Mage/Adminhtml/Block/Tag/Store/Switcher.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -48,4 +48,4 @@ public function __construct()
$this->getUrl('*/*/*/', array('store' => null, '_current' => true))
);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Tag.php b/app/code/core/Mage/Adminhtml/Block/Tag/Tag.php
index 5b27f715af..35a1d9f87c 100644
--- a/app/code/core/Mage/Adminhtml/Block/Tag/Tag.php
+++ b/app/code/core/Mage/Adminhtml/Block/Tag/Tag.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Edit.php b/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Edit.php
index 4a246e5645..87dd1a1b65 100644
--- a/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Edit.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Edit/Form.php
index e8b7508c10..500dfc1491 100644
--- a/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Edit/Form.php
+++ b/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Edit/Form.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Grid.php b/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Grid.php
index 66f7ac9274..565bf9d1a0 100644
--- a/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Grid.php
+++ b/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Grid.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Class.php b/app/code/core/Mage/Adminhtml/Block/Tax/Class.php
index cb2677f3b0..1aa160c0c4 100644
--- a/app/code/core/Mage/Adminhtml/Block/Tax/Class.php
+++ b/app/code/core/Mage/Adminhtml/Block/Tax/Class.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -56,4 +56,4 @@ public function setClassType($classType)
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Class/Edit.php b/app/code/core/Mage/Adminhtml/Block/Tax/Class/Edit.php
index 9490c9fb73..a66713d435 100644
--- a/app/code/core/Mage/Adminhtml/Block/Tax/Class/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/Tax/Class/Edit.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -60,4 +60,4 @@ public function setClassType($classType)
$this->getChild('form')->setClassType($classType);
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Class/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Tax/Class/Edit/Form.php
index 142d34f78e..96f6e090a1 100644
--- a/app/code/core/Mage/Adminhtml/Block/Tax/Class/Edit/Form.php
+++ b/app/code/core/Mage/Adminhtml/Block/Tax/Class/Edit/Form.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -97,4 +97,4 @@ protected function _prepareForm()
return parent::_prepareForm();
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Class/Grid.php b/app/code/core/Mage/Adminhtml/Block/Tax/Class/Grid.php
index 8dfd32297d..154d7bdf71 100644
--- a/app/code/core/Mage/Adminhtml/Block/Tax/Class/Grid.php
+++ b/app/code/core/Mage/Adminhtml/Block/Tax/Class/Grid.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Form.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Form.php
index dc4585f351..74a1915160 100644
--- a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Form.php
+++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Form.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -55,9 +55,14 @@ protected function _prepareForm()
->toOptionArray();
unset($countries[0]);
+ $countryId = $rateObject->getTaxCountryId();
+ if (!$countryId) {
+ $countryId = Mage::getStoreConfig('general/country/default');
+ }
+
$regionCollection = Mage::getModel('directory/region')
->getCollection()
- ->addCountryFilter($rateModel->getTaxCountryId());
+ ->addCountryFilter($countryId);
$regions = $regionCollection->toOptionArray();
@@ -78,11 +83,6 @@ protected function _prepareForm()
);
}
- $countryId = $rateObject->getTaxCountryId();
- if (!$countryId) {
- $countryId = Mage::getStoreConfig('general/country/default');
- }
-
$fieldset->addField('code', 'text',
array(
'name' => 'code',
diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid.php
index 8ba1e92fe2..6c9ba05960 100644
--- a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid.php
+++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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_Adminhtml_Block_Tax_Rate_Grid extends Mage_Adminhtml_Block_Widget_Grid
{
diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid/Renderer/Country.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid/Renderer/Country.php
index 0e70abce9a..519aa8e96a 100644
--- a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid/Renderer/Country.php
+++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid/Renderer/Country.php
@@ -1,46 +1,46 @@
-
- */
-class Mage_Adminhtml_Block_Tax_Rate_Grid_Renderer_Country extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Country
-{
-/**
- * Render column for export
- *
- * @param Varien_Object $row
- * @return string
- */
- public function renderExport(Varien_Object $row)
- {
- return $row->getData($this->getColumn()->getIndex());
- }
-}
+
+ */
+class Mage_Adminhtml_Block_Tax_Rate_Grid_Renderer_Country extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Country
+{
+/**
+ * Render column for export
+ *
+ * @param Varien_Object $row
+ * @return string
+ */
+ public function renderExport(Varien_Object $row)
+ {
+ return $row->getData($this->getColumn()->getIndex());
+ }
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid/Renderer/Data.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid/Renderer/Data.php
index 9ce217e6bc..84f0e7c3c3 100644
--- a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid/Renderer/Data.php
+++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid/Renderer/Data.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -38,10 +38,10 @@ protected function _getValue (Varien_Object $row)
{
$data = parent::_getValue($row);
if (intval($data) == $data) {
- return (string) number_format($data, 2);
+ return (string) number_format($data, 2);
}
if (!is_null($data)) {
- return $data * 1;
+ return $data * 1;
}
return $this->getColumn()->getDefault();
}
diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/ImportExport.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/ImportExport.php
index 611cc53bf2..8e67675a5e 100644
--- a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/ImportExport.php
+++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/ImportExport.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
@@ -33,4 +33,4 @@ public function __construct()
$this->setTemplate('tax/importExport.phtml');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Title.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Title.php
index 18753c7e4b..fba526bc67 100644
--- a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Title.php
+++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Title.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
@@ -68,4 +68,4 @@ public function getStores()
}
return $stores;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Title/Fieldset.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Title/Fieldset.php
index 60b50f5f02..d9eb4b6920 100644
--- a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Title/Fieldset.php
+++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Title/Fieldset.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
@@ -36,4 +36,4 @@ public function getChildrenHtml()
{
return Mage::getBlockSingleton('adminhtml/tax_rate_title')->toHtml();
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Add.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Add.php
index 5ec762db01..9ff2b95b0e 100644
--- a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Add.php
+++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Add.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -39,4 +39,4 @@ public function __construct()
parent::__construct();
$this->setTemplate('tax/toolbar/rate/add.phtml');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Save.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Save.php
index 87b7de8bda..a37c0ec7f3 100644
--- a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Save.php
+++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Save.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -102,4 +102,4 @@ public function getDeleteButtonHtml()
}
return $this->getChildHtml('deleteButton');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rule.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rule.php
index a7e41c60ad..bab9ebfc8d 100644
--- a/app/code/core/Mage/Adminhtml/Block/Tax/Rule.php
+++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rule.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -41,4 +41,4 @@ public function __construct()
$this->_addButtonLabel = Mage::helper('tax')->__('Add New Tax Rule');
parent::__construct();
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Edit.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Edit.php
index fe98fa3c67..8e6bb3a31a 100644
--- a/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Edit.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -48,7 +48,7 @@ public function __construct()
$this->_updateButton('save', 'label', Mage::helper('tax')->__('Save Rule'));
$this->_updateButton('delete', 'label', Mage::helper('tax')->__('Delete Rule'));
- $this->_addButton('save_and_continue', array(
+ $this->_addButton('save_and_continue', array(
'label' => Mage::helper('tax')->__('Save And Continue Edit'),
'onclick' => 'saveAndContinueEdit()',
'class' => 'save'
@@ -71,4 +71,4 @@ public function getHeaderText()
return Mage::helper('tax')->__('New Rule');
}
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Edit/Form.php
index d29ca5787f..eb42064167 100644
--- a/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Edit/Form.php
+++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Edit/Form.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -155,4 +155,4 @@ protected function _prepareForm()
return parent::_prepareForm();
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Grid.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Grid.php
index c10efb02a5..f5849169f9 100644
--- a/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Grid.php
+++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Grid.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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_Adminhtml_Block_Tax_Rule_Grid extends Mage_Adminhtml_Block_Widget_Grid
{
diff --git a/app/code/core/Mage/Adminhtml/Block/Template.php b/app/code/core/Mage/Adminhtml/Block/Template.php
index ddf6835b81..0bf0f4a4f7 100644
--- a/app/code/core/Mage/Adminhtml/Block/Template.php
+++ b/app/code/core/Mage/Adminhtml/Block/Template.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/Text/List.php b/app/code/core/Mage/Adminhtml/Block/Text/List.php
index 7ccdc98fac..74005920b7 100644
--- a/app/code/core/Mage/Adminhtml/Block/Text/List.php
+++ b/app/code/core/Mage/Adminhtml/Block/Text/List.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
diff --git a/app/code/core/Mage/Adminhtml/Block/Urlrewrite.php b/app/code/core/Mage/Adminhtml/Block/Urlrewrite.php
index eeaf3cb50a..7cd3a2f5bd 100644
--- a/app/code/core/Mage/Adminhtml/Block/Urlrewrite.php
+++ b/app/code/core/Mage/Adminhtml/Block/Urlrewrite.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Category/Tree.php b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Category/Tree.php
index 163b2955fa..5a03819460 100644
--- a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Category/Tree.php
+++ b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Category/Tree.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit.php b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit.php
index a76a9ca295..dbc7f34048 100644
--- a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit/Form.php
index eabf76556c..2178f38b98 100644
--- a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit/Form.php
+++ b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit/Form.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Grid.php b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Grid.php
index 9abf72ba0c..fd499904af 100644
--- a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Grid.php
+++ b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Grid.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Link.php b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Link.php
index 90e637b12f..953210b428 100644
--- a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Link.php
+++ b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Link.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Product/Grid.php b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Product/Grid.php
index 72d527dfeb..f20c952cf9 100644
--- a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Product/Grid.php
+++ b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Product/Grid.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Selector.php b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Selector.php
index c328c1266a..a4c9552322 100644
--- a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Selector.php
+++ b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Selector.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget.php b/app/code/core/Mage/Adminhtml/Block/Widget.php
index f855325f4d..52eee3bd98 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -36,7 +36,7 @@ class Mage_Adminhtml_Block_Widget extends Mage_Adminhtml_Block_Template
public function getId()
{
if ($this->getData('id')===null) {
- $this->setData('id', 'id_'.md5(microtime()));
+ $this->setData('id', Mage::helper('core')->uniqHash('id_'));
}
return $this->getData('id');
}
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Accordion.php b/app/code/core/Mage/Adminhtml/Block/Widget/Accordion.php
index 62167e5cf4..b719843a90 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Accordion.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Accordion.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Accordion/Item.php b/app/code/core/Mage/Adminhtml/Block/Widget/Accordion/Item.php
index 7303132520..c95033952f 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Accordion/Item.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Accordion/Item.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Breadcrumbs.php b/app/code/core/Mage/Adminhtml/Block/Widget/Breadcrumbs.php
index 0a990538cc..bfed144b1f 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Breadcrumbs.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Breadcrumbs.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -65,4 +65,4 @@ protected function _beforeToHtml()
// $this->assign('links', $this->_links);
return parent::_beforeToHtml();
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Button.php b/app/code/core/Mage/Adminhtml/Block/Widget/Button.php
index 7e314c7227..ef325dc2fc 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Button.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Button.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Container.php b/app/code/core/Mage/Adminhtml/Block/Widget/Container.php
index ddd2c39f31..15b5182160 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Container.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Container.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Adminhtml
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Form.php b/app/code/core/Mage/Adminhtml/Block/Widget/Form.php
index 2be2848ca3..4b1e0ed3ce 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Form.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Form.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Adminhtml
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Container.php b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Container.php
index a77e2a7c9c..e9fe613865 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Container.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Container.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Adminhtml
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element.php b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element.php
index dda2522e02..d07c60b272 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element/Gallery.php b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element/Gallery.php
index 4f93300156..6483af8418 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element/Gallery.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element/Gallery.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Element.php b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Element.php
index 1e45dd0630..ab688b1e41 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Element.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Element.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Fieldset.php b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Fieldset.php
index efa1d37017..7fa3b1a0a1 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Fieldset.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Fieldset.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -50,4 +50,4 @@ public function render(Varien_Data_Form_Element_Abstract $element)
$this->_element = $element;
return $this->toHtml();
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Fieldset/Element.php b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Fieldset/Element.php
index 6ff8b3c149..557f0799e4 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Fieldset/Element.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Fieldset/Element.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php
index 6ca71743b7..e0fd5ca03f 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Block.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Block.php
index f3213ad48a..dbaab3c1d3 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Block.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Block.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -39,4 +39,4 @@ public function render(Varien_Object $row)
$block->setPageObject($row);
echo $block->toHtml();
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column.php
index db1856b361..cfde8c377f 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Abstract.php
index 3989a8463f..774f9d748c 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Abstract.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Abstract.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Checkbox.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Checkbox.php
index 6b9af54258..bb717d1c49 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Checkbox.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Checkbox.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -69,4 +69,4 @@ public function getCondition()
}
//return array('like'=>'%'.$this->getValue().'%');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Country.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Country.php
index 40c6ebe1d7..54c4fda2fc 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Country.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Country.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Date.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Date.php
index e1df560788..139d09a8ec 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Date.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Date.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -172,4 +172,4 @@ protected function _convertDate($date, $locale)
return null;
}
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Datetime.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Datetime.php
index c955fb2ff6..64beceb08d 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Datetime.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Datetime.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -158,4 +158,4 @@ public function getEscapedValue($index=null)
return parent::getEscapedValue($index);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Interface.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Interface.php
index db8758a3ee..683d775032 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Interface.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Interface.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Massaction.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Massaction.php
index 85ecfbf7dc..71bfe8c115 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Massaction.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Massaction.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -42,4 +42,4 @@ public function getCondition()
return array('nin'=> ( $this->getColumn()->getSelected() ? $this->getColumn()->getSelected() : array(0) ));
}
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Price.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Price.php
index 236c4d3d37..409f8150b6 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Price.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Price.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -147,4 +147,4 @@ public function prepareRates($displayCurrency)
$this->getColumn()->setCurrencyCode($displayCurrency);
}
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Radio.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Radio.php
index a22e71772a..98041a0fa3 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Radio.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Radio.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -63,4 +63,4 @@ public function getCondition()
);
}
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Range.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Range.php
index feb249dab3..4fac9eae36 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Range.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Range.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -59,4 +59,4 @@ public function getCondition()
return $value;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Select.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Select.php
index d2824893cb..e82455fef2 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Select.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Select.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -51,19 +51,19 @@ public function getHtml()
$html = '';
return $html;
}
- public function getCondition()
- {
- if (is_null($this->getValue())) {
- return null;
- }
- return array('eq' => $this->getValue());
- }
+ public function getCondition()
+ {
+ if (is_null($this->getValue())) {
+ return null;
+ }
+ return array('eq' => $this->getValue());
+ }
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Store.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Store.php
index 59ae3e348e..3064b60715 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Store.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Store.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Text.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Text.php
index 347088b96a..68426d4a4f 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Text.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Text.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Theme.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Theme.php
index 329e92257a..e01e962d82 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Theme.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Theme.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Abstract.php
index ca8288ab4b..dd716a5724 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Abstract.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Abstract.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -58,9 +58,8 @@ public function render(Varien_Object $row)
{
if ($this->getColumn()->getEditable()) {
$value = $this->_getValue($row);
- $value = $value!=''?$value:' ';
- return $value . ( ($this->getColumn()->getEditOnly() && trim($this->_getValue($row)!='')) ? '' : '| ' ) . $this->_getInputValueElement($row);
-
+ return $value . ($this->getColumn()->getEditOnly() ? '' : ($value != '' ? $value : ' ') . ' | ')
+ . $this->_getInputValueElement($row);
}
return $this->_getValue($row);
}
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Action.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Action.php
index 1865727c36..599e2c645c 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Action.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Action.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -42,30 +42,30 @@ class Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Action extends Mage_Admin
*/
public function render(Varien_Object $row)
{
- $actions = $this->getColumn()->getActions();
- if ( empty($actions) || !is_array($actions) ) {
- return ' ';
- }
+ $actions = $this->getColumn()->getActions();
+ if ( empty($actions) || !is_array($actions) ) {
+ return ' ';
+ }
- if(sizeof($actions)==1 && !$this->getColumn()->getNoLink()) {
- foreach ($actions as $action){
+ if(sizeof($actions)==1 && !$this->getColumn()->getNoLink()) {
+ foreach ($actions as $action){
if ( is_array($action) ) {
return $this->_toLinkHtml($action, $row);
- }
+ }
}
- }
+ }
- $out = '';
+ return $out;
}
/**
@@ -130,32 +130,32 @@ protected function _transformActionData(&$action, &$actionCaption, Varien_Object
$this->getColumn()->setFormat(null);
}
- switch ($attibute) {
- case 'caption':
- $actionCaption = $action['caption'];
- unset($action['caption']);
- break;
+ switch ($attibute) {
+ case 'caption':
+ $actionCaption = $action['caption'];
+ unset($action['caption']);
+ break;
- case 'url':
- if(is_array($action['url'])) {
- $params = array($action['field']=>$this->_getValue($row));
- if(isset($action['url']['params'])) {
+ case 'url':
+ if(is_array($action['url'])) {
+ $params = array($action['field']=>$this->_getValue($row));
+ if(isset($action['url']['params'])) {
$params = array_merge($action['url']['params'], $params);
- }
- $action['href'] = $this->getUrl($action['url']['base'], $params);
- unset($action['field']);
- } else {
- $action['href'] = $action['url'];
- }
- unset($action['url']);
- break;
-
- case 'popup':
- $action['onclick'] = 'popWin(this.href, \'windth=800,height=700,resizable=1,scrollbars=1\');return false;';
- break;
+ }
+ $action['href'] = $this->getUrl($action['url']['base'], $params);
+ unset($action['field']);
+ } else {
+ $action['href'] = $action['url'];
+ }
+ unset($action['url']);
+ break;
+
+ case 'popup':
+ $action['onclick'] = 'popWin(this.href, \'windth=800,height=700,resizable=1,scrollbars=1\');return false;';
+ break;
}
}
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Checkbox.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Checkbox.php
index bceadb0f60..ef44f0935d 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Checkbox.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Checkbox.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Concat.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Concat.php
index 1093cb5e1b..870938aca9 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Concat.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Concat.php
@@ -1,57 +1,57 @@
-
- */
-
-class Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Concat extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract
-{
-
- /**
- * Renders grid column
- *
- * @param Varien_Object $row
- * @return string
- */
- public function render(Varien_Object $row)
- {
- $dataArr = array();
- foreach ($this->getColumn()->getIndex() as $index) {
- if ($data = $row->getData($index)) {
- $dataArr[] = $data;
- }
- }
- $data = join($this->getColumn()->getSeparator(), $dataArr);
- // TODO run column type renderer
- return $data;
- }
-
-}
\ No newline at end of file
+
+ */
+
+class Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Concat extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract
+{
+
+ /**
+ * Renders grid column
+ *
+ * @param Varien_Object $row
+ * @return string
+ */
+ public function render(Varien_Object $row)
+ {
+ $dataArr = array();
+ foreach ($this->getColumn()->getIndex() as $index) {
+ if ($data = $row->getData($index)) {
+ $dataArr[] = $data;
+ }
+ }
+ $data = join($this->getColumn()->getSeparator(), $dataArr);
+ // TODO run column type renderer
+ return $data;
+ }
+
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Country.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Country.php
index 36fe481ac7..9968cbd729 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Country.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Country.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Currency.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Currency.php
index 414d3f2231..45285d0c4d 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Currency.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Currency.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -90,4 +90,4 @@ public function renderCss()
{
return parent::renderCss() . ' a-right';
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Date.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Date.php
index 3bbe7f1439..d5fb134015 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Date.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Date.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Datetime.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Datetime.php
index eb370e5af9..a6e11b8f10 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Datetime.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Datetime.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -34,20 +34,20 @@
class Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Datetime extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract
{
- /**
- * Date format string
- */
- protected static $_format = null;
+ /**
+ * Date format string
+ */
+ protected static $_format = null;
- /**
- * Retrieve datetime format
- *
- * @return unknown
- */
- protected function _getFormat()
- {
- $format = $this->getColumn()->getFormat();
- if (!$format) {
+ /**
+ * Retrieve datetime format
+ *
+ * @return unknown
+ */
+ protected function _getFormat()
+ {
+ $format = $this->getColumn()->getFormat();
+ if (!$format) {
if (is_null(self::$_format)) {
try {
self::$_format = Mage::app()->getLocale()->getDateTimeFormat(
@@ -57,11 +57,11 @@ protected function _getFormat()
catch (Exception $e) {
}
- }
- $format = self::$_format;
- }
- return $format;
- }
+ }
+ $format = self::$_format;
+ }
+ return $format;
+ }
/**
* Renders grid column
@@ -72,8 +72,8 @@ protected function _getFormat()
public function render(Varien_Object $row)
{
if ($data = $row->getData($this->getColumn()->getIndex())) {
- $format = $this->_getFormat();
- try {
+ $format = $this->_getFormat();
+ try {
$data = Mage::app()->getLocale()->date($data, Varien_Date::DATETIME_INTERNAL_FORMAT)->toString($format);
}
catch (Exception $e)
@@ -85,4 +85,4 @@ public function render(Varien_Object $row)
}
return $this->getColumn()->getDefault();
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Input.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Input.php
index 4908b3db7b..7f892a89c2 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Input.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Input.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Interface.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Interface.php
index c5b2d6c023..85cdbf2b84 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Interface.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Interface.php
@@ -1,47 +1,47 @@
-
- */
-
-interface Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Interface
-{
- public function setColumn($column);
-
- public function getColumn();
-
- /**
- * Renders grid column
- *
- * @param Varien_Object $row
- */
- public function render(Varien_Object $row);
-}
\ No newline at end of file
+
+ */
+
+interface Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Interface
+{
+ public function setColumn($column);
+
+ public function getColumn();
+
+ /**
+ * Renders grid column
+ *
+ * @param Varien_Object $row
+ */
+ public function render(Varien_Object $row);
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Ip.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Ip.php
index 6667da446a..0b369e3f0a 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Ip.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Ip.php
@@ -1,43 +1,43 @@
-getData($this->getColumn()->getIndex()));
- }
-}
+getData($this->getColumn()->getIndex()));
+ }
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Longtext.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Longtext.php
index 4c033a4ed7..16fc88f3a4 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Longtext.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Longtext.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -54,7 +54,7 @@ public function render(Varien_Object $row)
}
$text = Mage::helper('core/string')->truncate(parent::_getValue($row), $truncateLength);
if ($this->getColumn()->getEscape()) {
- $text = $this->htmlEscape($text);
+ $text = $this->htmlEscape($text);
}
if ($this->getColumn()->getNl2br()) {
$text = nl2br($text);
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Massaction.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Massaction.php
index d406d5dbad..82be78aee8 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Massaction.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Massaction.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
@@ -52,8 +52,8 @@ public function renderProperty()
public function render(Varien_Object $row)
{
if ($this->getColumn()->getGrid()->getMassactionIdFieldOnlyIndexValue()){
- $this->setNoObjectId(true);
- }
+ $this->setNoObjectId(true);
+ }
return parent::render($row);
}
//
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Number.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Number.php
index 79cb752cc3..9addf0d8c6 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Number.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Number.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -41,7 +41,7 @@ protected function _getValue(Varien_Object $row)
$data = parent::_getValue($row);
if (!is_null($data)) {
$value = $data * 1;
- return $value ? $value: '0'; // fixed for showing zero in grid
+ return $value ? $value: '0'; // fixed for showing zero in grid
}
return $this->getColumn()->getDefault();
}
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Options.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Options.php
index 381963cc74..99f01d33f0 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Options.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Options.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Price.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Price.php
index 529194a18c..3da38e5b62 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Price.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Price.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -35,10 +35,10 @@
class Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Price extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract
{
protected $_defaultWidth = 100;
- /**
- * Currency objects cache
- */
- protected static $_currencies = array();
+ /**
+ * Currency objects cache
+ */
+ protected static $_currencies = array();
/**
* Renders grid column
@@ -49,16 +49,16 @@ class Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Price extends Mage_Adminh
public function render(Varien_Object $row)
{
if ($data = $row->getData($this->getColumn()->getIndex())) {
- $currency_code = $this->_getCurrencyCode($row);
+ $currency_code = $this->_getCurrencyCode($row);
- if (!$currency_code) {
- return $data;
- }
+ if (!$currency_code) {
+ return $data;
+ }
- $data = floatval($data) * $this->_getRate($row);
- $data = sprintf("%f", $data);
- $data = Mage::app()->getLocale()->currency($currency_code)->toCurrency($data);
- return $data;
+ $data = floatval($data) * $this->_getRate($row);
+ $data = sprintf("%f", $data);
+ $data = Mage::app()->getLocale()->currency($currency_code)->toCurrency($data);
+ return $data;
}
return $this->getColumn()->getDefault();
}
@@ -89,4 +89,4 @@ public function renderCss()
{
return parent::renderCss() . ' a-right';
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Radio.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Radio.php
index 5bfb7d5fdb..460859c485 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Radio.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Radio.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Select.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Select.php
index e69078f2fa..a6d8aeafb2 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Select.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Select.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -46,7 +46,7 @@ public function render(Varien_Object $row)
$html = '';
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Store.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Store.php
index 505b908849..85ed87a356 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Store.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Store.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Text.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Text.php
index 40ba7610f2..4dba178894 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Text.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Text.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -69,4 +69,4 @@ public function _getValue(Varien_Object $row)
return htmlspecialchars($format);
}
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Theme.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Theme.php
index 160bad55ea..500c20ec05 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Theme.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Theme.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -99,4 +99,4 @@ protected function _getValueLabel($options, $value)
return false;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Wrapline.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Wrapline.php
index e3aea97fc2..6aea650b02 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Wrapline.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Wrapline.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -56,4 +56,4 @@ public function render(Varien_Object $row)
}
return $wrappedLine;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Container.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Container.php
index 05381dc54f..c6466c0ae3 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Container.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Container.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction.php
index da2283d699..29eb48ad15 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Abstract.php
index d7edc283d7..31159a230c 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Abstract.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Abstract.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item.php
index 69ea1f174c..296c596aaf 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item/Additional/Default.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item/Additional/Default.php
index 4c2ed063b6..b15176f1a9 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item/Additional/Default.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item/Additional/Default.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item/Additional/Interface.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item/Additional/Interface.php
index 132c9f444c..9ecf29e06d 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item/Additional/Interface.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item/Additional/Interface.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Serializer.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Serializer.php
index 78b41d260d..014f152cf0 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Serializer.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Serializer.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -96,6 +96,9 @@ public function getDataAsJSON()
if ($serializeData = $this->getSerializeData()) {
$result = $serializeData;
}
+ elseif (!empty($this->_inputsToSerialize)) {
+ return '{}';
+ }
return Mage::helper('core')->jsonEncode($result);
}
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Tab/Interface.php b/app/code/core/Mage/Adminhtml/Block/Widget/Tab/Interface.php
index 52a39ddd07..35b4e224bf 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Tab/Interface.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Tab/Interface.php
@@ -1,41 +1,41 @@
-
- */
-interface Mage_Adminhtml_Block_Widget_Tab_Interface
-{
- public function getTabLabel();
- public function getTabTitle();
- public function canShowTab();
- public function isHidden();
-}
+
+ */
+interface Mage_Adminhtml_Block_Widget_Tab_Interface
+{
+ public function getTabLabel();
+ public function getTabTitle();
+ public function canShowTab();
+ public function isHidden();
+}
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Widget/Tabs.php
index 0eecc61065..ed7e007481 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Tabs.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Tabs.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Tree.php b/app/code/core/Mage/Adminhtml/Block/Widget/Tree.php
index c9af014ca5..b78445fc9e 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Tree.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Tree.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/View/Container.php b/app/code/core/Mage/Adminhtml/Block/Widget/View/Container.php
index 2cb4ef58a6..a092f3b1d8 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/View/Container.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/View/Container.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Controller/Action.php b/app/code/core/Mage/Adminhtml/Controller/Action.php
index 7994a9346b..420c8e0664 100644
--- a/app/code/core/Mage/Adminhtml/Controller/Action.php
+++ b/app/code/core/Mage/Adminhtml/Controller/Action.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Adminhtml
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
diff --git a/app/code/core/Mage/Adminhtml/Controller/Sales/Creditmemo.php b/app/code/core/Mage/Adminhtml/Controller/Sales/Creditmemo.php
index a6913063b4..19ca059191 100644
--- a/app/code/core/Mage/Adminhtml/Controller/Sales/Creditmemo.php
+++ b/app/code/core/Mage/Adminhtml/Controller/Sales/Creditmemo.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -132,4 +132,4 @@ protected function _isAllowed()
{
return Mage::getSingleton('admin/session')->isAllowed('sales/creditmemo');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Controller/Sales/Invoice.php b/app/code/core/Mage/Adminhtml/Controller/Sales/Invoice.php
index f7bbfd08a9..a864f7e553 100644
--- a/app/code/core/Mage/Adminhtml/Controller/Sales/Invoice.php
+++ b/app/code/core/Mage/Adminhtml/Controller/Sales/Invoice.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Controller/Sales/Shipment.php b/app/code/core/Mage/Adminhtml/Controller/Sales/Shipment.php
index 96c6a13fcd..4fa6728bf9 100644
--- a/app/code/core/Mage/Adminhtml/Controller/Sales/Shipment.php
+++ b/app/code/core/Mage/Adminhtml/Controller/Sales/Shipment.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -117,4 +117,4 @@ protected function _isAllowed()
{
return Mage::getSingleton('admin/session')->isAllowed('sales/shipment');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Exception.php b/app/code/core/Mage/Adminhtml/Exception.php
index f3378b1a14..c076a528e5 100644
--- a/app/code/core/Mage/Adminhtml/Exception.php
+++ b/app/code/core/Mage/Adminhtml/Exception.php
@@ -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_Core
- * @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_Adminhtml
+ * @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)
*/
diff --git a/app/code/core/Mage/Adminhtml/Helper/Catalog.php b/app/code/core/Mage/Adminhtml/Helper/Catalog.php
index 5043b98839..e41e9de032 100644
--- a/app/code/core/Mage/Adminhtml/Helper/Catalog.php
+++ b/app/code/core/Mage/Adminhtml/Helper/Catalog.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Helper/Catalog/Product/Edit/Action/Attribute.php b/app/code/core/Mage/Adminhtml/Helper/Catalog/Product/Edit/Action/Attribute.php
index 5285272b1f..ff0329d97d 100644
--- a/app/code/core/Mage/Adminhtml/Helper/Catalog/Product/Edit/Action/Attribute.php
+++ b/app/code/core/Mage/Adminhtml/Helper/Catalog/Product/Edit/Action/Attribute.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
diff --git a/app/code/core/Mage/Adminhtml/Helper/Dashboard/Abstract.php b/app/code/core/Mage/Adminhtml/Helper/Dashboard/Abstract.php
index 19f54978f2..73e39f9774 100644
--- a/app/code/core/Mage/Adminhtml/Helper/Dashboard/Abstract.php
+++ b/app/code/core/Mage/Adminhtml/Helper/Dashboard/Abstract.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
diff --git a/app/code/core/Mage/Adminhtml/Helper/Dashboard/Data.php b/app/code/core/Mage/Adminhtml/Helper/Dashboard/Data.php
index 56fb1cc505..a8869c6683 100644
--- a/app/code/core/Mage/Adminhtml/Helper/Dashboard/Data.php
+++ b/app/code/core/Mage/Adminhtml/Helper/Dashboard/Data.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -56,9 +56,9 @@ public function getDatePeriods()
return array(
'24h'=>$this->__('Last 24 hours'),
'7d'=>$this->__('Last 7 days'),
- '1m'=>$this->__('Current Month'),
- '1y'=>$this->__('YTD'),
- '2y'=>$this->__('2YTD')
+ '1m'=>$this->__('Current Month'),
+ '1y'=>$this->__('YTD'),
+ '2y'=>$this->__('2YTD')
);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Helper/Dashboard/Order.php b/app/code/core/Mage/Adminhtml/Helper/Dashboard/Order.php
index b2f85f81fa..ae3ce97318 100644
--- a/app/code/core/Mage/Adminhtml/Helper/Dashboard/Order.php
+++ b/app/code/core/Mage/Adminhtml/Helper/Dashboard/Order.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Helper/Data.php b/app/code/core/Mage/Adminhtml/Helper/Data.php
index b4f350c8ea..9dec87048f 100644
--- a/app/code/core/Mage/Adminhtml/Helper/Data.php
+++ b/app/code/core/Mage/Adminhtml/Helper/Data.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Helper/Js.php b/app/code/core/Mage/Adminhtml/Helper/Js.php
index 8ad3cde085..cd87ba6c46 100644
--- a/app/code/core/Mage/Adminhtml/Helper/Js.php
+++ b/app/code/core/Mage/Adminhtml/Helper/Js.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -35,24 +35,37 @@ class Mage_Adminhtml_Helper_Js extends Mage_Core_Helper_Js
{
/**
* Decode serialized grid data
- *
- * If string is in next format: 1&2&3&4,
- * than this method convert it to enumerated array
+ *
+ * Ignores non-numeric array keys
+ *
+ * '1&2&3&4' will be decoded into:
+ * array(1, 2, 3, 4);
+ *
+ * otherwise the following format is anticipated:
+ * 1=&2=:
+ * array (
+ * 1 => array(...),
+ * 2 => array(...),
+ * )
*
* @param string $encoded
* @return array
*/
- public function decodeInput($encoded)
+ public function decodeGridSerializedInput($encoded)
{
- $_data = array();
- parse_str($encoded, $data);
- foreach($data as $key=>$value) {
- if (empty($value)) {
- $_data[] = $key;
+ $isSimplified = (false === strpos($encoded, '='));
+ $result = array();
+ parse_str($encoded, $decoded);
+ foreach($decoded as $key => $value) {
+ if (is_numeric($key)) {
+ if ($isSimplified) {
+ $result[] = $key;
+ } else {
+ $result[$key] = null;
+ parse_str(base64_decode($value), $result[$key]);
+ }
}
- parse_str(base64_decode($value), $data[$key]);
}
- $data = !empty($_data) ? $_data : $data;
- return $data;
+ return $result;
}
}
diff --git a/app/code/core/Mage/Adminhtml/Helper/Media/Js.php b/app/code/core/Mage/Adminhtml/Helper/Media/Js.php
index f0164c4e22..e79cbb01c7 100644
--- a/app/code/core/Mage/Adminhtml/Helper/Media/Js.php
+++ b/app/code/core/Mage/Adminhtml/Helper/Media/Js.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
diff --git a/app/code/core/Mage/Adminhtml/Helper/Rss.php b/app/code/core/Mage/Adminhtml/Helper/Rss.php
index c2be23ce74..f0ff523fa5 100644
--- a/app/code/core/Mage/Adminhtml/Helper/Rss.php
+++ b/app/code/core/Mage/Adminhtml/Helper/Rss.php
@@ -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_Rss
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -47,4 +47,4 @@ public function authAdmin($path)
Mage::helper('core/http')->authFailed();
}
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Helper/Sales.php b/app/code/core/Mage/Adminhtml/Helper/Sales.php
index 37db7facbc..8cd356d1df 100644
--- a/app/code/core/Mage/Adminhtml/Helper/Sales.php
+++ b/app/code/core/Mage/Adminhtml/Helper/Sales.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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_Adminhtml_Helper_Sales extends Mage_Core_Helper_Abstract
@@ -84,4 +84,4 @@ public function displayPrices($dataObject, $basePrice, $price, $strong = false,
return $res;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Model/Config.php b/app/code/core/Mage/Adminhtml/Model/Config.php
index 37047aae53..55622e32e4 100644
--- a/app/code/core/Mage/Adminhtml/Model/Config.php
+++ b/app/code/core/Mage/Adminhtml/Model/Config.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
diff --git a/app/code/core/Mage/Adminhtml/Model/Config/Data.php b/app/code/core/Mage/Adminhtml/Model/Config/Data.php
index cf70a78498..bfb2c0e617 100644
--- a/app/code/core/Mage/Adminhtml/Model/Config/Data.php
+++ b/app/code/core/Mage/Adminhtml/Model/Config/Data.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Model/Customer/Renderer/Region.php b/app/code/core/Mage/Adminhtml/Model/Customer/Renderer/Region.php
index 8f502eaa69..f1e8cff19e 100644
--- a/app/code/core/Mage/Adminhtml/Model/Customer/Renderer/Region.php
+++ b/app/code/core/Mage/Adminhtml/Model/Customer/Renderer/Region.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -80,7 +80,7 @@ public function render(Varien_Data_Form_Element_Abstract $element)
.$element->serialize($htmlAttributes).'>'."\n";
foreach ($regionCollection as $region) {
$selected = ($regionId==$region->getId()) ? ' selected="selected"' : '';
- $html.= '';
+ $html.= '';
}
$html.= ' | ';
$element->setClass($elementClass);
diff --git a/app/code/core/Mage/Adminhtml/Model/Extension.php b/app/code/core/Mage/Adminhtml/Model/Extension.php
index ce663c42a5..2457479281 100644
--- a/app/code/core/Mage/Adminhtml/Model/Extension.php
+++ b/app/code/core/Mage/Adminhtml/Model/Extension.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
require_once 'Varien/Pear/Package.php';
@@ -76,7 +76,7 @@ protected function _setPackage($pfm)
$pfm->setPackageType('php');
$pfm->setChannel($this->getData('channel'));
- $pfm->setLicense($this->getData('license'), $this->getData('license_uri'));
+ $pfm->setLicense($this->getData('license'), $this->getData('license_uri'));
$pfm->setPackage($this->getData('name'));
$pfm->setSummary($this->getData('summary'));
@@ -314,10 +314,10 @@ public function createPackage()
if (!Mage::getConfig()->createDirIfNotExists($dir)) {
return false;
}
- $curDir = getcwd();
- chdir($dir);
+ $curDir = getcwd();
+ chdir($dir);
$result = $pear->run('mage-package', array(), array('package.xml'));
- chdir($curDir);
+ chdir($curDir);
if ($result instanceof PEAR_Error) {
return $result;
}
diff --git a/app/code/core/Mage/Adminhtml/Model/Extension/Collection.php b/app/code/core/Mage/Adminhtml/Model/Extension/Collection.php
index af592f03f4..f55d03698b 100644
--- a/app/code/core/Mage/Adminhtml/Model/Extension/Collection.php
+++ b/app/code/core/Mage/Adminhtml/Model/Extension/Collection.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Model/Extension/Local/Collection.php b/app/code/core/Mage/Adminhtml/Model/Extension/Local/Collection.php
index f78732fb42..5f50f895d3 100644
--- a/app/code/core/Mage/Adminhtml/Model/Extension/Local/Collection.php
+++ b/app/code/core/Mage/Adminhtml/Model/Extension/Local/Collection.php
@@ -1,5 +1,28 @@
getAllItems() as $item) {
- $productIds[] = $item->getProductId();
+ $productIds[] = $item->getProductId();
}
$productCollection = Mage::getModel('catalog/product')->getCollection()
@@ -69,14 +69,14 @@ public function checkRelation(Mage_Sales_Model_Order $order)
$hasBadItems = false;
foreach ($order->getAllItems() as $item) {
- if (!$productCollection->getItemById($item->getProductId())) {
- $this->_getSession()->addError(
- Mage::helper('adminhtml')->__('The item %s (SKU %s) doesn\'t exist in the catalog anymore',
- $item->getName(),
- $item->getSku()
+ if (!$productCollection->getItemById($item->getProductId())) {
+ $this->_getSession()->addError(
+ Mage::helper('adminhtml')->__('The item %s (SKU %s) doesn\'t exist in the catalog anymore',
+ $item->getName(),
+ $item->getSku()
));
$hasBadItems = true;
- }
+ }
}
if ($hasBadItems) {
$this->_getSession()->addError(
diff --git a/app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php b/app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php
index 11026468ed..4f77ab4b51 100644
--- a/app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php
+++ b/app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -1222,13 +1222,13 @@ protected function _putCustomerIntoQuote()
->setDefaultShipping($shippingAddress->getId());
}
elseif (($customer = $this->getSession()->getCustomer()) && $customer->getId()
- && !$this->getSession()->getCustomer(true,true)->getId())
- {
- $customer = clone $customer;
- $customer->setStore($this->getSession()->getStore())
- ->save();
- $this->getSession()->setCustomer($customer);
- $customer->addData($this->getData('account'));
+ && !$this->getSession()->getCustomer(true,true)->getId())
+ {
+ $customer = clone $customer;
+ $customer->setStore($this->getSession()->getStore())
+ ->save();
+ $this->getSession()->setCustomer($customer);
+ $customer->addData($this->getData('account'));
}
else { $customer = $this->getSession()->getCustomer();
$customer->addData($this->getData('account'));
@@ -1369,4 +1369,4 @@ protected function _getNewCustomerEmail($customer)
}
return $email;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Model/Sales/Order/Random.php b/app/code/core/Mage/Adminhtml/Model/Sales/Order/Random.php
index a2af9edc12..a0123e2645 100644
--- a/app/code/core/Mage/Adminhtml/Model/Sales/Order/Random.php
+++ b/app/code/core/Mage/Adminhtml/Model/Sales/Order/Random.php
@@ -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 Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -170,4 +170,4 @@ public function save()
$this->_quote->save();
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Model/Search/Catalog.php b/app/code/core/Mage/Adminhtml/Model/Search/Catalog.php
index 6070efa804..53f2de8e25 100644
--- a/app/code/core/Mage/Adminhtml/Model/Search/Catalog.php
+++ b/app/code/core/Mage/Adminhtml/Model/Search/Catalog.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
@@ -58,4 +58,4 @@ public function load()
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Model/Search/Customer.php b/app/code/core/Mage/Adminhtml/Model/Search/Customer.php
index b07f766214..3b407c38c9 100644
--- a/app/code/core/Mage/Adminhtml/Model/Search/Customer.php
+++ b/app/code/core/Mage/Adminhtml/Model/Search/Customer.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
diff --git a/app/code/core/Mage/Adminhtml/Model/Search/Order.php b/app/code/core/Mage/Adminhtml/Model/Search/Order.php
index 2ba1cb5b9a..efa838dd60 100644
--- a/app/code/core/Mage/Adminhtml/Model/Search/Order.php
+++ b/app/code/core/Mage/Adminhtml/Model/Search/Order.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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_Adminhtml_Model_Search_Order extends Varien_Object
{
diff --git a/app/code/core/Mage/Adminhtml/Model/Session.php b/app/code/core/Mage/Adminhtml/Model/Session.php
index 12c82aa429..b2c39bbf10 100644
--- a/app/code/core/Mage/Adminhtml/Model/Session.php
+++ b/app/code/core/Mage/Adminhtml/Model/Session.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
diff --git a/app/code/core/Mage/Adminhtml/Model/Session/Quote.php b/app/code/core/Mage/Adminhtml/Model/Session/Quote.php
index be7fa44394..6d86975c96 100644
--- a/app/code/core/Mage/Adminhtml/Model/Session/Quote.php
+++ b/app/code/core/Mage/Adminhtml/Model/Session/Quote.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -100,7 +100,7 @@ public function getQuote()
/**
* Set customer model object
- * To enable quick switch of preconfigured customer
+ * To enable quick switch of preconfigured customer
* @param Mage_Customer_Model_Customer $customer
* @return Mage_Adminhtml_Model_Session_Quote
*/
@@ -109,11 +109,11 @@ public function setCustomer(Mage_Customer_Model_Customer $customer)
$this->_customer = $customer;
return $this;
}
-
+
/**
* Retrieve customer model object
* @param bool $forceReload
- * @param bool $useSetStore
+ * @param bool $useSetStore
* @return Mage_Customer_Model_Customer
*/
public function getCustomer($forceReload=false, $useSetStore=false)
@@ -121,7 +121,7 @@ public function getCustomer($forceReload=false, $useSetStore=false)
if (is_null($this->_customer) || $forceReload) {
$this->_customer = Mage::getModel('customer/customer');
if ($useSetStore && $this->getStore()->getId()) {
- $this->_customer->setStore($this->getStore());
+ $this->_customer->setStore($this->getStore());
}
if ($customerId = $this->getCustomerId()) {
$this->_customer->load($customerId);
diff --git a/app/code/core/Mage/Adminhtml/Model/Sitemap/Sitemap.php b/app/code/core/Mage/Adminhtml/Model/Sitemap/Sitemap.php
index e69de29bb2..8b13789179 100644
--- a/app/code/core/Mage/Adminhtml/Model/Sitemap/Sitemap.php
+++ b/app/code/core/Mage/Adminhtml/Model/Sitemap/Sitemap.php
@@ -0,0 +1 @@
+
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Custom.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Custom.php
index 9930298bc2..9c82ff85fb 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Custom.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Custom.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
@@ -72,4 +72,4 @@ public function _afterSave()
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Usecustom.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Usecustom.php
index f584079461..095d7f2722 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Usecustom.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Usecustom.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
@@ -47,4 +47,4 @@ protected function _beforeSave()
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Usesecretkey.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Usesecretkey.php
index e1b7c6e4fa..b926c149b5 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Usesecretkey.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Usesecretkey.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
@@ -39,4 +39,4 @@ protected function _afterSave()
Mage::getSingleton('adminhtml/url')->renewSecretUrls();
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Baseurl.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Baseurl.php
index f96949b3a9..360d65ff97 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Baseurl.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Baseurl.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
@@ -43,9 +43,9 @@ protected function _beforeSave()
* If value is special ({{}}) we don't need add slash
*/
if (!preg_match('#}}$#', $value)) {
- $value.= '/';
+ $value.= '/';
}
-
+
$this->setValue($value);
return $this;
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Cache.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Cache.php
index 4f2962ed45..5ef31c65b3 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Cache.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Cache.php
@@ -1,50 +1,50 @@
-isValueChanged()) {
- Mage::app()->cleanCache($this->_cacheTags);
- }
- }
-}
+isValueChanged()) {
+ Mage::app()->cleanCache($this->_cacheTags);
+ }
+ }
+}
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Catalog/Inventory/Managestock.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Catalog/Inventory/Managestock.php
index 7a5170fc62..914dc42afd 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Catalog/Inventory/Managestock.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Catalog/Inventory/Managestock.php
@@ -1,57 +1,57 @@
-
- */
-class Mage_Adminhtml_Model_System_Config_Backend_Catalog_Inventory_Managestock
- extends Mage_Core_Model_Config_Data
-{
-/**
- * After change Catalog Inventory Manage value process
- *
- * @return Mage_Adminhtml_Model_System_Config_Backend_Catalog_Inventory_Managestock
- */
- protected function _afterSave()
- {
- $newValue = $this->getValue();
- $oldValue = Mage::getConfig()->getNode(
- Mage_CatalogSearch_Model_Fulltext::XML_PATH_CATALOG_SEARCH_TYPE,
- $this->getScope(),
- $this->getScopeId()
- );
- if ($newValue != $oldValue) {
- Mage::getSingleton('cataloginventory/stock_status')->rebuild();
- }
-
- return $this;
- }
-}
+
+ */
+class Mage_Adminhtml_Model_System_Config_Backend_Catalog_Inventory_Managestock
+ extends Mage_Core_Model_Config_Data
+{
+/**
+ * After change Catalog Inventory Manage value process
+ *
+ * @return Mage_Adminhtml_Model_System_Config_Backend_Catalog_Inventory_Managestock
+ */
+ protected function _afterSave()
+ {
+ $newValue = $this->getValue();
+ $oldValue = Mage::getConfig()->getNode(
+ Mage_CatalogSearch_Model_Fulltext::XML_PATH_CATALOG_SEARCH_TYPE,
+ $this->getScope(),
+ $this->getScopeId()
+ );
+ if ($newValue != $oldValue) {
+ Mage::getSingleton('cataloginventory/stock_status')->rebuild();
+ }
+
+ return $this;
+ }
+}
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Catalog/Search/Type.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Catalog/Search/Type.php
index 749959f176..d797e58480 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Catalog/Search/Type.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Catalog/Search/Type.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Category.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Category.php
index d6f1c9f434..5baac0a1c7 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Category.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Category.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -48,13 +48,13 @@ protected function _afterSave()
// Save root
$category->setStoreId(0)
- ->load($root->getId());
+ ->load($root->getId());
$category->setStoreId($storeId)
->save();
foreach ($root->getAllChildNodes() as $node) {
- $category->setStoreId(0)
- ->load($node->getId());
+ $category->setStoreId(0)
+ ->load($node->getId());
$category->setStoreId($storeId)
->save();
}
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Abstract.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Abstract.php
index 75415d4c19..62d6c1a456 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Abstract.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Abstract.php
@@ -1,95 +1,95 @@
-
- */
-abstract class Mage_Adminhtml_Model_System_Config_Backend_Currency_Abstract extends Mage_Core_Model_Config_Data
-{
- /**
- * Retrieve allowed currencies for current scope
- *
- * @return array
- */
- protected function _getAllowedCurrencies()
- {
- if ($this->getData('groups/options/fields/allow/inherit')) {
- return explode(',', Mage::getConfig()->getNode('currency/options/allow', $this->getScope(), $this->getScopeId()));
- }
- return $this->getData('groups/options/fields/allow/value');
- }
-
- /**
- * Retrieve Installed Currencies
- *
- * @return array
- */
- protected function _getInstalledCurrencies()
- {
- return explode(',', Mage::getStoreConfig('system/currency/installed'));
- }
-
- /**
- * Retrieve Base Currency value for current scope
- *
- * @return string
- */
- protected function _getCurrencyBase()
- {
- if (!$value = $this->getData('groups/options/fields/base/value')) {
- $value = Mage::getConfig()->getNode(
- Mage_Directory_Model_Currency::XML_PATH_CURRENCY_BASE,
- $this->getScope(),
- $this->getScopeId()
- );
- }
- return strval($value);
- }
-
- /**
- * Retrieve Default desplay Currency value for current scope
- *
- * @return string
- */
- protected function _getCurrencyDefault()
- {
- if (!$value = $this->getData('groups/options/fields/default/value')) {
- $value = Mage::getConfig()->getNode(
- Mage_Directory_Model_Currency::XML_PATH_CURRENCY_DEFAULT,
- $this->getScope(),
- $this->getScopeId()
- );
- }
- return strval($value);
- }
-}
+
+ */
+abstract class Mage_Adminhtml_Model_System_Config_Backend_Currency_Abstract extends Mage_Core_Model_Config_Data
+{
+ /**
+ * Retrieve allowed currencies for current scope
+ *
+ * @return array
+ */
+ protected function _getAllowedCurrencies()
+ {
+ if ($this->getData('groups/options/fields/allow/inherit')) {
+ return explode(',', Mage::getConfig()->getNode('currency/options/allow', $this->getScope(), $this->getScopeId()));
+ }
+ return $this->getData('groups/options/fields/allow/value');
+ }
+
+ /**
+ * Retrieve Installed Currencies
+ *
+ * @return array
+ */
+ protected function _getInstalledCurrencies()
+ {
+ return explode(',', Mage::getStoreConfig('system/currency/installed'));
+ }
+
+ /**
+ * Retrieve Base Currency value for current scope
+ *
+ * @return string
+ */
+ protected function _getCurrencyBase()
+ {
+ if (!$value = $this->getData('groups/options/fields/base/value')) {
+ $value = Mage::getConfig()->getNode(
+ Mage_Directory_Model_Currency::XML_PATH_CURRENCY_BASE,
+ $this->getScope(),
+ $this->getScopeId()
+ );
+ }
+ return strval($value);
+ }
+
+ /**
+ * Retrieve Default desplay Currency value for current scope
+ *
+ * @return string
+ */
+ protected function _getCurrencyDefault()
+ {
+ if (!$value = $this->getData('groups/options/fields/default/value')) {
+ $value = Mage::getConfig()->getNode(
+ Mage_Directory_Model_Currency::XML_PATH_CURRENCY_DEFAULT,
+ $this->getScope(),
+ $this->getScopeId()
+ );
+ }
+ return strval($value);
+ }
+}
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Allow.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Allow.php
index 2640168749..70418b95ac 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Allow.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Allow.php
@@ -1,64 +1,64 @@
-
- */
-class Mage_Adminhtml_Model_System_Config_Backend_Currency_Allow extends Mage_Adminhtml_Model_System_Config_Backend_Currency_Abstract
-{
- /**
- * Check is isset default display currency in allowed currencies
- * Check allowed currencies is available in installed currencies
- *
- * @return Mage_Adminhtml_Model_System_Config_Backend_Currency_Allow
- */
- protected function _afterSave()
- {
- $exceptions = array();
- foreach ($this->_getAllowedCurrencies() as $currencyCode) {
- if (!in_array($currencyCode, $this->_getInstalledCurrencies())) {
- $exceptions[] = Mage::helper('adminhtml')->__('Selected allow currency "%s" is not available in installed currencies', Mage::app()->getLocale()->currency($currencyCode)->getName());
- }
- }
-
- if (!in_array($this->_getCurrencyDefault(), $this->_getAllowedCurrencies())) {
- $exceptions[] = Mage::helper('adminhtml')->__('Default display currency "%s" is not available in allowed currencies', Mage::app()->getLocale()->currency($this->_getCurrencyDefault())->getName());
- }
-
- if ($exceptions) {
- Mage::throwException(join("\n", $exceptions));
- }
-
- return $this;
- }
-}
+
+ */
+class Mage_Adminhtml_Model_System_Config_Backend_Currency_Allow extends Mage_Adminhtml_Model_System_Config_Backend_Currency_Abstract
+{
+ /**
+ * Check is isset default display currency in allowed currencies
+ * Check allowed currencies is available in installed currencies
+ *
+ * @return Mage_Adminhtml_Model_System_Config_Backend_Currency_Allow
+ */
+ protected function _afterSave()
+ {
+ $exceptions = array();
+ foreach ($this->_getAllowedCurrencies() as $currencyCode) {
+ if (!in_array($currencyCode, $this->_getInstalledCurrencies())) {
+ $exceptions[] = Mage::helper('adminhtml')->__('Selected allow currency "%s" is not available in installed currencies', Mage::app()->getLocale()->currency($currencyCode)->getName());
+ }
+ }
+
+ if (!in_array($this->_getCurrencyDefault(), $this->_getAllowedCurrencies())) {
+ $exceptions[] = Mage::helper('adminhtml')->__('Default display currency "%s" is not available in allowed currencies', Mage::app()->getLocale()->currency($this->_getCurrencyDefault())->getName());
+ }
+
+ if ($exceptions) {
+ Mage::throwException(join("\n", $exceptions));
+ }
+
+ return $this;
+ }
+}
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Base.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Base.php
index 162dfe197c..bfd2aa4d10 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Base.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Base.php
@@ -1,53 +1,53 @@
-
- */
-class Mage_Adminhtml_Model_System_Config_Backend_Currency_Base extends Mage_Adminhtml_Model_System_Config_Backend_Currency_Abstract
-{
- /**
- * Check base currency is available in installed currencies
- *
- * @return Mage_Adminhtml_Model_System_Config_Backend_Currency_Base
- */
- protected function _afterSave()
- {
- if (!in_array($this->getValue(), $this->_getInstalledCurrencies())) {
- Mage::throwException(Mage::helper('adminhtml')->__('Selected base currency is not available in installed currencies'));
- }
-
- return $this;
- }
-}
-
+
+ */
+class Mage_Adminhtml_Model_System_Config_Backend_Currency_Base extends Mage_Adminhtml_Model_System_Config_Backend_Currency_Abstract
+{
+ /**
+ * Check base currency is available in installed currencies
+ *
+ * @return Mage_Adminhtml_Model_System_Config_Backend_Currency_Base
+ */
+ protected function _afterSave()
+ {
+ if (!in_array($this->getValue(), $this->_getInstalledCurrencies())) {
+ Mage::throwException(Mage::helper('adminhtml')->__('Selected base currency is not available in installed currencies'));
+ }
+
+ return $this;
+ }
+}
+
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Cron.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Cron.php
index 9358402af3..372dbcbc80 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Cron.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Cron.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Default.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Default.php
index 33789f1f8e..c6bc405b17 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Default.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Default.php
@@ -1,57 +1,57 @@
-
- */
-class Mage_Adminhtml_Model_System_Config_Backend_Currency_Default extends Mage_Adminhtml_Model_System_Config_Backend_Currency_Abstract
-{
- /**
- * Check default currency is available in installed currencies
- * Check default currency is available in allowed currencies
- *
- * @return Mage_Adminhtml_Model_System_Config_Backend_Currency_Default
- */
- protected function _afterSave()
- {
- if (!in_array($this->getValue(), $this->_getInstalledCurrencies())) {
- Mage::throwException(Mage::helper('adminhtml')->__('Selected default display currency is not available in installed currencies'));
- }
-
- if (!in_array($this->getValue(), $this->_getAllowedCurrencies())) {
- Mage::throwException(Mage::helper('adminhtml')->__('Selected default display currency is not available in allowed currencies'));
- }
-
- return $this;
- }
-}
+
+ */
+class Mage_Adminhtml_Model_System_Config_Backend_Currency_Default extends Mage_Adminhtml_Model_System_Config_Backend_Currency_Abstract
+{
+ /**
+ * Check default currency is available in installed currencies
+ * Check default currency is available in allowed currencies
+ *
+ * @return Mage_Adminhtml_Model_System_Config_Backend_Currency_Default
+ */
+ protected function _afterSave()
+ {
+ if (!in_array($this->getValue(), $this->_getInstalledCurrencies())) {
+ Mage::throwException(Mage::helper('adminhtml')->__('Selected default display currency is not available in installed currencies'));
+ }
+
+ if (!in_array($this->getValue(), $this->_getAllowedCurrencies())) {
+ Mage::throwException(Mage::helper('adminhtml')->__('Selected default display currency is not available in allowed currencies'));
+ }
+
+ return $this;
+ }
+}
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Datashare.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Datashare.php
index 474bbd9662..0da4e28e4f 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Datashare.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Datashare.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -37,4 +37,4 @@ protected function _afterSave()
{
#echo "".print_r($configData,1)."
"; die;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Design/Package.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Design/Package.php
index 6409624934..eec106c178 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Design/Package.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Design/Package.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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_Adminhtml_Model_System_Config_Backend_Design_Package extends Mage_Core_Model_Config_Data
@@ -36,4 +36,4 @@ protected function _beforeSave()
throw new Exception('package with this name does not exist and cannot be set.');
}
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Email/Address.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Email/Address.php
index a6971421d6..2695e1c793 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Email/Address.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Email/Address.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
@@ -38,8 +38,8 @@ protected function _beforeSave()
{
$value = $this->getValue();
if (!Zend_Validate::is($value, 'EmailAddress')) {
- Mage::throwException(Mage::helper('adminhtml')->__('Invalid email address "%s"', $value));
+ Mage::throwException(Mage::helper('adminhtml')->__('Invalid email address "%s"', $value));
}
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Email/Sender.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Email/Sender.php
index eb129ad66f..1c4f1360ae 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Email/Sender.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Email/Sender.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
@@ -42,4 +42,4 @@ protected function _beforeSave()
}
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Encrypted.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Encrypted.php
index 9381443f7a..9e9255eec9 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Encrypted.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Encrypted.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image.php
index 800126d377..0a9b4ccead 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image/Pdf.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image/Pdf.php
index 1895248207..4e27c0b1a2 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image/Pdf.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image/Pdf.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
@@ -38,4 +38,4 @@ protected function _getAllowedExtensions()
{
return array('tif', 'tiff', 'png', 'jpg', 'jpe', 'jpeg');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Layer/Children.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Layer/Children.php
index c357f930e5..5995cd2325 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Layer/Children.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Layer/Children.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Locale.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Locale.php
index 3cc42063e3..44cfd5f2ce 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Locale.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Locale.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Log/Cron.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Log/Cron.php
index bb3586cdf2..e82e0fc628 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Log/Cron.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Log/Cron.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
@@ -85,4 +85,4 @@ protected function _afterSave()
Mage::throwException(Mage::helper('adminhtml')->__('Unable to save Cron expression'));
}
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Price/Scope.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Price/Scope.php
index c8f3e10767..de5087d852 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Price/Scope.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Price/Scope.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -33,4 +33,4 @@ class Mage_Adminhtml_Model_System_Config_Backend_Price_Scope extends Mage_Core_M
{
// protected $_eventPrefix = 'system_config_price_scope';
// protected $_eventObject = 'option';
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Product/Alert/Cron.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Product/Alert/Cron.php
index 758534d971..ffd4ff7cf3 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Product/Alert/Cron.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Product/Alert/Cron.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
@@ -78,4 +78,4 @@ protected function _afterSave()
throw new Exception(Mage::helper('cron')->__('Unable to save Cron expression'));
}
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Seo/Product.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Seo/Product.php
index 4884db8a9b..d8641626f5 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Seo/Product.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Seo/Product.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Serialized.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Serialized.php
index 8d930ac874..b570a4c2e7 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Serialized.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Serialized.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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_Adminhtml_Model_System_Config_Backend_Serialized extends Mage_Core_Model_Config_Data
@@ -39,4 +39,4 @@ protected function _beforeSave()
$this->setValue(serialize($this->getValue()));
}
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Serialized/Array.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Serialized/Array.php
index 69719ed196..7e68bbd000 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Serialized/Array.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Serialized/Array.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Shipping/Tablerate.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Shipping/Tablerate.php
index df41fd4745..dc2d3cace2 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Shipping/Tablerate.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Shipping/Tablerate.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Sitemap.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Sitemap.php
index a192362e85..e32a31d217 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Sitemap.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Sitemap.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
@@ -31,11 +31,11 @@ class Mage_Adminhtml_Model_System_Config_Backend_Sitemap extends Mage_Core_Model
protected function _beforeSave()
{
$value = $this->getValue();
- if ($value < 0 || $value > 1) {
- throw new Exception(Mage::helper('sitemap')->__('Priority must be between 0 and 1'));
- } elseif (($value == 0) && !($value === '0' || $value === '0.0')) {
- throw new Exception(Mage::helper('sitemap')->__('Priority must be between 0 and 1'));
- }
+ if ($value < 0 || $value > 1) {
+ throw new Exception(Mage::helper('sitemap')->__('Priority must be between 0 and 1'));
+ } elseif (($value == 0) && !($value === '0' || $value === '0.0')) {
+ throw new Exception(Mage::helper('sitemap')->__('Priority must be between 0 and 1'));
+ }
return $this;
}
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Sitemap/Cron.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Sitemap/Cron.php
index 70b2114ee7..b114ce12ea 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Sitemap/Cron.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Sitemap/Cron.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Store.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Store.php
index 368fae109d..f623fd4f9b 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Store.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Store.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
@@ -39,4 +39,4 @@ protected function _afterSave()
Mage::app()->getStore()->setConfig(Mage_Core_Model_Store::XML_PATH_STORE_IN_URL, $this->getValue());
Mage::app()->cleanCache();
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Clone/Media/Image.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Clone/Media/Image.php
index 40e77bd526..122b4dfdaf 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Clone/Media/Image.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Clone/Media/Image.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Admin/Page.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Admin/Page.php
index 33ea6d5bec..ec3f5046c3 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Admin/Page.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Admin/Page.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
@@ -160,4 +160,4 @@ protected function _getHelperValue(Varien_Simplexml_Element $child)
return Mage::helper($helperName)->__((string)$child->$titleNodeName);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Allregion.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Allregion.php
index 9c5a1720aa..f6454d2977 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Allregion.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Allregion.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
@@ -68,4 +68,4 @@ public function sortRegionCountries($a, $b)
{
return strcmp($this->_countries[$a], $this->_countries[$b]);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/GridPerPage.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/GridPerPage.php
index f6ad93c224..5ca80b7c3f 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/GridPerPage.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/GridPerPage.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
@@ -45,4 +45,4 @@ public function toOptionArray()
//$result[] = array('value' => 'all', 'label' => Mage::helper('catalog')->__('All'));
return $result;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/ListMode.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/ListMode.php
index 799f340099..b59a2e9a83 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/ListMode.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/ListMode.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
@@ -37,4 +37,4 @@ public function toOptionArray()
array('value'=>'list-grid', 'label'=>Mage::helper('adminhtml')->__('List (default) / Grid')),
);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/ListPerPage.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/ListPerPage.php
index c829c6b569..3657eab4bb 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/ListPerPage.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/ListPerPage.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/ListSort.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/ListSort.php
index f554199c14..1ac3e16f1c 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/ListSort.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/ListSort.php
@@ -1,66 +1,66 @@
-
- */
-class Mage_Adminhtml_Model_System_Config_Source_Catalog_ListSort
-{
- /**
- * Retrieve option values array
- *
- * @return array
- */
- public function toOptionArray()
- {
- $options = array();
- $options[] = array(
- 'label' => Mage::helper('catalog')->__('Best Value'),
- 'value' => 'position'
- );
- foreach ($this->_getCatalogConfig()->getAttributesUsedForSortBy() as $attribute) {
- $options[] = array(
- 'label' => Mage::helper('catalog')->__($attribute['frontend_label']),
- 'value' => $attribute['attribute_code']
- );
- }
- return $options;
- }
-
- /**
- * Retrieve Catalog Config Singleton
- *
- * @return Mage_Catalog_Model_Config
- */
- protected function _getCatalogConfig() {
- return Mage::getSingleton('catalog/config');
- }
-}
+
+ */
+class Mage_Adminhtml_Model_System_Config_Source_Catalog_ListSort
+{
+ /**
+ * Retrieve option values array
+ *
+ * @return array
+ */
+ public function toOptionArray()
+ {
+ $options = array();
+ $options[] = array(
+ 'label' => Mage::helper('catalog')->__('Best Value'),
+ 'value' => 'position'
+ );
+ foreach ($this->_getCatalogConfig()->getAttributesUsedForSortBy() as $attribute) {
+ $options[] = array(
+ 'label' => Mage::helper('catalog')->__($attribute['frontend_label']),
+ 'value' => $attribute['attribute_code']
+ );
+ }
+ return $options;
+ }
+
+ /**
+ * Retrieve Catalog Config Singleton
+ *
+ * @return Mage_Catalog_Model_Config
+ */
+ protected function _getCatalogConfig() {
+ return Mage::getSingleton('catalog/config');
+ }
+}
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/Search/Type.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/Search/Type.php
index 21084f27ef..a88190fd31 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/Search/Type.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/Search/Type.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/TimeFormat.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/TimeFormat.php
index 2b2c41bf82..e8ef8beb21 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/TimeFormat.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/TimeFormat.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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_Adminhtml_Model_System_Config_Source_Catalog_TimeFormat
@@ -33,4 +33,4 @@ public function toOptionArray()
array('value' => '24h', 'label' => Mage::helper('adminhtml')->__('24h')),
);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Category.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Category.php
index a2c5fdf92c..9e2f97e291 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Category.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Category.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cms/Page.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cms/Page.php
index 91b6727601..ab3ed94788 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cms/Page.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cms/Page.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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_Adminhtml_Model_System_Config_Source_Cms_Page
{
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cms/Wysiwyg/Enabled.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cms/Wysiwyg/Enabled.php
index 0e26c8e3c2..b38535afab 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cms/Wysiwyg/Enabled.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cms/Wysiwyg/Enabled.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Mage
- * @package Mage_Cms
+ * @package Mage_Adminhtml
* @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)
*/
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Country.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Country.php
index a78699848a..efab44a6cf 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Country.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Country.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
@@ -42,4 +42,4 @@ public function toOptionArray($isMultiselect=false)
return $options;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Country/Full.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Country/Full.php
index 9d91a2d4a5..bb50873720 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Country/Full.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Country/Full.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
@@ -30,4 +30,4 @@ class Mage_Adminhtml_Model_System_Config_Source_Country_Full extends Mage_Adminh
public function toOptionArray($isMultiselect=false) {
return parent::toOptionArray(true);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cron/Frequency.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cron/Frequency.php
index 01ef6b1d54..33d617514f 100755
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cron/Frequency.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cron/Frequency.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Currency.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Currency.php
index b528f0efa4..e7bae47de9 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Currency.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Currency.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
@@ -37,4 +37,4 @@ public function toOptionArray($isMultiselect)
$options = $this->_options;
return $options;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Currency/Service.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Currency/Service.php
index 53af818aa3..36f13392e4 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Currency/Service.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Currency/Service.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
@@ -46,4 +46,4 @@ public function toOptionArray($isMultiselect)
return $options;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Customer/Group.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Customer/Group.php
index 29938d3844..07cec88d21 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Customer/Group.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Customer/Group.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
@@ -39,4 +39,4 @@ public function toOptionArray()
}
return $this->_options;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Date/Short.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Date/Short.php
index 498e372b95..9d504357b8 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Date/Short.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Date/Short.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
@@ -37,4 +37,4 @@ public function toOptionArray()
$arr[] = array('label'=>strftime('DD/MM/YYYY (%d/%m/%Y)'), 'value'=>'%d/%m/%Y');
return $arr;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Design/Package.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Design/Package.php
index da37e8d56b..afe89991bf 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Design/Package.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Design/Package.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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_Adminhtml_Model_System_Config_Source_Package
{
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Design/Robots.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Design/Robots.php
index 7a94e20bb8..e6a2c9be8e 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Design/Robots.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Design/Robots.php
@@ -18,22 +18,22 @@
* 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_Adminhtml
- * @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_Adminhtml
+ * @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_Adminhtml_Model_System_Config_Source_Design_Robots
{
- public function toOptionArray()
- {
- return array(
- array('value'=>'INDEX,FOLLOW', 'label'=>'INDEX, FOLLOW'),
- array('value'=>'NOINDEX,FOLLOW', 'label'=>'NOINDEX, FOLLOW'),
- array('value'=>'INDEX,NOFOLLOW', 'label'=>'INDEX, NOFOLLOW'),
- array('value'=>'NOINDEX,NOFOLLOW', 'label'=>'NOINDEX, NOFOLLOW'),
- );
- }
-}
\ No newline at end of file
+ public function toOptionArray()
+ {
+ return array(
+ array('value'=>'INDEX,FOLLOW', 'label'=>'INDEX, FOLLOW'),
+ array('value'=>'NOINDEX,FOLLOW', 'label'=>'NOINDEX, FOLLOW'),
+ array('value'=>'INDEX,NOFOLLOW', 'label'=>'INDEX, NOFOLLOW'),
+ array('value'=>'NOINDEX,NOFOLLOW', 'label'=>'NOINDEX, NOFOLLOW'),
+ );
+ }
+}
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Dev/Dbautoup.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Dev/Dbautoup.php
index 0c8d7b635f..4797b927e9 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Dev/Dbautoup.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Dev/Dbautoup.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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_Adminhtml_Model_System_Config_Source_Dev_Dbautoup
{
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Identity.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Identity.php
index b74bf69cd1..8c0d0ca563 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Identity.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Identity.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
@@ -47,4 +47,4 @@ public function toOptionArray()
return $this->_options;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Method.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Method.php
index fb0049e911..0f48834cbe 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Method.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Method.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
@@ -48,4 +48,4 @@ public function toOptionArray()
);
return $options;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Smtpauth.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Smtpauth.php
index dee352b884..7131870e33 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Smtpauth.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Smtpauth.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
@@ -36,4 +36,4 @@ public function toOptionArray()
array('value'=>'CRAM-MD5', 'label'=>'CRAM-MD5'),
);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Template.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Template.php
index 6a0b23965f..3761329bec 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Template.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Template.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Enabledisable.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Enabledisable.php
index 7a16896192..21529186e5 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Enabledisable.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Enabledisable.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
@@ -34,4 +34,4 @@ public function toOptionArray()
array('value'=>0, 'label'=>Mage::helper('adminhtml')->__('Disable')),
);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Frequency.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Frequency.php
index f6239a9e38..f27abd6c86 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Frequency.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Frequency.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
@@ -39,4 +39,4 @@ public function toOptionArray()
array('value'=>'never', 'label'=>Mage::helper('sitemap')->__('Never')),
);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Language.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Language.php
index 4fd2c72d1a..c11d7ba28d 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Language.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Language.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale.php
index 8756bf645c..eb52cd9006 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale.php
@@ -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 Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Country.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Country.php
index 5d8763d6a3..a12a1d45a1 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Country.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Country.php
@@ -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 Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Currency.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Currency.php
index ad4643dd16..2ef5fe321e 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Currency.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Currency.php
@@ -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 Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Currency/All.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Currency/All.php
index d550ba1760..1036c855bf 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Currency/All.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Currency/All.php
@@ -1,43 +1,43 @@
-_options) {
- $this->_options = Mage::app()->getLocale()->getOptionAllCurrencies();
- }
- $options = $this->_options;
- if(!$isMultiselect){
- array_unshift($options, array('value'=>'', 'label'=>''));
- }
-
- return $options;
- }
-}
\ No newline at end of file
+_options) {
+ $this->_options = Mage::app()->getLocale()->getOptionAllCurrencies();
+ }
+ $options = $this->_options;
+ if(!$isMultiselect){
+ array_unshift($options, array('value'=>'', 'label'=>''));
+ }
+
+ return $options;
+ }
+}
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Timezone.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Timezone.php
index a8414aac35..f8233d41ca 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Timezone.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Timezone.php
@@ -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 Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Weekdays.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Weekdays.php
index 384ddb2f47..6aea7b139d 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Weekdays.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Weekdays.php
@@ -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 Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Nooptreq.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Nooptreq.php
index 7428c15e01..e0c58381e1 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Nooptreq.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Nooptreq.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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_Adminhtml_Model_System_Config_Source_Nooptreq
{
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Notification/Frequency.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Notification/Frequency.php
index 583c7df957..e6879bbbfc 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Notification/Frequency.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Notification/Frequency.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
@@ -44,4 +44,4 @@ public function toOptionArray()
24 => Mage::helper('adminhtml')->__('24 Hours')
);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status.php
index 2e3a16b437..0847986144 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -50,14 +50,14 @@ public function toOptionArray()
}
$options = array();
$options[] = array(
- 'value' => '',
- 'label' => Mage::helper('adminhtml')->__('-- Please Select --')
- );
+ 'value' => '',
+ 'label' => Mage::helper('adminhtml')->__('-- Please Select --')
+ );
foreach ($statuses as $code=>$label) {
- $options[] = array(
- 'value' => $code,
- 'label' => $label
- );
+ $options[] = array(
+ 'value' => $code,
+ 'label' => $label
+ );
}
return $options;
}
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status/New.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status/New.php
index 5a5e7c101b..61d0d5ec37 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status/New.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status/New.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status/Newprocessing.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status/Newprocessing.php
index 26e4df9991..d182cc1636 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status/Newprocessing.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status/Newprocessing.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status/Processing.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status/Processing.php
index 347c98cc83..0e0e2a3582 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status/Processing.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status/Processing.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Allmethods.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Allmethods.php
index 51f0000001..a1ab5567f1 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Allmethods.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Allmethods.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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_Adminhtml_Model_System_Config_Source_Payment_Allmethods
@@ -44,4 +44,4 @@ public function toOptionArray()
return $methods;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Allowedmethods.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Allowedmethods.php
index c90fe05970..53c85b1aa0 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Allowedmethods.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Allowedmethods.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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_Adminhtml_Model_System_Config_Source_Payment_Allowedmethods
@@ -46,4 +46,4 @@ protected function _getPaymentMethods()
//
// return $methods;
// }
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Allspecificcountries.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Allspecificcountries.php
index 554c23b5ef..5da8827a9c 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Allspecificcountries.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Allspecificcountries.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
@@ -34,4 +34,4 @@ public function toOptionArray()
array('value'=>1, 'label'=>Mage::helper('adminhtml')->__('Specific Countries')),
);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Cctype.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Cctype.php
index 9df909e2dd..d7a10e1ed0 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Cctype.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Cctype.php
@@ -18,25 +18,25 @@
* 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_Adminhtml
- * @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_Adminhtml
+ * @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_Adminhtml_Model_System_Config_Source_Payment_Cctype
{
public function toOptionArray()
{
$options = array();
-
+
foreach (Mage::getSingleton('payment/config')->getCcTypes() as $code => $name) {
- $options[] = array(
- 'value' => $code,
- 'label' => $name
- );
+ $options[] = array(
+ 'value' => $code,
+ 'label' => $name
+ );
}
-
+
return $options;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Paypal/Standardtypes.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Paypal/Standardtypes.php
index 7ffd0d11a6..202491fc0d 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Paypal/Standardtypes.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Paypal/Standardtypes.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
@@ -34,4 +34,4 @@ public function toOptionArray()
//array('value'=>'PDT', 'label'=>Mage::helper('adminhtml')->__('Payment Data Transfer (PDT)')),
);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Paypal/Transactiontype.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Paypal/Transactiontype.php
index e341e10930..e4ccc6dfee 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Paypal/Transactiontype.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Paypal/Transactiontype.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Price/Scope.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Price/Scope.php
index 845dd5d3d6..51a53b24c2 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Price/Scope.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Price/Scope.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
@@ -34,4 +34,4 @@ public function toOptionArray()
array('value'=>'1', 'label'=>Mage::helper('core')->__('Website')),
);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Product/Options/Price.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Product/Options/Price.php
index de6e75b9b9..0178844202 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Product/Options/Price.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Product/Options/Price.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -40,4 +40,4 @@ public function toOptionArray()
array('value' => 'percent', 'label' => Mage::helper('adminhtml')->__('Percent'))
);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Product/Options/Type.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Product/Options/Type.php
index e181ede11f..5f495ed188 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Product/Options/Type.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Product/Options/Type.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -62,4 +62,4 @@ public function toOptionArray()
return $groups;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Product/Thumbnail.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Product/Thumbnail.php
index 566dfffa65..4e4eb8eef4 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Product/Thumbnail.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Product/Thumbnail.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
@@ -40,4 +40,4 @@ public function toOptionArray()
array('value'=>'parent', 'label'=>Mage::helper('adminhtml')->__('Parent Product Thumbnail')),
);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Reports/Scope.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Reports/Scope.php
index 416b3952e6..94bfdd2ea0 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Reports/Scope.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Reports/Scope.php
@@ -1,48 +1,48 @@
-
- */
-class Mage_Adminhtml_Model_System_Config_Source_Reports_Scope
-{
- /**
- * Scope filter
- */
- public function toOptionArray()
- {
- return array(
- array('value'=>'website', 'label'=>Mage::helper('adminhtml')->__('Website')),
- array('value'=>'group', 'label'=>Mage::helper('adminhtml')->__('Store')),
- array('value'=>'store', 'label'=>Mage::helper('adminhtml')->__('Store View')),
- );
- }
-
-}
\ No newline at end of file
+
+ */
+class Mage_Adminhtml_Model_System_Config_Source_Reports_Scope
+{
+ /**
+ * Scope filter
+ */
+ public function toOptionArray()
+ {
+ return array(
+ array('value'=>'website', 'label'=>Mage::helper('adminhtml')->__('Website')),
+ array('value'=>'group', 'label'=>Mage::helper('adminhtml')->__('Store')),
+ array('value'=>'store', 'label'=>Mage::helper('adminhtml')->__('Store View')),
+ );
+ }
+
+}
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Allmethods.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Allmethods.php
index 9d05ec5dcb..4a8e03f8c5 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Allmethods.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Allmethods.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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_Adminhtml_Model_System_Config_Source_Shipping_Allmethods
@@ -60,4 +60,4 @@ public function toOptionArray($isActiveOnlyFlag=false)
return $methods;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Allowedmethods.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Allowedmethods.php
index d74fa40481..f5e444fbe4 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Allowedmethods.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Allowedmethods.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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_Adminhtml_Model_System_Config_Source_Shipping_Allowedmethods
@@ -32,4 +32,4 @@ public function toOptionArray()
return parent::toOptionArray(true);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Allspecificcountries.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Allspecificcountries.php
index af4c5ece87..9eadcff0fe 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Allspecificcountries.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Allspecificcountries.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
@@ -34,4 +34,4 @@ public function toOptionArray()
array('value'=>1, 'label'=>Mage::helper('adminhtml')->__('Specific Countries')),
);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Flatrate.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Flatrate.php
index 6fe29f2a0d..091c340cf0 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Flatrate.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Flatrate.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Tablerate.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Tablerate.php
index c0de1a654c..42ee09eeb3 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Tablerate.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Tablerate.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Taxclass.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Taxclass.php
index 34d5347981..a6d2834732 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Taxclass.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Taxclass.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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_Adminhtml_Model_System_Config_Source_Shipping_Taxclass
{
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Store.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Store.php
index bef38a7c74..723ba6588b 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Store.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Store.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
@@ -37,4 +37,4 @@ public function toOptionArray()
}
return $this->_options;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/Apply/On.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/Apply/On.php
index 36f0489fa7..adad3f4412 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/Apply/On.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/Apply/On.php
@@ -1,36 +1,36 @@
-0, 'label'=>Mage::helper('tax')->__('Custom price if available')),
- array('value'=>1, 'label'=>Mage::helper('tax')->__('Original price only')),
- );
- }
-
-}
+0, 'label'=>Mage::helper('tax')->__('Custom price if available')),
+ array('value'=>1, 'label'=>Mage::helper('tax')->__('Original price only')),
+ );
+ }
+
+}
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/Basedon.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/Basedon.php
index b19de5a1b5..dfe9fe6f4f 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/Basedon.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/Basedon.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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_Adminhtml_Model_System_Config_Source_Tax_Basedon
{
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/Catalog.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/Catalog.php
index 0793f3246d..be2971c929 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/Catalog.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/Catalog.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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_Adminhtml_Model_System_Config_Source_Tax_Catalog
{
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Watermark/Position.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Watermark/Position.php
index 82e1d7c7f1..ae283373d2 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Watermark/Position.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Watermark/Position.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Web/Protocol.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Web/Protocol.php
index 52cb9642fc..8acdd5fff2 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Web/Protocol.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Web/Protocol.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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_Adminhtml_Model_System_Config_Source_Web_Protocol
{
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Website.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Website.php
index 7419f9bfb5..f9272ceda2 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Website.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Website.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Yesno.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Yesno.php
index 7f0f6085a0..e3028f3bc6 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Yesno.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Yesno.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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_Adminhtml_Model_System_Config_Source_Yesno
{
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Store.php b/app/code/core/Mage/Adminhtml/Model/System/Store.php
index f958984205..01fca3ad3a 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Store.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Store.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
@@ -167,12 +167,19 @@ public function getStoreValuesForForm($empty = false, $all = false)
return $options;
}
+ /**
+ * Website label/value array getter, compatible with form dropdown options
+ *
+ * @param bool $empty
+ * @param bool $all
+ * @return array
+ */
public function getWebsiteValuesForForm($empty = false, $all = false)
{
$options = array();
if ($empty) {
$options[] = array(
- 'label' => '',
+ 'label' => Mage::helper('adminhtml')->__('-- Please Select --'),
'value' => ''
);
}
@@ -310,7 +317,7 @@ public function getStoreNameWithWebsite($storeId)
if (is_array($storeId)) {
$names = array();
foreach ($storeId as $id) {
- $names[]= $this->getStoreNameWithWebsite($id);
+ $names[]= $this->getStoreNameWithWebsite($id);
}
$name = implode(', ', $names);
}
@@ -399,7 +406,7 @@ public function getStoreNamePath($storeId)
if (is_array($storeId)) {
$names = array();
foreach ($storeId as $id) {
- $names[]= $this->getStoreNamePath($id);
+ $names[]= $this->getStoreNamePath($id);
}
$name = implode(', ', $names);
}
diff --git a/app/code/core/Mage/Adminhtml/Model/Url.php b/app/code/core/Mage/Adminhtml/Model/Url.php
index 2915ee133f..3943a0417e 100644
--- a/app/code/core/Mage/Adminhtml/Model/Url.php
+++ b/app/code/core/Mage/Adminhtml/Model/Url.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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_Adminhtml_Model_Url extends Mage_Core_Model_Url
{
diff --git a/app/code/core/Mage/Adminhtml/controllers/Api/RoleController.php b/app/code/core/Mage/Adminhtml/controllers/Api/RoleController.php
index 2eaeb876c3..2016358fd4 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Api/RoleController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Api/RoleController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -190,4 +190,4 @@ protected function _isAllowed()
{
return Mage::getSingleton('admin/session')->isAllowed('api/roles');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Api/UserController.php b/app/code/core/Mage/Adminhtml/controllers/Api/UserController.php
index 1391ec045a..d8f35af352 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Api/UserController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Api/UserController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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_Adminhtml_Api_UserController extends Mage_Adminhtml_Controller_Action
{
diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/Category/WidgetController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Category/WidgetController.php
index be0e9ebf62..951a9cfe7f 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Category/WidgetController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Category/WidgetController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/CategoryController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/CategoryController.php
index 89c7569c3b..890f7ee3f2 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Catalog/CategoryController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/CategoryController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/Action/AttributeController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/Action/AttributeController.php
index 63ab3d8fe2..3842ddfc97 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/Action/AttributeController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/Action/AttributeController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
@@ -191,4 +191,4 @@ protected function _isAllowed()
{
return Mage::getSingleton('admin/session')->isAllowed('catalog/update_attributes');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/AttributeController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/AttributeController.php
index 84f8413d08..3e40c8ce9c 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/AttributeController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/AttributeController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -263,6 +263,6 @@ public function deleteAction()
protected function _isAllowed()
{
- return Mage::getSingleton('admin/session')->isAllowed('catalog/attributes/attributes');
+ return Mage::getSingleton('admin/session')->isAllowed('catalog/attributes/attributes');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/DatafeedsController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/DatafeedsController.php
index 045b86fbd7..b06d472097 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/DatafeedsController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/DatafeedsController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
@@ -32,4 +32,4 @@ public function indexAction()
{
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GalleryController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GalleryController.php
index 21525943af..6f274b6393 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GalleryController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GalleryController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -65,4 +65,4 @@ protected function _isAllowed()
{
return Mage::getSingleton('admin/session')->isAllowed('catalog/products');
}
-} // Class Mage_Adminhtml_Catalog_Product_GalleryController End
\ No newline at end of file
+} // Class Mage_Adminhtml_Catalog_Product_GalleryController End
diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GroupController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GroupController.php
index ab0efb14d1..bf7e4bead2 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GroupController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GroupController.php
@@ -18,20 +18,15 @@
* 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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
- * description
- *
- * @category Mage
- * @package Mage_Adminhtml
- * @author Magento Core Team
+ * @deprecated after 1.4.0.0-alpha2
*/
-
class Mage_Adminhtml_Catalog_Product_GroupController extends Mage_Adminhtml_Controller_Action
{
public function saveAction()
@@ -51,7 +46,7 @@ public function saveAction()
}
}
}
-
+
protected function _isAllowed()
{
return Mage::getSingleton('admin/session')->isAllowed('catalog/products');
diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/ReviewController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/ReviewController.php
index 5ab193b39b..c6f64fc15e 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/ReviewController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/ReviewController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -34,7 +34,7 @@
class Mage_Adminhtml_Catalog_Product_ReviewController extends Mage_Adminhtml_Controller_Action
{
- public function indexAction()
+ public function indexAction()
{
if ($this->getRequest()->getParam('ajax')) {
return $this->_forward('reviewGrid');
@@ -290,10 +290,10 @@ public function postAction()
$arrRatingId = $this->getRequest()->getParam('ratings', array());
foreach ($arrRatingId as $ratingId=>$optionId) {
- Mage::getModel('rating/rating')
- ->setRatingId($ratingId)
- ->setReviewId($review->getId())
- ->addOptionVote($optionId, $productId);
+ Mage::getModel('rating/rating')
+ ->setRatingId($ratingId)
+ ->setReviewId($review->getId())
+ ->addOptionVote($optionId, $productId);
}
$review->aggregate();
@@ -322,13 +322,13 @@ public function ratingItemsAction()
protected function _isAllowed()
{
- switch ($this->getRequest()->getActionName()) {
+ switch ($this->getRequest()->getActionName()) {
case 'pending':
return Mage::getSingleton('admin/session')->isAllowed('catalog/reviews_ratings/reviews/pending');
break;
default:
return Mage::getSingleton('admin/session')->isAllowed('catalog/reviews_ratings/reviews/all');
break;
- }
+ }
}
}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/SetController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/SetController.php
index 92d264b331..ff1fc16ed8 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/SetController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/SetController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -170,4 +170,4 @@ protected function _isAllowed()
{
return Mage::getSingleton('admin/session')->isAllowed('catalog/attributes/sets');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/WidgetController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/WidgetController.php
index 42e354f3bd..dd853840ff 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/WidgetController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/WidgetController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php
index a60852c36e..96ae179e7b 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -509,16 +509,16 @@ protected function _initProductSave()
*/
$links = $this->getRequest()->getPost('links');
if (isset($links['related']) && !$product->getRelatedReadonly()) {
- $product->setRelatedLinkData($this->_decodeInput($links['related']));
+ $product->setRelatedLinkData(Mage::helper('adminhtml/js')->decodeGridSerializedInput($links['related']));
}
- if (isset($links['upsell']) && !$product->getUpsellReadonly()) {
- $product->setUpSellLinkData($this->_decodeInput($links['upsell']));
+ if (isset($links['upsell']) && !$product->getUpsellReadonly()) {
+ $product->setUpSellLinkData(Mage::helper('adminhtml/js')->decodeGridSerializedInput($links['upsell']));
}
- if (isset($links['crosssell']) && !$product->getCrosssellReadonly()) {
- $product->setCrossSellLinkData($this->_decodeInput($links['crosssell']));
+ if (isset($links['crosssell']) && !$product->getCrosssellReadonly()) {
+ $product->setCrossSellLinkData(Mage::helper('adminhtml/js')->decodeGridSerializedInput($links['crosssell']));
}
- if (isset($links['grouped']) && !$product->getGroupedReadonly()) {
- $product->setGroupedLinkData($this->_decodeInput($links['grouped']));
+ if (isset($links['grouped']) && !$product->getGroupedReadonly()) {
+ $product->setGroupedLinkData(Mage::helper('adminhtml/js')->decodeGridSerializedInput($links['grouped']));
}
/**
@@ -653,10 +653,7 @@ public function duplicateAction()
}
/**
- * Decode strings for linked products
- *
- * @param string $encoded
- * @return array
+ * @deprecated since 1.4.0.0-alpha2
*/
protected function _decodeInput($encoded)
{
@@ -664,7 +661,6 @@ protected function _decodeInput($encoded)
foreach($data as $key=>$value) {
parse_str(base64_decode($value), $data[$key]);
}
-
return $data;
}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/SearchController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/SearchController.php
index 654ba75889..2381095f84 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Catalog/SearchController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/SearchController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
@@ -165,6 +165,6 @@ public function massDeleteAction()
protected function _isAllowed()
{
- return Mage::getSingleton('admin/session')->isAllowed('catalog/search');
+ return Mage::getSingleton('admin/session')->isAllowed('catalog/search');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/controllers/CatalogController.php b/app/code/core/Mage/Adminhtml/controllers/CatalogController.php
index b72fc2ca77..b5a067cc5b 100644
--- a/app/code/core/Mage/Adminhtml/controllers/CatalogController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/CatalogController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -45,6 +45,6 @@ public function indexAction()
protected function _isAllowed()
{
- return Mage::getSingleton('admin/session')->isAllowed('catalog');
+ return Mage::getSingleton('admin/session')->isAllowed('catalog');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Checkout/AgreementController.php b/app/code/core/Mage/Adminhtml/controllers/Checkout/AgreementController.php
index b2376e958b..313a20a58d 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Checkout/AgreementController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Checkout/AgreementController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -145,6 +145,6 @@ protected function _initAction()
protected function _isAllowed()
{
- return Mage::getSingleton('admin/session')->isAllowed('sales/checkoutagreement');
+ return Mage::getSingleton('admin/session')->isAllowed('sales/checkoutagreement');
}
}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Cms/Block/WidgetController.php b/app/code/core/Mage/Adminhtml/controllers/Cms/Block/WidgetController.php
index 3880ad6f86..067872e60b 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Cms/Block/WidgetController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Cms/Block/WidgetController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
diff --git a/app/code/core/Mage/Adminhtml/controllers/Cms/BlockController.php b/app/code/core/Mage/Adminhtml/controllers/Cms/BlockController.php
index 939c97adef..a672951918 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Cms/BlockController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Cms/BlockController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
diff --git a/app/code/core/Mage/Adminhtml/controllers/Cms/Page/WidgetController.php b/app/code/core/Mage/Adminhtml/controllers/Cms/Page/WidgetController.php
index 2312d47073..8bfd315572 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Cms/Page/WidgetController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Cms/Page/WidgetController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
diff --git a/app/code/core/Mage/Adminhtml/controllers/Cms/PageController.php b/app/code/core/Mage/Adminhtml/controllers/Cms/PageController.php
index e219d32846..fcfc251ecb 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Cms/PageController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Cms/PageController.php
@@ -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_Cms
- * @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_Adminhtml
+ * @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)
*/
diff --git a/app/code/core/Mage/Adminhtml/controllers/Cms/WidgetController.php b/app/code/core/Mage/Adminhtml/controllers/Cms/WidgetController.php
index 52a77d8a46..e66ca4748f 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Cms/WidgetController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Cms/WidgetController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
@@ -45,11 +45,10 @@ public function indexAction()
$header = $this->getLayout()->getBlock('head');
$header->setCanLoadExtJs(true);
- // set extra params to widgets insertion form
- $this->getLayout()->getBlock('wysiwyg_widget')->addData(array(
- 'skip_context_widgets' => $this->getRequest()->getParam('skip_context_widgets'),
- 'skip_widgets' => $this->getRequest()->getParam('skip_widgets'),
- ));
+ // save extra params for widgets insertion form
+ $skipped = $this->getRequest()->getParam('skip_widgets');
+ $skipped = Mage::getSingleton('cms/widget_config')->decodeWidgetsFromQuery($skipped);
+ Mage::register('skip_widgets', $skipped);
// Include WYSIWYG popup helper if WYSIWYG instance exists
if (!$this->getRequest()->getParam('no_wysiwyg')) {
@@ -57,14 +56,8 @@ public function indexAction()
}
// Add extra JS files required for widgets
- $config = Mage::getSingleton('cms/widget')->getXmlConfig();
- $widgets = $config->getNode('widgets');
- foreach ($widgets->children() as $widget) {
- if ($widget->js) {
- foreach (explode(',', (string)$widget->js) as $js) {
- $header->addJs($js);
- }
- }
+ foreach (Mage::getModel('cms/widget')->getWidgetsRequiredJsFiles() as $file) {
+ $header->addJs($file);
}
$this->renderLayout();
@@ -77,10 +70,10 @@ public function loadOptionsAction()
{
try {
$this->loadLayout('empty');
- $optionsBlock = $this->getLayout()->getBlock('wysiwyg_widget.options');
- if ($optionsBlock && $paramsJson = $this->getRequest()->getParam('widget')) {
+ if ($paramsJson = $this->getRequest()->getParam('widget')) {
$request = Mage::helper('core')->jsonDecode($paramsJson);
if (is_array($request)) {
+ $optionsBlock = $this->getLayout()->getBlock('wysiwyg_widget.options');
if (isset($request['widget_type'])) {
$optionsBlock->setWidgetType($request['widget_type']);
}
@@ -90,7 +83,7 @@ public function loadOptionsAction()
}
$this->renderLayout();
}
- } catch (Exception $e) {
+ } catch (Mage_Core_Exception $e) {
$result = array('error' => true, 'message' => $e->getMessage());
$this->getResponse()->setBody(Mage::helper('core')->jsonEncode($result));
}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Cms/Wysiwyg/ImagesController.php b/app/code/core/Mage/Adminhtml/controllers/Cms/Wysiwyg/ImagesController.php
index c7d6eb30c9..c232552250 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Cms/Wysiwyg/ImagesController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Cms/Wysiwyg/ImagesController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
@@ -147,15 +147,9 @@ public function onInsertAction()
{
$filename = $this->getRequest()->getParam('filename');
$filename = Mage::helper('core')->urlDecode($filename);
- $fileurl = Mage::helper('cms/wysiwyg_images')->getCurrentUrl() . $filename;
- $mediaPath = str_replace(Mage::getBaseUrl('media'), '', $fileurl);
- $directive = sprintf('{{media url="%s"}}', $mediaPath);
- if ($this->getRequest()->getParam('as_is')) {
- $directive = sprintf('
', $directive);
- } else {
- $directive = $this->getUrl('*/cms_wysiwyg/directive', array('directive' => Mage::helper('core')->urlEncode($directive)));
- }
- $this->getResponse()->setBody($directive);
+ $asIs = $this->getRequest()->getParam('as_is');
+ $image = Mage::helper('cms/wysiwyg_images')->getImageHtmlDeclaration($filename, $asIs);
+ $this->getResponse()->setBody($image);
}
/**
diff --git a/app/code/core/Mage/Adminhtml/controllers/Cms/WysiwygController.php b/app/code/core/Mage/Adminhtml/controllers/Cms/WysiwygController.php
index 98e6845faf..155dcc57e7 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Cms/WysiwygController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Cms/WysiwygController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
diff --git a/app/code/core/Mage/Adminhtml/controllers/Customer/ConfigController.php b/app/code/core/Mage/Adminhtml/controllers/Customer/ConfigController.php
index ac4ab03354..5aaa846c45 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Customer/ConfigController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Customer/ConfigController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -50,6 +50,6 @@ public function indexAction()
protected function _isAllowed()
{
- return Mage::getSingleton('admin/session')->isAllowed('customer/config');
+ return Mage::getSingleton('admin/session')->isAllowed('customer/config');
}
}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Customer/GroupController.php b/app/code/core/Mage/Adminhtml/controllers/Customer/GroupController.php
index ce37e2ac2d..383342ce8f 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Customer/GroupController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Customer/GroupController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -145,6 +145,6 @@ public function deleteAction()
protected function _isAllowed()
{
- return Mage::getSingleton('admin/session')->isAllowed('customer/group');
+ return Mage::getSingleton('admin/session')->isAllowed('customer/group');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Customer/OnlineController.php b/app/code/core/Mage/Adminhtml/controllers/Customer/OnlineController.php
index c77cd87971..37e8277608 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Customer/OnlineController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Customer/OnlineController.php
@@ -18,20 +18,20 @@
* 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_Adminhtml
- * @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_Adminhtml
+ * @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_Adminhtml_Customer_OnlineController extends Mage_Adminhtml_Controller_Action
{
public function indexAction()
{
- if($this->getRequest()->getParam('ajax')) {
- $this->_forward('grid');
- return;
- }
+ if($this->getRequest()->getParam('ajax')) {
+ $this->_forward('grid');
+ return;
+ }
$this->loadLayout();
@@ -47,6 +47,6 @@ public function indexAction()
protected function _isAllowed()
{
- return Mage::getSingleton('admin/session')->isAllowed('customer/online');
+ return Mage::getSingleton('admin/session')->isAllowed('customer/online');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/controllers/CustomerController.php b/app/code/core/Mage/Adminhtml/controllers/CustomerController.php
index 5debd35331..a4f723cb57 100644
--- a/app/code/core/Mage/Adminhtml/controllers/CustomerController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/CustomerController.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Adminhtml
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
@@ -151,7 +151,7 @@ public function deleteAction()
public function saveAction()
{
if ($data = $this->getRequest()->getPost()) {
- $redirectBack = $this->getRequest()->getParam('back', false);
+ $redirectBack = $this->getRequest()->getParam('back', false);
$this->_initCustomer('customer_id');
$customer = Mage::registry('current_customer');
@@ -233,11 +233,11 @@ public function saveAction()
Mage::dispatchEvent('adminhtml_customer_save_after', array('customer' => $customer));
if ($redirectBack) {
- $this->_redirect('*/*/edit', array(
- 'id' => $customer->getId(),
- '_current'=>true
- ));
- return;
+ $this->_redirect('*/*/edit', array(
+ 'id' => $customer->getId(),
+ '_current'=>true
+ ));
+ return;
}
}
catch (Exception $e){
diff --git a/app/code/core/Mage/Adminhtml/controllers/DashboardController.php b/app/code/core/Mage/Adminhtml/controllers/DashboardController.php
index 16354e89ea..0fe18fb2be 100644
--- a/app/code/core/Mage/Adminhtml/controllers/DashboardController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/DashboardController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -91,4 +91,4 @@ protected function _isAllowed()
{
return Mage::getSingleton('admin/session')->isAllowed('dashboard');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Extensions/ConfigController.php b/app/code/core/Mage/Adminhtml/controllers/Extensions/ConfigController.php
index 68f21c9e4a..ec9443c3be 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Extensions/ConfigController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Extensions/ConfigController.php
@@ -1,5 +1,4 @@
isAllowed('system/extensions/config');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Extensions/ConsoleController.php b/app/code/core/Mage/Adminhtml/controllers/Extensions/ConsoleController.php
index 3f145694bf..ecfb94d086 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Extensions/ConsoleController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Extensions/ConsoleController.php
@@ -1,5 +1,4 @@
isAllowed('system/extensions');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Extensions/CustomController.php b/app/code/core/Mage/Adminhtml/controllers/Extensions/CustomController.php
index 28aefc008d..6116bdb608 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Extensions/CustomController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Extensions/CustomController.php
@@ -1,5 +1,4 @@
- */
-class Mage_Adminhtml_Extensions_FileController extends Mage_Adminhtml_Controller_Action
-{
- public function indexAction()
- {
- $this->loadLayout();
-
- $this->_setActiveMenu('system/extensions');
-
- $this->_addContent($this->getLayout()->createBlock('adminhtml/extensions_file_form')->initForm());
-
- $this->renderLayout();
- }
-
- public function installAction()
- {
- $params = array('comment'=>Mage::helper('adminhtml')->__("Pending installation...")."\r\n\r\n");
- if ($this->getRequest()->getParam('do')) {
- switch ($this->getRequest()->getParam('file_type')) {
- case 'local':
- if (empty($_FILES['local']['tmp_name'])) {
- $params['comment'] = Mage::helper('adminhtml')->__("Error uploading the file")."\r\n\r\n";
- break;
- }
- $tmpDir = Mage::getBaseDir('var').DS.'pear';
- if (!is_dir($tmpDir)) {
- mkdir($tmpDir, 0777, true);
- }
- $pkg = $tmpDir.DS.$_FILES['local']['name'];
- move_uploaded_file($_FILES['local']['tmp_name'], $pkg);
-
- break;
-
- case 'remote':
- $pkg = $this->getRequest()->getParam('remote');
- if (empty($pkg)) {
- $params['comment'] = Mage::helper('adminhtml')->__("Invalid URL")."\r\n\r\n";
- }
- break;
- }
- if (!empty($pkg)) {
- $params['comment'] = Mage::helper('adminhtml')->__("Installing $pkg, please wait...")."\r\n\r\n";
- $params['command'] = 'install';
- $params['options'] = array();
- $params['params'] = array($pkg);
- }
- }
- $result = Varien_Pear::getInstance()->runHtmlConsole($params);
- if (!$result instanceof PEAR_Error) {
- Mage::getModel('adminhtml/extension')->clearAllCache();
- }
- }
-
- public function upgradeAllAction()
- {
- $params = array('comment'=>Mage::helper('adminhtml')->__("Upgrading all packages, please wait...")."\r\n\r\n");
- if ($this->getRequest()->getParam('do')) {
- $params['command'] = 'upgrade';
- $params['options'] = array();
- $params['params'] = array($pkg);
- }
- $result = Varien_Pear::getInstance()->runHtmlConsole($params);
- if (!$result instanceof PEAR_Error) {
- Mage::app()->cleanCache();
- }
- }
-
- protected function _isAllowed()
- {
- return Mage::getSingleton('admin/session')->isAllowed('system/extensions');
- }
-}
\ No newline at end of file
+
+ */
+class Mage_Adminhtml_Extensions_FileController extends Mage_Adminhtml_Controller_Action
+{
+ public function indexAction()
+ {
+ $this->loadLayout();
+
+ $this->_setActiveMenu('system/extensions');
+
+ $this->_addContent($this->getLayout()->createBlock('adminhtml/extensions_file_form')->initForm());
+
+ $this->renderLayout();
+ }
+
+ public function installAction()
+ {
+ $params = array('comment'=>Mage::helper('adminhtml')->__("Pending installation...")."\r\n\r\n");
+ if ($this->getRequest()->getParam('do')) {
+ switch ($this->getRequest()->getParam('file_type')) {
+ case 'local':
+ if (empty($_FILES['local']['tmp_name'])) {
+ $params['comment'] = Mage::helper('adminhtml')->__("Error uploading the file")."\r\n\r\n";
+ break;
+ }
+ $tmpDir = Mage::getBaseDir('var').DS.'pear';
+ if (!is_dir($tmpDir)) {
+ mkdir($tmpDir, 0777, true);
+ }
+ $pkg = $tmpDir.DS.$_FILES['local']['name'];
+ move_uploaded_file($_FILES['local']['tmp_name'], $pkg);
+
+ break;
+
+ case 'remote':
+ $pkg = $this->getRequest()->getParam('remote');
+ if (empty($pkg)) {
+ $params['comment'] = Mage::helper('adminhtml')->__("Invalid URL")."\r\n\r\n";
+ }
+ break;
+ }
+ if (!empty($pkg)) {
+ $params['comment'] = Mage::helper('adminhtml')->__("Installing $pkg, please wait...")."\r\n\r\n";
+ $params['command'] = 'install';
+ $params['options'] = array();
+ $params['params'] = array($pkg);
+ }
+ }
+ $result = Varien_Pear::getInstance()->runHtmlConsole($params);
+ if (!$result instanceof PEAR_Error) {
+ Mage::getModel('adminhtml/extension')->clearAllCache();
+ }
+ }
+
+ public function upgradeAllAction()
+ {
+ $params = array('comment'=>Mage::helper('adminhtml')->__("Upgrading all packages, please wait...")."\r\n\r\n");
+ if ($this->getRequest()->getParam('do')) {
+ $params['command'] = 'upgrade';
+ $params['options'] = array();
+ $params['params'] = array($pkg);
+ }
+ $result = Varien_Pear::getInstance()->runHtmlConsole($params);
+ if (!$result instanceof PEAR_Error) {
+ Mage::app()->cleanCache();
+ }
+ }
+
+ protected function _isAllowed()
+ {
+ return Mage::getSingleton('admin/session')->isAllowed('system/extensions');
+ }
+}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Extensions/LocalController.php b/app/code/core/Mage/Adminhtml/controllers/Extensions/LocalController.php
index 7fa3f16274..a643ce9d64 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Extensions/LocalController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Extensions/LocalController.php
@@ -1,207 +1,206 @@
-
- */
-class Mage_Adminhtml_Extensions_LocalController extends Mage_Adminhtml_Controller_Action
-{
- public function indexAction()
- {
- $url = Mage::getBaseUrl('web').'downloader/?return='.urlencode(Mage::getUrl('adminhtml'));
- $this->getResponse()->setRedirect($url);
- return;
-
- $this->loadLayout();
-
- $this->_setActiveMenu('system/extensions/local');
-
- $this->_addContent($this->getLayout()->createBlock('adminhtml/extensions_local'));
-
- $this->renderLayout();
- }
-
- public function gridAction()
- {
- $this->getResponse()->setBody($this->getLayout()->createBlock('adminhtml/extensions_local_grid')->toHtml());
- }
-
- public function editAction()
- {
- $this->loadLayout();
-
- $pkg = str_replace('|', '/', $this->getRequest()->getParam('id'));
- $ext = Mage::getModel('adminhtml/extension')->loadLocal($pkg);
- Mage::register('local_extension', $ext);
-#echo "".print_r($ext->getData(),1)."
";
- $this->_setActiveMenu('system/extensions/local');
-
- $this->_addContent($this->getLayout()->createBlock('adminhtml/extensions_local_edit'));
- $this->_addLeft($this->getLayout()->createBlock('adminhtml/extensions_local_edit_tabs'));
-
- $this->renderLayout();
- }
-
- public function prepareAction()
- {
- $pkg = str_replace('|', '/', $this->getRequest()->getParam('id'));
- $params = array('comment'=>Mage::helper('adminhtml')->__("Preparing to change $pkg, please wait...")."\r\n\r\n");
- Varien_Pear::getInstance()->runHtmlConsole($params);
- }
-
- public function upgradeAction()
- {
- $pkg = str_replace('|', '/', $this->getRequest()->getParam('id'));
- $params = array('comment'=>Mage::helper('adminhtml')->__("Upgrading $pkg, please wait...")."\r\n\r\n");
- if ($this->getRequest()->getParam('do')) {
- $params['command'] = 'upgrade';
- $params['options'] = array();
- $params['params'] = array($pkg);
- }
- $result = Varien_Pear::getInstance()->runHtmlConsole($params);
- if (!$result instanceof PEAR_Error) {
- Mage::app()->cleanCache();
- }
- Mage::app()->getFrontController()->getResponse()->clearAllHeaders();
- }
-
- public function uninstallAction()
- {
- $pkg = str_replace('|', '/', $this->getRequest()->getParam('id'));
- $params = array('comment'=>Mage::helper('adminhtml')->__("Uninstalling $pkg, please wait...")."\r\n\r\n");
- if ($this->getRequest()->getParam('do')) {
- $params['command'] = 'uninstall';
- $params['options'] = array();
- $params['params'] = array($pkg);
- }
- $result = Varien_Pear::getInstance()->runHtmlConsole($params);
- if (!$result instanceof PEAR_Error) {
- Mage::app()->cleanCache();
- }
- Mage::app()->getFrontController()->getResponse()->clearAllHeaders();
- }
-
- public function upgradeAllAction()
- {
- $this->loadLayout();
-
- $this->_setActiveMenu('system/extensions');
-
- $this->_addContent($this->getLayout()->createBlock('adminhtml/extensions_local_upgrade')->initForm());
-
- $this->renderLayout();
- }
-
- public function upgradeAllRunAction()
- {
- $params = array('comment'=>Mage::helper('adminhtml')->__("Upgrading all available packages, please wait...")."\r\n\r\n");
- if ($this->getRequest()->getParam('do')) {
- $params['command'] = 'upgrade-all';
- $params['options'] = array();
- $params['params'] = array();
- }
- $result = Varien_Pear::getInstance()->runHtmlConsole($params);
- if (!$result instanceof PEAR_Error) {
- Mage::app()->cleanCache();
- echo "ALL UPGRADES ARE DONE.\n";
- } else {
- echo "ERROR DURING UPGRADES.\n";
- }
- Mage::app()->getFrontController()->getResponse()->clearAllHeaders();
- }
-
- public function massUninstallAction()
- {
- $this->loadLayout();
-
- $this->_setActiveMenu('system/extensions');
-
- $this->_addContent($this->getLayout()->createBlock('adminhtml/extensions_mass_uninstall')->initForm());
-
- $this->renderLayout();
- }
-
- public function massUninstallRunAction()
- {
- $params = array('comment'=>Mage::helper('adminhtml')->__("Uninstalling selected packages, please wait...")."\r\n\r\n");
- if ($this->getRequest()->getParam('do')) {
- $params['command'] = 'uninstall';
- $params['options'] = array();
- $packages = array();
- foreach ($this->getRequest()->getPost('package') as $package) {
- $packages[] = str_replace('|', '/', $package);
- }
- $params['params'] = $packages;
- }
- $result = Varien_Pear::getInstance()->runHtmlConsole($params);
- if (!$result instanceof PEAR_Error) {
- Mage::app()->cleanCache();
- }
- Mage::app()->getFrontController()->getResponse()->clearAllHeaders();
- }
-
- public function massUpgradeAction()
- {
- $this->loadLayout();
-
- $this->_setActiveMenu('system/extensions');
-
- $this->_addContent($this->getLayout()->createBlock('adminhtml/extensions_mass_upgrade')->initForm());
-
- $this->renderLayout();
- }
-
- public function massUpgradeRunAction()
- {
- $params = array('comment'=>Mage::helper('adminhtml')->__("Upgrading selected packages, please wait...")."\r\n\r\n");
- if ($this->getRequest()->getParam('do')) {
- $params['command'] = 'upgrade';
- $params['options'] = array();
- $packages = array();
- foreach ($this->getRequest()->getPost('package') as $package) {
- $packages[] = str_replace('|', '/', $package);
- }
- $params['params'] = $packages;
- }
- $result = Varien_Pear::getInstance()->runHtmlConsole($params);
- if (!$result instanceof PEAR_Error) {
- Mage::app()->cleanCache();
- }
- Mage::app()->getFrontController()->getResponse()->clearAllHeaders();
- }
-
- protected function _isAllowed()
- {
- return Mage::getSingleton('admin/session')->isAllowed('system/extensions/local');
- }
-}
\ No newline at end of file
+
+ */
+class Mage_Adminhtml_Extensions_LocalController extends Mage_Adminhtml_Controller_Action
+{
+ public function indexAction()
+ {
+ $url = Mage::getBaseUrl('web').'downloader/?return='.urlencode(Mage::getUrl('adminhtml'));
+ $this->getResponse()->setRedirect($url);
+ return;
+
+ $this->loadLayout();
+
+ $this->_setActiveMenu('system/extensions/local');
+
+ $this->_addContent($this->getLayout()->createBlock('adminhtml/extensions_local'));
+
+ $this->renderLayout();
+ }
+
+ public function gridAction()
+ {
+ $this->getResponse()->setBody($this->getLayout()->createBlock('adminhtml/extensions_local_grid')->toHtml());
+ }
+
+ public function editAction()
+ {
+ $this->loadLayout();
+
+ $pkg = str_replace('|', '/', $this->getRequest()->getParam('id'));
+ $ext = Mage::getModel('adminhtml/extension')->loadLocal($pkg);
+ Mage::register('local_extension', $ext);
+#echo "".print_r($ext->getData(),1)."
";
+ $this->_setActiveMenu('system/extensions/local');
+
+ $this->_addContent($this->getLayout()->createBlock('adminhtml/extensions_local_edit'));
+ $this->_addLeft($this->getLayout()->createBlock('adminhtml/extensions_local_edit_tabs'));
+
+ $this->renderLayout();
+ }
+
+ public function prepareAction()
+ {
+ $pkg = str_replace('|', '/', $this->getRequest()->getParam('id'));
+ $params = array('comment'=>Mage::helper('adminhtml')->__("Preparing to change $pkg, please wait...")."\r\n\r\n");
+ Varien_Pear::getInstance()->runHtmlConsole($params);
+ }
+
+ public function upgradeAction()
+ {
+ $pkg = str_replace('|', '/', $this->getRequest()->getParam('id'));
+ $params = array('comment'=>Mage::helper('adminhtml')->__("Upgrading $pkg, please wait...")."\r\n\r\n");
+ if ($this->getRequest()->getParam('do')) {
+ $params['command'] = 'upgrade';
+ $params['options'] = array();
+ $params['params'] = array($pkg);
+ }
+ $result = Varien_Pear::getInstance()->runHtmlConsole($params);
+ if (!$result instanceof PEAR_Error) {
+ Mage::app()->cleanCache();
+ }
+ Mage::app()->getFrontController()->getResponse()->clearAllHeaders();
+ }
+
+ public function uninstallAction()
+ {
+ $pkg = str_replace('|', '/', $this->getRequest()->getParam('id'));
+ $params = array('comment'=>Mage::helper('adminhtml')->__("Uninstalling $pkg, please wait...")."\r\n\r\n");
+ if ($this->getRequest()->getParam('do')) {
+ $params['command'] = 'uninstall';
+ $params['options'] = array();
+ $params['params'] = array($pkg);
+ }
+ $result = Varien_Pear::getInstance()->runHtmlConsole($params);
+ if (!$result instanceof PEAR_Error) {
+ Mage::app()->cleanCache();
+ }
+ Mage::app()->getFrontController()->getResponse()->clearAllHeaders();
+ }
+
+ public function upgradeAllAction()
+ {
+ $this->loadLayout();
+
+ $this->_setActiveMenu('system/extensions');
+
+ $this->_addContent($this->getLayout()->createBlock('adminhtml/extensions_local_upgrade')->initForm());
+
+ $this->renderLayout();
+ }
+
+ public function upgradeAllRunAction()
+ {
+ $params = array('comment'=>Mage::helper('adminhtml')->__("Upgrading all available packages, please wait...")."\r\n\r\n");
+ if ($this->getRequest()->getParam('do')) {
+ $params['command'] = 'upgrade-all';
+ $params['options'] = array();
+ $params['params'] = array();
+ }
+ $result = Varien_Pear::getInstance()->runHtmlConsole($params);
+ if (!$result instanceof PEAR_Error) {
+ Mage::app()->cleanCache();
+ echo "ALL UPGRADES ARE DONE.\n";
+ } else {
+ echo "ERROR DURING UPGRADES.\n";
+ }
+ Mage::app()->getFrontController()->getResponse()->clearAllHeaders();
+ }
+
+ public function massUninstallAction()
+ {
+ $this->loadLayout();
+
+ $this->_setActiveMenu('system/extensions');
+
+ $this->_addContent($this->getLayout()->createBlock('adminhtml/extensions_mass_uninstall')->initForm());
+
+ $this->renderLayout();
+ }
+
+ public function massUninstallRunAction()
+ {
+ $params = array('comment'=>Mage::helper('adminhtml')->__("Uninstalling selected packages, please wait...")."\r\n\r\n");
+ if ($this->getRequest()->getParam('do')) {
+ $params['command'] = 'uninstall';
+ $params['options'] = array();
+ $packages = array();
+ foreach ($this->getRequest()->getPost('package') as $package) {
+ $packages[] = str_replace('|', '/', $package);
+ }
+ $params['params'] = $packages;
+ }
+ $result = Varien_Pear::getInstance()->runHtmlConsole($params);
+ if (!$result instanceof PEAR_Error) {
+ Mage::app()->cleanCache();
+ }
+ Mage::app()->getFrontController()->getResponse()->clearAllHeaders();
+ }
+
+ public function massUpgradeAction()
+ {
+ $this->loadLayout();
+
+ $this->_setActiveMenu('system/extensions');
+
+ $this->_addContent($this->getLayout()->createBlock('adminhtml/extensions_mass_upgrade')->initForm());
+
+ $this->renderLayout();
+ }
+
+ public function massUpgradeRunAction()
+ {
+ $params = array('comment'=>Mage::helper('adminhtml')->__("Upgrading selected packages, please wait...")."\r\n\r\n");
+ if ($this->getRequest()->getParam('do')) {
+ $params['command'] = 'upgrade';
+ $params['options'] = array();
+ $packages = array();
+ foreach ($this->getRequest()->getPost('package') as $package) {
+ $packages[] = str_replace('|', '/', $package);
+ }
+ $params['params'] = $packages;
+ }
+ $result = Varien_Pear::getInstance()->runHtmlConsole($params);
+ if (!$result instanceof PEAR_Error) {
+ Mage::app()->cleanCache();
+ }
+ Mage::app()->getFrontController()->getResponse()->clearAllHeaders();
+ }
+
+ protected function _isAllowed()
+ {
+ return Mage::getSingleton('admin/session')->isAllowed('system/extensions/local');
+ }
+}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Extensions/RemoteController.php b/app/code/core/Mage/Adminhtml/controllers/Extensions/RemoteController.php
index b04b66a095..4114f8310a 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Extensions/RemoteController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Extensions/RemoteController.php
@@ -1,137 +1,136 @@
-
- */
-class Mage_Adminhtml_Extensions_RemoteController extends Mage_Adminhtml_Controller_Action
-{
- public function indexAction()
- {
- $this->loadLayout();
-
- $this->_setActiveMenu('system/extensions/remote');
-
- $this->_addContent($this->getLayout()->createBlock('adminhtml/extensions_remote'));
-
- $this->renderLayout();
- }
-
- public function gridAction()
- {
- $this->getResponse()->setBody($this->getLayout()->createBlock('adminhtml/extensions_remote_grid')->toHtml());
- }
-
- public function editAction()
- {
- $this->loadLayout();
-
- $pkg = str_replace('|', '/', $this->getRequest()->getParam('id'));
- $ext = Mage::getModel('adminhtml/extension')->loadRemote($pkg);
-#echo "".print_r($ext->getData(),1)."
";
- Mage::register('remote_extension', $ext);
- $this->_setActiveMenu('system/extensions/remote');
-
- $this->_addContent($this->getLayout()->createBlock('adminhtml/extensions_remote_edit'));
- $this->_addLeft($this->getLayout()->createBlock('adminhtml/extensions_remote_edit_tabs'));
-
- $this->renderLayout();
- }
-
- public function installAction()
- {
- $pkg = str_replace('|', '/', $this->getRequest()->getParam('id'));
- $params = array('comment'=>Mage::helper('adminhtml')->__("Downloading and installing $pkg, please wait...")."\r\n\r\n");
- if ($this->getRequest()->getParam('do')) {
- $params['command'] = 'install';
- $params['options'] = array('onlyreqdeps'=>1);
- $params['params'] = array($pkg);
- }
- $result = Varien_Pear::getInstance()->runHtmlConsole($params);
- if (!$result instanceof PEAR_Error) {
- Mage::app()->cleanCache();
- }
- Mage::app()->getFrontController()->getResponse()->clearAllHeaders();
- }
-
- public function upgradeAction()
- {
- $pkg = str_replace('|', '/', $this->getRequest()->getParam('id'));
- $params = array('comment'=>Mage::helper('adminhtml')->__("Upgrading $pkg, please wait...")."\r\n\r\n");
- if ($this->getRequest()->getParam('do')) {
- $params['command'] = 'upgrade';
- $params['options'] = array();
- $params['params'] = array($pkg);
- }
- $result = Varien_Pear::getInstance()->runHtmlConsole($params);
- if (!$result instanceof PEAR_Error) {
- Mage::app()->cleanCache();
- }
- Mage::app()->getFrontController()->getResponse()->clearAllHeaders();
- }
-
- public function massInstallAction()
- {
- $this->loadLayout();
-
- $this->_setActiveMenu('system/extensions');
-
- $this->_addContent($this->getLayout()->createBlock('adminhtml/extensions_mass_install')->initForm());
-
- $this->renderLayout();
- }
-
- public function massInstallRunAction()
- {
- $params = array('comment'=>Mage::helper('adminhtml')->__("Installing selected packages, please wait...")."\r\n\r\n");
- if ($this->getRequest()->getParam('do')) {
- $params['command'] = 'install';
- $params['options'] = array();
- $packages = array();
- foreach ($this->getRequest()->getPost('package') as $package) {
- $packages[] = str_replace('|', '/', $package);
- }
- $params['params'] = $packages;
- }
- $result = Varien_Pear::getInstance()->runHtmlConsole($params);
- if (!$result instanceof PEAR_Error) {
- Mage::app()->cleanCache();
- }
- Mage::app()->getFrontController()->getResponse()->clearAllHeaders();
- }
-
- protected function _isAllowed()
- {
- return Mage::getSingleton('admin/session')->isAllowed('system/extensions/remote');
- }
-}
+
+ */
+class Mage_Adminhtml_Extensions_RemoteController extends Mage_Adminhtml_Controller_Action
+{
+ public function indexAction()
+ {
+ $this->loadLayout();
+
+ $this->_setActiveMenu('system/extensions/remote');
+
+ $this->_addContent($this->getLayout()->createBlock('adminhtml/extensions_remote'));
+
+ $this->renderLayout();
+ }
+
+ public function gridAction()
+ {
+ $this->getResponse()->setBody($this->getLayout()->createBlock('adminhtml/extensions_remote_grid')->toHtml());
+ }
+
+ public function editAction()
+ {
+ $this->loadLayout();
+
+ $pkg = str_replace('|', '/', $this->getRequest()->getParam('id'));
+ $ext = Mage::getModel('adminhtml/extension')->loadRemote($pkg);
+#echo "".print_r($ext->getData(),1)."
";
+ Mage::register('remote_extension', $ext);
+ $this->_setActiveMenu('system/extensions/remote');
+
+ $this->_addContent($this->getLayout()->createBlock('adminhtml/extensions_remote_edit'));
+ $this->_addLeft($this->getLayout()->createBlock('adminhtml/extensions_remote_edit_tabs'));
+
+ $this->renderLayout();
+ }
+
+ public function installAction()
+ {
+ $pkg = str_replace('|', '/', $this->getRequest()->getParam('id'));
+ $params = array('comment'=>Mage::helper('adminhtml')->__("Downloading and installing $pkg, please wait...")."\r\n\r\n");
+ if ($this->getRequest()->getParam('do')) {
+ $params['command'] = 'install';
+ $params['options'] = array('onlyreqdeps'=>1);
+ $params['params'] = array($pkg);
+ }
+ $result = Varien_Pear::getInstance()->runHtmlConsole($params);
+ if (!$result instanceof PEAR_Error) {
+ Mage::app()->cleanCache();
+ }
+ Mage::app()->getFrontController()->getResponse()->clearAllHeaders();
+ }
+
+ public function upgradeAction()
+ {
+ $pkg = str_replace('|', '/', $this->getRequest()->getParam('id'));
+ $params = array('comment'=>Mage::helper('adminhtml')->__("Upgrading $pkg, please wait...")."\r\n\r\n");
+ if ($this->getRequest()->getParam('do')) {
+ $params['command'] = 'upgrade';
+ $params['options'] = array();
+ $params['params'] = array($pkg);
+ }
+ $result = Varien_Pear::getInstance()->runHtmlConsole($params);
+ if (!$result instanceof PEAR_Error) {
+ Mage::app()->cleanCache();
+ }
+ Mage::app()->getFrontController()->getResponse()->clearAllHeaders();
+ }
+
+ public function massInstallAction()
+ {
+ $this->loadLayout();
+
+ $this->_setActiveMenu('system/extensions');
+
+ $this->_addContent($this->getLayout()->createBlock('adminhtml/extensions_mass_install')->initForm());
+
+ $this->renderLayout();
+ }
+
+ public function massInstallRunAction()
+ {
+ $params = array('comment'=>Mage::helper('adminhtml')->__("Installing selected packages, please wait...")."\r\n\r\n");
+ if ($this->getRequest()->getParam('do')) {
+ $params['command'] = 'install';
+ $params['options'] = array();
+ $packages = array();
+ foreach ($this->getRequest()->getPost('package') as $package) {
+ $packages[] = str_replace('|', '/', $package);
+ }
+ $params['params'] = $packages;
+ }
+ $result = Varien_Pear::getInstance()->runHtmlConsole($params);
+ if (!$result instanceof PEAR_Error) {
+ Mage::app()->cleanCache();
+ }
+ Mage::app()->getFrontController()->getResponse()->clearAllHeaders();
+ }
+
+ protected function _isAllowed()
+ {
+ return Mage::getSingleton('admin/session')->isAllowed('system/extensions/remote');
+ }
+}
diff --git a/app/code/core/Mage/Adminhtml/controllers/IndexController.php b/app/code/core/Mage/Adminhtml/controllers/IndexController.php
index e455fbec04..9648fc0332 100644
--- a/app/code/core/Mage/Adminhtml/controllers/IndexController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/IndexController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
diff --git a/app/code/core/Mage/Adminhtml/controllers/JsonController.php b/app/code/core/Mage/Adminhtml/controllers/JsonController.php
index dcc5882875..b9c363d38c 100644
--- a/app/code/core/Mage/Adminhtml/controllers/JsonController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/JsonController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -49,4 +49,4 @@ public function countryRegionAction()
$this->getResponse()->setBody(Mage::helper('core')->jsonEncode($arrRes));
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Media/EditorController.php b/app/code/core/Mage/Adminhtml/controllers/Media/EditorController.php
index ca20c99602..e3cd342d8d 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Media/EditorController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Media/EditorController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
diff --git a/app/code/core/Mage/Adminhtml/controllers/Media/UploaderController.php b/app/code/core/Mage/Adminhtml/controllers/Media/UploaderController.php
index c00ea66383..88913bb48d 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Media/UploaderController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Media/UploaderController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -52,4 +52,4 @@ protected function _isAllowed()
{
return Mage::getSingleton('admin/session')->isAllowed('media');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Newsletter/ProblemController.php b/app/code/core/Mage/Adminhtml/controllers/Newsletter/ProblemController.php
index 7624ce4e03..138f1be4f8 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Newsletter/ProblemController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Newsletter/ProblemController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -99,4 +99,4 @@ protected function _isAllowed()
{
return Mage::getSingleton('admin/session')->isAllowed('newsletter/problem');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Newsletter/QueueController.php b/app/code/core/Mage/Adminhtml/controllers/Newsletter/QueueController.php
index 5886a23667..576e908772 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Newsletter/QueueController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Newsletter/QueueController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/controllers/Newsletter/SubscriberController.php b/app/code/core/Mage/Adminhtml/controllers/Newsletter/SubscriberController.php
index f92b55bca0..8bc10089dd 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Newsletter/SubscriberController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Newsletter/SubscriberController.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Adminhtml
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
diff --git a/app/code/core/Mage/Adminhtml/controllers/Newsletter/TemplateController.php b/app/code/core/Mage/Adminhtml/controllers/Newsletter/TemplateController.php
index 4fde237585..4da03ee951 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Newsletter/TemplateController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Newsletter/TemplateController.php
@@ -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_Adminhtml
- * @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)
+ * @category Mage
+ * @package Mage_Adminhtml
+ * @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)
*/
/**
* Manage Newsletter Template Controller
diff --git a/app/code/core/Mage/Adminhtml/controllers/NotificationController.php b/app/code/core/Mage/Adminhtml/controllers/NotificationController.php
index 6c4cf8cb71..d9b8907400 100644
--- a/app/code/core/Mage/Adminhtml/controllers/NotificationController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/NotificationController.php
@@ -10,12 +10,18 @@
* http://opensource.org/licenses/osl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
+ * to license@magentocommerce.com so we can send you a copy immediately.
*
- * @category Mage
- * @package Mage_Adminhtml
- * @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)
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * 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_Adminhtml
+ * @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)
*/
@@ -183,4 +189,4 @@ protected function _isAllowed()
}
return Mage::getSingleton('admin/session')->isAllowed($acl);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Permissions/RoleController.php b/app/code/core/Mage/Adminhtml/controllers/Permissions/RoleController.php
index e07b2c5df5..e80dfa9c5c 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Permissions/RoleController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Permissions/RoleController.php
@@ -1,198 +1,198 @@
-
- */
-class Mage_Adminhtml_Permissions_RoleController extends Mage_Adminhtml_Controller_Action
-{
-
- protected function _initAction()
- {
- $this->loadLayout();
- $this->_setActiveMenu('system/acl');
- $this->_addBreadcrumb($this->__('System'), $this->__('System'));
- $this->_addBreadcrumb($this->__('Permissions'), $this->__('Permissions'));
- $this->_addBreadcrumb($this->__('Roles'), $this->__('Roles'));
- return $this;
- }
-
- protected function _initRole($requestVariable = 'rid')
- {
- Mage::register('current_role', Mage::getModel('admin/roles')->load($this->getRequest()->getParam($requestVariable)));
- return Mage::registry('current_role');
- }
-
- public function indexAction()
- {
- $this->_initAction();
-
- $this->renderLayout();
- }
-
- public function roleGridAction()
- {
- $this->loadLayout();
- $this->getResponse()->setBody($this->getLayout()->getBlock('adminhtml.permission.role.grid')->toHtml());
- }
-
- public function editRoleAction()
- {
- $role = $this->_initRole();
- $this->_initAction();
-
- if ($role->getId()) {
- $breadCrumb = $this->__('Edit Role');
- $breadCrumbTitle = $this->__('Edit Role');
- } else {
- $breadCrumb = $this->__('Add new Role');
- $breadCrumbTitle = $this->__('Add new Role');
- }
- $this->_addBreadcrumb($breadCrumb, $breadCrumbTitle);
-
- $this->getLayout()->getBlock('head')->setCanLoadExtJs(true);
-
- $this->_addContent(
- $this->getLayout()->createBlock('adminhtml/permissions_buttons')
- ->setRoleId($role->getId())
- ->setRoleInfo($role)
- ->setTemplate('permissions/roleinfo.phtml')
- );
- $this->_addJs($this->getLayout()->createBlock('adminhtml/template')->setTemplate('permissions/role_users_grid_js.phtml'));
- $this->renderLayout();
- }
-
- public function deleteAction()
- {
- $rid = $this->getRequest()->getParam('rid', false);
- $currentUser = Mage::getModel('admin/user')->setId(Mage::getSingleton('admin/session')->getUser()->getId());
- if ( in_array($rid, $currentUser->getRoles()) ) {
- Mage::getSingleton('adminhtml/session')->addError($this->__('You can not delete self assigned roles.'));
- $this->_redirect('*/*/editrole', array('rid' => $rid));
- return;
- }
-
- try {
- Mage::getModel("admin/roles")->setId($rid)->delete();
- Mage::getSingleton('adminhtml/session')->addSuccess($this->__('Role successfully deleted.'));
- } catch (Exception $e) {
- Mage::getSingleton('adminhtml/session')->addError($this->__('Error while deleting this role. Please try again later.'));
- }
-
- $this->_redirect("*/*/");
- }
-
- public function saveRoleAction()
- {
- $rid = $this->getRequest()->getParam('role_id', false);
- $resource = explode(',', $this->getRequest()->getParam('resource', false));
- $roleUsers = $this->getRequest()->getParam('in_role_user', null);
- parse_str($roleUsers, $roleUsers);
- $roleUsers = array_keys($roleUsers);
-
- $isAll = $this->getRequest()->getParam('all');
- if ($isAll)
- $resource = array("all");
-
- try {
- $role = Mage::getModel("admin/roles")
- ->setId($rid)
- ->setName($this->getRequest()->getParam('rolename', false))
- ->setPid($this->getRequest()->getParam('parent_id', false))
- ->setRoleType('G');
- Mage::dispatchEvent('admin_permissions_role_prepare_save', array('object' => $role, 'request' => $this->getRequest()));
- $role->save();
-
- Mage::getModel("admin/rules")
- ->setRoleId($role->getId())
- ->setResources($resource)
- ->saveRel();
-
- $oldRoleUsers = Mage::getModel("admin/roles")->setId($role->getId())->getRoleUsers($role);
- if ( sizeof($oldRoleUsers) > 0 ) {
- foreach($oldRoleUsers as $oUid) {
- $this->_deleteUserFromRole($oUid, $role->getId());
- }
- }
- if ( $roleUsers ) {
- foreach ($roleUsers as $nRuid) {
- $this->_addUserToRole($nRuid, $role->getId());
- }
- }
- $rid = $role->getId();
- Mage::getSingleton('adminhtml/session')->addSuccess($this->__('Role successfully saved.'));
- } catch (Mage_Core_Exception $e) {
- Mage::getSingleton('adminhtml/session')->addError($e->getMessage());
- } catch (Exception $e) {
- Mage::getSingleton('adminhtml/session')->addError($this->__('Error while saving this role. Please try again later.'));
- }
-
- //$this->getResponse()->setRedirect($this->getUrl("*/*/editrole/rid/$rid"));
- $this->_redirect('*/*/editrole', array('rid' => $rid));
- return;
- }
-
- public function editrolegridAction()
- {
- $this->getResponse()->setBody($this->getLayout()->createBlock('adminhtml/permissions_role_grid_user')->toHtml());
- }
-
- protected function _deleteUserFromRole($userId, $roleId)
- {
- try {
- Mage::getModel("admin/user")
- ->setRoleId($roleId)
- ->setUserId($userId)
- ->deleteFromRole();
- } catch (Exception $e) {
- throw $e;
- return false;
- }
- return true;
- }
-
- protected function _addUserToRole($userId, $roleId)
- {
- $user = Mage::getModel("admin/user")->load($userId);
- $user->setRoleId($roleId)->setUserId($userId);
-
- if( $user->roleUserExists() === true ) {
- return false;
- } else {
- $user->add();
- return true;
- }
- }
-
- protected function _isAllowed()
- {
- return Mage::getSingleton('admin/session')->isAllowed('system/acl/roles');
- }
-}
\ No newline at end of file
+
+ */
+class Mage_Adminhtml_Permissions_RoleController extends Mage_Adminhtml_Controller_Action
+{
+
+ protected function _initAction()
+ {
+ $this->loadLayout();
+ $this->_setActiveMenu('system/acl');
+ $this->_addBreadcrumb($this->__('System'), $this->__('System'));
+ $this->_addBreadcrumb($this->__('Permissions'), $this->__('Permissions'));
+ $this->_addBreadcrumb($this->__('Roles'), $this->__('Roles'));
+ return $this;
+ }
+
+ protected function _initRole($requestVariable = 'rid')
+ {
+ Mage::register('current_role', Mage::getModel('admin/roles')->load($this->getRequest()->getParam($requestVariable)));
+ return Mage::registry('current_role');
+ }
+
+ public function indexAction()
+ {
+ $this->_initAction();
+
+ $this->renderLayout();
+ }
+
+ public function roleGridAction()
+ {
+ $this->loadLayout();
+ $this->getResponse()->setBody($this->getLayout()->getBlock('adminhtml.permission.role.grid')->toHtml());
+ }
+
+ public function editRoleAction()
+ {
+ $role = $this->_initRole();
+ $this->_initAction();
+
+ if ($role->getId()) {
+ $breadCrumb = $this->__('Edit Role');
+ $breadCrumbTitle = $this->__('Edit Role');
+ } else {
+ $breadCrumb = $this->__('Add new Role');
+ $breadCrumbTitle = $this->__('Add new Role');
+ }
+ $this->_addBreadcrumb($breadCrumb, $breadCrumbTitle);
+
+ $this->getLayout()->getBlock('head')->setCanLoadExtJs(true);
+
+ $this->_addContent(
+ $this->getLayout()->createBlock('adminhtml/permissions_buttons')
+ ->setRoleId($role->getId())
+ ->setRoleInfo($role)
+ ->setTemplate('permissions/roleinfo.phtml')
+ );
+ $this->_addJs($this->getLayout()->createBlock('adminhtml/template')->setTemplate('permissions/role_users_grid_js.phtml'));
+ $this->renderLayout();
+ }
+
+ public function deleteAction()
+ {
+ $rid = $this->getRequest()->getParam('rid', false);
+ $currentUser = Mage::getModel('admin/user')->setId(Mage::getSingleton('admin/session')->getUser()->getId());
+ if ( in_array($rid, $currentUser->getRoles()) ) {
+ Mage::getSingleton('adminhtml/session')->addError($this->__('You can not delete self assigned roles.'));
+ $this->_redirect('*/*/editrole', array('rid' => $rid));
+ return;
+ }
+
+ try {
+ Mage::getModel("admin/roles")->setId($rid)->delete();
+ Mage::getSingleton('adminhtml/session')->addSuccess($this->__('Role successfully deleted.'));
+ } catch (Exception $e) {
+ Mage::getSingleton('adminhtml/session')->addError($this->__('Error while deleting this role. Please try again later.'));
+ }
+
+ $this->_redirect("*/*/");
+ }
+
+ public function saveRoleAction()
+ {
+ $rid = $this->getRequest()->getParam('role_id', false);
+ $resource = explode(',', $this->getRequest()->getParam('resource', false));
+ $roleUsers = $this->getRequest()->getParam('in_role_user', null);
+ parse_str($roleUsers, $roleUsers);
+ $roleUsers = array_keys($roleUsers);
+
+ $isAll = $this->getRequest()->getParam('all');
+ if ($isAll)
+ $resource = array("all");
+
+ try {
+ $role = Mage::getModel("admin/roles")
+ ->setId($rid)
+ ->setName($this->getRequest()->getParam('rolename', false))
+ ->setPid($this->getRequest()->getParam('parent_id', false))
+ ->setRoleType('G');
+ Mage::dispatchEvent('admin_permissions_role_prepare_save', array('object' => $role, 'request' => $this->getRequest()));
+ $role->save();
+
+ Mage::getModel("admin/rules")
+ ->setRoleId($role->getId())
+ ->setResources($resource)
+ ->saveRel();
+
+ $oldRoleUsers = Mage::getModel("admin/roles")->setId($role->getId())->getRoleUsers($role);
+ if ( sizeof($oldRoleUsers) > 0 ) {
+ foreach($oldRoleUsers as $oUid) {
+ $this->_deleteUserFromRole($oUid, $role->getId());
+ }
+ }
+ if ( $roleUsers ) {
+ foreach ($roleUsers as $nRuid) {
+ $this->_addUserToRole($nRuid, $role->getId());
+ }
+ }
+ $rid = $role->getId();
+ Mage::getSingleton('adminhtml/session')->addSuccess($this->__('Role successfully saved.'));
+ } catch (Mage_Core_Exception $e) {
+ Mage::getSingleton('adminhtml/session')->addError($e->getMessage());
+ } catch (Exception $e) {
+ Mage::getSingleton('adminhtml/session')->addError($this->__('Error while saving this role. Please try again later.'));
+ }
+
+ //$this->getResponse()->setRedirect($this->getUrl("*/*/editrole/rid/$rid"));
+ $this->_redirect('*/*/editrole', array('rid' => $rid));
+ return;
+ }
+
+ public function editrolegridAction()
+ {
+ $this->getResponse()->setBody($this->getLayout()->createBlock('adminhtml/permissions_role_grid_user')->toHtml());
+ }
+
+ protected function _deleteUserFromRole($userId, $roleId)
+ {
+ try {
+ Mage::getModel("admin/user")
+ ->setRoleId($roleId)
+ ->setUserId($userId)
+ ->deleteFromRole();
+ } catch (Exception $e) {
+ throw $e;
+ return false;
+ }
+ return true;
+ }
+
+ protected function _addUserToRole($userId, $roleId)
+ {
+ $user = Mage::getModel("admin/user")->load($userId);
+ $user->setRoleId($roleId)->setUserId($userId);
+
+ if( $user->roleUserExists() === true ) {
+ return false;
+ } else {
+ $user->add();
+ return true;
+ }
+ }
+
+ protected function _isAllowed()
+ {
+ return Mage::getSingleton('admin/session')->isAllowed('system/acl/roles');
+ }
+}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Permissions/UserController.php b/app/code/core/Mage/Adminhtml/controllers/Permissions/UserController.php
index 35bc4c7bb4..8254551b21 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Permissions/UserController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Permissions/UserController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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_Adminhtml_Permissions_UserController extends Mage_Adminhtml_Controller_Action
{
diff --git a/app/code/core/Mage/Adminhtml/controllers/Poll/AnswerController.php b/app/code/core/Mage/Adminhtml/controllers/Poll/AnswerController.php
index b0c3a38631..e85a444efa 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Poll/AnswerController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Poll/AnswerController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -119,7 +119,7 @@ public function jsonDeleteAction()
protected function _isAllowed()
{
- return Mage::getSingleton('admin/session')->isAllowed('cms/poll');
+ return Mage::getSingleton('admin/session')->isAllowed('cms/poll');
}
}
diff --git a/app/code/core/Mage/Adminhtml/controllers/PollController.php b/app/code/core/Mage/Adminhtml/controllers/PollController.php
index 3e6811e676..ca65d02e27 100644
--- a/app/code/core/Mage/Adminhtml/controllers/PollController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/PollController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -195,4 +195,4 @@ protected function _isAllowed()
return Mage::getSingleton('admin/session')->isAllowed('cms/poll');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Promo/CatalogController.php b/app/code/core/Mage/Adminhtml/controllers/Promo/CatalogController.php
index 3b0a700e3c..f9659383c6 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Promo/CatalogController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Promo/CatalogController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
diff --git a/app/code/core/Mage/Adminhtml/controllers/Promo/QuoteController.php b/app/code/core/Mage/Adminhtml/controllers/Promo/QuoteController.php
index 87b7fe4d36..ca73c354fe 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Promo/QuoteController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Promo/QuoteController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
diff --git a/app/code/core/Mage/Adminhtml/controllers/Promo/WidgetController.php b/app/code/core/Mage/Adminhtml/controllers/Promo/WidgetController.php
index 944d34116e..5f176c681e 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Promo/WidgetController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Promo/WidgetController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
@@ -54,7 +54,7 @@ public function chooserAction()
protected function _isAllowed()
{
- return Mage::getSingleton('admin/session')->isAllowed('promo/catalog');
+ return Mage::getSingleton('admin/session')->isAllowed('promo/catalog');
}
/**
diff --git a/app/code/core/Mage/Adminhtml/controllers/PromoController.php b/app/code/core/Mage/Adminhtml/controllers/PromoController.php
index 3d252a3cdf..83de3cef08 100644
--- a/app/code/core/Mage/Adminhtml/controllers/PromoController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/PromoController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/controllers/RatingController.php b/app/code/core/Mage/Adminhtml/controllers/RatingController.php
index 0691f07d14..550df66f08 100644
--- a/app/code/core/Mage/Adminhtml/controllers/RatingController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/RatingController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -140,7 +140,7 @@ protected function _initEnityId()
protected function _isAllowed()
{
- return Mage::getSingleton('admin/session')->isAllowed('catalog/reviews_ratings/ratings');
+ return Mage::getSingleton('admin/session')->isAllowed('catalog/reviews_ratings/ratings');
}
}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Report/CustomerController.php b/app/code/core/Mage/Adminhtml/controllers/Report/CustomerController.php
index 87bc1d693b..086bac51e9 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Report/CustomerController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Report/CustomerController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -164,4 +164,4 @@ protected function _isAllowed()
break;
}
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Report/ProductController.php b/app/code/core/Mage/Adminhtml/controllers/Report/ProductController.php
index 80444be061..d2fcc40b6b 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Report/ProductController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Report/ProductController.php
@@ -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_Adminhtml
- * @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)
+ * @category Mage
+ * @package Mage_Adminhtml
+ * @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)
*/
@@ -276,4 +276,4 @@ protected function _isAllowed()
break;
}
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Report/ReviewController.php b/app/code/core/Mage/Adminhtml/controllers/Report/ReviewController.php
index 1c3c807e7a..7e2aac77ff 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Report/ReviewController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Report/ReviewController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -147,7 +147,7 @@ public function exportProductDetailExcelAction()
protected function _isAllowed()
{
- switch ($this->getRequest()->getActionName()) {
+ switch ($this->getRequest()->getActionName()) {
case 'customer':
return Mage::getSingleton('admin/session')->isAllowed('report/review/customer');
break;
@@ -159,4 +159,4 @@ protected function _isAllowed()
break;
}
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Report/SalesController.php b/app/code/core/Mage/Adminhtml/controllers/Report/SalesController.php
index 7f9a49863c..b7718e6097 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Report/SalesController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Report/SalesController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/controllers/Report/ShopcartController.php b/app/code/core/Mage/Adminhtml/controllers/Report/ShopcartController.php
index d8757cc610..34ff22b36c 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Report/ShopcartController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Report/ShopcartController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -158,4 +158,4 @@ protected function _isAllowed()
break;
}
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Report/TagController.php b/app/code/core/Mage/Adminhtml/controllers/Report/TagController.php
index bbbf1036ab..a54640290e 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Report/TagController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Report/TagController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/controllers/ReportController.php b/app/code/core/Mage/Adminhtml/controllers/ReportController.php
index 3a2264f545..0ff014dbda 100644
--- a/app/code/core/Mage/Adminhtml/controllers/ReportController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/ReportController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -129,7 +129,7 @@ public function totalsAction()
protected function _isAllowed()
{
- switch ($this->getRequest()->getActionName()) {
+ switch ($this->getRequest()->getActionName()) {
case 'search':
return Mage::getSingleton('admin/session')->isAllowed('report/search');
break;
@@ -143,4 +143,4 @@ protected function _isAllowed()
break;
}
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Rss/CatalogController.php b/app/code/core/Mage/Adminhtml/controllers/Rss/CatalogController.php
index 627e725d21..22849a136d 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Rss/CatalogController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Rss/CatalogController.php
@@ -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_Rss
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -60,4 +60,4 @@ public function reviewAction()
$this->loadLayout(false);
$this->renderLayout();
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Rss/OrderController.php b/app/code/core/Mage/Adminhtml/controllers/Rss/OrderController.php
index 74f58b5205..421b2adecd 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Rss/OrderController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Rss/OrderController.php
@@ -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_Rss
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -48,4 +48,4 @@ public function newAction()
$this->loadLayout(false);
$this->renderLayout();
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/CreditmemoController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/CreditmemoController.php
index a380c7ce98..e52acc6625 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Sales/CreditmemoController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Sales/CreditmemoController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -32,4 +32,4 @@
class Mage_Adminhtml_Sales_CreditmemoController extends Mage_Adminhtml_Controller_Sales_Creditmemo
{
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/InvoiceController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/InvoiceController.php
index c676b84d11..439bd1bc54 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Sales/InvoiceController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Sales/InvoiceController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -32,4 +32,4 @@
class Mage_Adminhtml_Sales_InvoiceController extends Mage_Adminhtml_Controller_Sales_Invoice
{
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreateController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreateController.php
index 0c6f31d22f..c32e208631 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreateController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreateController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -419,4 +419,4 @@ protected function _isAllowed()
}
return Mage::getSingleton('admin/session')->isAllowed('sales/order');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreditmemoController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreditmemoController.php
index 605c6130e5..e781e16842 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreditmemoController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreditmemoController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/EditController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/EditController.php
index 20a606d30d..94bab48589 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/EditController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/EditController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
require_once('CreateController.php');
@@ -61,4 +61,4 @@ public function startAction()
$this->_redirect('*/sales_order/');
}
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/InvoiceController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/InvoiceController.php
index e699c31544..0357d411e7 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/InvoiceController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/InvoiceController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -73,7 +73,7 @@ protected function _initInvoice($update = false)
* Check invoice create availability
*/
if (!$order->canInvoice()) {
- $this->_getSession()->addError($this->__('Can not do invoice for order'));
+ $this->_getSession()->addError($this->__('Order does not allow to create an invoice.'));
return false;
}
@@ -290,6 +290,7 @@ public function updateQtyAction()
public function saveAction()
{
$data = $this->getRequest()->getPost('invoice');
+ $orderId = $this->getRequest()->getParam('order_id');
try {
if ($invoice = $this->_initInvoice()) {
@@ -322,41 +323,47 @@ public function saveAction()
}
$transactionSave->save();
- /**
- * Sending emails
- */
+ if (!empty($data['do_shipment'])) {
+ $this->_getSession()->addSuccess($this->__('Invoice and shipment have been successfully created.'));
+ }
+ else {
+ $this->_getSession()->addSuccess($this->__('Invoice has been successfully created.'));
+ }
+
+ // send invoice/shipment emails
$comment = '';
if (isset($data['comment_customer_notify'])) {
$comment = $data['comment_text'];
}
- $invoice->sendEmail(!empty($data['send_email']), $comment);
- if ($shipment) {
- $shipment->sendEmail(!empty($data['send_email']));
- }
-
- if (!empty($data['do_shipment'])) {
- $this->_getSession()->addSuccess($this->__('Invoice and shipment was successfully created.'));
+ try {
+ $invoice->sendEmail(!empty($data['send_email']), $comment);
+ } catch (Exception $e) {
+ Mage::logException($e);
+ $this->_getSession()->addError($this->__('Unable to send invoice email.'));
}
- else {
- $this->_getSession()->addSuccess($this->__('Invoice was successfully created.'));
+ if ($shipment) {
+ try {
+ $shipment->sendEmail(!empty($data['send_email']));
+ } catch (Exception $e) {
+ Mage::logException($e);
+ $this->_getSession()->addError($this->__('Unable to send shipment email.'));
+ }
}
-
- $this->_redirect('*/sales_order/view', array('order_id' => $invoice->getOrderId()));
- return;
+ $this->_redirect('*/sales_order/view', array('order_id' => $orderId));
}
else {
$this->_forward('noRoute');
- return;
}
+ return;
}
catch (Mage_Core_Exception $e) {
$this->_getSession()->addError($e->getMessage());
}
catch (Exception $e) {
- $this->_getSession()->addError($this->__('Can not save invoice'));
+ $this->_getSession()->addError($this->__('Failed to save invoice.'));
+ Mage::logException($e);
}
-
- $this->_redirect('*/*/new', array('order_id' => $this->getRequest()->getParam('order_id')));
+ $this->_redirect('*/*/new', array('order_id' => $orderId));
}
@@ -524,4 +531,4 @@ protected function _needToAddDummyForShipment($item, $qtys) {
}
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php
index efdb56b9a6..c8de91a759 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/View/GiftmessageController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/View/GiftmessageController.php
index ea4a424142..fb92971e03 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/View/GiftmessageController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/View/GiftmessageController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/OrderController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/OrderController.php
index 035aa1ac3c..31e49d85a5 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Sales/OrderController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Sales/OrderController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -122,10 +122,17 @@ public function viewAction()
public function emailAction()
{
if ($order = $this->_initOrder()) {
- $order->sendNewOrderEmail();
- $this->_getSession()->addSuccess(Mage::helper('sales')->__('Message was successfully sent'));
- $this->_redirect('*/sales_order/view', array('order_id' => $order->getId()));
+ try {
+ $order->sendNewOrderEmail();
+ $this->_getSession()->addSuccess($this->__('Order email has been successfully sent.'));
+ } catch (Mage_Core_Exception $e) {
+ $this->_getSession()->addError($e->getMessage());
+ } catch (Exception $e) {
+ $this->_getSession()->addError($this->__('Failed to send order email.'));
+ Mage::logException($e);
+ }
}
+ $this->_redirect('*/sales_order/view', array('order_id' => $order->getId()));
}
/**
* Cancel order
@@ -527,4 +534,4 @@ protected function _isAllowed()
}
return Mage::getSingleton('admin/session')->isAllowed('sales/order');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/ShipmentController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/ShipmentController.php
index 60c4005efb..818fcad9f6 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Sales/ShipmentController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Sales/ShipmentController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -32,4 +32,4 @@
class Mage_Adminhtml_Sales_ShipmentController extends Mage_Adminhtml_Controller_Sales_Shipment
{
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/controllers/SalesController.php b/app/code/core/Mage/Adminhtml/controllers/SalesController.php
index 0878263645..c2fde89164 100644
--- a/app/code/core/Mage/Adminhtml/controllers/SalesController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/SalesController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -57,6 +57,6 @@ public function indexAction()
protected function _isAllowed()
{
- return Mage::getSingleton('admin/session')->isAllowed('sales');
+ return Mage::getSingleton('admin/session')->isAllowed('sales');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/controllers/SitemapController.php b/app/code/core/Mage/Adminhtml/controllers/SitemapController.php
index e2f5e98f35..dfbfbd4348 100644
--- a/app/code/core/Mage/Adminhtml/controllers/SitemapController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/SitemapController.php
@@ -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_Sitemap
- * @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_Adminhtml
+ * @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)
*/
@@ -242,4 +242,4 @@ protected function _isAllowed()
{
return Mage::getSingleton('admin/session')->isAllowed('catalog/sitemap');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/controllers/System/AccountController.php b/app/code/core/Mage/Adminhtml/controllers/System/AccountController.php
index 43ec1f6313..a5ac47ba2c 100644
--- a/app/code/core/Mage/Adminhtml/controllers/System/AccountController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/System/AccountController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/controllers/System/BackupController.php b/app/code/core/Mage/Adminhtml/controllers/System/BackupController.php
index 21af1e1089..7a5eb2411d 100644
--- a/app/code/core/Mage/Adminhtml/controllers/System/BackupController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/System/BackupController.php
@@ -1,147 +1,147 @@
-
- */
-class Mage_Adminhtml_System_BackupController extends Mage_Adminhtml_Controller_Action
-{
- /**
- * Backup list action
- */
- public function indexAction()
- {
- if($this->getRequest()->getParam('ajax')) {
- $this->_forward('grid');
- return;
- }
-
- $this->loadLayout();
- $this->_setActiveMenu('system');
- $this->_addBreadcrumb(Mage::helper('adminhtml')->__('System'), Mage::helper('adminhtml')->__('System'));
- $this->_addBreadcrumb(Mage::helper('adminhtml')->__('Tools'), Mage::helper('adminhtml')->__('Tools'));
- $this->_addBreadcrumb(Mage::helper('adminhtml')->__('Backups'), Mage::helper('adminhtml')->__('Backup'));
-
- $this->_addContent($this->getLayout()->createBlock('adminhtml/backup', 'backup'));
-
- $this->renderLayout();
- }
-
- /**
- * Backup list action
- */
- public function gridAction()
- {
- $this->getResponse()->setBody($this->getLayout()->createBlock('adminhtml/backup_grid')->toHtml());
- }
-
- /**
- * Create backup action
- */
- public function createAction()
- {
- try {
- $backupDb = Mage::getModel('backup/db');
- $backup = Mage::getModel('backup/backup')
- ->setTime(time())
- ->setType('db')
- ->setPath(Mage::getBaseDir("var") . DS . "backups");
-
- $backupDb->createBackup($backup);
- $this->_getSession()->addSuccess(Mage::helper('adminhtml')->__('Backup successfully created'));
- }
- catch (Exception $e) {
- $this->_getSession()->addException($e, Mage::helper('adminhtml')->__('Error while create backup. Please try again later'));
- }
- $this->_redirect('*/*');
- }
-
- /**
- * Download backup action
- */
- public function downloadAction()
- {
- $backup = Mage::getModel('backup/backup')
- ->setTime((int)$this->getRequest()->getParam('time'))
- ->setType($this->getRequest()->getParam('type'))
- ->setPath(Mage::getBaseDir("var") . DS . "backups");
- /* @var $backup Mage_Backup_Model_Backup */
-
- if (!$backup->exists()) {
- $this->_redirect('*/*');
- }
-
- $fileName = 'backup-' . date('YmdHis', $backup->getTime()) . '.sql.gz';
-
- $this->_prepareDownloadResponse($fileName, null, 'application/octet-stream', $backup->getSize());
-
- $this->getResponse()->sendHeaders();
-
- $backup->output();
- exit();
- }
-
- /**
- * Delete backup action
- */
- public function deleteAction()
- {
- try {
- $backup = Mage::getModel('backup/backup')
- ->setTime((int)$this->getRequest()->getParam('time'))
- ->setType($this->getRequest()->getParam('type'))
- ->setPath(Mage::getBaseDir("var") . DS . "backups")
- ->deleteFile();
-
- $this->_getSession()->addSuccess(Mage::helper('adminhtml')->__('Backup record was deleted'));
- }
- catch (Exception $e) {
- // Nothing
- }
-
- $this->_redirect('*/*/');
-
- }
-
- protected function _isAllowed()
- {
- return Mage::getSingleton('admin/session')->isAllowed('system/tools/backup');
- }
-
- /**
- * Retrive adminhtml session model
- *
- * @return Mage_Adminhtml_Model_Session
- */
- protected function _getSession()
- {
- return Mage::getSingleton('adminhtml/session');
- }
-}
+
+ */
+class Mage_Adminhtml_System_BackupController extends Mage_Adminhtml_Controller_Action
+{
+ /**
+ * Backup list action
+ */
+ public function indexAction()
+ {
+ if($this->getRequest()->getParam('ajax')) {
+ $this->_forward('grid');
+ return;
+ }
+
+ $this->loadLayout();
+ $this->_setActiveMenu('system');
+ $this->_addBreadcrumb(Mage::helper('adminhtml')->__('System'), Mage::helper('adminhtml')->__('System'));
+ $this->_addBreadcrumb(Mage::helper('adminhtml')->__('Tools'), Mage::helper('adminhtml')->__('Tools'));
+ $this->_addBreadcrumb(Mage::helper('adminhtml')->__('Backups'), Mage::helper('adminhtml')->__('Backup'));
+
+ $this->_addContent($this->getLayout()->createBlock('adminhtml/backup', 'backup'));
+
+ $this->renderLayout();
+ }
+
+ /**
+ * Backup list action
+ */
+ public function gridAction()
+ {
+ $this->getResponse()->setBody($this->getLayout()->createBlock('adminhtml/backup_grid')->toHtml());
+ }
+
+ /**
+ * Create backup action
+ */
+ public function createAction()
+ {
+ try {
+ $backupDb = Mage::getModel('backup/db');
+ $backup = Mage::getModel('backup/backup')
+ ->setTime(time())
+ ->setType('db')
+ ->setPath(Mage::getBaseDir("var") . DS . "backups");
+
+ $backupDb->createBackup($backup);
+ $this->_getSession()->addSuccess(Mage::helper('adminhtml')->__('Backup successfully created'));
+ }
+ catch (Exception $e) {
+ $this->_getSession()->addException($e, Mage::helper('adminhtml')->__('Error while create backup. Please try again later'));
+ }
+ $this->_redirect('*/*');
+ }
+
+ /**
+ * Download backup action
+ */
+ public function downloadAction()
+ {
+ $backup = Mage::getModel('backup/backup')
+ ->setTime((int)$this->getRequest()->getParam('time'))
+ ->setType($this->getRequest()->getParam('type'))
+ ->setPath(Mage::getBaseDir("var") . DS . "backups");
+ /* @var $backup Mage_Backup_Model_Backup */
+
+ if (!$backup->exists()) {
+ $this->_redirect('*/*');
+ }
+
+ $fileName = 'backup-' . date('YmdHis', $backup->getTime()) . '.sql.gz';
+
+ $this->_prepareDownloadResponse($fileName, null, 'application/octet-stream', $backup->getSize());
+
+ $this->getResponse()->sendHeaders();
+
+ $backup->output();
+ exit();
+ }
+
+ /**
+ * Delete backup action
+ */
+ public function deleteAction()
+ {
+ try {
+ $backup = Mage::getModel('backup/backup')
+ ->setTime((int)$this->getRequest()->getParam('time'))
+ ->setType($this->getRequest()->getParam('type'))
+ ->setPath(Mage::getBaseDir("var") . DS . "backups")
+ ->deleteFile();
+
+ $this->_getSession()->addSuccess(Mage::helper('adminhtml')->__('Backup record was deleted'));
+ }
+ catch (Exception $e) {
+ // Nothing
+ }
+
+ $this->_redirect('*/*/');
+
+ }
+
+ protected function _isAllowed()
+ {
+ return Mage::getSingleton('admin/session')->isAllowed('system/tools/backup');
+ }
+
+ /**
+ * Retrive adminhtml session model
+ *
+ * @return Mage_Adminhtml_Model_Session
+ */
+ protected function _getSession()
+ {
+ return Mage::getSingleton('adminhtml/session');
+ }
+}
diff --git a/app/code/core/Mage/Adminhtml/controllers/System/CacheController.php b/app/code/core/Mage/Adminhtml/controllers/System/CacheController.php
index 0a7bca9032..99e88ce793 100644
--- a/app/code/core/Mage/Adminhtml/controllers/System/CacheController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/System/CacheController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -323,6 +323,6 @@ public function refreshLayeredNavigationAction()
protected function _isAllowed()
{
- return Mage::getSingleton('admin/session')->isAllowed('system/cache');
+ return Mage::getSingleton('admin/session')->isAllowed('system/cache');
}
}
diff --git a/app/code/core/Mage/Adminhtml/controllers/System/ConfigController.php b/app/code/core/Mage/Adminhtml/controllers/System/ConfigController.php
index 348e98a94d..c1e2991972 100644
--- a/app/code/core/Mage/Adminhtml/controllers/System/ConfigController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/System/ConfigController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
diff --git a/app/code/core/Mage/Adminhtml/controllers/System/Convert/GuiController.php b/app/code/core/Mage/Adminhtml/controllers/System/Convert/GuiController.php
index eae1cc2267..1332bebd01 100644
--- a/app/code/core/Mage/Adminhtml/controllers/System/Convert/GuiController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/System/Convert/GuiController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
include_once "ProfileController.php";
@@ -146,4 +146,4 @@ protected function _isAllowed()
return Mage::getSingleton('admin/session')->isAllowed('admin/system/convert/gui');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/controllers/System/Convert/ProfileController.php b/app/code/core/Mage/Adminhtml/controllers/System/Convert/ProfileController.php
index bfcbe3bc73..f36fde5f1c 100644
--- a/app/code/core/Mage/Adminhtml/controllers/System/Convert/ProfileController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/System/Convert/ProfileController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/controllers/System/CurrencyController.php b/app/code/core/Mage/Adminhtml/controllers/System/CurrencyController.php
index b2b568d062..dbfed97941 100644
--- a/app/code/core/Mage/Adminhtml/controllers/System/CurrencyController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/System/CurrencyController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -76,7 +76,7 @@ public function fetchRatesAction()
$errors = $importModel->getMessages();
if( sizeof($errors) > 0 ) {
foreach ($errors as $error) {
- Mage::getSingleton('adminhtml/session')->addWarning($error);
+ Mage::getSingleton('adminhtml/session')->addWarning($error);
}
Mage::getSingleton('adminhtml/session')->addWarning(Mage::helper('adminhtml')->__('All possible rates were fetched, click on "Save" to apply'));
} else {
@@ -118,6 +118,6 @@ public function saveRatesAction()
protected function _isAllowed()
{
- return Mage::getSingleton('admin/session')->isAllowed('system/currency');
+ return Mage::getSingleton('admin/session')->isAllowed('system/currency');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/controllers/System/DesignController.php b/app/code/core/Mage/Adminhtml/controllers/System/DesignController.php
index 1d94649a76..72f78e150a 100644
--- a/app/code/core/Mage/Adminhtml/controllers/System/DesignController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/System/DesignController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
@@ -69,17 +69,17 @@ public function editAction()
public function saveAction()
{
if ($data = $this->getRequest()->getPost()) {
- $id = (int) $this->getRequest()->getParam('id');
+ $id = (int) $this->getRequest()->getParam('id');
- $design = Mage::getModel('core/design');
- if ($id) {
- $design->load($id);
- }
+ $design = Mage::getModel('core/design');
+ if ($id) {
+ $design->load($id);
+ }
$design->setData($data['design']);
- if ($id) {
- $design->setId($id);
- }
+ if ($id) {
+ $design->setId($id);
+ }
try {
$design->save();
@@ -122,4 +122,4 @@ protected function _isAllowed()
{
return Mage::getSingleton('admin/session')->isAllowed('system/design');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/controllers/System/Email/TemplateController.php b/app/code/core/Mage/Adminhtml/controllers/System/Email/TemplateController.php
index e1a82ca4bb..7fd6df459b 100644
--- a/app/code/core/Mage/Adminhtml/controllers/System/Email/TemplateController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/System/Email/TemplateController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -40,7 +40,7 @@ public function indexAction()
return;
}
- $this->loadLayout();
+ $this->loadLayout();
$this->_setActiveMenu('system/email_template');
$this->_addBreadcrumb(Mage::helper('adminhtml')->__('Transactional Emails'), Mage::helper('adminhtml')->__('Transactional Emails'));
@@ -92,7 +92,7 @@ public function saveAction()
->setTemplateSenderName($request->getParam('sender_name'))
*/
->setTemplateText($request->getParam('template_text'))
- ->setModifiedAt(Mage::getSingleton('core/date')->gmtDate());
+ ->setModifiedAt(Mage::getSingleton('core/date')->gmtDate());
if (!$template->getId()) {
//$type = constant(Mage::getConfig()->getModelClassName('core/email_template') . "::TYPE_HTML");
@@ -108,9 +108,9 @@ public function saveAction()
$this->_redirect('*/*');
}
catch (Exception $e) {
- Mage::getSingleton('adminhtml/session')->setData('email_template_form_data', $this->getRequest()->getParams());
- Mage::getSingleton('adminhtml/session')->addError($e->getMessage());
- $this->_forward('new');
+ Mage::getSingleton('adminhtml/session')->setData('email_template_form_data', $this->getRequest()->getParams());
+ Mage::getSingleton('adminhtml/session')->addError($e->getMessage());
+ $this->_forward('new');
}
}
@@ -148,6 +148,6 @@ public function defaultTemplateAction()
protected function _isAllowed()
{
- return Mage::getSingleton('admin/session')->isAllowed('system/email_template');
+ return Mage::getSingleton('admin/session')->isAllowed('system/email_template');
}
}
diff --git a/app/code/core/Mage/Adminhtml/controllers/System/StoreController.php b/app/code/core/Mage/Adminhtml/controllers/System/StoreController.php
index 0e07843d74..53332d3a5e 100644
--- a/app/code/core/Mage/Adminhtml/controllers/System/StoreController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/System/StoreController.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Adminhtml
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
diff --git a/app/code/core/Mage/Adminhtml/controllers/SystemController.php b/app/code/core/Mage/Adminhtml/controllers/SystemController.php
index 931c5427ff..f9bf5ffb5c 100644
--- a/app/code/core/Mage/Adminhtml/controllers/SystemController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/SystemController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -54,4 +54,4 @@ protected function _isAllowed()
{
return Mage::getSingleton('admin/session')->isAllowed('system');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/controllers/TagController.php b/app/code/core/Mage/Adminhtml/controllers/TagController.php
index 5805cd6725..fbf03d2049 100644
--- a/app/code/core/Mage/Adminhtml/controllers/TagController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/TagController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -47,7 +47,7 @@ protected function _initAction()
/**
* Prepare tag model for manipulation
*
- * @return Mage_Tag_Model_Tag
+ * @return Mage_Tag_Model_Tag | false
*/
protected function _initTag()
{
@@ -56,8 +56,12 @@ protected function _initTag()
$model = Mage::getModel('tag/tag');
if ($id) {
$model->load($id);
+ if (!$model->getId()) {
+ return false;
+ }
$model->setStoreId($storeId);
}
+
Mage::register('current_tag', $model);
return $model;
@@ -119,7 +123,15 @@ public function editAction()
return;
}
- $model = $this->_initTag();
+ if (!$model = $this->_initTag()) {
+ Mage::getSingleton('adminhtml/session')->addError(
+ Mage::helper('adminhtml')->__('Wrong Tag specified')
+ );
+ $this->_redirect('*/*/index', array(
+ 'store' => $this->getRequest()->getParam('store')
+ ));
+ return;
+ }
$model->addSummary($this->getRequest()->getParam('store'));
@@ -148,13 +160,21 @@ public function saveAction()
$data['name'] = trim($postData['tag_name']);
$data['status'] = $postData['tag_status'];
$data['base_popularity'] = (isset($postData['base_popularity'])) ? $postData['base_popularity'] : 0;
- $data['store_id'] = $postData['store_id'];
+ $data['store'] = $postData['store_id'];
- $model = $this->_initTag();
+ if (!$model = $this->_initTag()) {
+ Mage::getSingleton('adminhtml/session')->addError(
+ Mage::helper('adminhtml')->__('Wrong Tag specified')
+ );
+ $this->_redirect('*/*/index', array(
+ 'store' => $data['store']
+ ));
+ return;
+ }
$model->addData($data);
if (isset($postData['tag_assigned_products'])) {
- $productIds = Mage::helper('adminhtml/js')->decodeInput($postData['tag_assigned_products']);
+ $productIds = Mage::helper('adminhtml/js')->decodeGridSerializedInput($postData['tag_assigned_products']);
$tagRelationModel = Mage::getModel('tag/tag_relation');
$tagRelationModel->addRelations($model, $productIds);
}
@@ -189,7 +209,8 @@ public function saveAction()
if ($this->getRequest()->getParam('ret') == 'edit') {
$url = $this->getUrl('*/tag/edit', array(
- 'tag_id' => $model->getId()
+ 'tag_id' => $model->getId(),
+ 'store' => $model->getStoreId()
));
}
@@ -198,7 +219,10 @@ public function saveAction()
} catch (Exception $e) {
Mage::getSingleton('adminhtml/session')->addError($e->getMessage());
Mage::getSingleton('adminhtml/session')->setTagData($data);
- $this->_redirect('*/*/edit', array('tag_id' => $this->getRequest()->getParam('tag_id')));
+ $this->_redirect('*/*/edit', array(
+ 'tag_id' => $model->getId(),
+ 'store' => $model->getStoreId()
+ ));
return;
}
}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Tax/Class/CustomerController.php b/app/code/core/Mage/Adminhtml/controllers/Tax/Class/CustomerController.php
index f5944818ed..29e8aea8a3 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Tax/Class/CustomerController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Tax/Class/CustomerController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -161,6 +161,6 @@ protected function _initAction()
*/
protected function _isAllowed()
{
- return Mage::getSingleton('admin/session')->isAllowed('sales/tax/classes_customer');
+ return Mage::getSingleton('admin/session')->isAllowed('sales/tax/classes_customer');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Tax/Class/ProductController.php b/app/code/core/Mage/Adminhtml/controllers/Tax/Class/ProductController.php
index f73e82276b..3129c0fc05 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Tax/Class/ProductController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Tax/Class/ProductController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -163,4 +163,4 @@ protected function _isAllowed()
return Mage::getSingleton('admin/session')->isAllowed('sales/tax/classes_product');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Tax/ClassController.php b/app/code/core/Mage/Adminhtml/controllers/Tax/ClassController.php
index 8ec767ae1e..fc1d450340 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Tax/ClassController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Tax/ClassController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -87,4 +87,4 @@ protected function _initAction()
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Tax/RateController.php b/app/code/core/Mage/Adminhtml/controllers/Tax/RateController.php
index 44d978e1bb..32ad1ff25d 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Tax/RateController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Tax/RateController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/controllers/Tax/RuleController.php b/app/code/core/Mage/Adminhtml/controllers/Tax/RuleController.php
index 425ea9da77..236c7790d8 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Tax/RuleController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Tax/RuleController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
@@ -151,6 +151,6 @@ protected function _initAction()
protected function _isAllowed()
{
- return Mage::getSingleton('admin/session')->isAllowed('sales/tax/rules');
+ return Mage::getSingleton('admin/session')->isAllowed('sales/tax/rules');
}
}
diff --git a/app/code/core/Mage/Adminhtml/controllers/UrlrewriteController.php b/app/code/core/Mage/Adminhtml/controllers/UrlrewriteController.php
index 90e17e0b51..0c51f26a1c 100644
--- a/app/code/core/Mage/Adminhtml/controllers/UrlrewriteController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/UrlrewriteController.php
@@ -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_Adminhtml
- * @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_Adminhtml
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Adminhtml/etc/adminhtml.xml b/app/code/core/Mage/Adminhtml/etc/adminhtml.xml
index 6212260507..4c302e812c 100644
--- a/app/code/core/Mage/Adminhtml/etc/adminhtml.xml
+++ b/app/code/core/Mage/Adminhtml/etc/adminhtml.xml
@@ -21,8 +21,8 @@
*
* @category Mage
* @package Mage_Adminhtml
- * @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)
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
diff --git a/app/code/core/Mage/Adminhtml/etc/config.xml b/app/code/core/Mage/Adminhtml/etc/config.xml
index f85aef09b0..b7083916b8 100644
--- a/app/code/core/Mage/Adminhtml/etc/config.xml
+++ b/app/code/core/Mage/Adminhtml/etc/config.xml
@@ -21,8 +21,8 @@
*
* @category Mage
* @package Mage_Adminhtml
- * @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)
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
@@ -184,4 +184,4 @@
-
\ No newline at end of file
+
diff --git a/app/code/core/Mage/AmazonPayments/Block/Adminhtml/Shipping/Methods.php b/app/code/core/Mage/AmazonPayments/Block/Adminhtml/Shipping/Methods.php
index 2a05f6f502..ed4e07e994 100644
--- a/app/code/core/Mage/AmazonPayments/Block/Adminhtml/Shipping/Methods.php
+++ b/app/code/core/Mage/AmazonPayments/Block/Adminhtml/Shipping/Methods.php
@@ -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 design_default
- * @package Mage
- * @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_AmazonPayments
+ * @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_AmazonPayments_Block_Adminhtml_Shipping_Methods
@@ -100,4 +100,4 @@ protected function _getSelected($value)
{
return $this->getElement()->getData('value/method') == $value ? 'selected="selected"' : '';
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/AmazonPayments/Block/Asp/Form.php b/app/code/core/Mage/AmazonPayments/Block/Asp/Form.php
index c616c5b0ad..fa002f365c 100644
--- a/app/code/core/Mage/AmazonPayments/Block/Asp/Form.php
+++ b/app/code/core/Mage/AmazonPayments/Block/Asp/Form.php
@@ -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_AmazonPayments
- * @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_AmazonPayments
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/AmazonPayments/Block/Asp/Redirect.php b/app/code/core/Mage/AmazonPayments/Block/Asp/Redirect.php
index c6109f714c..5569b37011 100644
--- a/app/code/core/Mage/AmazonPayments/Block/Asp/Redirect.php
+++ b/app/code/core/Mage/AmazonPayments/Block/Asp/Redirect.php
@@ -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_AmazonPayments
- * @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_AmazonPayments
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/AmazonPayments/Block/Asp/Shortcut.php b/app/code/core/Mage/AmazonPayments/Block/Asp/Shortcut.php
index 43fb8bbbec..4383a3b138 100644
--- a/app/code/core/Mage/AmazonPayments/Block/Asp/Shortcut.php
+++ b/app/code/core/Mage/AmazonPayments/Block/Asp/Shortcut.php
@@ -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_Paypal
- * @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_AmazonPayments
+ * @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)
*/
/**
@@ -40,7 +40,7 @@ public function getCheckoutUrl()
public function getButtonImageUrl()
{
- return Mage::getStoreConfig('payment/amazonpayments_asp/pay_now_button_image_url');
+ return Mage::getStoreConfig('payment/amazonpayments_asp/pay_now_button_image_url');
}
public function _toHtml()
@@ -52,4 +52,4 @@ public function _toHtml()
return '';
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/AmazonPayments/Block/Cba/Form.php b/app/code/core/Mage/AmazonPayments/Block/Cba/Form.php
index 9d890244fb..b91b59c262 100644
--- a/app/code/core/Mage/AmazonPayments/Block/Cba/Form.php
+++ b/app/code/core/Mage/AmazonPayments/Block/Cba/Form.php
@@ -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_AmazonPayments
- * @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_AmazonPayments
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/AmazonPayments/Block/Cba/Redirect.php b/app/code/core/Mage/AmazonPayments/Block/Cba/Redirect.php
index ef9da0b73d..4f4e1ca4b9 100644
--- a/app/code/core/Mage/AmazonPayments/Block/Cba/Redirect.php
+++ b/app/code/core/Mage/AmazonPayments/Block/Cba/Redirect.php
@@ -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_AmazonPayments
- * @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_AmazonPayments
+ * @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)
*/
/**
@@ -66,4 +66,4 @@ protected function _toHtml()
return $html;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/AmazonPayments/Block/Cba/Success.php b/app/code/core/Mage/AmazonPayments/Block/Cba/Success.php
index f6e181f32a..2554fb618d 100644
--- a/app/code/core/Mage/AmazonPayments/Block/Cba/Success.php
+++ b/app/code/core/Mage/AmazonPayments/Block/Cba/Success.php
@@ -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_AmazonPayments
- * @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_AmazonPayments
+ * @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)
*/
/**
@@ -47,4 +47,4 @@ protected function _toHtml()
return '';
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/AmazonPayments/Block/Form.php b/app/code/core/Mage/AmazonPayments/Block/Form.php
index 24bd2be700..f09711c64f 100644
--- a/app/code/core/Mage/AmazonPayments/Block/Form.php
+++ b/app/code/core/Mage/AmazonPayments/Block/Form.php
@@ -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_AmazonPayments
- * @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_AmazonPayments
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/AmazonPayments/Block/Link/Shortcut.php b/app/code/core/Mage/AmazonPayments/Block/Link/Shortcut.php
index 9d01cf72f0..49f3244a5d 100644
--- a/app/code/core/Mage/AmazonPayments/Block/Link/Shortcut.php
+++ b/app/code/core/Mage/AmazonPayments/Block/Link/Shortcut.php
@@ -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_Paypal
- * @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_AmazonPayments
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/AmazonPayments/Helper/Data.php b/app/code/core/Mage/AmazonPayments/Helper/Data.php
index c5a46ef205..4a9417826e 100644
--- a/app/code/core/Mage/AmazonPayments/Helper/Data.php
+++ b/app/code/core/Mage/AmazonPayments/Helper/Data.php
@@ -18,11 +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_AmazonPayments
- * @*package Mage_AmazonBase
- * @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_AmazonPayments
+ * @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)
*/
/**
@@ -44,4 +43,4 @@ public function formatAmount($amount)
{
return round($amount, 2);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/AmazonPayments/Model/Api/Abstract.php b/app/code/core/Mage/AmazonPayments/Model/Api/Abstract.php
index 4bb052d152..ec0ae3bcd9 100644
--- a/app/code/core/Mage/AmazonPayments/Model/Api/Abstract.php
+++ b/app/code/core/Mage/AmazonPayments/Model/Api/Abstract.php
@@ -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_AmazonPayments
- * @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_AmazonPayments
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/AmazonPayments/Model/Api/Asp.php b/app/code/core/Mage/AmazonPayments/Model/Api/Asp.php
index 3de6ae302e..610b138160 100644
--- a/app/code/core/Mage/AmazonPayments/Model/Api/Asp.php
+++ b/app/code/core/Mage/AmazonPayments/Model/Api/Asp.php
@@ -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_AmazonPayments
- * @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_AmazonPayments
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Abstract.php b/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Abstract.php
index d9ce3fcfe7..538b9d518c 100644
--- a/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Abstract.php
+++ b/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Abstract.php
@@ -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_AmazonPayments
- * @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_AmazonPayments
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Amount.php b/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Amount.php
index 54abce4ffd..c75973857e 100644
--- a/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Amount.php
+++ b/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Amount.php
@@ -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_AmazonPayments
- * @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_AmazonPayments
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps.php b/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps.php
index 22aaf170df..3e67d10a1e 100644
--- a/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps.php
+++ b/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps.php
@@ -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_AmazonPayments
- * @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_AmazonPayments
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Request/Abstract.php b/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Request/Abstract.php
index 4b11f00438..c15a596686 100644
--- a/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Request/Abstract.php
+++ b/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Request/Abstract.php
@@ -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_AmazonPayments
- * @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_AmazonPayments
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Request/Cancel.php b/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Request/Cancel.php
index 17773aa3ac..95e2107e7c 100644
--- a/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Request/Cancel.php
+++ b/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Request/Cancel.php
@@ -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_AmazonPayments
- * @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_AmazonPayments
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Request/Refund.php b/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Request/Refund.php
index 0e4013ad32..1dafbd5bb3 100644
--- a/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Request/Refund.php
+++ b/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Request/Refund.php
@@ -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_AmazonPayments
- * @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_AmazonPayments
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Request/Settle.php b/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Request/Settle.php
index a58825fdcd..1031c32045 100644
--- a/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Request/Settle.php
+++ b/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Request/Settle.php
@@ -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_AmazonPayments
- * @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_AmazonPayments
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Response/Abstract.php b/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Response/Abstract.php
index 83db36eae7..4dc7a2e7e9 100644
--- a/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Response/Abstract.php
+++ b/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Response/Abstract.php
@@ -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_AmazonPayments
- * @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_AmazonPayments
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Response/Cancel.php b/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Response/Cancel.php
index fcdbb4190e..6b8f1c15a7 100644
--- a/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Response/Cancel.php
+++ b/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Response/Cancel.php
@@ -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_AmazonPayments
- * @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_AmazonPayments
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Response/Error.php b/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Response/Error.php
index 3bf5895f86..df77e46fff 100644
--- a/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Response/Error.php
+++ b/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Response/Error.php
@@ -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_AmazonPayments
- * @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_AmazonPayments
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Response/Refund.php b/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Response/Refund.php
index e6fc48ae72..96cb6807c4 100644
--- a/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Response/Refund.php
+++ b/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Response/Refund.php
@@ -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_AmazonPayments
- * @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_AmazonPayments
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Response/Settle.php b/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Response/Settle.php
index 25b9085ebc..37ab8772fc 100644
--- a/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Response/Settle.php
+++ b/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Fps/Response/Settle.php
@@ -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_AmazonPayments
- * @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_AmazonPayments
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Ipn/Request.php b/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Ipn/Request.php
index 880846ca65..8899d96cf0 100644
--- a/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Ipn/Request.php
+++ b/app/code/core/Mage/AmazonPayments/Model/Api/Asp/Ipn/Request.php
@@ -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_AmazonPayments
- * @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_AmazonPayments
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/AmazonPayments/Model/Api/Cba.php b/app/code/core/Mage/AmazonPayments/Model/Api/Cba.php
index 682051630f..73deced0a9 100644
--- a/app/code/core/Mage/AmazonPayments/Model/Api/Cba.php
+++ b/app/code/core/Mage/AmazonPayments/Model/Api/Cba.php
@@ -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_AmazonPayments
- * @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_AmazonPayments
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/AmazonPayments/Model/Api/Cba/Document.php b/app/code/core/Mage/AmazonPayments/Model/Api/Cba/Document.php
index 9cf3f03ee8..d43eabc10f 100644
--- a/app/code/core/Mage/AmazonPayments/Model/Api/Cba/Document.php
+++ b/app/code/core/Mage/AmazonPayments/Model/Api/Cba/Document.php
@@ -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_AmazonPayments
- * @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_AmazonPayments
+ * @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)
*/
diff --git a/app/code/core/Mage/AmazonPayments/Model/Api/Debug.php b/app/code/core/Mage/AmazonPayments/Model/Api/Debug.php
index d33e4fb194..5835c511a8 100644
--- a/app/code/core/Mage/AmazonPayments/Model/Api/Debug.php
+++ b/app/code/core/Mage/AmazonPayments/Model/Api/Debug.php
@@ -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_AmazonPayments
- * @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_AmazonPayments
+ * @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)
*/
/**
@@ -41,4 +41,4 @@ protected function _construct()
{
$this->_init('amazonpayments/api_debug');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/AmazonPayments/Model/Mysql4/Api/Debug.php b/app/code/core/Mage/AmazonPayments/Model/Mysql4/Api/Debug.php
index 3bdb339c40..2ac7a9d44c 100644
--- a/app/code/core/Mage/AmazonPayments/Model/Mysql4/Api/Debug.php
+++ b/app/code/core/Mage/AmazonPayments/Model/Mysql4/Api/Debug.php
@@ -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_AmazonPayments
- * @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_AmazonPayments
+ * @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)
*/
/**
@@ -42,4 +42,4 @@ protected function _construct()
{
$this->_init('amazonpayments/api_debug', 'transaction_id');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/AmazonPayments/Model/Mysql4/Api/Debug/Collection.php b/app/code/core/Mage/AmazonPayments/Model/Mysql4/Api/Debug/Collection.php
index 3238fe6529..8052e0dc56 100644
--- a/app/code/core/Mage/AmazonPayments/Model/Mysql4/Api/Debug/Collection.php
+++ b/app/code/core/Mage/AmazonPayments/Model/Mysql4/Api/Debug/Collection.php
@@ -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_AmazonPayments
- * @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_AmazonPayments
+ * @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)
*/
/**
@@ -42,4 +42,4 @@ protected function _construct()
{
$this->_init('amazonpayments/api_debug');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/AmazonPayments/Model/Mysql4/Setup.php b/app/code/core/Mage/AmazonPayments/Model/Mysql4/Setup.php
index 50bdc92471..cf2ded6fb8 100644
--- a/app/code/core/Mage/AmazonPayments/Model/Mysql4/Setup.php
+++ b/app/code/core/Mage/AmazonPayments/Model/Mysql4/Setup.php
@@ -18,14 +18,14 @@
* 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_AmazonPayments
- * @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_AmazonPayments
+ * @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_AmazonPayments_Model_Mysql4_Setup extends Mage_Sales_Model_Mysql4_Setup
{
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/AmazonPayments/Model/Observer.php b/app/code/core/Mage/AmazonPayments/Model/Observer.php
index da44977a3f..b7851d2057 100644
--- a/app/code/core/Mage/AmazonPayments/Model/Observer.php
+++ b/app/code/core/Mage/AmazonPayments/Model/Observer.php
@@ -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_AmazonPayments
- * @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_AmazonPayments
+ * @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)
*/
diff --git a/app/code/core/Mage/AmazonPayments/Model/Payment/Asp.php b/app/code/core/Mage/AmazonPayments/Model/Payment/Asp.php
index bb0b365aeb..2ddf21574c 100644
--- a/app/code/core/Mage/AmazonPayments/Model/Payment/Asp.php
+++ b/app/code/core/Mage/AmazonPayments/Model/Payment/Asp.php
@@ -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_AmazonPayments
- * @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_AmazonPayments
+ * @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)
*/
/**
@@ -324,7 +324,7 @@ public function capture(Varien_Object $payment, $amount)
*/
public function processInvoice($invoice, $payment)
{
- if (!is_null($payment->getCcTransId()) &&
+ if (!is_null($payment->getCcTransId()) &&
is_null($payment->getLastTransId()) &&
is_null($invoice->getTransactionId())) {
diff --git a/app/code/core/Mage/AmazonPayments/Model/Payment/Asp/Abstract.php b/app/code/core/Mage/AmazonPayments/Model/Payment/Asp/Abstract.php
index 808e397b69..2bc0cbdf1b 100644
--- a/app/code/core/Mage/AmazonPayments/Model/Payment/Asp/Abstract.php
+++ b/app/code/core/Mage/AmazonPayments/Model/Payment/Asp/Abstract.php
@@ -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_AmazonPayments
- * @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_AmazonPayments
+ * @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_AmazonPayments_Model_Payment_Asp_Abstract extends Mage_Payment_Model_Method_Abstract
diff --git a/app/code/core/Mage/AmazonPayments/Model/Payment/Asp/Fps.php b/app/code/core/Mage/AmazonPayments/Model/Payment/Asp/Fps.php
index 367546af4c..3a875d89b1 100644
--- a/app/code/core/Mage/AmazonPayments/Model/Payment/Asp/Fps.php
+++ b/app/code/core/Mage/AmazonPayments/Model/Payment/Asp/Fps.php
@@ -18,18 +18,18 @@
* 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_AmazonPayments
- * @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_AmazonPayments
+ * @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_AmazonPayments_Model_Payment_Asp_Fps extends Mage_AmazonPayments_Model_Payment_Asp_Abstract
{
-
+
public function refund($reserveTransactionId, $callerReference)
{
- $this->getApi()->getFps()->refund($reserveTransactionId, $callerReference);
+ $this->getApi()->getFps()->refund($reserveTransactionId, $callerReference);
}
}
diff --git a/app/code/core/Mage/AmazonPayments/Model/Payment/Asp/Notification.php b/app/code/core/Mage/AmazonPayments/Model/Payment/Asp/Notification.php
index 2956e793b7..ea72ebc3ad 100644
--- a/app/code/core/Mage/AmazonPayments/Model/Payment/Asp/Notification.php
+++ b/app/code/core/Mage/AmazonPayments/Model/Payment/Asp/Notification.php
@@ -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_AmazonPayments
- * @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_AmazonPayments
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/AmazonPayments/Model/Payment/Asp/Source/PaymentAction.php b/app/code/core/Mage/AmazonPayments/Model/Payment/Asp/Source/PaymentAction.php
index f30fff4267..96104926e3 100644
--- a/app/code/core/Mage/AmazonPayments/Model/Payment/Asp/Source/PaymentAction.php
+++ b/app/code/core/Mage/AmazonPayments/Model/Payment/Asp/Source/PaymentAction.php
@@ -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_AmazonPayments
- * @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_AmazonPayments
+ * @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)
*/
/**
@@ -46,4 +46,4 @@ public function toOptionArray()
),
);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/AmazonPayments/Model/Payment/Cba.php b/app/code/core/Mage/AmazonPayments/Model/Payment/Cba.php
index 0ec1ab6da9..fc60f1021c 100644
--- a/app/code/core/Mage/AmazonPayments/Model/Payment/Cba.php
+++ b/app/code/core/Mage/AmazonPayments/Model/Payment/Cba.php
@@ -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_AmazonPayments
- * @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_AmazonPayments
+ * @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_AmazonPayments_Model_Payment_Cba extends Mage_Payment_Model_Method_Abstract
@@ -595,4 +595,4 @@ public function getDebug()
{
return Mage::getStoreConfig('payment/' . $this->getCode() . '/debug_flag');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/AmazonPayments/Model/Session.php b/app/code/core/Mage/AmazonPayments/Model/Session.php
index 90c8cd1967..852930cb83 100644
--- a/app/code/core/Mage/AmazonPayments/Model/Session.php
+++ b/app/code/core/Mage/AmazonPayments/Model/Session.php
@@ -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_Paypal
- * @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_AmazonPayments
+ * @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)
*/
/**
@@ -36,4 +36,4 @@ public function __construct()
{
$this->init('amazonpayments');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/AmazonPayments/controllers/AspController.php b/app/code/core/Mage/AmazonPayments/controllers/AspController.php
index 8ac1cf1bcd..e29e35219f 100644
--- a/app/code/core/Mage/AmazonPayments/controllers/AspController.php
+++ b/app/code/core/Mage/AmazonPayments/controllers/AspController.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_AmazonPayments
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
diff --git a/app/code/core/Mage/AmazonPayments/controllers/CbaController.php b/app/code/core/Mage/AmazonPayments/controllers/CbaController.php
index 8103f9c2b1..a3e94833b9 100644
--- a/app/code/core/Mage/AmazonPayments/controllers/CbaController.php
+++ b/app/code/core/Mage/AmazonPayments/controllers/CbaController.php
@@ -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_AmazonPayments
- * @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_AmazonPayments
+ * @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_AmazonPayments_CbaController extends Mage_Core_Controller_Front_Action
@@ -164,4 +164,4 @@ public function cancelAction()
$this->_redirect('checkout/cart/');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/AmazonPayments/etc/system.xml b/app/code/core/Mage/AmazonPayments/etc/system.xml
index 1155b35a54..64c5daec42 100644
--- a/app/code/core/Mage/AmazonPayments/etc/system.xml
+++ b/app/code/core/Mage/AmazonPayments/etc/system.xml
@@ -19,10 +19,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_AmazonPayments
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ * @category Mage
+ * @package Mage_AmazonPayments
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
@@ -335,7 +335,7 @@
-
+
text
30
1
@@ -343,7 +343,7 @@
0
-
+
text
31
1
diff --git a/app/code/core/Mage/AmazonPayments/sql/amazonpayments_setup/mysql4-install-0.1.2.php b/app/code/core/Mage/AmazonPayments/sql/amazonpayments_setup/mysql4-install-0.1.2.php
index b6bbf16309..49ac50490a 100644
--- a/app/code/core/Mage/AmazonPayments/sql/amazonpayments_setup/mysql4-install-0.1.2.php
+++ b/app/code/core/Mage/AmazonPayments/sql/amazonpayments_setup/mysql4-install-0.1.2.php
@@ -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_AmazonPayments
- * @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_AmazonPayments
+ * @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)
*/
diff --git a/app/code/core/Mage/AmazonPayments/sql/amazonpayments_setup/mysql4-upgrade-0.1.0-0.1.1.php b/app/code/core/Mage/AmazonPayments/sql/amazonpayments_setup/mysql4-upgrade-0.1.0-0.1.1.php
index b6bbf16309..49ac50490a 100644
--- a/app/code/core/Mage/AmazonPayments/sql/amazonpayments_setup/mysql4-upgrade-0.1.0-0.1.1.php
+++ b/app/code/core/Mage/AmazonPayments/sql/amazonpayments_setup/mysql4-upgrade-0.1.0-0.1.1.php
@@ -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_AmazonPayments
- * @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_AmazonPayments
+ * @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)
*/
diff --git a/app/code/core/Mage/AmazonPayments/sql/amazonpayments_setup/mysql4-upgrade-0.1.1-0.1.2.php b/app/code/core/Mage/AmazonPayments/sql/amazonpayments_setup/mysql4-upgrade-0.1.1-0.1.2.php
index 4a933b57aa..5852a8d0ff 100644
--- a/app/code/core/Mage/AmazonPayments/sql/amazonpayments_setup/mysql4-upgrade-0.1.1-0.1.2.php
+++ b/app/code/core/Mage/AmazonPayments/sql/amazonpayments_setup/mysql4-upgrade-0.1.1-0.1.2.php
@@ -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_AmazonPayments
- * @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_AmazonPayments
+ * @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)
*/
diff --git a/app/code/core/Mage/Api/Controller/Action.php b/app/code/core/Mage/Api/Controller/Action.php
index 49e4765858..15f5a0c36f 100644
--- a/app/code/core/Mage/Api/Controller/Action.php
+++ b/app/code/core/Mage/Api/Controller/Action.php
@@ -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_Adminhtml
- * @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_Api
+ * @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)
*/
/**
@@ -50,4 +50,4 @@ protected function _getServer()
{
return Mage::getSingleton('api/server');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Api/Exception.php b/app/code/core/Mage/Api/Exception.php
index 0e6d306e5b..c248f3144e 100644
--- a/app/code/core/Mage/Api/Exception.php
+++ b/app/code/core/Mage/Api/Exception.php
@@ -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_Api
- * @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_Api
+ * @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)
*/
/**
@@ -50,4 +50,4 @@ public function getCustomMessage()
{
return $this->_customMessage;
}
-} // Class Mage_Api_Model_Resource_Exception End
\ No newline at end of file
+} // Class Mage_Api_Model_Resource_Exception End
diff --git a/app/code/core/Mage/Api/Helper/Data.php b/app/code/core/Mage/Api/Helper/Data.php
index f1db5add47..b19c09db57 100644
--- a/app/code/core/Mage/Api/Helper/Data.php
+++ b/app/code/core/Mage/Api/Helper/Data.php
@@ -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_Api
- * @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_Api
+ * @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)
*/
/**
@@ -33,4 +33,4 @@
*/
class Mage_Api_Helper_Data extends Mage_Core_Helper_Abstract
{
-} // Class Mage_Api_Helper_Data End
\ No newline at end of file
+} // Class Mage_Api_Helper_Data End
diff --git a/app/code/core/Mage/Api/Model/Acl.php b/app/code/core/Mage/Api/Model/Acl.php
index a0bb4b701b..27b2f62444 100644
--- a/app/code/core/Mage/Api/Model/Acl.php
+++ b/app/code/core/Mage/Api/Model/Acl.php
@@ -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_Api
- * @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_Api
+ * @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)
*/
@@ -89,4 +89,4 @@ public function addRoleParent($role, $parent)
$this->_getRoleRegistry()->addParent($role, $parent);
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Api/Model/Acl/Assert/Ip.php b/app/code/core/Mage/Api/Model/Acl/Assert/Ip.php
index de5e6fafe8..27a74a9660 100644
--- a/app/code/core/Mage/Api/Model/Acl/Assert/Ip.php
+++ b/app/code/core/Mage/Api/Model/Acl/Assert/Ip.php
@@ -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_Api
- * @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_Api
+ * @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)
*/
@@ -53,4 +53,4 @@ protected function _isCleanIP($ip)
{
// ...
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Api/Model/Acl/Assert/Time.php b/app/code/core/Mage/Api/Model/Acl/Assert/Time.php
index 6f76640482..e8b5479f63 100644
--- a/app/code/core/Mage/Api/Model/Acl/Assert/Time.php
+++ b/app/code/core/Mage/Api/Model/Acl/Assert/Time.php
@@ -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_Api
- * @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_Api
+ * @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)
*/
@@ -53,4 +53,4 @@ protected function _isCleanTime($time)
{
// ...
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Api/Model/Acl/Resource.php b/app/code/core/Mage/Api/Model/Acl/Resource.php
index 434ad186be..9583b7d6c4 100644
--- a/app/code/core/Mage/Api/Model/Acl/Resource.php
+++ b/app/code/core/Mage/Api/Model/Acl/Resource.php
@@ -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_Api
- * @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_Api
+ * @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)
*/
@@ -35,4 +35,4 @@
class Mage_Api_Model_Acl_Resource extends Zend_Acl_Resource
{
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Api/Model/Acl/Role.php b/app/code/core/Mage/Api/Model/Acl/Role.php
index 11466e9341..802c259622 100644
--- a/app/code/core/Mage/Api/Model/Acl/Role.php
+++ b/app/code/core/Mage/Api/Model/Acl/Role.php
@@ -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_Api
- * @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_Api
+ * @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)
*/
@@ -38,4 +38,4 @@ protected function _construct()
{
$this->_init('api/role');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Api/Model/Acl/Role/Generic.php b/app/code/core/Mage/Api/Model/Acl/Role/Generic.php
index 2907c20617..7e42cf4521 100644
--- a/app/code/core/Mage/Api/Model/Acl/Role/Generic.php
+++ b/app/code/core/Mage/Api/Model/Acl/Role/Generic.php
@@ -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_Api
- * @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_Api
+ * @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)
*/
@@ -35,4 +35,4 @@
class Mage_Api_Model_Acl_Role_Generic extends Zend_Acl_Role
{
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Api/Model/Acl/Role/Group.php b/app/code/core/Mage/Api/Model/Acl/Role/Group.php
index fdc066c43d..4e309a011b 100644
--- a/app/code/core/Mage/Api/Model/Acl/Role/Group.php
+++ b/app/code/core/Mage/Api/Model/Acl/Role/Group.php
@@ -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_Api
- * @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_Api
+ * @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)
*/
@@ -35,4 +35,4 @@
class Mage_Api_Model_Acl_Role_Group extends Mage_Api_Model_Acl_Role_Generic
{
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Api/Model/Acl/Role/Registry.php b/app/code/core/Mage/Api/Model/Acl/Role/Registry.php
index 9db6eab80b..114ea6cbcc 100644
--- a/app/code/core/Mage/Api/Model/Acl/Role/Registry.php
+++ b/app/code/core/Mage/Api/Model/Acl/Role/Registry.php
@@ -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_Api
- * @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_Api
+ * @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)
*/
diff --git a/app/code/core/Mage/Api/Model/Acl/Role/User.php b/app/code/core/Mage/Api/Model/Acl/Role/User.php
index e590e04961..389024c311 100644
--- a/app/code/core/Mage/Api/Model/Acl/Role/User.php
+++ b/app/code/core/Mage/Api/Model/Acl/Role/User.php
@@ -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_Api
- * @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_Api
+ * @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)
*/
@@ -35,4 +35,4 @@
class Mage_Api_Model_Acl_Role_User extends Mage_Api_Model_Acl_Role_Generic
{
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Api/Model/Config.php b/app/code/core/Mage/Api/Model/Config.php
index 50492199bb..7951060491 100644
--- a/app/code/core/Mage/Api/Model/Config.php
+++ b/app/code/core/Mage/Api/Model/Config.php
@@ -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_Api
- * @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_Api
+ * @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)
*/
/**
@@ -270,4 +270,4 @@ protected function _removeCache($id)
{
return Mage::app()->removeCache($id);
}
-} // Class Mage_Api_Model_Config End
\ No newline at end of file
+} // Class Mage_Api_Model_Config End
diff --git a/app/code/core/Mage/Api/Model/Mysql4/Acl.php b/app/code/core/Mage/Api/Model/Mysql4/Acl.php
index 1f1cc33d18..479442e93b 100644
--- a/app/code/core/Mage/Api/Model/Mysql4/Acl.php
+++ b/app/code/core/Mage/Api/Model/Mysql4/Acl.php
@@ -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_Api
- * @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_Api
+ * @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)
*/
@@ -116,7 +116,7 @@ function loadRoles(Mage_Api_Model_Acl $acl, array $rolesArr)
*/
function loadRules(Mage_Api_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;
@@ -128,9 +128,9 @@ function loadRules(Mage_Api_Model_Acl $acl, array $rulesArr)
}
try {
if ( $rule['permission'] == 'allow' ) {
- $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();
diff --git a/app/code/core/Mage/Api/Model/Mysql4/Acl/Role.php b/app/code/core/Mage/Api/Model/Mysql4/Acl/Role.php
index 82eaec6c1c..dacf5965b8 100644
--- a/app/code/core/Mage/Api/Model/Mysql4/Acl/Role.php
+++ b/app/code/core/Mage/Api/Model/Mysql4/Acl/Role.php
@@ -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_Api
- * @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_Api
+ * @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)
*/
/**
@@ -45,4 +45,4 @@ protected function _beforeSave(Mage_Core_Model_Abstract $object)
}
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Api/Model/Mysql4/Acl/Role/Collection.php b/app/code/core/Mage/Api/Model/Mysql4/Acl/Role/Collection.php
index 8918292481..3424955fe2 100644
--- a/app/code/core/Mage/Api/Model/Mysql4/Acl/Role/Collection.php
+++ b/app/code/core/Mage/Api/Model/Mysql4/Acl/Role/Collection.php
@@ -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_Api
- * @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_Api
+ * @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)
*/
/**
@@ -37,4 +37,4 @@ protected function _construct()
{
$this->_init('api/role');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Api/Model/Mysql4/Permissions/Collection.php b/app/code/core/Mage/Api/Model/Mysql4/Permissions/Collection.php
index 81efb60705..b0f4e8ecb0 100644
--- a/app/code/core/Mage/Api/Model/Mysql4/Permissions/Collection.php
+++ b/app/code/core/Mage/Api/Model/Mysql4/Permissions/Collection.php
@@ -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_Api
- * @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_Api
+ * @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_Api_Model_Mysql4_Permissions_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract
diff --git a/app/code/core/Mage/Api/Model/Mysql4/Role.php b/app/code/core/Mage/Api/Model/Mysql4/Role.php
index 1085f328a0..3b7cd7895f 100644
--- a/app/code/core/Mage/Api/Model/Mysql4/Role.php
+++ b/app/code/core/Mage/Api/Model/Mysql4/Role.php
@@ -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_Api
- * @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_Api
+ * @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_Api_Model_Mysql4_Role extends Mage_Core_Model_Mysql4_Abstract
diff --git a/app/code/core/Mage/Api/Model/Mysql4/Role/Collection.php b/app/code/core/Mage/Api/Model/Mysql4/Role/Collection.php
index d76d585ed1..5ab7ca8293 100644
--- a/app/code/core/Mage/Api/Model/Mysql4/Role/Collection.php
+++ b/app/code/core/Mage/Api/Model/Mysql4/Role/Collection.php
@@ -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_Api
- * @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_Api
+ * @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_Api_Model_Mysql4_Role_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract
diff --git a/app/code/core/Mage/Api/Model/Mysql4/Roles.php b/app/code/core/Mage/Api/Model/Mysql4/Roles.php
index bf9ebcf79e..77e38ca527 100644
--- a/app/code/core/Mage/Api/Model/Mysql4/Roles.php
+++ b/app/code/core/Mage/Api/Model/Mysql4/Roles.php
@@ -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_Api
- * @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_Api
+ * @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_Api_Model_Mysql4_Roles extends Mage_Core_Model_Mysql4_Abstract
diff --git a/app/code/core/Mage/Api/Model/Mysql4/Roles/Collection.php b/app/code/core/Mage/Api/Model/Mysql4/Roles/Collection.php
index 43567f52c6..d3cdc7e0f7 100644
--- a/app/code/core/Mage/Api/Model/Mysql4/Roles/Collection.php
+++ b/app/code/core/Mage/Api/Model/Mysql4/Roles/Collection.php
@@ -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_Api
- * @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_Api
+ * @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_Api_Model_Mysql4_Roles_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract
diff --git a/app/code/core/Mage/Api/Model/Mysql4/Roles/User/Collection.php b/app/code/core/Mage/Api/Model/Mysql4/Roles/User/Collection.php
index 61a30281cf..dfb4c60fc7 100644
--- a/app/code/core/Mage/Api/Model/Mysql4/Roles/User/Collection.php
+++ b/app/code/core/Mage/Api/Model/Mysql4/Roles/User/Collection.php
@@ -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_Api
- * @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_Api
+ * @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_Api_Model_Mysql4_Roles_User_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract
diff --git a/app/code/core/Mage/Api/Model/Mysql4/Rules.php b/app/code/core/Mage/Api/Model/Mysql4/Rules.php
index 709989588e..c02c7ada73 100644
--- a/app/code/core/Mage/Api/Model/Mysql4/Rules.php
+++ b/app/code/core/Mage/Api/Model/Mysql4/Rules.php
@@ -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_Api
- * @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_Api
+ * @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_Api_Model_Mysql4_Rules extends Mage_Core_Model_Mysql4_Abstract
diff --git a/app/code/core/Mage/Api/Model/Mysql4/Rules/Collection.php b/app/code/core/Mage/Api/Model/Mysql4/Rules/Collection.php
index 1dffb7adee..161fcd86ae 100644
--- a/app/code/core/Mage/Api/Model/Mysql4/Rules/Collection.php
+++ b/app/code/core/Mage/Api/Model/Mysql4/Rules/Collection.php
@@ -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_Api
- * @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_Api
+ * @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_Api_Model_Mysql4_Rules_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract
diff --git a/app/code/core/Mage/Api/Model/Mysql4/User.php b/app/code/core/Mage/Api/Model/Mysql4/User.php
index 53a6dcf480..1165141cb8 100644
--- a/app/code/core/Mage/Api/Model/Mysql4/User.php
+++ b/app/code/core/Mage/Api/Model/Mysql4/User.php
@@ -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_Api
- * @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_Api
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Api/Model/Mysql4/User/Collection.php b/app/code/core/Mage/Api/Model/Mysql4/User/Collection.php
index c580f55a96..f919a0561f 100644
--- a/app/code/core/Mage/Api/Model/Mysql4/User/Collection.php
+++ b/app/code/core/Mage/Api/Model/Mysql4/User/Collection.php
@@ -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_Api
- * @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_Api
+ * @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_Api_Model_Mysql4_User_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract
diff --git a/app/code/core/Mage/Api/Model/Resource/Abstract.php b/app/code/core/Mage/Api/Model/Resource/Abstract.php
index 900fcebb6d..4e7a82bdbf 100644
--- a/app/code/core/Mage/Api/Model/Resource/Abstract.php
+++ b/app/code/core/Mage/Api/Model/Resource/Abstract.php
@@ -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_Api
- * @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_Api
+ * @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)
*/
/**
@@ -102,4 +102,4 @@ protected function _fault($code, $customMessage=null)
{
throw new Mage_Api_Exception($code, $customMessage);
}
-} // Class Mage_Api_Model_Resource_Abstract End
\ No newline at end of file
+} // Class Mage_Api_Model_Resource_Abstract End
diff --git a/app/code/core/Mage/Api/Model/Role.php b/app/code/core/Mage/Api/Model/Role.php
index c9bce6c86d..6f2ea47692 100644
--- a/app/code/core/Mage/Api/Model/Role.php
+++ b/app/code/core/Mage/Api/Model/Role.php
@@ -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_Api
- * @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_Api
+ * @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_Api_Model_Role extends Mage_Core_Model_Abstract
diff --git a/app/code/core/Mage/Api/Model/Roles.php b/app/code/core/Mage/Api/Model/Roles.php
index f92a7d39e1..739c8585e0 100644
--- a/app/code/core/Mage/Api/Model/Roles.php
+++ b/app/code/core/Mage/Api/Model/Roles.php
@@ -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_Api
- * @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_Api
+ * @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_Api_Model_Roles extends Mage_Core_Model_Abstract
@@ -113,4 +113,4 @@ protected function _buildResourcesArray(Varien_Simplexml_Element $resource=null,
}
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Api/Model/Rules.php b/app/code/core/Mage/Api/Model/Rules.php
index 8c8a50c516..cef0068751 100644
--- a/app/code/core/Mage/Api/Model/Rules.php
+++ b/app/code/core/Mage/Api/Model/Rules.php
@@ -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_Api
- * @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_Api
+ * @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_Api_Model_Rules extends Mage_Core_Model_Abstract
diff --git a/app/code/core/Mage/Api/Model/Server.php b/app/code/core/Mage/Api/Model/Server.php
index d4cbc1e15f..05bb348670 100644
--- a/app/code/core/Mage/Api/Model/Server.php
+++ b/app/code/core/Mage/Api/Model/Server.php
@@ -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_Api
- * @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_Api
+ * @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)
*/
/**
@@ -87,4 +87,4 @@ public function getAdapter()
}
-} // Class Mage_Api_Model_Server_Abstract End
\ No newline at end of file
+} // Class Mage_Api_Model_Server_Abstract End
diff --git a/app/code/core/Mage/Api/Model/Server/Adapter/Interface.php b/app/code/core/Mage/Api/Model/Server/Adapter/Interface.php
index ba3834a354..19a46202c8 100644
--- a/app/code/core/Mage/Api/Model/Server/Adapter/Interface.php
+++ b/app/code/core/Mage/Api/Model/Server/Adapter/Interface.php
@@ -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_Api
- * @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_Api
+ * @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)
*/
/**
@@ -78,4 +78,4 @@ function run();
*/
function fault($code, $message);
-} // Class Mage_Api_Model_Server_Adapter_Interface End
\ No newline at end of file
+} // Class Mage_Api_Model_Server_Adapter_Interface End
diff --git a/app/code/core/Mage/Api/Model/Server/Adapter/Soap.php b/app/code/core/Mage/Api/Model/Server/Adapter/Soap.php
index 1e15c5f821..a513e84987 100644
--- a/app/code/core/Mage/Api/Model/Server/Adapter/Soap.php
+++ b/app/code/core/Mage/Api/Model/Server/Adapter/Soap.php
@@ -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_Api
- * @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_Api
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Api/Model/Server/Adapter/Xmlrpc.php b/app/code/core/Mage/Api/Model/Server/Adapter/Xmlrpc.php
index 5bae6c959d..3b861add80 100644
--- a/app/code/core/Mage/Api/Model/Server/Adapter/Xmlrpc.php
+++ b/app/code/core/Mage/Api/Model/Server/Adapter/Xmlrpc.php
@@ -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_Api
- * @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_Api
+ * @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)
*/
/**
@@ -112,4 +112,4 @@ public function fault($code, $message)
{
throw new Zend_XmlRpc_Server_Exception($message, $code);
}
-} // Class Mage_Api_Model_Server_Adapter_Xmlrpc End
\ No newline at end of file
+} // Class Mage_Api_Model_Server_Adapter_Xmlrpc End
diff --git a/app/code/core/Mage/Api/Model/Server/Handler.php b/app/code/core/Mage/Api/Model/Server/Handler.php
index c7702c2760..6aea0fb39e 100644
--- a/app/code/core/Mage/Api/Model/Server/Handler.php
+++ b/app/code/core/Mage/Api/Model/Server/Handler.php
@@ -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_Api
- * @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_Api
+ * @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)
*/
/**
@@ -34,4 +34,4 @@
class Mage_Api_Model_Server_Handler extends Mage_Api_Model_Server_Handler_Abstract
{
-} // Class Mage_Api_Model_Server_Handler End
\ No newline at end of file
+} // Class Mage_Api_Model_Server_Handler End
diff --git a/app/code/core/Mage/Api/Model/Server/Handler/Abstract.php b/app/code/core/Mage/Api/Model/Server/Handler/Abstract.php
index 8d260b0648..3af45be2b6 100644
--- a/app/code/core/Mage/Api/Model/Server/Handler/Abstract.php
+++ b/app/code/core/Mage/Api/Model/Server/Handler/Abstract.php
@@ -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_Api
- * @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_Api
+ * @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)
*/
/**
@@ -529,4 +529,4 @@ public function globalFaults($sessionId)
$this->_startSession($sessionId);
return array_values($this->_getConfig()->getFaults());
}
-} // Class Mage_Api_Model_Server_Handler_Abstract End
\ No newline at end of file
+} // Class Mage_Api_Model_Server_Handler_Abstract End
diff --git a/app/code/core/Mage/Api/Model/Server/V2/Adapter/Soap.php b/app/code/core/Mage/Api/Model/Server/V2/Adapter/Soap.php
index 8b5ef96361..0073d80bd1 100644
--- a/app/code/core/Mage/Api/Model/Server/V2/Adapter/Soap.php
+++ b/app/code/core/Mage/Api/Model/Server/V2/Adapter/Soap.php
@@ -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_Api
- * @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_Api
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Api/Model/Server/V2/Handler.php b/app/code/core/Mage/Api/Model/Server/V2/Handler.php
index ed9adff0ee..ce97dc09b4 100644
--- a/app/code/core/Mage/Api/Model/Server/V2/Handler.php
+++ b/app/code/core/Mage/Api/Model/Server/V2/Handler.php
@@ -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_Api
- * @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_Api
+ * @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)
*/
/**
@@ -56,4 +56,4 @@ public function __call( $function, $args )
}
return $this->call($sessionId, $apiKey, $args);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Api/Model/Session.php b/app/code/core/Mage/Api/Model/Session.php
index 705cdf5b59..4dbc818473 100644
--- a/app/code/core/Mage/Api/Model/Session.php
+++ b/app/code/core/Mage/Api/Model/Session.php
@@ -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_Api
- * @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_Api
+ * @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)
*/
/**
@@ -139,17 +139,17 @@ public function isAllowed($resource, $privilege=null)
$acl = $this->getAcl();
if ($user && $acl) {
- try {
- if ($acl->isAllowed($user->getAclRole(), 'all', null)){
- return true;
- }
- } catch (Exception $e) {}
+ try {
+ if ($acl->isAllowed($user->getAclRole(), 'all', null)){
+ return true;
+ }
+ } catch (Exception $e) {}
- try {
+ try {
return $acl->isAllowed($user->getAclRole(), $resource, $privilege);
- } catch (Exception $e) {
- return false;
- }
+ } catch (Exception $e) {
+ return false;
+ }
}
return false;
}
@@ -208,4 +208,4 @@ protected function _renewBySessId ($sessId)
return false;
}
-} // Class Mage_Api_Model_Session End
\ No newline at end of file
+} // Class Mage_Api_Model_Session End
diff --git a/app/code/core/Mage/Api/Model/User.php b/app/code/core/Mage/Api/Model/User.php
index 2ada3a1a8b..f82bb2d5d0 100644
--- a/app/code/core/Mage/Api/Model/User.php
+++ b/app/code/core/Mage/Api/Model/User.php
@@ -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_Api
- * @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_Api
+ * @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_Api_Model_User extends Mage_Core_Model_Abstract
@@ -212,4 +212,4 @@ protected function _getEncodedApiKey($apiKey)
return Mage::helper('core')->getHash($apiKey, 2);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Api/Model/Wsdl/Config.php b/app/code/core/Mage/Api/Model/Wsdl/Config.php
index 62137dad3b..f0153dd5e8 100644
--- a/app/code/core/Mage/Api/Model/Wsdl/Config.php
+++ b/app/code/core/Mage/Api/Model/Wsdl/Config.php
@@ -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_Api
- * @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_Api
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Api/Model/Wsdl/Config/Base.php b/app/code/core/Mage/Api/Model/Wsdl/Config/Base.php
index 903fdb59df..3623d76720 100644
--- a/app/code/core/Mage/Api/Model/Wsdl/Config/Base.php
+++ b/app/code/core/Mage/Api/Model/Wsdl/Config/Base.php
@@ -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_Api
- * @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_Api
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Api/Model/Wsdl/Config/Element.php b/app/code/core/Mage/Api/Model/Wsdl/Config/Element.php
index a390e571c9..f3365d9b01 100644
--- a/app/code/core/Mage/Api/Model/Wsdl/Config/Element.php
+++ b/app/code/core/Mage/Api/Model/Wsdl/Config/Element.php
@@ -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_Core
- * @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_Api
+ * @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)
*/
diff --git a/app/code/core/Mage/Api/controllers/IndexController.php b/app/code/core/Mage/Api/controllers/IndexController.php
index 55a52450c9..4d5bb530da 100644
--- a/app/code/core/Mage/Api/controllers/IndexController.php
+++ b/app/code/core/Mage/Api/controllers/IndexController.php
@@ -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_Api
- * @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_Api
+ * @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)
*/
/**
@@ -41,4 +41,4 @@ public function indexAction()
$this->_getServer()->init($this, 'soap')
->run();
}
-} // Class Mage_Api_IndexController End
\ No newline at end of file
+} // Class Mage_Api_IndexController End
diff --git a/app/code/core/Mage/Api/controllers/SoapController.php b/app/code/core/Mage/Api/controllers/SoapController.php
index cc6e18568c..60b7330646 100644
--- a/app/code/core/Mage/Api/controllers/SoapController.php
+++ b/app/code/core/Mage/Api/controllers/SoapController.php
@@ -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_Api
- * @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_Api
+ * @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)
*/
/**
@@ -41,4 +41,4 @@ public function indexAction()
$this->_getServer()->init($this)
->run();
}
-} // Class Mage_Api_IndexController End
\ No newline at end of file
+} // Class Mage_Api_IndexController End
diff --git a/app/code/core/Mage/Api/controllers/V2/SoapController.php b/app/code/core/Mage/Api/controllers/V2/SoapController.php
index d76f22c062..76db40213b 100644
--- a/app/code/core/Mage/Api/controllers/V2/SoapController.php
+++ b/app/code/core/Mage/Api/controllers/V2/SoapController.php
@@ -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_Api
- * @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_Api
+ * @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)
*/
/**
@@ -41,4 +41,4 @@ public function indexAction()
$this->_getServer()->init($this, 'soap_v2', 'soap_v2')
->run();
}
-} // Class Mage_Api_IndexController End
\ No newline at end of file
+} // Class Mage_Api_IndexController End
diff --git a/app/code/core/Mage/Api/controllers/XmlrpcController.php b/app/code/core/Mage/Api/controllers/XmlrpcController.php
index 191c2e52c7..97551f0d77 100644
--- a/app/code/core/Mage/Api/controllers/XmlrpcController.php
+++ b/app/code/core/Mage/Api/controllers/XmlrpcController.php
@@ -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_Api
- * @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_Api
+ * @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)
*/
/**
@@ -38,4 +38,4 @@ public function indexAction()
$this->_getServer()->init($this, 'xmlrpc')
->run();
}
-} // Class Mage_Api_XmlrpcController End
\ No newline at end of file
+} // Class Mage_Api_XmlrpcController End
diff --git a/app/code/core/Mage/Api/etc/adminhtml.xml b/app/code/core/Mage/Api/etc/adminhtml.xml
index 3a3e383f48..b2bd959a7e 100644
--- a/app/code/core/Mage/Api/etc/adminhtml.xml
+++ b/app/code/core/Mage/Api/etc/adminhtml.xml
@@ -21,8 +21,8 @@
*
* @category Mage
* @package Mage_Api
- * @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)
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
diff --git a/app/code/core/Mage/Api/etc/api.xml b/app/code/core/Mage/Api/etc/api.xml
index 11e0ddfe68..687e63cc71 100644
--- a/app/code/core/Mage/Api/etc/api.xml
+++ b/app/code/core/Mage/Api/etc/api.xml
@@ -21,8 +21,8 @@
*
* @category Mage
* @package Mage_Api
- * @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)
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
@@ -123,4 +123,4 @@
-
\ No newline at end of file
+
diff --git a/app/code/core/Mage/Api/etc/config.xml b/app/code/core/Mage/Api/etc/config.xml
index cae2702d7e..5f671bc205 100644
--- a/app/code/core/Mage/Api/etc/config.xml
+++ b/app/code/core/Mage/Api/etc/config.xml
@@ -21,8 +21,8 @@
*
* @category Mage
* @package Mage_Api
- * @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)
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
@@ -121,4 +121,4 @@
-
\ No newline at end of file
+
diff --git a/app/code/core/Mage/Api/etc/system.xml b/app/code/core/Mage/Api/etc/system.xml
index 64d0f40c20..743a8f4f79 100644
--- a/app/code/core/Mage/Api/etc/system.xml
+++ b/app/code/core/Mage/Api/etc/system.xml
@@ -19,10 +19,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_Api
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ * @category Mage
+ * @package Mage_Api
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
@@ -57,4 +57,4 @@
-
\ No newline at end of file
+
diff --git a/app/code/core/Mage/Api/sql/api_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Api/sql/api_setup/mysql4-install-0.7.0.php
index 247502afd7..f0b61029b9 100644
--- a/app/code/core/Mage/Api/sql/api_setup/mysql4-install-0.7.0.php
+++ b/app/code/core/Mage/Api/sql/api_setup/mysql4-install-0.7.0.php
@@ -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_Api
+ * @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)
*/
$installer = $this;
@@ -87,4 +87,4 @@
");
-$installer->endSetup();
\ No newline at end of file
+$installer->endSetup();
diff --git a/app/code/core/Mage/Api/sql/api_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Api/sql/api_setup/mysql4-upgrade-0.7.0-0.7.1.php
index 0e474860c8..f87bb66f78 100644
--- a/app/code/core/Mage/Api/sql/api_setup/mysql4-upgrade-0.7.0-0.7.1.php
+++ b/app/code/core/Mage/Api/sql/api_setup/mysql4-upgrade-0.7.0-0.7.1.php
@@ -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_Api
- * @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_Api
+ * @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)
*/
/**
@@ -37,4 +37,4 @@
$installer->startSetup();
$installer->run("ALTER TABLE {$this->getTable('api_user')} ADD `sessid` VARCHAR(40) NOT NULL AFTER `lognum`;");
-$installer->endSetup();
\ No newline at end of file
+$installer->endSetup();
diff --git a/app/code/core/Mage/Api/sql/api_setup/mysql4-upgrade-0.8.0-0.8.1.php b/app/code/core/Mage/Api/sql/api_setup/mysql4-upgrade-0.8.0-0.8.1.php
index 69f8c24cd8..f57a0ff7c7 100644
--- a/app/code/core/Mage/Api/sql/api_setup/mysql4-upgrade-0.8.0-0.8.1.php
+++ b/app/code/core/Mage/Api/sql/api_setup/mysql4-upgrade-0.8.0-0.8.1.php
@@ -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_Api
- * @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_Api
+ * @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)
*/
/**
@@ -53,4 +53,4 @@
$installer->getConnection()->dropColumn($installer->getTable('api/user'), 'logdate');
$installer->getConnection()->dropColumn($installer->getTable('api/user'), 'sessid');
-$installer->endSetup();
\ No newline at end of file
+$installer->endSetup();
diff --git a/app/code/core/Mage/Backup/Exception.php b/app/code/core/Mage/Backup/Exception.php
index ceb4dc5c42..98cf7384bb 100644
--- a/app/code/core/Mage/Backup/Exception.php
+++ b/app/code/core/Mage/Backup/Exception.php
@@ -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_Backup
- * @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_Backup
+ * @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)
*/
diff --git a/app/code/core/Mage/Backup/Helper/Data.php b/app/code/core/Mage/Backup/Helper/Data.php
index 3de538ce15..e6517716d2 100644
--- a/app/code/core/Mage/Backup/Helper/Data.php
+++ b/app/code/core/Mage/Backup/Helper/Data.php
@@ -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_Backup
- * @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_Backup
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Backup/Model/Backup.php b/app/code/core/Mage/Backup/Model/Backup.php
index c70fa2feed..0df96a54c0 100644
--- a/app/code/core/Mage/Backup/Model/Backup.php
+++ b/app/code/core/Mage/Backup/Model/Backup.php
@@ -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_Backup
- * @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_Backup
+ * @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)
*/
/**
@@ -351,4 +351,4 @@ public function getSize()
return 0;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Backup/Model/Db.php b/app/code/core/Mage/Backup/Model/Db.php
index 526599cf83..7f340a8f15 100644
--- a/app/code/core/Mage/Backup/Model/Db.php
+++ b/app/code/core/Mage/Backup/Model/Db.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Backup
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
@@ -84,8 +84,8 @@ public function renderSql()
$tables = $this->getTables();
foreach ($tables as $tableName) {
- $sql.= $this->getTableCreateScript($tableName, true);
- $sql.= $this->getTableDataDump($tableName);
+ $sql.= $this->getTableCreateScript($tableName, true);
+ $sql.= $this->getTableDataDump($tableName);
}
$sql.= $this->getFooter();
diff --git a/app/code/core/Mage/Backup/Model/Fs/Collection.php b/app/code/core/Mage/Backup/Model/Fs/Collection.php
index b7d72785dd..d26f9a3e85 100644
--- a/app/code/core/Mage/Backup/Model/Fs/Collection.php
+++ b/app/code/core/Mage/Backup/Model/Fs/Collection.php
@@ -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_Backup
- * @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_Backup
+ * @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)
*/
/**
@@ -82,4 +82,4 @@ protected function _generateRow($filename)
$row['size'] = filesize($filename);
return $row;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Backup/Model/Media.php b/app/code/core/Mage/Backup/Model/Media.php
index aebe3c3e66..18acb3a7ba 100644
--- a/app/code/core/Mage/Backup/Model/Media.php
+++ b/app/code/core/Mage/Backup/Model/Media.php
@@ -18,8 +18,8 @@
* 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_Backup
- * @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_Backup
+ * @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)
*/
diff --git a/app/code/core/Mage/Backup/Model/Mysql4/Db.php b/app/code/core/Mage/Backup/Model/Mysql4/Db.php
index 6c76f15c98..6e9bf70ecc 100644
--- a/app/code/core/Mage/Backup/Model/Mysql4/Db.php
+++ b/app/code/core/Mage/Backup/Model/Mysql4/Db.php
@@ -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_Backup
- * @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_Backup
+ * @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)
*/
/**
@@ -101,7 +101,7 @@ public function getTableCreateSql($tableName, $withForeignKeys = false)
$sql = 'SHOW CREATE TABLE ' . $quotedTableName;
$row = $this->_read->fetchRow($sql);
- if (!$row) {
+ if (!$row || !isset($row['Table']) || !isset($row['Create Table'])) {
return false;
}
@@ -301,7 +301,7 @@ public function getTableDataDump($tableName, $step=100)
while ($data = $this->_read->fetchAll($select)) {
$dataSql = array();
foreach ($data as $row) {
- $dataSql[] = $this->_read->quoteInto('(?)', $row);
+ $dataSql[] = $this->_read->quoteInto('(?)', $row);
}
$arrSql[] = $sql.implode(', ', $dataSql).';';
$startRow += $step;
@@ -404,4 +404,4 @@ public function rollBackTransaction()
{
$this->_read->rollBack();
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Backup/Model/View.php b/app/code/core/Mage/Backup/Model/View.php
index aebe3c3e66..18acb3a7ba 100644
--- a/app/code/core/Mage/Backup/Model/View.php
+++ b/app/code/core/Mage/Backup/Model/View.php
@@ -18,8 +18,8 @@
* 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_Backup
- * @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_Backup
+ * @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)
*/
diff --git a/app/code/core/Mage/Backup/etc/adminhtml.xml b/app/code/core/Mage/Backup/etc/adminhtml.xml
index ff8474583a..84ee7c5835 100644
--- a/app/code/core/Mage/Backup/etc/adminhtml.xml
+++ b/app/code/core/Mage/Backup/etc/adminhtml.xml
@@ -19,10 +19,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_Backup
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ * @category Mage
+ * @package Mage_Backup
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
diff --git a/app/code/core/Mage/Backup/etc/config.xml b/app/code/core/Mage/Backup/etc/config.xml
index 78b4cdd369..b644a092d7 100644
--- a/app/code/core/Mage/Backup/etc/config.xml
+++ b/app/code/core/Mage/Backup/etc/config.xml
@@ -19,10 +19,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_Backup
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ * @category Mage
+ * @package Mage_Backup
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
@@ -60,4 +60,4 @@
-
\ No newline at end of file
+
diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes.php
index fe60d7f626..f371f93f9c 100644
--- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes.php
+++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes.php
@@ -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_Bundle
- * @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_Bundle
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php
index ff184cc650..cfa209e94e 100644
--- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php
+++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php
@@ -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_Bundle
- * @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_Bundle
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Special.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Special.php
index 0d70d32061..6e1a8de907 100644
--- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Special.php
+++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Special.php
@@ -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_Bundle
- * @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_Bundle
+ * @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)
*/
/**
@@ -40,4 +40,4 @@ public function getElementHtml()
.'[%]';;
return $html;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php
index 4ca7a09df6..35b278eca0 100644
--- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php
+++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php
@@ -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_Bundle
- * @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_Bundle
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php
index 24612d37fb..99ed97751c 100644
--- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php
+++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php
@@ -1,209 +1,209 @@
-
- */
-class Mage_Bundle_Block_Adminhtml_Catalog_Product_Edit_Tab_Bundle_Option extends Mage_Adminhtml_Block_Widget
-{
- protected $_element = null;
- protected $_customerGroups = null;
- protected $_websites = null;
-
- protected $_oprions = null;
-
- public function __construct()
- {
- $this->setTemplate('bundle/product/edit/bundle/option.phtml');
- }
-
- public function getFieldId()
- {
- return 'bundle_option';
- }
-
- public function getFieldName()
- {
- return 'bundle_options';
- }
-
- /**
- * Retrieve Product object
- *
- * @return Mage_Catalog_Model_Product
- */
- public function getProduct()
- {
- if (!$this->getData('product')) {
- $this->setData('product', Mage::registry('product'));
- }
- return $this->getData('product');
- }
-
- public function render(Varien_Data_Form_Element_Abstract $element)
- {
- $this->setElement($element);
- return $this->toHtml();
- }
-
- public function setElement(Varien_Data_Form_Element_Abstract $element)
- {
- $this->_element = $element;
- return $this;
- }
-
- public function getElement()
- {
- return $this->_element;
- }
-
- public function isMultiWebsites()
- {
- return !Mage::app()->isSingleStoreMode();
- }
-
- protected function _prepareLayout()
- {
- $this->setChild('add_selection_button',
- $this->getLayout()->createBlock('adminhtml/widget_button')
- ->setData(array(
- 'id' => $this->getFieldId().'_{{index}}_add_button',
- 'label' => Mage::helper('bundle')->__('Add Selection'),
- 'on_click' => 'bSelection.showSearch(event)',
- 'class' => 'add'
- )));
-
- $this->setChild('close_search_button',
- $this->getLayout()->createBlock('adminhtml/widget_button')
- ->setData(array(
- 'id' => $this->getFieldId().'_{{index}}_close_button',
- 'label' => Mage::helper('bundle')->__('Close'),
- 'on_click' => 'bSelection.closeSearch(event)',
- 'class' => 'back no-display'
- )));
-
- $this->setChild('option_delete_button',
- $this->getLayout()->createBlock('adminhtml/widget_button')
- ->setData(array(
- 'label' => Mage::helper('catalog')->__('Delete Option'),
- 'class' => 'delete delete-product-option',
- 'on_click' => 'bOption.remove(event)'
- ))
- );
-
- $this->setChild('selection_template',
- $this->getLayout()->createBlock('bundle/adminhtml_catalog_product_edit_tab_bundle_option_selection')
- );
-
- return parent::_prepareLayout();
- }
-
- public function getAddButtonHtml()
- {
- return $this->getChildHtml('add_button');
- }
-
- public function getCloseSearchButtonHtml()
- {
- return $this->getChildHtml('close_search_button');
- }
-
- public function getAddSelectionButtonHtml()
- {
- return $this->getChildHtml('add_selection_button');
- }
-
- public function getOptions()
- {
- if (!$this->_options) {
- $this->getProduct()->getTypeInstance(true)->setStoreFilter($this->getProduct()->getStoreId(), $this->getProduct());
-
- $optionCollection = $this->getProduct()->getTypeInstance(true)->getOptionsCollection($this->getProduct());
-
- $selectionCollection = $this->getProduct()->getTypeInstance(true)->getSelectionsCollection(
- $this->getProduct()->getTypeInstance(true)->getOptionsIds($this->getProduct()),
- $this->getProduct()
- );
-
- $this->_options = $optionCollection->appendSelections($selectionCollection);
- }
- return $this->_options;
- }
-
- public function getAddButtonId()
- {
- $buttonId = $this->getLayout()
- ->getBlock('admin.product.bundle.items')
- ->getChild('add_button')->getId();
- return $buttonId;
- }
-
- public function getOptionDeleteButtonHtml()
- {
- return $this->getChildHtml('option_delete_button');
- }
-
- public function getSelectionHtml()
- {
- return $this->getChildHtml('selection_template');
- }
-
- public function getTypeSelectHtml()
- {
- $select = $this->getLayout()->createBlock('adminhtml/html_select')
- ->setData(array(
- 'id' => $this->getFieldId().'_{{index}}_type',
- 'class' => 'select select-product-option-type required-option-select',
- 'extra_params' => 'onchange="bOption.changeType(event)"'
- ))
- ->setName($this->getFieldName().'[{{index}}][type]')
- ->setOptions(Mage::getSingleton('bundle/source_option_type')->toOptionArray());
-
- return $select->getHtml();
- }
-
- public function getRequireSelectHtml()
- {
- $select = $this->getLayout()->createBlock('adminhtml/html_select')
- ->setData(array(
- 'id' => $this->getFieldId().'_{{index}}_required',
- 'class' => 'select'
- ))
- ->setName($this->getFieldName().'[{{index}}][required]')
- ->setOptions(Mage::getSingleton('adminhtml/system_config_source_yesno')->toOptionArray());
-
- return $select->getHtml();
- }
-
- public function isDefaultStore()
- {
- return ($this->getProduct()->getStoreId() == '0');
- }
-}
\ No newline at end of file
+
+ */
+class Mage_Bundle_Block_Adminhtml_Catalog_Product_Edit_Tab_Bundle_Option extends Mage_Adminhtml_Block_Widget
+{
+ protected $_element = null;
+ protected $_customerGroups = null;
+ protected $_websites = null;
+
+ protected $_oprions = null;
+
+ public function __construct()
+ {
+ $this->setTemplate('bundle/product/edit/bundle/option.phtml');
+ }
+
+ public function getFieldId()
+ {
+ return 'bundle_option';
+ }
+
+ public function getFieldName()
+ {
+ return 'bundle_options';
+ }
+
+ /**
+ * Retrieve Product object
+ *
+ * @return Mage_Catalog_Model_Product
+ */
+ public function getProduct()
+ {
+ if (!$this->getData('product')) {
+ $this->setData('product', Mage::registry('product'));
+ }
+ return $this->getData('product');
+ }
+
+ public function render(Varien_Data_Form_Element_Abstract $element)
+ {
+ $this->setElement($element);
+ return $this->toHtml();
+ }
+
+ public function setElement(Varien_Data_Form_Element_Abstract $element)
+ {
+ $this->_element = $element;
+ return $this;
+ }
+
+ public function getElement()
+ {
+ return $this->_element;
+ }
+
+ public function isMultiWebsites()
+ {
+ return !Mage::app()->isSingleStoreMode();
+ }
+
+ protected function _prepareLayout()
+ {
+ $this->setChild('add_selection_button',
+ $this->getLayout()->createBlock('adminhtml/widget_button')
+ ->setData(array(
+ 'id' => $this->getFieldId().'_{{index}}_add_button',
+ 'label' => Mage::helper('bundle')->__('Add Selection'),
+ 'on_click' => 'bSelection.showSearch(event)',
+ 'class' => 'add'
+ )));
+
+ $this->setChild('close_search_button',
+ $this->getLayout()->createBlock('adminhtml/widget_button')
+ ->setData(array(
+ 'id' => $this->getFieldId().'_{{index}}_close_button',
+ 'label' => Mage::helper('bundle')->__('Close'),
+ 'on_click' => 'bSelection.closeSearch(event)',
+ 'class' => 'back no-display'
+ )));
+
+ $this->setChild('option_delete_button',
+ $this->getLayout()->createBlock('adminhtml/widget_button')
+ ->setData(array(
+ 'label' => Mage::helper('catalog')->__('Delete Option'),
+ 'class' => 'delete delete-product-option',
+ 'on_click' => 'bOption.remove(event)'
+ ))
+ );
+
+ $this->setChild('selection_template',
+ $this->getLayout()->createBlock('bundle/adminhtml_catalog_product_edit_tab_bundle_option_selection')
+ );
+
+ return parent::_prepareLayout();
+ }
+
+ public function getAddButtonHtml()
+ {
+ return $this->getChildHtml('add_button');
+ }
+
+ public function getCloseSearchButtonHtml()
+ {
+ return $this->getChildHtml('close_search_button');
+ }
+
+ public function getAddSelectionButtonHtml()
+ {
+ return $this->getChildHtml('add_selection_button');
+ }
+
+ public function getOptions()
+ {
+ if (!$this->_options) {
+ $this->getProduct()->getTypeInstance(true)->setStoreFilter($this->getProduct()->getStoreId(), $this->getProduct());
+
+ $optionCollection = $this->getProduct()->getTypeInstance(true)->getOptionsCollection($this->getProduct());
+
+ $selectionCollection = $this->getProduct()->getTypeInstance(true)->getSelectionsCollection(
+ $this->getProduct()->getTypeInstance(true)->getOptionsIds($this->getProduct()),
+ $this->getProduct()
+ );
+
+ $this->_options = $optionCollection->appendSelections($selectionCollection);
+ }
+ return $this->_options;
+ }
+
+ public function getAddButtonId()
+ {
+ $buttonId = $this->getLayout()
+ ->getBlock('admin.product.bundle.items')
+ ->getChild('add_button')->getId();
+ return $buttonId;
+ }
+
+ public function getOptionDeleteButtonHtml()
+ {
+ return $this->getChildHtml('option_delete_button');
+ }
+
+ public function getSelectionHtml()
+ {
+ return $this->getChildHtml('selection_template');
+ }
+
+ public function getTypeSelectHtml()
+ {
+ $select = $this->getLayout()->createBlock('adminhtml/html_select')
+ ->setData(array(
+ 'id' => $this->getFieldId().'_{{index}}_type',
+ 'class' => 'select select-product-option-type required-option-select',
+ 'extra_params' => 'onchange="bOption.changeType(event)"'
+ ))
+ ->setName($this->getFieldName().'[{{index}}][type]')
+ ->setOptions(Mage::getSingleton('bundle/source_option_type')->toOptionArray());
+
+ return $select->getHtml();
+ }
+
+ public function getRequireSelectHtml()
+ {
+ $select = $this->getLayout()->createBlock('adminhtml/html_select')
+ ->setData(array(
+ 'id' => $this->getFieldId().'_{{index}}_required',
+ 'class' => 'select'
+ ))
+ ->setName($this->getFieldName().'[{{index}}][required]')
+ ->setOptions(Mage::getSingleton('adminhtml/system_config_source_yesno')->toOptionArray());
+
+ return $select->getHtml();
+ }
+
+ public function isDefaultStore()
+ {
+ return ($this->getProduct()->getStoreId() == '0');
+ }
+}
diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search.php
index ee6f8b01fb..d902637c15 100644
--- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search.php
+++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search.php
@@ -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_Bundle
- * @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_Bundle
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search/Grid.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search/Grid.php
index ced3a492c3..b2cd554642 100644
--- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search/Grid.php
+++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search/Grid.php
@@ -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_Bundle
- * @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_Bundle
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php
index 9df4f12bf2..2138182cbf 100644
--- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php
+++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php
@@ -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_Bundle
- * @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_Bundle
+ * @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)
*/
/**
@@ -97,4 +97,4 @@ public function getSelectionSearchUrl()
{
return $this->getUrl('bundle/selection/search');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tabs.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tabs.php
index d90a97d05b..9097df40e7 100644
--- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tabs.php
+++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tabs.php
@@ -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_Bundle
- * @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_Bundle
+ * @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)
*/
/**
@@ -46,4 +46,4 @@ protected function _prepareLayout()
));
$this->bindShadowTabs('bundle_items', 'customer_options');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php
index 5c824621b7..be1dcac470 100644
--- a/app/code/core/Mage/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php
+++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php
@@ -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_Bundle
- * @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_Bundle
+ * @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)
*/
diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Sales/Order/View/Items/Renderer.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Sales/Order/View/Items/Renderer.php
index f50cbd3bd2..1c68c5563f 100644
--- a/app/code/core/Mage/Bundle/Block/Adminhtml/Sales/Order/View/Items/Renderer.php
+++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Sales/Order/View/Items/Renderer.php
@@ -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_Bundle
- * @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_Bundle
+ * @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)
*/
diff --git a/app/code/core/Mage/Bundle/Block/Catalog/Product/List/Partof.php b/app/code/core/Mage/Bundle/Block/Catalog/Product/List/Partof.php
index 832408117f..4930fa748d 100644
--- a/app/code/core/Mage/Bundle/Block/Catalog/Product/List/Partof.php
+++ b/app/code/core/Mage/Bundle/Block/Catalog/Product/List/Partof.php
@@ -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_Bundle
- * @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_Bundle
+ * @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)
*/
/**
@@ -127,4 +127,4 @@ public function getProduct()
}
return $this->_product;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Bundle/Block/Catalog/Product/Price.php b/app/code/core/Mage/Bundle/Block/Catalog/Product/Price.php
index b3a81433c7..1e62bca567 100644
--- a/app/code/core/Mage/Bundle/Block/Catalog/Product/Price.php
+++ b/app/code/core/Mage/Bundle/Block/Catalog/Product/Price.php
@@ -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_Bundle
- * @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_Bundle
+ * @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)
*/
diff --git a/app/code/core/Mage/Bundle/Block/Catalog/Product/View.php b/app/code/core/Mage/Bundle/Block/Catalog/Product/View.php
index 621a5ef0cc..400854fda9 100644
--- a/app/code/core/Mage/Bundle/Block/Catalog/Product/View.php
+++ b/app/code/core/Mage/Bundle/Block/Catalog/Product/View.php
@@ -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_Bundle
- * @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_Bundle
+ * @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)
*/
diff --git a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle.php b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle.php
index e4914cd01a..b70d86a730 100644
--- a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle.php
+++ b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle.php
@@ -1,143 +1,143 @@
-
- */
-class Mage_Bundle_Block_Catalog_Product_View_Type_Bundle extends Mage_Catalog_Block_Product_View_Abstract
-{
- protected $_optionRenderers = array();
- protected $_options = null;
-
- public function getOptions()
- {
- if (!$this->_options) {
- $this->getProduct()->getTypeInstance(true)->setStoreFilter($this->getProduct()->getStoreId(), $this->getProduct());
-
- $optionCollection = $this->getProduct()->getTypeInstance(true)->getOptionsCollection($this->getProduct());
-
- $selectionCollection = $this->getProduct()->getTypeInstance(true)->getSelectionsCollection(
- $this->getProduct()->getTypeInstance(true)->getOptionsIds($this->getProduct()),
- $this->getProduct()
- );
-
- $this->_options = $optionCollection->appendSelections($selectionCollection, false, false);
- }
- return $this->_options;
- }
-
- public function hasOptions()
- {
- $this->getOptions();
- if (empty($this->_options) || !$this->getProduct()->isSalable()) {
- return false;
- }
- return true;
- }
-
- public function getJsonConfig()
- {
- Mage::app()->getLocale()->getJsPriceFormat();
- $store = Mage::app()->getStore();
- $optionsArray = $this->getOptions();
- $options = array();
- $selected = array();
-
- foreach ($optionsArray as $_option) {
- if (!$_option->getSelections()) {
- continue;
- }
- $option = array (
- 'selections' => array(),
- 'title' => $_option->getTitle(),
- 'isMulti' => ($_option->getType() == 'multi' || $_option->getType() == 'checkbox')
- );
-
- $selectionCount = count($_option->getSelections());
-
- foreach ($_option->getSelections() as $_selection) {
- $_qty = !($_selection->getSelectionQty()*1)?'1':$_selection->getSelectionQty()*1;
- $selection = array (
- 'qty' => $_qty,
- 'customQty' => $_selection->getSelectionCanChangeQty(),
- 'price' => Mage::helper('core')->currency($_selection->getFinalPrice(), false, false),
- 'priceValue' => Mage::helper('core')->currency($_selection->getSelectionPriceValue(), false, false),
- 'priceType' => $_selection->getSelectionPriceType(),
- 'tierPrice' => $_selection->getTierPrice(),
- 'name' => $_selection->getName(),
- 'plusDisposition' => 0,
- 'minusDisposition' => 0,
- );
- $responseObject = new Varien_Object();
- $args = array('response_object'=>$responseObject, 'selection'=>$_selection);
- Mage::dispatchEvent('bundle_product_view_config', $args);
- if (is_array($responseObject->getAdditionalOptions())) {
- foreach ($responseObject->getAdditionalOptions() as $o=>$v) {
- $selection[$o] = $v;
- }
- }
- $option['selections'][$_selection->getSelectionId()] = $selection;
-
- if (($_selection->getIsDefault() || ($selectionCount == 1 && $_option->getRequired())) && $_selection->isSalable()) {
- $selected[$_option->getId()][] = $_selection->getSelectionId();
- }
- }
- $options[$_option->getId()] = $option;
- }
-
- $config = array(
- 'options' => $options,
- 'selected' => $selected,
- 'bundleId' => $this->getProduct()->getId(),
- 'priceFormat' => Mage::app()->getLocale()->getJsPriceFormat(),
- 'basePrice' => Mage::helper('core')->currency($this->getProduct()->getPrice(), false, false),
- 'priceType' => $this->getProduct()->getPriceType(),
- 'specialPrice' => $this->getProduct()->getSpecialPrice()
- );
-
- return Mage::helper('core')->jsonEncode($config);
- }
-
- public function addRenderer($type, $block)
- {
- $this->_optionRenderers[$type] = $block;
- }
-
- public function getOptionHtml($option)
- {
- if (!isset($this->_optionRenderers[$option->getType()])) {
- return $this->__('There is no defined renderer for "%s" option type', $option->getType());
- }
- return $this->getLayout()->createBlock($this->_optionRenderers[$option->getType()])
- ->setOption($option)->toHtml();
- }
-
-}
\ No newline at end of file
+
+ */
+class Mage_Bundle_Block_Catalog_Product_View_Type_Bundle extends Mage_Catalog_Block_Product_View_Abstract
+{
+ protected $_optionRenderers = array();
+ protected $_options = null;
+
+ public function getOptions()
+ {
+ if (!$this->_options) {
+ $this->getProduct()->getTypeInstance(true)->setStoreFilter($this->getProduct()->getStoreId(), $this->getProduct());
+
+ $optionCollection = $this->getProduct()->getTypeInstance(true)->getOptionsCollection($this->getProduct());
+
+ $selectionCollection = $this->getProduct()->getTypeInstance(true)->getSelectionsCollection(
+ $this->getProduct()->getTypeInstance(true)->getOptionsIds($this->getProduct()),
+ $this->getProduct()
+ );
+
+ $this->_options = $optionCollection->appendSelections($selectionCollection, false, false);
+ }
+ return $this->_options;
+ }
+
+ public function hasOptions()
+ {
+ $this->getOptions();
+ if (empty($this->_options) || !$this->getProduct()->isSalable()) {
+ return false;
+ }
+ return true;
+ }
+
+ public function getJsonConfig()
+ {
+ Mage::app()->getLocale()->getJsPriceFormat();
+ $store = Mage::app()->getStore();
+ $optionsArray = $this->getOptions();
+ $options = array();
+ $selected = array();
+
+ foreach ($optionsArray as $_option) {
+ if (!$_option->getSelections()) {
+ continue;
+ }
+ $option = array (
+ 'selections' => array(),
+ 'title' => $_option->getTitle(),
+ 'isMulti' => ($_option->getType() == 'multi' || $_option->getType() == 'checkbox')
+ );
+
+ $selectionCount = count($_option->getSelections());
+
+ foreach ($_option->getSelections() as $_selection) {
+ $_qty = !($_selection->getSelectionQty()*1)?'1':$_selection->getSelectionQty()*1;
+ $selection = array (
+ 'qty' => $_qty,
+ 'customQty' => $_selection->getSelectionCanChangeQty(),
+ 'price' => Mage::helper('core')->currency($_selection->getFinalPrice(), false, false),
+ 'priceValue' => Mage::helper('core')->currency($_selection->getSelectionPriceValue(), false, false),
+ 'priceType' => $_selection->getSelectionPriceType(),
+ 'tierPrice' => $_selection->getTierPrice(),
+ 'name' => $_selection->getName(),
+ 'plusDisposition' => 0,
+ 'minusDisposition' => 0,
+ );
+ $responseObject = new Varien_Object();
+ $args = array('response_object'=>$responseObject, 'selection'=>$_selection);
+ Mage::dispatchEvent('bundle_product_view_config', $args);
+ if (is_array($responseObject->getAdditionalOptions())) {
+ foreach ($responseObject->getAdditionalOptions() as $o=>$v) {
+ $selection[$o] = $v;
+ }
+ }
+ $option['selections'][$_selection->getSelectionId()] = $selection;
+
+ if (($_selection->getIsDefault() || ($selectionCount == 1 && $_option->getRequired())) && $_selection->isSalable()) {
+ $selected[$_option->getId()][] = $_selection->getSelectionId();
+ }
+ }
+ $options[$_option->getId()] = $option;
+ }
+
+ $config = array(
+ 'options' => $options,
+ 'selected' => $selected,
+ 'bundleId' => $this->getProduct()->getId(),
+ 'priceFormat' => Mage::app()->getLocale()->getJsPriceFormat(),
+ 'basePrice' => Mage::helper('core')->currency($this->getProduct()->getPrice(), false, false),
+ 'priceType' => $this->getProduct()->getPriceType(),
+ 'specialPrice' => $this->getProduct()->getSpecialPrice()
+ );
+
+ return Mage::helper('core')->jsonEncode($config);
+ }
+
+ public function addRenderer($type, $block)
+ {
+ $this->_optionRenderers[$type] = $block;
+ }
+
+ public function getOptionHtml($option)
+ {
+ if (!isset($this->_optionRenderers[$option->getType()])) {
+ return $this->__('There is no defined renderer for "%s" option type', $option->getType());
+ }
+ return $this->getLayout()->createBlock($this->_optionRenderers[$option->getType()])
+ ->setOption($option)->toHtml();
+ }
+
+}
diff --git a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php
index 99740b57e3..ba5d3cdc30 100644
--- a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php
+++ b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php
@@ -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_Bundle
- * @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_Bundle
+ * @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)
*/
diff --git a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Checkbox.php b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Checkbox.php
index 8228a832e6..4745317bfa 100644
--- a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Checkbox.php
+++ b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Checkbox.php
@@ -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_Bundle
- * @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_Bundle
+ * @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)
*/
@@ -39,4 +39,4 @@ public function _construct()
{
$this->setTemplate('bundle/catalog/product/view/type/bundle/option/checkbox.phtml');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Multi.php b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Multi.php
index d9dad59ab8..e74f794225 100644
--- a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Multi.php
+++ b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Multi.php
@@ -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_Bundle
- * @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_Bundle
+ * @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)
*/
@@ -39,4 +39,4 @@ public function _construct()
{
$this->setTemplate('bundle/catalog/product/view/type/bundle/option/multi.phtml');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Radio.php b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Radio.php
index 2b6616949a..549804a437 100644
--- a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Radio.php
+++ b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Radio.php
@@ -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_Bundle
- * @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_Bundle
+ * @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)
*/
@@ -39,4 +39,4 @@ public function _construct()
{
$this->setTemplate('bundle/catalog/product/view/type/bundle/option/radio.phtml');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Select.php b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Select.php
index fde3a75df0..7aa1a1e13a 100644
--- a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Select.php
+++ b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Select.php
@@ -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_Bundle
- * @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_Bundle
+ * @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)
*/
@@ -39,4 +39,4 @@ public function _construct()
{
$this->setTemplate('bundle/catalog/product/view/type/bundle/option/select.phtml');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Bundle/Block/Checkout/Cart/Item/Renderer.php b/app/code/core/Mage/Bundle/Block/Checkout/Cart/Item/Renderer.php
index 415c1987d0..8d7b4b8cb8 100644
--- a/app/code/core/Mage/Bundle/Block/Checkout/Cart/Item/Renderer.php
+++ b/app/code/core/Mage/Bundle/Block/Checkout/Cart/Item/Renderer.php
@@ -1,121 +1,121 @@
-
- */
-class Mage_Bundle_Block_Checkout_Cart_Item_Renderer extends Mage_Checkout_Block_Cart_Item_Renderer
-{
- /**
- * Get bundled selections (slections-products collection)
- *
- * Returns array of options objects.
- * Each option object will contain array of selections objects
- *
- * @return array
- */
- protected function _getBundleOptions($useCache = true)
- {
- $options = array();
-
- /**
- * @var Mage_Bundle_Model_Product_Type
- */
- $typeInstance = $this->getProduct()->getTypeInstance(true);
-
- // get bundle options
- $optionsQuoteItemOption = $this->getItem()->getOptionByCode('bundle_option_ids');
- $bundleOptionsIds = unserialize($optionsQuoteItemOption->getValue());
- if ($bundleOptionsIds) {
- /**
- * @var Mage_Bundle_Model_Mysql4_Option_Collection
- */
- $optionsCollection = $typeInstance->getOptionsByIds($bundleOptionsIds, $this->getProduct());
-
- // get and add bundle selections collection
- $selectionsQuoteItemOption = $this->getItem()->getOptionByCode('bundle_selection_ids');
-
- $selectionsCollection = $typeInstance->getSelectionsByIds(
- unserialize($selectionsQuoteItemOption->getValue()),
- $this->getProduct()
- );
-
- $bundleOptions = $optionsCollection->appendSelections($selectionsCollection, true);
- foreach ($bundleOptions as $bundleOption) {
- if ($bundleOption->getSelections()) {
- $option = array('label' => $bundleOption->getTitle(), "value" => array());
- $bundleSelections = $bundleOption->getSelections();
-
- foreach ($bundleSelections as $bundleSelection) {
- $option['value'][] = $this->_getSelectionQty($bundleSelection->getSelectionId()).' x '. $this->htmlEscape($bundleSelection->getName()). ' ' .Mage::helper('core')->currency($this->_getSelectionFinalPrice($bundleSelection));
- }
-
- $options[] = $option;
- }
- }
- }
- return $options;
- }
-
- /**
- * Obtain final price of selection in a bundle product
- *
- * @param Mage_Catalog_Model_Product $selectionProduct
- * @return decimal
- */
- protected function _getSelectionFinalPrice($selectionProduct)
- {
- $bundleProduct = $this->getProduct();
- return $bundleProduct->getPriceModel()->getSelectionFinalPrice(
- $bundleProduct, $selectionProduct,
- $this->getQty(),
- $this->_getSelectionQty($selectionProduct->getSelectionId())
- );
- }
-
- /**
- * Get selection quantity
- *
- * @param int $selectionId
- * @return decimal
- */
- protected function _getSelectionQty($selectionId)
- {
- if ($selectionQty = $this->getProduct()->getCustomOption('selection_qty_' . $selectionId)) {
- return $selectionQty->getValue();
- }
- return 0;
- }
-
- public function getOptionList()
- {
- return array_merge($this->_getBundleOptions(), parent::getOptionList());
- }
-}
+
+ */
+class Mage_Bundle_Block_Checkout_Cart_Item_Renderer extends Mage_Checkout_Block_Cart_Item_Renderer
+{
+ /**
+ * Get bundled selections (slections-products collection)
+ *
+ * Returns array of options objects.
+ * Each option object will contain array of selections objects
+ *
+ * @return array
+ */
+ protected function _getBundleOptions($useCache = true)
+ {
+ $options = array();
+
+ /**
+ * @var Mage_Bundle_Model_Product_Type
+ */
+ $typeInstance = $this->getProduct()->getTypeInstance(true);
+
+ // get bundle options
+ $optionsQuoteItemOption = $this->getItem()->getOptionByCode('bundle_option_ids');
+ $bundleOptionsIds = unserialize($optionsQuoteItemOption->getValue());
+ if ($bundleOptionsIds) {
+ /**
+ * @var Mage_Bundle_Model_Mysql4_Option_Collection
+ */
+ $optionsCollection = $typeInstance->getOptionsByIds($bundleOptionsIds, $this->getProduct());
+
+ // get and add bundle selections collection
+ $selectionsQuoteItemOption = $this->getItem()->getOptionByCode('bundle_selection_ids');
+
+ $selectionsCollection = $typeInstance->getSelectionsByIds(
+ unserialize($selectionsQuoteItemOption->getValue()),
+ $this->getProduct()
+ );
+
+ $bundleOptions = $optionsCollection->appendSelections($selectionsCollection, true);
+ foreach ($bundleOptions as $bundleOption) {
+ if ($bundleOption->getSelections()) {
+ $option = array('label' => $bundleOption->getTitle(), "value" => array());
+ $bundleSelections = $bundleOption->getSelections();
+
+ foreach ($bundleSelections as $bundleSelection) {
+ $option['value'][] = $this->_getSelectionQty($bundleSelection->getSelectionId()).' x '. $this->htmlEscape($bundleSelection->getName()). ' ' .Mage::helper('core')->currency($this->_getSelectionFinalPrice($bundleSelection));
+ }
+
+ $options[] = $option;
+ }
+ }
+ }
+ return $options;
+ }
+
+ /**
+ * Obtain final price of selection in a bundle product
+ *
+ * @param Mage_Catalog_Model_Product $selectionProduct
+ * @return decimal
+ */
+ protected function _getSelectionFinalPrice($selectionProduct)
+ {
+ $bundleProduct = $this->getProduct();
+ return $bundleProduct->getPriceModel()->getSelectionFinalPrice(
+ $bundleProduct, $selectionProduct,
+ $this->getQty(),
+ $this->_getSelectionQty($selectionProduct->getSelectionId())
+ );
+ }
+
+ /**
+ * Get selection quantity
+ *
+ * @param int $selectionId
+ * @return decimal
+ */
+ protected function _getSelectionQty($selectionId)
+ {
+ if ($selectionQty = $this->getProduct()->getCustomOption('selection_qty_' . $selectionId)) {
+ return $selectionQty->getValue();
+ }
+ return 0;
+ }
+
+ public function getOptionList()
+ {
+ return array_merge($this->_getBundleOptions(), parent::getOptionList());
+ }
+}
diff --git a/app/code/core/Mage/Bundle/Block/Sales/Order/Items/Renderer.php b/app/code/core/Mage/Bundle/Block/Sales/Order/Items/Renderer.php
index 7d3290fb27..e63cea6cdd 100644
--- a/app/code/core/Mage/Bundle/Block/Sales/Order/Items/Renderer.php
+++ b/app/code/core/Mage/Bundle/Block/Sales/Order/Items/Renderer.php
@@ -1,169 +1,169 @@
-
- */
-class Mage_Bundle_Block_Sales_Order_Items_Renderer extends Mage_Sales_Block_Order_Item_Renderer_Default
-{
- public function isShipmentSeparately($item = null)
- {
- if ($item) {
- if ($item->getOrderItem()) {
- $item = $item->getOrderItem();
- }
- if ($parentItem = $item->getParentItem()) {
- if ($options = $parentItem->getProductOptions()) {
- if (isset($options['shipment_type']) && $options['shipment_type'] == Mage_Catalog_Model_Product_Type_Abstract::SHIPMENT_SEPARATELY) {
- return true;
- } else {
- return false;
- }
- }
- } else {
- if ($options = $item->getProductOptions()) {
- if (isset($options['shipment_type']) && $options['shipment_type'] == Mage_Catalog_Model_Product_Type_Abstract::SHIPMENT_SEPARATELY) {
- return false;
- } else {
- return true;
- }
- }
- }
- }
-
- if ($options = $this->getOrderItem()->getProductOptions()) {
- if (isset($options['shipment_type']) && $options['shipment_type'] == Mage_Catalog_Model_Product_Type_Abstract::SHIPMENT_SEPARATELY) {
- return true;
- }
- }
- return false;
- }
-
- public function isChildCalculated($item = null)
- {
- if ($item) {
- if ($item->getOrderItem()) {
- $item = $item->getOrderItem();
- }
- if ($parentItem = $item->getParentItem()) {
- if ($options = $parentItem->getProductOptions()) {
- if (isset($options['product_calculations']) && $options['product_calculations'] == Mage_Catalog_Model_Product_Type_Abstract::CALCULATE_CHILD) {
- return true;
- } else {
- return false;
- }
- }
- } else {
- if ($options = $item->getProductOptions()) {
- if (isset($options['product_calculations']) && $options['product_calculations'] == Mage_Catalog_Model_Product_Type_Abstract::CALCULATE_CHILD) {
- return false;
- } else {
- return true;
- }
- }
- }
- }
-
- if ($options = $this->getOrderItem()->getProductOptions()) {
- if (isset($options['product_calculations'])
- && $options['product_calculations'] == Mage_Catalog_Model_Product_Type_Abstract::CALCULATE_CHILD) {
- return true;
- }
- }
- return false;
- }
-
- public function getSelectionAttributes($item) {
- if ($item instanceof Mage_Sales_Model_Order_Item) {
- $options = $item->getProductOptions();
- } else {
- $options = $item->getOrderItem()->getProductOptions();
- }
- if (isset($options['bundle_selection_attributes'])) {
- return unserialize($options['bundle_selection_attributes']);
- }
- return null;
- }
-
- public function getValueHtml($item)
- {
- if ($attributes = $this->getSelectionAttributes($item)) {
- return sprintf('%d', $attributes['qty']) . ' x ' .
- $this->htmlEscape($item->getName()) .
- " " . $this->getOrder()->formatPrice($attributes['price']);
- } else {
- return $this->htmlEscape($item->getName());
- }
- }
-
- /**
- * Getting all available childs for Invoice, Shipmen or Creditmemo item
- *
- * @param Varien_Object $item
- * @return array
- */
- public function getChilds($item)
- {
- $_itemsArray = array();
-
- if ($item instanceof Mage_Sales_Model_Order_Invoice_Item) {
- $_items = $item->getInvoice()->getAllItems();
- } else if ($item instanceof Mage_Sales_Model_Order_Shipment_Item) {
- $_items = $item->getShipment()->getAllItems();
- } else if ($item instanceof Mage_Sales_Model_Order_Creditmemo_Item) {
- $_items = $item->getCreditmemo()->getAllItems();
- }
-
- if ($_items) {
- foreach ($_items as $_item) {
- if ($parentItem = $_item->getOrderItem()->getParentItem()) {
- $_itemsArray[$parentItem->getId()][$_item->getOrderItemId()] = $_item;
- } else {
- $_itemsArray[$_item->getOrderItem()->getId()][$_item->getOrderItemId()] = $_item;
- }
- }
- }
-
- if (isset($_itemsArray[$item->getOrderItem()->getId()])) {
- return $_itemsArray[$item->getOrderItem()->getId()];
- } else {
- return null;
- }
- }
-
- public function canShowPriceInfo($item)
- {
- if (($item->getOrderItem()->getParentItem() && $this->isChildCalculated())
- || (!$item->getOrderItem()->getParentItem() && !$this->isChildCalculated())) {
- return true;
- }
- return false;
- }
-}
\ No newline at end of file
+
+ */
+class Mage_Bundle_Block_Sales_Order_Items_Renderer extends Mage_Sales_Block_Order_Item_Renderer_Default
+{
+ public function isShipmentSeparately($item = null)
+ {
+ if ($item) {
+ if ($item->getOrderItem()) {
+ $item = $item->getOrderItem();
+ }
+ if ($parentItem = $item->getParentItem()) {
+ if ($options = $parentItem->getProductOptions()) {
+ if (isset($options['shipment_type']) && $options['shipment_type'] == Mage_Catalog_Model_Product_Type_Abstract::SHIPMENT_SEPARATELY) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+ } else {
+ if ($options = $item->getProductOptions()) {
+ if (isset($options['shipment_type']) && $options['shipment_type'] == Mage_Catalog_Model_Product_Type_Abstract::SHIPMENT_SEPARATELY) {
+ return false;
+ } else {
+ return true;
+ }
+ }
+ }
+ }
+
+ if ($options = $this->getOrderItem()->getProductOptions()) {
+ if (isset($options['shipment_type']) && $options['shipment_type'] == Mage_Catalog_Model_Product_Type_Abstract::SHIPMENT_SEPARATELY) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public function isChildCalculated($item = null)
+ {
+ if ($item) {
+ if ($item->getOrderItem()) {
+ $item = $item->getOrderItem();
+ }
+ if ($parentItem = $item->getParentItem()) {
+ if ($options = $parentItem->getProductOptions()) {
+ if (isset($options['product_calculations']) && $options['product_calculations'] == Mage_Catalog_Model_Product_Type_Abstract::CALCULATE_CHILD) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+ } else {
+ if ($options = $item->getProductOptions()) {
+ if (isset($options['product_calculations']) && $options['product_calculations'] == Mage_Catalog_Model_Product_Type_Abstract::CALCULATE_CHILD) {
+ return false;
+ } else {
+ return true;
+ }
+ }
+ }
+ }
+
+ if ($options = $this->getOrderItem()->getProductOptions()) {
+ if (isset($options['product_calculations'])
+ && $options['product_calculations'] == Mage_Catalog_Model_Product_Type_Abstract::CALCULATE_CHILD) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public function getSelectionAttributes($item) {
+ if ($item instanceof Mage_Sales_Model_Order_Item) {
+ $options = $item->getProductOptions();
+ } else {
+ $options = $item->getOrderItem()->getProductOptions();
+ }
+ if (isset($options['bundle_selection_attributes'])) {
+ return unserialize($options['bundle_selection_attributes']);
+ }
+ return null;
+ }
+
+ public function getValueHtml($item)
+ {
+ if ($attributes = $this->getSelectionAttributes($item)) {
+ return sprintf('%d', $attributes['qty']) . ' x ' .
+ $this->htmlEscape($item->getName()) .
+ " " . $this->getOrder()->formatPrice($attributes['price']);
+ } else {
+ return $this->htmlEscape($item->getName());
+ }
+ }
+
+ /**
+ * Getting all available childs for Invoice, Shipmen or Creditmemo item
+ *
+ * @param Varien_Object $item
+ * @return array
+ */
+ public function getChilds($item)
+ {
+ $_itemsArray = array();
+
+ if ($item instanceof Mage_Sales_Model_Order_Invoice_Item) {
+ $_items = $item->getInvoice()->getAllItems();
+ } else if ($item instanceof Mage_Sales_Model_Order_Shipment_Item) {
+ $_items = $item->getShipment()->getAllItems();
+ } else if ($item instanceof Mage_Sales_Model_Order_Creditmemo_Item) {
+ $_items = $item->getCreditmemo()->getAllItems();
+ }
+
+ if ($_items) {
+ foreach ($_items as $_item) {
+ if ($parentItem = $_item->getOrderItem()->getParentItem()) {
+ $_itemsArray[$parentItem->getId()][$_item->getOrderItemId()] = $_item;
+ } else {
+ $_itemsArray[$_item->getOrderItem()->getId()][$_item->getOrderItemId()] = $_item;
+ }
+ }
+ }
+
+ if (isset($_itemsArray[$item->getOrderItem()->getId()])) {
+ return $_itemsArray[$item->getOrderItem()->getId()];
+ } else {
+ return null;
+ }
+ }
+
+ public function canShowPriceInfo($item)
+ {
+ if (($item->getOrderItem()->getParentItem() && $this->isChildCalculated())
+ || (!$item->getOrderItem()->getParentItem() && !$this->isChildCalculated())) {
+ return true;
+ }
+ return false;
+ }
+}
diff --git a/app/code/core/Mage/Bundle/Helper/Data.php b/app/code/core/Mage/Bundle/Helper/Data.php
index b7df61265c..fc889d2fc4 100644
--- a/app/code/core/Mage/Bundle/Helper/Data.php
+++ b/app/code/core/Mage/Bundle/Helper/Data.php
@@ -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_Bundle
- * @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_Bundle
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Bundle/Model/CatalogIndex/Data/Bundle.php b/app/code/core/Mage/Bundle/Model/CatalogIndex/Data/Bundle.php
index d1acf51217..ae8c2b1e45 100644
--- a/app/code/core/Mage/Bundle/Model/CatalogIndex/Data/Bundle.php
+++ b/app/code/core/Mage/Bundle/Model/CatalogIndex/Data/Bundle.php
@@ -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_Bundle
- * @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_Bundle
+ * @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)
*/
/**
@@ -83,4 +83,4 @@ protected function _prepareLinkFetchSelect($store, $table, $idField, $whereField
{
$this->_addAttributeFilter($this->_getLinkSelect(), 'required_options', 'l', $idField, $store, 0);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Bundle/Model/Mysql4/Bundle.php b/app/code/core/Mage/Bundle/Model/Mysql4/Bundle.php
index 4ceef686ef..2d2343b205 100644
--- a/app/code/core/Mage/Bundle/Model/Mysql4/Bundle.php
+++ b/app/code/core/Mage/Bundle/Model/Mysql4/Bundle.php
@@ -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_Bundle
- * @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_Bundle
+ * @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)
*/
diff --git a/app/code/core/Mage/Bundle/Model/Mysql4/Option.php b/app/code/core/Mage/Bundle/Model/Mysql4/Option.php
index 7ee7df72d7..a879b61498 100644
--- a/app/code/core/Mage/Bundle/Model/Mysql4/Option.php
+++ b/app/code/core/Mage/Bundle/Model/Mysql4/Option.php
@@ -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_Bundle
- * @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_Bundle
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Bundle/Model/Mysql4/Option/Collection.php b/app/code/core/Mage/Bundle/Model/Mysql4/Option/Collection.php
index ee0c4906f8..abc01b2379 100644
--- a/app/code/core/Mage/Bundle/Model/Mysql4/Option/Collection.php
+++ b/app/code/core/Mage/Bundle/Model/Mysql4/Option/Collection.php
@@ -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_Bundle
- * @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_Bundle
+ * @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)
*/
/**
@@ -126,4 +126,4 @@ public function setIdFilter($ids)
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Bundle/Model/Mysql4/Price/Index.php b/app/code/core/Mage/Bundle/Model/Mysql4/Price/Index.php
index 06b22da5b9..5a67ec1c1c 100644
--- a/app/code/core/Mage/Bundle/Model/Mysql4/Price/Index.php
+++ b/app/code/core/Mage/Bundle/Model/Mysql4/Price/Index.php
@@ -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_Bundle
- * @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)
+ * @category Mage
+ * @package Mage_Bundle
+ * @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)
*/
@@ -761,7 +761,7 @@ public function _calculateSpecialPrice($finalPrice, array $priceData, Mage_Core_
$specialPrice = $priceData['special_price'];
if (!is_null($specialPrice) && $specialPrice != false) {
- if (Mage::app()->getLocale()->IsStoreDateInInterval($store, $priceData['special_from_date'], $priceData['special_to_date'])) {
+ if (Mage::app()->getLocale()->isStoreDateInInterval($store, $priceData['special_from_date'], $priceData['special_to_date'])) {
$specialPrice = ($finalPrice * $specialPrice) / 100;
$finalPrice = min($finalPrice, $specialPrice);
}
diff --git a/app/code/core/Mage/Bundle/Model/Mysql4/Selection.php b/app/code/core/Mage/Bundle/Model/Mysql4/Selection.php
index bca5a09ef6..035b9b4a8e 100644
--- a/app/code/core/Mage/Bundle/Model/Mysql4/Selection.php
+++ b/app/code/core/Mage/Bundle/Model/Mysql4/Selection.php
@@ -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_Bundle
- * @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_Bundle
+ * @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)
*/
/**
@@ -185,4 +185,4 @@ public function getParentIdsByChild($childId)
return $parentIds;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Bundle/Model/Mysql4/Selection/Collection.php b/app/code/core/Mage/Bundle/Model/Mysql4/Selection/Collection.php
index d26cfb3ffc..7548258ded 100644
--- a/app/code/core/Mage/Bundle/Model/Mysql4/Selection/Collection.php
+++ b/app/code/core/Mage/Bundle/Model/Mysql4/Selection/Collection.php
@@ -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_Bundle
- * @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_Bundle
+ * @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)
*/
diff --git a/app/code/core/Mage/Bundle/Model/Observer.php b/app/code/core/Mage/Bundle/Model/Observer.php
index 3385a8367e..816018ff8a 100644
--- a/app/code/core/Mage/Bundle/Model/Observer.php
+++ b/app/code/core/Mage/Bundle/Model/Observer.php
@@ -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_Bundle
- * @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)
+ * @category Mage
+ * @package Mage_Bundle
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Bundle/Model/Option.php b/app/code/core/Mage/Bundle/Model/Option.php
index 748c3481ab..c9d1d5b362 100644
--- a/app/code/core/Mage/Bundle/Model/Option.php
+++ b/app/code/core/Mage/Bundle/Model/Option.php
@@ -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_Bundle
- * @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_Bundle
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Bundle/Model/Price/Index.php b/app/code/core/Mage/Bundle/Model/Price/Index.php
index 7cf2f82d90..413b3eabd3 100644
--- a/app/code/core/Mage/Bundle/Model/Price/Index.php
+++ b/app/code/core/Mage/Bundle/Model/Price/Index.php
@@ -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_Bundle
- * @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)
+ * @category Mage
+ * @package Mage_Bundle
+ * @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)
*/
diff --git a/app/code/core/Mage/Bundle/Model/Product/Attribute/Source/Price/View.php b/app/code/core/Mage/Bundle/Model/Product/Attribute/Source/Price/View.php
index 300b9103a4..202a48649f 100644
--- a/app/code/core/Mage/Bundle/Model/Product/Attribute/Source/Price/View.php
+++ b/app/code/core/Mage/Bundle/Model/Product/Attribute/Source/Price/View.php
@@ -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_Bundle
- * @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_Bundle
+ * @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)
*/
@@ -97,4 +97,4 @@ public function getFlatUpdateSelect($store)
return Mage::getResourceModel('eav/entity_attribute_option')
->getFlatUpdateSelect($this->getAttribute(), $store, false);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Bundle/Model/Product/Price.php b/app/code/core/Mage/Bundle/Model/Product/Price.php
index af393313e2..a23072c48a 100644
--- a/app/code/core/Mage/Bundle/Model/Product/Price.php
+++ b/app/code/core/Mage/Bundle/Model/Product/Price.php
@@ -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_Bundle
- * @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_Bundle
+ * @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)
*/
/**
@@ -557,7 +557,7 @@ public static function calculatePrice($basePrice, $specialPrice, $specialPriceFr
public static function calculateSpecialPrice($finalPrice, $specialPrice, $specialPriceFrom, $specialPriceTo, $store = null)
{
if (!is_null($specialPrice) && $specialPrice != false) {
- if (Mage::app()->getLocale()->IsStoreDateInInterval($store, $specialPriceFrom, $specialPriceTo)) {
+ if (Mage::app()->getLocale()->isStoreDateInInterval($store, $specialPriceFrom, $specialPriceTo)) {
$specialPrice = ($finalPrice * $specialPrice) / 100;
$finalPrice = min($finalPrice, $specialPrice);
}
diff --git a/app/code/core/Mage/Bundle/Model/Product/Type.php b/app/code/core/Mage/Bundle/Model/Product/Type.php
index 51a72b4dab..328f2c5174 100644
--- a/app/code/core/Mage/Bundle/Model/Product/Type.php
+++ b/app/code/core/Mage/Bundle/Model/Product/Type.php
@@ -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_Bundle
- * @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_Bundle
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Abstract.php b/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Abstract.php
index e00070b470..6f7c63d740 100644
--- a/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Abstract.php
+++ b/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Abstract.php
@@ -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_Bundle
- * @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)
+ * @category Mage
+ * @package Mage_Bundle
+ * @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)
*/
diff --git a/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Creditmemo.php b/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Creditmemo.php
index 980f1dbb82..5101decb93 100644
--- a/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Creditmemo.php
+++ b/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Creditmemo.php
@@ -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_Sales
- * @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)
+ * @category Mage
+ * @package Mage_Bundle
+ * @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)
*/
diff --git a/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Invoice.php b/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Invoice.php
index 2881f1d68d..ba051a4a8a 100644
--- a/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Invoice.php
+++ b/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Invoice.php
@@ -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_Sales
- * @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)
+ * @category Mage
+ * @package Mage_Bundle
+ * @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)
*/
diff --git a/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Shipment.php b/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Shipment.php
index 1b24b04f5c..719f5521bd 100644
--- a/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Shipment.php
+++ b/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Shipment.php
@@ -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_Bundle
- * @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)
+ * @category Mage
+ * @package Mage_Bundle
+ * @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)
*/
diff --git a/app/code/core/Mage/Bundle/Model/Selection.php b/app/code/core/Mage/Bundle/Model/Selection.php
index 5437b2441e..5da46e258c 100644
--- a/app/code/core/Mage/Bundle/Model/Selection.php
+++ b/app/code/core/Mage/Bundle/Model/Selection.php
@@ -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_Bundle
- * @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_Bundle
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Bundle/Model/Source/Option/Selection/Price/Type.php b/app/code/core/Mage/Bundle/Model/Source/Option/Selection/Price/Type.php
index 81c3a4709b..157dadffd4 100644
--- a/app/code/core/Mage/Bundle/Model/Source/Option/Selection/Price/Type.php
+++ b/app/code/core/Mage/Bundle/Model/Source/Option/Selection/Price/Type.php
@@ -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_Bundle
- * @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_Bundle
+ * @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)
*/
/**
@@ -40,4 +40,4 @@ public function toOptionArray()
array('value' => '1', 'label' => Mage::helper('bundle')->__('Percent')),
);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Bundle/Model/Source/Option/Type.php b/app/code/core/Mage/Bundle/Model/Source/Option/Type.php
index 71716bd646..81a2cc69bb 100644
--- a/app/code/core/Mage/Bundle/Model/Source/Option/Type.php
+++ b/app/code/core/Mage/Bundle/Model/Source/Option/Type.php
@@ -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_Bundle
- * @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_Bundle
+ * @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)
*/
/**
@@ -49,4 +49,4 @@ public function toOptionArray()
return $types;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Bundle/controllers/Product/EditController.php b/app/code/core/Mage/Bundle/controllers/Product/EditController.php
index f5856c49bb..081b0fd619 100644
--- a/app/code/core/Mage/Bundle/controllers/Product/EditController.php
+++ b/app/code/core/Mage/Bundle/controllers/Product/EditController.php
@@ -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_Bundle
- * @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_Bundle
+ * @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)
*/
require_once 'Mage/Adminhtml/controllers/Catalog/ProductController.php';
diff --git a/app/code/core/Mage/Bundle/controllers/SelectionController.php b/app/code/core/Mage/Bundle/controllers/SelectionController.php
index 39bccfc101..b1e1d5a5dd 100644
--- a/app/code/core/Mage/Bundle/controllers/SelectionController.php
+++ b/app/code/core/Mage/Bundle/controllers/SelectionController.php
@@ -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_Bundle
- * @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_Bundle
+ * @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)
*/
/**
@@ -59,4 +59,4 @@ public function gridAction()
);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Bundle/etc/config.xml b/app/code/core/Mage/Bundle/etc/config.xml
index 91bc0279e3..547278fc81 100644
--- a/app/code/core/Mage/Bundle/etc/config.xml
+++ b/app/code/core/Mage/Bundle/etc/config.xml
@@ -19,10 +19,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_Bundle
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ * @category Mage
+ * @package Mage_Bundle
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
diff --git a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-install-0.1.0.php b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-install-0.1.0.php
index 8e39db93f3..ec42bb3499 100644
--- a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-install-0.1.0.php
+++ b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-install-0.1.0.php
@@ -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_Bundle
- * @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_Bundle
+ * @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)
*/
$installer = $this;
@@ -166,4 +166,4 @@
}
}
-$installer->endSetup();
\ No newline at end of file
+$installer->endSetup();
diff --git a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.0-0.1.1.php b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.0-0.1.1.php
index 365b00e198..1af54b1b3b 100644
--- a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.0-0.1.1.php
+++ b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.0-0.1.1.php
@@ -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_Bundle
- * @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_Bundle
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.1-0.1.2.php b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.1-0.1.2.php
index 3f72fb97ad..5d59040571 100644
--- a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.1-0.1.2.php
+++ b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.1-0.1.2.php
@@ -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_Bundle
- * @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_Bundle
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.2-0.1.3.php b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.2-0.1.3.php
index 5039e35920..082ff33e3b 100644
--- a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.2-0.1.3.php
+++ b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.2-0.1.3.php
@@ -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_Bundle
- * @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_Bundle
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.3-0.1.4.php b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.3-0.1.4.php
index 86593e4851..378503f1e5 100644
--- a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.3-0.1.4.php
+++ b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.3-0.1.4.php
@@ -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_Bundle
- * @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_Bundle
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.4-0.1.5.php b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.4-0.1.5.php
index 423812b589..4069ea5cce 100644
--- a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.4-0.1.5.php
+++ b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.4-0.1.5.php
@@ -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_Bundle
- * @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_Bundle
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.5-0.1.6.php b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.5-0.1.6.php
index b9ad19e8d4..835734aad3 100644
--- a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.5-0.1.6.php
+++ b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.5-0.1.6.php
@@ -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_Bundle
- * @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_Bundle
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.6-0.1.7.php b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.6-0.1.7.php
index 2ebecd05ba..258d4fd664 100644
--- a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.6-0.1.7.php
+++ b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.6-0.1.7.php
@@ -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_Bundle
- * @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)
+ * @category Mage
+ * @package Mage_Bundle
+ * @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)
*/
diff --git a/app/code/core/Mage/Catalog/Block/Breadcrumbs.php b/app/code/core/Mage/Catalog/Block/Breadcrumbs.php
index 9e7bfbc1d2..dd174be465 100644
--- a/app/code/core/Mage/Catalog/Block/Breadcrumbs.php
+++ b/app/code/core/Mage/Catalog/Block/Breadcrumbs.php
@@ -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_Checkout
- * @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_Catalog
+ * @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)
*/
/**
* Catalog breadcrumbs
diff --git a/app/code/core/Mage/Catalog/Block/Category/View.php b/app/code/core/Mage/Catalog/Block/Category/View.php
index 6e4e757a03..f12ac57b14 100644
--- a/app/code/core/Mage/Catalog/Block/Category/View.php
+++ b/app/code/core/Mage/Catalog/Block/Category/View.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Catalog/Block/Category/Widget/Link.php b/app/code/core/Mage/Catalog/Block/Category/Widget/Link.php
index 5d1cb5920a..ffdc4c7a46 100644
--- a/app/code/core/Mage/Catalog/Block/Category/Widget/Link.php
+++ b/app/code/core/Mage/Catalog/Block/Category/Widget/Link.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Catalog/Block/Layer/Filter/Abstract.php b/app/code/core/Mage/Catalog/Block/Layer/Filter/Abstract.php
index 3decccc25c..806a96d180 100644
--- a/app/code/core/Mage/Catalog/Block/Layer/Filter/Abstract.php
+++ b/app/code/core/Mage/Catalog/Block/Layer/Filter/Abstract.php
@@ -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_Catalog
- * @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)
+ * @category Mage
+ * @package Mage_Catalog
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Catalog/Block/Layer/Filter/Attribute.php b/app/code/core/Mage/Catalog/Block/Layer/Filter/Attribute.php
index a97886f9e8..bf6981b515 100644
--- a/app/code/core/Mage/Catalog/Block/Layer/Filter/Attribute.php
+++ b/app/code/core/Mage/Catalog/Block/Layer/Filter/Attribute.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Catalog/Block/Layer/Filter/Category.php b/app/code/core/Mage/Catalog/Block/Layer/Filter/Category.php
index 468cbadb9a..22e706d99b 100644
--- a/app/code/core/Mage/Catalog/Block/Layer/Filter/Category.php
+++ b/app/code/core/Mage/Catalog/Block/Layer/Filter/Category.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Catalog
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
diff --git a/app/code/core/Mage/Catalog/Block/Layer/Filter/Price.php b/app/code/core/Mage/Catalog/Block/Layer/Filter/Price.php
index cdc8d6e29a..6c76b8b368 100644
--- a/app/code/core/Mage/Catalog/Block/Layer/Filter/Price.php
+++ b/app/code/core/Mage/Catalog/Block/Layer/Filter/Price.php
@@ -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_Catalog
- * @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)
+ * @category Mage
+ * @package Mage_Catalog
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Catalog/Block/Layer/State.php b/app/code/core/Mage/Catalog/Block/Layer/State.php
index 7cc72dcc82..cbc79bd1ea 100644
--- a/app/code/core/Mage/Catalog/Block/Layer/State.php
+++ b/app/code/core/Mage/Catalog/Block/Layer/State.php
@@ -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_Catalog
- * @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)
+ * @category Mage
+ * @package Mage_Catalog
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Catalog/Block/Navigation.php b/app/code/core/Mage/Catalog/Block/Navigation.php
index 81a5a718b9..6b54fdb488 100644
--- a/app/code/core/Mage/Catalog/Block/Navigation.php
+++ b/app/code/core/Mage/Catalog/Block/Navigation.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
diff --git a/app/code/core/Mage/Catalog/Block/Product.php b/app/code/core/Mage/Catalog/Block/Product.php
index cfffbc7ee3..8b939f3099 100644
--- a/app/code/core/Mage/Catalog/Block/Product.php
+++ b/app/code/core/Mage/Catalog/Block/Product.php
@@ -18,50 +18,50 @@
* 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_Catalog
- * @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_Catalog
+ * @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_Catalog_Block_Product extends Mage_Core_Block_Template
{
- protected $_finalPrice = array();
+ protected $_finalPrice = array();
- public function getProduct()
- {
- if (!$this->getData('product') instanceof Mage_Catalog_Model_Product) {
- if ($this->getData('product')->getProductId()) {
- $productId = $this->getData('product')->getProductId();
- }
- if ($productId) {
- $product = Mage::getModel('catalog/product')->load($productId);
- if ($product) {
- $this->setProduct($product);
- }
- }
- }
- return $this->getData('product');
- }
+ public function getProduct()
+ {
+ if (!$this->getData('product') instanceof Mage_Catalog_Model_Product) {
+ if ($this->getData('product')->getProductId()) {
+ $productId = $this->getData('product')->getProductId();
+ }
+ if ($productId) {
+ $product = Mage::getModel('catalog/product')->load($productId);
+ if ($product) {
+ $this->setProduct($product);
+ }
+ }
+ }
+ return $this->getData('product');
+ }
- public function getPrice()
- {
- return $this->getProduct()->getPrice();
- }
+ public function getPrice()
+ {
+ return $this->getProduct()->getPrice();
+ }
- public function getFinalPrice()
- {
- if (!isset($this->_finalPrice[$this->getProduct()->getId()])) {
- $this->_finalPrice[$this->getProduct()->getId()] = $this->getProduct()->getFinalPrice();
- }
- return $this->_finalPrice[$this->getProduct()->getId()];
- }
+ public function getFinalPrice()
+ {
+ if (!isset($this->_finalPrice[$this->getProduct()->getId()])) {
+ $this->_finalPrice[$this->getProduct()->getId()] = $this->getProduct()->getFinalPrice();
+ }
+ return $this->_finalPrice[$this->getProduct()->getId()];
+ }
- public function getPriceHtml($product)
- {
- $this->setTemplate('catalog/product/price.phtml');
- $this->setProduct($product);
- return $this->toHtml();
- }
-}
\ No newline at end of file
+ public function getPriceHtml($product)
+ {
+ $this->setTemplate('catalog/product/price.phtml');
+ $this->setProduct($product);
+ return $this->toHtml();
+ }
+}
diff --git a/app/code/core/Mage/Catalog/Block/Product/Abstract.php b/app/code/core/Mage/Catalog/Block/Product/Abstract.php
index 46f2ed9f38..5d833b41f9 100644
--- a/app/code/core/Mage/Catalog/Block/Product/Abstract.php
+++ b/app/code/core/Mage/Catalog/Block/Product/Abstract.php
@@ -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_Catalog
- * @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)
+ * @category Mage
+ * @package Mage_Catalog
+ * @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)
*/
@@ -38,9 +38,29 @@ abstract class Mage_Catalog_Block_Product_Abstract extends Mage_Core_Block_Templ
protected $_priceBlockDefaultTemplate = 'catalog/product/price.phtml';
protected $_tierPriceDefaultTemplate = 'catalog/product/view/tierprices.phtml';
protected $_priceBlockTypes = array();
+ /**
+ * Flag which allow/disallow to use link for as low as price
+ *
+ * @var bool
+ */
+ protected $_useLinkForAsLowAs = true;
protected $_reviewsHelperBlock;
+ /**
+ * Default product amount per row
+ *
+ * @var int
+ */
+ protected $_defaultColumnCount = 3;
+
+ /**
+ * Product amount per row depending on custom page layout of category
+ *
+ * @var array
+ */
+ protected $_columnCountLayoutDepend = array();
+
/**
* Retrieve url for add product to cart
* Will return product view page URL if product has required options
@@ -132,6 +152,7 @@ public function getPriceHtml($product, $displayMinimalPrice = false, $idSuffix='
->setProduct($product)
->setDisplayMinimalPrice($displayMinimalPrice)
->setIdSuffix($idSuffix)
+ ->setUseLinkForAsLowAs($this->_useLinkForAsLowAs)
->toHtml();
}
@@ -343,4 +364,79 @@ public function hasProductUrl($product)
return false;
}
+
+ /**
+ * Retrieve product amount per row
+ *
+ * @return int
+ */
+ public function getColumnCount()
+ {
+ if (!$this->_getData('column_count')) {
+ $pageLayout = $this->getPageLayout();
+ if ($pageLayout && $this->getColumnCountLayoutDepend($pageLayout->getCode())) {
+ $this->setData(
+ 'column_count',
+ $this->getColumnCountLayoutDepend($pageLayout->getCode())
+ );
+ } else {
+ $this->setData('column_count', $this->_defaultColumnCount);
+ }
+ }
+
+ return (int) $this->_getData('column_count');
+ }
+
+ /**
+ * Add row size depends on page layout
+ *
+ * @param string $pageLayout
+ * @param int $rowSize
+ * @return Mage_Catalog_Block_Product_List
+ */
+ public function addColumnCountLayoutDepend($pageLayout, $columnCount)
+ {
+ $this->_columnCountLayoutDepend[$pageLayout] = $columnCount;
+ return $this;
+ }
+
+ /**
+ * Remove row size depends on page layout
+ *
+ * @param string $pageLayout
+ * @return Mage_Catalog_Block_Product_List
+ */
+ public function removeColumnCountLayoutDepend($pageLayout)
+ {
+ if (isset($this->_columnCountLayoutDepend[$pageLayout])) {
+ unset($this->_columnCountLayoutDepend[$pageLayout]);
+ }
+
+ return $this;
+ }
+
+ /**
+ * Retrieve row size depends on page layout
+ *
+ * @param string $pageLayout
+ * @return int|boolean
+ */
+ public function getColumnCountLayoutDepend($pageLayout)
+ {
+ if (isset($this->_columnCountLayoutDepend[$pageLayout])) {
+ return $this->_columnCountLayoutDepend[$pageLayout];
+ }
+
+ return false;
+ }
+
+ /**
+ * Retrieve current page layout
+ *
+ * @return Varien_Object
+ */
+ public function getPageLayout()
+ {
+ return $this->helper('page/layout')->getCurrentPageLayout();
+ }
}
diff --git a/app/code/core/Mage/Catalog/Block/Product/Compare/Abstract.php b/app/code/core/Mage/Catalog/Block/Product/Compare/Abstract.php
index f527a65e6e..e1e78947ea 100644
--- a/app/code/core/Mage/Catalog/Block/Product/Compare/Abstract.php
+++ b/app/code/core/Mage/Catalog/Block/Product/Compare/Abstract.php
@@ -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_Catalog
- * @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)
+ * @category Mage
+ * @package Mage_Catalog
+ * @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)
*/
diff --git a/app/code/core/Mage/Catalog/Block/Product/Compare/List.php b/app/code/core/Mage/Catalog/Block/Product/Compare/List.php
index 8cbe9b64b6..55b2bf226d 100644
--- a/app/code/core/Mage/Catalog/Block/Product/Compare/List.php
+++ b/app/code/core/Mage/Catalog/Block/Product/Compare/List.php
@@ -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_Catalog
- * @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)
+ * @category Mage
+ * @package Mage_Catalog
+ * @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)
*/
@@ -48,6 +48,13 @@ class Mage_Catalog_Block_Product_Compare_List extends Mage_Catalog_Block_Product
*/
protected $_attributes;
+ /**
+ * Flag which allow/disallow to use link for as low as price
+ *
+ * @var bool
+ */
+ protected $_useLinkForAsLowAs = false;
+
/**
* Retrieve url for adding product to wishlist with params
*
diff --git a/app/code/core/Mage/Catalog/Block/Product/Compare/Sidebar.php b/app/code/core/Mage/Catalog/Block/Product/Compare/Sidebar.php
index 8f21ad1802..1adf6c7368 100644
--- a/app/code/core/Mage/Catalog/Block/Product/Compare/Sidebar.php
+++ b/app/code/core/Mage/Catalog/Block/Product/Compare/Sidebar.php
@@ -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_Catalog
- * @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)
+ * @category Mage
+ * @package Mage_Catalog
+ * @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)
*/
diff --git a/app/code/core/Mage/Catalog/Block/Product/Gallery.php b/app/code/core/Mage/Catalog/Block/Product/Gallery.php
index 1982c1ff3f..02bf81eb72 100644
--- a/app/code/core/Mage/Catalog/Block/Product/Gallery.php
+++ b/app/code/core/Mage/Catalog/Block/Product/Gallery.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Catalog/Block/Product/List.php b/app/code/core/Mage/Catalog/Block/Product/List.php
index 0e2a9fe2b2..3617e82cf5 100644
--- a/app/code/core/Mage/Catalog/Block/Product/List.php
+++ b/app/code/core/Mage/Catalog/Block/Product/List.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
@@ -48,22 +48,6 @@ class Mage_Catalog_Block_Product_List extends Mage_Catalog_Block_Product_Abstrac
*/
protected $_productCollection;
- /**
- * Default product amount per row in grid display mode
- *
- * @var int
- */
- protected $_defaultColumnCount = 3;
-
- /**
- * Product amount per row in grid display mode depending
- * on custom page layout of category
- *
- * @var array
- */
- protected $_columnCountLayoutDepend = array();
-
-
/**
* Retrieve loaded category collection
*
@@ -247,79 +231,4 @@ public function prepareSortableFieldsByCategory($category) {
return $this;
}
-
- /**
- * Retrieve product amount per row in grid display mode
- *
- * @return int
- */
- public function getColumnCount()
- {
- if (!$this->_getData('column_count')) {
- $pageLayout = $this->getPageLayout();
- if ($pageLayout && $this->getColumnCountLayoutDepend($pageLayout->getCode())) {
- $this->setData(
- 'column_count',
- $this->getColumnCountLayoutDepend($pageLayout->getCode())
- );
- } else {
- $this->setData('column_count', $this->_defaultColumnCount);
- }
- }
-
- return (int) $this->_getData('column_count');
- }
-
- /**
- * Add row size depends on page layout
- *
- * @param string $pageLayout
- * @param int $rowSize
- * @return Mage_Catalog_Block_Product_List
- */
- public function addColumnCountLayoutDepend($pageLayout, $columnCount)
- {
- $this->_columnCountLayoutDepend[$pageLayout] = $columnCount;
- return $this;
- }
-
- /**
- * Remove row size depends on page layout
- *
- * @param string $pageLayout
- * @return Mage_Catalog_Block_Product_List
- */
- public function removeColumnCountLayoutDepend($pageLayout)
- {
- if (isset($this->_columnCountLayoutDepend[$pageLayout])) {
- unset($this->_columnCountLayoutDepend[$pageLayout]);
- }
-
- return $this;
- }
-
- /**
- * Retrieve row size depends on page layout
- *
- * @param string $pageLayout
- * @return int|boolean
- */
- public function getColumnCountLayoutDepend($pageLayout)
- {
- if (isset($this->_columnCountLayoutDepend[$pageLayout])) {
- return $this->_columnCountLayoutDepend[$pageLayout];
- }
-
- return false;
- }
-
- /**
- * Retrieve current page layout
- *
- * @return Varien_Object
- */
- public function getPageLayout()
- {
- return $this->helper('page/layout')->getCurrentPageLayout();
- }
}
diff --git a/app/code/core/Mage/Catalog/Block/Product/List/Crosssell.php b/app/code/core/Mage/Catalog/Block/Product/List/Crosssell.php
index 5c1a39eb6c..16ba4d4bf3 100644
--- a/app/code/core/Mage/Catalog/Block/Product/List/Crosssell.php
+++ b/app/code/core/Mage/Catalog/Block/Product/List/Crosssell.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
diff --git a/app/code/core/Mage/Catalog/Block/Product/List/Promotion.php b/app/code/core/Mage/Catalog/Block/Product/List/Promotion.php
index f6499c8655..499865129f 100755
--- a/app/code/core/Mage/Catalog/Block/Product/List/Promotion.php
+++ b/app/code/core/Mage/Catalog/Block/Product/List/Promotion.php
@@ -1,5 +1,28 @@
_productCollection;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Catalog/Block/Product/List/Random.php b/app/code/core/Mage/Catalog/Block/Product/List/Random.php
index a2b15a9999..0901c77d1f 100644
--- a/app/code/core/Mage/Catalog/Block/Product/List/Random.php
+++ b/app/code/core/Mage/Catalog/Block/Product/List/Random.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
@@ -48,4 +48,4 @@ protected function _getProductCollection()
}
return $this->_productCollection;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Catalog/Block/Product/List/Related.php b/app/code/core/Mage/Catalog/Block/Product/List/Related.php
index 7aaf41aa3a..e66961880e 100644
--- a/app/code/core/Mage/Catalog/Block/Product/List/Related.php
+++ b/app/code/core/Mage/Catalog/Block/Product/List/Related.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
@@ -73,4 +73,4 @@ public function getItems()
{
return $this->_itemCollection;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Catalog/Block/Product/List/Toolbar.php b/app/code/core/Mage/Catalog/Block/Product/List/Toolbar.php
index 2ac4c24f9f..057fb9a3c4 100644
--- a/app/code/core/Mage/Catalog/Block/Product/List/Toolbar.php
+++ b/app/code/core/Mage/Catalog/Block/Product/List/Toolbar.php
@@ -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_Catalog
- * @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)
+ * @category Mage
+ * @package Mage_Catalog
+ * @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)
*/
diff --git a/app/code/core/Mage/Catalog/Block/Product/List/Upsell.php b/app/code/core/Mage/Catalog/Block/Product/List/Upsell.php
index bd4b0b73e1..443349e989 100644
--- a/app/code/core/Mage/Catalog/Block/Product/List/Upsell.php
+++ b/app/code/core/Mage/Catalog/Block/Product/List/Upsell.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
@@ -158,4 +158,4 @@ public function getItemLimit($type = '')
return 0;
}
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Catalog/Block/Product/New.php b/app/code/core/Mage/Catalog/Block/Product/New.php
index fcd7231618..27d94b0f19 100644
--- a/app/code/core/Mage/Catalog/Block/Product/New.php
+++ b/app/code/core/Mage/Catalog/Block/Product/New.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
@@ -60,7 +60,8 @@ public function getCacheKey()
. '_' . Mage::getDesign()->getPackageName()
. '_' . Mage::getDesign()->getTheme('template')
. '_' . Mage::getSingleton('customer/session')->getCustomerGroupId()
- . '_' . md5($this->getTemplate());
+ . '_' . md5($this->getTemplate())
+ . '_' . $this->getProductsCount();
}
/**
diff --git a/app/code/core/Mage/Catalog/Block/Product/Price.php b/app/code/core/Mage/Catalog/Block/Product/Price.php
index b19d43b01d..bd8f322ad8 100644
--- a/app/code/core/Mage/Catalog/Block/Product/Price.php
+++ b/app/code/core/Mage/Catalog/Block/Product/Price.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
diff --git a/app/code/core/Mage/Catalog/Block/Product/Send.php b/app/code/core/Mage/Catalog/Block/Product/Send.php
index da1ac25fe7..92f030dbeb 100644
--- a/app/code/core/Mage/Catalog/Block/Product/Send.php
+++ b/app/code/core/Mage/Catalog/Block/Product/Send.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
@@ -34,11 +34,11 @@
*/
class Mage_Catalog_Block_Product_Send extends Mage_Catalog_Block_Product_Abstract
{
- public function __construct(){
- parent::__construct();
- }
+ public function __construct(){
+ parent::__construct();
+ }
- /**
+ /**
* Retrieve username for form field
*
* @return string
@@ -46,12 +46,12 @@ public function __construct(){
public function getUserName()
{
- return Mage::getSingleton('customer/session')->getCustomer()->getName();
+ return Mage::getSingleton('customer/session')->getCustomer()->getName();
}
public function getEmail()
{
- return (string)Mage::getSingleton('customer/session')->getCustomer()->getEmail();
+ return (string)Mage::getSingleton('customer/session')->getCustomer()->getEmail();
}
public function getProductId()
@@ -59,9 +59,9 @@ public function getProductId()
return $this->getRequest()->getParam('id');
}
- public function getMaxRecipients()
- {
- $sendToFriendModel = Mage::registry('send_to_friend_model');
- return $sendToFriendModel->getMaxRecipients();
- }
-}
\ No newline at end of file
+ public function getMaxRecipients()
+ {
+ $sendToFriendModel = Mage::registry('send_to_friend_model');
+ return $sendToFriendModel->getMaxRecipients();
+ }
+}
diff --git a/app/code/core/Mage/Catalog/Block/Product/View.php b/app/code/core/Mage/Catalog/Block/Product/View.php
index 049621f430..230bc7613d 100644
--- a/app/code/core/Mage/Catalog/Block/Product/View.php
+++ b/app/code/core/Mage/Catalog/Block/Product/View.php
@@ -1,187 +1,187 @@
-getLayout()->createBlock('catalog/breadcrumbs');
- $headBlock = $this->getLayout()->getBlock('head');
- if ($headBlock) {
- $title = $this->getProduct()->getMetaTitle();
- if ($title) {
- $headBlock->setTitle($title);
- }
- $keyword = $this->getProduct()->getMetaKeyword();
- $currentCategory = Mage::registry('current_category');
- if ($keyword) {
- $headBlock->setKeywords($keyword);
- } elseif($currentCategory) {
- $headBlock->setKeywords($this->getProduct()->getName());
- }
- $description = $this->getProduct()->getMetaDescription();
- if ($description) {
- $headBlock->setDescription( ($description) );
- } else {
- $headBlock->setDescription( $this->getProduct()->getDescription() );
- }
- }
-
- return parent::_prepareLayout();
- }
-
- /**
- * Retrieve current product model
- *
- * @return Mage_Catalog_Model_Product
- */
- public function getProduct()
- {
- if (!Mage::registry('product') && $this->getProductId()) {
- $product = Mage::getModel('catalog/product')->load($this->getProductId());
- Mage::register('product', $product);
- }
- return Mage::registry('product');
- }
-
- /**
- * Check if product can be emailed to friend
- *
- * @return bool
- */
- public function canEmailToFriend()
- {
- $sendToFriendModel = Mage::registry('send_to_friend_model');
- return $sendToFriendModel && $sendToFriendModel->canEmailToFriend();
- }
-
- /**
- * Retrieve url for direct adding product to cart
- *
- * @param Mage_Catalog_Model_Product $product
- * @param array $additional
- * @return string
- */
- public function getAddToCartUrl($product, $additional = array())
- {
- if ($this->getRequest()->getParam('wishlist_next')){
- $additional['wishlist_next'] = 1;
- }
-
- return $this->helper('checkout/cart')->getAddUrl($product, $additional);
- }
-
- /**
- * Get JSON encripted configuration array which can be used for JS dynamic
- * price calculation depending on product options
- *
- * @return string
- */
- public function getJsonConfig()
- {
- $config = array();
- if (!$this->hasOptions()) {
- return Mage::helper('core')->jsonEncode($config);
- }
-
- $_request = Mage::getSingleton('tax/calculation')->getRateRequest(false, false, false);
- $_request->setProductClassId($this->getProduct()->getTaxClassId());
- $defaultTax = Mage::getSingleton('tax/calculation')->getRate($_request);
-
- $_request = Mage::getSingleton('tax/calculation')->getRateRequest();
- $_request->setProductClassId($this->getProduct()->getTaxClassId());
- $currentTax = Mage::getSingleton('tax/calculation')->getRate($_request);
-
- $_regularPrice = $this->getProduct()->getPrice();
- $_finalPrice = $this->getProduct()->getFinalPrice();
- $_priceInclTax = Mage::helper('tax')->getPrice($this->getProduct(), $_finalPrice, true);
- $_priceExclTax = Mage::helper('tax')->getPrice($this->getProduct(), $_finalPrice);
-
- $config = array(
- 'productId' => $this->getProduct()->getId(),
- 'priceFormat' => Mage::app()->getLocale()->getJsPriceFormat(),
- 'includeTax' => Mage::helper('tax')->priceIncludesTax() ? 'true' : 'false',
- 'showIncludeTax' => Mage::helper('tax')->displayPriceIncludingTax(),
- 'showBothPrices' => Mage::helper('tax')->displayBothPrices(),
- 'productPrice' => Mage::helper('core')->currency($_finalPrice, false, false),
- 'productOldPrice' => Mage::helper('core')->currency($_regularPrice, false, false),
- 'skipCalculate' => ($_priceExclTax != $_priceInclTax ? 0 : 1),
- 'defaultTax' => $defaultTax,
- 'currentTax' => $currentTax,
- 'idSuffix' => '_clone',
- 'oldPlusDisposition' => 0,
- 'plusDisposition' => 0,
- 'oldMinusDisposition' => 0,
- 'minusDisposition' => 0,
- );
-
- $responseObject = new Varien_Object();
- Mage::dispatchEvent('catalog_product_view_config', array('response_object'=>$responseObject));
- if (is_array($responseObject->getAdditionalOptions())) {
- foreach ($responseObject->getAdditionalOptions() as $option=>$value) {
- $config[$option] = $value;
- }
- }
-
- return Mage::helper('core')->jsonEncode($config);
- }
-
- /**
- * Return true if product has options
- *
- * @return bool
- */
- public function hasOptions()
- {
- if ($this->getProduct()->getTypeInstance(true)->hasOptions($this->getProduct())) {
- return true;
- }
- return false;
- }
-
- /**
- * Check if product has required options
- *
- * @return bool
- */
- public function hasRequiredOptions()
- {
- return $this->getProduct()->getTypeInstance(true)->hasRequiredOptions($this->getProduct());
- }
-}
+getLayout()->createBlock('catalog/breadcrumbs');
+ $headBlock = $this->getLayout()->getBlock('head');
+ if ($headBlock) {
+ $title = $this->getProduct()->getMetaTitle();
+ if ($title) {
+ $headBlock->setTitle($title);
+ }
+ $keyword = $this->getProduct()->getMetaKeyword();
+ $currentCategory = Mage::registry('current_category');
+ if ($keyword) {
+ $headBlock->setKeywords($keyword);
+ } elseif($currentCategory) {
+ $headBlock->setKeywords($this->getProduct()->getName());
+ }
+ $description = $this->getProduct()->getMetaDescription();
+ if ($description) {
+ $headBlock->setDescription( ($description) );
+ } else {
+ $headBlock->setDescription( $this->getProduct()->getDescription() );
+ }
+ }
+
+ return parent::_prepareLayout();
+ }
+
+ /**
+ * Retrieve current product model
+ *
+ * @return Mage_Catalog_Model_Product
+ */
+ public function getProduct()
+ {
+ if (!Mage::registry('product') && $this->getProductId()) {
+ $product = Mage::getModel('catalog/product')->load($this->getProductId());
+ Mage::register('product', $product);
+ }
+ return Mage::registry('product');
+ }
+
+ /**
+ * Check if product can be emailed to friend
+ *
+ * @return bool
+ */
+ public function canEmailToFriend()
+ {
+ $sendToFriendModel = Mage::registry('send_to_friend_model');
+ return $sendToFriendModel && $sendToFriendModel->canEmailToFriend();
+ }
+
+ /**
+ * Retrieve url for direct adding product to cart
+ *
+ * @param Mage_Catalog_Model_Product $product
+ * @param array $additional
+ * @return string
+ */
+ public function getAddToCartUrl($product, $additional = array())
+ {
+ if ($this->getRequest()->getParam('wishlist_next')){
+ $additional['wishlist_next'] = 1;
+ }
+
+ return $this->helper('checkout/cart')->getAddUrl($product, $additional);
+ }
+
+ /**
+ * Get JSON encripted configuration array which can be used for JS dynamic
+ * price calculation depending on product options
+ *
+ * @return string
+ */
+ public function getJsonConfig()
+ {
+ $config = array();
+ if (!$this->hasOptions()) {
+ return Mage::helper('core')->jsonEncode($config);
+ }
+
+ $_request = Mage::getSingleton('tax/calculation')->getRateRequest(false, false, false);
+ $_request->setProductClassId($this->getProduct()->getTaxClassId());
+ $defaultTax = Mage::getSingleton('tax/calculation')->getRate($_request);
+
+ $_request = Mage::getSingleton('tax/calculation')->getRateRequest();
+ $_request->setProductClassId($this->getProduct()->getTaxClassId());
+ $currentTax = Mage::getSingleton('tax/calculation')->getRate($_request);
+
+ $_regularPrice = $this->getProduct()->getPrice();
+ $_finalPrice = $this->getProduct()->getFinalPrice();
+ $_priceInclTax = Mage::helper('tax')->getPrice($this->getProduct(), $_finalPrice, true);
+ $_priceExclTax = Mage::helper('tax')->getPrice($this->getProduct(), $_finalPrice);
+
+ $config = array(
+ 'productId' => $this->getProduct()->getId(),
+ 'priceFormat' => Mage::app()->getLocale()->getJsPriceFormat(),
+ 'includeTax' => Mage::helper('tax')->priceIncludesTax() ? 'true' : 'false',
+ 'showIncludeTax' => Mage::helper('tax')->displayPriceIncludingTax(),
+ 'showBothPrices' => Mage::helper('tax')->displayBothPrices(),
+ 'productPrice' => Mage::helper('core')->currency($_finalPrice, false, false),
+ 'productOldPrice' => Mage::helper('core')->currency($_regularPrice, false, false),
+ 'skipCalculate' => ($_priceExclTax != $_priceInclTax ? 0 : 1),
+ 'defaultTax' => $defaultTax,
+ 'currentTax' => $currentTax,
+ 'idSuffix' => '_clone',
+ 'oldPlusDisposition' => 0,
+ 'plusDisposition' => 0,
+ 'oldMinusDisposition' => 0,
+ 'minusDisposition' => 0,
+ );
+
+ $responseObject = new Varien_Object();
+ Mage::dispatchEvent('catalog_product_view_config', array('response_object'=>$responseObject));
+ if (is_array($responseObject->getAdditionalOptions())) {
+ foreach ($responseObject->getAdditionalOptions() as $option=>$value) {
+ $config[$option] = $value;
+ }
+ }
+
+ return Mage::helper('core')->jsonEncode($config);
+ }
+
+ /**
+ * Return true if product has options
+ *
+ * @return bool
+ */
+ public function hasOptions()
+ {
+ if ($this->getProduct()->getTypeInstance(true)->hasOptions($this->getProduct())) {
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * Check if product has required options
+ *
+ * @return bool
+ */
+ public function hasRequiredOptions()
+ {
+ return $this->getProduct()->getTypeInstance(true)->hasRequiredOptions($this->getProduct());
+ }
+}
diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Abstract.php b/app/code/core/Mage/Catalog/Block/Product/View/Abstract.php
index 7162f272ac..a7341999a0 100644
--- a/app/code/core/Mage/Catalog/Block/Product/View/Abstract.php
+++ b/app/code/core/Mage/Catalog/Block/Product/View/Abstract.php
@@ -1,51 +1,51 @@
-
- */
-abstract class Mage_Catalog_Block_Product_View_Abstract extends Mage_Catalog_Block_Product_Abstract
-{
- /**
- * Retrive product
- *
- * @return Mage_Catalog_Model_Product
- */
- public function getProduct()
- {
- $product = parent::getProduct();
- if (is_null($product->getTypeInstance(true)->getStoreFilter($product))) {
- $product->getTypeInstance(true)->setStoreFilter(Mage::app()->getStore(), $product);
- }
-
- return $product;
- }
-
-}
+
+ */
+abstract class Mage_Catalog_Block_Product_View_Abstract extends Mage_Catalog_Block_Product_Abstract
+{
+ /**
+ * Retrive product
+ *
+ * @return Mage_Catalog_Model_Product
+ */
+ public function getProduct()
+ {
+ $product = parent::getProduct();
+ if (is_null($product->getTypeInstance(true)->getStoreFilter($product))) {
+ $product->getTypeInstance(true)->setStoreFilter(Mage::app()->getStore(), $product);
+ }
+
+ return $product;
+ }
+
+}
diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Additional.php b/app/code/core/Mage/Catalog/Block/Product/View/Additional.php
index 40ebf63d28..7265802644 100644
--- a/app/code/core/Mage/Catalog/Block/Product/View/Additional.php
+++ b/app/code/core/Mage/Catalog/Block/Product/View/Additional.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Attributes.php b/app/code/core/Mage/Catalog/Block/Product/View/Attributes.php
index 7af29b7012..3ea502b58e 100644
--- a/app/code/core/Mage/Catalog/Block/Product/View/Attributes.php
+++ b/app/code/core/Mage/Catalog/Block/Product/View/Attributes.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
@@ -81,4 +81,4 @@ public function getAdditionalData(array $excludeAttr = array())
}
return $data;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Description.php b/app/code/core/Mage/Catalog/Block/Product/View/Description.php
index 4ba7c0c520..5c1a76ac8f 100644
--- a/app/code/core/Mage/Catalog/Block/Product/View/Description.php
+++ b/app/code/core/Mage/Catalog/Block/Product/View/Description.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
@@ -43,4 +43,4 @@ function getProduct()
}
return $this->_product;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Media.php b/app/code/core/Mage/Catalog/Block/Product/View/Media.php
index 14e3b9b3be..707894f344 100644
--- a/app/code/core/Mage/Catalog/Block/Product/View/Media.php
+++ b/app/code/core/Mage/Catalog/Block/Product/View/Media.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
@@ -58,4 +58,4 @@ public function disableGallery()
{
$this->_isGalleryDisabled = true;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Options.php b/app/code/core/Mage/Catalog/Block/Product/View/Options.php
index 318e843ef9..c1af9e408f 100644
--- a/app/code/core/Mage/Catalog/Block/Product/View/Options.php
+++ b/app/code/core/Mage/Catalog/Block/Product/View/Options.php
@@ -1,180 +1,180 @@
-
- */
-class Mage_Catalog_Block_Product_View_Options extends Mage_Core_Block_Template
-{
- protected $_product;
-
- protected $_optionRenders = array();
-
- public function __construct()
- {
- parent::__construct();
- $this->addOptionRenderer(
- 'default',
- 'catalog/product_view_options_type_default',
- 'catalog/product/view/options/type/default.phtml'
- );
- }
-
- /**
- * Retrieve product object
- *
- * @return Mage_Catalog_Model_Product
- */
- public function getProduct()
- {
- if (!$this->_product) {
- if (Mage::registry('product')) {
- $this->_product = Mage::registry('current_product');
- } else {
- $this->_product = Mage::getSingleton('catalog/product');
- }
- }
- return $this->_product;
- }
-
- /**
- * Set product object
- *
- * @param Mage_Catalog_Model_Product $product
- * @return Mage_Catalog_Block_Product_View_Options
- */
- public function setProduct(Mage_Catalog_Model_Product $product = null)
- {
- $this->_product = $product;
- return $this;
- }
-
- /**
- * Add option renderer to renderers array
- *
- * @param string $type
- * @param string $block
- * @param string $template
- * @return Mage_Catalog_Block_Product_View_Options
- */
- public function addOptionRenderer($type, $block, $template)
- {
- $this->_optionRenders[$type] = array(
- 'block' => $block,
- 'template' => $template,
- 'renderer' => null
- );
- return $this;
- }
-
- /**
- * Get option render by given type
- *
- * @param string $type
- * @return array
- */
- public function getOptionRender($type)
- {
- if (isset($this->_optionRenders[$type])) {
- return $this->_optionRenders[$type];
- }
-
- return $this->_optionRenders['default'];
- }
-
- public function getGroupOfOption($type)
- {
- $group = Mage::getSingleton('catalog/product_option')->getGroupByType($type);
-
- return $group == '' ? 'default' : $group;
- }
-
- /**
- * Get product options
- *
- * @return array
- */
- public function getOptions()
- {
- return $this->getProduct()->getOptions();
- }
-
- public function hasOptions()
- {
- if ($this->getOptions()) {
- return true;
- }
- return false;
- }
-
- public function getJsonConfig()
- {
- $config = array();
-
- foreach ($this->getOptions() as $option) {
- /* @var $option Mage_Catalog_Model_Product_Option */
- $priceValue = 0;
- if ($option->getGroupByType() == Mage_Catalog_Model_Product_Option::OPTION_GROUP_SELECT) {
- $_tmpPriceValues = array();
- foreach ($option->getValues() as $value) {
- /* @var $value Mage_Catalog_Model_Product_Option_Value */
- $_tmpPriceValues[$value->getId()] = Mage::helper('core')->currency($value->getPrice(true), false, false);
- }
- $priceValue = $_tmpPriceValues;
- } else {
- $priceValue = Mage::helper('core')->currency($option->getPrice(), false, false);
- }
- $config[$option->getId()] = $priceValue;
- }
-
- return Mage::helper('core')->jsonEncode($config);
- }
-
- /**
- * Get option html block
- *
- * @param Mage_Catalog_Model_Product_Option $option
- */
- public function getOptionHtml(Mage_Catalog_Model_Product_Option $option)
- {
- $renderer = $this->getOptionRender(
- $this->getGroupOfOption($option->getType())
- );
- if (is_null($renderer['renderer'])) {
- $renderer['renderer'] = $this->getLayout()->createBlock($renderer['block'])
- ->setTemplate($renderer['template']);
- }
- return $renderer['renderer']
- ->setProduct($this->getProduct())
- ->setOption($option)
- ->toHtml();
- }
-}
\ No newline at end of file
+
+ */
+class Mage_Catalog_Block_Product_View_Options extends Mage_Core_Block_Template
+{
+ protected $_product;
+
+ protected $_optionRenders = array();
+
+ public function __construct()
+ {
+ parent::__construct();
+ $this->addOptionRenderer(
+ 'default',
+ 'catalog/product_view_options_type_default',
+ 'catalog/product/view/options/type/default.phtml'
+ );
+ }
+
+ /**
+ * Retrieve product object
+ *
+ * @return Mage_Catalog_Model_Product
+ */
+ public function getProduct()
+ {
+ if (!$this->_product) {
+ if (Mage::registry('product')) {
+ $this->_product = Mage::registry('current_product');
+ } else {
+ $this->_product = Mage::getSingleton('catalog/product');
+ }
+ }
+ return $this->_product;
+ }
+
+ /**
+ * Set product object
+ *
+ * @param Mage_Catalog_Model_Product $product
+ * @return Mage_Catalog_Block_Product_View_Options
+ */
+ public function setProduct(Mage_Catalog_Model_Product $product = null)
+ {
+ $this->_product = $product;
+ return $this;
+ }
+
+ /**
+ * Add option renderer to renderers array
+ *
+ * @param string $type
+ * @param string $block
+ * @param string $template
+ * @return Mage_Catalog_Block_Product_View_Options
+ */
+ public function addOptionRenderer($type, $block, $template)
+ {
+ $this->_optionRenders[$type] = array(
+ 'block' => $block,
+ 'template' => $template,
+ 'renderer' => null
+ );
+ return $this;
+ }
+
+ /**
+ * Get option render by given type
+ *
+ * @param string $type
+ * @return array
+ */
+ public function getOptionRender($type)
+ {
+ if (isset($this->_optionRenders[$type])) {
+ return $this->_optionRenders[$type];
+ }
+
+ return $this->_optionRenders['default'];
+ }
+
+ public function getGroupOfOption($type)
+ {
+ $group = Mage::getSingleton('catalog/product_option')->getGroupByType($type);
+
+ return $group == '' ? 'default' : $group;
+ }
+
+ /**
+ * Get product options
+ *
+ * @return array
+ */
+ public function getOptions()
+ {
+ return $this->getProduct()->getOptions();
+ }
+
+ public function hasOptions()
+ {
+ if ($this->getOptions()) {
+ return true;
+ }
+ return false;
+ }
+
+ public function getJsonConfig()
+ {
+ $config = array();
+
+ foreach ($this->getOptions() as $option) {
+ /* @var $option Mage_Catalog_Model_Product_Option */
+ $priceValue = 0;
+ if ($option->getGroupByType() == Mage_Catalog_Model_Product_Option::OPTION_GROUP_SELECT) {
+ $_tmpPriceValues = array();
+ foreach ($option->getValues() as $value) {
+ /* @var $value Mage_Catalog_Model_Product_Option_Value */
+ $_tmpPriceValues[$value->getId()] = Mage::helper('core')->currency($value->getPrice(true), false, false);
+ }
+ $priceValue = $_tmpPriceValues;
+ } else {
+ $priceValue = Mage::helper('core')->currency($option->getPrice(), false, false);
+ }
+ $config[$option->getId()] = $priceValue;
+ }
+
+ return Mage::helper('core')->jsonEncode($config);
+ }
+
+ /**
+ * Get option html block
+ *
+ * @param Mage_Catalog_Model_Product_Option $option
+ */
+ public function getOptionHtml(Mage_Catalog_Model_Product_Option $option)
+ {
+ $renderer = $this->getOptionRender(
+ $this->getGroupOfOption($option->getType())
+ );
+ if (is_null($renderer['renderer'])) {
+ $renderer['renderer'] = $this->getLayout()->createBlock($renderer['block'])
+ ->setTemplate($renderer['template']);
+ }
+ return $renderer['renderer']
+ ->setProduct($this->getProduct())
+ ->setOption($option)
+ ->toHtml();
+ }
+}
diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Options/Abstract.php b/app/code/core/Mage/Catalog/Block/Product/View/Options/Abstract.php
index 13146c1050..08c6ae471a 100644
--- a/app/code/core/Mage/Catalog/Block/Product/View/Options/Abstract.php
+++ b/app/code/core/Mage/Catalog/Block/Product/View/Options/Abstract.php
@@ -1,160 +1,160 @@
-
- */
-abstract class Mage_Catalog_Block_Product_View_Options_Abstract extends Mage_Core_Block_Template
-{
- /**
- * Product object
- *
- * @var Mage_Catalog_Model_Product
- */
- protected $_product;
-
- /**
- * Product option object
- *
- * @var Mage_Catalog_Model_Product_Option
- */
- protected $_option;
-
- /**
- * Set Product object
- *
- * @param Mage_Catalog_Model_Product $product
- * @return Mage_Catalog_Block_Product_View_Options_Abstract
- */
- public function setProduct(Mage_Catalog_Model_Product $product = null)
- {
- $this->_product = $product;
- return $this;
- }
-
- /**
- * Retrieve Product object
- *
- * @return Mage_Catalog_Model_Product
- */
- public function getProduct()
- {
- return $this->_product;
- }
-
- /**
- * Set option
- *
- * @param Mage_Catalog_Model_Product_Option $option
- * @return Mage_Catalog_Block_Product_View_Options_Abstract
- */
- public function setOption(Mage_Catalog_Model_Product_Option $option)
- {
- $this->_option = $option;
- return $this;
- }
-
- /**
- * Get option
- *
- * @return Mage_Catalog_Model_Product_Option
- */
- public function getOption()
- {
- return $this->_option;
- }
-
- public function getFormatedPrice()
- {
- if ($option = $this->getOption()) {
- return $this->_formatPrice(array(
- 'is_percent' => ($option->getPriceType() == 'percent') ? true : false,
- 'pricing_value' => $option->getPrice(true)
- ));
- }
- return '';
- }
-
- /**
- * Return formated price
- *
- * @param array $value
- * @return string
- */
- protected function _formatPrice($value, $flag=true)
- {
- if ($value['pricing_value'] == 0) {
- return '';
- }
- $sign = '+';
- if ($value['pricing_value'] < 0) {
- $sign = '-';
- $value['pricing_value'] = 0 - $value['pricing_value'];
- }
- $priceStr = $sign;
- $_priceInclTax = $this->getPrice($value['pricing_value'], true);
- $_priceExclTax = $this->getPrice($value['pricing_value']);
- if (Mage::helper('tax')->displayPriceIncludingTax()) {
- $priceStr .= $this->helper('core')->currency($_priceInclTax, true, $flag);
- } elseif (Mage::helper('tax')->displayPriceExcludingTax()) {
- $priceStr .= $this->helper('core')->currency($_priceExclTax, true, $flag);
- } elseif (Mage::helper('tax')->displayBothPrices()) {
- $priceStr .= $this->helper('core')->currency($_priceExclTax, true, $flag);
- if ($_priceInclTax != $_priceExclTax) {
- $priceStr .= ' ('.$sign.$this->helper('core')
- ->currency($_priceInclTax, true, $flag).' '.$this->__('Incl. Tax').')';
- }
- }
-
- if ($flag) {
- $priceStr = ''.$priceStr.'';
- }
-
- return $priceStr;
- }
-
- /**
- * Get price with including/excluding tax
- *
- * @param decimal $price
- * @param bool $includingTax
- * @return decimal
- */
- public function getPrice($price, $includingTax = null)
- {
- if (!is_null($includingTax)) {
- $price = Mage::helper('tax')->getPrice($this->getProduct(), $price, true);
- } else {
- $price = Mage::helper('tax')->getPrice($this->getProduct(), $price);
- }
- return $price;
- }
-}
\ No newline at end of file
+
+ */
+abstract class Mage_Catalog_Block_Product_View_Options_Abstract extends Mage_Core_Block_Template
+{
+ /**
+ * Product object
+ *
+ * @var Mage_Catalog_Model_Product
+ */
+ protected $_product;
+
+ /**
+ * Product option object
+ *
+ * @var Mage_Catalog_Model_Product_Option
+ */
+ protected $_option;
+
+ /**
+ * Set Product object
+ *
+ * @param Mage_Catalog_Model_Product $product
+ * @return Mage_Catalog_Block_Product_View_Options_Abstract
+ */
+ public function setProduct(Mage_Catalog_Model_Product $product = null)
+ {
+ $this->_product = $product;
+ return $this;
+ }
+
+ /**
+ * Retrieve Product object
+ *
+ * @return Mage_Catalog_Model_Product
+ */
+ public function getProduct()
+ {
+ return $this->_product;
+ }
+
+ /**
+ * Set option
+ *
+ * @param Mage_Catalog_Model_Product_Option $option
+ * @return Mage_Catalog_Block_Product_View_Options_Abstract
+ */
+ public function setOption(Mage_Catalog_Model_Product_Option $option)
+ {
+ $this->_option = $option;
+ return $this;
+ }
+
+ /**
+ * Get option
+ *
+ * @return Mage_Catalog_Model_Product_Option
+ */
+ public function getOption()
+ {
+ return $this->_option;
+ }
+
+ public function getFormatedPrice()
+ {
+ if ($option = $this->getOption()) {
+ return $this->_formatPrice(array(
+ 'is_percent' => ($option->getPriceType() == 'percent') ? true : false,
+ 'pricing_value' => $option->getPrice(true)
+ ));
+ }
+ return '';
+ }
+
+ /**
+ * Return formated price
+ *
+ * @param array $value
+ * @return string
+ */
+ protected function _formatPrice($value, $flag=true)
+ {
+ if ($value['pricing_value'] == 0) {
+ return '';
+ }
+ $sign = '+';
+ if ($value['pricing_value'] < 0) {
+ $sign = '-';
+ $value['pricing_value'] = 0 - $value['pricing_value'];
+ }
+ $priceStr = $sign;
+ $_priceInclTax = $this->getPrice($value['pricing_value'], true);
+ $_priceExclTax = $this->getPrice($value['pricing_value']);
+ if (Mage::helper('tax')->displayPriceIncludingTax()) {
+ $priceStr .= $this->helper('core')->currency($_priceInclTax, true, $flag);
+ } elseif (Mage::helper('tax')->displayPriceExcludingTax()) {
+ $priceStr .= $this->helper('core')->currency($_priceExclTax, true, $flag);
+ } elseif (Mage::helper('tax')->displayBothPrices()) {
+ $priceStr .= $this->helper('core')->currency($_priceExclTax, true, $flag);
+ if ($_priceInclTax != $_priceExclTax) {
+ $priceStr .= ' ('.$sign.$this->helper('core')
+ ->currency($_priceInclTax, true, $flag).' '.$this->__('Incl. Tax').')';
+ }
+ }
+
+ if ($flag) {
+ $priceStr = ''.$priceStr.'';
+ }
+
+ return $priceStr;
+ }
+
+ /**
+ * Get price with including/excluding tax
+ *
+ * @param decimal $price
+ * @param bool $includingTax
+ * @return decimal
+ */
+ public function getPrice($price, $includingTax = null)
+ {
+ if (!is_null($includingTax)) {
+ $price = Mage::helper('tax')->getPrice($this->getProduct(), $price, true);
+ } else {
+ $price = Mage::helper('tax')->getPrice($this->getProduct(), $price);
+ }
+ return $price;
+ }
+}
diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Date.php b/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Date.php
index d6efa96166..f567819940 100644
--- a/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Date.php
+++ b/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Date.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
@@ -204,4 +204,4 @@ protected function _getValueWithLeadingZeros($value)
}
return $value < 10 ? '0'.$value : $value;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Default.php b/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Default.php
index c67fbea8c9..5dd43cd01e 100644
--- a/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Default.php
+++ b/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Default.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
@@ -36,4 +36,4 @@ class Mage_Catalog_Block_Product_View_Options_Type_Default
extends Mage_Catalog_Block_Product_View_Options_Abstract
{
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/File.php b/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/File.php
index bc96d0fa78..fd763d9b73 100644
--- a/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/File.php
+++ b/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/File.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
@@ -36,4 +36,4 @@ class Mage_Catalog_Block_Product_View_Options_Type_File
extends Mage_Catalog_Block_Product_View_Options_Abstract
{
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Select.php b/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Select.php
index 9f44d8dd3e..ff0cabf56f 100644
--- a/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Select.php
+++ b/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Select.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
@@ -117,4 +117,4 @@ public function getValuesHtml()
}
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Text.php b/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Text.php
index c479fc8714..25a7f7498b 100644
--- a/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Text.php
+++ b/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Text.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
@@ -36,4 +36,4 @@ class Mage_Catalog_Block_Product_View_Options_Type_Text
extends Mage_Catalog_Block_Product_View_Options_Abstract
{
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Price.php b/app/code/core/Mage/Catalog/Block/Product/View/Price.php
index 63ec5bd9d6..edd25b4b51 100644
--- a/app/code/core/Mage/Catalog/Block/Product/View/Price.php
+++ b/app/code/core/Mage/Catalog/Block/Product/View/Price.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Tabs.php b/app/code/core/Mage/Catalog/Block/Product/View/Tabs.php
index 0cb43e8546..615d2f15d6 100644
--- a/app/code/core/Mage/Catalog/Block/Product/View/Tabs.php
+++ b/app/code/core/Mage/Catalog/Block/Product/View/Tabs.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
@@ -65,4 +65,4 @@ function getTabs()
{
return $this->_tabs;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Type/Configurable.php b/app/code/core/Mage/Catalog/Block/Product/View/Type/Configurable.php
index 7e17934c08..8df8134306 100644
--- a/app/code/core/Mage/Catalog/Block/Product/View/Type/Configurable.php
+++ b/app/code/core/Mage/Catalog/Block/Product/View/Type/Configurable.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
@@ -263,4 +263,4 @@ protected function _convertPrice($price, $round=false)
// }
// return $this;
// }
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Type/Grouped.php b/app/code/core/Mage/Catalog/Block/Product/View/Type/Grouped.php
index 7b21abd284..07b10fb11f 100644
--- a/app/code/core/Mage/Catalog/Block/Product/View/Type/Grouped.php
+++ b/app/code/core/Mage/Catalog/Block/Product/View/Type/Grouped.php
@@ -1,42 +1,42 @@
-
- */
-class Mage_Catalog_Block_Product_View_Type_Grouped extends Mage_Catalog_Block_Product_View_Abstract
-{
- public function getAssociatedProducts()
- {
- return $this->getProduct()->getTypeInstance(true)
- ->getAssociatedProducts($this->getProduct());
- }
-}
\ No newline at end of file
+
+ */
+class Mage_Catalog_Block_Product_View_Type_Grouped extends Mage_Catalog_Block_Product_View_Abstract
+{
+ public function getAssociatedProducts()
+ {
+ return $this->getProduct()->getTypeInstance(true)
+ ->getAssociatedProducts($this->getProduct());
+ }
+}
diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Type/Simple.php b/app/code/core/Mage/Catalog/Block/Product/View/Type/Simple.php
index 2d5465deeb..7526e2b82d 100644
--- a/app/code/core/Mage/Catalog/Block/Product/View/Type/Simple.php
+++ b/app/code/core/Mage/Catalog/Block/Product/View/Type/Simple.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
@@ -33,4 +33,4 @@
*/
class Mage_Catalog_Block_Product_View_Type_Simple extends Mage_Catalog_Block_Product_View_Abstract
{
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Type/Virtual.php b/app/code/core/Mage/Catalog/Block/Product/View/Type/Virtual.php
index 679b666e88..faef25a0d4 100644
--- a/app/code/core/Mage/Catalog/Block/Product/View/Type/Virtual.php
+++ b/app/code/core/Mage/Catalog/Block/Product/View/Type/Virtual.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
@@ -34,4 +34,4 @@
class Mage_Catalog_Block_Product_View_Type_Virtual extends Mage_Catalog_Block_Product_View_Abstract
{
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Catalog/Block/Product/Widget/Link.php b/app/code/core/Mage/Catalog/Block/Product/Widget/Link.php
index c3427cbb86..52ec36d2be 100644
--- a/app/code/core/Mage/Catalog/Block/Product/Widget/Link.php
+++ b/app/code/core/Mage/Catalog/Block/Product/Widget/Link.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Catalog/Block/Product/Widget/New.php b/app/code/core/Mage/Catalog/Block/Product/Widget/New.php
index 395772896d..830df61628 100644
--- a/app/code/core/Mage/Catalog/Block/Product/Widget/New.php
+++ b/app/code/core/Mage/Catalog/Block/Product/Widget/New.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
@@ -35,6 +35,20 @@ class Mage_Catalog_Block_Product_Widget_New
extends Mage_Catalog_Block_Product_New
implements Mage_Cms_Block_Widget_Interface
{
+ /**
+ * Internal contructor
+ *
+ */
+ protected function _construct()
+ {
+ parent::_construct();
+ $this->addColumnCountLayoutDepend('one_column', 5)
+ ->addColumnCountLayoutDepend('two_columns_left', 4)
+ ->addColumnCountLayoutDepend('two_columns_right', 4)
+ ->addColumnCountLayoutDepend('three_columns', 3);
+ $this->addPriceBlockType('bundle', 'bundle/catalog_product_price', 'bundle/catalog/product/price.phtml');
+ }
+
/**
* Retrieve how much products should be displayed.
*
diff --git a/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Abstract.php b/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Abstract.php
index 204cfbad02..0bd423343c 100644
--- a/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Abstract.php
+++ b/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Abstract.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
diff --git a/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Category.php b/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Category.php
index 6213a5242a..1fa8725b47 100644
--- a/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Category.php
+++ b/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Category.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
diff --git a/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Product.php b/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Product.php
index f71029dce6..e3d0e723cb 100644
--- a/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Product.php
+++ b/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Product.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Catalog
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
diff --git a/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Tree/Category.php b/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Tree/Category.php
index b5161e76f4..84acb72a21 100644
--- a/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Tree/Category.php
+++ b/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Tree/Category.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
diff --git a/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Tree/Pager.php b/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Tree/Pager.php
index 137463f145..f803ee3da8 100644
--- a/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Tree/Pager.php
+++ b/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Tree/Pager.php
@@ -1,180 +1,180 @@
-
- *
- * @todo separate order, mode and pager
- */
-class Mage_Catalog_Block_Seo_Sitemap_Tree_Pager extends Mage_Page_Block_Html_Pager
-{
- protected $_showPerPage = false;
- protected $lastPageNumber = 1;
- protected $_totalNum = 0;
- protected $_firstNum = 0;
- protected $_lastNum = 1;
-
- public function getCurrentPage($displacement = 0)
- {
- if ($page = (int) $this->getRequest()->getParam($this->getPageVarName()) + $displacement) {
- if ($page > $this->getLastPageNum()) {
- return $this->getLastPageNum();
- }
- return $page;
- }
- return 1;
- }
-
- public function getLimit()
- {
- $limits = $this->getAvailableLimit();
-// if ($limit = $this->getRequest()->getParam($this->getLimitVarName())) {
-// if (isset($limits[$limit])) {
-// return $limit;
-// }
-// }
- $limits = array_keys($limits);
- return $limits[0];
- }
-
- public function setCollection($collection)
- {
- $this->_collection = $collection;
-// ->setCurPage($this->getCurrentPage());
- // If not int - then not limit
-// if ((int) $this->getLimit()) {
-// $this->_collection->setPageSize($this->getLimit());
-// }
-
- return $this;
- }
-
- /**
- * @return Mage_Core_Model_Mysql4_Collection_Abstract
- */
- public function getCollection()
- {
- return $this->_collection;
- }
-
- public function getFirstNum()
- {
- return $this->_firstNum + 1;
- }
-
- public function setFirstNum($firstNum)
- {
- $this->_firstNum = $firstNum;
- return $this;
- }
-
- public function getLastNum()
- {
- return $this->_lastNum;
- }
-
- public function setLastNum($lastNum)
- {
- $this->_lastNum = $lastNum;
- return $this;
- }
-
- public function getTotalNum()
- {
- return $this->_totalNum;
- }
-
- public function setTotalNum($totalNum)
- {
- $this->_totalNum = $totalNum;
- return $this;
- }
-
- public function isFirstPage()
- {
- return $this->getCurrentPage() == 1;
- }
-
- public function getLastPageNum()
- {
- return $this->_lastPageNumber;
- }
-
- public function setLastPageNum($lastPageNum)
- {
- $this->_lastPageNumber = $lastPageNum;
- return $this;
- }
-
- public function isLastPage()
- {
- return $this->getCurrentPage() >= $this->getLastPageNum();
- }
-
- public function getPages()
- {
- $pages = array();
- if ($this->getLastPageNum() <= $this->_displayPages) {
- $pages = range(1, $this->getLastPageNum());
- } else {
- $half = ceil($this->_displayPages / 2);
- if ($this->getCurrentPage() >= $half && $this->getCurrentPage() <= $this->getLastPageNum() - $half) {
- $start = ($this->getCurrentPage() - $half) + 1;
- $finish = ($start + $this->_displayPages) - 1;
- } elseif ($this->getCurrentPage() < $half) {
- $start = 1;
- $finish = $this->_displayPages;
- } elseif ($this->getCurrentPage() > ($this->getLastPageNum() - $half)) {
- $finish = $this->getLastPageNum();
- $start = $finish - $this->_displayPages + 1;
- }
- $pages = range($start, $finish);
- }
-
- return $pages;
- }
-
- public function getPreviousPageUrl()
- {
- return $this->getPageUrl($this->getCurrentPage(-1));
- }
-
- public function getNextPageUrl()
- {
- return $this->getPageUrl($this->getCurrentPage(+1));
- }
-
- public function getLastPageUrl()
- {
- return $this->getPageUrl($this->getLastPageNum());
- }
-
-}
-
+
+ *
+ * @todo separate order, mode and pager
+ */
+class Mage_Catalog_Block_Seo_Sitemap_Tree_Pager extends Mage_Page_Block_Html_Pager
+{
+ protected $_showPerPage = false;
+ protected $lastPageNumber = 1;
+ protected $_totalNum = 0;
+ protected $_firstNum = 0;
+ protected $_lastNum = 1;
+
+ public function getCurrentPage($displacement = 0)
+ {
+ if ($page = (int) $this->getRequest()->getParam($this->getPageVarName()) + $displacement) {
+ if ($page > $this->getLastPageNum()) {
+ return $this->getLastPageNum();
+ }
+ return $page;
+ }
+ return 1;
+ }
+
+ public function getLimit()
+ {
+ $limits = $this->getAvailableLimit();
+// if ($limit = $this->getRequest()->getParam($this->getLimitVarName())) {
+// if (isset($limits[$limit])) {
+// return $limit;
+// }
+// }
+ $limits = array_keys($limits);
+ return $limits[0];
+ }
+
+ public function setCollection($collection)
+ {
+ $this->_collection = $collection;
+// ->setCurPage($this->getCurrentPage());
+ // If not int - then not limit
+// if ((int) $this->getLimit()) {
+// $this->_collection->setPageSize($this->getLimit());
+// }
+
+ return $this;
+ }
+
+ /**
+ * @return Mage_Core_Model_Mysql4_Collection_Abstract
+ */
+ public function getCollection()
+ {
+ return $this->_collection;
+ }
+
+ public function getFirstNum()
+ {
+ return $this->_firstNum + 1;
+ }
+
+ public function setFirstNum($firstNum)
+ {
+ $this->_firstNum = $firstNum;
+ return $this;
+ }
+
+ public function getLastNum()
+ {
+ return $this->_lastNum;
+ }
+
+ public function setLastNum($lastNum)
+ {
+ $this->_lastNum = $lastNum;
+ return $this;
+ }
+
+ public function getTotalNum()
+ {
+ return $this->_totalNum;
+ }
+
+ public function setTotalNum($totalNum)
+ {
+ $this->_totalNum = $totalNum;
+ return $this;
+ }
+
+ public function isFirstPage()
+ {
+ return $this->getCurrentPage() == 1;
+ }
+
+ public function getLastPageNum()
+ {
+ return $this->_lastPageNumber;
+ }
+
+ public function setLastPageNum($lastPageNum)
+ {
+ $this->_lastPageNumber = $lastPageNum;
+ return $this;
+ }
+
+ public function isLastPage()
+ {
+ return $this->getCurrentPage() >= $this->getLastPageNum();
+ }
+
+ public function getPages()
+ {
+ $pages = array();
+ if ($this->getLastPageNum() <= $this->_displayPages) {
+ $pages = range(1, $this->getLastPageNum());
+ } else {
+ $half = ceil($this->_displayPages / 2);
+ if ($this->getCurrentPage() >= $half && $this->getCurrentPage() <= $this->getLastPageNum() - $half) {
+ $start = ($this->getCurrentPage() - $half) + 1;
+ $finish = ($start + $this->_displayPages) - 1;
+ } elseif ($this->getCurrentPage() < $half) {
+ $start = 1;
+ $finish = $this->_displayPages;
+ } elseif ($this->getCurrentPage() > ($this->getLastPageNum() - $half)) {
+ $finish = $this->getLastPageNum();
+ $start = $finish - $this->_displayPages + 1;
+ }
+ $pages = range($start, $finish);
+ }
+
+ return $pages;
+ }
+
+ public function getPreviousPageUrl()
+ {
+ return $this->getPageUrl($this->getCurrentPage(-1));
+ }
+
+ public function getNextPageUrl()
+ {
+ return $this->getPageUrl($this->getCurrentPage(+1));
+ }
+
+ public function getLastPageUrl()
+ {
+ return $this->getPageUrl($this->getLastPageNum());
+ }
+
+}
+
diff --git a/app/code/core/Mage/Catalog/Block/Widget/Link.php b/app/code/core/Mage/Catalog/Block/Widget/Link.php
index b6903667d0..f952c6f251 100644
--- a/app/code/core/Mage/Catalog/Block/Widget/Link.php
+++ b/app/code/core/Mage/Catalog/Block/Widget/Link.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
@@ -57,9 +57,10 @@ class Mage_Catalog_Block_Widget_Link
protected $_anchorText;
/**
- * Prepare url using passed id path.
+ * Prepare url using passed id path and return it
+ * or return false if path was not found in url rewrites.
*
- * @return string
+ * @return string|false
*/
public function getHref()
{
@@ -68,9 +69,12 @@ public function getHref()
/* @var $store Mage_Core_Model_Store */
$href = "";
if ($this->getData('id_path')) {
- $urlRewriteResource = Mage::getResourceSingleton('core/url_rewrite');
/* @var $urlRewriteResource Mage_Core_Model_Mysql4_Url_Rewrite */
+ $urlRewriteResource = Mage::getResourceSingleton('core/url_rewrite');
$href = $urlRewriteResource->getRequestPathByIdPath($this->getData('id_path'), $store);
+ if (!$href) {
+ return false;
+ }
}
$this->_href = $store->getUrl('', array('_direct' => $href));
@@ -90,9 +94,11 @@ public function getAnchorText()
if (!$this->_anchorText && $this->_entityResource) {
if (!$this->getData('anchor_text')) {
$idPath = explode('/', $this->_getData('id_path'));
- $id = array_pop($idPath);
- if ($id) {
- $this->_anchorText = $this->_entityResource->getAttributeRawValue($id, 'name', Mage::app()->getStore());
+ if (isset($idPath[1])) {
+ $id = $idPath[1];
+ if ($id) {
+ $this->_anchorText = $this->_entityResource->getAttributeRawValue($id, 'name', Mage::app()->getStore());
+ }
}
} else {
$this->_anchorText = $this->getData('anchor_text');
@@ -101,4 +107,18 @@ public function getAnchorText()
return $this->_anchorText;
}
+
+ /**
+ * Render block HTML
+ * or return empty string if url can't be prepared
+ *
+ * @return string
+ */
+ protected function _toHtml()
+ {
+ if ($this->getHref()) {
+ return parent::_toHtml();
+ }
+ return '';
+ }
}
diff --git a/app/code/core/Mage/Catalog/Exception.php b/app/code/core/Mage/Catalog/Exception.php
index 24a8e4675c..8870a9e8a8 100644
--- a/app/code/core/Mage/Catalog/Exception.php
+++ b/app/code/core/Mage/Catalog/Exception.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
@@ -30,4 +30,4 @@
class Mage_Catalog_Exception extends Zend_Exception
{
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Catalog/Helper/Category.php b/app/code/core/Mage/Catalog/Helper/Category.php
index 28ac963dfb..2df19c9fdf 100644
--- a/app/code/core/Mage/Catalog/Helper/Category.php
+++ b/app/code/core/Mage/Catalog/Helper/Category.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Catalog/Helper/Category/Flat.php b/app/code/core/Mage/Catalog/Helper/Category/Flat.php
index 9feea72b27..13850c6523 100644
--- a/app/code/core/Mage/Catalog/Helper/Category/Flat.php
+++ b/app/code/core/Mage/Catalog/Helper/Category/Flat.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
@@ -71,4 +71,4 @@ public function isBuilt()
{
return $this->isEnabled(true);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Catalog/Helper/Data.php b/app/code/core/Mage/Catalog/Helper/Data.php
index e4ca699f79..e908766a43 100644
--- a/app/code/core/Mage/Catalog/Helper/Data.php
+++ b/app/code/core/Mage/Catalog/Helper/Data.php
@@ -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_Catalog
- * @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)
+ * @category Mage
+ * @package Mage_Catalog
+ * @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)
*/
diff --git a/app/code/core/Mage/Catalog/Helper/Image.php b/app/code/core/Mage/Catalog/Helper/Image.php
index fb77b2e3ed..fc4e4ce3cc 100644
--- a/app/code/core/Mage/Catalog/Helper/Image.php
+++ b/app/code/core/Mage/Catalog/Helper/Image.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
@@ -483,4 +483,4 @@ public function getOriginalSizeArray()
$this->getOriginalHeight()
);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Catalog/Helper/Map.php b/app/code/core/Mage/Catalog/Helper/Map.php
index cf6dcb58e9..9953991a2c 100644
--- a/app/code/core/Mage/Catalog/Helper/Map.php
+++ b/app/code/core/Mage/Catalog/Helper/Map.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Catalog/Helper/Output.php b/app/code/core/Mage/Catalog/Helper/Output.php
index 8731603b7a..a610481f2d 100644
--- a/app/code/core/Mage/Catalog/Helper/Output.php
+++ b/app/code/core/Mage/Catalog/Helper/Output.php
@@ -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_Catalog
- * @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_Catalog
+ * @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_Catalog_Helper_Output extends Mage_Core_Helper_Abstract
@@ -83,9 +83,9 @@ public function getHandlers($method)
public function process($method, $result, $params)
{
foreach ($this->getHandlers($method) as $handler) {
- if (method_exists($handler, $method)) {
+ if (method_exists($handler, $method)) {
$result = $handler->$method($this, $result, $params);
- }
+ }
}
return $result;
}
@@ -123,4 +123,4 @@ public function categoryAttribute($category, $attributeHtml, $attributeName)
));
return $attributeHtml;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Catalog/Helper/Product.php b/app/code/core/Mage/Catalog/Helper/Product.php
index 9937308bb5..eacb41e216 100644
--- a/app/code/core/Mage/Catalog/Helper/Product.php
+++ b/app/code/core/Mage/Catalog/Helper/Product.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
@@ -187,4 +187,4 @@ public function getProductUrlSuffix($storeId = null)
}
return $this->_productUrlSuffix[$storeId];
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Catalog/Helper/Product/Compare.php b/app/code/core/Mage/Catalog/Helper/Product/Compare.php
index 1fc5dec88d..d07402d9e8 100644
--- a/app/code/core/Mage/Catalog/Helper/Product/Compare.php
+++ b/app/code/core/Mage/Catalog/Helper/Product/Compare.php
@@ -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_Catalog
- * @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)
+ * @category Mage
+ * @package Mage_Catalog
+ * @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)
*/
diff --git a/app/code/core/Mage/Catalog/Helper/Product/Flat.php b/app/code/core/Mage/Catalog/Helper/Product/Flat.php
index 24d7d3a8ed..85de26c6f5 100644
--- a/app/code/core/Mage/Catalog/Helper/Product/Flat.php
+++ b/app/code/core/Mage/Catalog/Helper/Product/Flat.php
@@ -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_Catalog
- * @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)
+ * @category Mage
+ * @package Mage_Catalog
+ * @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)
*/
diff --git a/app/code/core/Mage/Catalog/Helper/Product/Options.php b/app/code/core/Mage/Catalog/Helper/Product/Options.php
index c5d0ec9151..f07100e0cd 100644
--- a/app/code/core/Mage/Catalog/Helper/Product/Options.php
+++ b/app/code/core/Mage/Catalog/Helper/Product/Options.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
@@ -34,4 +34,4 @@
*/
class Mage_Catalog_Helper_Product_Options extends Mage_Core_Helper_Abstract
{
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Catalog/Helper/Product/Url.php b/app/code/core/Mage/Catalog/Helper/Product/Url.php
index d5a02caca3..7bb20de1ea 100644
--- a/app/code/core/Mage/Catalog/Helper/Product/Url.php
+++ b/app/code/core/Mage/Catalog/Helper/Product/Url.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
@@ -128,4 +128,4 @@ public function format($string)
{
return strtr($string, $this->getConvertTable());
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Catalog/Model/Abstract.php b/app/code/core/Mage/Catalog/Model/Abstract.php
index c0d9ccf1cb..16568ada9f 100644
--- a/app/code/core/Mage/Catalog/Model/Abstract.php
+++ b/app/code/core/Mage/Catalog/Model/Abstract.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Catalog/Model/Api/Resource.php b/app/code/core/Mage/Catalog/Model/Api/Resource.php
index e7789d15e6..eb3a990e60 100644
--- a/app/code/core/Mage/Catalog/Model/Api/Resource.php
+++ b/app/code/core/Mage/Catalog/Model/Api/Resource.php
@@ -1,151 +1,151 @@
-
- */
-class Mage_Catalog_Model_Api_Resource extends Mage_Api_Model_Resource_Abstract
-{
- /**
- * Default ignored attribute codes
- *
- * @var array
- */
- protected $_ignoredAttributeCodes = array('entity_id', 'attribute_set_id', 'entity_type_id');
-
- /**
- * Default ignored attribute types
- *
- * @var array
- */
- protected $_ignoredAttributeTypes = array();
-
- /**
- * Field name in session for saving store id
- * @var string
- */
- protected $_storeIdSessionField = 'store_id';
-
- /**
- * Check is attribute allowed
- *
- * @param Mage_Eav_Model_Entity_Attribute_Abstract $attribute
- * @param array $attributes
- * @return boolean
- */
- protected function _isAllowedAttribute($attribute, $attributes = null)
- {
- if (is_array($attributes)
- && !( in_array($attribute->getAttributeCode(), $attributes)
- || in_array($attribute->getAttributeId(), $attributes))) {
- return false;
- }
-
- return !in_array($attribute->getFrontendInput(), $this->_ignoredAttributeTypes)
- && !in_array($attribute->getAttributeCode(), $this->_ignoredAttributeCodes);
- }
-
- /**
- * Retrives store id from store code, if no store id specified,
- * it use seted session or admin store
- *
- * @param string|int $store
- * @return int
- */
- protected function _getStoreId($store = null)
- {
- if (is_null($store)) {
- $store = ($this->_getSession()->hasData($this->_storeIdSessionField)
- ? $this->_getSession()->getData($this->_storeIdSessionField) : 0);
- }
-
- try {
- $storeId = Mage::app()->getStore($store)->getId();
- } catch (Mage_Core_Model_Store_Exception $e) {
- $this->_fault('store_not_exists');
- }
-
- return $storeId;
- }
-
- /**
- * Return loaded product instance
- *
- * @param int|string $productId (SKU or ID)
- * @param int|string $store
- * @return Mage_Catalog_Model_Product
- */
- protected function _getProduct($productId, $store = null, $identifierType = null)
- {
- $loadByIdOnFalse = false;
- if ($identifierType === null) {
- $identifierType = 'sku';
- $loadByIdOnFalse = true;
- }
- $product = Mage::getModel('catalog/product');
- if ($store !== null) {
- $product->setStoreId($this->_getStoreId($store));
- }
- /* @var $product Mage_Catalog_Model_Product */
- if ($identifierType == 'sku') {
- $idBySku = $product->getIdBySku($productId);
- if ($idBySku) {
- $productId = $idBySku;
- }
- if ($idBySku || $loadByIdOnFalse) {
- $product->load($productId);
- }
- } elseif ($identifierType == 'id') {
- $product->load($productId);
- }
- return $product;
- }
-
- /**
- * Set current store for catalog.
- *
- * @param string|int $store
- * @return int
- */
- public function currentStore($store=null)
- {
- if (!is_null($store)) {
- try {
- $storeId = Mage::app()->getStore($store)->getId();
- } catch (Mage_Core_Model_Store_Exception $e) {
- $this->_fault('store_not_exists');
- }
-
- $this->_getSession()->setData($this->_storeIdSessionField, $storeId);
- }
-
- return $this->_getStoreId();
- }
-} // Class Mage_Catalog_Model_Api_Resource End
\ No newline at end of file
+
+ */
+class Mage_Catalog_Model_Api_Resource extends Mage_Api_Model_Resource_Abstract
+{
+ /**
+ * Default ignored attribute codes
+ *
+ * @var array
+ */
+ protected $_ignoredAttributeCodes = array('entity_id', 'attribute_set_id', 'entity_type_id');
+
+ /**
+ * Default ignored attribute types
+ *
+ * @var array
+ */
+ protected $_ignoredAttributeTypes = array();
+
+ /**
+ * Field name in session for saving store id
+ * @var string
+ */
+ protected $_storeIdSessionField = 'store_id';
+
+ /**
+ * Check is attribute allowed
+ *
+ * @param Mage_Eav_Model_Entity_Attribute_Abstract $attribute
+ * @param array $attributes
+ * @return boolean
+ */
+ protected function _isAllowedAttribute($attribute, $attributes = null)
+ {
+ if (is_array($attributes)
+ && !( in_array($attribute->getAttributeCode(), $attributes)
+ || in_array($attribute->getAttributeId(), $attributes))) {
+ return false;
+ }
+
+ return !in_array($attribute->getFrontendInput(), $this->_ignoredAttributeTypes)
+ && !in_array($attribute->getAttributeCode(), $this->_ignoredAttributeCodes);
+ }
+
+ /**
+ * Retrives store id from store code, if no store id specified,
+ * it use seted session or admin store
+ *
+ * @param string|int $store
+ * @return int
+ */
+ protected function _getStoreId($store = null)
+ {
+ if (is_null($store)) {
+ $store = ($this->_getSession()->hasData($this->_storeIdSessionField)
+ ? $this->_getSession()->getData($this->_storeIdSessionField) : 0);
+ }
+
+ try {
+ $storeId = Mage::app()->getStore($store)->getId();
+ } catch (Mage_Core_Model_Store_Exception $e) {
+ $this->_fault('store_not_exists');
+ }
+
+ return $storeId;
+ }
+
+ /**
+ * Return loaded product instance
+ *
+ * @param int|string $productId (SKU or ID)
+ * @param int|string $store
+ * @return Mage_Catalog_Model_Product
+ */
+ protected function _getProduct($productId, $store = null, $identifierType = null)
+ {
+ $loadByIdOnFalse = false;
+ if ($identifierType === null) {
+ $identifierType = 'sku';
+ $loadByIdOnFalse = true;
+ }
+ $product = Mage::getModel('catalog/product');
+ if ($store !== null) {
+ $product->setStoreId($this->_getStoreId($store));
+ }
+ /* @var $product Mage_Catalog_Model_Product */
+ if ($identifierType == 'sku') {
+ $idBySku = $product->getIdBySku($productId);
+ if ($idBySku) {
+ $productId = $idBySku;
+ }
+ if ($idBySku || $loadByIdOnFalse) {
+ $product->load($productId);
+ }
+ } elseif ($identifierType == 'id') {
+ $product->load($productId);
+ }
+ return $product;
+ }
+
+ /**
+ * Set current store for catalog.
+ *
+ * @param string|int $store
+ * @return int
+ */
+ public function currentStore($store=null)
+ {
+ if (!is_null($store)) {
+ try {
+ $storeId = Mage::app()->getStore($store)->getId();
+ } catch (Mage_Core_Model_Store_Exception $e) {
+ $this->_fault('store_not_exists');
+ }
+
+ $this->_getSession()->setData($this->_storeIdSessionField, $storeId);
+ }
+
+ return $this->_getStoreId();
+ }
+} // Class Mage_Catalog_Model_Api_Resource End
diff --git a/app/code/core/Mage/Catalog/Model/Category.php b/app/code/core/Mage/Catalog/Model/Category.php
index b89a0de229..fb751af6e6 100644
--- a/app/code/core/Mage/Catalog/Model/Category.php
+++ b/app/code/core/Mage/Catalog/Model/Category.php
@@ -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_Catalog
- * @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)
+ * @category Mage
+ * @package Mage_Catalog
+ * @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)
*/
diff --git a/app/code/core/Mage/Catalog/Model/Category/Api.php b/app/code/core/Mage/Catalog/Model/Category/Api.php
index 99ffdff3ba..527fd73e8e 100644
--- a/app/code/core/Mage/Catalog/Model/Category/Api.php
+++ b/app/code/core/Mage/Catalog/Model/Category/Api.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
@@ -533,4 +533,4 @@ public function removeProduct($categoryId, $productId, $identifierType = null)
return true;
}
-} // Class Mage_Catalog_Model_Category_Api End
\ No newline at end of file
+} // Class Mage_Catalog_Model_Category_Api End
diff --git a/app/code/core/Mage/Catalog/Model/Category/Api/V2.php b/app/code/core/Mage/Catalog/Model/Category/Api/V2.php
index 7e301f6af1..d295337f5f 100644
--- a/app/code/core/Mage/Catalog/Model/Category/Api/V2.php
+++ b/app/code/core/Mage/Catalog/Model/Category/Api/V2.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Catalog/Model/Category/Attribute/Api.php b/app/code/core/Mage/Catalog/Model/Category/Attribute/Api.php
index 9a4875c73c..d2d5345549 100644
--- a/app/code/core/Mage/Catalog/Model/Category/Attribute/Api.php
+++ b/app/code/core/Mage/Catalog/Model/Category/Attribute/Api.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
@@ -106,4 +106,4 @@ public function options($attributeId, $store = null)
return $result;
}
-} // Class Mage_Catalog_Model_Category_Attribute_Api End
\ No newline at end of file
+} // Class Mage_Catalog_Model_Category_Attribute_Api End
diff --git a/app/code/core/Mage/Catalog/Model/Category/Attribute/Api/V2.php b/app/code/core/Mage/Catalog/Model/Category/Attribute/Api/V2.php
index fcbb12cf9b..3ed63b93c6 100644
--- a/app/code/core/Mage/Catalog/Model/Category/Attribute/Api/V2.php
+++ b/app/code/core/Mage/Catalog/Model/Category/Attribute/Api/V2.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
@@ -33,4 +33,4 @@
*/
class Mage_Catalog_Model_Category_Attribute_Api_V2 extends Mage_Catalog_Model_Category_Attribute_Api
{
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Image.php b/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Image.php
index 47caaa946c..2058a4c145 100644
--- a/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Image.php
+++ b/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Image.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
diff --git a/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Sortby.php b/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Sortby.php
index f4bf32791c..3f9a5a9a99 100644
--- a/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Sortby.php
+++ b/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Sortby.php
@@ -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_Catalog
- * @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)
+ * @category Mage
+ * @package Mage_Catalog
+ * @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)
*/
diff --git a/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Urlkey.php b/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Urlkey.php
index 6ec0e445e4..ac72ab27af 100644
--- a/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Urlkey.php
+++ b/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Urlkey.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
diff --git a/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Layout.php b/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Layout.php
index 44f5ca9e3d..b90f062fd0 100644
--- a/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Layout.php
+++ b/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Layout.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Mode.php b/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Mode.php
index 33a24d23c2..fb161f93ab 100644
--- a/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Mode.php
+++ b/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Mode.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Page.php b/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Page.php
index 94d90800d8..820e9be776 100644
--- a/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Page.php
+++ b/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Page.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Sortby.php b/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Sortby.php
index 58843033ea..549cfabd0c 100644
--- a/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Sortby.php
+++ b/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Sortby.php
@@ -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_Catalog
- * @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)
+ * @category Mage
+ * @package Mage_Catalog
+ * @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)
*/
diff --git a/app/code/core/Mage/Catalog/Model/Category/Indexer/Product.php b/app/code/core/Mage/Catalog/Model/Category/Indexer/Product.php
index 7bb234cf38..78688f5691 100644
--- a/app/code/core/Mage/Catalog/Model/Category/Indexer/Product.php
+++ b/app/code/core/Mage/Catalog/Model/Category/Indexer/Product.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Catalog/Model/Config.php b/app/code/core/Mage/Catalog/Model/Config.php
index bff44b6afb..357a8635e9 100644
--- a/app/code/core/Mage/Catalog/Model/Config.php
+++ b/app/code/core/Mage/Catalog/Model/Config.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
diff --git a/app/code/core/Mage/Catalog/Model/Convert.php b/app/code/core/Mage/Catalog/Model/Convert.php
index 1f8561687a..19740a840c 100644
--- a/app/code/core/Mage/Catalog/Model/Convert.php
+++ b/app/code/core/Mage/Catalog/Model/Convert.php
@@ -1,31 +1,31 @@
-getLocale()->IsStoreDateInInterval(null, $date['from'], $date['to'])) {
+ if (Mage::app()->getLocale()->isStoreDateInInterval(null, $date['from'], $date['to'])) {
$this->_apply($package, $theme);
return true;
}
diff --git a/app/code/core/Mage/Catalog/Model/Entity/Attribute.php b/app/code/core/Mage/Catalog/Model/Entity/Attribute.php
index e030631984..286395bdab 100644
--- a/app/code/core/Mage/Catalog/Model/Entity/Attribute.php
+++ b/app/code/core/Mage/Catalog/Model/Entity/Attribute.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
@@ -59,4 +59,4 @@ protected function _afterSave()
Mage::getSingleton('eav/config')->clear();
return parent::_afterSave();
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Catalog/Model/Entity/Product/Attribute/Design/Options/Container.php b/app/code/core/Mage/Catalog/Model/Entity/Product/Attribute/Design/Options/Container.php
index e04600b01a..29a27b7ac1 100644
--- a/app/code/core/Mage/Catalog/Model/Entity/Product/Attribute/Design/Options/Container.php
+++ b/app/code/core/Mage/Catalog/Model/Entity/Product/Attribute/Design/Options/Container.php
@@ -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_Eav
- * @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_Catalog
+ * @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)
*/
/**
@@ -62,4 +62,4 @@ public function getOptionText($value)
return false;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Catalog/Model/Entity/Product/Attribute/Frontend/Image.php b/app/code/core/Mage/Catalog/Model/Entity/Product/Attribute/Frontend/Image.php
index 090ecefaf5..7b19ada3b1 100644
--- a/app/code/core/Mage/Catalog/Model/Entity/Product/Attribute/Frontend/Image.php
+++ b/app/code/core/Mage/Catalog/Model/Entity/Product/Attribute/Frontend/Image.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
@@ -54,4 +54,4 @@ public function getUrl($object, $size=null)
}*/
return $url;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Catalog/Model/Index.php b/app/code/core/Mage/Catalog/Model/Index.php
index 9af759c69e..df5435e50d 100644
--- a/app/code/core/Mage/Catalog/Model/Index.php
+++ b/app/code/core/Mage/Catalog/Model/Index.php
@@ -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_Catalog
- * @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)
+ * @category Mage
+ * @package Mage_Catalog
+ * @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)
*/
diff --git a/app/code/core/Mage/Catalog/Model/Indexer/Url.php b/app/code/core/Mage/Catalog/Model/Indexer/Url.php
index fac0e402aa..f1d6032724 100644
--- a/app/code/core/Mage/Catalog/Model/Indexer/Url.php
+++ b/app/code/core/Mage/Catalog/Model/Indexer/Url.php
@@ -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_
- * @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_Catalog
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Catalog/Model/Layer.php b/app/code/core/Mage/Catalog/Model/Layer.php
index 7c39b4bb1f..00d6764fe6 100644
--- a/app/code/core/Mage/Catalog/Model/Layer.php
+++ b/app/code/core/Mage/Catalog/Model/Layer.php
@@ -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_Catalog
- * @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)
+ * @category Mage
+ * @package Mage_Catalog
+ * @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)
*/
diff --git a/app/code/core/Mage/Catalog/Model/Layer/Filter/Abstract.php b/app/code/core/Mage/Catalog/Model/Layer/Filter/Abstract.php
index e877b1a1f8..76e5a095a0 100644
--- a/app/code/core/Mage/Catalog/Model/Layer/Filter/Abstract.php
+++ b/app/code/core/Mage/Catalog/Model/Layer/Filter/Abstract.php
@@ -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_Catalog
- * @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)
+ * @category Mage
+ * @package Mage_Catalog
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Catalog/Model/Layer/Filter/Attribute.php b/app/code/core/Mage/Catalog/Model/Layer/Filter/Attribute.php
index f692b6ffce..e89aaebcb0 100644
--- a/app/code/core/Mage/Catalog/Model/Layer/Filter/Attribute.php
+++ b/app/code/core/Mage/Catalog/Model/Layer/Filter/Attribute.php
@@ -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_Catalog
- * @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)
+ * @category Mage
+ * @package Mage_Catalog
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Catalog/Model/Layer/Filter/Category.php b/app/code/core/Mage/Catalog/Model/Layer/Filter/Category.php
index 97004fe078..9e70420b66 100644
--- a/app/code/core/Mage/Catalog/Model/Layer/Filter/Category.php
+++ b/app/code/core/Mage/Catalog/Model/Layer/Filter/Category.php
@@ -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_Catalog
- * @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)
+ * @category Mage
+ * @package Mage_Catalog
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Catalog/Model/Layer/Filter/Item.php b/app/code/core/Mage/Catalog/Model/Layer/Filter/Item.php
index 07a1cda11a..55e00c9458 100644
--- a/app/code/core/Mage/Catalog/Model/Layer/Filter/Item.php
+++ b/app/code/core/Mage/Catalog/Model/Layer/Filter/Item.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
@@ -101,4 +101,4 @@ public function getValueString()
}
return $value;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Catalog/Model/Layer/State.php b/app/code/core/Mage/Catalog/Model/Layer/State.php
index 8d81141dff..0a53e5fa80 100644
--- a/app/code/core/Mage/Catalog/Model/Layer/State.php
+++ b/app/code/core/Mage/Catalog/Model/Layer/State.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
@@ -76,4 +76,4 @@ public function getFilters()
}
return $filters;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Catalog/Model/Observer.php b/app/code/core/Mage/Catalog/Model/Observer.php
index e952e311e7..8fd71c34a1 100644
--- a/app/code/core/Mage/Catalog/Model/Observer.php
+++ b/app/code/core/Mage/Catalog/Model/Observer.php
@@ -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_Catalog
- * @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)
+ * @category Mage
+ * @package Mage_Catalog
+ * @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)
*/
diff --git a/app/code/core/Mage/Catalog/Model/Product.php b/app/code/core/Mage/Catalog/Model/Product.php
index 5c82d5f41f..a78d7c0552 100644
--- a/app/code/core/Mage/Catalog/Model/Product.php
+++ b/app/code/core/Mage/Catalog/Model/Product.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Catalog/Model/Product/Api.php b/app/code/core/Mage/Catalog/Model/Product/Api.php
index b6a6e1725c..2194a3d7dd 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Api.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Api.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
@@ -310,4 +310,4 @@ public function delete($productId, $identifierType = null)
return true;
}
-} // Class Mage_Catalog_Model_Product_Api End
\ No newline at end of file
+} // Class Mage_Catalog_Model_Product_Api End
diff --git a/app/code/core/Mage/Catalog/Model/Product/Api/V2.php b/app/code/core/Mage/Catalog/Model/Product/Api/V2.php
index 5d11a8d6db..c5cc86476a 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Api/V2.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Api/V2.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
@@ -339,4 +339,4 @@ public function getSpecialPrice($productId, $store = null)
);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Api.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Api.php
index 2388462072..c9b315db04 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Api.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Api.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
@@ -115,4 +115,4 @@ public function options($attributeId, $store = null)
}
return $options;
}
-} // Class Mage_Catalog_Model_Product_Attribute_Api End
\ No newline at end of file
+} // Class Mage_Catalog_Model_Product_Attribute_Api End
diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Api/V2.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Api/V2.php
index 97a1fbfa86..acbeaa447f 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Api/V2.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Api/V2.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
@@ -33,4 +33,4 @@
*/
class Mage_Catalog_Model_Product_Attribute_Api_V2 extends Mage_Catalog_Model_Product_Attribute_Api
{
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Media.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Media.php
index 170b49e178..3dafc124fd 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Media.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Media.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Price.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Price.php
index 3a2457bb0c..40006117ee 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Price.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Price.php
@@ -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_Catalog
- * @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)
+ * @category Mage
+ * @package Mage_Catalog
+ * @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)
*/
diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Startdate.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Startdate.php
index 2aa25a8051..1570391be5 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Startdate.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Startdate.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Tierprice.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Tierprice.php
index 2bb2228281..44452212b8 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Tierprice.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Tierprice.php
@@ -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_Catalog
- * @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)
+ * @category Mage
+ * @package Mage_Catalog
+ * @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)
*/
@@ -240,7 +240,7 @@ public function afterSave($object)
// prepare data for save
foreach ($tierPrices as $data) {
- if (empty($data['price_qty']) || !isset($data['price_qty']) || !empty($data['delete'])) {
+ if (empty($data['price_qty']) || !isset($data['cust_group']) || !empty($data['delete'])) {
continue;
}
if ($this->getAttribute()->isScopeGlobal() && $data['website_id'] > 0) {
diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Urlkey.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Urlkey.php
index 6f724cea98..9478ebca40 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Urlkey.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Urlkey.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Frontend/Image.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Frontend/Image.php
index da08480667..5593f74bef 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Frontend/Image.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Frontend/Image.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Media/Api.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Media/Api.php
index b44658f1af..6e7465ca51 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Media/Api.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Media/Api.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
@@ -382,4 +382,4 @@ protected function _initProduct($productId, $store = null, $identifierType = nul
return $product;
}
-} // Class Mage_Catalog_Model_Product_Attribute_Media_Api End
\ No newline at end of file
+} // Class Mage_Catalog_Model_Product_Attribute_Media_Api End
diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Media/Api/V2.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Media/Api/V2.php
index b3a0a7115e..ffa98e5258 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Media/Api/V2.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Media/Api/V2.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
@@ -181,4 +181,4 @@ public function update($productId, $file, $data, $store = null, $identifierType
return true;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Set/Api.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Set/Api.php
index b6786c99c1..607eda3a08 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Set/Api.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Set/Api.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
@@ -55,4 +55,4 @@ public function items()
return $result;
}
-} // Class Mage_Catalog_Model_Product_Attribute_Set_Api End
\ No newline at end of file
+} // Class Mage_Catalog_Model_Product_Attribute_Set_Api End
diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Set/Api/V2.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Set/Api/V2.php
index 290dc3c03f..0ce2bfc685 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Set/Api/V2.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Set/Api/V2.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
@@ -33,4 +33,4 @@
*/
class Mage_Catalog_Model_Product_Attribute_Set_Api_V2 extends Mage_Catalog_Model_Product_Attribute_Set_Api
{
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Layout.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Layout.php
index 5d88e8e4b3..59110a8277 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Layout.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Layout.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
@@ -41,4 +41,4 @@ public function getAllOptions()
}
return $this->_options;
}
-}
+}
diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api.php
index 0cee46bf5b..109350fc71 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
@@ -119,7 +119,7 @@ public function update($productId, $tierPrices, $identifierType = null)
}
try {
- $product->setData(self::ATTRIBUTE_CODE ,$updateValue);
+ $product->setData(self::ATTRIBUTE_CODE ,$updateValue);
$product->validate();
$product->save();
} catch (Mage_Core_Exception $e) {
@@ -166,4 +166,4 @@ protected function _initProduct($productId, $identifierType = null)
return $product;
}
-} // Class Mage_Catalog_Model_Product_Attribute_Tierprice End
\ No newline at end of file
+} // Class Mage_Catalog_Model_Product_Attribute_Tierprice End
diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api/V2.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api/V2.php
index e0352e4f33..13c065c225 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api/V2.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api/V2.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
@@ -96,7 +96,7 @@ public function update($productId, $tierPrices, $identifierType = null)
}
try {
- $product->setData(self::ATTRIBUTE_CODE ,$updateValue);
+ $product->setData(self::ATTRIBUTE_CODE ,$updateValue);
$product->validate();
$product->save();
} catch (Mage_Core_Exception $e) {
@@ -105,4 +105,4 @@ public function update($productId, $tierPrices, $identifierType = null)
return true;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Catalog/Model/Product/Compare/Item.php b/app/code/core/Mage/Catalog/Model/Product/Compare/Item.php
index 9be4bb2a3c..9ee06aa327 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Compare/Item.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Compare/Item.php
@@ -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_Catalog
- * @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)
+ * @category Mage
+ * @package Mage_Catalog
+ * @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)
*/
diff --git a/app/code/core/Mage/Catalog/Model/Product/Compare/List.php b/app/code/core/Mage/Catalog/Model/Product/Compare/List.php
index 63c446b5bf..fb64710f11 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Compare/List.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Compare/List.php
@@ -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_Catalog
- * @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)
+ * @category Mage
+ * @package Mage_Catalog
+ * @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)
*/
/**
@@ -128,4 +128,4 @@ public function hasItems($customerId, $visitorId)
return Mage::getResourceSingleton('catalog/product_compare_item')
->getCount($customerId, $visitorId);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Catalog/Model/Product/Condition.php b/app/code/core/Mage/Catalog/Model/Product/Condition.php
index 2dea33bedf..5b01a140b5 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Condition.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Condition.php
@@ -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_Eav
- * @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_Catalog
+ * @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_Catalog_Model_Product_Condition extends Varien_Object implements Mage_Catalog_Model_Product_Condition_Interface
@@ -47,4 +47,4 @@ public function getIdsSelect($dbAdapter)
}
return '';
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Catalog/Model/Product/Condition/Interface.php b/app/code/core/Mage/Catalog/Model/Product/Condition/Interface.php
index eb26468b15..90ed1b646a 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Condition/Interface.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Condition/Interface.php
@@ -18,14 +18,14 @@
* 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_Eav
- * @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_Catalog
+ * @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)
*/
interface Mage_Catalog_Model_Product_Condition_Interface
{
public function applyToCollection($collection);
public function getIdsSelect($dbAdapter);
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Catalog/Model/Product/Flat/Flag.php b/app/code/core/Mage/Catalog/Model/Product/Flat/Flag.php
index b426dffd4c..d88dddbbef 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Flat/Flag.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Flat/Flag.php
@@ -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_Catalog
- * @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)
+ * @category Mage
+ * @package Mage_Catalog
+ * @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)
*/
diff --git a/app/code/core/Mage/Catalog/Model/Product/Flat/Indexer.php b/app/code/core/Mage/Catalog/Model/Product/Flat/Indexer.php
index dee437f7b3..7cf9a41a7c 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Flat/Indexer.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Flat/Indexer.php
@@ -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_Catalog
- * @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)
+ * @category Mage
+ * @package Mage_Catalog
+ * @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)
*/
diff --git a/app/code/core/Mage/Catalog/Model/Product/Flat/Observer.php b/app/code/core/Mage/Catalog/Model/Product/Flat/Observer.php
index c359fd32d5..aef0932153 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Flat/Observer.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Flat/Observer.php
@@ -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_Catalog
- * @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)
+ * @category Mage
+ * @package Mage_Catalog
+ * @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)
*/
diff --git a/app/code/core/Mage/Catalog/Model/Product/Image.php b/app/code/core/Mage/Catalog/Model/Product/Image.php
index dd1def7443..9c85fb6308 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Image.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Image.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
@@ -255,7 +255,7 @@ private function _rgbToString($rgbArray)
*/
public function setBaseFile($file)
{
- if (($file) && (0 !== strpos($file, '/', 0))) {
+ if (($file) && (0 !== strpos($file, '/', 0))) {
$file = '/' . $file;
}
$baseDir = Mage::getSingleton('catalog/product_media_config')->getBaseMediaPath();
@@ -413,7 +413,7 @@ public function setAngle($angle)
/**
* Add watermark to image
- * size param in format 100x200
+ * size param in format 100x200
*
* @param string $fileName
* @param string $position
@@ -431,11 +431,11 @@ public function setWatermark($file, $position=null, $size=null, $width=null, $he
return $this;
}
- if ($position)
+ if ($position)
$this->setWatermarkPosition($position);
- if ($size)
+ if ($size)
$this->setWatermarkSize($size);
- if ($width)
+ if ($width)
$this->setWatermarkWidth($width);
if ($heigth)
$this->setWatermarkHeigth($heigth);
@@ -443,7 +443,7 @@ public function setWatermark($file, $position=null, $size=null, $width=null, $he
$this->setImageOpacity($imageOpacity);
$filePath = $this->_getWatermarkFilePath();
-
+
if($filePath) {
$this->getImageProcessor()
->setWatermarkPosition( $this->getWatermarkPosition() )
@@ -501,7 +501,7 @@ public function isCached()
{
return file_exists($this->_newFile);
}
-
+
/**
* Set watermark file name
*
@@ -527,7 +527,7 @@ public function getWatermarkFile()
/**
* Get relative watermark file path
* or false if file not found
- *
+ *
* @return string | bool
*/
protected function _getWatermarkFilePath()
@@ -580,7 +580,7 @@ public function getWatermarkPosition()
{
return $this->_watermarkPosition;
}
-
+
/**
* Set watermark image opacity
*
@@ -668,4 +668,4 @@ public function clearCache()
$io = new Varien_Io_File();
$io->rmdir($directory, true);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Catalog/Model/Product/Indexer/Eav.php b/app/code/core/Mage/Catalog/Model/Product/Indexer/Eav.php
index aaa9e471fe..c5e163e798 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Indexer/Eav.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Indexer/Eav.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
diff --git a/app/code/core/Mage/Catalog/Model/Product/Indexer/Flat.php b/app/code/core/Mage/Catalog/Model/Product/Indexer/Flat.php
index 8e94b4b8fb..3a138a676e 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Indexer/Flat.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Indexer/Flat.php
@@ -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_
- * @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_Catalog
+ * @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_Catalog_Model_Product_Indexer_Flat extends Mage_Index_Model_Indexer_Abstract
{
diff --git a/app/code/core/Mage/Catalog/Model/Product/Indexer/Price.php b/app/code/core/Mage/Catalog/Model/Product/Indexer/Price.php
index 41af77ea6b..dc5404696a 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Indexer/Price.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Indexer/Price.php
@@ -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_
- * @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_Catalog
+ * @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_Catalog_Model_Product_Indexer_Price extends Mage_Index_Model_Indexer_Abstract
diff --git a/app/code/core/Mage/Catalog/Model/Product/Indexer/Status.php b/app/code/core/Mage/Catalog/Model/Product/Indexer/Status.php
index f8d3181291..c37097bf88 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Indexer/Status.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Indexer/Status.php
@@ -18,8 +18,8 @@
* 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_
- * @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_Catalog
+ * @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)
*/
diff --git a/app/code/core/Mage/Catalog/Model/Product/Link.php b/app/code/core/Mage/Catalog/Model/Product/Link.php
index 3730af5a0e..35246e36bf 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Link.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Link.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
@@ -152,4 +152,4 @@ public function saveGroupedLinks($product)
}
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Catalog/Model/Product/Link/Api.php b/app/code/core/Mage/Catalog/Model/Product/Link/Api.php
index 928e632da8..49b29edffc 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Link/Api.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Link/Api.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
@@ -328,4 +328,4 @@ protected function _collectionToEditableArray($collection)
return $result;
}
-} // Class Mage_Catalog_Model_Product_Link_Api End
\ No newline at end of file
+} // Class Mage_Catalog_Model_Product_Link_Api End
diff --git a/app/code/core/Mage/Catalog/Model/Product/Link/Api/V2.php b/app/code/core/Mage/Catalog/Model/Product/Link/Api/V2.php
index eb8029fe84..260b75d8f9 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Link/Api/V2.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Link/Api/V2.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
@@ -116,4 +116,4 @@ public function update($type, $productId, $linkedProductId, $data = array(), $id
return true;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Catalog/Model/Product/Media/Config.php b/app/code/core/Mage/Catalog/Model/Product/Media/Config.php
index c1de7ce732..8310676d96 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Media/Config.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Media/Config.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
@@ -107,4 +107,4 @@ protected function _prepareFileForPath($file)
{
return str_replace('/', DS, $file);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Catalog/Model/Product/Option.php b/app/code/core/Mage/Catalog/Model/Product/Option.php
index e403caccd9..5956142995 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Option.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Option.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Catalog/Model/Product/Option/Observer.php b/app/code/core/Mage/Catalog/Model/Product/Option/Observer.php
index 8e66c64aa1..d19513cd54 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Option/Observer.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Option/Observer.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Catalog/Model/Product/Option/Type/Date.php b/app/code/core/Mage/Catalog/Model/Product/Option/Type/Date.php
index 8950030fe3..72a24e94e0 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Option/Type/Date.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Option/Type/Date.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
@@ -324,4 +324,4 @@ protected function _timeExists()
Mage_Catalog_Model_Product_Option::OPTION_TYPE_TIME
));
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Catalog/Model/Product/Option/Type/Default.php b/app/code/core/Mage/Catalog/Model/Product/Option/Type/Default.php
index 80e1907fc0..0e8ebfe0c6 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Option/Type/Default.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Option/Type/Default.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
@@ -349,4 +349,4 @@ protected function _getChargableOptionPrice($price, $isPercent, $basePrice)
}
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Catalog/Model/Product/Option/Type/File.php b/app/code/core/Mage/Catalog/Model/Product/Option/Type/File.php
index 588eb1f7bf..96ebdd21bc 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Option/Type/File.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Option/Type/File.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
@@ -576,4 +576,4 @@ protected function _bytesToMbytes($bytes)
{
return round($bytes / (1024 * 1024));
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Catalog/Model/Product/Option/Type/Select.php b/app/code/core/Mage/Catalog/Model/Product/Option/Type/Select.php
index b3db5e73d9..bc459188bc 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Option/Type/Select.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Option/Type/Select.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
@@ -303,4 +303,4 @@ protected function _isSingleSelection()
);
return in_array($this->getOption()->getType(), $_single);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Catalog/Model/Product/Option/Type/Text.php b/app/code/core/Mage/Catalog/Model/Product/Option/Type/Text.php
index af73aa0746..2a65fdc50d 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Option/Type/Text.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Option/Type/Text.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
@@ -82,4 +82,4 @@ public function getFormattedOptionValue($value)
{
return Mage::helper('core')->htmlEscape($value);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Catalog/Model/Product/Option/Value.php b/app/code/core/Mage/Catalog/Model/Product/Option/Value.php
index dff61c9084..3771db8c57 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Option/Value.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Option/Value.php
@@ -1,209 +1,209 @@
-
- */
-class Mage_Catalog_Model_Product_Option_Value extends Mage_Core_Model_Abstract
-{
- protected $_values = array();
-
- protected $_product;
-
- protected $_option;
-
- protected function _construct()
- {
- $this->_init('catalog/product_option_value');
- }
-
- public function addValue($value)
- {
- $this->_values[] = $value;
- return $this;
- }
-
- public function getValues()
- {
- return $this->_values;
- }
-
- public function setValues($values)
- {
- $this->_values = $values;
- return $this;
- }
-
- public function unsetValues()
- {
- $this->_values = array();
- return $this;
- }
-
- public function setOption(Mage_Catalog_Model_Product_Option $option)
- {
- $this->_option = $option;
- return $this;
- }
-
- public function unsetOption()
- {
- $this->_option = null;
- return $this;
- }
-
- /**
- * Enter description here...
- *
- * @return Mage_Catalog_Model_Product_Option
- */
- public function getOption()
- {
- return $this->_option;
- }
-
- public function setProduct($product)
- {
- $this->_product = $product;
- return $this;
- }
-
- public function getProduct()
- {
- if (is_null($this->_product)) {
- $this->_product = $this->getOption()->getProduct();
- }
- return $this->_product;
- }
-
- public function saveValues()
- {
- foreach ($this->getValues() as $value) {
- $this->setData($value)
- ->setData('option_id', $this->getOption()->getId())
- ->setData('store_id', $this->getOption()->getStoreId());
-
- if ($this->getData('option_type_id') == '-1') {//change to 0
- $this->unsetData('option_type_id');
- } else {
- $this->setId($this->getData('option_type_id'));
- }
-
- if ($this->getData('is_delete') == '1') {
- if ($this->getId()) {
- $this->deleteValues($this->getId());
- $this->delete();
- }
- } else {
- $this->save();
- }
- }//eof foreach()
- return $this;
- }
-
- /**
- * Return price. If $flag is true and price is percent
- * return converted percent to price
- *
- * @param bool $flag
- * @return decimal
- */
- public function getPrice($flag=false)
- {
- if ($flag && $this->getPriceType() == 'percent') {
- $basePrice = $this->getOption()->getProduct()->getFinalPrice();
- $price = $basePrice*($this->_getData('price')/100);
- return $price;
- }
- return $this->_getData('price');
- }
-
- /**
- * Enter description here...
- *
- * @param Mage_Catalog_Model_Product_Option $option
- * @return Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value_Collection
- */
- public function getValuesCollection(Mage_Catalog_Model_Product_Option $option)
- {
- $collection = Mage::getResourceModel('catalog/product_option_value_collection')
- ->addFieldToFilter('option_id', $option->getId())
- ->getValues($option->getStoreId());
-
- return $collection;
- }
-
- public function getValuesByOption($optionIds, $option_id, $store_id)
- {
- $collection = Mage::getResourceModel('catalog/product_option_value_collection')
- ->addFieldToFilter('option_id', $option_id)
- ->getValuesByOption($optionIds, $store_id);
-
- return $collection;
- }
-
- public function deleteValue($option_id)
- {
- $this->getResource()->deleteValue($option_id);
- return $this;
- }
-
- public function deleteValues($option_type_id)
- {
- $this->getResource()->deleteValues($option_type_id);
- return $this;
- }
-
- /**
- * Prepare array of option values for duplicate
- *
- * @return array
- */
- public function prepareValueForDuplicate()
- {
- $this->setOptionId(null);
- $this->setOptionTypeId(null);
-
- return $this->__toArray();
- }
-
- /**
- * Duplicate product options value
- *
- * @param int $oldOptionId
- * @param int $newOptionId
- * @return Mage_Catalog_Model_Product_Option_Value
- */
- public function duplicate($oldOptionId, $newOptionId)
- {
- $this->getResource()->duplicate($this, $oldOptionId, $newOptionId);
- return $this;
- }
-}
\ No newline at end of file
+
+ */
+class Mage_Catalog_Model_Product_Option_Value extends Mage_Core_Model_Abstract
+{
+ protected $_values = array();
+
+ protected $_product;
+
+ protected $_option;
+
+ protected function _construct()
+ {
+ $this->_init('catalog/product_option_value');
+ }
+
+ public function addValue($value)
+ {
+ $this->_values[] = $value;
+ return $this;
+ }
+
+ public function getValues()
+ {
+ return $this->_values;
+ }
+
+ public function setValues($values)
+ {
+ $this->_values = $values;
+ return $this;
+ }
+
+ public function unsetValues()
+ {
+ $this->_values = array();
+ return $this;
+ }
+
+ public function setOption(Mage_Catalog_Model_Product_Option $option)
+ {
+ $this->_option = $option;
+ return $this;
+ }
+
+ public function unsetOption()
+ {
+ $this->_option = null;
+ return $this;
+ }
+
+ /**
+ * Enter description here...
+ *
+ * @return Mage_Catalog_Model_Product_Option
+ */
+ public function getOption()
+ {
+ return $this->_option;
+ }
+
+ public function setProduct($product)
+ {
+ $this->_product = $product;
+ return $this;
+ }
+
+ public function getProduct()
+ {
+ if (is_null($this->_product)) {
+ $this->_product = $this->getOption()->getProduct();
+ }
+ return $this->_product;
+ }
+
+ public function saveValues()
+ {
+ foreach ($this->getValues() as $value) {
+ $this->setData($value)
+ ->setData('option_id', $this->getOption()->getId())
+ ->setData('store_id', $this->getOption()->getStoreId());
+
+ if ($this->getData('option_type_id') == '-1') {//change to 0
+ $this->unsetData('option_type_id');
+ } else {
+ $this->setId($this->getData('option_type_id'));
+ }
+
+ if ($this->getData('is_delete') == '1') {
+ if ($this->getId()) {
+ $this->deleteValues($this->getId());
+ $this->delete();
+ }
+ } else {
+ $this->save();
+ }
+ }//eof foreach()
+ return $this;
+ }
+
+ /**
+ * Return price. If $flag is true and price is percent
+ * return converted percent to price
+ *
+ * @param bool $flag
+ * @return decimal
+ */
+ public function getPrice($flag=false)
+ {
+ if ($flag && $this->getPriceType() == 'percent') {
+ $basePrice = $this->getOption()->getProduct()->getFinalPrice();
+ $price = $basePrice*($this->_getData('price')/100);
+ return $price;
+ }
+ return $this->_getData('price');
+ }
+
+ /**
+ * Enter description here...
+ *
+ * @param Mage_Catalog_Model_Product_Option $option
+ * @return Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value_Collection
+ */
+ public function getValuesCollection(Mage_Catalog_Model_Product_Option $option)
+ {
+ $collection = Mage::getResourceModel('catalog/product_option_value_collection')
+ ->addFieldToFilter('option_id', $option->getId())
+ ->getValues($option->getStoreId());
+
+ return $collection;
+ }
+
+ public function getValuesByOption($optionIds, $option_id, $store_id)
+ {
+ $collection = Mage::getResourceModel('catalog/product_option_value_collection')
+ ->addFieldToFilter('option_id', $option_id)
+ ->getValuesByOption($optionIds, $store_id);
+
+ return $collection;
+ }
+
+ public function deleteValue($option_id)
+ {
+ $this->getResource()->deleteValue($option_id);
+ return $this;
+ }
+
+ public function deleteValues($option_type_id)
+ {
+ $this->getResource()->deleteValues($option_type_id);
+ return $this;
+ }
+
+ /**
+ * Prepare array of option values for duplicate
+ *
+ * @return array
+ */
+ public function prepareValueForDuplicate()
+ {
+ $this->setOptionId(null);
+ $this->setOptionTypeId(null);
+
+ return $this->__toArray();
+ }
+
+ /**
+ * Duplicate product options value
+ *
+ * @param int $oldOptionId
+ * @param int $newOptionId
+ * @return Mage_Catalog_Model_Product_Option_Value
+ */
+ public function duplicate($oldOptionId, $newOptionId)
+ {
+ $this->getResource()->duplicate($this, $oldOptionId, $newOptionId);
+ return $this;
+ }
+}
diff --git a/app/code/core/Mage/Catalog/Model/Product/Status.php b/app/code/core/Mage/Catalog/Model/Product/Status.php
index c4ba27c582..3f16f8359a 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Status.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Status.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
diff --git a/app/code/core/Mage/Catalog/Model/Product/Type.php b/app/code/core/Mage/Catalog/Model/Product/Type.php
index 3209aa44e8..55959d032c 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Type.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Type.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Abstract.php b/app/code/core/Mage/Catalog/Model/Product/Type/Abstract.php
index cb3ba2e7d7..469277f594 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Type/Abstract.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Type/Abstract.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Catalog
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Api.php b/app/code/core/Mage/Catalog/Model/Product/Type/Api.php
index 064e76403b..b6424ae7a1 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Type/Api.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Type/Api.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
@@ -51,4 +51,4 @@ public function items()
return $result;
}
-} // Class Mage_Catalog_Model_Product_Type_Api End
\ No newline at end of file
+} // Class Mage_Catalog_Model_Product_Type_Api End
diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Api/V2.php b/app/code/core/Mage/Catalog/Model/Product/Type/Api/V2.php
index 8fa4493970..b9d81b5c1d 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Type/Api/V2.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Type/Api/V2.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
@@ -33,4 +33,4 @@
*/
class Mage_Catalog_Model_Product_Type_Api_V2 extends Mage_Catalog_Model_Product_Type_Api
{
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Configurable.php b/app/code/core/Mage/Catalog/Model/Product/Type/Configurable.php
index b1840fabd5..3115c7ae22 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Type/Configurable.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Type/Configurable.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Configurable/Attribute.php b/app/code/core/Mage/Catalog/Model/Product/Type/Configurable/Attribute.php
index 15323ca7d9..d7f7d01a06 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Type/Configurable/Attribute.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Type/Configurable/Attribute.php
@@ -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_Catalog
- * @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)
+ * @category Mage
+ * @package Mage_Catalog
+ * @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)
*/
diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Configurable/Price.php b/app/code/core/Mage/Catalog/Model/Product/Type/Configurable/Price.php
index 24940699ff..3cc6dc11c5 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Type/Configurable/Price.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Type/Configurable/Price.php
@@ -1,103 +1,103 @@
-
- */
-class Mage_Catalog_Model_Product_Type_Configurable_Price extends Mage_Catalog_Model_Product_Type_Price
-{
- /**
- * Get product final price
- *
- * @param double $qty
- * @param Mage_Catalog_Model_Product $product
- * @return double
- */
- public function getFinalPrice($qty=null, $product)
- {
- if (is_null($qty) && !is_null($product->getCalculatedFinalPrice())) {
- return $product->getCalculatedFinalPrice();
- }
-
- $finalPrice = parent::getFinalPrice($qty, $product);
- $product->getTypeInstance(true)
- ->setStoreFilter($product->getStore(), $product);
- $attributes = $product->getTypeInstance(true)
- ->getConfigurableAttributes($product);
-
- $selectedAttributes = array();
- if ($product->getCustomOption('attributes')) {
- $selectedAttributes = unserialize($product->getCustomOption('attributes')->getValue());
- }
-
- $basePrice = $finalPrice;
- foreach ($attributes as $attribute) {
- $attributeId = $attribute->getProductAttribute()->getId();
- $value = $this->_getValueByIndex(
- $attribute->getPrices() ? $attribute->getPrices() : array(),
- isset($selectedAttributes[$attributeId]) ? $selectedAttributes[$attributeId] : null
- );
- if($value) {
- if($value['pricing_value'] != 0) {
- $finalPrice += $this->_calcSelectionPrice($value, $basePrice);
- }
- }
- }
- $product->setFinalPrice($finalPrice);
- return max(0, $product->getData('final_price'));
- }
-
- /**
- * Calculate configurable product selection price
- *
- * @param array $priceInfo
- * @param decimal $productPrice
- * @return decimal
- */
- protected function _calcSelectionPrice($priceInfo, $productPrice)
- {
- if($priceInfo['is_percent']) {
- $ratio = $priceInfo['pricing_value']/100;
- $price = $productPrice * $ratio;
- } else {
- $price = $priceInfo['pricing_value'];
- }
- return $price;
- }
-
- protected function _getValueByIndex($values, $index) {
- foreach ($values as $value) {
- if($value['value_index'] == $index) {
- return $value;
- }
- }
- return false;
- }
-}
\ No newline at end of file
+
+ */
+class Mage_Catalog_Model_Product_Type_Configurable_Price extends Mage_Catalog_Model_Product_Type_Price
+{
+ /**
+ * Get product final price
+ *
+ * @param double $qty
+ * @param Mage_Catalog_Model_Product $product
+ * @return double
+ */
+ public function getFinalPrice($qty=null, $product)
+ {
+ if (is_null($qty) && !is_null($product->getCalculatedFinalPrice())) {
+ return $product->getCalculatedFinalPrice();
+ }
+
+ $finalPrice = parent::getFinalPrice($qty, $product);
+ $product->getTypeInstance(true)
+ ->setStoreFilter($product->getStore(), $product);
+ $attributes = $product->getTypeInstance(true)
+ ->getConfigurableAttributes($product);
+
+ $selectedAttributes = array();
+ if ($product->getCustomOption('attributes')) {
+ $selectedAttributes = unserialize($product->getCustomOption('attributes')->getValue());
+ }
+
+ $basePrice = $finalPrice;
+ foreach ($attributes as $attribute) {
+ $attributeId = $attribute->getProductAttribute()->getId();
+ $value = $this->_getValueByIndex(
+ $attribute->getPrices() ? $attribute->getPrices() : array(),
+ isset($selectedAttributes[$attributeId]) ? $selectedAttributes[$attributeId] : null
+ );
+ if($value) {
+ if($value['pricing_value'] != 0) {
+ $finalPrice += $this->_calcSelectionPrice($value, $basePrice);
+ }
+ }
+ }
+ $product->setFinalPrice($finalPrice);
+ return max(0, $product->getData('final_price'));
+ }
+
+ /**
+ * Calculate configurable product selection price
+ *
+ * @param array $priceInfo
+ * @param decimal $productPrice
+ * @return decimal
+ */
+ protected function _calcSelectionPrice($priceInfo, $productPrice)
+ {
+ if($priceInfo['is_percent']) {
+ $ratio = $priceInfo['pricing_value']/100;
+ $price = $productPrice * $ratio;
+ } else {
+ $price = $priceInfo['pricing_value'];
+ }
+ return $price;
+ }
+
+ protected function _getValueByIndex($values, $index) {
+ foreach ($values as $value) {
+ if($value['value_index'] == $index) {
+ return $value;
+ }
+ }
+ return false;
+ }
+}
diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Grouped.php b/app/code/core/Mage/Catalog/Model/Product/Type/Grouped.php
index b69f759aa0..168aa1f433 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Type/Grouped.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Type/Grouped.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
@@ -308,4 +308,4 @@ public function prepareForCart(Varien_Object $buyRequest, $product = null)
}
return Mage::helper('catalog')->__('Please specify the product(s) quantity');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Price.php b/app/code/core/Mage/Catalog/Model/Product/Type/Price.php
index 5c9916ef57..3347e799f8 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Type/Price.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Type/Price.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
@@ -320,7 +320,7 @@ public static function calculatePrice($basePrice, $specialPrice, $specialPriceFr
public static function calculateSpecialPrice($finalPrice, $specialPrice, $specialPriceFrom, $specialPriceTo, $store = null)
{
if (!is_null($specialPrice) && $specialPrice != false) {
- if (Mage::app()->getLocale()->IsStoreDateInInterval($store, $specialPriceFrom, $specialPriceTo)) {
+ if (Mage::app()->getLocale()->isStoreDateInInterval($store, $specialPriceFrom, $specialPriceTo)) {
$finalPrice = min($finalPrice, $specialPrice);
}
}
diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Simple.php b/app/code/core/Mage/Catalog/Model/Product/Type/Simple.php
index 87464fad2f..2292b83774 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Type/Simple.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Type/Simple.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
@@ -33,4 +33,4 @@
*/
class Mage_Catalog_Model_Product_Type_Simple extends Mage_Catalog_Model_Product_Type_Abstract
{
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Virtual.php b/app/code/core/Mage/Catalog/Model/Product/Type/Virtual.php
index 9aa6261e02..a666f74862 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Type/Virtual.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Type/Virtual.php
@@ -1,46 +1,46 @@
-
- */
-class Mage_Catalog_Model_Product_Type_Virtual extends Mage_Catalog_Model_Product_Type_Abstract
-{
- /**
- * Check is virtual product
- *
- * @param Mage_Catalog_Model_Product $product
- * @return bool
- */
- public function isVirtual($product = null)
- {
- return true;
- }
-}
\ No newline at end of file
+
+ */
+class Mage_Catalog_Model_Product_Type_Virtual extends Mage_Catalog_Model_Product_Type_Abstract
+{
+ /**
+ * Check is virtual product
+ *
+ * @param Mage_Catalog_Model_Product $product
+ * @return bool
+ */
+ public function isVirtual($product = null)
+ {
+ return true;
+ }
+}
diff --git a/app/code/core/Mage/Catalog/Model/Product/Url.php b/app/code/core/Mage/Catalog/Model/Product/Url.php
index aa655ed568..6cec32cb1f 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Url.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Url.php
@@ -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_Catalog
- * @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)
+ * @category Mage
+ * @package Mage_Catalog
+ * @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)
*/
diff --git a/app/code/core/Mage/Catalog/Model/Product/Visibility.php b/app/code/core/Mage/Catalog/Model/Product/Visibility.php
index 05e7e25e7f..d51e98ff1a 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Visibility.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Visibility.php
@@ -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_Catalog
- * @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)
+ * @category Mage
+ * @package Mage_Catalog
+ * @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)
*/
@@ -136,7 +136,7 @@ public function getVisibleInSiteIds()
static public function getOptionArray()
{
return array(
- self::VISIBILITY_NOT_VISIBLE=> Mage::helper('catalog')->__('Nowhere'),
+ self::VISIBILITY_NOT_VISIBLE=> Mage::helper('catalog')->__('Not Visible Individually'),
self::VISIBILITY_IN_CATALOG => Mage::helper('catalog')->__('Catalog'),
self::VISIBILITY_IN_SEARCH => Mage::helper('catalog')->__('Search'),
self::VISIBILITY_BOTH => Mage::helper('catalog')->__('Catalog, Search')
diff --git a/app/code/core/Mage/Catalog/Model/Product/Website.php b/app/code/core/Mage/Catalog/Model/Product/Website.php
index d37af7653e..16542df952 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Website.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Website.php
@@ -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_Catalog
- * @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)
+ * @category Mage
+ * @package Mage_Catalog
+ * @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)
*/
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Attribute.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Attribute.php
index 9b5fdaae86..daf5c1c88a 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Attribute.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Attribute.php
@@ -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_Catalog
- * @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)
+ * @category Mage
+ * @package Mage_Catalog
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Abstract.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Abstract.php
index eddff0a6cc..8d0d961363 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Abstract.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Abstract.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Attribute.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Attribute.php
index cd577777d9..313a5ad087 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Attribute.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Attribute.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category.php
index e72ad9fa0c..c14a0c576a 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category.php
@@ -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_Catalog
- * @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)
+ * @category Mage
+ * @package Mage_Catalog
+ * @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)
*/
/**
@@ -340,7 +340,7 @@ protected function _saveCategoryProducts($category)
*/
if (!empty($update)) {
foreach ($update as $productId => $position) {
- $where = $adapter->quoteInto('category_id=?', (int)$id)
+ $where = $adapter->quoteInto('category_id=? AND ', (int)$id)
. $adapter->quoteInto('product_id=?', (int)$productId);
$bind = array('position' => (int)$position);
$adapter->update($this->_categoryProductTable, $bind, $where);
@@ -1149,4 +1149,4 @@ protected function _refreshRootCategoryProductIndex($productIds = array(), $stor
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Collection.php
index df088c031a..df9f6e1b81 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Collection.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Collection.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Frontend/Image.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Frontend/Image.php
index 4a6ba10ab5..28da702035 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Frontend/Image.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Frontend/Image.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Layout.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Layout.php
index 0eafe68f62..7fcd3a281f 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Layout.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Layout.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Mode.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Mode.php
index 10aa66e84d..07cf38c529 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Mode.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Mode.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Page.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Page.php
index 4064d4a345..8d44790905 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Page.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Page.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Collection.php
index ae6976d6c7..68695b2f03 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Collection.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Collection.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Flat.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Flat.php
index 080a26487b..b2343f61b6 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Flat.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Flat.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
@@ -803,7 +803,6 @@ public function synchronize($category = null, $storeIds = array())
$select = $write->select()
->from($this->getTable('catalog/category'))
->where('entity_id=?', $category);
- Mage::log($select->assemble());
$row = $write->fetchRow($select);
if (!$row) {
return $this;
@@ -811,14 +810,12 @@ public function synchronize($category = null, $storeIds = array())
$stores = $this->getStoresRootCategories();
$path = explode('/', $row['path']);
- Mage::log($path);
foreach ($stores as $storeId => $rootCategoryId) {
if (in_array($rootCategoryId, $path)) {
$attributeValues = $this->_getAttributeValues($category, $storeId);
$data = new Varien_Object($row);
$data->addData($attributeValues[$category])
->setStoreId($storeId);
- Mage::log($data->debug());
$this->_synchronize($data);
} else {
$where = $write->quoteInto('entity_id=?', $category);
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Flat/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Flat/Collection.php
index 8c512bd293..92e6e5932e 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Flat/Collection.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Flat/Collection.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
@@ -340,4 +340,4 @@ public function setPage($pageNum, $pageSize)
->setPageSize($pageSize);
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Indexer/Product.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Indexer/Product.php
index d2a4c86462..21c64b07a7 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Indexer/Product.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Indexer/Product.php
@@ -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_Catalog
- * @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_Catalog
+ * @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_Catalog_Model_Resource_Eav_Mysql4_Category_Indexer_Product extends Mage_Index_Model_Mysql4_Abstract
{
@@ -266,7 +266,6 @@ protected function _refreshAnchorRelations($categoryIds=null, $productIds=null)
}
$sql = $select->insertFromSelect($this->getMainTable());
- Mage::log($sql);
$this->_getWriteAdapter()->query($sql);
return $this;
}
@@ -506,4 +505,4 @@ protected function _prepareAnchorCategories($storeId, $rootPath)
$this->insertFromSelect($sql, $tmpTable, array('category_id' , 'path'));
return $tmpTable;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Tree.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Tree.php
index b86afebca8..8dad745eb8 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Tree.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Tree.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Collection/Abstract.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Collection/Abstract.php
index b8f9dc228b..c12a09013e 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Collection/Abstract.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Collection/Abstract.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
@@ -74,7 +74,7 @@ public function getDefaultStoreId()
protected function _getLoadAttributesSelect($table, $attributeIds = array())
{
if (empty($attributeIds)) {
- $attributeIds = $this->_selectAttributes;
+ $attributeIds = $this->_selectAttributes;
}
if ((int) $this->getStoreId()) {
$entityIdField = $this->getEntity()->getEntityIdField();
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Config.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Config.php
index 8a1d75fa4d..4cf5421f94 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Config.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Config.php
@@ -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_Catalog
- * @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)
+ * @category Mage
+ * @package Mage_Catalog
+ * @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)
*/
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Layer/Filter/Attribute.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Layer/Filter/Attribute.php
index b1d50b6f15..ea85cab25f 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Layer/Filter/Attribute.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Layer/Filter/Attribute.php
@@ -1,37 +1,37 @@
- */
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * 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_Catalog
+ * @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)
+ */
+
+
+/**
+ * Catalog Layer Attribute Filter Resource Model
+ *
+ * @category Mage
+ * @package Mage_Catalog
+ * @author Magento Core Team
+ */
class Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Attribute extends Mage_Core_Model_Mysql4_Abstract
{
/**
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product.php
index 49c65b3097..e57029829b 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Gallery.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Gallery.php
index 9b13420cda..9b3241b28a 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Gallery.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Gallery.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Image.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Image.php
index f2dbb4dfa8..758bbef51a 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Image.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Image.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Media.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Media.php
index e17ce09999..3573765944 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Media.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Media.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
@@ -205,4 +205,4 @@ public function duplicate($object, $newFiles, $originalProductId, $newProductId)
return $this;
}
-} // Class Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media End
\ No newline at end of file
+} // Class Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Backend_Media End
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Tierprice.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Tierprice.php
index f84576bfe6..cb121fff57 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Tierprice.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Tierprice.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
@@ -92,10 +92,10 @@ public function deletePriceData($productId, $websiteId = null, $priceId = null)
$adapter->quoteInto('entity_id=?', $productId)
);
if (!is_null($websiteId)) {
- $where[] = $adapter->quoteInto('website_id=?', $websiteId);
+ $conds[] = $adapter->quoteInto('website_id=?', $websiteId);
}
if (!is_null($priceId)) {
- $where[] = $adapter->quoteInto($this->getIdFieldName() . '=?', $priceId);
+ $conds[] = $adapter->quoteInto($this->getIdFieldName() . '=?', $priceId);
}
$where = join(' AND ', $conds);
@@ -111,9 +111,7 @@ public function deletePriceData($productId, $websiteId = null, $priceId = null)
public function savePriceData(Varien_Object $priceObject)
{
$adapter = $this->_getWriteAdapter();
- Mage::log($priceObject->debug());
$data = $this->_prepareDataForTable($priceObject, $this->getMainTable());
- Mage::log($data);
if (!empty($data[$this->getIdFieldName()])) {
$where = $adapter->quoteInto($this->getIdFieldName() . '=?', $data[$this->getIdFieldName()]);
unset($data[$this->getIdFieldName()]);
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Urlkey.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Urlkey.php
index 72fd9b7edf..f5aeec6681 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Urlkey.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Urlkey.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Collection.php
index 28c1cc3231..ccf870f147 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Collection.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Collection.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Frontend/Image.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Frontend/Image.php
index 2327017246..c4ce7c425e 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Frontend/Image.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Frontend/Image.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Frontend/Tierprice.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Frontend/Tierprice.php
index 90d4af60fa..eced6f0247 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Frontend/Tierprice.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Frontend/Tierprice.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Collection.php
index 62a29e50d3..901a84c475 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Collection.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Collection.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
@@ -1415,10 +1415,13 @@ protected function _productLimitationJoinPrice()
$fromPart = $this->getSelect()->getPart(Zend_Db_Select::FROM);
if (!isset($fromPart['price_index'])) {
+ $minimalExpr = new Zend_Db_Expr(
+ 'IF(`price_index`.`tier_price`, LEAST(`price_index`.`min_price`, `price_index`.`tier_price`), `price_index`.`min_price`)'
+ );
$this->getSelect()->joinLeft(
array('price_index' => $this->getTable('catalog/product_index_price')),
$joinCond,
- array('price', 'final_price', 'min_price', 'max_price', 'tier_price')
+ array('price', 'final_price', 'minimal_price'=>$minimalExpr , 'min_price', 'max_price', 'tier_price')
);
} else {
$fromPart['price_index']['joinCondition'] = $joinCond;
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Compare/Item.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Compare/Item.php
index 396d5b74f5..55abf3d336 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Compare/Item.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Compare/Item.php
@@ -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_Catalog
- * @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)
+ * @category Mage
+ * @package Mage_Catalog
+ * @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)
*/
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Compare/Item/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Compare/Item/Collection.php
index 91157d278a..877bd0af04 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Compare/Item/Collection.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Compare/Item/Collection.php
@@ -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_Catalog
- * @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)
+ * @category Mage
+ * @package Mage_Catalog
+ * @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)
*/
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Flat.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Flat.php
index 6620eda4c2..2b56a35716 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Flat.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Flat.php
@@ -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_Catalog
- * @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)
+ * @category Mage
+ * @package Mage_Catalog
+ * @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)
*/
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Flat/Indexer.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Flat/Indexer.php
index 5915da7cf9..137ca52bfd 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Flat/Indexer.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Flat/Indexer.php
@@ -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_Catalog
- * @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)
+ * @category Mage
+ * @package Mage_Catalog
+ * @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)
*/
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav.php
index c9dbc7e481..60ad3ab48a 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price.php
index 277a1f6e20..85240e655e 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link.php
index 0071da1e95..cc3b915374 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link/Collection.php
index 623b1aa3d7..a17941f656 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link/Collection.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link/Collection.php
@@ -1,142 +1,142 @@
-
- */
-class Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Collection
- extends Mage_Core_Model_Mysql4_Collection_Abstract
-{
- protected $_product;
- protected $_linkModel;
- protected $_linkTypeId;
-
- protected function _construct()
- {
- $this->_init('catalog/product_link');
- }
-
- /**
- * Declare link model and initialize type attributes join
- *
- * @param Mage_Catalog_Model_Product_Link $linkModel
- * @return Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Collection
- */
- public function setLinkModel($linkModel)
- {
- $this->_linkModel = $linkModel;
- if ($linkModel->getLinkTypeId()) {
- $this->_linkTypeId = $linkModel->getLinkTypeId();
- }
- return $this;
- }
-
- /**
- * Retrieve collection link model
- *
- * @return Mage_Catalog_Model_Product_Link
- */
- public function getLinkModel()
- {
- return $this->_linkModel;
- }
-
- /**
- * Initialize collection parent product and add limitation join
- *
- * @param Mage_Catalog_Model_Product $product
- * @return Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Collection
- */
- public function setProduct($product)
- {
- $this->_product = $product;
- return $this;
- }
-
- /**
- * Retrieve collection base product object
- *
- * @return Mage_Catalog_Model_Product
- */
- public function getProduct()
- {
- return $this->_product;
- }
-
- /**
- * Add link's type to filter
- *
- * @return Mage_Catalog_Model_Product
- */
- public function addLinkTypeIdFilter()
- {
- if ($this->_linkTypeId) {
- $this->addFieldToFilter("link_type_id", $this->_linkTypeId);
- }
- return $this;
- }
-
- /**
- * Add product to filter
- *
- * @return Mage_Catalog_Model_Product
- */
- public function addProductIdFilter()
- {
- if ($this->getProduct() && $this->getProduct()->getId()) {
- $this->addFieldToFilter("product_id", $this->getProduct()->getId());
- }
- return $this;
- }
-
- /**
- * Join attributes
- *
- * @return Mage_Catalog_Model_Product
- */
- public function joinAttributes()
- {
- if ($this->getLinkModel()) {
- $attributes = $this->getLinkModel()->getAttributes();
- $attributesByType = array();
- foreach ($attributes as $attribute) {
- $table = $this->getLinkModel()->getAttributeTypeTable($attribute['type']);
- $alias = 'link_attribute_'.$attribute['code'].'_'.$attribute['type'];
- $this->getSelect()->joinLeft(
- array($alias => $table),
- $alias.'.link_id=main_table.link_id AND '.$alias.'.product_link_attribute_id='.$attribute['id'],
- array($attribute['code'] => 'value')
- );
- }
- }
- return $this;
- }
-}
\ No newline at end of file
+
+ */
+class Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Collection
+ extends Mage_Core_Model_Mysql4_Collection_Abstract
+{
+ protected $_product;
+ protected $_linkModel;
+ protected $_linkTypeId;
+
+ protected function _construct()
+ {
+ $this->_init('catalog/product_link');
+ }
+
+ /**
+ * Declare link model and initialize type attributes join
+ *
+ * @param Mage_Catalog_Model_Product_Link $linkModel
+ * @return Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Collection
+ */
+ public function setLinkModel($linkModel)
+ {
+ $this->_linkModel = $linkModel;
+ if ($linkModel->getLinkTypeId()) {
+ $this->_linkTypeId = $linkModel->getLinkTypeId();
+ }
+ return $this;
+ }
+
+ /**
+ * Retrieve collection link model
+ *
+ * @return Mage_Catalog_Model_Product_Link
+ */
+ public function getLinkModel()
+ {
+ return $this->_linkModel;
+ }
+
+ /**
+ * Initialize collection parent product and add limitation join
+ *
+ * @param Mage_Catalog_Model_Product $product
+ * @return Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Collection
+ */
+ public function setProduct($product)
+ {
+ $this->_product = $product;
+ return $this;
+ }
+
+ /**
+ * Retrieve collection base product object
+ *
+ * @return Mage_Catalog_Model_Product
+ */
+ public function getProduct()
+ {
+ return $this->_product;
+ }
+
+ /**
+ * Add link's type to filter
+ *
+ * @return Mage_Catalog_Model_Product
+ */
+ public function addLinkTypeIdFilter()
+ {
+ if ($this->_linkTypeId) {
+ $this->addFieldToFilter("link_type_id", $this->_linkTypeId);
+ }
+ return $this;
+ }
+
+ /**
+ * Add product to filter
+ *
+ * @return Mage_Catalog_Model_Product
+ */
+ public function addProductIdFilter()
+ {
+ if ($this->getProduct() && $this->getProduct()->getId()) {
+ $this->addFieldToFilter("product_id", $this->getProduct()->getId());
+ }
+ return $this;
+ }
+
+ /**
+ * Join attributes
+ *
+ * @return Mage_Catalog_Model_Product
+ */
+ public function joinAttributes()
+ {
+ if ($this->getLinkModel()) {
+ $attributes = $this->getLinkModel()->getAttributes();
+ $attributesByType = array();
+ foreach ($attributes as $attribute) {
+ $table = $this->getLinkModel()->getAttributeTypeTable($attribute['type']);
+ $alias = 'link_attribute_'.$attribute['code'].'_'.$attribute['type'];
+ $this->getSelect()->joinLeft(
+ array($alias => $table),
+ $alias.'.link_id=main_table.link_id AND '.$alias.'.product_link_attribute_id='.$attribute['id'],
+ array($attribute['code'] => 'value')
+ );
+ }
+ }
+ return $this;
+ }
+}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link/Product/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link/Product/Collection.php
index f8ea1a4f16..e10e80704d 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link/Product/Collection.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link/Product/Collection.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option.php
index e3d409d132..1b27dc0918 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Collection.php
index 5aa3794178..efa35eaa21 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Collection.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Collection.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
@@ -145,4 +145,4 @@ public function reset() {
return $this->_reset();
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Value.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Value.php
index 66ecca029a..f4e731deef 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Value.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Value.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
@@ -260,4 +260,4 @@ public function duplicate(Mage_Catalog_Model_Product_Option_Value $object, $oldO
return $object;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Value/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Value/Collection.php
index 08ba205850..92ae9a8eeb 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Value/Collection.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Value/Collection.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
@@ -138,4 +138,4 @@ public function addOptionToFilter($option)
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Status.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Status.php
index 992f39ab27..9b13f0c3ea 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Status.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Status.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable.php
index cbdfe41114..56776f92d5 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
@@ -81,7 +81,7 @@ public function saveProducts($mainProduct, $productIds)
if (!empty($insert)) {
$data = array();
foreach ($insert as $childId) {
- $data = array(
+ $data[] = array(
'product_id' => $childId,
'parent_id' => $mainProductId
);
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Attribute.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Attribute.php
index bff820b869..1cd8782071 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Attribute.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Attribute.php
@@ -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_Catalog
- * @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)
+ * @category Mage
+ * @package Mage_Catalog
+ * @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)
*/
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Attribute/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Attribute/Collection.php
index 8dc84102b9..6a4986cde9 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Attribute/Collection.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Attribute/Collection.php
@@ -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_Catalog
- * @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)
+ * @category Mage
+ * @package Mage_Catalog
+ * @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)
*/
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Product/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Product/Collection.php
index 2492424577..09a4b7ecaf 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Product/Collection.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Product/Collection.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Website.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Website.php
index 1bbe4c9ad8..9cc201b584 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Website.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Website.php
@@ -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_Catalog
- * @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)
+ * @category Mage
+ * @package Mage_Catalog
+ * @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)
*/
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Sendfriend.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Sendfriend.php
index 3a8ba8348b..00bfe55047 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Sendfriend.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Sendfriend.php
@@ -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_Catalog
- * @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_Catalog
+ * @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_Catalog_Model_Resource_Eav_Mysql4_Sendfriend extends Mage_Core_Model_Mysql4_Abstract
@@ -50,4 +50,4 @@ public function deleteLogsBefore($time)
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Sendfriend/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Sendfriend/Collection.php
index 7c6f443a96..72e37f7b85 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Sendfriend/Collection.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Sendfriend/Collection.php
@@ -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_Catalog
- * @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_Catalog
+ * @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_Catalog_Model_Resource_Eav_Mysql4_Sendfriend_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract
@@ -30,4 +30,4 @@ protected function _construct()
{
$this->_init('catalog/sendfriend');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Setup.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Setup.php
index 019bd39ba9..d7c981d82d 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Setup.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Setup.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
@@ -1263,7 +1263,7 @@ public function getDefaultEntities()
'input' => 'textarea',
'class' => '',
'source' => '',
- 'global' => Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_GLOBAL,
+ 'global' => Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_STORE,
'visible' => true,
'required' => false,
'user_defined' => false,
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Url.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Url.php
index dbb66a7410..0abf7ef5a2 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Url.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Url.php
@@ -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_Catalog
- * @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)
+ * @category Mage
+ * @package Mage_Catalog
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Catalog/Model/Sendfriend.php b/app/code/core/Mage/Catalog/Model/Sendfriend.php
index 1421f83569..efb6870e9f 100644
--- a/app/code/core/Mage/Catalog/Model/Sendfriend.php
+++ b/app/code/core/Mage/Catalog/Model/Sendfriend.php
@@ -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_Catalog
- * @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_Catalog
+ * @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_Catalog_Model_Sendfriend extends Mage_Core_Model_Abstract
@@ -264,4 +264,4 @@ private function _deleteLogsBefore($time)
$this->_getResource()->deleteLogsBefore($time);
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Catalog/Model/Session.php b/app/code/core/Mage/Catalog/Model/Session.php
index bb3ffb481b..b07be2624d 100644
--- a/app/code/core/Mage/Catalog/Model/Session.php
+++ b/app/code/core/Mage/Catalog/Model/Session.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Catalog/Model/Url.php b/app/code/core/Mage/Catalog/Model/Url.php
index dbe0184312..4e40b99690 100644
--- a/app/code/core/Mage/Catalog/Model/Url.php
+++ b/app/code/core/Mage/Catalog/Model/Url.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
@@ -674,4 +674,4 @@ public function generatePath($type = 'target', $product = null, $category = null
}
return 'catalog/product/view/id/' . $product->getId();
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Catalog/controllers/CategoryController.php b/app/code/core/Mage/Catalog/controllers/CategoryController.php
index e1680e02f5..ceefe66926 100644
--- a/app/code/core/Mage/Catalog/controllers/CategoryController.php
+++ b/app/code/core/Mage/Catalog/controllers/CategoryController.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Catalog/controllers/IndexController.php b/app/code/core/Mage/Catalog/controllers/IndexController.php
index b9a318917a..ad98e1983f 100644
--- a/app/code/core/Mage/Catalog/controllers/IndexController.php
+++ b/app/code/core/Mage/Catalog/controllers/IndexController.php
@@ -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_Catalog
- * @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_Catalog
+ * @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_Catalog_IndexController extends Mage_Core_Controller_Front_Action
diff --git a/app/code/core/Mage/Catalog/controllers/Product/CompareController.php b/app/code/core/Mage/Catalog/controllers/Product/CompareController.php
index 96c39a470f..1b6bf5710e 100644
--- a/app/code/core/Mage/Catalog/controllers/Product/CompareController.php
+++ b/app/code/core/Mage/Catalog/controllers/Product/CompareController.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
@@ -150,4 +150,4 @@ public function clearAction()
$this->_redirectReferer();
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Catalog/controllers/ProductController.php b/app/code/core/Mage/Catalog/controllers/ProductController.php
index b33489b3c8..59ab5a6f8a 100644
--- a/app/code/core/Mage/Catalog/controllers/ProductController.php
+++ b/app/code/core/Mage/Catalog/controllers/ProductController.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Catalog/controllers/Seo/SitemapController.php b/app/code/core/Mage/Catalog/controllers/Seo/SitemapController.php
index 84a78c9723..62dffcf495 100644
--- a/app/code/core/Mage/Catalog/controllers/Seo/SitemapController.php
+++ b/app/code/core/Mage/Catalog/controllers/Seo/SitemapController.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
diff --git a/app/code/core/Mage/Catalog/etc/adminhtml.xml b/app/code/core/Mage/Catalog/etc/adminhtml.xml
index 7a92c22d03..c917d6f8ca 100644
--- a/app/code/core/Mage/Catalog/etc/adminhtml.xml
+++ b/app/code/core/Mage/Catalog/etc/adminhtml.xml
@@ -19,10 +19,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_Catalog
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ * @category Mage
+ * @package Mage_Catalog
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
@@ -38,10 +38,12 @@
Manage Products
adminhtml/catalog_product/
+ 0
Manage Categories
adminhtml/catalog_category/
+ 10
Attributes
@@ -55,10 +57,12 @@
adminhtml/catalog_product_set/
+ 20
URL Rewrite Management
adminhtml/urlrewrite/index
+ 30
@@ -102,9 +106,6 @@
Update Attributes
-
- Search
-
Url Rewrite Management
diff --git a/app/code/core/Mage/Catalog/etc/api.xml b/app/code/core/Mage/Catalog/etc/api.xml
index 2fa71d02c8..b9a12ab8ab 100644
--- a/app/code/core/Mage/Catalog/etc/api.xml
+++ b/app/code/core/Mage/Catalog/etc/api.xml
@@ -21,8 +21,8 @@
*
* @category Mage
* @package Mage_Catalog
- * @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)
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
@@ -515,4 +515,4 @@
-
\ No newline at end of file
+
diff --git a/app/code/core/Mage/Catalog/etc/config.xml b/app/code/core/Mage/Catalog/etc/config.xml
index e9ed7ea01c..27eec4d731 100644
--- a/app/code/core/Mage/Catalog/etc/config.xml
+++ b/app/code/core/Mage/Catalog/etc/config.xml
@@ -19,16 +19,16 @@
* 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_Catalog
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ * @category Mage
+ * @package Mage_Catalog
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
- 1.4.0.0.10
+ 1.4.0.0.11
diff --git a/app/code/core/Mage/Catalog/etc/convert.xml b/app/code/core/Mage/Catalog/etc/convert.xml
index 04040a6ce3..a19df36f1e 100644
--- a/app/code/core/Mage/Catalog/etc/convert.xml
+++ b/app/code/core/Mage/Catalog/etc/convert.xml
@@ -129,4 +129,4 @@
upload
-
\ No newline at end of file
+
diff --git a/app/code/core/Mage/Catalog/etc/system.xml b/app/code/core/Mage/Catalog/etc/system.xml
index 18b44818ca..97b01be3ff 100644
--- a/app/code/core/Mage/Catalog/etc/system.xml
+++ b/app/code/core/Mage/Catalog/etc/system.xml
@@ -19,10 +19,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_Catalog
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ * @category Mage
+ * @package Mage_Catalog
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
diff --git a/app/code/core/Mage/Catalog/etc/widget.xml b/app/code/core/Mage/Catalog/etc/widget.xml
index c0199db194..b87dbacbae 100644
--- a/app/code/core/Mage/Catalog/etc/widget.xml
+++ b/app/code/core/Mage/Catalog/etc/widget.xml
@@ -19,92 +19,145 @@
* 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_Catalog
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ * @category Mage
+ * @package Mage_Catalog
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-
-
-
- Catalog New Products List
- List of Products that are marked as New
-
-
- 1
- 1
- 5
-
- text
-
-
- 1
- catalog/product/new.phtml
-
-
-
- 86400 by default, if not set
- 1
- text
-
-
-
+
+
+ Catalog New Products List
+ List of Products that are set as New
+
+
+ 1
+ 1
+ 5
+
+ text
+
+
+ 1
+ 1
+
+ select
+ catalog/product/widget/new/content/new_grid.phtml
+
+
+ catalog/product/widget/new/content/new_grid.phtml
+
+
+
+ catalog/product/widget/new/content/new_list.phtml
+
+
+
+
+
+
+ 86400 by default, if not set. To refresh instantly, Clear the Blocks HTML Output Cache.
+ 1
+ text
+
+
+
-
- Catalog Product Link
- Link to a Specified Product
-
-
- 1
- 1
-
-
- label
- adminhtml/catalog_product_widget_chooser
-
- 10
-
-
- 1
-
- If empty, the Product Name will be used
- text
-
-
- <visible>1</visible>
- <label>Anchor Title</label>
- <type>text</type>
-
-
-
+
+ Catalog Product Link
+ Link to a Specified Product
+
+
+ 1
+ 1
+
+ label
+
+ adminhtml/catalog_product_widget_chooser
+
+
+
+
+ 10
+
+
+ 1
+
+ If empty, the Product Name will be used
+ text
+
+
+ <visible>1</visible>
+ <label>Anchor Custom Title</label>
+ <type>text</type>
+
+
+
+ 1
+ select
+ catalog/product/widget/link/link_block.phtml
+
+
+ catalog/product/widget/link/link_block.phtml
+
+
+
+ catalog/product/widget/link/link_inline.phtml
+
+
+
+
+
+
-
- Catalog Category Link
- Link to a Specified Category
-
-
- 1
- 1
-
-
- label
- adminhtml/catalog_category_widget_chooser
-
- 10
-
-
- 1
-
- If empty, the Category Name will be used
- text
-
-
- <visible>1</visible>
- <label>Anchor Title</label>
- <type>text</type>
-
-
-
-
-
+
+ Catalog Category Link
+ Link to a Specified Category
+
+
+ 1
+ 1
+
+ label
+
+ adminhtml/catalog_category_widget_chooser
+
+
+
+
+ 10
+
+
+ 1
+
+ If empty, the Category Name will be used
+ text
+
+
+ <visible>1</visible>
+ <label>Anchor Custom Title</label>
+ <type>text</type>
+
+
+
+ 1
+ select
+ catalog/category/widget/link/link_block.phtml
+
+
+ catalog/category/widget/link/link_block.phtml
+
+
+
+ catalog/category/widget/link/link_inline.phtml
+
+
+
+
+
+
+
diff --git a/app/code/core/Mage/Catalog/etc/wsdl.xml b/app/code/core/Mage/Catalog/etc/wsdl.xml
index f9b1f10599..5f292e36dd 100644
--- a/app/code/core/Mage/Catalog/etc/wsdl.xml
+++ b/app/code/core/Mage/Catalog/etc/wsdl.xml
@@ -364,6 +364,13 @@
+
+
+
+
+
+
+
@@ -431,6 +438,13 @@
+
+
+
+
+
+
+
@@ -475,6 +489,13 @@
+
+
+
+
+
+
+
@@ -693,7 +714,7 @@
-
+
@@ -787,8 +808,8 @@
Set/Get current store view
-
-
+
+
Retrieve products list by filters
@@ -827,8 +848,8 @@
Set/Get current store view
-
-
+
+
Retrieve attribute list
@@ -862,8 +883,8 @@
Set/Get current store view
-
-
+
+
Retrieve product image list
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-install-0.7.0.php
index e33a0b1e20..b16672a7a2 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-install-0.7.0.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-install-0.7.0.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-install-1.4.0.0.0.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-install-1.4.0.0.0.php
index 4202ec7a32..f9c9864c5d 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-install-1.4.0.0.0.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-install-1.4.0.0.0.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/* @var $installer Mage_Catalog_Model_Resource_Eav_Mysql4_Setup */
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.6.40-0.7.0.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.6.40-0.7.0.php
index cf6b0e4ea4..4a19087845 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.6.40-0.7.0.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.6.40-0.7.0.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.0-0.7.1.php
index d277f07a90..758128986f 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.0-0.7.1.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.0-0.7.1.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
$this->startSetup()->run("
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.1-0.7.2.php
index 480aa3562a..c19c440e9e 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.1-0.7.2.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.1-0.7.2.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
$this->addAttributeGroup('catalog_product', 'Default', 'Design', 6);
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.11-0.7.12.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.11-0.7.12.php
index e4a3de1e81..b79c4d7a90 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.11-0.7.12.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.11-0.7.12.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.12-0.7.13.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.12-0.7.13.php
index 6051721b09..ede799bb82 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.12-0.7.13.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.12-0.7.13.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.13-0.7.14.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.13-0.7.14.php
index 37475fca4e..868343a8ac 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.13-0.7.14.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.13-0.7.14.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.14-0.7.15.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.14-0.7.15.php
index d22e5f9f1d..8dbb3b4924 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.14-0.7.15.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.14-0.7.15.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
$this->startSetup()->run("
delete link1.*
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.15-0.7.16.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.15-0.7.16.php
index 8163d84063..7ff45ad585 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.15-0.7.16.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.15-0.7.16.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
$installer = $this;
@@ -40,4 +40,4 @@
WHEN '5' THEN 'virtual'
ELSE `type_id` END;
");
-$installer->endSetup();
\ No newline at end of file
+$installer->endSetup();
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.16-0.7.17.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.16-0.7.17.php
index 6051721b09..ede799bb82 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.16-0.7.17.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.16-0.7.17.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.17-0.7.18.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.17-0.7.18.php
index 359dcea1b2..dac90ba144 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.17-0.7.18.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.17-0.7.18.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.18-0.7.19.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.18-0.7.19.php
index c2fd149405..ecc6a2c401 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.18-0.7.19.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.18-0.7.19.php
@@ -1,34 +1,34 @@
-getEntityTypeId('catalog_product');
-$installer->run("
- UPDATE `{$installer->getTable('eav_attribute')}`
- SET `apply_to` = IF(`use_in_super_product`, 'simple,grouped,configurable', 'simple')
- WHERE `entity_type_id` = $entityTypeId;
-");
-$installer->getConnection()->dropColumn($installer->getTable('eav_attribute'), 'use_in_super_product');
\ No newline at end of file
+getEntityTypeId('catalog_product');
+$installer->run("
+ UPDATE `{$installer->getTable('eav_attribute')}`
+ SET `apply_to` = IF(`use_in_super_product`, 'simple,grouped,configurable', 'simple')
+ WHERE `entity_type_id` = $entityTypeId;
+");
+$installer->getConnection()->dropColumn($installer->getTable('eav_attribute'), 'use_in_super_product');
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.19-0.7.20.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.19-0.7.20.php
index e4a3de1e81..b79c4d7a90 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.19-0.7.20.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.19-0.7.20.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.2-0.7.3.php
index f0375db6b8..2d74d2310b 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.2-0.7.3.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.2-0.7.3.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
$this->run("
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.20-0.7.21.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.20-0.7.21.php
index b452e0ebba..612ba2fe23 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.20-0.7.21.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.20-0.7.21.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.21-0.7.22.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.21-0.7.22.php
index 16ca9c38a6..a7af3c8878 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.21-0.7.22.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.21-0.7.22.php
@@ -1,41 +1,41 @@
-run("
-ALTER TABLE `{$this->getTable('catalog_product_entity_tier_price')}` MODIFY COLUMN `qty` DECIMAL(12,4) NOT NULL DEFAULT 1;
-DELETE FROM `{$this->getTable('catalog_product_entity_tier_price')}` WHERE store_id>0;
-ALTER TABLE `{$this->getTable('catalog_product_entity_tier_price')}` DROP COLUMN `store_id`,
- ADD COLUMN `website_id` SMALLINT(5) UNSIGNED NOT NULL AFTER `value`
-, DROP INDEX `FK_CATALOG_PRODUCT_ENTITY_TIER_PRICE_STORE`,
- DROP FOREIGN KEY `FK_CATALOG_PRODUCT_ENTITY_TIER_PRICE_STORE`,
- ADD CONSTRAINT `FK_CATALOG_PRODUCT_TIER_WEBSITE` FOREIGN KEY `FK_CATALOG_PRODUCT_TIER_WEBSITE` (`website_id`)
- REFERENCES `{$this->getTable('core_website')}` (`website_id`)
- ON DELETE CASCADE
- ON UPDATE CASCADE;
-");
\ No newline at end of file
+run("
+ALTER TABLE `{$this->getTable('catalog_product_entity_tier_price')}` MODIFY COLUMN `qty` DECIMAL(12,4) NOT NULL DEFAULT 1;
+DELETE FROM `{$this->getTable('catalog_product_entity_tier_price')}` WHERE store_id>0;
+ALTER TABLE `{$this->getTable('catalog_product_entity_tier_price')}` DROP COLUMN `store_id`,
+ ADD COLUMN `website_id` SMALLINT(5) UNSIGNED NOT NULL AFTER `value`
+, DROP INDEX `FK_CATALOG_PRODUCT_ENTITY_TIER_PRICE_STORE`,
+ DROP FOREIGN KEY `FK_CATALOG_PRODUCT_ENTITY_TIER_PRICE_STORE`,
+ ADD CONSTRAINT `FK_CATALOG_PRODUCT_TIER_WEBSITE` FOREIGN KEY `FK_CATALOG_PRODUCT_TIER_WEBSITE` (`website_id`)
+ REFERENCES `{$this->getTable('core_website')}` (`website_id`)
+ ON DELETE CASCADE
+ ON UPDATE CASCADE;
+");
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.22-0.7.23.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.22-0.7.23.php
index caa2534333..9d2a0442c0 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.22-0.7.23.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.22-0.7.23.php
@@ -1,27 +1,27 @@
-installEntities();
\ No newline at end of file
+installEntities();
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.23-0.7.24.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.23-0.7.24.php
index 594ec2f3ac..039e748029 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.23-0.7.24.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.23-0.7.24.php
@@ -1,30 +1,30 @@
-run("UPDATE `{$this->getTable('catalog_category_entity')}` SET `position` = `entity_id` WHERE `position` = 0;");
+run("UPDATE `{$this->getTable('catalog_category_entity')}` SET `position` = `entity_id` WHERE `position` = 0;");
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.24-0.7.25.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.24-0.7.25.php
index 569341770d..26da8027d5 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.24-0.7.25.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.24-0.7.25.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.25-0.7.26.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.25-0.7.26.php
index 569341770d..26da8027d5 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.25-0.7.26.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.25-0.7.26.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.26-0.7.27.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.26-0.7.27.php
index ae5b10de5f..59de5a6114 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.26-0.7.27.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.26-0.7.27.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
$installer = $this;
@@ -72,4 +72,4 @@
'FK_CORE_URL_REWRITE_PRODUCT', $installer->getTable('core_url_rewrite'), 'product_id',
$installer->getTable('catalog_product_entity'), 'entity_id'
);
-$installer->endSetup();
\ No newline at end of file
+$installer->endSetup();
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.27-0.7.28.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.27-0.7.28.php
index f1d8c2cd84..7a64ee1236 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.27-0.7.28.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.27-0.7.28.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.28-0.7.29.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.28-0.7.29.php
index c67894ad34..2bb37305ad 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.28-0.7.29.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.28-0.7.29.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.29-0.7.30.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.29-0.7.30.php
index 4678ed7261..edf3cc1c92 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.29-0.7.30.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.29-0.7.30.php
@@ -1,39 +1,39 @@
-startSetup();
-$installer->updateAttribute('catalog_category', 'is_active', 'is_global', Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_STORE);
-$installer->updateAttribute('catalog_category', 'image', 'is_global', Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_STORE);
-$installer->updateAttribute('catalog_category', 'display_mode', 'is_global', Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_STORE);
-$installer->updateAttribute('catalog_category', 'landing_page', 'is_global', Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_STORE);
-$installer->updateAttribute('catalog_category', 'page_layout', 'is_global', Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_STORE);
-$installer->updateAttribute('catalog_category', 'custom_layout_update', 'is_global', Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_STORE);
-
-$installer->updateAttribute('catalog_product', 'status', 'is_global', Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_WEBSITE);
-$installer->endSetup();
+startSetup();
+$installer->updateAttribute('catalog_category', 'is_active', 'is_global', Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_STORE);
+$installer->updateAttribute('catalog_category', 'image', 'is_global', Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_STORE);
+$installer->updateAttribute('catalog_category', 'display_mode', 'is_global', Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_STORE);
+$installer->updateAttribute('catalog_category', 'landing_page', 'is_global', Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_STORE);
+$installer->updateAttribute('catalog_category', 'page_layout', 'is_global', Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_STORE);
+$installer->updateAttribute('catalog_category', 'custom_layout_update', 'is_global', Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_STORE);
+
+$installer->updateAttribute('catalog_product', 'status', 'is_global', Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_WEBSITE);
+$installer->endSetup();
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.30-0.7.31.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.30-0.7.31.php
index 8f291b78e5..2dfe654a73 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.30-0.7.31.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.30-0.7.31.php
@@ -1,35 +1,35 @@
-run("
-//
-//update `{$installer->getTable('eav/attribute')}` set `is_required`=0 where `attribute_id`='{$installer->getAttributeId('catalog_product', 'tax_class_id')}'
-//
-//");
-//
\ No newline at end of file
+run("
+//
+//update `{$installer->getTable('eav/attribute')}` set `is_required`=0 where `attribute_id`='{$installer->getAttributeId('catalog_product', 'tax_class_id')}'
+//
+//");
+//
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.31-0.7.32.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.31-0.7.32.php
index 65a2d2df57..aebd26022a 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.31-0.7.32.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.31-0.7.32.php
@@ -1,34 +1,34 @@
-run("
-
-update `{$installer->getTable('eav/attribute')}` set `is_required`=1 where `attribute_id`='{$installer->getAttributeId('catalog_product', 'tax_class_id')}'
-
-");
+run("
+
+update `{$installer->getTable('eav/attribute')}` set `is_required`=1 where `attribute_id`='{$installer->getAttributeId('catalog_product', 'tax_class_id')}'
+
+");
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.32-0.7.33.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.32-0.7.33.php
index 5e50803690..2daf6cea98 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.32-0.7.33.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.32-0.7.33.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.33-0.7.34.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.33-0.7.34.php
index 9d2ebf7d4d..36644bbcbb 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.33-0.7.34.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.33-0.7.34.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
$installer = $this;
@@ -59,4 +59,4 @@
ADD UNIQUE `UNQ_CATEGORY_PRODUCT` (`category_id`, `product_id`);
");
-$installer->endSetup();
\ No newline at end of file
+$installer->endSetup();
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.34-0.7.35.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.34-0.7.35.php
index 845debc2ef..665dcb2bac 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.34-0.7.35.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.34-0.7.35.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
$installer = $this;
@@ -31,4 +31,4 @@
$installer->run("ALTER TABLE `{$installer->getTable('catalog_category_entity')}` DROP `is_active`;");
-$installer->endSetup();
\ No newline at end of file
+$installer->endSetup();
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.35-0.7.36.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.35-0.7.36.php
index 4df2d15d62..663e86b3e1 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.35-0.7.36.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.35-0.7.36.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
$installer = $this;
@@ -58,4 +58,4 @@
'unique' => false,
));
-$installer->endSetup();
\ No newline at end of file
+$installer->endSetup();
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.36-0.7.37.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.36-0.7.37.php
index e33085d7f0..d0081484b1 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.36-0.7.37.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.36-0.7.37.php
@@ -1,47 +1,47 @@
-startSetup();
-try {
- $installer->run("
- ALTER TABLE `{$installer->getTable('catalog_product_website')}` ENGINE = InnoDB CHARACTER SET utf8 COLLATE utf8_general_ci;
-
- delete from `{$installer->getTable('catalog_product_website')}` where product_id not in (select entity_id from catalog_product_entity);
- delete from `{$installer->getTable('catalog_product_website')}` where website_id not in (select website_id from core_website);
-
- ALTER TABLE `{$installer->getTable('catalog_product_website')}` DROP INDEX `FK_CATALOG_PRODUCT_WEBSITE_WEBSITE`,
- ADD CONSTRAINT `FK_CATALOG_PRODUCT_WEBSITE_PRODUCT` FOREIGN KEY `FK_CATALOG_PRODUCT_WEBSITE_PRODUCT` (`product_id`)
- REFERENCES `{$installer->getTable('catalog_product_entity')}` (`entity_id`) ON DELETE CASCADE ON UPDATE CASCADE,
- ADD CONSTRAINT `FK_CATAOLOG_PRODUCT_WEBSITE_WEBSITE` FOREIGN KEY `FK_CATAOLOG_PRODUCT_WEBSITE_WEBSITE` (`website_id`)
- REFERENCES `{$installer->getTable('core_website')}` (`website_id`) ON DELETE CASCADE ON UPDATE CASCADE,
- ROW_FORMAT = FIXED;
- ");
-} catch (Exception $e) {
-}
-$installer->endSetup();
+startSetup();
+try {
+ $installer->run("
+ ALTER TABLE `{$installer->getTable('catalog_product_website')}` ENGINE = InnoDB CHARACTER SET utf8 COLLATE utf8_general_ci;
+
+ delete from `{$installer->getTable('catalog_product_website')}` where product_id not in (select entity_id from catalog_product_entity);
+ delete from `{$installer->getTable('catalog_product_website')}` where website_id not in (select website_id from core_website);
+
+ ALTER TABLE `{$installer->getTable('catalog_product_website')}` DROP INDEX `FK_CATALOG_PRODUCT_WEBSITE_WEBSITE`,
+ ADD CONSTRAINT `FK_CATALOG_PRODUCT_WEBSITE_PRODUCT` FOREIGN KEY `FK_CATALOG_PRODUCT_WEBSITE_PRODUCT` (`product_id`)
+ REFERENCES `{$installer->getTable('catalog_product_entity')}` (`entity_id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ ADD CONSTRAINT `FK_CATAOLOG_PRODUCT_WEBSITE_WEBSITE` FOREIGN KEY `FK_CATAOLOG_PRODUCT_WEBSITE_WEBSITE` (`website_id`)
+ REFERENCES `{$installer->getTable('core_website')}` (`website_id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ ROW_FORMAT = FIXED;
+ ");
+} catch (Exception $e) {
+}
+$installer->endSetup();
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.37-0.7.38.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.37-0.7.38.php
index eb2a926a16..333b5ba300 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.37-0.7.38.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.37-0.7.38.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
$installer = $this;
@@ -110,4 +110,4 @@
)ENGINE=InnoDB default CHARSET=utf8;
");
-$installer->endSetup();
\ No newline at end of file
+$installer->endSetup();
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.38-0.7.39.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.38-0.7.39.php
index 5872d2cb8f..b6eb518caf 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.38-0.7.39.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.38-0.7.39.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
$installer = $this;
@@ -34,4 +34,4 @@
");
-$installer->endSetup();
\ No newline at end of file
+$installer->endSetup();
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.39-0.7.40.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.39-0.7.40.php
index 9c347e2441..8cda5ce85f 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.39-0.7.40.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.39-0.7.40.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
$installer = $this;
@@ -39,4 +39,4 @@
}
}
-$installer->endSetup();
\ No newline at end of file
+$installer->endSetup();
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.4-0.7.5.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.4-0.7.5.php
index 71d734643c..237e4bd5eb 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.4-0.7.5.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.4-0.7.5.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
$installer = $this;
@@ -50,13 +50,13 @@
$installer->getConnection()->dropColumn($productTable, 'is_active');
try {
- $installer->run("
- INSERT INTO {$this->getTable('catalog_product_website')}
- SELECT DISTINCT ps.product_id, cs.website_id
- FROM {$this->getTable('catalog_product_store')} ps, {$this->getTable('core_store')} cs
- WHERE cs.store_id=ps.store_id AND ps.store_id>0;
- DROP TABLE IF EXISTS {$this->getTable('catalog_product_store')};
- ");
+ $installer->run("
+ INSERT INTO {$this->getTable('catalog_product_website')}
+ SELECT DISTINCT ps.product_id, cs.website_id
+ FROM {$this->getTable('catalog_product_store')} ps, {$this->getTable('core_store')} cs
+ WHERE cs.store_id=ps.store_id AND ps.store_id>0;
+ DROP TABLE IF EXISTS {$this->getTable('catalog_product_store')};
+ ");
} catch (Exception $e) {
}
@@ -68,7 +68,7 @@
} catch (Exception $e) {
}
try {
- $this->run("DROP TABLE IF EXISTS `{$this->getTable('catalog/category_tree')}`;");
+ $this->run("DROP TABLE IF EXISTS `{$this->getTable('catalog/category_tree')}`;");
} catch (Exception $e) {
}
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.40-0.7.41.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.40-0.7.41.php
index baa9942d09..62e1f5710b 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.40-0.7.41.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.40-0.7.41.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.41-0.7.42.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.41-0.7.42.php
index 645b13dca4..b8fa03aea5 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.41-0.7.42.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.41-0.7.42.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
$installer = $this;
@@ -35,4 +35,4 @@
$installer->getConnection()->addKey($installer->getTable('catalog_product_entity_text'), 'IDX_ATTRIBUTE_VALUE', array('entity_id', 'attribute_id', 'store_id'));
$installer->getConnection()->addKey($installer->getTable('catalog_product_entity_varchar'), 'IDX_ATTRIBUTE_VALUE', array('entity_id', 'attribute_id', 'store_id'));
-$installer->endSetup();
\ No newline at end of file
+$installer->endSetup();
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.42-0.7.43.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.42-0.7.43.php
index 6d9e44c943..56e66c129f 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.42-0.7.43.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.42-0.7.43.php
@@ -18,9 +18,9 @@
* 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_Catalog
- * @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_Catalog
+ * @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)
*/
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.43-0.7.44.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.43-0.7.44.php
index 735e8319b3..85fd42801d 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.43-0.7.44.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.43-0.7.44.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
$installer = $this;
@@ -34,4 +34,4 @@
'default' => false
));
-$installer->endSetup();
\ No newline at end of file
+$installer->endSetup();
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.44-0.7.45.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.44-0.7.45.php
index c12c489e53..8f00ab7aa9 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.44-0.7.45.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.44-0.7.45.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
$installer = $this;
@@ -31,4 +31,4 @@
$installer->updateAttribute('catalog_product', 'tax_class_id', 'apply_to', 'simple,configurable,virtual');
-$installer->endSetup();
\ No newline at end of file
+$installer->endSetup();
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.45-0.7.46.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.45-0.7.46.php
index c071b7253e..902aad3563 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.45-0.7.46.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.45-0.7.46.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
$installer = $this;
@@ -31,4 +31,4 @@
$installer->updateAttribute('catalog_product', 'tier_price', 'is_used_for_price_rules', '0');
-$installer->endSetup();
\ No newline at end of file
+$installer->endSetup();
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.46-0.7.47.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.46-0.7.47.php
index 0957f3a617..488edb9911 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.46-0.7.47.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.46-0.7.47.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
$installer = $this;
@@ -107,9 +107,9 @@
");
foreach ($storeIds as $storeId) {
if (!$storeId) {
- continue;
+ continue;
}
- $installer->run("
+ $installer->run("
INSERT INTO {$installer->getTable('catalog_product_enabled_index')}
SELECT t_v_default.entity_id, {$storeId}, IFNULL(t_v.value, t_v_default.value)
FROM {$installer->getTable('catalog_product_entity_int')} AS t_v_default
@@ -123,7 +123,7 @@
WHERE
t_v_default.attribute_id='{$visibilityAttributeId}' AND t_v_default.store_id=0
AND (IFNULL(t_s.value, t_s_default.value)=".Mage_Catalog_Model_Product_Status::STATUS_ENABLED.")
- ");
+ ");
}
}
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.47-0.7.48.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.47-0.7.48.php
index c21b44b2d5..80a4ee1cff 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.47-0.7.48.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.47-0.7.48.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.48-0.7.49.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.48-0.7.49.php
index 6a9b4a4aaf..52e3874e57 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.48-0.7.49.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.48-0.7.49.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.49-0.7.50.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.49-0.7.50.php
index f76445e60c..513adfdccb 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.49-0.7.50.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.49-0.7.50.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/* @var $this Mage_Catalog_Model_Resource_Eav_Mysql4_Setup */
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.5-0.7.6.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.5-0.7.6.php
index 98e27e1492..732984c803 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.5-0.7.6.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.5-0.7.6.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.50-0.7.51.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.50-0.7.51.php
index 7fff4855aa..85f9280b71 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.50-0.7.51.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.50-0.7.51.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/* @var $this Mage_Catalog_Model_Resource_Eav_Mysql4_Setup */
@@ -41,4 +41,4 @@
WHERE `entity_id` = {$row['entity_id']}");
}
-$this->endSetup();
\ No newline at end of file
+$this->endSetup();
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.51-0.7.52.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.51-0.7.52.php
index 56888ac37d..4e543d590f 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.51-0.7.52.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.51-0.7.52.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/* @var $this Mage_Catalog_Model_Resource_Eav_Mysql4_Setup */
@@ -48,4 +48,4 @@
$this->run("DROP TABLE `{$tableTmp}`");
-$this->endSetup();
\ No newline at end of file
+$this->endSetup();
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.52-0.7.53.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.52-0.7.53.php
index 3b9ee79334..a70f51c245 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.52-0.7.53.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.52-0.7.53.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
$installer = $this;
@@ -32,4 +32,4 @@
$installer->getConnection()->changeColumn($installer->getTable('catalog/product_option_title'), 'title', 'title', 'VARCHAR(255) NOT NULL default \'\'');
$installer->getConnection()->changeColumn($installer->getTable('catalog/product_option_type_title'), 'title', 'title', 'VARCHAR(255) NOT NULL default \'\'');
-$installer->endSetup();
\ No newline at end of file
+$installer->endSetup();
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.53-0.7.54.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.53-0.7.54.php
index 1ab88f0c68..f877dd312d 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.53-0.7.54.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.53-0.7.54.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
$installer = $this;
@@ -59,4 +59,4 @@
'is_configurable' => false,
));
-$installer->endSetup();
\ No newline at end of file
+$installer->endSetup();
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.54-0.7.55.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.54-0.7.55.php
index f2406120d0..0be8ec53af 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.54-0.7.55.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.54-0.7.55.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
$installer = $this;
@@ -35,4 +35,4 @@
$installer->updateAttribute('catalog_product', 'thumbnail_label', 'is_searchable', '0');
-$installer->endSetup();
\ No newline at end of file
+$installer->endSetup();
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.55-0.7.56.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.55-0.7.56.php
index 78a8a7b82a..0cb9714c9f 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.55-0.7.56.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.55-0.7.56.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
$installer = $this;
@@ -69,31 +69,31 @@
");
foreach ($storesData as $storeData) {
- $storeId = $storeData['store_id'];
- $websiteId = $storeData['website_id'];
- $path = $storeData['root_path'];
-
- $query = "INSERT INTO {$categoryIndexTable}
- (`category_id`, `product_id`, `position`, `is_parent`, `store_id`, `visibility`)
- SELECT
- ci.category_id,
- ci.product_id,
- ci.position,
- ci.is_parent,
- {$storeId},
- ep.visibility
- FROM
- $categoryIndexTable AS ci
- INNER JOIN {$installer->getTable('catalog/product_website')} AS pw
- ON pw.product_id=ci.product_id AND pw.website_id={$websiteId}
- INNER JOIN {$installer->getTable('catalog/category')} AS c
- ON c.entity_id=ci.category_id AND c.path LIKE '{$path}%'
- INNER JOIN {$installer->getTable('catalog/product_enabled_index')} AS ep
- ON ep.product_id=ci.product_id AND ep.store_id={$storeId}
+ $storeId = $storeData['store_id'];
+ $websiteId = $storeData['website_id'];
+ $path = $storeData['root_path'];
+
+ $query = "INSERT INTO {$categoryIndexTable}
+ (`category_id`, `product_id`, `position`, `is_parent`, `store_id`, `visibility`)
+ SELECT
+ ci.category_id,
+ ci.product_id,
+ ci.position,
+ ci.is_parent,
+ {$storeId},
+ ep.visibility
+ FROM
+ $categoryIndexTable AS ci
+ INNER JOIN {$installer->getTable('catalog/product_website')} AS pw
+ ON pw.product_id=ci.product_id AND pw.website_id={$websiteId}
+ INNER JOIN {$installer->getTable('catalog/category')} AS c
+ ON c.entity_id=ci.category_id AND c.path LIKE '{$path}%'
+ INNER JOIN {$installer->getTable('catalog/product_enabled_index')} AS ep
+ ON ep.product_id=ci.product_id AND ep.store_id={$storeId}
WHERE
ci.store_id=0";
- $installer->run($query);
+ $installer->run($query);
}
$installer->getConnection()->delete($categoryIndexTable, 'store_id=0');
@@ -124,4 +124,4 @@
'store_id'
);
-$installer->endSetup();
\ No newline at end of file
+$installer->endSetup();
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.56-0.7.57.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.56-0.7.57.php
index f2d4f18774..12e8d11407 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.56-0.7.57.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.56-0.7.57.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.57-0.7.58.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.57-0.7.58.php
index 593df91119..ea280cd511 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.57-0.7.58.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.57-0.7.58.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.58-0.7.59.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.58-0.7.59.php
index 9e5c5ab60a..38d804b17b 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.58-0.7.59.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.58-0.7.59.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.59-0.7.60.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.59-0.7.60.php
index f3384d237c..931642d3de 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.59-0.7.60.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.59-0.7.60.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.6-0.7.7.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.6-0.7.7.php
index e4a3de1e81..b79c4d7a90 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.6-0.7.7.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.6-0.7.7.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.60-0.7.61.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.60-0.7.61.php
index 7d74b9a490..19df73101c 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.60-0.7.61.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.60-0.7.61.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.61-0.7.62.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.61-0.7.62.php
index a6f7c98f20..52a8f68fea 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.61-0.7.62.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.61-0.7.62.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.62-0.7.63.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.62-0.7.63.php
index babb259ecb..5e450ff84d 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.62-0.7.63.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.62-0.7.63.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.63-0.7.64.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.63-0.7.64.php
index 123777c58b..57f8cad2fe 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.63-0.7.64.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.63-0.7.64.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.64-0.7.65.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.64-0.7.65.php
index e9a273671d..e1c0a74f32 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.64-0.7.65.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.64-0.7.65.php
@@ -1,30 +1,30 @@
getTable('core/config_data')}` SET `value`=0
WHERE `path` LIKE '".Mage_Catalog_Helper_Product_Flat::XML_PATH_USE_PRODUCT_FLAT."';
");
-$installer->endSetup();
\ No newline at end of file
+$installer->endSetup();
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.66-0.7.67.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.66-0.7.67.php
index 51e8eefc16..3152f8d242 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.66-0.7.67.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.66-0.7.67.php
@@ -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_Catalog
- * @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)
+ * @category Mage
+ * @package Mage_Catalog
+ * @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)
*/
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.67-0.7.68.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.67-0.7.68.php
index 04acbbf586..4fa0ae2a30 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.67-0.7.68.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.67-0.7.68.php
@@ -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_Catalog
- * @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)
+ * @category Mage
+ * @package Mage_Catalog
+ * @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)
*/
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.68-0.7.69.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.68-0.7.69.php
index 43733e4c70..ea814bacd4 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.68-0.7.69.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.68-0.7.69.php
@@ -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_Catalog
- * @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)
+ * @category Mage
+ * @package Mage_Catalog
+ * @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)
*/
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.69-0.7.70.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.69-0.7.70.php
index 69fe8bff06..2420b4c715 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.69-0.7.70.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.69-0.7.70.php
@@ -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_Catalog
- * @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)
+ * @category Mage
+ * @package Mage_Catalog
+ * @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)
*/
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.7-0.7.8.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.7-0.7.8.php
index 8af7c61439..5867b46cac 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.7-0.7.8.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.7-0.7.8.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.70-0.7.71.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.70-0.7.71.php
index a14b87df2f..415ccc40df 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.70-0.7.71.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.70-0.7.71.php
@@ -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_Catalog
- * @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)
+ * @category Mage
+ * @package Mage_Catalog
+ * @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)
*/
$this->startSetup();
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.8-0.7.9.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.8-0.7.9.php
index fb73cecf5e..183f2ba2aa 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.8-0.7.9.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.8-0.7.9.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.10-1.4.0.0.11.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.10-1.4.0.0.11.php
new file mode 100644
index 0000000000..7d11863335
--- /dev/null
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.10-1.4.0.0.11.php
@@ -0,0 +1,31 @@
+updateAttribute('catalog_product', 'custom_layout_update', 'is_global',
+ Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_STORE);
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.7-1.4.0.0.8.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.7-1.4.0.0.8.php
index eef469fcae..7e1783296b 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.7-1.4.0.0.8.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.7-1.4.0.0.8.php
@@ -1,34 +1,34 @@
-updateAttribute('catalog_category', 'url_key', 'is_global', Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_STORE);
-$installer->updateAttribute('catalog_category', 'url_path', 'is_global', Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_STORE);
-
-$installer->updateAttribute('catalog_product', 'url_key', 'is_global', Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_STORE);
-$installer->updateAttribute('catalog_product', 'url_path', 'is_global', Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_STORE);
+updateAttribute('catalog_category', 'url_key', 'is_global', Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_STORE);
+$installer->updateAttribute('catalog_category', 'url_path', 'is_global', Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_STORE);
+
+$installer->updateAttribute('catalog_product', 'url_key', 'is_global', Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_STORE);
+$installer->updateAttribute('catalog_product', 'url_path', 'is_global', Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_STORE);
diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.9-1.4.0.0.10.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.9-1.4.0.0.10.php
index cb7ae2dca3..44084a2efe 100644
--- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.9-1.4.0.0.10.php
+++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.9-1.4.0.0.10.php
@@ -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_Catalog
- * @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_Catalog
+ * @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)
*/
/* @var $installer Mage_Catalog_Model_Resource_Eav_Mysql4_Setup */
@@ -48,4 +48,4 @@
'UNQ_CATEGORY_PRODUCT',
array('category_id', 'product_id', 'store_id'),
'unique'
-);
\ No newline at end of file
+);
diff --git a/app/code/core/Mage/CatalogIndex/Model/Aggregation.php b/app/code/core/Mage/CatalogIndex/Model/Aggregation.php
index 4b04cc87d7..988f68ccb8 100644
--- a/app/code/core/Mage/CatalogIndex/Model/Aggregation.php
+++ b/app/code/core/Mage/CatalogIndex/Model/Aggregation.php
@@ -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_Catalog
- * @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_CatalogIndex
+ * @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)
*/
/**
@@ -119,7 +119,7 @@ public function clearProductData($productIds)
if (!empty($categoryPaths)) {
$tags = array();
foreach ($categoryPaths as $path) {
- $tags[] = Mage_Catalog_Model_Category::CACHE_TAG.':'.$path;
+ $tags[] = Mage_Catalog_Model_Category::CACHE_TAG.':'.$path;
}
$this->clearCacheData($tags);
}
@@ -163,4 +163,4 @@ protected function _processTags($tags)
}
return $newTags;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/CatalogIndex/Model/Attribute.php b/app/code/core/Mage/CatalogIndex/Model/Attribute.php
index 7ebad38387..f66924096c 100644
--- a/app/code/core/Mage/CatalogIndex/Model/Attribute.php
+++ b/app/code/core/Mage/CatalogIndex/Model/Attribute.php
@@ -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_CatalogIndex
- * @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_CatalogIndex
+ * @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)
*/
@@ -58,4 +58,4 @@ public function applyFilterToCollection($collection, $attribute, $value)
$this->_getResource()->applyFilterToCollection($collection, $attribute, $value);
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/CatalogIndex/Model/Catalog/Index/Flag.php b/app/code/core/Mage/CatalogIndex/Model/Catalog/Index/Flag.php
index a825d921b8..7f9d6c54d8 100644
--- a/app/code/core/Mage/CatalogIndex/Model/Catalog/Index/Flag.php
+++ b/app/code/core/Mage/CatalogIndex/Model/Catalog/Index/Flag.php
@@ -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_CatalogIndex
- * @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_CatalogIndex
+ * @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_CatalogIndex_Model_Catalog_Index_Flag extends Mage_Core_Model_Flag
@@ -49,4 +49,4 @@ protected function _beforeSave()
return parent::_beforeSave();
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/CatalogIndex/Model/Catalog/Index/Kill/Flag.php b/app/code/core/Mage/CatalogIndex/Model/Catalog/Index/Kill/Flag.php
index 26dc707bd6..628a643983 100644
--- a/app/code/core/Mage/CatalogIndex/Model/Catalog/Index/Kill/Flag.php
+++ b/app/code/core/Mage/CatalogIndex/Model/Catalog/Index/Kill/Flag.php
@@ -12,10 +12,16 @@
* obtain it through the world-wide-web, please send an email
* to license@magentocommerce.com so we can send you a copy immediately.
*
- * @category Mage
- * @package Mage_CatalogIndex
- * @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)
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * 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_CatalogIndex
+ * @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_CatalogIndex_Model_Catalog_Index_Kill_Flag extends Mage_Core_Model_Flag
@@ -26,4 +32,4 @@ public function checkIsThisProcess()
{
return ($this->getFlagData() == getmypid());
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/CatalogIndex/Model/Data/Abstract.php b/app/code/core/Mage/CatalogIndex/Model/Data/Abstract.php
index 9a77088030..9e57b249fa 100644
--- a/app/code/core/Mage/CatalogIndex/Model/Data/Abstract.php
+++ b/app/code/core/Mage/CatalogIndex/Model/Data/Abstract.php
@@ -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_CatalogIndex
- * @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)
+ * @category Mage
+ * @package Mage_CatalogIndex
+ * @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)
*/
diff --git a/app/code/core/Mage/CatalogIndex/Model/Data/Configurable.php b/app/code/core/Mage/CatalogIndex/Model/Data/Configurable.php
index 7a66d3b1bb..9031fedd99 100644
--- a/app/code/core/Mage/CatalogIndex/Model/Data/Configurable.php
+++ b/app/code/core/Mage/CatalogIndex/Model/Data/Configurable.php
@@ -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_CatalogIndex
- * @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_CatalogIndex
+ * @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)
*/
/**
@@ -77,4 +77,4 @@ protected function _getLinkSettings()
'child_field'=>'product_id',
);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/CatalogIndex/Model/Data/Grouped.php b/app/code/core/Mage/CatalogIndex/Model/Data/Grouped.php
index f52e29c45e..195d5403d2 100644
--- a/app/code/core/Mage/CatalogIndex/Model/Data/Grouped.php
+++ b/app/code/core/Mage/CatalogIndex/Model/Data/Grouped.php
@@ -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_CatalogIndex
- * @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_CatalogIndex
+ * @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)
*/
/**
@@ -80,4 +80,4 @@ protected function _getLinkSettings()
'additional'=>array('link_type_id'=>Mage_Catalog_Model_Product_Link::LINK_TYPE_GROUPED)
);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/CatalogIndex/Model/Data/Simple.php b/app/code/core/Mage/CatalogIndex/Model/Data/Simple.php
index 2007ef7fee..80d7d15fd0 100644
--- a/app/code/core/Mage/CatalogIndex/Model/Data/Simple.php
+++ b/app/code/core/Mage/CatalogIndex/Model/Data/Simple.php
@@ -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_CatalogIndex
- * @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_CatalogIndex
+ * @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)
*/
/**
@@ -42,4 +42,4 @@ public function getTypeCode()
{
return Mage_Catalog_Model_Product_Type::TYPE_SIMPLE;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/CatalogIndex/Model/Data/Virtual.php b/app/code/core/Mage/CatalogIndex/Model/Data/Virtual.php
index f4a6730d25..b109df280a 100644
--- a/app/code/core/Mage/CatalogIndex/Model/Data/Virtual.php
+++ b/app/code/core/Mage/CatalogIndex/Model/Data/Virtual.php
@@ -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_CatalogIndex
- * @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_CatalogIndex
+ * @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)
*/
/**
@@ -43,4 +43,4 @@ public function getTypeCode()
return Mage_Catalog_Model_Product_Type::TYPE_VIRTUAL;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/CatalogIndex/Model/Indexer.php b/app/code/core/Mage/CatalogIndex/Model/Indexer.php
index 89ebf29706..924a47643d 100644
--- a/app/code/core/Mage/CatalogIndex/Model/Indexer.php
+++ b/app/code/core/Mage/CatalogIndex/Model/Indexer.php
@@ -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_CatalogIndex
- * @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)
+ * @category Mage
+ * @package Mage_CatalogIndex
+ * @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)
*/
@@ -803,4 +803,4 @@ public function updateCatalogProductFlat($store, $products = null, $resourceTabl
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/CatalogIndex/Model/Indexer/Abstract.php b/app/code/core/Mage/CatalogIndex/Model/Indexer/Abstract.php
index c48292301b..a6bb4c2276 100644
--- a/app/code/core/Mage/CatalogIndex/Model/Indexer/Abstract.php
+++ b/app/code/core/Mage/CatalogIndex/Model/Indexer/Abstract.php
@@ -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_CatalogIndex
- * @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_CatalogIndex
+ * @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)
*/
@@ -149,4 +149,4 @@ public function isAttributeIdUsed()
{
return true;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/CatalogIndex/Model/Indexer/Eav.php b/app/code/core/Mage/CatalogIndex/Model/Indexer/Eav.php
index 3d895fcbdb..3951576e94 100644
--- a/app/code/core/Mage/CatalogIndex/Model/Indexer/Eav.php
+++ b/app/code/core/Mage/CatalogIndex/Model/Indexer/Eav.php
@@ -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_CatalogIndex
- * @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_CatalogIndex
+ * @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)
*/
@@ -85,4 +85,4 @@ protected function _getIndexableAttributeConditions()
$conditions['or']['is_filterable'] = array(1, 2);
$conditions['or']['is_visible_in_advanced_search'] = 1;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/CatalogIndex/Model/Indexer/Interface.php b/app/code/core/Mage/CatalogIndex/Model/Indexer/Interface.php
index d9415babae..008d46ddf6 100644
--- a/app/code/core/Mage/CatalogIndex/Model/Indexer/Interface.php
+++ b/app/code/core/Mage/CatalogIndex/Model/Indexer/Interface.php
@@ -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_CatalogIndex
- * @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_CatalogIndex
+ * @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)
*/
@@ -33,4 +33,4 @@
interface Mage_CatalogIndex_Model_Indexer_Interface
{
public function createIndexData(Mage_Catalog_Model_Product $object, Mage_Eav_Model_Entity_Attribute_Abstract $attribute = null);
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/CatalogIndex/Model/Indexer/Minimalprice.php b/app/code/core/Mage/CatalogIndex/Model/Indexer/Minimalprice.php
index 18a116b46d..459b8479ac 100644
--- a/app/code/core/Mage/CatalogIndex/Model/Indexer/Minimalprice.php
+++ b/app/code/core/Mage/CatalogIndex/Model/Indexer/Minimalprice.php
@@ -1,122 +1,122 @@
-
- */
-class Mage_CatalogIndex_Model_Indexer_Minimalprice extends Mage_CatalogIndex_Model_Indexer_Abstract
-{
- protected $_customerGroups = array();
- protected $_runOnce = true;
- protected $_processChildren = false;
-
- protected function _construct()
- {
- $this->_init('catalogindex/indexer_minimalprice');
- $this->_currencyModel = Mage::getModel('directory/currency');
- $this->_customerGroups = Mage::getModel('customer/group')->getCollection();
-
- return parent::_construct();
- }
-
- public function getTierPriceAttribute()
- {
- $data = $this->getData('tier_price_attribute');
- if (is_null($data)) {
- $data = Mage::getModel('eav/entity_attribute')->loadByCode('catalog_product', 'tier_price');
- $this->setData('tier_price_attribute', $data);
- }
- return $data;
- }
-
- public function getPriceAttribute()
- {
- $data = $this->getData('price_attribute');
- if (is_null($data)) {
- $data = Mage::getModel('eav/entity_attribute')->loadByCode('catalog_product', 'price');
- $this->setData('price_attribute', $data);
- }
- return $data;
- }
-
- public function createIndexData(Mage_Catalog_Model_Product $object, Mage_Eav_Model_Entity_Attribute_Abstract $attribute = null)
- {
- $searchEntityId = $object->getId();
- $priceAttributeId = $this->getTierPriceAttribute()->getId();
- if ($object->isGrouped()) {
- $priceAttributeId = $this->getPriceAttribute()->getId();
- $associated = $object->getTypeInstance(true)->getAssociatedProducts($object);
- $searchEntityId = array();
-
- foreach ($associated as $product) {
- $searchEntityId[] = $product->getId();
- }
- }
-
- if (!count($searchEntityId)) {
- return false;
- }
-
- $result = array();
- $data = array();
-
- $data['store_id'] = $object->getStoreId();
- $data['entity_id'] = $object->getId();
-
- $search['store_id'] = $object->getStoreId();
- $search['entity_id'] = $searchEntityId;
- $search['attribute_id'] = $priceAttributeId;
-
- foreach ($this->_customerGroups as $group) {
- $search['customer_group_id'] = $group->getId();
- $data['customer_group_id'] = $group->getId();
-
- $value = $this->_getResource()->getMinimalValue($search);
- if (is_null($value))
- continue;
- $data['value'] = $value;
- $result[] = $data;
- }
-
- return $result;
- }
-
- public function isAttributeIdUsed()
- {
- return false;
- }
-
- protected function _isAttributeIndexable(Mage_Eav_Model_Entity_Attribute_Abstract $attribute)
- {
- if ($attribute->getAttributeCode() != 'minimal_price')
- return false;
-
- return true;
- }
-}
\ No newline at end of file
+
+ */
+class Mage_CatalogIndex_Model_Indexer_Minimalprice extends Mage_CatalogIndex_Model_Indexer_Abstract
+{
+ protected $_customerGroups = array();
+ protected $_runOnce = true;
+ protected $_processChildren = false;
+
+ protected function _construct()
+ {
+ $this->_init('catalogindex/indexer_minimalprice');
+ $this->_currencyModel = Mage::getModel('directory/currency');
+ $this->_customerGroups = Mage::getModel('customer/group')->getCollection();
+
+ return parent::_construct();
+ }
+
+ public function getTierPriceAttribute()
+ {
+ $data = $this->getData('tier_price_attribute');
+ if (is_null($data)) {
+ $data = Mage::getModel('eav/entity_attribute')->loadByCode('catalog_product', 'tier_price');
+ $this->setData('tier_price_attribute', $data);
+ }
+ return $data;
+ }
+
+ public function getPriceAttribute()
+ {
+ $data = $this->getData('price_attribute');
+ if (is_null($data)) {
+ $data = Mage::getModel('eav/entity_attribute')->loadByCode('catalog_product', 'price');
+ $this->setData('price_attribute', $data);
+ }
+ return $data;
+ }
+
+ public function createIndexData(Mage_Catalog_Model_Product $object, Mage_Eav_Model_Entity_Attribute_Abstract $attribute = null)
+ {
+ $searchEntityId = $object->getId();
+ $priceAttributeId = $this->getTierPriceAttribute()->getId();
+ if ($object->isGrouped()) {
+ $priceAttributeId = $this->getPriceAttribute()->getId();
+ $associated = $object->getTypeInstance(true)->getAssociatedProducts($object);
+ $searchEntityId = array();
+
+ foreach ($associated as $product) {
+ $searchEntityId[] = $product->getId();
+ }
+ }
+
+ if (!count($searchEntityId)) {
+ return false;
+ }
+
+ $result = array();
+ $data = array();
+
+ $data['store_id'] = $object->getStoreId();
+ $data['entity_id'] = $object->getId();
+
+ $search['store_id'] = $object->getStoreId();
+ $search['entity_id'] = $searchEntityId;
+ $search['attribute_id'] = $priceAttributeId;
+
+ foreach ($this->_customerGroups as $group) {
+ $search['customer_group_id'] = $group->getId();
+ $data['customer_group_id'] = $group->getId();
+
+ $value = $this->_getResource()->getMinimalValue($search);
+ if (is_null($value))
+ continue;
+ $data['value'] = $value;
+ $result[] = $data;
+ }
+
+ return $result;
+ }
+
+ public function isAttributeIdUsed()
+ {
+ return false;
+ }
+
+ protected function _isAttributeIndexable(Mage_Eav_Model_Entity_Attribute_Abstract $attribute)
+ {
+ if ($attribute->getAttributeCode() != 'minimal_price')
+ return false;
+
+ return true;
+ }
+}
diff --git a/app/code/core/Mage/CatalogIndex/Model/Indexer/Price.php b/app/code/core/Mage/CatalogIndex/Model/Indexer/Price.php
index 2d97d0e49e..65b7a16af2 100644
--- a/app/code/core/Mage/CatalogIndex/Model/Indexer/Price.php
+++ b/app/code/core/Mage/CatalogIndex/Model/Indexer/Price.php
@@ -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_CatalogIndex
- * @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_CatalogIndex
+ * @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)
*/
@@ -86,4 +86,4 @@ protected function _getIndexableAttributeConditions()
$conditions = "frontend_input = 'price' AND attribute_code <> 'price'";
return $conditions;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/CatalogIndex/Model/Indexer/Tierprice.php b/app/code/core/Mage/CatalogIndex/Model/Indexer/Tierprice.php
index 9e982b49a2..eb0bbac020 100644
--- a/app/code/core/Mage/CatalogIndex/Model/Indexer/Tierprice.php
+++ b/app/code/core/Mage/CatalogIndex/Model/Indexer/Tierprice.php
@@ -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_CatalogIndex
- * @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_CatalogIndex
+ * @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)
*/
@@ -96,4 +96,4 @@ protected function _getIndexableAttributeConditions()
return $conditions;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Abstract.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Abstract.php
index 3e9cd84b6b..0f26f90efe 100644
--- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Abstract.php
+++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Abstract.php
@@ -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_CatalogIndex
- * @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_CatalogIndex
+ * @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)
*/
@@ -57,4 +57,4 @@ public function getWebsiteId()
}
return $this->_websiteId;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Aggregation.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Aggregation.php
index 935298afe2..eba7be0dc2 100644
--- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Aggregation.php
+++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Aggregation.php
@@ -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_Catalog
- * @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_CatalogIndex
+ * @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_CatalogIndex_Model_Mysql4_Aggregation extends Mage_Core_Model_Mysql4_Abstract
@@ -211,4 +211,4 @@ public function getProductCategoryPaths($productIds)
);
return $this->_getReadAdapter()->fetchCol($select);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Attribute.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Attribute.php
index 1f287a8e2c..b62333c9bb 100644
--- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Attribute.php
+++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Attribute.php
@@ -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_CatalogIndex
- * @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_CatalogIndex
+ * @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)
*/
@@ -100,4 +100,4 @@ public function applyFilterToCollection($collection, $attribute, $value)
->where($alias.'.value = ?', $value);
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Abstract.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Abstract.php
index 034f90e928..c3d1491fbd 100644
--- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Abstract.php
+++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Abstract.php
@@ -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_CatalogIndex
- * @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_CatalogIndex
+ * @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_CatalogIndex_Model_Mysql4_Data_Abstract extends Mage_Core_Model_Mysql4_Abstract
@@ -296,4 +296,4 @@ protected function _addAttributeFilter(Varien_Db_Select $select, $attributeCode,
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Configurable.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Configurable.php
index ae4d31c606..5022bc7094 100644
--- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Configurable.php
+++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Configurable.php
@@ -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_CatalogIndex
- * @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_CatalogIndex
+ * @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_CatalogIndex_Model_Mysql4_Data_Configurable extends Mage_CatalogIndex_Model_Mysql4_Data_Abstract
diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Grouped.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Grouped.php
index 151edbe1c6..c55d79a717 100644
--- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Grouped.php
+++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Grouped.php
@@ -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_CatalogIndex
- * @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)
+ * @category Mage
+ * @package Mage_CatalogIndex
+ * @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)
*/
diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer.php
index ee87801262..268e4cafd9 100644
--- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer.php
+++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer.php
@@ -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_CatalogIndex
- * @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_CatalogIndex
+ * @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)
*/
@@ -70,7 +70,7 @@ public function clear($eav = true, $price = true, $minimal = true, $finalPrice =
if ($products instanceof Mage_Catalog_Model_Product) {
$products = $products->getId();
} elseif ($products instanceof Mage_Catalog_Model_Product_Condition_Interface) {
- $suffix = 'entity_id IN ('.$products->getIdsSelect($this->_getWriteAdapter())->__toString().')';
+ $suffix = 'entity_id IN ('.$products->getIdsSelect($this->_getWriteAdapter())->__toString().')';
}
else if (!is_numeric($products) && !is_array($products)) {
Mage::throwException('Invalid products supplied for indexing');
@@ -666,4 +666,4 @@ public function updateCatalogProductFlat($storeId, $productIds = null, $tableNam
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Abstract.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Abstract.php
index 8417f3d291..f96ec1c460 100644
--- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Abstract.php
+++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Abstract.php
@@ -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_CatalogIndex
- * @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_CatalogIndex
+ * @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)
*/
@@ -114,4 +114,4 @@ public function loadAttributeCodesByCondition($conditions)
}
return $this->_getReadAdapter()->fetchCol($select);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Eav.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Eav.php
index 59cbcc7535..45e22961be 100644
--- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Eav.php
+++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Eav.php
@@ -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_CatalogIndex
- * @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_CatalogIndex
+ * @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)
*/
@@ -40,4 +40,4 @@ protected function _construct()
$this->_attributeIdFieldName = 'attribute_id';
$this->_storeIdFieldName = 'store_id';
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Minimalprice.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Minimalprice.php
index 03075d643e..f475eb8aa7 100644
--- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Minimalprice.php
+++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Minimalprice.php
@@ -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_CatalogIndex
- * @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_CatalogIndex
+ * @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)
*/
@@ -65,4 +65,4 @@ public function cleanup($productId, $storeId = null, $attributeId = null)
$conditions = implode (' AND ', $conditions);
$this->_getWriteAdapter()->delete($this->getMainTable(), $conditions);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Price.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Price.php
index eab4c7bae6..705bf69d8b 100644
--- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Price.php
+++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Price.php
@@ -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_CatalogIndex
- * @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_CatalogIndex
+ * @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)
*/
@@ -40,4 +40,4 @@ protected function _construct()
$this->_attributeIdFieldName = 'attribute_id';
$this->_storeIdFieldName = 'store_id';
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Price.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Price.php
index d500a76c8f..65e9a6b3d9 100644
--- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Price.php
+++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Price.php
@@ -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_CatalogIndex
- * @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_CatalogIndex
+ * @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)
*/
diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Retreiver.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Retreiver.php
index 345a0651ca..b9b575b152 100644
--- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Retreiver.php
+++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Retreiver.php
@@ -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_CatalogIndex
- * @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_CatalogIndex
+ * @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)
*/
/**
@@ -49,4 +49,4 @@ public function getProductTypes($ids)
->where('main_table.entity_id in (?)', $ids);
return $this->_getReadAdapter()->fetchAll($select);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Setup.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Setup.php
index 9cccf4dd0f..680b60cdb1 100644
--- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Setup.php
+++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Setup.php
@@ -12,10 +12,16 @@
* obtain it through the world-wide-web, please send an email
* to license@magentocommerce.com so we can send you a copy immediately.
*
- * @category Mage
- * @package Mage_CatalogIndex
- * @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)
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * 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_CatalogIndex
+ * @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_CatalogIndex_Model_Mysql4_Setup extends Mage_Core_Model_Resource_Setup
@@ -54,4 +60,4 @@ protected function _setWebsiteInfo($table, $websiteId, $storeIds)
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/CatalogIndex/Model/Observer.php b/app/code/core/Mage/CatalogIndex/Model/Observer.php
index d25bf41f53..396ef797e4 100644
--- a/app/code/core/Mage/CatalogIndex/Model/Observer.php
+++ b/app/code/core/Mage/CatalogIndex/Model/Observer.php
@@ -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_CatalogIndex
- * @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_CatalogIndex
+ * @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)
*/
@@ -197,7 +197,7 @@ public function processAttributeChangeEvent(Varien_Event_Observer $observer)
$this->_getAggregator()->clearCacheData($tags);
}
} elseif ($attribute->getIsFilterable()) {
- $this->_getAggregator()->clearCacheData($tags);
+ $this->_getAggregator()->clearCacheData($tags);
}
return $this;
@@ -398,4 +398,4 @@ public function catalogProductFlatUpdateProduct(Varien_Event_Observer $observer)
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/CatalogIndex/Model/Price.php b/app/code/core/Mage/CatalogIndex/Model/Price.php
index bd116e82a0..b9916cc55e 100644
--- a/app/code/core/Mage/CatalogIndex/Model/Price.php
+++ b/app/code/core/Mage/CatalogIndex/Model/Price.php
@@ -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_CatalogIndex
- * @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_CatalogIndex
+ * @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)
*/
@@ -72,4 +72,4 @@ public function addMinimalPrices(Mage_Catalog_Model_Resource_Eav_Mysql4_Product_
}
}
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/CatalogIndex/Model/Retreiver.php b/app/code/core/Mage/CatalogIndex/Model/Retreiver.php
index 0c78580f48..a76dc374ff 100644
--- a/app/code/core/Mage/CatalogIndex/Model/Retreiver.php
+++ b/app/code/core/Mage/CatalogIndex/Model/Retreiver.php
@@ -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_CatalogIndex
- * @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_CatalogIndex
+ * @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)
*/
/**
@@ -110,4 +110,4 @@ public function assignProductTypes($products)
}
return $result;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/CatalogIndex/etc/config.xml b/app/code/core/Mage/CatalogIndex/etc/config.xml
index 2afb2b4021..f1e98f32eb 100644
--- a/app/code/core/Mage/CatalogIndex/etc/config.xml
+++ b/app/code/core/Mage/CatalogIndex/etc/config.xml
@@ -19,10 +19,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_CatalogIndex
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ * @category Mage
+ * @package Mage_CatalogIndex
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
diff --git a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-install-0.7.0.php
index fccf181200..507600db25 100644
--- a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-install-0.7.0.php
+++ b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-install-0.7.0.php
@@ -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_CatalogIndex
- * @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_CatalogIndex
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.0-0.7.1.php
index 542f6c2464..07b2a095e2 100644
--- a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.0-0.7.1.php
+++ b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.0-0.7.1.php
@@ -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_CatalogIndex
- * @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_CatalogIndex
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.1-0.7.2.php
index 12509522b2..8abfca6b60 100644
--- a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.1-0.7.2.php
+++ b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.1-0.7.2.php
@@ -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_CatalogIndex
- * @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_CatalogIndex
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.2-0.7.3.php
index 4594e44725..666730358a 100644
--- a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.2-0.7.3.php
+++ b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.2-0.7.3.php
@@ -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_CatalogIndex
- * @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_CatalogIndex
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.3-0.7.4.php b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.3-0.7.4.php
index 825ec7444b..524fa3294d 100644
--- a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.3-0.7.4.php
+++ b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.3-0.7.4.php
@@ -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_CatalogIndex
- * @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_CatalogIndex
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.4-0.7.5.php b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.4-0.7.5.php
index 0702d4eae0..f38aa9ebb4 100644
--- a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.4-0.7.5.php
+++ b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.4-0.7.5.php
@@ -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_Catalog
- * @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_CatalogIndex
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.5-0.7.6.php b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.5-0.7.6.php
index f634c46ace..08fda72d23 100644
--- a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.5-0.7.6.php
+++ b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.5-0.7.6.php
@@ -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_CatalogIndex
- * @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_CatalogIndex
+ * @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)
*/
@@ -40,4 +40,4 @@
$installer->getTable('catalog_product_entity'), 'entity_id'
);
-$installer->endSetup();
\ No newline at end of file
+$installer->endSetup();
diff --git a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.6-0.7.7.php b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.6-0.7.7.php
index cb6e6d2785..283cbfdcec 100644
--- a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.6-0.7.7.php
+++ b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.6-0.7.7.php
@@ -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_CatalogIndex
- * @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_CatalogIndex
+ * @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)
*/
diff --git a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.7-0.7.8.php b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.7-0.7.8.php
index 776169ebc3..c19127dfe0 100644
--- a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.7-0.7.8.php
+++ b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.7-0.7.8.php
@@ -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_CatalogIndex
- * @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_CatalogIndex
+ * @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)
*/
diff --git a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.8-0.7.9.php b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.8-0.7.9.php
index 09a27a53f1..5a04f51ce8 100644
--- a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.8-0.7.9.php
+++ b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.8-0.7.9.php
@@ -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_CatalogIndex
- * @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_CatalogIndex
+ * @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)
*/
diff --git a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.9-0.7.10.php b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.9-0.7.10.php
index eedceafbb5..b1fc3ae8d9 100644
--- a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.9-0.7.10.php
+++ b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.9-0.7.10.php
@@ -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_CatalogIndex
- * @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_CatalogIndex
+ * @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)
*/
diff --git a/app/code/core/Mage/CatalogInventory/Helper/Data.php b/app/code/core/Mage/CatalogInventory/Helper/Data.php
index 92d1a40959..cef6d94553 100644
--- a/app/code/core/Mage/CatalogInventory/Helper/Data.php
+++ b/app/code/core/Mage/CatalogInventory/Helper/Data.php
@@ -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_CatalogInventory
- * @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_CatalogInventory
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock.php b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock.php
index 9cc3485ea6..9b1fc955f6 100644
--- a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock.php
+++ b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock.php
@@ -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_CatalogInventory
- * @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_CatalogInventory
+ * @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)
*/
/**
@@ -177,4 +177,4 @@ public function updateLowStockDate()
$this->getTable('catalog/product'), $this->_getWriteAdapter()->quote($this->_configTypeIds)
));
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Item.php b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Item.php
index 0e8fdf03a4..bfb1f0088a 100644
--- a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Item.php
+++ b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Item.php
@@ -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_CatalogInventory
- * @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_CatalogInventory
+ * @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)
*/
/**
@@ -88,4 +88,4 @@ public function addCatalogInventoryToProductCollection($productCollection)
null, 'left');
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Item/Collection.php b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Item/Collection.php
index 3f941dfa44..3cab6a8ad6 100644
--- a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Item/Collection.php
+++ b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Item/Collection.php
@@ -1,138 +1,138 @@
-
- */
-class Mage_CatalogInventory_Model_Mysql4_Stock_Item_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract
-{
- protected function _construct()
- {
- $this->_init('cataloginventory/stock_item');
- }
-
- /**
- * Add stock filter to collection
- *
- * @param mixed $stock
- * @return Mage_CatalogInventory_Model_Mysql4_Stock_Item_Collection
- */
- public function addStockFilter($stock)
- {
- if ($stock instanceof Mage_CatalogInventory_Model_Stock) {
- $this->addFieldToFilter('main_table.stock_id', $stock->getId());
- }
- else {
- $this->addFieldToFilter('main_table.stock_id', $stock);
- }
- return $this;
- }
-
- /**
- * Add product filter to collection
- *
- * @param mixed $products
- * @return Mage_CatalogInventory_Model_Mysql4_Stock_Item_Collection
- */
- public function addProductsFilter($products)
- {
- $productIds = array();
- foreach ($products as $product) {
- if ($product instanceof Mage_Catalog_Model_Product) {
- $productIds[] = $product->getId();
- }
- else {
- $productIds[] = $product;
- }
- }
- if (empty($productIds)) {
- $productIds[] = false;
- $this->_setIsLoaded(true);
- }
- $this->addFieldToFilter('main_table.product_id', array('in'=>$productIds));
- return $this;
- }
-
- /**
- * Join Stock Status to collection
- *
- * @param int $storeId
- * @return Mage_CatalogInventory_Model_Mysql4_Stock_Item_Collection
- */
- public function joinStockStatus($storeId = null)
- {
- $websiteId = Mage::app()->getStore($storeId)->getWebsiteId();
- $this->getSelect()->joinLeft(
- array('status_table' => $this->getTable('cataloginventory/stock_status')),
- '`main_table`.`product_id`=`status_table`.`product_id`'
- . ' AND `main_table`.`stock_id`=`status_table`.`stock_id`'
- . $this->getConnection()->quoteInto(' AND `status_table`.`website_id`=?', $websiteId),
- array('stock_status')
- );
-
- return $this;
- }
-
- public function addManagedFilter($isStockManagedInConfig)
- {
- if ($isStockManagedInConfig) {
- $this->getSelect()->where('(manage_stock = 1 OR use_config_manage_stock = 1)');
- } else {
- $this->addFieldToFilter('manage_stock', 1);
- }
-
- return $this;
- }
-
- public function addQtyFilter($comparsionMethod, $qty)
- {
- $allowedMethods = array('<', '>', '=', '<=', '>=', '<>');
- if (!in_array($comparsionMethod, $allowedMethods)) {
- Mage::throwException(Mage::helper('cataloginventory')->__('%s is not correct comparsion method.', $comparsionMethod));
- }
- $this->getSelect()->where("main_table.qty {$comparsionMethod} ?", $qty);
- return $this;
- }
-
- /**
- * Load data
- *
- * @return Varien_Data_Collection_Db
- */
- public function load($printQuery = false, $logQuery = false)
- {
- if (!$this->isLoaded()) {
- $this->getSelect()->joinInner(array('_products_table' => $this->getTable('catalog/product')),
- 'main_table.product_id=_products_table.entity_id', 'type_id'
- );
- }
- return parent::load($printQuery, $logQuery);
- }
-}
+
+ */
+class Mage_CatalogInventory_Model_Mysql4_Stock_Item_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract
+{
+ protected function _construct()
+ {
+ $this->_init('cataloginventory/stock_item');
+ }
+
+ /**
+ * Add stock filter to collection
+ *
+ * @param mixed $stock
+ * @return Mage_CatalogInventory_Model_Mysql4_Stock_Item_Collection
+ */
+ public function addStockFilter($stock)
+ {
+ if ($stock instanceof Mage_CatalogInventory_Model_Stock) {
+ $this->addFieldToFilter('main_table.stock_id', $stock->getId());
+ }
+ else {
+ $this->addFieldToFilter('main_table.stock_id', $stock);
+ }
+ return $this;
+ }
+
+ /**
+ * Add product filter to collection
+ *
+ * @param mixed $products
+ * @return Mage_CatalogInventory_Model_Mysql4_Stock_Item_Collection
+ */
+ public function addProductsFilter($products)
+ {
+ $productIds = array();
+ foreach ($products as $product) {
+ if ($product instanceof Mage_Catalog_Model_Product) {
+ $productIds[] = $product->getId();
+ }
+ else {
+ $productIds[] = $product;
+ }
+ }
+ if (empty($productIds)) {
+ $productIds[] = false;
+ $this->_setIsLoaded(true);
+ }
+ $this->addFieldToFilter('main_table.product_id', array('in'=>$productIds));
+ return $this;
+ }
+
+ /**
+ * Join Stock Status to collection
+ *
+ * @param int $storeId
+ * @return Mage_CatalogInventory_Model_Mysql4_Stock_Item_Collection
+ */
+ public function joinStockStatus($storeId = null)
+ {
+ $websiteId = Mage::app()->getStore($storeId)->getWebsiteId();
+ $this->getSelect()->joinLeft(
+ array('status_table' => $this->getTable('cataloginventory/stock_status')),
+ '`main_table`.`product_id`=`status_table`.`product_id`'
+ . ' AND `main_table`.`stock_id`=`status_table`.`stock_id`'
+ . $this->getConnection()->quoteInto(' AND `status_table`.`website_id`=?', $websiteId),
+ array('stock_status')
+ );
+
+ return $this;
+ }
+
+ public function addManagedFilter($isStockManagedInConfig)
+ {
+ if ($isStockManagedInConfig) {
+ $this->getSelect()->where('(manage_stock = 1 OR use_config_manage_stock = 1)');
+ } else {
+ $this->addFieldToFilter('manage_stock', 1);
+ }
+
+ return $this;
+ }
+
+ public function addQtyFilter($comparsionMethod, $qty)
+ {
+ $allowedMethods = array('<', '>', '=', '<=', '>=', '<>');
+ if (!in_array($comparsionMethod, $allowedMethods)) {
+ Mage::throwException(Mage::helper('cataloginventory')->__('%s is not correct comparsion method.', $comparsionMethod));
+ }
+ $this->getSelect()->where("main_table.qty {$comparsionMethod} ?", $qty);
+ return $this;
+ }
+
+ /**
+ * Load data
+ *
+ * @return Varien_Data_Collection_Db
+ */
+ public function load($printQuery = false, $logQuery = false)
+ {
+ if (!$this->isLoaded()) {
+ $this->getSelect()->joinInner(array('_products_table' => $this->getTable('catalog/product')),
+ 'main_table.product_id=_products_table.entity_id', 'type_id'
+ );
+ }
+ return parent::load($printQuery, $logQuery);
+ }
+}
diff --git a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Status.php b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Status.php
index a990852ae7..ef386a8178 100644
--- a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Status.php
+++ b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Status.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_CatalogInventory
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
@@ -232,4 +232,24 @@ public function prepareCatalogProductIndexSelect(Varien_Db_Select $select, $enti
return $this;
}
+
+ /**
+ * Add only is in stock products filter to product collection
+ *
+ * @param Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Collection $collection
+ * @return Mage_CatalogInventory_Model_Stock_Status
+ */
+ public function addIsInStockFilterToCollection($collection)
+ {
+ $websiteId = Mage::app()->getStore($collection->getStoreId())->getWebsiteId();
+ $collection->getSelect()
+ ->join(
+ array('stock_status_index' => $this->getMainTable()),
+ 'e.entity_id = stock_status_index.product_id AND stock_status_index.website_id = ' . $websiteId
+ . ' AND stock_status_index.stock_id = ' . Mage_CatalogInventory_Model_Stock::DEFAULT_STOCK_ID,
+ array())
+ ->where('stock_status_index.stock_status=?', Mage_CatalogInventory_Model_Stock_Status::STATUS_IN_STOCK);
+
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/CatalogInventory/Model/Observer.php b/app/code/core/Mage/CatalogInventory/Model/Observer.php
index 274189d76b..ec80f45563 100644
--- a/app/code/core/Mage/CatalogInventory/Model/Observer.php
+++ b/app/code/core/Mage/CatalogInventory/Model/Observer.php
@@ -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_CatalogInventory
- * @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_CatalogInventory
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/CatalogInventory/Model/Source/Backorders.php b/app/code/core/Mage/CatalogInventory/Model/Source/Backorders.php
index 15c037e619..f091cdc875 100644
--- a/app/code/core/Mage/CatalogInventory/Model/Source/Backorders.php
+++ b/app/code/core/Mage/CatalogInventory/Model/Source/Backorders.php
@@ -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_Adminhtml
- * @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_CatalogInventory
+ * @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_CatalogInventory_Model_Source_Backorders
@@ -34,4 +34,4 @@ public function toOptionArray()
array('value' => Mage_CatalogInventory_Model_Stock::BACKORDERS_YES_NOTIFY , 'label'=>Mage::helper('cataloginventory')->__('Allow Qty Below 0 and Notify Customer')),
);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/CatalogInventory/Model/Source/Stock.php b/app/code/core/Mage/CatalogInventory/Model/Source/Stock.php
index d8364388ce..36fc187a6e 100644
--- a/app/code/core/Mage/CatalogInventory/Model/Source/Stock.php
+++ b/app/code/core/Mage/CatalogInventory/Model/Source/Stock.php
@@ -1,55 +1,55 @@
-
- */
-class Mage_CatalogInventory_Model_Source_Stock
-{
- /**
- * Retrieve option array
- *
- * @return array
- */
- public function toOptionArray()
- {
- return array(
- array(
- 'value' => Mage_CatalogInventory_Model_Stock::STOCK_IN_STOCK,
- 'label' => Mage::helper('cataloginventory')->__('In Stock')
- ),
- array(
- 'value' => Mage_CatalogInventory_Model_Stock::STOCK_OUT_OF_STOCK,
- 'label' => Mage::helper('cataloginventory')->__('Out of Stock')
- ),
- );
- }
-}
+
+ */
+class Mage_CatalogInventory_Model_Source_Stock
+{
+ /**
+ * Retrieve option array
+ *
+ * @return array
+ */
+ public function toOptionArray()
+ {
+ return array(
+ array(
+ 'value' => Mage_CatalogInventory_Model_Stock::STOCK_IN_STOCK,
+ 'label' => Mage::helper('cataloginventory')->__('In Stock')
+ ),
+ array(
+ 'value' => Mage_CatalogInventory_Model_Stock::STOCK_OUT_OF_STOCK,
+ 'label' => Mage::helper('cataloginventory')->__('Out of Stock')
+ ),
+ );
+ }
+}
diff --git a/app/code/core/Mage/CatalogInventory/Model/Stock.php b/app/code/core/Mage/CatalogInventory/Model/Stock.php
index d9f4fb568b..1ae5d26a4c 100644
--- a/app/code/core/Mage/CatalogInventory/Model/Stock.php
+++ b/app/code/core/Mage/CatalogInventory/Model/Stock.php
@@ -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_CatalogInventory
- * @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_CatalogInventory
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/CatalogInventory/Model/Stock/Item.php b/app/code/core/Mage/CatalogInventory/Model/Stock/Item.php
index 132fb725f2..e2200d641c 100644
--- a/app/code/core/Mage/CatalogInventory/Model/Stock/Item.php
+++ b/app/code/core/Mage/CatalogInventory/Model/Stock/Item.php
@@ -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_CatalogInvemtory
- * @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)
+ * @category Mage
+ * @package Mage_CatalogInventory
+ * @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)
*/
diff --git a/app/code/core/Mage/CatalogInventory/Model/Stock/Item/Api.php b/app/code/core/Mage/CatalogInventory/Model/Stock/Item/Api.php
index 67b641e201..225fe68cf6 100644
--- a/app/code/core/Mage/CatalogInventory/Model/Stock/Item/Api.php
+++ b/app/code/core/Mage/CatalogInventory/Model/Stock/Item/Api.php
@@ -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_CatalogInventory
- * @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_CatalogInventory
+ * @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)
*/
/**
@@ -118,4 +118,4 @@ public function update($productId, $data)
return true;
}
-} // Class Mage_CatalogInventory_Model_Stock_Item_Api End
\ No newline at end of file
+} // Class Mage_CatalogInventory_Model_Stock_Item_Api End
diff --git a/app/code/core/Mage/CatalogInventory/Model/Stock/Item/Api/V2.php b/app/code/core/Mage/CatalogInventory/Model/Stock/Item/Api/V2.php
index a8dbd0af1f..22caf96197 100644
--- a/app/code/core/Mage/CatalogInventory/Model/Stock/Item/Api/V2.php
+++ b/app/code/core/Mage/CatalogInventory/Model/Stock/Item/Api/V2.php
@@ -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_CatalogInventory
- * @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_CatalogInventory
+ * @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)
*/
/**
@@ -78,4 +78,4 @@ public function update($productId, $data)
return true;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/CatalogInventory/Model/Stock/Status.php b/app/code/core/Mage/CatalogInventory/Model/Stock/Status.php
index ef0c65fb74..bd1df05f3a 100644
--- a/app/code/core/Mage/CatalogInventory/Model/Stock/Status.php
+++ b/app/code/core/Mage/CatalogInventory/Model/Stock/Status.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_CatalogInventory
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
@@ -516,4 +516,16 @@ public function prepareCatalogProductIndexSelect(Varien_Db_Select $select, $enti
return $this;
}
+
+ /**
+ * Add only is in stock products filter to product collection
+ *
+ * @param Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Collection $collection
+ * @return Mage_CatalogInventory_Model_Stock_Status
+ */
+ public function addIsInStockFilterToCollection($collection)
+ {
+ $this->_getResource()->addIsInStockFilterToCollection($collection);
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/CatalogInventory/etc/adminhtml.xml b/app/code/core/Mage/CatalogInventory/etc/adminhtml.xml
index aaa531556c..25c0dc8669 100644
--- a/app/code/core/Mage/CatalogInventory/etc/adminhtml.xml
+++ b/app/code/core/Mage/CatalogInventory/etc/adminhtml.xml
@@ -19,10 +19,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_CatalogInventory
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ * @category Mage
+ * @package Mage_CatalogInventory
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
diff --git a/app/code/core/Mage/CatalogInventory/etc/api.xml b/app/code/core/Mage/CatalogInventory/etc/api.xml
index 1166ec597b..cb39729c8b 100644
--- a/app/code/core/Mage/CatalogInventory/etc/api.xml
+++ b/app/code/core/Mage/CatalogInventory/etc/api.xml
@@ -21,8 +21,8 @@
*
* @category Mage
* @package Mage_CatalogInventory
- * @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)
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
@@ -78,4 +78,4 @@
-
\ No newline at end of file
+
diff --git a/app/code/core/Mage/CatalogInventory/etc/config.xml b/app/code/core/Mage/CatalogInventory/etc/config.xml
index 12a82ad350..d71e599837 100644
--- a/app/code/core/Mage/CatalogInventory/etc/config.xml
+++ b/app/code/core/Mage/CatalogInventory/etc/config.xml
@@ -19,10 +19,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_CatalogInventory
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ * @category Mage
+ * @package Mage_CatalogInventory
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
diff --git a/app/code/core/Mage/CatalogInventory/etc/system.xml b/app/code/core/Mage/CatalogInventory/etc/system.xml
index 026538adef..448739daa3 100644
--- a/app/code/core/Mage/CatalogInventory/etc/system.xml
+++ b/app/code/core/Mage/CatalogInventory/etc/system.xml
@@ -19,10 +19,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_CatalogRule
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ * @category Mage
+ * @package Mage_CatalogInventory
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
@@ -138,4 +138,4 @@
-
\ No newline at end of file
+
diff --git a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-install-0.7.0.php
index 172b7aaa26..f1db56d9e5 100644
--- a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-install-0.7.0.php
+++ b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-install-0.7.0.php
@@ -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_CatalogInventory
- * @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_CatalogInventory
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.0-0.7.1.php
index 664682cf7d..a333e242c7 100644
--- a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.0-0.7.1.php
+++ b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.0-0.7.1.php
@@ -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_CatalogInventory
- * @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_CatalogInventory
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.1-0.7.2.php
index 504d2afb0c..1eeb1fdc23 100644
--- a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.1-0.7.2.php
+++ b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.1-0.7.2.php
@@ -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_CatalogInventory
- * @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_CatalogInventory
+ * @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)
*/
@@ -31,4 +31,4 @@
$installer->startSetup();
$installer->getConnection()->addColumn($this->getTable('cataloginventory_stock_item'), 'manage_stock', 'tinyint(1) unsigned NOT NULL DEFAULT 0');
$installer->getConnection()->addColumn($this->getTable('cataloginventory_stock_item'), 'use_config_manage_stock', 'tinyint(1) unsigned NOT NULL DEFAULT 1');
-$installer->endSetup();
\ No newline at end of file
+$installer->endSetup();
diff --git a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.2-0.7.3.php
index 26bd5a4a07..78c9130d0b 100644
--- a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.2-0.7.3.php
+++ b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.2-0.7.3.php
@@ -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_CatalogInventory
- * @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_CatalogInventory
+ * @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)
*/
@@ -30,4 +30,4 @@
$installer->startSetup();
$installer->getConnection()->addColumn($this->getTable('cataloginventory_stock_item'), 'stock_status_changed_automatically', 'tinyint(1) unsigned NOT NULL DEFAULT 0');
-$installer->endSetup();
\ No newline at end of file
+$installer->endSetup();
diff --git a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.3-0.7.4.php b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.3-0.7.4.php
index 715cb70661..ab5a0928b7 100644
--- a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.3-0.7.4.php
+++ b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.3-0.7.4.php
@@ -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_CatalogInventory
- * @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_CatalogInventory
+ * @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)
*/
@@ -42,4 +42,4 @@
));
}
-$installer->endSetup();
\ No newline at end of file
+$installer->endSetup();
diff --git a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.4-0.7.5.php b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.4-0.7.5.php
index c3dacc8f9f..5fbe0e0b3e 100644
--- a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.4-0.7.5.php
+++ b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.4-0.7.5.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_CatalogInventory
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
diff --git a/app/code/core/Mage/CatalogRule/Helper/Data.php b/app/code/core/Mage/CatalogRule/Helper/Data.php
index d826f61c7b..3d2c72ec15 100644
--- a/app/code/core/Mage/CatalogRule/Helper/Data.php
+++ b/app/code/core/Mage/CatalogRule/Helper/Data.php
@@ -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_CatalogRule
- * @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_CatalogRule
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule.php b/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule.php
index 77a2cb2be5..c60080b3ad 100644
--- a/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule.php
+++ b/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule.php
@@ -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_CatalogRule
- * @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_CatalogRule
+ * @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)
*/
/**
@@ -359,24 +359,24 @@ protected function _getRuleProductsStmt($fromDate, $toDate, $productId=null, $we
array($fieldAlias=>$tableAlias.'.value')
);
} else {
- foreach (Mage::app()->getWebsites() as $website) {
- $websiteId = $website->getId();
- $defaultGroup = $website->getDefaultGroup();
- if ($defaultGroup instanceof Mage_Core_Model_Store_Group) {
- $storeId = $defaultGroup->getDefaultStoreId();
- } else {
+ foreach (Mage::app()->getWebsites() as $website) {
+ $websiteId = $website->getId();
+ $defaultGroup = $website->getDefaultGroup();
+ if ($defaultGroup instanceof Mage_Core_Model_Store_Group) {
+ $storeId = $defaultGroup->getDefaultStoreId();
+ } else {
$storeId = Mage_Core_Model_App::ADMIN_STORE_ID;
}
- $storeId = $defaultGroup->getDefaultStoreId();
- $tableAlias = 'pp'.$websiteId;
- $fieldAlias = 'website_'.$websiteId.'_price';
- $select->joinLeft(
- array($tableAlias=>$priceTable),
- sprintf($joinCondition, $tableAlias, $storeId),
- array($fieldAlias=>$tableAlias.'.value')
- );
- }
+ $storeId = $defaultGroup->getDefaultStoreId();
+ $tableAlias = 'pp'.$websiteId;
+ $fieldAlias = 'website_'.$websiteId.'_price';
+ $select->joinLeft(
+ array($tableAlias=>$priceTable),
+ sprintf($joinCondition, $tableAlias, $storeId),
+ array($fieldAlias=>$tableAlias.'.value')
+ );
+ }
}
return $read->query($select);
}
@@ -510,6 +510,15 @@ public function applyAllRulesForDateRange($fromDate=null, $toDate=null, $product
$this->_saveRuleProductPrices($dayPrices);
}
$this->_saveRuleProductPrices($dayPrices);
+
+ $write->delete($this->getTable('catalogrule/rule_group_website'), array());
+
+ $select = $write->select()
+ ->distinct(true)
+ ->from($this->getTable('catalogrule/rule_product'), array('rule_id', 'customer_group_id', 'website_id'));
+ $query = $select->insertFromSelect($this->getTable('catalogrule/rule_group_website'));
+ $write->query($query);
+
$write->commit();
} catch (Exception $e) {
$write->rollback();
@@ -735,4 +744,4 @@ public function applyToProduct($rule, $product, $websiteIds)
$write->commit();
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Collection.php b/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Collection.php
index 4ead18cf7d..89a98b298b 100644
--- a/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Collection.php
+++ b/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Collection.php
@@ -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_CatalogRule
- * @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_CatalogRule
+ * @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)
*/
@@ -57,4 +57,4 @@ public function addWebsiteFilter($websiteIds)
}
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Product/Price.php b/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Product/Price.php
index a72f1d7597..21ab33635f 100644
--- a/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Product/Price.php
+++ b/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Product/Price.php
@@ -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_SalesRule
- * @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_CatalogRule
+ * @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)
*/
diff --git a/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Product/Price/Collection.php b/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Product/Price/Collection.php
index 3211a96b46..7fca635d79 100644
--- a/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Product/Price/Collection.php
+++ b/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Product/Price/Collection.php
@@ -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_SalesRule
- * @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_CatalogRule
+ * @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)
*/
@@ -44,4 +44,4 @@ public function getProductIds()
$idsSelect->distinct(true);
return $this->getConnection()->fetchCol($idsSelect);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/CatalogRule/Model/Observer.php b/app/code/core/Mage/CatalogRule/Model/Observer.php
index 89612d5d1f..7a7c63b54d 100644
--- a/app/code/core/Mage/CatalogRule/Model/Observer.php
+++ b/app/code/core/Mage/CatalogRule/Model/Observer.php
@@ -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_CatalogRule
- * @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_CatalogRule
+ * @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)
*/
/**
@@ -201,4 +201,4 @@ public function prepareCatalogProductPriceIndexTable(Varien_Event_Observer $obse
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/CatalogRule/Model/Rule.php b/app/code/core/Mage/CatalogRule/Model/Rule.php
index 23570da443..24b5ddfc1f 100644
--- a/app/code/core/Mage/CatalogRule/Model/Rule.php
+++ b/app/code/core/Mage/CatalogRule/Model/Rule.php
@@ -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_CatalogRule
- * @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_CatalogRule
+ * @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)
*/
@@ -227,4 +227,4 @@ public function applyAll()
$indexProcess->reindexAll();
}
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/CatalogRule/Model/Rule/Action/Collection.php b/app/code/core/Mage/CatalogRule/Model/Rule/Action/Collection.php
index d6882496eb..1893d9decc 100644
--- a/app/code/core/Mage/CatalogRule/Model/Rule/Action/Collection.php
+++ b/app/code/core/Mage/CatalogRule/Model/Rule/Action/Collection.php
@@ -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_CatalogRule
- * @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_CatalogRule
+ * @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)
*/
diff --git a/app/code/core/Mage/CatalogRule/Model/Rule/Action/Product.php b/app/code/core/Mage/CatalogRule/Model/Rule/Action/Product.php
index adfc54ddbd..0e5fea2297 100644
--- a/app/code/core/Mage/CatalogRule/Model/Rule/Action/Product.php
+++ b/app/code/core/Mage/CatalogRule/Model/Rule/Action/Product.php
@@ -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_CatalogRule
- * @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_CatalogRule
+ * @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)
*/
@@ -52,4 +52,4 @@ public function asHtml()
$html.= $this->getRemoveLinkHtml();
return $html;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/CatalogRule/Model/Rule/Condition/Combine.php b/app/code/core/Mage/CatalogRule/Model/Rule/Condition/Combine.php
index 153074222b..2fad277113 100644
--- a/app/code/core/Mage/CatalogRule/Model/Rule/Condition/Combine.php
+++ b/app/code/core/Mage/CatalogRule/Model/Rule/Condition/Combine.php
@@ -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_CatalogRule
- * @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_CatalogRule
+ * @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)
*/
diff --git a/app/code/core/Mage/CatalogRule/Model/Rule/Condition/Product.php b/app/code/core/Mage/CatalogRule/Model/Rule/Condition/Product.php
index 841af84b90..5241cdabf1 100644
--- a/app/code/core/Mage/CatalogRule/Model/Rule/Condition/Product.php
+++ b/app/code/core/Mage/CatalogRule/Model/Rule/Condition/Product.php
@@ -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_CatalogRule
- * @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_CatalogRule
+ * @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)
*/
@@ -377,4 +377,4 @@ public function validate(Varien_Object $object)
return parent::validate($object);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/CatalogRule/etc/adminhtml.xml b/app/code/core/Mage/CatalogRule/etc/adminhtml.xml
index 37a4b58208..bc6ae9ef65 100644
--- a/app/code/core/Mage/CatalogRule/etc/adminhtml.xml
+++ b/app/code/core/Mage/CatalogRule/etc/adminhtml.xml
@@ -19,10 +19,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_CatalogRule
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ * @category Mage
+ * @package Mage_CatalogRule
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
@@ -34,7 +34,6 @@
Catalog Price Rules
adminhtml/promo_catalog/
- promo/catalog
Mage_Catalog
diff --git a/app/code/core/Mage/CatalogRule/etc/config.xml b/app/code/core/Mage/CatalogRule/etc/config.xml
index 027ad63598..2197ac24dc 100644
--- a/app/code/core/Mage/CatalogRule/etc/config.xml
+++ b/app/code/core/Mage/CatalogRule/etc/config.xml
@@ -19,16 +19,16 @@
* 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_CatalogRule
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ * @category Mage
+ * @package Mage_CatalogRule
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
- 0.7.7
+ 0.7.8
@@ -49,6 +49,7 @@
catalogrule_product_price
catalogrule_affected_product
+ catalogrule_group_website
diff --git a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-install-0.7.0.php
index b4fcf0a07f..7094726496 100644
--- a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-install-0.7.0.php
+++ b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-install-0.7.0.php
@@ -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_CatalogRule
- * @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_CatalogRule
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.0-0.7.1.php
index 1a35fed426..8429ffab1d 100644
--- a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.0-0.7.1.php
+++ b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.0-0.7.1.php
@@ -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_CatalogRule
- * @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_CatalogRule
+ * @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)
*/
$installer = $this;
@@ -32,4 +32,4 @@
$installer->getConnection()->addColumn($this->getTable('catalogrule'), 'simple_action', 'varchar(32) not null');
$installer->getConnection()->addColumn($this->getTable('catalogrule'), 'discount_amount', 'decimal(12,4) not null');
-$installer->endSetup();
\ No newline at end of file
+$installer->endSetup();
diff --git a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.1-0.7.2.php
index 7023e6f5b4..974638f6ca 100644
--- a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.1-0.7.2.php
+++ b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.1-0.7.2.php
@@ -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_CatalogRule
- * @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_CatalogRule
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.2-0.7.3.php
index 5e0ae82774..125a55a05f 100644
--- a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.2-0.7.3.php
+++ b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.2-0.7.3.php
@@ -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_CatalogRule
- * @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_CatalogRule
+ * @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)
*/
$installer = $this;
@@ -32,4 +32,4 @@
$installer->getConnection()->addColumn($this->getTable('catalogrule_product_price'), 'latest_start_date', 'date');
$installer->getConnection()->addColumn($this->getTable('catalogrule_product_price'), 'earliest_end_date', 'date');
-$installer->endSetup();
\ No newline at end of file
+$installer->endSetup();
diff --git a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.3-0.7.4.php b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.3-0.7.4.php
index c461a5182c..efdb625140 100644
--- a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.3-0.7.4.php
+++ b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.3-0.7.4.php
@@ -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_CatalogRule
- * @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_CatalogRule
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.4-0.7.5.php b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.4-0.7.5.php
index dd929c9593..d7ee6f42a0 100644
--- a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.4-0.7.5.php
+++ b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.4-0.7.5.php
@@ -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_CatalogRule
- * @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_CatalogRule
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.5-0.7.6.php b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.5-0.7.6.php
index b6a5a57a69..b87d8df5d2 100644
--- a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.5-0.7.6.php
+++ b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.5-0.7.6.php
@@ -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_CatalogRule
- * @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_CatalogRule
+ * @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)
*/
@@ -33,4 +33,4 @@
'sort_order',
array('rule_id', 'from_time','to_time','website_id','customer_group_id','product_id','sort_order'),
'unique'
-);
\ No newline at end of file
+);
diff --git a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.6-0.7.7.php b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.6-0.7.7.php
index a7b41bdd71..299f379c3d 100644
--- a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.6-0.7.7.php
+++ b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.6-0.7.7.php
@@ -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_CatalogRule
- * @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)
+ * @category Mage
+ * @package Mage_CatalogRule
+ * @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)
*/
diff --git a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.7-0.7.8.php b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.7-0.7.8.php
new file mode 100644
index 0000000000..6fce1bd864
--- /dev/null
+++ b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.7-0.7.8.php
@@ -0,0 +1,55 @@
+startSetup();
+
+$ruleGroupWebsiteTable = $installer->getTable('catalogrule/rule_group_website');
+
+$installer->run("CREATE TABLE `{$ruleGroupWebsiteTable}` (
+ `rule_id` int(10) unsigned NOT NULL default '0',
+ `customer_group_id` smallint(5) unsigned default NULL,
+ `website_id` smallint(5) unsigned default NULL,
+ KEY `rule_id` (`rule_id`),
+ KEY `customer_group_id` (`customer_group_id`),
+ KEY `website_id` (`website_id`)
+ ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin");
+
+$installer->getConnection()->addConstraint(
+ 'FK_CATALOGRULE_GROUP_WEBSITE_RULE', $ruleGroupWebsiteTable, 'rule_id',
+ $installer->getTable('catalogrule/rule'), 'rule_id', 'CASCADE', 'CASCADE'
+);
+$installer->getConnection()->addConstraint(
+ 'FK_CATALOGRULE_GROUP_WEBSITE_GROUP', $ruleGroupWebsiteTable, 'customer_group_id',
+ $installer->getTable('customer/customer_group'), 'customer_group_id', 'CASCADE', 'CASCADE'
+);
+$installer->getConnection()->addConstraint(
+ 'FK_CATALOGRULE_GROUP_WEBSITE_WEBSITE', $ruleGroupWebsiteTable, 'website_id',
+ $installer->getTable('core/website'), 'website_id', 'CASCADE', 'CASCADE'
+);
+
+$installer->run("ALTER TABLE `{$ruleGroupWebsiteTable}` ADD PRIMARY KEY ( `rule_id` , `customer_group_id`, `website_id` )");
\ No newline at end of file
diff --git a/app/code/core/Mage/CatalogSearch/Block/Advanced/Form.php b/app/code/core/Mage/CatalogSearch/Block/Advanced/Form.php
index fa09496365..09ce9044e0 100644
--- a/app/code/core/Mage/CatalogSearch/Block/Advanced/Form.php
+++ b/app/code/core/Mage/CatalogSearch/Block/Advanced/Form.php
@@ -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_CatalogSearch
- * @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_CatalogSearch
+ * @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)
*/
/**
@@ -198,7 +198,7 @@ public function getAttributeSelectElement($attribute)
->setExtraParams($extra)
->setValue($this->getAttributeValue($attribute))
->setOptions($options)
- ->setClass('multiselect')
+ ->setClass('multiselect')
->getHtml();
}
@@ -270,4 +270,4 @@ public function getDateInput($attribute, $part = 'from')
->setClass('input-text')
->getHtml();
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/CatalogSearch/Block/Advanced/Result.php b/app/code/core/Mage/CatalogSearch/Block/Advanced/Result.php
index a3562329e9..7d893e170d 100644
--- a/app/code/core/Mage/CatalogSearch/Block/Advanced/Result.php
+++ b/app/code/core/Mage/CatalogSearch/Block/Advanced/Result.php
@@ -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_CatalogSearch
- * @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_CatalogSearch
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/CatalogSearch/Block/Autocomplete.php b/app/code/core/Mage/CatalogSearch/Block/Autocomplete.php
index 4f44f47fdd..fa1844ef45 100644
--- a/app/code/core/Mage/CatalogSearch/Block/Autocomplete.php
+++ b/app/code/core/Mage/CatalogSearch/Block/Autocomplete.php
@@ -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_CatalogSearch
- * @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_CatalogSearch
+ * @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)
*/
/**
@@ -93,4 +93,4 @@ public function getSuggestData()
/*
*
*/
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/CatalogSearch/Block/Layer.php b/app/code/core/Mage/CatalogSearch/Block/Layer.php
index 3e550d873f..a91b25085d 100644
--- a/app/code/core/Mage/CatalogSearch/Block/Layer.php
+++ b/app/code/core/Mage/CatalogSearch/Block/Layer.php
@@ -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_CatalogSearch
- * @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_CatalogSearch
+ * @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)
*/
/**
@@ -66,4 +66,4 @@ public function canShowBlock()
}
return false;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/CatalogSearch/Block/Layer/Filter/Attribute.php b/app/code/core/Mage/CatalogSearch/Block/Layer/Filter/Attribute.php
index 0be0d28644..add5533d9b 100644
--- a/app/code/core/Mage/CatalogSearch/Block/Layer/Filter/Attribute.php
+++ b/app/code/core/Mage/CatalogSearch/Block/Layer/Filter/Attribute.php
@@ -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_CatalogSearch
- * @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_CatalogSearch
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/CatalogSearch/Block/Result.php b/app/code/core/Mage/CatalogSearch/Block/Result.php
index d828519137..990d6fc925 100644
--- a/app/code/core/Mage/CatalogSearch/Block/Result.php
+++ b/app/code/core/Mage/CatalogSearch/Block/Result.php
@@ -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_CatalogSearch
- * @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_CatalogSearch
+ * @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)
*/
diff --git a/app/code/core/Mage/CatalogSearch/Block/Term.php b/app/code/core/Mage/CatalogSearch/Block/Term.php
index 9b3b1b0703..56976a3561 100644
--- a/app/code/core/Mage/CatalogSearch/Block/Term.php
+++ b/app/code/core/Mage/CatalogSearch/Block/Term.php
@@ -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_Catalog
- * @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_CatalogSearch
+ * @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_CatalogSearch_Block_Term extends Mage_Core_Block_Template
@@ -74,15 +74,15 @@ public function getTerms()
}
public function getSearchUrl($obj)
- {
- $url = Mage::getModel('core/url');
- /*
- * url encoding will be done in Url.php http_build_query
- * so no need to explicitly called urlencode for the text
- */
- $url->setQueryParam('q', $obj->getName());
- return $url->getUrl('catalogsearch/result');
- }
+ {
+ $url = Mage::getModel('core/url');
+ /*
+ * url encoding will be done in Url.php http_build_query
+ * so no need to explicitly called urlencode for the text
+ */
+ $url->setQueryParam('q', $obj->getName());
+ return $url->getUrl('catalogsearch/result');
+ }
public function getMaxPopularity()
{
@@ -93,4 +93,4 @@ public function getMinPopularity()
{
return $this->_minPopularity;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/CatalogSearch/Helper/Data.php b/app/code/core/Mage/CatalogSearch/Helper/Data.php
index 1c427af4fe..f27ed12f50 100644
--- a/app/code/core/Mage/CatalogSearch/Helper/Data.php
+++ b/app/code/core/Mage/CatalogSearch/Helper/Data.php
@@ -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_CatalogSearch
- * @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_CatalogSearch
+ * @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)
*/
/**
@@ -81,8 +81,10 @@ public function getQuery()
{
if (!$this->_query) {
$this->_query = Mage::getModel('catalogsearch/query')
- ->loadByQuery($this->getQueryText())
- ->setQueryText($this->getQueryText());
+ ->loadByQuery($this->getQueryText());
+ if (!$this->_query->getId()) {
+ $this->_query->setQueryText($this->getQueryText());
+ }
}
return $this->_query;
}
diff --git a/app/code/core/Mage/CatalogSearch/Model/Advanced.php b/app/code/core/Mage/CatalogSearch/Model/Advanced.php
index fb96c8699c..a33aac5aeb 100644
--- a/app/code/core/Mage/CatalogSearch/Model/Advanced.php
+++ b/app/code/core/Mage/CatalogSearch/Model/Advanced.php
@@ -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_CatalogSearch
- * @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_CatalogSearch
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/CatalogSearch/Model/Fulltext.php b/app/code/core/Mage/CatalogSearch/Model/Fulltext.php
index 82402e6be1..a0d64bafa7 100644
--- a/app/code/core/Mage/CatalogSearch/Model/Fulltext.php
+++ b/app/code/core/Mage/CatalogSearch/Model/Fulltext.php
@@ -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_CatalogSearch
- * @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_CatalogSearch
+ * @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)
*/
/**
@@ -121,4 +121,4 @@ public function getSearchType($storeId = null)
{
return Mage::getStoreConfig(self::XML_PATH_CATALOG_SEARCH_TYPE, $storeId);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/CatalogSearch/Model/Fulltext/Observer.php b/app/code/core/Mage/CatalogSearch/Model/Fulltext/Observer.php
index dd116e73f3..0aa543413d 100644
--- a/app/code/core/Mage/CatalogSearch/Model/Fulltext/Observer.php
+++ b/app/code/core/Mage/CatalogSearch/Model/Fulltext/Observer.php
@@ -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_CatalogSearch
- * @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_CatalogSearch
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/CatalogSearch/Model/Layer.php b/app/code/core/Mage/CatalogSearch/Model/Layer.php
index fb3c7b96d6..0a52eb3ee4 100644
--- a/app/code/core/Mage/CatalogSearch/Model/Layer.php
+++ b/app/code/core/Mage/CatalogSearch/Model/Layer.php
@@ -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_CatalogSearch
- * @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_CatalogSearch
+ * @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_CatalogSearch_Model_Layer extends Mage_Catalog_Model_Layer
@@ -56,7 +56,7 @@ public function getProductCollection()
public function prepareProductCollection($collection)
{
$collection->addAttributeToSelect(Mage::getSingleton('catalog/config')->getProductAttributes())
- ->addSearchFilter(Mage::helper('catalogsearch')->getQueryText())
+ ->addSearchFilter(Mage::helper('catalogsearch')->getQuery()->getQueryText())
->setStore(Mage::app()->getStore())
->addMinimalPrice()
->addFinalPrice()
@@ -120,4 +120,4 @@ protected function _prepareAttribute($attribute)
$attribute->setIsFilterable(Mage_Catalog_Model_Layer_Filter_Attribute::OPTIONS_ONLY_WITH_RESULTS);
return $attribute;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/CatalogSearch/Model/Layer/Filter/Attribute.php b/app/code/core/Mage/CatalogSearch/Model/Layer/Filter/Attribute.php
index 050b1d9a39..1c9988feb7 100644
--- a/app/code/core/Mage/CatalogSearch/Model/Layer/Filter/Attribute.php
+++ b/app/code/core/Mage/CatalogSearch/Model/Layer/Filter/Attribute.php
@@ -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_CatalogSearch
- * @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)
+ * @category Mage
+ * @package Mage_CatalogSearch
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Advanced/Collection.php b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Advanced/Collection.php
index 8cfc83be60..c8e633f9aa 100644
--- a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Advanced/Collection.php
+++ b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Advanced/Collection.php
@@ -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_Catalog
- * @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_CatalogSearch
+ * @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_CatalogSearch_Model_Mysql4_Advanced_Collection extends Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Collection
@@ -128,4 +128,4 @@ public function addFieldsToFilter($fields)
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext.php b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext.php
index dbb17d972a..642a399bed 100644
--- a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext.php
+++ b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext.php
@@ -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_CatalogSearch
- * @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_CatalogSearch
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext/Collection.php b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext/Collection.php
index fee9c62628..dd27e6ebb2 100644
--- a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext/Collection.php
+++ b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext/Collection.php
@@ -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_CatalogSearch
- * @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_CatalogSearch
+ * @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)
*/
diff --git a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Query.php b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Query.php
index cc9320ce1d..4372b647be 100644
--- a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Query.php
+++ b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Query.php
@@ -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_CatalogSearch
- * @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_CatalogSearch
+ * @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)
*/
/**
@@ -49,7 +49,7 @@ protected function _construct()
*/
protected function _getLoadSelect($field, $value, $object)
{
- $select = $this->_getReadAdapter()->select()
+ $select = $this->_getReadAdapter()->select()
->from($this->getMainTable())
->where($this->getMainTable().'.'.$field.'=?', $value);
return $select;
@@ -66,13 +66,11 @@ public function loadByQuery(Mage_Core_Model_Abstract $object, $value)
{
$select = $this->_getReadAdapter()->select()
->from($this->getMainTable())
- ->where('query_text=:query_text')
- ->where('store_id=:store_id');
- $bind = array(
- ':query_text' => $value,
- ':store_id' => $object->getStoreId()
- );
- if ($data = $this->_getReadAdapter()->fetchRow($select, $bind)) {
+ ->where('synonym_for=?', $value)
+ ->orWhere('query_text=?', $value)
+ ->where('store_id=?', $object->getStoreId())
+ ->order('synonym_for DESC');
+ if ($data = $this->_getReadAdapter()->fetchRow($select)) {
$object->setData($data);
$this->_afterLoad($object);
}
diff --git a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Query/Collection.php b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Query/Collection.php
index 0ac955205e..50636c2b08 100644
--- a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Query/Collection.php
+++ b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Query/Collection.php
@@ -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_CatalogSearch
- * @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_CatalogSearch
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Search/Collection.php b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Search/Collection.php
index be6598a2d1..8cba764a7a 100644
--- a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Search/Collection.php
+++ b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Search/Collection.php
@@ -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_CatalogSearch
- * @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_CatalogSearch
+ * @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)
*/
diff --git a/app/code/core/Mage/CatalogSearch/Model/Query.php b/app/code/core/Mage/CatalogSearch/Model/Query.php
index 1e28361c3a..9ca8bfc1d8 100644
--- a/app/code/core/Mage/CatalogSearch/Model/Query.php
+++ b/app/code/core/Mage/CatalogSearch/Model/Query.php
@@ -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_CatalogSearch
- * @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_CatalogSearch
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/CatalogSearch/Model/Session.php b/app/code/core/Mage/CatalogSearch/Model/Session.php
index b9202e951a..32ea0be09d 100644
--- a/app/code/core/Mage/CatalogSearch/Model/Session.php
+++ b/app/code/core/Mage/CatalogSearch/Model/Session.php
@@ -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_CatalogSearch
- * @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_CatalogSearch
+ * @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_CatalogSearch_Model_Session extends Mage_Core_Model_Session_Abstract
diff --git a/app/code/core/Mage/CatalogSearch/Model/System/Config/Backend/Sitemap.php b/app/code/core/Mage/CatalogSearch/Model/System/Config/Backend/Sitemap.php
index 9582d608af..6fca5efb7e 100644
--- a/app/code/core/Mage/CatalogSearch/Model/System/Config/Backend/Sitemap.php
+++ b/app/code/core/Mage/CatalogSearch/Model/System/Config/Backend/Sitemap.php
@@ -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_Catalogsearch
- * @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_CatalogSearch
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/CatalogSearch/controllers/AdvancedController.php b/app/code/core/Mage/CatalogSearch/controllers/AdvancedController.php
index 3225f924a9..a8c96500bc 100644
--- a/app/code/core/Mage/CatalogSearch/controllers/AdvancedController.php
+++ b/app/code/core/Mage/CatalogSearch/controllers/AdvancedController.php
@@ -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_CatalogSearch
- * @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_CatalogSearch
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/CatalogSearch/controllers/AjaxController.php b/app/code/core/Mage/CatalogSearch/controllers/AjaxController.php
index 27c42d5a5c..ac6614231a 100644
--- a/app/code/core/Mage/CatalogSearch/controllers/AjaxController.php
+++ b/app/code/core/Mage/CatalogSearch/controllers/AjaxController.php
@@ -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_CatalogSearch
- * @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_CatalogSearch
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/CatalogSearch/controllers/ResultController.php b/app/code/core/Mage/CatalogSearch/controllers/ResultController.php
index 0a0f50d0da..e1c60c98d9 100644
--- a/app/code/core/Mage/CatalogSearch/controllers/ResultController.php
+++ b/app/code/core/Mage/CatalogSearch/controllers/ResultController.php
@@ -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_CatalogSearch
- * @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_CatalogSearch
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/CatalogSearch/controllers/TermController.php b/app/code/core/Mage/CatalogSearch/controllers/TermController.php
index ed39e41773..ae62544be2 100644
--- a/app/code/core/Mage/CatalogSearch/controllers/TermController.php
+++ b/app/code/core/Mage/CatalogSearch/controllers/TermController.php
@@ -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_Catalog
- * @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_CatalogSearch
+ * @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)
*/
@@ -30,15 +30,15 @@ class Mage_CatalogSearch_TermController extends Mage_Core_Controller_Front_Actio
public function preDispatch(){
parent::preDispatch();
if(!Mage::getStoreConfig('catalog/seo/search_terms')){
- $this->_redirect('noroute');
- $this->setFlag('',self::FLAG_NO_DISPATCH,true);
- }
- return $this;
+ $this->_redirect('noroute');
+ $this->setFlag('',self::FLAG_NO_DISPATCH,true);
+ }
+ return $this;
}
public function popularAction()
{
- $this->loadLayout();
- $this->renderLayout();
+ $this->loadLayout();
+ $this->renderLayout();
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/CatalogSearch/etc/adminhtml.xml b/app/code/core/Mage/CatalogSearch/etc/adminhtml.xml
index 6a84040f6d..a03efee663 100644
--- a/app/code/core/Mage/CatalogSearch/etc/adminhtml.xml
+++ b/app/code/core/Mage/CatalogSearch/etc/adminhtml.xml
@@ -19,10 +19,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_CatalogSearch
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ * @category Mage
+ * @package Mage_CatalogSearch
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
@@ -30,8 +30,9 @@
- Search
+ Search Terms
adminhtml/catalog_search/
+ 40
@@ -43,7 +44,7 @@
- Search
+ Search Terms
diff --git a/app/code/core/Mage/CatalogSearch/etc/config.xml b/app/code/core/Mage/CatalogSearch/etc/config.xml
index 1cbab3d672..77188de172 100644
--- a/app/code/core/Mage/CatalogSearch/etc/config.xml
+++ b/app/code/core/Mage/CatalogSearch/etc/config.xml
@@ -19,10 +19,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_CatalogSearch
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ * @category Mage
+ * @package Mage_CatalogSearch
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
@@ -196,4 +196,4 @@
-
\ No newline at end of file
+
diff --git a/app/code/core/Mage/CatalogSearch/etc/system.xml b/app/code/core/Mage/CatalogSearch/etc/system.xml
index 9e8c792b47..6b72e4fc5f 100644
--- a/app/code/core/Mage/CatalogSearch/etc/system.xml
+++ b/app/code/core/Mage/CatalogSearch/etc/system.xml
@@ -19,10 +19,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_CatalogSearch
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ * @category Mage
+ * @package Mage_CatalogSearch
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
@@ -109,4 +109,4 @@
-
\ No newline at end of file
+
diff --git a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-install-0.7.0.php
index 7b0da42fd2..30432b4ce2 100644
--- a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-install-0.7.0.php
+++ b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-install-0.7.0.php
@@ -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_CatalogSearch
- * @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_CatalogSearch
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.1-0.7.2.php
index 576f67d037..d1d565a982 100644
--- a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.1-0.7.2.php
+++ b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.1-0.7.2.php
@@ -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_Eav
- * @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_CatalogSearch
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.2-0.7.3.php
index d6dbbbc91b..cc7be61202 100644
--- a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.2-0.7.3.php
+++ b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.2-0.7.3.php
@@ -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_Eav
- * @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_CatalogSearch
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.3-0.7.4.php b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.3-0.7.4.php
index fca1f61cfa..515ec6c675 100644
--- a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.3-0.7.4.php
+++ b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.3-0.7.4.php
@@ -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_Eav
- * @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_CatalogSearch
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.4-0.7.5.php b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.4-0.7.5.php
index 5e8217894d..fb6c828afe 100644
--- a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.4-0.7.5.php
+++ b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.4-0.7.5.php
@@ -1,31 +1,31 @@
-startSetup();
-$installer->endSetup();
+startSetup();
+$installer->endSetup();
diff --git a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.5-0.7.6.php b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.5-0.7.6.php
index 47a5e0a7cd..bda7c4f263 100644
--- a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.5-0.7.6.php
+++ b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.5-0.7.6.php
@@ -1,75 +1,75 @@
-getConnection();
-/* @var $installer Mage_Core_Model_Resource_Setup */
-/* @var $connection Varien_Db_Adapter_Pdo_Mysql */
-
-$installer->startSetup();
-
-$installer->run("
-DROP TABLE IF EXISTS `{$installer->getTable('catalogsearch_fulltext')}`;
-CREATE TABLE `{$installer->getTable('catalogsearch_fulltext')}` (
- `product_id` int(10) unsigned NOT NULL,
- `store_id` smallint(5) unsigned NOT NULL,
- `data_index` longtext NOT NULL,
- PRIMARY KEY (`product_id`,`store_id`),
- FULLTEXT KEY `data_index` (`data_index`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-CREATE TABLE `{$installer->getTable('catalogsearch_result')}` (
- `query_id` int(10) unsigned NOT NULL,
- `product_id` int(10) unsigned NOT NULL,
- `relevance` decimal(6,4) NOT NULL default '0.0000',
- PRIMARY KEY (`query_id`,`product_id`),
- KEY `IDX_QUERY` (`query_id`),
- KEY `IDX_PRODUCT` (`product_id`),
- KEY `IDX_RELEVANCE` (`query_id`, `relevance`),
- CONSTRAINT `FK_CATALOGSEARCH_RESULT_QUERY` FOREIGN KEY (`query_id`) REFERENCES `{$installer->getTable('catalogsearch_query')}` (`query_id`) ON DELETE CASCADE ON UPDATE CASCADE,
- CONSTRAINT `FK_CATALOGSEARCH_RESULT_CATALOG_PRODUCT` FOREIGN KEY (`product_id`) REFERENCES `{$installer->getTable('catalog_product_entity')}` (`entity_id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-");
-
-$connection->dropForeignKey($installer->getTable('catalogsearch_query'), 'FK_catalogsearch_query');
-$connection->dropKey($installer->getTable('catalogsearch_query'), 'FK_catalogsearch_query');
-$connection->addConstraint('FK_CATALOGSEARCH_QUERY_STORE',
- $installer->getTable('catalogsearch_query'), 'store_id',
- $installer->getTable('core_store'), 'store_id'
-);
-$connection->addColumn($installer->getTable('catalogsearch_query'), 'is_active', 'tinyint(1) DEFAULT 1 AFTER `display_in_terms`');
-$connection->addColumn($installer->getTable('catalogsearch_query'), 'is_processed', 'tinyint(1) DEFAULT 0 AFTER `is_active`');
-
-$connection->dropKey($installer->getTable('catalogsearch_query'), 'search_query');
-$connection->addKey($installer->getTable('catalogsearch_query'), 'IDX_SEARCH_QUERY', array(
- 'query_text', 'store_id', 'popularity'
-));
-
-$installer->endSetup();
-
-//Mage::app()->reinitStores();
-//Mage::getModel('catalogsearch/fulltext')->rebuildIndex();
+getConnection();
+/* @var $installer Mage_Core_Model_Resource_Setup */
+/* @var $connection Varien_Db_Adapter_Pdo_Mysql */
+
+$installer->startSetup();
+
+$installer->run("
+DROP TABLE IF EXISTS `{$installer->getTable('catalogsearch_fulltext')}`;
+CREATE TABLE `{$installer->getTable('catalogsearch_fulltext')}` (
+ `product_id` int(10) unsigned NOT NULL,
+ `store_id` smallint(5) unsigned NOT NULL,
+ `data_index` longtext NOT NULL,
+ PRIMARY KEY (`product_id`,`store_id`),
+ FULLTEXT KEY `data_index` (`data_index`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+CREATE TABLE `{$installer->getTable('catalogsearch_result')}` (
+ `query_id` int(10) unsigned NOT NULL,
+ `product_id` int(10) unsigned NOT NULL,
+ `relevance` decimal(6,4) NOT NULL default '0.0000',
+ PRIMARY KEY (`query_id`,`product_id`),
+ KEY `IDX_QUERY` (`query_id`),
+ KEY `IDX_PRODUCT` (`product_id`),
+ KEY `IDX_RELEVANCE` (`query_id`, `relevance`),
+ CONSTRAINT `FK_CATALOGSEARCH_RESULT_QUERY` FOREIGN KEY (`query_id`) REFERENCES `{$installer->getTable('catalogsearch_query')}` (`query_id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `FK_CATALOGSEARCH_RESULT_CATALOG_PRODUCT` FOREIGN KEY (`product_id`) REFERENCES `{$installer->getTable('catalog_product_entity')}` (`entity_id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+");
+
+$connection->dropForeignKey($installer->getTable('catalogsearch_query'), 'FK_catalogsearch_query');
+$connection->dropKey($installer->getTable('catalogsearch_query'), 'FK_catalogsearch_query');
+$connection->addConstraint('FK_CATALOGSEARCH_QUERY_STORE',
+ $installer->getTable('catalogsearch_query'), 'store_id',
+ $installer->getTable('core_store'), 'store_id'
+);
+$connection->addColumn($installer->getTable('catalogsearch_query'), 'is_active', 'tinyint(1) DEFAULT 1 AFTER `display_in_terms`');
+$connection->addColumn($installer->getTable('catalogsearch_query'), 'is_processed', 'tinyint(1) DEFAULT 0 AFTER `is_active`');
+
+$connection->dropKey($installer->getTable('catalogsearch_query'), 'search_query');
+$connection->addKey($installer->getTable('catalogsearch_query'), 'IDX_SEARCH_QUERY', array(
+ 'query_text', 'store_id', 'popularity'
+));
+
+$installer->endSetup();
+
+//Mage::app()->reinitStores();
+//Mage::getModel('catalogsearch/fulltext')->rebuildIndex();
diff --git a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.6-0.7.7.php b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.6-0.7.7.php
index ad451f144b..38aa3480f0 100644
--- a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.6-0.7.7.php
+++ b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.6-0.7.7.php
@@ -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_Tax
- * @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_CatalogSearch
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/Checkout/Block/Agreements.php b/app/code/core/Mage/Checkout/Block/Agreements.php
index 7ce5d5bc53..d8df24b772 100644
--- a/app/code/core/Mage/Checkout/Block/Agreements.php
+++ b/app/code/core/Mage/Checkout/Block/Agreements.php
@@ -1,5 +1,28 @@
getData('agreements');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Checkout/Block/Cart.php b/app/code/core/Mage/Checkout/Block/Cart.php
index 59ef26eda1..1058ed409a 100644
--- a/app/code/core/Mage/Checkout/Block/Cart.php
+++ b/app/code/core/Mage/Checkout/Block/Cart.php
@@ -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_Checkout
- * @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_Checkout
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Checkout/Block/Cart/Abstract.php b/app/code/core/Mage/Checkout/Block/Cart/Abstract.php
index 2dc237ccb7..c8f3c95e88 100644
--- a/app/code/core/Mage/Checkout/Block/Cart/Abstract.php
+++ b/app/code/core/Mage/Checkout/Block/Cart/Abstract.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Checkout
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
@@ -186,4 +186,4 @@ public function getTotalsCache()
}
return $this->_totals;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Checkout/Block/Cart/Coupon.php b/app/code/core/Mage/Checkout/Block/Cart/Coupon.php
index 858a55fb58..8e58c96a9d 100644
--- a/app/code/core/Mage/Checkout/Block/Cart/Coupon.php
+++ b/app/code/core/Mage/Checkout/Block/Cart/Coupon.php
@@ -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_Checkout
- * @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_Checkout
+ * @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)
*/
@@ -33,4 +33,4 @@ public function getCouponCode()
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Checkout/Block/Cart/Crosssell.php b/app/code/core/Mage/Checkout/Block/Cart/Crosssell.php
index 6fbfa234c3..598230a9b1 100644
--- a/app/code/core/Mage/Checkout/Block/Cart/Crosssell.php
+++ b/app/code/core/Mage/Checkout/Block/Cart/Crosssell.php
@@ -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_Checkout
- * @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_Checkout
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer.php b/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer.php
index 71e11c3ccc..aaa2a00d79 100644
--- a/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer.php
+++ b/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer.php
@@ -340,4 +340,4 @@ public function getFormatedOptionValue($optionValue)
return $result;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer/Configurable.php b/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer/Configurable.php
index 95f49e7008..c937faeef7 100644
--- a/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer/Configurable.php
+++ b/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer/Configurable.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Checkout
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
@@ -111,4 +111,4 @@ public function getOptionList()
return $options;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer/Grouped.php b/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer/Grouped.php
index 84d866ba91..601ab26324 100644
--- a/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer/Grouped.php
+++ b/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer/Grouped.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Checkout
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
diff --git a/app/code/core/Mage/Checkout/Block/Cart/Shipping.php b/app/code/core/Mage/Checkout/Block/Cart/Shipping.php
index 68f270a0be..69df5abee0 100644
--- a/app/code/core/Mage/Checkout/Block/Cart/Shipping.php
+++ b/app/code/core/Mage/Checkout/Block/Cart/Shipping.php
@@ -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_Checkout
- * @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_Checkout
+ * @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)
*/
@@ -176,4 +176,4 @@ public function isZipCodeRequired()
}
return false;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Checkout/Block/Cart/Sidebar.php b/app/code/core/Mage/Checkout/Block/Cart/Sidebar.php
index 50bdcc3d5c..4437ab0527 100644
--- a/app/code/core/Mage/Checkout/Block/Cart/Sidebar.php
+++ b/app/code/core/Mage/Checkout/Block/Cart/Sidebar.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Checkout
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
@@ -36,6 +36,9 @@ class Mage_Checkout_Block_Cart_Sidebar extends Mage_Checkout_Block_Cart_Abstract
{
const XML_PATH_CHECKOUT_SIDEBAR_COUNT = 'checkout/sidebar/count';
+ /**
+ * Class constructor
+ */
public function __construct()
{
parent::__construct();
@@ -72,19 +75,30 @@ public function getRecentItems($count = null)
/**
* Get shopping cart subtotal.
+ *
* It will include tax, if required by config settings.
*
- * @return decimal
+ * @param bool $skipTax flag for getting price with tax or not. Ignored in case when we display just subtotal incl.tax
+ * @return decimal
*/
- public function getSubtotal($skipTax = false)
+ public function getSubtotal($skipTax = true)
{
$subtotal = 0;
$totals = $this->getTotals();
+ $config = Mage::getSingleton('tax/config');
if (isset($totals['subtotal'])) {
- $subtotal = $totals['subtotal']->getValue();
- if (!$skipTax) {
- if ((!$this->helper('tax')->displayCartBothPrices()) && $this->helper('tax')->displayCartPriceInclTax()) {
- $subtotal = $this->_addTax($subtotal);
+ if ($config->displayCartSubtotalBoth()) {
+ if ($skipTax) {
+ $subtotal = $totals['subtotal']->getValueExclTax();
+ } else {
+ $subtotal = $totals['subtotal']->getValueInclTax();
+ }
+ } elseif($config->displayCartSubtotalInclTax()) {
+ $subtotal = $totals['subtotal']->getValueInclTax();
+ } else {
+ $subtotal = $totals['subtotal']->getValue();
+ if (!$skipTax && isset($totals['tax'])) {
+ $subtotal+= $totals['tax']->getValue();
}
}
}
@@ -99,12 +113,19 @@ public function getSubtotal($skipTax = false)
*/
public function getSubtotalInclTax()
{
- if (!$this->helper('tax')->displayCartBothPrices()) {
+ if (!Mage::getSingleton('tax/config')->displayCartSubtotalBoth()) {
return 0;
}
- return $this->_addTax($this->getSubtotal(true));
+ return $this->getSubtotal(false);
}
+ /**
+ * Add tax to amount
+ *
+ * @param float $price
+ * @param bool $exclShippingTax
+ * @return float
+ */
private function _addTax($price, $exclShippingTax=true) {
$totals = $this->getTotals();
if (isset($totals['tax'])) {
@@ -117,27 +138,53 @@ private function _addTax($price, $exclShippingTax=true) {
return $price;
}
+ /**
+ * Get shipping tax amount
+ *
+ * @return float
+ */
protected function _getShippingTaxAmount()
{
return $this->getQuote()->getShippingAddress()->getShippingTaxAmount();
}
+ /**
+ * Get shopping cart items qty based on configuration (summary qty or items qty)
+ *
+ * @return int | float
+ */
public function getSummaryCount()
{
return Mage::getSingleton('checkout/cart')->getSummaryQty();
}
+ /**
+ * Get incl/excl tax label
+ *
+ * @param bool $flag
+ * @return string
+ */
public function getIncExcTax($flag)
{
$text = Mage::helper('tax')->getIncExcText($flag);
return $text ? ' ('.$text.')' : '';
}
+ /**
+ * Check if one page checkout is available
+ *
+ * @return bool
+ */
public function isPossibleOnepageCheckout()
{
return $this->helper('checkout')->canOnepageCheckout();
}
+ /**
+ * Get one page checkout page url
+ *
+ * @return bool
+ */
public function getCheckoutUrl()
{
return $this->helper('checkout/url')->getCheckoutUrl();
diff --git a/app/code/core/Mage/Checkout/Block/Cart/Totals.php b/app/code/core/Mage/Checkout/Block/Cart/Totals.php
index 17ea3f9341..d60e54a247 100644
--- a/app/code/core/Mage/Checkout/Block/Cart/Totals.php
+++ b/app/code/core/Mage/Checkout/Block/Cart/Totals.php
@@ -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_Checkout
- * @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_Checkout
+ * @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_Checkout_Block_Cart_Totals extends Mage_Checkout_Block_Cart_Abstract
@@ -124,4 +124,4 @@ public function displayBaseGrandtotal()
}
return '-';
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Checkout/Block/Links.php b/app/code/core/Mage/Checkout/Block/Links.php
index 861f055fa9..5ee0fde9ef 100644
--- a/app/code/core/Mage/Checkout/Block/Links.php
+++ b/app/code/core/Mage/Checkout/Block/Links.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Checkout
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
diff --git a/app/code/core/Mage/Checkout/Block/Multishipping/Abstract.php b/app/code/core/Mage/Checkout/Block/Multishipping/Abstract.php
index 7be69e8d48..0d1581d8a8 100644
--- a/app/code/core/Mage/Checkout/Block/Multishipping/Abstract.php
+++ b/app/code/core/Mage/Checkout/Block/Multishipping/Abstract.php
@@ -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_Checkout
- * @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_Checkout
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Checkout/Block/Multishipping/Address/Select.php b/app/code/core/Mage/Checkout/Block/Multishipping/Address/Select.php
index fdc973b44a..3f921a7a1c 100644
--- a/app/code/core/Mage/Checkout/Block/Multishipping/Address/Select.php
+++ b/app/code/core/Mage/Checkout/Block/Multishipping/Address/Select.php
@@ -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_Checkout
- * @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_Checkout
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Checkout/Block/Multishipping/Addresses.php b/app/code/core/Mage/Checkout/Block/Multishipping/Addresses.php
index ad6437e19f..5ca8b95447 100644
--- a/app/code/core/Mage/Checkout/Block/Multishipping/Addresses.php
+++ b/app/code/core/Mage/Checkout/Block/Multishipping/Addresses.php
@@ -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_Checkout
- * @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_Checkout
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Checkout/Block/Multishipping/Billing.php b/app/code/core/Mage/Checkout/Block/Multishipping/Billing.php
index cda1944ca2..b800be672c 100644
--- a/app/code/core/Mage/Checkout/Block/Multishipping/Billing.php
+++ b/app/code/core/Mage/Checkout/Block/Multishipping/Billing.php
@@ -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_Checkout
- * @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_Checkout
+ * @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)
*/
/**
@@ -128,4 +128,4 @@ public function getBackUrl()
{
return $this->getUrl('*/*/backtoshipping');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Checkout/Block/Multishipping/Billing/Items.php b/app/code/core/Mage/Checkout/Block/Multishipping/Billing/Items.php
index a3b4560387..a3c04faff8 100644
--- a/app/code/core/Mage/Checkout/Block/Multishipping/Billing/Items.php
+++ b/app/code/core/Mage/Checkout/Block/Multishipping/Billing/Items.php
@@ -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_Checkout
- * @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_Checkout
+ * @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)
*/
/**
@@ -78,4 +78,4 @@ public function getVirtualQuoteItems()
}
return $items;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Checkout/Block/Multishipping/Link.php b/app/code/core/Mage/Checkout/Block/Multishipping/Link.php
index 905759d72d..b311bc85ed 100644
--- a/app/code/core/Mage/Checkout/Block/Multishipping/Link.php
+++ b/app/code/core/Mage/Checkout/Block/Multishipping/Link.php
@@ -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_Checkout
- * @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_Checkout
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Checkout/Block/Multishipping/Overview.php b/app/code/core/Mage/Checkout/Block/Multishipping/Overview.php
index a9f7d23e5b..313f8fecc6 100644
--- a/app/code/core/Mage/Checkout/Block/Multishipping/Overview.php
+++ b/app/code/core/Mage/Checkout/Block/Multishipping/Overview.php
@@ -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_Checkout
- * @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_Checkout
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Checkout/Block/Multishipping/Payment/Info.php b/app/code/core/Mage/Checkout/Block/Multishipping/Payment/Info.php
index 2c961ad82c..247a905e94 100644
--- a/app/code/core/Mage/Checkout/Block/Multishipping/Payment/Info.php
+++ b/app/code/core/Mage/Checkout/Block/Multishipping/Payment/Info.php
@@ -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_Checkout
- * @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_Checkout
+ * @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)
*/
/**
@@ -51,4 +51,4 @@ protected function _toHtml()
}
return $html;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Checkout/Block/Multishipping/Shipping.php b/app/code/core/Mage/Checkout/Block/Multishipping/Shipping.php
index d92d90a858..c561346203 100644
--- a/app/code/core/Mage/Checkout/Block/Multishipping/Shipping.php
+++ b/app/code/core/Mage/Checkout/Block/Multishipping/Shipping.php
@@ -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_Checkout
- * @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_Checkout
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Checkout/Block/Multishipping/State.php b/app/code/core/Mage/Checkout/Block/Multishipping/State.php
index e992b61d91..59340a30b5 100644
--- a/app/code/core/Mage/Checkout/Block/Multishipping/State.php
+++ b/app/code/core/Mage/Checkout/Block/Multishipping/State.php
@@ -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_Checkout
- * @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_Checkout
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Checkout/Block/Multishipping/Success.php b/app/code/core/Mage/Checkout/Block/Multishipping/Success.php
index 9c6c98a1a1..81ae413033 100644
--- a/app/code/core/Mage/Checkout/Block/Multishipping/Success.php
+++ b/app/code/core/Mage/Checkout/Block/Multishipping/Success.php
@@ -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_Checkout
- * @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_Checkout
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Checkout/Block/Onepage.php b/app/code/core/Mage/Checkout/Block/Onepage.php
index 141f6dcce2..ac6e140389 100644
--- a/app/code/core/Mage/Checkout/Block/Onepage.php
+++ b/app/code/core/Mage/Checkout/Block/Onepage.php
@@ -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_Checkout
- * @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_Checkout
+ * @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)
*/
/**
@@ -191,4 +191,4 @@ public function getPayment()
return $payment;
}
*/
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Abstract.php b/app/code/core/Mage/Checkout/Block/Onepage/Abstract.php
index 3660960416..1566c053e8 100644
--- a/app/code/core/Mage/Checkout/Block/Onepage/Abstract.php
+++ b/app/code/core/Mage/Checkout/Block/Onepage/Abstract.php
@@ -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_Checkout
- * @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_Checkout
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Billing.php b/app/code/core/Mage/Checkout/Block/Onepage/Billing.php
index ef7921d1f3..6e77b9e663 100644
--- a/app/code/core/Mage/Checkout/Block/Onepage/Billing.php
+++ b/app/code/core/Mage/Checkout/Block/Onepage/Billing.php
@@ -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_Checkout
- * @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_Checkout
+ * @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)
*/
/**
@@ -101,4 +101,4 @@ public function getSaveUrl()
{
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Failure.php b/app/code/core/Mage/Checkout/Block/Onepage/Failure.php
index 5721666486..1441faafa0 100644
--- a/app/code/core/Mage/Checkout/Block/Onepage/Failure.php
+++ b/app/code/core/Mage/Checkout/Block/Onepage/Failure.php
@@ -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_Checkout
- * @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_Checkout
+ * @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)
*/
@@ -53,4 +53,4 @@ public function getContinueShoppingUrl()
{
return Mage::getUrl('checkout/cart');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Link.php b/app/code/core/Mage/Checkout/Block/Onepage/Link.php
index 2357b8f36c..1fcec09c4b 100644
--- a/app/code/core/Mage/Checkout/Block/Onepage/Link.php
+++ b/app/code/core/Mage/Checkout/Block/Onepage/Link.php
@@ -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_Checkout
- * @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_Checkout
+ * @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)
*/
/**
@@ -47,4 +47,4 @@ public function isPossibleOnepageCheckout()
{
return $this->helper('checkout')->canOnepageCheckout();
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Login.php b/app/code/core/Mage/Checkout/Block/Onepage/Login.php
index 8879de82b7..1e2a56afc6 100644
--- a/app/code/core/Mage/Checkout/Block/Onepage/Login.php
+++ b/app/code/core/Mage/Checkout/Block/Onepage/Login.php
@@ -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_Checkout
- * @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_Checkout
+ * @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)
*/
/**
@@ -81,4 +81,4 @@ public function getUsername()
{
return Mage::getSingleton('customer/session')->getUsername(true);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Payment.php b/app/code/core/Mage/Checkout/Block/Onepage/Payment.php
index 176d4fcf0d..aeec00b771 100644
--- a/app/code/core/Mage/Checkout/Block/Onepage/Payment.php
+++ b/app/code/core/Mage/Checkout/Block/Onepage/Payment.php
@@ -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_Checkout
- * @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_Checkout
+ * @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)
*/
/**
@@ -42,4 +42,4 @@ protected function _construct()
));
parent::_construct();
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Payment/Info.php b/app/code/core/Mage/Checkout/Block/Onepage/Payment/Info.php
index 2a8f4c4238..e2cc7a5ff7 100644
--- a/app/code/core/Mage/Checkout/Block/Onepage/Payment/Info.php
+++ b/app/code/core/Mage/Checkout/Block/Onepage/Payment/Info.php
@@ -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_Checkout
- * @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_Checkout
+ * @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)
*/
/**
@@ -55,4 +55,4 @@ protected function _toHtml()
}
return $html;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Payment/Methods.php b/app/code/core/Mage/Checkout/Block/Onepage/Payment/Methods.php
index f74f2a519d..7021016f92 100644
--- a/app/code/core/Mage/Checkout/Block/Onepage/Payment/Methods.php
+++ b/app/code/core/Mage/Checkout/Block/Onepage/Payment/Methods.php
@@ -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_Checkout
- * @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_Checkout
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Progress.php b/app/code/core/Mage/Checkout/Block/Onepage/Progress.php
index 1f522dd916..2370e53285 100644
--- a/app/code/core/Mage/Checkout/Block/Onepage/Progress.php
+++ b/app/code/core/Mage/Checkout/Block/Onepage/Progress.php
@@ -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_Checkout
- * @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_Checkout
+ * @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)
*/
/**
@@ -85,4 +85,4 @@ public function formatPrice($price)
{
return $this->getQuote()->getStore()->formatPrice($price);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Review.php b/app/code/core/Mage/Checkout/Block/Onepage/Review.php
index f9cd41e9d8..275931744d 100644
--- a/app/code/core/Mage/Checkout/Block/Onepage/Review.php
+++ b/app/code/core/Mage/Checkout/Block/Onepage/Review.php
@@ -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_Checkout
- * @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_Checkout
+ * @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)
*/
/**
@@ -44,4 +44,4 @@ protected function _construct()
$this->getQuote()->collectTotals()->save();
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Review/Info.php b/app/code/core/Mage/Checkout/Block/Onepage/Review/Info.php
index 53062b8fda..4db25ff90a 100644
--- a/app/code/core/Mage/Checkout/Block/Onepage/Review/Info.php
+++ b/app/code/core/Mage/Checkout/Block/Onepage/Review/Info.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Checkout
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
@@ -35,11 +35,11 @@ class Mage_Checkout_Block_Onepage_Review_Info extends Mage_Sales_Block_Items_Abs
{
public function getItems()
{
- return Mage::getSingleton('checkout/session')->getQuote()->getAllVisibleItems();
+ return Mage::getSingleton('checkout/session')->getQuote()->getAllVisibleItems();
}
public function getTotals()
{
return Mage::getSingleton('checkout/session')->getQuote()->getTotals();
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Shipping.php b/app/code/core/Mage/Checkout/Block/Onepage/Shipping.php
index f1319c5e86..3947cc0a30 100644
--- a/app/code/core/Mage/Checkout/Block/Onepage/Shipping.php
+++ b/app/code/core/Mage/Checkout/Block/Onepage/Shipping.php
@@ -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_Checkout
- * @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_Checkout
+ * @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)
*/
/**
@@ -64,4 +64,4 @@ public function isShow()
{
return !$this->getQuote()->isVirtual();
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method.php b/app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method.php
index 913ba215d0..91e908966c 100644
--- a/app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method.php
+++ b/app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method.php
@@ -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_Checkout
- * @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_Checkout
+ * @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)
*/
/**
@@ -52,4 +52,4 @@ public function isShow()
{
return !$this->getQuote()->isVirtual();
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method/Additional.php b/app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method/Additional.php
index e6f676f9f4..26e8afda92 100644
--- a/app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method/Additional.php
+++ b/app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method/Additional.php
@@ -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_Checkout
- * @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_Checkout
+ * @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)
*/
diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method/Available.php b/app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method/Available.php
index 886453335c..b151b60437 100644
--- a/app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method/Available.php
+++ b/app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method/Available.php
@@ -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_Checkout
- * @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_Checkout
+ * @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)
*/
/**
@@ -41,7 +41,7 @@ public function getShippingRates()
{
if (empty($this->_rates)) {
- $this->getAddress()->collectShippingRates()->save();
+ $this->getAddress()->collectShippingRates()->save();
$groups = $this->getAddress()->getGroupedAllShippingRates();
/*
@@ -50,7 +50,7 @@ public function getShippingRates()
$ratesFilter->addFilter(Mage::app()->getStore()->getPriceFilter(), 'price');
foreach ($groups as $code => $groupItems) {
- $groups[$code] = $ratesFilter->filter($groupItems);
+ $groups[$code] = $ratesFilter->filter($groupItems);
}
}
*/
@@ -86,4 +86,4 @@ public function getShippingPrice($price, $flag)
{
return $this->getQuote()->getStore()->convertPrice(Mage::helper('tax')->getShippingPrice($price, $flag, $this->getAddress()), true);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Success.php b/app/code/core/Mage/Checkout/Block/Onepage/Success.php
index bab637bb9c..0a8b49f94c 100644
--- a/app/code/core/Mage/Checkout/Block/Onepage/Success.php
+++ b/app/code/core/Mage/Checkout/Block/Onepage/Success.php
@@ -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_Checkout
- * @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_Checkout
+ * @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)
*/
/**
@@ -95,4 +95,4 @@ public function isOrderVisible()
return !in_array($this->_order->getState(), Mage::getSingleton('sales/order_config')->getInvisibleOnFrontStates());
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Checkout/Block/Success.php b/app/code/core/Mage/Checkout/Block/Success.php
index 38dd24ff51..0e93d263d2 100644
--- a/app/code/core/Mage/Checkout/Block/Success.php
+++ b/app/code/core/Mage/Checkout/Block/Success.php
@@ -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_Checkout
- * @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_Checkout
+ * @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)
*/
@@ -29,8 +29,8 @@ class Mage_Checkout_Block_Success extends Mage_Core_Block_Template
{
public function getRealOrderId()
{
- $order = Mage::getModel('sales/order')->load($this->getLastOrderId());
- #print_r($order->getData());
- return $order->getIncrementId();
+ $order = Mage::getModel('sales/order')->load($this->getLastOrderId());
+ #print_r($order->getData());
+ return $order->getIncrementId();
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Checkout/Block/Total/Default.php b/app/code/core/Mage/Checkout/Block/Total/Default.php
index 14a1fa9b65..5a3be21e43 100644
--- a/app/code/core/Mage/Checkout/Block/Total/Default.php
+++ b/app/code/core/Mage/Checkout/Block/Total/Default.php
@@ -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_Sales
- * @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_Checkout
+ * @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)
*/
@@ -64,4 +64,4 @@ public function getStore()
{
return $this->_store;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Checkout/Block/Total/Tax.php b/app/code/core/Mage/Checkout/Block/Total/Tax.php
index a6243975b2..b7922ace0b 100644
--- a/app/code/core/Mage/Checkout/Block/Total/Tax.php
+++ b/app/code/core/Mage/Checkout/Block/Total/Tax.php
@@ -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_Sales
- * @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_Checkout
+ * @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)
*/
@@ -33,4 +33,4 @@
class Mage_Checkout_Block_Total_Tax extends Mage_Checkout_Block_Total_Default
{
protected $_template = 'checkout/total/tax.phtml';
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Checkout/Controller/Action.php b/app/code/core/Mage/Checkout/Controller/Action.php
index 5080e11c6e..fe4a431baf 100644
--- a/app/code/core/Mage/Checkout/Controller/Action.php
+++ b/app/code/core/Mage/Checkout/Controller/Action.php
@@ -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_Core
- * @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_Checkout
+ * @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)
*/
diff --git a/app/code/core/Mage/Checkout/Exception.php b/app/code/core/Mage/Checkout/Exception.php
index 6017170fc3..ea2e8b89ce 100644
--- a/app/code/core/Mage/Checkout/Exception.php
+++ b/app/code/core/Mage/Checkout/Exception.php
@@ -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_Checkout
- * @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_Checkout
+ * @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)
*/
@@ -30,4 +30,4 @@
class Mage_Checkout_Exception extends Zend_Exception
{
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Checkout/Helper/Cart.php b/app/code/core/Mage/Checkout/Helper/Cart.php
index da51cbc50f..44b16fec11 100644
--- a/app/code/core/Mage/Checkout/Helper/Cart.php
+++ b/app/code/core/Mage/Checkout/Helper/Cart.php
@@ -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_Checkout
- * @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_Checkout
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Checkout/Helper/Data.php b/app/code/core/Mage/Checkout/Helper/Data.php
index e346048825..7aba7c9ceb 100644
--- a/app/code/core/Mage/Checkout/Helper/Data.php
+++ b/app/code/core/Mage/Checkout/Helper/Data.php
@@ -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_Checkout
- * @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_Checkout
+ * @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)
*/
/**
@@ -110,7 +110,7 @@ public function getPriceInclTax($item)
}
/**
- * Get sales item (quote item, order item etc) row total price including tax
+ * Get sales item (quote item, order item etc) row total price including tax
*
* @param Varien_Object $item
* @return float
@@ -282,4 +282,4 @@ public function isAllowedGuestCheckout(Mage_Sales_Model_Quote $quote, $store = n
return $guestCheckout;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Checkout/Helper/Url.php b/app/code/core/Mage/Checkout/Helper/Url.php
index 66fa6f9034..ba3b1654e8 100644
--- a/app/code/core/Mage/Checkout/Helper/Url.php
+++ b/app/code/core/Mage/Checkout/Helper/Url.php
@@ -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_Checkout
- * @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_Checkout
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Checkout/Model/Agreement.php b/app/code/core/Mage/Checkout/Model/Agreement.php
index ea7593b6c8..3e2dc110e8 100644
--- a/app/code/core/Mage/Checkout/Model/Agreement.php
+++ b/app/code/core/Mage/Checkout/Model/Agreement.php
@@ -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_CheckoutAgreement
- * @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_Checkout
+ * @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_Checkout_Model_Agreement extends Mage_Core_Model_Abstract
@@ -30,4 +30,4 @@ protected function _construct()
{
$this->_init('checkout/agreement');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Checkout/Model/Cart.php b/app/code/core/Mage/Checkout/Model/Cart.php
index 32e9d4baf3..cd0367119a 100644
--- a/app/code/core/Mage/Checkout/Model/Cart.php
+++ b/app/code/core/Mage/Checkout/Model/Cart.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Checkout
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
@@ -357,6 +357,10 @@ public function save()
$this->getQuote()->collectTotals();
$this->getQuote()->save();
$this->getCheckoutSession()->setQuoteId($this->getQuote()->getId());
+ /**
+ * Cart save usually called after chenges with cart items.
+ */
+ Mage::dispatchEvent('checkout_cart_save_after', array('cart'=>$this));
return $this;
}
@@ -537,4 +541,4 @@ public function getItemsQty()
{
return $this->getQuote()->getItemsQty()*1;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Checkout/Model/Config/Source/Cart/Summary.php b/app/code/core/Mage/Checkout/Model/Config/Source/Cart/Summary.php
index 91aa2392fe..c5dd1fc819 100644
--- a/app/code/core/Mage/Checkout/Model/Config/Source/Cart/Summary.php
+++ b/app/code/core/Mage/Checkout/Model/Config/Source/Cart/Summary.php
@@ -1,35 +1,35 @@
-0, 'label'=>Mage::helper('checkout')->__('Display number of items in cart')),
- array('value'=>1, 'label'=>Mage::helper('checkout')->__('Display item quantities')),
- );
- }
-}
+0, 'label'=>Mage::helper('checkout')->__('Display number of items in cart')),
+ array('value'=>1, 'label'=>Mage::helper('checkout')->__('Display item quantities')),
+ );
+ }
+}
diff --git a/app/code/core/Mage/Checkout/Model/Mysql4/Agreement.php b/app/code/core/Mage/Checkout/Model/Mysql4/Agreement.php
index 34068d12a9..b9a703248b 100644
--- a/app/code/core/Mage/Checkout/Model/Mysql4/Agreement.php
+++ b/app/code/core/Mage/Checkout/Model/Mysql4/Agreement.php
@@ -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_CheckoutAgreement
- * @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_Checkout
+ * @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_Checkout_Model_Mysql4_Agreement extends Mage_Core_Model_Mysql4_Abstract
diff --git a/app/code/core/Mage/Checkout/Model/Mysql4/Agreement/Collection.php b/app/code/core/Mage/Checkout/Model/Mysql4/Agreement/Collection.php
index db777aa996..cb21ffac61 100644
--- a/app/code/core/Mage/Checkout/Model/Mysql4/Agreement/Collection.php
+++ b/app/code/core/Mage/Checkout/Model/Mysql4/Agreement/Collection.php
@@ -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_CheckoutAgreement
- * @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_Checkout
+ * @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_Checkout_Model_Mysql4_Agreement_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract
diff --git a/app/code/core/Mage/Checkout/Model/Mysql4/Cart.php b/app/code/core/Mage/Checkout/Model/Mysql4/Cart.php
index e4cbdeab87..27a704554d 100644
--- a/app/code/core/Mage/Checkout/Model/Mysql4/Cart.php
+++ b/app/code/core/Mage/Checkout/Model/Mysql4/Cart.php
@@ -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_Checkout
- * @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_Checkout
+ * @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)
*/
diff --git a/app/code/core/Mage/Checkout/Model/Observer.php b/app/code/core/Mage/Checkout/Model/Observer.php
index 2674d840d2..e76338c3b7 100644
--- a/app/code/core/Mage/Checkout/Model/Observer.php
+++ b/app/code/core/Mage/Checkout/Model/Observer.php
@@ -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_Checkout
- * @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_Checkout
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Checkout/Model/Session.php b/app/code/core/Mage/Checkout/Model/Session.php
index c506d4bf56..0f01564532 100644
--- a/app/code/core/Mage/Checkout/Model/Session.php
+++ b/app/code/core/Mage/Checkout/Model/Session.php
@@ -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_Checkout
- * @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_Checkout
+ * @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)
*/
@@ -55,7 +55,23 @@ public function getQuote()
/* @var $quote Mage_Sales_Model_Quote */
if ($this->getQuoteId()) {
$quote->load($this->getQuoteId());
- if (!$quote->getId()) {
+ if ($quote->getId()) {
+ /**
+ * If current currency code of quote is not equal current currency code of store,
+ * need recalculate totals of quote. It is possible if customer use currency switcher or
+ * store switcher.
+ */
+ if ($quote->getQuoteCurrencyCode() != Mage::app()->getStore()->getCurrentCurrencyCode()) {
+ $quote->setStore(Mage::app()->getStore());
+ $quote->collectTotals()->save();
+ /*
+ * We mast to create new quote object, because collectTotals()
+ * can to create links with other objects.
+ */
+ $quote = Mage::getModel('sales/quote')->setStoreId(Mage::app()->getStore()->getId());
+ $quote->load($this->getQuoteId());
+ }
+ } else {
$this->setQuoteId(null);
}
}
@@ -191,4 +207,4 @@ public function replaceQuote($quote)
$this->setQuoteId($quote->getId());
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Checkout/Model/Type/Abstract.php b/app/code/core/Mage/Checkout/Model/Type/Abstract.php
index 93c089dc81..1f7dbd36d4 100644
--- a/app/code/core/Mage/Checkout/Model/Type/Abstract.php
+++ b/app/code/core/Mage/Checkout/Model/Type/Abstract.php
@@ -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_Checkout
- * @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_Checkout
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Checkout/Model/Type/Multishipping.php b/app/code/core/Mage/Checkout/Model/Type/Multishipping.php
index 94b85dc923..229cb37b0f 100644
--- a/app/code/core/Mage/Checkout/Model/Type/Multishipping.php
+++ b/app/code/core/Mage/Checkout/Model/Type/Multishipping.php
@@ -18,17 +18,17 @@
* 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_Checkout
- * @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_Checkout
+ * @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)
*/
/**
* Multishipping checkout model
*
- * @category Mage
- * @package Mage_Checkout
+ * @category Mage
+ * @package Mage_Checkout
* @author Magento Core Team
*/
class Mage_Checkout_Model_Type_Multishipping extends Mage_Checkout_Model_Type_Abstract
@@ -40,7 +40,8 @@ public function __construct()
}
/**
- * Initialize multishipping checkout
+ * Initialize multishipping checkout.
+ * Split virtual/not virtual items between default billing/shipping addresses
*
* @return Mage_Checkout_Model_Type_Multishipping
*/
@@ -49,61 +50,60 @@ protected function _init()
/**
* reset quote shipping addresses and items
*/
- $this->getQuote()->setIsMultiShipping(true);
+ $quote = $this->getQuote();
+ $quote->setIsMultiShipping(true);
if (!$this->getCustomer()->getId()) {
return $this;
}
if ($this->getCheckoutSession()->getCheckoutState() === Mage_Checkout_Model_Session::CHECKOUT_STATE_BEGIN) {
$this->getCheckoutSession()->setCheckoutState(true);
-
/**
* Remove all addresses
*/
- $addresses = $this->getQuote()->getAllAddresses();
+ $addresses = $quote->getAllAddresses();
foreach ($addresses as $address) {
- $this->getQuote()->removeAddress($address->getId());
+ $quote->removeAddress($address->getId());
}
if ($defaultShipping = $this->getCustomerDefaultShippingAddress()) {
- $this->getQuote()->getShippingAddress()
- ->importCustomerAddress($defaultShipping);
+ $quote->getShippingAddress()->importCustomerAddress($defaultShipping);
foreach ($this->getQuoteItems() as $item) {
/**
- * Items with parent id we add in importQuoteItem method
+ * Items with parent id we add in importQuoteItem method.
+ * Skip virtual items
*/
- if ($item->getParentItemId()) {
- continue;
- }
- if ($item->getProduct()->getIsVirtual()) {
+ if ($item->getParentItemId() || $item->getProduct()->getIsVirtual()) {
continue;
}
- $this->getQuote()->getShippingAddress()
- ->addItem($item);
+ $quote->getShippingAddress()->addItem($item);
}
}
if ($this->getCustomerDefaultBillingAddress()) {
- $this->getQuote()->getBillingAddress()
+ $quote->getBillingAddress()
->importCustomerAddress($this->getCustomerDefaultBillingAddress());
foreach ($this->getQuoteItems() as $item) {
if ($item->getParentItemId()) {
continue;
}
if ($item->getProduct()->getIsVirtual()) {
- $this->getQuote()->getBillingAddress()->addItem($item);
+ $quote->getBillingAddress()->addItem($item);
}
}
}
-
$this->save();
- } else {
- $this->getQuote()->collectTotals();
}
return $this;
}
+ /**
+ * Get quote items assigned to different quote addresses populated per item qty.
+ * Based on result array we can display each item separately
+ *
+ * @return array
+ */
public function getQuoteShippingAddressesItems()
{
$items = array();
@@ -113,46 +113,48 @@ public function getQuoteShippingAddressesItems()
if ($item->getParentItemId()) {
continue;
}
-
if ($item->getProduct()->getIsVirtual()) {
$items[] = $item;
continue;
}
- else {
- if ($item->getQty() > 1) {
- for ($i = 0, $n = $item->getQty(); $i < $n; $i++) {
- if ($i == 0) {
- $addressItem = $item;
- }
- else {
- $addressItem = clone $item;
- }
- $addressItem->setQty(1)
- ->setCustomerAddressId($address->getCustomerAddressId())
- ->save();
- $items[] = $addressItem;
+ if ($item->getQty() > 1) {
+ for ($i = 0, $n = $item->getQty(); $i < $n; $i++) {
+ if ($i == 0) {
+ $addressItem = $item;
+ } else {
+ $addressItem = clone $item;
}
+ $addressItem->setQty(1)
+ ->setCustomerAddressId($address->getCustomerAddressId())
+ ->save();
+ $items[] = $addressItem;
}
- else {
- $item->setCustomerAddressId($address->getCustomerAddressId());
- $items[] = $item;
- }
+ } else {
+ $item->setCustomerAddressId($address->getCustomerAddressId());
+ $items[] = $item;
}
}
}
return $items;
}
+ /**
+ * Remove item from address
+ *
+ * @param int $addressId
+ * @param int $itemId
+ * @return Mage_Checkout_Model_Type_Multishipping
+ */
public function removeAddressItem($addressId, $itemId)
{
$address = $this->getQuote()->getAddressById($addressId);
/* @var $address Mage_Sales_Model_Quote_Address */
if ($address) {
- if ($item = $address->getItemById($itemId)) {
+ $item = $address->getValidItemById($itemId);
+ if ($item) {
if ($item->getQty()>1 && !$item->getProduct()->getIsVirtual()) {
$item->setQty($item->getQty()-1);
- }
- else {
+ } else {
$address->removeItem($item->getId());
}
@@ -164,18 +166,30 @@ public function removeAddressItem($addressId, $itemId)
$newItemQty = $quoteItem->getQty()-1;
if ($newItemQty > 0 && !$item->getProduct()->getIsVirtual()) {
$quoteItem->setQty($quoteItem->getQty()-1);
- }
- else {
+ } else {
$this->getQuote()->removeItem($quoteItem->getId());
}
}
-
$this->save();
}
}
return $this;
}
+ /**
+ * Assign quote items to addresses and specify items qty
+ *
+ * array structure:
+ * array(
+ * $quoteItemId => array(
+ * 'qty' => $qty,
+ * 'address' => $customerAddressId
+ * )
+ * )
+ *
+ * @param array $info
+ * @return Mage_Checkout_Model_Type_Multishipping
+ */
public function setShippingItemsInformation($info)
{
if (is_array($info)) {
@@ -190,10 +204,10 @@ public function setShippingItemsInformation($info)
if ($allQty > $maxQty) {
Mage::throwException(Mage::helper('checkout')->__('Maximum qty allowed for Shipping to multiple addresses is %s', $maxQty));
}
-
- $addresses = $this->getQuote()->getAllShippingAddresses();
+ $quote = $this->getQuote();
+ $addresses = $quote->getAllShippingAddresses();
foreach ($addresses as $address) {
- $this->getQuote()->removeAddress($address->getId());
+ $quote->removeAddress($address->getId());
}
foreach ($info as $itemData) {
@@ -202,29 +216,35 @@ public function setShippingItemsInformation($info)
}
}
- if ($billingAddress = $this->getQuote()->getBillingAddress()) {
- $this->getQuote()->removeAddress($billingAddress->getId());
+ if ($billingAddress = $quote->getBillingAddress()) {
+ $quote->removeAddress($billingAddress->getId());
}
- $this->getQuote()->getBillingAddress()
- ->importCustomerAddress($this->getCustomerDefaultBillingAddress());
+ $quote->getBillingAddress()->importCustomerAddress($this->getCustomerDefaultBillingAddress());
- foreach ($this->getQuote()->getAllItems() as $_item) {
+ foreach ($quote->getAllItems() as $_item) {
if (!$_item->getProduct()->getIsVirtual()) {
continue;
}
if (isset($itemData[$_item->getId()]['qty']) && ($qty = (int)$itemData[$_item->getId()]['qty'])) {
$_item->setQty($qty);
}
- $this->getQuote()->getBillingAddress()->addItem($_item);
+ $quote->getBillingAddress()->addItem($_item);
}
$this->save();
- Mage::dispatchEvent('checkout_type_multishipping_set_shipping_items', array('quote'=>$this->getQuote()));
+ Mage::dispatchEvent('checkout_type_multishipping_set_shipping_items', array('quote'=>$quote));
}
return $this;
}
+ /**
+ * Add quote item to specific shipping address based on customer address id
+ *
+ * @param int $quoteItemId
+ * @param array $data array('qty'=>$qty, 'address'=>$customerAddressId)
+ * @return Mage_Checkout_Model_Type_Multishipping
+ */
protected function _addShippingItem($quoteItemId, $data)
{
$qty = isset($data['qty']) ? (int) $data['qty'] : 0;
@@ -235,33 +255,34 @@ protected function _addShippingItem($quoteItemId, $data)
if ($addressId && $quoteItem) {
$quoteItem->setMultisippingQty((int)$quoteItem->getMultisippingQty()+$qty);
$quoteItem->setQty($quoteItem->getMultisippingQty());
-
$address = $this->getCustomer()->getAddressById($addressId);
if ($address) {
if (!$quoteAddress = $this->getQuote()->getShippingAddressByCustomerAddressId($addressId)) {
- $quoteAddress = Mage::getModel('sales/quote_address')
- ->importCustomerAddress($address);
+ $quoteAddress = Mage::getModel('sales/quote_address')->importCustomerAddress($address);
$this->getQuote()->addShippingAddress($quoteAddress);
}
$quoteAddress = $this->getQuote()->getShippingAddressByCustomerAddressId($address->getId());
-
if ($quoteAddressItem = $quoteAddress->getItemByQuoteItemId($quoteItemId)) {
$quoteAddressItem->setQty((int)($quoteAddressItem->getQty()+$qty));
- }
- else {
+ } else {
$quoteAddress->addItem($quoteItem, $qty);
}
/**
- * Collect rates for shipping method page only
+ * Require shiping rate recollect
*/
- //$quoteAddress->setCollectShippingRates(true);
$quoteAddress->setCollectShippingRates((boolean) $this->getCollectRatesFlag());
}
}
return $this;
}
+ /**
+ * Reimport customer address info to quote shipping address
+ *
+ * @param int $addressId customer address id
+ * @return Mage_Checkout_Model_Type_Multishipping
+ */
public function updateQuoteCustomerShippingAddress($addressId)
{
if ($address = $this->getCustomer()->getAddressById($addressId)) {
@@ -274,6 +295,12 @@ public function updateQuoteCustomerShippingAddress($addressId)
return $this;
}
+ /**
+ * Reimport customer billing address to quote
+ *
+ * @param int $addressId customer address id
+ * @return Mage_Checkout_Model_Type_Multishipping
+ */
public function setQuoteCustomerBillingAddress($addressId)
{
if ($address = $this->getCustomer()->getAddressById($addressId)) {
@@ -285,23 +312,32 @@ public function setQuoteCustomerBillingAddress($addressId)
return $this;
}
+ /**
+ * Assign shipping methods to addresses
+ *
+ * @param array $methods
+ * @return Mage_Checkout_Model_Type_Multishipping
+ */
public function setShippingMethods($methods)
{
$addresses = $this->getQuote()->getAllShippingAddresses();
foreach ($addresses as $address) {
if (isset($methods[$address->getId()])) {
$address->setShippingMethod($methods[$address->getId()]);
- }
- elseif (!$address->getShippingMethod()) {
+ } elseif (!$address->getShippingMethod()) {
Mage::throwException(Mage::helper('checkout')->__('Please select shipping methods for all addresses'));
}
}
- $addresses = $this->getQuote()
- ->collectTotals()
- ->save();
+ $this->save();
return $this;
}
+ /**
+ * Set payment method info to quote payment
+ *
+ * @param array $payment
+ * @return Mage_Checkout_Model_Type_Multishipping
+ */
public function setPaymentMethod($payment)
{
if (!isset($payment['method'])) {
@@ -314,28 +350,28 @@ public function setPaymentMethod($payment)
}
/**
- * Prepare order
+ * Prepare order based on quote address
*
- * @param Mage_Sales_Model_Quote_Address $address
- * @return Mage_Sales_Model_Order
+ * @param Mage_Sales_Model_Quote_Address $address
+ * @return Mage_Sales_Model_Order
*/
protected function _prepareOrder(Mage_Sales_Model_Quote_Address $address)
{
- $this->getQuote()->unsReservedOrderId();
- $this->getQuote()->reserveOrderId();
+ $quote = $this->getQuote();
+ $quote->unsReservedOrderId();
+ $quote->reserveOrderId();
$convertQuote = Mage::getSingleton('sales/convert_quote');
$order = $convertQuote->addressToOrder($address);
$order->setBillingAddress(
- $convertQuote->addressToOrderAddress($this->getQuote()->getBillingAddress())
+ $convertQuote->addressToOrderAddress($quote->getBillingAddress())
);
if ($address->getAddressType() == 'billing') {
$order->setIsVirtual(1);
- }
- else {
+ } else {
$order->setShippingAddress($convertQuote->addressToOrderAddress($address));
}
- $order->setPayment($convertQuote->paymentToOrderPayment($this->getQuote()->getPayment()));
+ $order->setPayment($convertQuote->paymentToOrderPayment($quote->getPayment()));
foreach ($address->getAllItems() as $item) {
$item->setProductType($item->getQuoteItem()->getProductType())
@@ -350,14 +386,20 @@ protected function _prepareOrder(Mage_Sales_Model_Quote_Address $address)
return $order;
}
+ /**
+ * Validate quote data
+ *
+ * @return Mage_Checkout_Model_Type_Multishipping
+ */
protected function _validate()
{
$helper = Mage::helper('checkout');
- if (!$this->getQuote()->getIsMultiShipping()) {
+ $quote = $this->getQuote();
+ if (!$quote->getIsMultiShipping()) {
Mage::throwException($helper->__('Invalid checkout type.'));
}
- $addresses = $this->getQuote()->getAllShippingAddresses();
+ $addresses = $quote->getAllShippingAddresses();
foreach ($addresses as $address) {
$addressValidation = $address->validate();
if ($addressValidation !== true) {
@@ -369,13 +411,18 @@ protected function _validate()
Mage::throwException($helper->__('Please specify shipping methods for all addresses.'));
}
}
- $addressValidation = $this->getQuote()->getBillingAddress()->validate();
+ $addressValidation = $quote->getBillingAddress()->validate();
if ($addressValidation !== true) {
Mage::throwException($helper->__('Please check billing address information.'));
}
return $this;
}
+ /**
+ * Create orders per each quote address
+ *
+ * @return Mage_Checkout_Model_Type_Multishipping
+ */
public function createOrders()
{
$orderIds = array();
@@ -398,10 +445,8 @@ public function createOrders()
}
foreach ($orders as $order) {
- #$order->save();
$order->place();
$order->save();
-
$order->sendNewOrderEmail();
$orderIds[$order->getId()] = $order->getIncrementId();
}
@@ -410,10 +455,14 @@ public function createOrders()
$this->getQuote()
->setIsActive(false)
->save();
-
return $this;
}
+ /**
+ * Collect quote totals and save quote object
+ *
+ * @return Mage_Checkout_Model_Type_Multishipping
+ */
public function save()
{
$this->getQuote()->collectTotals()
@@ -421,12 +470,22 @@ public function save()
return $this;
}
+ /**
+ * Specify BEGIN state in checkout session whot allow reinit multishipping checkout
+ *
+ * @return Mage_Checkout_Model_Type_Multishipping
+ */
public function reset()
{
$this->getCheckoutSession()->setCheckoutState(Mage_Checkout_Model_Session::CHECKOUT_STATE_BEGIN);
return $this;
}
+ /**
+ * Check if quote amount is allowed for multishipping checkout
+ *
+ * @return bool
+ */
public function validateMinimumAmount()
{
return !(Mage::getStoreConfigFlag('sales/minimum_order/active')
@@ -434,6 +493,11 @@ public function validateMinimumAmount()
&& !$this->getQuote()->validateMinimumAmount());
}
+ /**
+ * Get notification message for case when multishipping checkout is not allowed
+ *
+ * @return string
+ */
public function getMinimumAmountDescription()
{
$descr = Mage::getStoreConfig('sales/minimum_order/multi_address_description');
diff --git a/app/code/core/Mage/Checkout/Model/Type/Multishipping/State.php b/app/code/core/Mage/Checkout/Model/Type/Multishipping/State.php
index 2ac8e3784c..13cacbbe16 100644
--- a/app/code/core/Mage/Checkout/Model/Type/Multishipping/State.php
+++ b/app/code/core/Mage/Checkout/Model/Type/Multishipping/State.php
@@ -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_Checkout
- * @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_Checkout
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Checkout/Model/Type/Onepage.php b/app/code/core/Mage/Checkout/Model/Type/Onepage.php
index d7408d45d0..a55177f8f5 100644
--- a/app/code/core/Mage/Checkout/Model/Type/Onepage.php
+++ b/app/code/core/Mage/Checkout/Model/Type/Onepage.php
@@ -18,15 +18,31 @@
* 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_Checkout
- * @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_Checkout
+ * @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_Checkout_Model_Type_Onepage
{
+ /**
+ * Error message of "customer already exists"
+ *
+ * @var string
+ */
+ private $_customerEmailExistsMessage = '';
+
+ /**
+ * Set customer already exists message
+ * @return Mage_Checkout_Model_Type_Onepage
+ */
+ public function __construct()
+ {
+ $this->_customerEmailExistsMessage = Mage::helper('checkout')->__('There is already a customer registered using this email address. Please login using this email address or enter a different email address to register your account.');
+ }
+
/**
* Enter description here...
*
@@ -63,6 +79,16 @@ public function initCheckout()
}
}
}
+
+ /**
+ * Reset multishipping flag before any manipulations with quote address
+ * addAddress method for quote object related on this flag
+ */
+ if ($this->getQuote()->getIsMultiShipping()) {
+ $this->getQuote()->setIsMultiShipping(false);
+ $this->getQuote()->save();
+ }
+
/*
* want to laod the correct customer information by assiging to address
* instead of just loading from sales/quote_address
@@ -71,10 +97,6 @@ public function initCheckout()
if ($customer) {
$this->getQuote()->assignCustomer($customer);
}
- if ($this->getQuote()->getIsMultiShipping()) {
- $this->getQuote()->setIsMultiShipping(false);
- $this->getQuote()->save();
- }
return $this;
}
@@ -160,7 +182,7 @@ public function saveBilling($data, $customerAddressId)
if (!$this->getQuote()->getCustomerId() && Mage_Sales_Model_Quote::CHECKOUT_METHOD_REGISTER == $this->getQuote()->getCheckoutMethod()) {
if ($this->_customerEmailExists($address->getEmail(), Mage::app()->getWebsite()->getId())) {
return array('error' => 1,
- 'message' => Mage::helper('checkout')->__('There is already a customer registered using this email address')
+ 'message' => $this->_customerEmailExistsMessage
);
}
}
@@ -411,12 +433,24 @@ protected function validateOrder()
*/
public function saveOrder()
{
-
$this->validateOrder();
$billing = $this->getQuote()->getBillingAddress();
if (!$this->getQuote()->isVirtual()) {
$shipping = $this->getQuote()->getShippingAddress();
}
+
+ /*
+ * Check if before this step checkout method was not defined use default values.
+ * Related to issue with some browsers when checkout method was not saved during first step.
+ */
+ if (!$this->getQuote()->getCheckoutMethod()) {
+ if (Mage::helper('checkout')->isAllowedGuestCheckout($this->getQuote(), $this->getQuote()->getStore())) {
+ $this->getQuote()->setCheckoutMethod(Mage_Sales_Model_Quote::CHECKOUT_METHOD_GUEST);
+ } else {
+ $this->getQuote()->setCheckoutMethod(Mage_Sales_Model_Quote::CHECKOUT_METHOD_REGISTER);
+ }
+ }
+
switch ($this->getQuote()->getCheckoutMethod()) {
case Mage_Sales_Model_Quote::CHECKOUT_METHOD_GUEST:
if (!$this->getQuote()->isAllowedGuestCheckout()) {
@@ -530,7 +564,7 @@ public function saveOrder()
// check again, if customer exists
if ($this->getQuote()->getCheckoutMethod() == Mage_Sales_Model_Quote::CHECKOUT_METHOD_REGISTER) {
if ($this->_customerEmailExists($customer->getEmail(), Mage::app()->getWebsite()->getId())) {
- Mage::throwException(Mage::helper('checkout')->__('There is already a customer registered using this email address'));
+ Mage::throwException($this->_customerEmailExistsMessage);
}
}
$order->place();
@@ -555,11 +589,15 @@ public function saveOrder()
$shipping->setCustomerId($customer->getId())->setCustomerAddressId($customerShippingId);
}
- if ($customer->isConfirmationRequired()) {
- $customer->sendNewAccountEmail('confirmation');
- }
- else {
- $customer->sendNewAccountEmail();
+ try {
+ if ($customer->isConfirmationRequired()) {
+ $customer->sendNewAccountEmail('confirmation');
+ }
+ else {
+ $customer->sendNewAccountEmail();
+ }
+ } catch (Exception $e) {
+ Mage::logException($e);
}
}
@@ -591,7 +629,11 @@ public function saveOrder()
* we only want to send to customer about new order when there is no redirect to third party
*/
if(!$redirectUrl){
- $order->sendNewOrderEmail();
+ try {
+ $order->sendNewOrderEmail();
+ } catch (Exception $e) {
+ Mage::logException($e);
+ }
}
if ($this->getQuote()->getCheckoutMethod(true)==Mage_Sales_Model_Quote::CHECKOUT_METHOD_REGISTER
diff --git a/app/code/core/Mage/Checkout/Model/Type/Standard.php b/app/code/core/Mage/Checkout/Model/Type/Standard.php
index 7bf24e19b8..883090b9f7 100644
--- a/app/code/core/Mage/Checkout/Model/Type/Standard.php
+++ b/app/code/core/Mage/Checkout/Model/Type/Standard.php
@@ -18,8 +18,8 @@
* 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_Checkout
- * @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_Checkout
+ * @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)
*/
diff --git a/app/code/core/Mage/Checkout/controllers/CartController.php b/app/code/core/Mage/Checkout/controllers/CartController.php
index b0af211fbf..bb40c6b4db 100644
--- a/app/code/core/Mage/Checkout/controllers/CartController.php
+++ b/app/code/core/Mage/Checkout/controllers/CartController.php
@@ -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_Checkout
- * @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_Checkout
+ * @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)
*/
/**
@@ -366,4 +366,4 @@ public function couponPostAction()
$this->_goBack();
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Checkout/controllers/IndexController.php b/app/code/core/Mage/Checkout/controllers/IndexController.php
index a86ab2bc81..b94dd11e51 100644
--- a/app/code/core/Mage/Checkout/controllers/IndexController.php
+++ b/app/code/core/Mage/Checkout/controllers/IndexController.php
@@ -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_Checkout
- * @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_Checkout
+ * @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_Checkout_IndexController extends Mage_Core_Controller_Front_Action
@@ -30,4 +30,4 @@ function indexAction()
{
$this->_redirect('checkout/onepage', array('_secure'=>true));
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Checkout/controllers/Multishipping/AddressController.php b/app/code/core/Mage/Checkout/controllers/Multishipping/AddressController.php
index 57ef39e9c8..11799eb032 100644
--- a/app/code/core/Mage/Checkout/controllers/Multishipping/AddressController.php
+++ b/app/code/core/Mage/Checkout/controllers/Multishipping/AddressController.php
@@ -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_Checkout
- * @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_Checkout
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Checkout/controllers/MultishippingController.php b/app/code/core/Mage/Checkout/controllers/MultishippingController.php
index d48d0da0c2..790bbae1b6 100644
--- a/app/code/core/Mage/Checkout/controllers/MultishippingController.php
+++ b/app/code/core/Mage/Checkout/controllers/MultishippingController.php
@@ -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_Checkout
- * @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_Checkout
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Checkout/controllers/OnepageController.php b/app/code/core/Mage/Checkout/controllers/OnepageController.php
index 3aa7b1e803..cb7be8ccc4 100644
--- a/app/code/core/Mage/Checkout/controllers/OnepageController.php
+++ b/app/code/core/Mage/Checkout/controllers/OnepageController.php
@@ -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_Checkout
- * @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_Checkout
+ * @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)
*/
diff --git a/app/code/core/Mage/Checkout/etc/adminhtml.xml b/app/code/core/Mage/Checkout/etc/adminhtml.xml
index 404bb66c31..6f94f28cab 100644
--- a/app/code/core/Mage/Checkout/etc/adminhtml.xml
+++ b/app/code/core/Mage/Checkout/etc/adminhtml.xml
@@ -19,10 +19,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_Checkout
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ * @category Mage
+ * @package Mage_Checkout
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
@@ -33,7 +33,6 @@
100
Terms and conditions
adminhtml/checkout_agreement/
- checkout/agreement
diff --git a/app/code/core/Mage/Checkout/etc/config.xml b/app/code/core/Mage/Checkout/etc/config.xml
index b863e29722..7765625979 100644
--- a/app/code/core/Mage/Checkout/etc/config.xml
+++ b/app/code/core/Mage/Checkout/etc/config.xml
@@ -19,10 +19,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_Checkout
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ * @category Mage
+ * @package Mage_Checkout
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
diff --git a/app/code/core/Mage/Checkout/etc/system.xml b/app/code/core/Mage/Checkout/etc/system.xml
index 7671f36d32..a47d67f606 100644
--- a/app/code/core/Mage/Checkout/etc/system.xml
+++ b/app/code/core/Mage/Checkout/etc/system.xml
@@ -19,10 +19,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_GiftMessage
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ * @category Mage
+ * @package Mage_Checkout
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
@@ -223,4 +223,4 @@
-
\ No newline at end of file
+
diff --git a/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-install-0.9.1.php b/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-install-0.9.1.php
index 35b88f4683..00b933f4d5 100644
--- a/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-install-0.9.1.php
+++ b/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-install-0.9.1.php
@@ -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_Checkout
- * @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_Checkout
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.0-0.9.1.php b/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.0-0.9.1.php
index 554e1303c0..944adb1c90 100644
--- a/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.0-0.9.1.php
+++ b/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.0-0.9.1.php
@@ -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_Checkout
- * @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_Checkout
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.1-0.9.2.php b/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.1-0.9.2.php
index 040704db6c..72364ac4a3 100644
--- a/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.1-0.9.2.php
+++ b/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.1-0.9.2.php
@@ -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_Checkout
- * @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_Checkout
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.2-0.9.3.php b/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.2-0.9.3.php
index f60e41727c..6665e56bed 100644
--- a/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.2-0.9.3.php
+++ b/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.2-0.9.3.php
@@ -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_Checkout
- * @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_Checkout
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/Chronopay/Block/Form.php b/app/code/core/Mage/Chronopay/Block/Form.php
index 6617a0f747..8d57f388b5 100644
--- a/app/code/core/Mage/Chronopay/Block/Form.php
+++ b/app/code/core/Mage/Chronopay/Block/Form.php
@@ -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_Chronopay
- * @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_Chronopay
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Chronopay/Block/Info.php b/app/code/core/Mage/Chronopay/Block/Info.php
index 62275166c4..037984c7fd 100644
--- a/app/code/core/Mage/Chronopay/Block/Info.php
+++ b/app/code/core/Mage/Chronopay/Block/Info.php
@@ -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_Chronopay
- * @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_Chronopay
+ * @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)
*/
/**
@@ -45,4 +45,4 @@ public function toPdf()
return $this->toHtml();
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Chronopay/Block/Standard/Failure.php b/app/code/core/Mage/Chronopay/Block/Standard/Failure.php
index ef1155fb01..9b62c7cee9 100644
--- a/app/code/core/Mage/Chronopay/Block/Standard/Failure.php
+++ b/app/code/core/Mage/Chronopay/Block/Standard/Failure.php
@@ -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_Chronopay
- * @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_Chronopay
+ * @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)
*/
/**
* Failure Response from Chronopay
@@ -34,4 +34,4 @@
class Mage_Chronopay_Block_Standard_Failure extends Mage_Core_Block_Template
{
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Chronopay/Block/Standard/Form.php b/app/code/core/Mage/Chronopay/Block/Standard/Form.php
index 0556672e13..2226df7005 100644
--- a/app/code/core/Mage/Chronopay/Block/Standard/Form.php
+++ b/app/code/core/Mage/Chronopay/Block/Standard/Form.php
@@ -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_Chronopay
- * @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_Chronopay
+ * @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)
*/
/**
@@ -40,4 +40,4 @@ protected function _construct()
$this->setTemplate('chronopay/standard/form.phtml');
parent::_construct();
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Chronopay/Block/Standard/Redirect.php b/app/code/core/Mage/Chronopay/Block/Standard/Redirect.php
index 398a81a7b3..46000837c4 100644
--- a/app/code/core/Mage/Chronopay/Block/Standard/Redirect.php
+++ b/app/code/core/Mage/Chronopay/Block/Standard/Redirect.php
@@ -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_Chronopay
- * @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_Chronopay
+ * @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)
*/
/**
@@ -56,4 +56,4 @@ protected function _toHtml()
return $html;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Chronopay/Helper/Data.php b/app/code/core/Mage/Chronopay/Helper/Data.php
index 67e1b0eba3..9630876202 100644
--- a/app/code/core/Mage/Chronopay/Helper/Data.php
+++ b/app/code/core/Mage/Chronopay/Helper/Data.php
@@ -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_Chronopay
- * @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_Chronopay
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Chronopay/Model/Api/Debug.php b/app/code/core/Mage/Chronopay/Model/Api/Debug.php
index 966449b0e9..b53494e2a2 100644
--- a/app/code/core/Mage/Chronopay/Model/Api/Debug.php
+++ b/app/code/core/Mage/Chronopay/Model/Api/Debug.php
@@ -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_Chronopay
- * @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_Chronopay
+ * @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)
*/
/**
@@ -38,4 +38,4 @@ protected function _construct()
{
$this->_init('chronopay/api_debug');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Chronopay/Model/Config.php b/app/code/core/Mage/Chronopay/Model/Config.php
index a860f43410..0a17a9f5ac 100644
--- a/app/code/core/Mage/Chronopay/Model/Config.php
+++ b/app/code/core/Mage/Chronopay/Model/Config.php
@@ -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_Chronopay
- * @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_Chronopay
+ * @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)
*/
/**
* Chronopay Configuration Model
@@ -123,4 +123,4 @@ public function getLanguage ()
{
return $this->getConfigData('language');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Chronopay/Model/Gateway.php b/app/code/core/Mage/Chronopay/Model/Gateway.php
index 5ae99a2457..9ac285488b 100644
--- a/app/code/core/Mage/Chronopay/Model/Gateway.php
+++ b/app/code/core/Mage/Chronopay/Model/Gateway.php
@@ -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_Chronopay
- * @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_Chronopay
+ * @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)
*/
/**
* ChronoPay Gateway Model
diff --git a/app/code/core/Mage/Chronopay/Model/Gateway/Request.php b/app/code/core/Mage/Chronopay/Model/Gateway/Request.php
index 5eaa8645c5..f67661262b 100644
--- a/app/code/core/Mage/Chronopay/Model/Gateway/Request.php
+++ b/app/code/core/Mage/Chronopay/Model/Gateway/Request.php
@@ -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_Chronopay
- * @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_Chronopay
+ * @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)
*/
/**
@@ -35,4 +35,4 @@
class Mage_Chronopay_Model_Gateway_Request extends Varien_Object
{
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Chronopay/Model/Gateway/Result.php b/app/code/core/Mage/Chronopay/Model/Gateway/Result.php
index fa1afa1d83..ee4a9013b8 100644
--- a/app/code/core/Mage/Chronopay/Model/Gateway/Result.php
+++ b/app/code/core/Mage/Chronopay/Model/Gateway/Result.php
@@ -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_Chronopay
- * @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_Chronopay
+ * @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)
*/
/**
@@ -35,4 +35,4 @@
class Mage_Chronopay_Model_Gateway_Result extends Varien_Object
{
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Chronopay/Model/Mysql4/Api/Debug.php b/app/code/core/Mage/Chronopay/Model/Mysql4/Api/Debug.php
index f69398cc18..6132be998d 100644
--- a/app/code/core/Mage/Chronopay/Model/Mysql4/Api/Debug.php
+++ b/app/code/core/Mage/Chronopay/Model/Mysql4/Api/Debug.php
@@ -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_Chronopay
- * @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_Chronopay
+ * @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)
*/
/**
@@ -39,4 +39,4 @@ protected function _construct()
{
$this->_init('chronopay/api_debug', 'debug_id');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Chronopay/Model/Mysql4/Api/Debug/Collection.php b/app/code/core/Mage/Chronopay/Model/Mysql4/Api/Debug/Collection.php
index 82278cc9a8..a79637608a 100644
--- a/app/code/core/Mage/Chronopay/Model/Mysql4/Api/Debug/Collection.php
+++ b/app/code/core/Mage/Chronopay/Model/Mysql4/Api/Debug/Collection.php
@@ -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_Chronopay
- * @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_Chronopay
+ * @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)
*/
/**
@@ -38,4 +38,4 @@ protected function _construct()
{
$this->_init('chronopay/api_debug');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Chronopay/Model/Mysql4/Setup.php b/app/code/core/Mage/Chronopay/Model/Mysql4/Setup.php
index 7bc8a0897a..14df4f2b32 100644
--- a/app/code/core/Mage/Chronopay/Model/Mysql4/Setup.php
+++ b/app/code/core/Mage/Chronopay/Model/Mysql4/Setup.php
@@ -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_Chronopay
- * @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_Chronopay
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Chronopay/Model/Source/Cctype.php b/app/code/core/Mage/Chronopay/Model/Source/Cctype.php
index 6383becb18..7baf32ea85 100644
--- a/app/code/core/Mage/Chronopay/Model/Source/Cctype.php
+++ b/app/code/core/Mage/Chronopay/Model/Source/Cctype.php
@@ -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_Chronopay
- * @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_Chronopay
+ * @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)
*/
/**
@@ -37,4 +37,4 @@ public function getAllowedTypes()
{
return array('VI', 'MC', 'AE', 'DICL', 'JCB', 'ENR', 'SS', 'DI');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Chronopay/Model/Source/Language.php b/app/code/core/Mage/Chronopay/Model/Source/Language.php
index 4e97de1175..e8fee6f1dd 100644
--- a/app/code/core/Mage/Chronopay/Model/Source/Language.php
+++ b/app/code/core/Mage/Chronopay/Model/Source/Language.php
@@ -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_Chronopay
- * @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_Chronopay
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Chronopay/Model/Source/PaymentAction.php b/app/code/core/Mage/Chronopay/Model/Source/PaymentAction.php
index 2f7b23158a..d945684523 100644
--- a/app/code/core/Mage/Chronopay/Model/Source/PaymentAction.php
+++ b/app/code/core/Mage/Chronopay/Model/Source/PaymentAction.php
@@ -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_Paygate
- * @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_Chronopay
+ * @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)
*/
/**
@@ -46,4 +46,4 @@ public function toOptionArray()
),
);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Chronopay/Model/Standard.php b/app/code/core/Mage/Chronopay/Model/Standard.php
index 48f45e975d..d6cfeb8ac9 100644
--- a/app/code/core/Mage/Chronopay/Model/Standard.php
+++ b/app/code/core/Mage/Chronopay/Model/Standard.php
@@ -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_Chronopay
- * @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_Chronopay
+ * @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)
*/
/**
@@ -266,4 +266,4 @@ public function validateResponse ($data)
return $e;
}
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Chronopay/controllers/StandardController.php b/app/code/core/Mage/Chronopay/controllers/StandardController.php
index 0b594c7c4e..2c96139df3 100644
--- a/app/code/core/Mage/Chronopay/controllers/StandardController.php
+++ b/app/code/core/Mage/Chronopay/controllers/StandardController.php
@@ -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_Chronopay
- * @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_Chronopay
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Chronopay/etc/config.xml b/app/code/core/Mage/Chronopay/etc/config.xml
index abd08ed46e..5d750b0560 100644
--- a/app/code/core/Mage/Chronopay/etc/config.xml
+++ b/app/code/core/Mage/Chronopay/etc/config.xml
@@ -19,10 +19,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_Chronopay
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ * @category Mage
+ * @package Mage_Chronopay
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
@@ -144,4 +144,4 @@
-
\ No newline at end of file
+
diff --git a/app/code/core/Mage/Chronopay/etc/system.xml b/app/code/core/Mage/Chronopay/etc/system.xml
index df4b90a0bb..31ca9c13b8 100644
--- a/app/code/core/Mage/Chronopay/etc/system.xml
+++ b/app/code/core/Mage/Chronopay/etc/system.xml
@@ -19,10 +19,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_Chronopay
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ * @category Mage
+ * @package Mage_Chronopay
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
@@ -269,4 +269,4 @@
-
\ No newline at end of file
+
diff --git a/app/code/core/Mage/Chronopay/sql/chronopay_setup/mysql4-install-0.1.0.php b/app/code/core/Mage/Chronopay/sql/chronopay_setup/mysql4-install-0.1.0.php
index 1b673aad9a..815695c343 100644
--- a/app/code/core/Mage/Chronopay/sql/chronopay_setup/mysql4-install-0.1.0.php
+++ b/app/code/core/Mage/Chronopay/sql/chronopay_setup/mysql4-install-0.1.0.php
@@ -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_Chronopay
- * @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_Chronopay
+ * @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)
*/
@@ -42,4 +42,4 @@
");
-$installer->endSetup();
\ No newline at end of file
+$installer->endSetup();
diff --git a/app/code/core/Mage/Cms/Block/Block.php b/app/code/core/Mage/Cms/Block/Block.php
index 9a77a31d08..cc115e442d 100644
--- a/app/code/core/Mage/Cms/Block/Block.php
+++ b/app/code/core/Mage/Cms/Block/Block.php
@@ -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_Cms
- * @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_Cms
+ * @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)
*/
diff --git a/app/code/core/Mage/Cms/Block/Page.php b/app/code/core/Mage/Cms/Block/Page.php
index fd417ad66f..2dbc739120 100644
--- a/app/code/core/Mage/Cms/Block/Page.php
+++ b/app/code/core/Mage/Cms/Block/Page.php
@@ -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_Cms
- * @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_Cms
+ * @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)
*/
diff --git a/app/code/core/Mage/Cms/Block/Widget/Block.php b/app/code/core/Mage/Cms/Block/Widget/Block.php
index 340eef0fef..167dfec63d 100644
--- a/app/code/core/Mage/Cms/Block/Widget/Block.php
+++ b/app/code/core/Mage/Cms/Block/Widget/Block.php
@@ -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_Cms
- * @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_Cms
+ * @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)
*/
@@ -32,15 +32,16 @@
* @package Mage_Cms
* @author Magento Core Team
*/
-class Mage_Cms_Block_Widget_Block extends Mage_Core_Block_Text implements Mage_Cms_Block_Widget_Interface
+class Mage_Cms_Block_Widget_Block extends Mage_Core_Block_Template implements Mage_Cms_Block_Widget_Interface
{
/**
* Prepare block text and determine whether block output enabled or not
*
- * @return bool
+ * @return Mage_Cms_Block_Widget_Block
*/
protected function _beforeToHtml()
{
+ parent::_beforeToHtml();
$blockId = $this->getData('block_id');
if ($blockId) {
$block = Mage::getModel('cms/block')
@@ -50,11 +51,9 @@ protected function _beforeToHtml()
/* @var $helper Mage_Cms_Helper_Data */
$helper = Mage::helper('cms');
$processor = $helper->getBlockTemplateProcessor();
- $html = $processor->filter($block->getContent());
- $this->setText($html);
- return true;
+ $this->setText($processor->filter($block->getContent()));
}
}
- return false;
+ return $this;
}
}
diff --git a/app/code/core/Mage/Cms/Block/Widget/Page/Link.php b/app/code/core/Mage/Cms/Block/Widget/Page/Link.php
index ec9fcfb354..3e387c4392 100644
--- a/app/code/core/Mage/Cms/Block/Widget/Page/Link.php
+++ b/app/code/core/Mage/Cms/Block/Widget/Page/Link.php
@@ -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_Cms
- * @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_Cms
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Cms/Helper/Data.php b/app/code/core/Mage/Cms/Helper/Data.php
index d68cb3490a..fa2ac17c8c 100644
--- a/app/code/core/Mage/Cms/Helper/Data.php
+++ b/app/code/core/Mage/Cms/Helper/Data.php
@@ -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_Cms
- * @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)
+ * @category Mage
+ * @package Mage_Cms
+ * @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)
*/
diff --git a/app/code/core/Mage/Cms/Helper/Page.php b/app/code/core/Mage/Cms/Helper/Page.php
index 71e6da6733..742ec3b626 100644
--- a/app/code/core/Mage/Cms/Helper/Page.php
+++ b/app/code/core/Mage/Cms/Helper/Page.php
@@ -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_Cms
- * @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)
+ * @category Mage
+ * @package Mage_Cms
+ * @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)
*/
@@ -74,7 +74,7 @@ protected function _renderPage(Mage_Core_Controller_Varien_Action $action, $pag
return false;
}
- $inRange = Mage::app()->getLocale()->IsStoreDateInInterval(null, $page->getCustomThemeFrom(), $page->getCustomThemeTo());
+ $inRange = Mage::app()->getLocale()->isStoreDateInInterval(null, $page->getCustomThemeFrom(), $page->getCustomThemeTo());
if ($page->getCustomTheme()) {
if ($inRange) {
diff --git a/app/code/core/Mage/Cms/Helper/Wysiwyg/Images.php b/app/code/core/Mage/Cms/Helper/Wysiwyg/Images.php
index b7362434ee..a9b05d12de 100644
--- a/app/code/core/Mage/Cms/Helper/Wysiwyg/Images.php
+++ b/app/code/core/Mage/Cms/Helper/Wysiwyg/Images.php
@@ -128,6 +128,27 @@ public function convertPathToUrl($path)
return str_replace(DS, '/', $path);
}
+ /**
+ * Prepare Image insertion declaration for Wysiwyg or textarea(as_is mode)
+ *
+ * @param string $filename Filename transferred via Ajax
+ * @param bool $asIs Leave image HTML as is or transform it to controller directive
+ * @return string
+ */
+ public function getImageHtmlDeclaration($filename, $asIs = false)
+ {
+ $fileurl = $this->getCurrentUrl() . $filename;
+ $mediaPath = str_replace(Mage::getBaseUrl('media'), '', $fileurl);
+ $directive = sprintf('{{media url="%s"}}', $mediaPath);
+ if ($asIs) {
+ $html = sprintf('', $directive);
+ } else {
+ $directive = Mage::helper('core')->urlEncode($directive);
+ $html = Mage::helper('adminhtml')->getUrl('*/cms_wysiwyg/directive', array('directive' => $directive));
+ }
+ return $html;
+ }
+
/**
* Return path of the current selected directory or root directory for startup
* Try to create target directory if it doesn't exist
diff --git a/app/code/core/Mage/Cms/Model/Block.php b/app/code/core/Mage/Cms/Model/Block.php
index f6bf7e3734..b054854bc7 100644
--- a/app/code/core/Mage/Cms/Model/Block.php
+++ b/app/code/core/Mage/Cms/Model/Block.php
@@ -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_Cms
- * @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_Cms
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Cms/Model/Config.php b/app/code/core/Mage/Cms/Model/Config.php
index 6b785d8ded..c5d6647437 100644
--- a/app/code/core/Mage/Cms/Model/Config.php
+++ b/app/code/core/Mage/Cms/Model/Config.php
@@ -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_Cms
- * @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)
+ * @category Mage
+ * @package Mage_Cms
+ * @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)
*/
@@ -65,7 +65,7 @@ public function getWidgets()
{
if (!$this->_widgets) {
$config = Mage::getConfig()->loadModulesConfiguration('widget.xml');
- $this->_widgets = $config->getNode('widgets');
+ $this->_widgets = $config->getNode();
}
return $this->_widgets;
diff --git a/app/code/core/Mage/Cms/Model/Mysql4/Block.php b/app/code/core/Mage/Cms/Model/Mysql4/Block.php
index 696bfd106d..a194afb78f 100644
--- a/app/code/core/Mage/Cms/Model/Mysql4/Block.php
+++ b/app/code/core/Mage/Cms/Model/Mysql4/Block.php
@@ -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_Cms
- * @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_Cms
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Cms/Model/Mysql4/Block/Collection.php b/app/code/core/Mage/Cms/Model/Mysql4/Block/Collection.php
index 5ba2136582..8de04b7c4c 100644
--- a/app/code/core/Mage/Cms/Model/Mysql4/Block/Collection.php
+++ b/app/code/core/Mage/Cms/Model/Mysql4/Block/Collection.php
@@ -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_Cms
- * @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_Cms
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Cms/Model/Mysql4/Page.php b/app/code/core/Mage/Cms/Model/Mysql4/Page.php
index 65791fd1ec..7a68dc954c 100644
--- a/app/code/core/Mage/Cms/Model/Mysql4/Page.php
+++ b/app/code/core/Mage/Cms/Model/Mysql4/Page.php
@@ -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_Cms
- * @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_Cms
+ * @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)
*/
/**
@@ -62,11 +62,11 @@ protected function _beforeSave(Mage_Core_Model_Abstract $object)
}
if (!$this->getIsUniquePageToStores($object)) {
- Mage::throwException(Mage::helper('cms')->__('Page Identifier for specified store already exist.'));
+ Mage::throwException(Mage::helper('cms')->__('Page URL Key for specified store already exist.'));
}
if ($this->isNumericPageIdentifier($object)) {
- Mage::throwException(Mage::helper('cms')->__('Page Identifier cannot consist only of numbers.'));
+ Mage::throwException(Mage::helper('cms')->__('Page URL Key cannot consist only of numbers.'));
}
if (! $object->getId()) {
diff --git a/app/code/core/Mage/Cms/Model/Mysql4/Page/Collection.php b/app/code/core/Mage/Cms/Model/Mysql4/Page/Collection.php
index e65250e494..7597acc3a5 100644
--- a/app/code/core/Mage/Cms/Model/Mysql4/Page/Collection.php
+++ b/app/code/core/Mage/Cms/Model/Mysql4/Page/Collection.php
@@ -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_Cms
- * @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_Cms
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Cms/Model/Mysql4/Widget.php b/app/code/core/Mage/Cms/Model/Mysql4/Widget.php
index b4502175f0..0b235a6f87 100644
--- a/app/code/core/Mage/Cms/Model/Mysql4/Widget.php
+++ b/app/code/core/Mage/Cms/Model/Mysql4/Widget.php
@@ -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_Cms
- * @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_Cms
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Cms/Model/Observer.php b/app/code/core/Mage/Cms/Model/Observer.php
index e87e4ce398..3cd0c92a48 100644
--- a/app/code/core/Mage/Cms/Model/Observer.php
+++ b/app/code/core/Mage/Cms/Model/Observer.php
@@ -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_Cms
- * @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)
+ * @category Mage
+ * @package Mage_Cms
+ * @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)
*/
@@ -73,4 +73,19 @@ public function noCookies(Varien_Event_Observer $observer)
}
return $this;
}
+
+ /**
+ * Add additional settings to wysiwyg config for Widgets Insertion Plugin
+ *
+ * @param Varien_Event_Observer $observer
+ * @return Mage_Cms_Model_Observer
+ */
+ public function prepareWidgetsPluginConfig(Varien_Event_Observer $observer)
+ {
+ $config = $observer->getEvent()->getConfig();
+ $settings = Mage::getModel('cms/widget_config')->getPluginSettings($config);
+ $config->addData($settings);
+ return $this;
+ }
+
}
diff --git a/app/code/core/Mage/Cms/Model/Template/Filter.php b/app/code/core/Mage/Cms/Model/Template/Filter.php
index d059895f31..969e9b2549 100644
--- a/app/code/core/Mage/Cms/Model/Template/Filter.php
+++ b/app/code/core/Mage/Cms/Model/Template/Filter.php
@@ -34,6 +34,13 @@
*/
class Mage_Cms_Model_Template_Filter extends Mage_Core_Model_Email_Template_Filter
{
+ /**
+ * Whether to allow SID in store directive: AUTO
+ *
+ * @var bool
+ */
+ protected $_useSessionInUrl = null;
+
/**
* Generate widget
*
@@ -70,4 +77,16 @@ public function widgetDirective($construction)
return $widget->toHtml();
}
+
+ /**
+ * Setter whether SID is allowed in store directive
+ *
+ * @param bool $flag
+ * @return Mage_Cms_Model_Template_Filter
+ */
+ public function setUseSessionInUrl($flag)
+ {
+ $this->_useSessionInUrl = (bool)$flag;
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/Cms/Model/Widget.php b/app/code/core/Mage/Cms/Model/Widget.php
index 1f153bed44..7cb10dd9b6 100644
--- a/app/code/core/Mage/Cms/Model/Widget.php
+++ b/app/code/core/Mage/Cms/Model/Widget.php
@@ -44,8 +44,8 @@ public function getXmlConfig()
if ($cachedXml) {
$xmlConfig = new Varien_Simplexml_Config($cachedXml);
} else {
- $config = new Varien_Simplexml_Config;
- $config->loadString('');
+ $config = new Varien_Simplexml_Config();
+ $config->loadString('');
Mage::getConfig()->loadModulesConfiguration('widget.xml', $config);
$xmlConfig = $config;
if (Mage::app()->useCache('config')) {
@@ -60,17 +60,133 @@ public function getXmlConfig()
* Return widget XML config element based on its type
*
* @param string $type Widget type
- * @return Varien_Simplexml_Element
+ * @return null|Varien_Simplexml_Element
*/
public function getXmlElementByType($type)
{
- $elements = $this->getXmlConfig()->getNode('widgets')->xpath('*[@type="' . $type . '"]');
+ $elements = $this->getXmlConfig()->getXpath('*[@type="' . $type . '"]');
if (is_array($elements) && isset($elements[0]) && $elements[0] instanceof Varien_Simplexml_Element) {
return $elements[0];
}
return null;
}
+ /**
+ * Wrapper for getXmlElementByType method
+ *
+ * @param string $type Widget type
+ * @return null|Varien_Simplexml_Element
+ */
+ public function getConfigAsXml($type)
+ {
+ return $this->getXmlElementByType($type);
+ }
+
+ /**
+ * Return widget XML configuration as Varien_Object and makes some data preparations
+ *
+ * @param string $type Widget type
+ * @return Varien_Object
+ */
+ public function getConfigAsObject($type)
+ {
+ $xml = $this->getConfigAsXml($type);
+
+ $object = new Varien_Object();
+ if ($xml === null) {
+ return $object;
+ }
+
+ // Save all nodes to object data
+ $object->setType($type);
+ $object->setData($xml->asCanonicalArray());
+
+ // Set module for translations etc.
+ $module = $object->getData('@/module');
+ if ($module) {
+ $object->setModule($module);
+ }
+
+ // Correct widget parameters and convert its data to objects
+ $params = $object->getData('parameters');
+ $newParams = array();
+ if (is_array($params)) {
+ $sortOrder = 0;
+ foreach ($params as $key => $data) {
+ if (is_array($data)) {
+ $data['key'] = $key;
+ $data['sort_order'] = isset($data['sort_order']) ? (int)$data['sort_order'] : $sortOrder;
+
+ // prepare values (for drop-dawns) specified directly in configuration
+ $values = array();
+ if (isset($data['values']) && is_array($data['values'])) {
+ foreach ($data['values'] as $value) {
+ if (isset($value['label']) && isset($value['value'])) {
+ $values[] = $value;
+ }
+ }
+ }
+ $data['values'] = $values;
+
+ // prepare helper block object
+ if (isset($data['helper_block'])) {
+ $helper = new Varien_Object();
+ if (isset($data['helper_block']['data']) && is_array($data['helper_block']['data'])) {
+ $helper->addData($data['helper_block']['data']);
+ }
+ if (isset($data['helper_block']['type'])) {
+ $helper->setType($data['helper_block']['type']);
+ }
+ $data['helper_block'] = $helper;
+ }
+
+ $newParams[$key] = new Varien_Object($data);
+ $sortOrder++;
+ }
+ }
+ }
+ uasort($newParams, array($this, '_sortParameters'));
+ $object->setData('parameters', $newParams);
+
+ return $object;
+ }
+
+ /**
+ * Return list of widgets as SimpleXml object
+ *
+ * @return Varien_Simplexml_Element
+ */
+ public function getWidgetsXml()
+ {
+ return $this->getXmlConfig()->getNode();
+ }
+
+ /**
+ * Return list of widgets as array
+ *
+ * @param bool $withEmptyElement
+ * @return array
+ */
+ public function getWidgetsArray($withEmptyElement = false)
+ {
+ if (!$this->_getData('widgets_array')) {
+ $result = array();
+ foreach ($this->getWidgetsXml() as $widget) {
+ $helper = $widget->getAttribute('module') ? $widget->getAttribute('module') : 'cms';
+ $helper = Mage::helper($helper);
+ $result[$widget->getName()] = array(
+ 'name' => $helper->__((string)$widget->name),
+ 'code' => $widget->getName(),
+ 'type' => $widget->getAttribute('type'),
+ 'description' => $helper->__((string)$widget->description)
+ );
+ }
+ usort($result, array($this, "_sortWidgets"));
+ $this->setData('widgets_array', $result);
+ }
+ return $this->_getData('widgets_array');
+ }
+
/**
* Return widget presentation code in WYSIWYG editor
*
@@ -81,13 +197,18 @@ public function getXmlElementByType($type)
*/
public function getWidgetDeclaration($type, $params = array(), $asIs = true)
{
- $widget = $this->getXmlElementByType($type);
-
$directive = '{{widget type="' . $type . '"';
+
foreach ($params as $name => $value) {
// Retrieve default option value if pre-configured
- if (trim($value) == '' && $widget->parameters) {
- $value = (string)$widget->parameters->{$name}->value;
+ if (is_array($value)) {
+ $value = implode(',', $value);
+ } elseif (trim($value) == '') {
+ $widget = $this->getConfigAsObject($type);
+ $parameters = $widget->getParameters();
+ if (isset($parameters[$name]) && is_object($parameters[$name])) {
+ $value = $parameters[$name]->getValue();
+ }
}
if ($value) {
$directive .= sprintf(' %s="%s"', $name, $value);
@@ -99,11 +220,12 @@ public function getWidgetDeclaration($type, $params = array(), $asIs = true)
return $directive;
}
+ $config = Mage::getSingleton('cms/widget_config');
$imageName = str_replace('/', '__', $type) . '.gif';
- if (is_file($this->getPlaceholderImagesBaseDir() . DS . $imageName)) {
- $image = $this->getPlaceholderImagesBaseUrl() . $imageName;
+ if (is_file($config->getPlaceholderImagesBaseDir() . DS . $imageName)) {
+ $image = $config->getPlaceholderImagesBaseUrl() . $imageName;
} else {
- $image = $this->getPlaceholderImagesBaseUrl() . 'default.gif';
+ $image = $config->getPlaceholderImagesBaseUrl() . 'default.gif';
}
$html = sprintf('',
$this->_idEncode($directive),
@@ -114,33 +236,57 @@ public function getWidgetDeclaration($type, $params = array(), $asIs = true)
}
/**
- * Return Widget placeholders images URL
+ * Return list of required JS files to be included on the top of the page before insertion plugin loaded
*
- * @return string
+ * @return array
*/
- public function getPlaceholderImagesBaseUrl()
+ public function getWidgetsRequiredJsFiles()
{
- return Mage::getDesign()->getSkinUrl('images/widget/');
+ $result = array();
+ foreach ($this->getWidgetsXml() as $widget) {
+ if ($widget->js) {
+ foreach (explode(',', (string)$widget->js) as $js) {
+ $result[] = $js;
+ }
+ }
+ }
+ return $result;
}
/**
- * Return Widget placeholders images dir
+ * Encode string to valid HTML id element, based on base64 encoding
*
+ * @param string $string
* @return string
*/
- public function getPlaceholderImagesBaseDir()
+ protected function _idEncode($string)
{
- return Mage::getDesign()->getSkinBaseDir() . DS . 'images' . DS . 'widget';
+ return strtr(base64_encode($string), '+/=', ':_-');
}
/**
- * Encode string to valid HTML id element, based on base64 encoding
+ * User-defined widgets sorting by Name
*
- * @param string $string
- * @return string
+ * @param array $a
+ * @param array $b
+ * @return boolean
*/
- protected function _idEncode($string)
+ protected function _sortWidgets($a, $b)
{
- return strtr(base64_encode($string), '+/=', ':_-');
+ return strcmp($a["name"], $b["name"]);
+ }
+
+ /**
+ * Widget parameters sort callback
+ *
+ * @param Varien_Object $a
+ * @param Varien_Object $b
+ * @return int
+ */
+ protected function _sortParameters($a, $b)
+ {
+ $aOrder = (int)$a->getData('sort_order');
+ $bOrder = (int)$b->getData('sort_order');
+ return $aOrder < $bOrder ? -1 : ($aOrder > $bOrder ? 1 : 0);
}
}
diff --git a/app/code/core/Mage/Cms/Model/Widget/Config.php b/app/code/core/Mage/Cms/Model/Widget/Config.php
new file mode 100644
index 0000000000..8bf9bf8673
--- /dev/null
+++ b/app/code/core/Mage/Cms/Model/Widget/Config.php
@@ -0,0 +1,138 @@
+
+ */
+class Mage_Cms_Model_Widget_Config extends Varien_Object
+{
+
+ /**
+ * Return config settings for widgets insertion plugin based on editor element config
+ *
+ * @param Varien_Object $config
+ * @return array
+ */
+ public function getPluginSettings($config)
+ {
+ $settings = array(
+ 'widget_plugin_src' => Mage::getBaseUrl('js').'mage/adminhtml/wysiwyg/tiny_mce/plugins/magentowidget/editor_plugin.js',
+ 'widget_images_url' => $this->getPlaceholderImagesBaseUrl(),
+ 'widget_placeholders' => $this->getAvailablePlaceholderFilenames(),
+ 'widget_window_url' => $this->getWidgetWindowUrl($config),
+ 'widget_window_no_wysiwyg_url' => $this->getWidgetWindowUrl($config, false),
+ );
+
+ return $settings;
+ }
+
+ /**
+ * Return Widget placeholders images URL
+ *
+ * @return string
+ */
+ public function getPlaceholderImagesBaseUrl()
+ {
+ return Mage::getDesign()->getSkinUrl('images/widget/');
+ }
+
+ /**
+ * Return Widget placeholders images dir
+ *
+ * @return string
+ */
+ public function getPlaceholderImagesBaseDir()
+ {
+ return Mage::getDesign()->getSkinBaseDir() . DS . 'images' . DS . 'widget';
+ }
+
+ /**
+ * Return list of existing widget image placeholders
+ *
+ * @return array
+ */
+ public function getAvailablePlaceholderFilenames()
+ {
+ $collection = new Varien_Data_Collection_Filesystem();
+ $collection->addTargetDir($this->getPlaceholderImagesBaseDir())
+ ->setCollectDirs(false)
+ ->setCollectFiles(true)
+ ->setCollectRecursively(false);
+ $result = array();
+ foreach ($collection as $file) {
+ $result[] = $file->getBasename();
+ }
+ return $result;
+ }
+
+ /**
+ * Return Widgets Insertion Plugin Window URL
+ *
+ * @param Varien_Object Editor element config
+ * @param array $params URL params
+ * @return string
+ */
+ public function getWidgetWindowUrl($config, $wysiwygMode = true)
+ {
+ $params = $wysiwygMode ? array() : array('no_wysiwyg' => true);
+
+ if ($config->hasData('skip_widgets')) {
+ $params['skip_widgets'] = $this->encodeWidgetsToQuery($config->getData('skip_widgets'));
+ }
+
+ return Mage::getSingleton('adminhtml/url')->getUrl('*/cms_widget/index', $params);
+ }
+
+ /**
+ * Encode list of widget types into query param
+ *
+ * @param array $widgets List of widgets
+ * @return string Query param value
+ */
+ public function encodeWidgetsToQuery($widgets)
+ {
+ $widgets = is_array($widgets) ? $widgets : array($widgets);
+ $param = implode(',', $widgets);
+ return Mage::helper('core')->urlEncode($param);
+ }
+
+ /**
+ * Decode URL query param and return list of widgets
+ *
+ * @param string $queryParam Query param value to decode
+ * @return array Array of widget types
+ */
+ public function decodeWidgetsFromQuery($queryParam)
+ {
+ $param = Mage::helper('core')->urlDecode($queryParam);
+ return preg_split('/\s*\,\s*/', $param, 0, PREG_SPLIT_NO_EMPTY);
+ }
+
+}
diff --git a/app/code/core/Mage/Cms/Model/Wysiwyg/Config.php b/app/code/core/Mage/Cms/Model/Wysiwyg/Config.php
index 3683f887e5..1c2e9ce95e 100644
--- a/app/code/core/Mage/Cms/Model/Wysiwyg/Config.php
+++ b/app/code/core/Mage/Cms/Model/Wysiwyg/Config.php
@@ -52,8 +52,6 @@ class Mage_Cms_Model_Wysiwyg_Config extends Varien_Object
* translator: Helper to translate phrases in lib
* files_browser_*: Files Browser (media, images) settings
* encode_directives: Encode template directives with JS or not
- * widget_window_*: Widget plugin insertion settings
- * widget_image_url: Default image placeholder fot widget insertion
*
* @param $data Varien_Object constructor params to override default config values
* @return Varien_Object
@@ -72,9 +70,6 @@ public function getConfig($data = array())
'files_browser_window_height' => Mage::getStoreConfig('cms/wysiwyg/browser_window_height'),
'encode_directives' => true,
'directives_url' => Mage::getSingleton('adminhtml/url')->getUrl('*/cms_wysiwyg/directive'),
- 'widget_plugin_src' => Mage::getBaseUrl('js').'mage/adminhtml/wysiwyg/tiny_mce/plugins/magentowidget/editor_plugin.js',
- 'widget_images_url' => Mage::getSingleton('cms/widget')->getPlaceholderImagesBaseUrl(),
- 'widget_placeholders' => $this->getAvailablePlaceholderFilenames(),
'popup_css' => Mage::getBaseUrl('js').'mage/adminhtml/wysiwyg/tiny_mce/themes/advanced/skins/default/dialog.css',
'content_css' => Mage::getBaseUrl('js').'mage/adminhtml/wysiwyg/tiny_mce/themes/advanced/skins/default/content.css',
));
@@ -85,59 +80,11 @@ public function getConfig($data = array())
$config->addData($data);
}
- if (!$config->hasData('widget_window_url')) {
- $config->setData('widget_window_url', $this->getWidgetWindowUrl($config));
- }
- if (!$config->hasData('widget_window_no_wysiwyg_url')) {
- $config->setData('widget_window_no_wysiwyg_url', $this->getWidgetWindowUrl($config, false));
- }
+ Mage::dispatchEvent('cms_wysiwyg_config_prepare', array('config' => $config));
return $config;
}
- /**
- * Return Widgets Insertion Plugin Window URL
- *
- * @param array $params URL params
- * @return string
- */
- public function getWidgetWindowUrl($config, $wysiwygMode = true)
- {
- $params = $wysiwygMode ? array() : array('no_wysiwyg' => true);
-
- if ($config->getData('skip_context_widgets')) {
- $params['skip_context_widgets'] = 1;
- }
-
- if ($config->hasData('skip_widgets')) {
- $skipped = $config->getData('skip_widgets');
- $skipped = is_array($skipped) ? $skipped : array($skipped);
- $skipped = implode(',', $skipped);
- $params['skip_widgets'] = Mage::helper('core')->urlEncode($skipped);
- }
-
- return Mage::getSingleton('adminhtml/url')->getUrl('*/cms_widget/index', $params);
- }
-
- /**
- * Return list of existing widget image placeholders
- *
- * @return array
- */
- public function getAvailablePlaceholderFilenames()
- {
- $collection = new Varien_Data_Collection_Filesystem();
- $collection->addTargetDir(Mage::getSingleton('cms/widget')->getPlaceholderImagesBaseDir())
- ->setCollectDirs(false)
- ->setCollectFiles(true)
- ->setCollectRecursively(false);
- $result = array();
- foreach ($collection as $file) {
- $result[] = $file->getBasename();
- }
- return $result;
- }
-
/**
* Check whether Wysiwyg is enabled or not
*
diff --git a/app/code/core/Mage/Cms/Model/Wysiwyg/Images/Storage.php b/app/code/core/Mage/Cms/Model/Wysiwyg/Images/Storage.php
index c5aef204b5..aa59e7743d 100644
--- a/app/code/core/Mage/Cms/Model/Wysiwyg/Images/Storage.php
+++ b/app/code/core/Mage/Cms/Model/Wysiwyg/Images/Storage.php
@@ -45,6 +45,7 @@ public function getDirsCollection($path)
{
$collection = $this->getCollection($path)
->setCollectDirs(true)
+ ->setDirsFilter(self::DIRECTORY_NAME_REGEXP)
->setCollectFiles(false)
->setCollectRecursively(false);
return $collection;
@@ -209,7 +210,7 @@ public function getConfigData($key, $default=false)
}
$this->setData($key, $value);
}
- return $this->getData($key);
+ return $this->_getData($key);
}
/**
@@ -227,4 +228,4 @@ public function getAllowedExtensions($type = null)
return array();
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Cms/Model/Wysiwyg/Images/Storage/Collection.php b/app/code/core/Mage/Cms/Model/Wysiwyg/Images/Storage/Collection.php
index 811c6ae62e..938aeca676 100644
--- a/app/code/core/Mage/Cms/Model/Wysiwyg/Images/Storage/Collection.php
+++ b/app/code/core/Mage/Cms/Model/Wysiwyg/Images/Storage/Collection.php
@@ -33,12 +33,6 @@
*/
class Mage_Cms_Model_Wysiwyg_Images_Storage_Collection extends Varien_Data_Collection_Filesystem
{
- public function __construct()
- {
- parent::__construct();
- $this->setPageSize(10000);
- }
-
protected function _generateRow($filename)
{
return array(
diff --git a/app/code/core/Mage/Cms/controllers/IndexController.php b/app/code/core/Mage/Cms/controllers/IndexController.php
index 0ea8f7501b..422941089c 100644
--- a/app/code/core/Mage/Cms/controllers/IndexController.php
+++ b/app/code/core/Mage/Cms/controllers/IndexController.php
@@ -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_Cms
- * @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)
+ * @category Mage
+ * @package Mage_Cms
+ * @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)
*/
diff --git a/app/code/core/Mage/Cms/controllers/PageController.php b/app/code/core/Mage/Cms/controllers/PageController.php
index 9a0e56c276..a599f0aad3 100644
--- a/app/code/core/Mage/Cms/controllers/PageController.php
+++ b/app/code/core/Mage/Cms/controllers/PageController.php
@@ -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_Cms
- * @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)
+ * @category Mage
+ * @package Mage_Cms
+ * @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)
*/
diff --git a/app/code/core/Mage/Cms/etc/adminhtml.xml b/app/code/core/Mage/Cms/etc/adminhtml.xml
index 3541c30cc7..32427b25ef 100644
--- a/app/code/core/Mage/Cms/etc/adminhtml.xml
+++ b/app/code/core/Mage/Cms/etc/adminhtml.xml
@@ -19,10 +19,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_Cms
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ * @category Mage
+ * @package Mage_Cms
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
@@ -32,7 +32,7 @@
70
- Manage Pages
+ Pages
adminhtml/cms_page
0
@@ -42,7 +42,7 @@
10
- Poll Manager
+ Polls
adminhtml/poll
20
@@ -59,11 +59,11 @@
Static Blocks
- 0
+ 10
- Manage Pages
- 10
+ Pages
+ 0
Save Page
@@ -76,7 +76,7 @@
- Poll Manager
+ Polls
20
diff --git a/app/code/core/Mage/Cms/etc/config.xml b/app/code/core/Mage/Cms/etc/config.xml
index 48dc255974..cc23b690a3 100644
--- a/app/code/core/Mage/Cms/etc/config.xml
+++ b/app/code/core/Mage/Cms/etc/config.xml
@@ -19,10 +19,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_Cms
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ * @category Mage
+ * @package Mage_Cms
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
@@ -86,6 +86,16 @@
+
+
+
+
+ cms/observer
+ prepareWidgetsPluginConfig
+
+
+
+
@@ -168,7 +178,7 @@
content/images
jpg,jpeg,png,gif
jpg,jpeg,png,gif
- flv,swf,avi,mov
+ flv,swf,avi,mov,rm,wmv
1000
800
100
diff --git a/app/code/core/Mage/Cms/etc/system.xml b/app/code/core/Mage/Cms/etc/system.xml
index 79614b4e10..f0a1a3fd36 100644
--- a/app/code/core/Mage/Cms/etc/system.xml
+++ b/app/code/core/Mage/Cms/etc/system.xml
@@ -19,10 +19,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_Cms
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ * @category Mage
+ * @package Mage_Cms
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
@@ -111,4 +111,4 @@
-
\ No newline at end of file
+
diff --git a/app/code/core/Mage/Cms/etc/widget.xml b/app/code/core/Mage/Cms/etc/widget.xml
index 170156ffac..886c21e454 100644
--- a/app/code/core/Mage/Cms/etc/widget.xml
+++ b/app/code/core/Mage/Cms/etc/widget.xml
@@ -19,55 +19,93 @@
* 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_Cms
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ * @category Mage
+ * @package Mage_Cms
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-
-
-
- CMS Page Link
- Link to a CMS Page
-
-
- 1
- 1
-
-
- label
- adminhtml/cms_page_widget_chooser
-
- 10
-
-
- 1
-
- If empty, the Page Title will be used
- text
-
-
- <visible>1</visible>
- <label>Anchor Title</label>
- <type>text</type>
-
-
-
-
- CMS Static Block
- Contents of a Static Block
-
-
- 1
- 1
-
-
- label
- adminhtml/cms_block_widget_chooser
-
-
-
-
-
-
+
+
+ CMS Page Link
+ Link to a CMS Page
+
+
+ 1
+ 1
+
+ label
+
+ adminhtml/cms_page_widget_chooser
+
+
+
+
+ 10
+
+
+ 1
+
+ If empty, the Page Title will be used
+ text
+
+
+ <visible>1</visible>
+ <label>Anchor Custom Title</label>
+ <type>text</type>
+
+
+
+ 1
+ select
+ cms/widget/link/link_block.phtml
+
+
+ cms/widget/link/link_block.phtml
+
+
+
+ cms/widget/link/link_inline.phtml
+
+
+
+
+
+
+
+ CMS Static Block
+ Contents of a Static Block
+
+
+ 1
+ 1
+
+ label
+
+ adminhtml/cms_block_widget_chooser
+
+
+
+
+ 20
+
+
+
+ 1
+ select
+ cms/widget/static_block/default.phtml
+
+
+ cms/widget/static_block/default.phtml
+
+
+
+ 10
+
+
+
+
diff --git a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-install-0.7.0.php
index e7fa0926fe..c81de8e987 100644
--- a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-install-0.7.0.php
+++ b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-install-0.7.0.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Cms
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
diff --git a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.0-0.7.1.php
index bfcae22ef2..6c88658a25 100644
--- a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.0-0.7.1.php
+++ b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.0-0.7.1.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Cms
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
diff --git a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.1-0.7.2.php
index 73b8474b04..59effbf7a3 100644
--- a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.1-0.7.2.php
+++ b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.1-0.7.2.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Cms
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
diff --git a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.10-0.7.11.php b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.10-0.7.11.php
index 9ab07afd31..e0c44bbc55 100644
--- a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.10-0.7.11.php
+++ b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.10-0.7.11.php
@@ -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_Core
- * @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)
+ * @category Mage
+ * @package Mage_Cms
+ * @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)
*/
diff --git a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.2-0.7.3.php
index 0e6d3a24f9..652f18d56f 100644
--- a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.2-0.7.3.php
+++ b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.2-0.7.3.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Cms
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
diff --git a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.4-0.7.5.php b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.4-0.7.5.php
index 1b57280e61..bef721931e 100644
--- a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.4-0.7.5.php
+++ b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.4-0.7.5.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Cms
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
@@ -55,4 +55,4 @@
");
-$installer->endSetup();
\ No newline at end of file
+$installer->endSetup();
diff --git a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.5-0.7.6.php b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.5-0.7.6.php
index 2ebdaae036..d8020803b4 100644
--- a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.5-0.7.6.php
+++ b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.5-0.7.6.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Cms
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
@@ -37,4 +37,4 @@
$installer->getConnection()->dropColumn($this->getTable('cms/block'), 'store_id');
-$installer->endSetup();
\ No newline at end of file
+$installer->endSetup();
diff --git a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.7-0.7.8.php b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.7-0.7.8.php
index e3586f7b2c..89467854ee 100644
--- a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.7-0.7.8.php
+++ b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.7-0.7.8.php
@@ -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_Core
- * @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)
+ * @category Mage
+ * @package Mage_Cms
+ * @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)
*/
diff --git a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.8-0.7.9.php b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.8-0.7.9.php
index ca18265e7f..db44fee6bc 100644
--- a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.8-0.7.9.php
+++ b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.8-0.7.9.php
@@ -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_Core
- * @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)
+ * @category Mage
+ * @package Mage_Cms
+ * @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)
*/
diff --git a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.9-0.7.10.php b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.9-0.7.10.php
index d3ee79d523..4c281e0f0f 100644
--- a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.9-0.7.10.php
+++ b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.9-0.7.10.php
@@ -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_Core
- * @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)
+ * @category Mage
+ * @package Mage_Cms
+ * @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)
*/
diff --git a/app/code/core/Mage/Compiler/Block/Process.php b/app/code/core/Mage/Compiler/Block/Process.php
index da34d9be53..486a215810 100644
--- a/app/code/core/Mage/Compiler/Block/Process.php
+++ b/app/code/core/Mage/Compiler/Block/Process.php
@@ -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_Compiler
- * @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_Compiler
+ * @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)
*/
diff --git a/app/code/core/Mage/Compiler/Helper/Data.php b/app/code/core/Mage/Compiler/Helper/Data.php
index 766dea965e..7a8d9fb4c7 100644
--- a/app/code/core/Mage/Compiler/Helper/Data.php
+++ b/app/code/core/Mage/Compiler/Helper/Data.php
@@ -1,36 +1,36 @@
-
- */
-class Mage_Compiler_Helper_Data extends Mage_Core_Helper_Abstract
-{
-} // Class Mage_Api_Helper_Data End
\ No newline at end of file
+
+ */
+class Mage_Compiler_Helper_Data extends Mage_Core_Helper_Abstract
+{
+} // Class Mage_Api_Helper_Data End
diff --git a/app/code/core/Mage/Compiler/Model/Process.php b/app/code/core/Mage/Compiler/Model/Process.php
index 5923947beb..9a35b5dfab 100644
--- a/app/code/core/Mage/Compiler/Model/Process.php
+++ b/app/code/core/Mage/Compiler/Model/Process.php
@@ -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_Compiler
- * @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_Compiler
+ * @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)
*/
/**
@@ -448,4 +448,4 @@ public function validate()
return $result;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Compiler/controllers/ProcessController.php b/app/code/core/Mage/Compiler/controllers/ProcessController.php
index d8bfad537f..aa7fc6c6e2 100644
--- a/app/code/core/Mage/Compiler/controllers/ProcessController.php
+++ b/app/code/core/Mage/Compiler/controllers/ProcessController.php
@@ -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_Compiler
- * @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_Compiler
+ * @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)
*/
/**
@@ -107,4 +107,4 @@ protected function _isAllowed()
{
return Mage::getSingleton('admin/session')->isAllowed('system/tools/compiler');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Compiler/etc/adminhtml.xml b/app/code/core/Mage/Compiler/etc/adminhtml.xml
index 7cdfc42849..ea64d27e27 100644
--- a/app/code/core/Mage/Compiler/etc/adminhtml.xml
+++ b/app/code/core/Mage/Compiler/etc/adminhtml.xml
@@ -20,9 +20,9 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Mage
- * @package Mage_Api
- * @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)
+ * @package Mage_Compiler
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
diff --git a/app/code/core/Mage/Compiler/etc/compilation.xml b/app/code/core/Mage/Compiler/etc/compilation.xml
index 0139877c9a..1dea0b8f3a 100644
--- a/app/code/core/Mage/Compiler/etc/compilation.xml
+++ b/app/code/core/Mage/Compiler/etc/compilation.xml
@@ -20,9 +20,9 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Mage
- * @package Mage_Api
- * @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)
+ * @package Mage_Compiler
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
diff --git a/app/code/core/Mage/Compiler/etc/config.xml b/app/code/core/Mage/Compiler/etc/config.xml
index 1256d820b1..6b92d426ea 100644
--- a/app/code/core/Mage/Compiler/etc/config.xml
+++ b/app/code/core/Mage/Compiler/etc/config.xml
@@ -1,86 +1,86 @@
-
-
-
-
-
- 0.1.0
-
-
-
-
-
- Mage_Compiler_Model
- compiler_mysql4
-
-
- Mage_Compiler_Model_Mysql4
-
-
-
-
-
-
-
-
-
-
- Mage_Compiler
-
-
-
-
-
-
-
-
-
- Mage_Compiler
- compiler
-
-
-
-
-
-
-
-
-
- Mage_Compiler.csv
-
-
-
-
-
-
-
- compiler.xml
-
-
-
-
-
\ No newline at end of file
+
+
+
+
+
+ 0.1.0
+
+
+
+
+
+ Mage_Compiler_Model
+ compiler_mysql4
+
+
+ Mage_Compiler_Model_Mysql4
+
+
+
+
+
+
+
+
+
+
+ Mage_Compiler
+
+
+
+
+
+
+
+
+
+ Mage_Compiler
+ compiler
+
+
+
+
+
+
+
+
+
+ Mage_Compiler.csv
+
+
+
+
+
+
+
+ compiler.xml
+
+
+
+
+
diff --git a/app/code/core/Mage/Contacts/Helper/Data.php b/app/code/core/Mage/Contacts/Helper/Data.php
index 8390198fd6..a92e9b5b9e 100644
--- a/app/code/core/Mage/Contacts/Helper/Data.php
+++ b/app/code/core/Mage/Contacts/Helper/Data.php
@@ -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_Contacts
- * @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_Contacts
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Contacts/Model/System/Config/Backend/Links.php b/app/code/core/Mage/Contacts/Model/System/Config/Backend/Links.php
index 1844d20ae5..0de6be8316 100644
--- a/app/code/core/Mage/Contacts/Model/System/Config/Backend/Links.php
+++ b/app/code/core/Mage/Contacts/Model/System/Config/Backend/Links.php
@@ -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_Contacts
- * @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_Contacts
+ * @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)
*/
/**
@@ -37,4 +37,4 @@ class Mage_Contacts_Model_System_Config_Backend_Links extends Mage_Adminhtml_Mod
*/
protected $_cacheTags = array(Mage_Core_Model_Store::CACHE_TAG, Mage_Cms_Model_Block::CACHE_TAG);
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Contacts/controllers/IndexController.php b/app/code/core/Mage/Contacts/controllers/IndexController.php
index ad5866ed6e..adaf3fd1d8 100644
--- a/app/code/core/Mage/Contacts/controllers/IndexController.php
+++ b/app/code/core/Mage/Contacts/controllers/IndexController.php
@@ -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_Contacts
- * @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_Contacts
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Contacts/etc/adminhtml.xml b/app/code/core/Mage/Contacts/etc/adminhtml.xml
index ae3389aab0..9988e45e4d 100644
--- a/app/code/core/Mage/Contacts/etc/adminhtml.xml
+++ b/app/code/core/Mage/Contacts/etc/adminhtml.xml
@@ -19,10 +19,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_Contacts
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ * @category Mage
+ * @package Mage_Contacts
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
diff --git a/app/code/core/Mage/Contacts/etc/config.xml b/app/code/core/Mage/Contacts/etc/config.xml
index 30f8c26405..6032086455 100644
--- a/app/code/core/Mage/Contacts/etc/config.xml
+++ b/app/code/core/Mage/Contacts/etc/config.xml
@@ -19,10 +19,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_Contacts
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ * @category Mage
+ * @package Mage_Contacts
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
diff --git a/app/code/core/Mage/Contacts/etc/system.xml b/app/code/core/Mage/Contacts/etc/system.xml
index 25b15ae709..788b8aa956 100644
--- a/app/code/core/Mage/Contacts/etc/system.xml
+++ b/app/code/core/Mage/Contacts/etc/system.xml
@@ -19,10 +19,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_Contacts
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ * @category Mage
+ * @package Mage_Contacts
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
diff --git a/app/code/core/Mage/Contacts/sql/contacts_setup/mysql4-install-0.7.1.php b/app/code/core/Mage/Contacts/sql/contacts_setup/mysql4-install-0.7.1.php
index 122e5dbbf3..77081deabf 100644
--- a/app/code/core/Mage/Contacts/sql/contacts_setup/mysql4-install-0.7.1.php
+++ b/app/code/core/Mage/Contacts/sql/contacts_setup/mysql4-install-0.7.1.php
@@ -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_Contacts
- * @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_Contacts
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/Contacts/sql/contacts_setup/mysql4-install-0.8.0.php b/app/code/core/Mage/Contacts/sql/contacts_setup/mysql4-install-0.8.0.php
index 2945159e0f..2a808dcb2f 100644
--- a/app/code/core/Mage/Contacts/sql/contacts_setup/mysql4-install-0.8.0.php
+++ b/app/code/core/Mage/Contacts/sql/contacts_setup/mysql4-install-0.8.0.php
@@ -18,11 +18,11 @@
* 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_Contacts
- * @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_Contacts
+ * @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)
*/
$installer = $this;
-/* @var $installer Mage_Core_Model_Resource_Setup */
\ No newline at end of file
+/* @var $installer Mage_Core_Model_Resource_Setup */
diff --git a/app/code/core/Mage/Contacts/sql/contacts_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Contacts/sql/contacts_setup/mysql4-upgrade-0.7.1-0.7.2.php
index 2232896979..a764883f79 100644
--- a/app/code/core/Mage/Contacts/sql/contacts_setup/mysql4-upgrade-0.7.1-0.7.2.php
+++ b/app/code/core/Mage/Contacts/sql/contacts_setup/mysql4-upgrade-0.7.1-0.7.2.php
@@ -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_Contacts
- * @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_Contacts
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/Core/Block/Abstract.php b/app/code/core/Mage/Core/Block/Abstract.php
index 19a8e60ed2..861a3091f2 100644
--- a/app/code/core/Mage/Core/Block/Abstract.php
+++ b/app/code/core/Mage/Core/Block/Abstract.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
diff --git a/app/code/core/Mage/Core/Block/Flush.php b/app/code/core/Mage/Core/Block/Flush.php
index ac76637903..83ee972036 100644
--- a/app/code/core/Mage/Core/Block/Flush.php
+++ b/app/code/core/Mage/Core/Block/Flush.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
diff --git a/app/code/core/Mage/Core/Block/Html/Calendar.php b/app/code/core/Mage/Core/Block/Html/Calendar.php
index 5dfc225fec..a0cbd85467 100644
--- a/app/code/core/Mage/Core/Block/Html/Calendar.php
+++ b/app/code/core/Mage/Core/Block/Html/Calendar.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Core/Block/Html/Date.php b/app/code/core/Mage/Core/Block/Html/Date.php
index 7fc2cb4d2b..18ce897fc5 100644
--- a/app/code/core/Mage/Core/Block/Html/Date.php
+++ b/app/code/core/Mage/Core/Block/Html/Date.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
diff --git a/app/code/core/Mage/Core/Block/Html/Link.php b/app/code/core/Mage/Core/Block/Html/Link.php
index 8178e208f4..563b65b382 100644
--- a/app/code/core/Mage/Core/Block/Html/Link.php
+++ b/app/code/core/Mage/Core/Block/Html/Link.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
@@ -32,8 +32,18 @@
* @package Mage_Core
* @author Magento Core Team
*/
-class Mage_Core_Block_Html_Link extends Mage_Core_Block_Abstract
+class Mage_Core_Block_Html_Link extends Mage_Core_Block_Template
{
+
+ /**
+ * Internal constructor
+ *
+ */
+ protected function _construct()
+ {
+ $this->setTemplate('core/link.phtml');
+ parent::_construct();
+ }
/**
* Prepare link attributes as serialized and formated string
*
@@ -84,14 +94,4 @@ public function serialize($attributes = array(), $valueSeparator='=', $fieldSepa
$res = implode($fieldSeparator, $data);
return $res;
}
-
- /**
- * Render block HTML
- *
- * @return string
- */
- protected function _toHtml()
- {
- return 'getLinkAttributes() . '>' . $this->htmlEscape($this->getAnchorText()) . '';
- }
}
diff --git a/app/code/core/Mage/Core/Block/Html/Select.php b/app/code/core/Mage/Core/Block/Html/Select.php
index ef83877154..9a31ae95a5 100644
--- a/app/code/core/Mage/Core/Block/Html/Select.php
+++ b/app/code/core/Mage/Core/Block/Html/Select.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
diff --git a/app/code/core/Mage/Core/Block/Messages.php b/app/code/core/Mage/Core/Block/Messages.php
index 51657b7be0..d6887a0d08 100644
--- a/app/code/core/Mage/Core/Block/Messages.php
+++ b/app/code/core/Mage/Core/Block/Messages.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Core/Block/Profiler.php b/app/code/core/Mage/Core/Block/Profiler.php
index 82a313a2a9..46c02886d0 100644
--- a/app/code/core/Mage/Core/Block/Profiler.php
+++ b/app/code/core/Mage/Core/Block/Profiler.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
@@ -29,11 +29,11 @@ class Mage_Core_Block_Profiler extends Mage_Core_Block_Abstract
{
protected function _toHtml()
{
- if (!$this->_beforeToHtml()
- || !Mage::getStoreConfig('dev/debug/profiler')
- || !Mage::helper('core')->isDevAllowed()) {
- return '';
- }
+ if (!$this->_beforeToHtml()
+ || !Mage::getStoreConfig('dev/debug/profiler')
+ || !Mage::helper('core')->isDevAllowed()) {
+ return '';
+ }
$timers = Varien_Profiler::getTimers();
@@ -69,4 +69,4 @@ protected function _toHtml()
return $out;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Core/Block/Saver.php b/app/code/core/Mage/Core/Block/Saver.php
index 2cc2dfea61..78b2ae7b8b 100644
--- a/app/code/core/Mage/Core/Block/Saver.php
+++ b/app/code/core/Mage/Core/Block/Saver.php
@@ -18,8 +18,8 @@
* 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_Core
- * @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_Core
+ * @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)
*/
diff --git a/app/code/core/Mage/Core/Block/Store/Switcher.php b/app/code/core/Mage/Core/Block/Store/Switcher.php
index baf162d389..ac38043c7d 100644
--- a/app/code/core/Mage/Core/Block/Store/Switcher.php
+++ b/app/code/core/Mage/Core/Block/Store/Switcher.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Core/Block/Template.php b/app/code/core/Mage/Core/Block/Template.php
index 65086f8f0f..79e4ec5574 100644
--- a/app/code/core/Mage/Core/Block/Template.php
+++ b/app/code/core/Mage/Core/Block/Template.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
diff --git a/app/code/core/Mage/Core/Block/Template/Facade.php b/app/code/core/Mage/Core/Block/Template/Facade.php
index e2c212c64b..f61366ab32 100644
--- a/app/code/core/Mage/Core/Block/Template/Facade.php
+++ b/app/code/core/Mage/Core/Block/Template/Facade.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
/**
@@ -93,4 +93,4 @@ public function ifEquals($conditionKeys)
}
return true;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Core/Block/Template/Smarty.php b/app/code/core/Mage/Core/Block/Template/Smarty.php
index 7af4398b12..91b2850268 100644
--- a/app/code/core/Mage/Core/Block/Template/Smarty.php
+++ b/app/code/core/Mage/Core/Block/Template/Smarty.php
@@ -18,14 +18,14 @@
* 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_Core
- * @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_Core
+ * @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_Core_Block_Template_Smarty extends Mage_Core_Block_Template
{
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Core/Block/Template/Zend.php b/app/code/core/Mage/Core/Block/Template/Zend.php
index 799d09c443..34279222c7 100644
--- a/app/code/core/Mage/Core/Block/Template/Zend.php
+++ b/app/code/core/Mage/Core/Block/Template/Zend.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
diff --git a/app/code/core/Mage/Core/Block/Text.php b/app/code/core/Mage/Core/Block/Text.php
index 344530e6e1..3fe458fdc2 100644
--- a/app/code/core/Mage/Core/Block/Text.php
+++ b/app/code/core/Mage/Core/Block/Text.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
diff --git a/app/code/core/Mage/Core/Block/Text/List.php b/app/code/core/Mage/Core/Block/Text/List.php
index 5aca524f78..9e5f9dd118 100644
--- a/app/code/core/Mage/Core/Block/Text/List.php
+++ b/app/code/core/Mage/Core/Block/Text/List.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
/**
@@ -32,16 +32,16 @@
class Mage_Core_Block_Text_List extends Mage_Core_Block_Text
{
- protected function _toHtml()
- {
- $this->setText('');
- foreach ($this->getSortedChildren() as $name) {
- $block = $this->getLayout()->getBlock($name);
- if (!$block) {
- Mage::throwException(Mage::helper('core')->__('Invalid block: %s', $name));
- }
- $this->addText($block->toHtml());
- }
- return parent::_toHtml();
- }
-}
\ No newline at end of file
+ protected function _toHtml()
+ {
+ $this->setText('');
+ foreach ($this->getSortedChildren() as $name) {
+ $block = $this->getLayout()->getBlock($name);
+ if (!$block) {
+ Mage::throwException(Mage::helper('core')->__('Invalid block: %s', $name));
+ }
+ $this->addText($block->toHtml());
+ }
+ return parent::_toHtml();
+ }
+}
diff --git a/app/code/core/Mage/Core/Block/Text/List/Item.php b/app/code/core/Mage/Core/Block/Text/List/Item.php
index d59636eebf..ca668a924c 100644
--- a/app/code/core/Mage/Core/Block/Text/List/Item.php
+++ b/app/code/core/Mage/Core/Block/Text/List/Item.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
diff --git a/app/code/core/Mage/Core/Block/Text/List/Link.php b/app/code/core/Mage/Core/Block/Text/List/Link.php
index f0b2ba29ad..2fe046d6a1 100644
--- a/app/code/core/Mage/Core/Block/Text/List/Link.php
+++ b/app/code/core/Mage/Core/Block/Text/List/Link.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
diff --git a/app/code/core/Mage/Core/Block/Text/Tag.php b/app/code/core/Mage/Core/Block/Text/Tag.php
index f9c55260a5..25d8597896 100644
--- a/app/code/core/Mage/Core/Block/Text/Tag.php
+++ b/app/code/core/Mage/Core/Block/Text/Tag.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
diff --git a/app/code/core/Mage/Core/Block/Text/Tag/Css.php b/app/code/core/Mage/Core/Block/Text/Tag/Css.php
index c3210b709d..ceed2bcd41 100644
--- a/app/code/core/Mage/Core/Block/Text/Tag/Css.php
+++ b/app/code/core/Mage/Core/Block/Text/Tag/Css.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
diff --git a/app/code/core/Mage/Core/Block/Text/Tag/Css/Admin.php b/app/code/core/Mage/Core/Block/Text/Tag/Css/Admin.php
index 28a189e457..5fbd1cdc7e 100644
--- a/app/code/core/Mage/Core/Block/Text/Tag/Css/Admin.php
+++ b/app/code/core/Mage/Core/Block/Text/Tag/Css/Admin.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
diff --git a/app/code/core/Mage/Core/Block/Text/Tag/Debug.php b/app/code/core/Mage/Core/Block/Text/Tag/Debug.php
index dcef9300f5..009d61ebfa 100644
--- a/app/code/core/Mage/Core/Block/Text/Tag/Debug.php
+++ b/app/code/core/Mage/Core/Block/Text/Tag/Debug.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
diff --git a/app/code/core/Mage/Core/Block/Text/Tag/Js.php b/app/code/core/Mage/Core/Block/Text/Tag/Js.php
index 584fdf160c..01bb59d655 100644
--- a/app/code/core/Mage/Core/Block/Text/Tag/Js.php
+++ b/app/code/core/Mage/Core/Block/Text/Tag/Js.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
diff --git a/app/code/core/Mage/Core/Block/Text/Tag/Meta.php b/app/code/core/Mage/Core/Block/Text/Tag/Meta.php
index 26e5cfd89d..140809aa57 100644
--- a/app/code/core/Mage/Core/Block/Text/Tag/Meta.php
+++ b/app/code/core/Mage/Core/Block/Text/Tag/Meta.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
@@ -41,4 +41,4 @@ protected function _toHtml()
return parent::_toHtml();
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Core/Controller/Front/Action.php b/app/code/core/Mage/Core/Controller/Front/Action.php
index 9d5aff916e..39197df38e 100644
--- a/app/code/core/Mage/Core/Controller/Front/Action.php
+++ b/app/code/core/Mage/Core/Controller/Front/Action.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
diff --git a/app/code/core/Mage/Core/Controller/Front/Router.php b/app/code/core/Mage/Core/Controller/Front/Router.php
index fde04d6287..d9a62a0263 100644
--- a/app/code/core/Mage/Core/Controller/Front/Router.php
+++ b/app/code/core/Mage/Core/Controller/Front/Router.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
@@ -93,4 +93,4 @@ public function getUrl($params=array())
return $url;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Core/Controller/Request/Http.php b/app/code/core/Mage/Core/Controller/Request/Http.php
index ef29372fba..be6818ee3a 100644
--- a/app/code/core/Mage/Core/Controller/Request/Http.php
+++ b/app/code/core/Mage/Core/Controller/Request/Http.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
@@ -437,4 +437,4 @@ public function getBeforeForwardInfo($name = null)
return null;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Core/Controller/Response/Http.php b/app/code/core/Mage/Core/Controller/Response/Http.php
index 3493815003..6a7c04bf16 100644
--- a/app/code/core/Mage/Core/Controller/Response/Http.php
+++ b/app/code/core/Mage/Core/Controller/Response/Http.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
@@ -80,4 +80,4 @@ public function sendResponse()
Mage::dispatchEvent('http_response_send_before', array('response'=>$this));
return parent::sendResponse();
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Core/Controller/Varien/Action.php b/app/code/core/Mage/Core/Controller/Varien/Action.php
index 5b12422e7f..a292cdd5d2 100644
--- a/app/code/core/Mage/Core/Controller/Varien/Action.php
+++ b/app/code/core/Mage/Core/Controller/Varien/Action.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
diff --git a/app/code/core/Mage/Core/Controller/Varien/Exception.php b/app/code/core/Mage/Core/Controller/Varien/Exception.php
index 004e230783..8375e4084b 100644
--- a/app/code/core/Mage/Core/Controller/Varien/Exception.php
+++ b/app/code/core/Mage/Core/Controller/Varien/Exception.php
@@ -1,125 +1,125 @@
-_resultCallback = self::RESULT_FORWARD;
- if (null === $actionName) {
- $actionName = $this->_defaultActionName;
- }
- $this->_resultCallbackParams = array($actionName, $controllerName, $moduleName, $params);
- return $this;
- }
-
- /**
- * Prepare data for redirecting
- *
- * @param string $path
- * @param array $arguments
- * @return Mage_Core_Controller_Varien_Exception
- */
- public function prepareRedirect($path, $arguments = array())
- {
- $this->_resultCallback = self::RESULT_REDIRECT;
- $this->_resultCallbackParams($path, $arguments);
- return $this;
- }
-
- /**
- * Prepare data for running a custom action
- *
- * @param string $actionName
- * @return Mage_Core_Controller_Varien_Exception
- */
- public function prepareFork($actionName = null)
- {
- if (null === $actionName) {
- $actionName = $this->_defaultActionName;
- }
- $this->_resultCallback = $actionName;
- return $this;
- }
-
- /**
- * Prepare a flag data
- *
- * @param string $action
- * @param string $flag
- * @param bool $value
- * @return Mage_Core_Controller_Varien_Exception
- */
- public function prepareFlag($action, $flag, $value)
- {
- $this->_flags[] = array($action, $flag, $value);
- return $this;
- }
-
- /**
- * Return all set flags
- *
- * @return array
- */
- public function getResultFlags()
- {
- return $this->_flags;
- }
-
- /**
- * Return results as callback for a controller
- *
- * @return array
- */
- public function getResultCallback()
- {
- if (null === $this->_resultCallback) {
- $this->prepareFork();
- }
- return array($this->_resultCallback, $this->_resultCallbackParams);
- }
-}
+_resultCallback = self::RESULT_FORWARD;
+ if (null === $actionName) {
+ $actionName = $this->_defaultActionName;
+ }
+ $this->_resultCallbackParams = array($actionName, $controllerName, $moduleName, $params);
+ return $this;
+ }
+
+ /**
+ * Prepare data for redirecting
+ *
+ * @param string $path
+ * @param array $arguments
+ * @return Mage_Core_Controller_Varien_Exception
+ */
+ public function prepareRedirect($path, $arguments = array())
+ {
+ $this->_resultCallback = self::RESULT_REDIRECT;
+ $this->_resultCallbackParams($path, $arguments);
+ return $this;
+ }
+
+ /**
+ * Prepare data for running a custom action
+ *
+ * @param string $actionName
+ * @return Mage_Core_Controller_Varien_Exception
+ */
+ public function prepareFork($actionName = null)
+ {
+ if (null === $actionName) {
+ $actionName = $this->_defaultActionName;
+ }
+ $this->_resultCallback = $actionName;
+ return $this;
+ }
+
+ /**
+ * Prepare a flag data
+ *
+ * @param string $action
+ * @param string $flag
+ * @param bool $value
+ * @return Mage_Core_Controller_Varien_Exception
+ */
+ public function prepareFlag($action, $flag, $value)
+ {
+ $this->_flags[] = array($action, $flag, $value);
+ return $this;
+ }
+
+ /**
+ * Return all set flags
+ *
+ * @return array
+ */
+ public function getResultFlags()
+ {
+ return $this->_flags;
+ }
+
+ /**
+ * Return results as callback for a controller
+ *
+ * @return array
+ */
+ public function getResultCallback()
+ {
+ if (null === $this->_resultCallback) {
+ $this->prepareFork();
+ }
+ return array($this->_resultCallback, $this->_resultCallbackParams);
+ }
+}
diff --git a/app/code/core/Mage/Core/Controller/Varien/Front.php b/app/code/core/Mage/Core/Controller/Varien/Front.php
index 6731ddc95d..aa865fa14d 100644
--- a/app/code/core/Mage/Core/Controller/Varien/Front.php
+++ b/app/code/core/Mage/Core/Controller/Varien/Front.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
@@ -280,4 +280,4 @@ protected function _processRewriteUrl($url)
}
return $url;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Core/Controller/Varien/Router/Abstract.php b/app/code/core/Mage/Core/Controller/Varien/Router/Abstract.php
index 4ad9624732..26563b03e6 100644
--- a/app/code/core/Mage/Core/Controller/Varien/Router/Abstract.php
+++ b/app/code/core/Mage/Core/Controller/Varien/Router/Abstract.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
abstract class Mage_Core_Controller_Varien_Router_Abstract
@@ -50,4 +50,4 @@ public function getRouteByFrontName($frontName)
}
abstract public function match(Zend_Controller_Request_Http $request);
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Core/Controller/Varien/Router/Admin.php b/app/code/core/Mage/Core/Controller/Varien/Router/Admin.php
index aff8519c20..699fcffb83 100644
--- a/app/code/core/Mage/Core/Controller/Varien/Router/Admin.php
+++ b/app/code/core/Mage/Core/Controller/Varien/Router/Admin.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
@@ -86,4 +86,4 @@ protected function _getCurrentSecureUrl($request)
{
return Mage::app()->getStore(Mage_Core_Model_App::ADMIN_STORE_ID)->getBaseUrl('link', true).ltrim($request->getPathInfo(), '/');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Core/Controller/Varien/Router/Default.php b/app/code/core/Mage/Core/Controller/Varien/Router/Default.php
index 7952673c43..c7c5123838 100644
--- a/app/code/core/Mage/Core/Controller/Varien/Router/Default.php
+++ b/app/code/core/Mage/Core/Controller/Varien/Router/Default.php
@@ -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_Core
- * @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_Core
+ * @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_Core_Controller_Varien_Router_Default extends Mage_Core_Controller_Varien_Router_Abstract
@@ -42,4 +42,4 @@ public function getUrl($routeName, $params)
}
*/
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Core/Controller/Varien/Router/Standard.php b/app/code/core/Mage/Core/Controller/Varien/Router/Standard.php
index 1eea173cd4..92c2f9cdf2 100644
--- a/app/code/core/Mage/Core/Controller/Varien/Router/Standard.php
+++ b/app/code/core/Mage/Core/Controller/Varien/Router/Standard.php
@@ -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_Core
- * @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_Core
+ * @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_Core_Controller_Varien_Router_Standard extends Mage_Core_Controller_Varien_Router_Abstract
@@ -424,4 +424,4 @@ protected function _shouldBeSecure($path)
&& substr(Mage::getStoreConfig('web/secure/base_url'),0,5)=='https'
&& Mage::getConfig()->shouldUrlBeSecure($path);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Core/Exception.php b/app/code/core/Mage/Core/Exception.php
index c900382d5e..e715488f9f 100644
--- a/app/code/core/Mage/Core/Exception.php
+++ b/app/code/core/Mage/Core/Exception.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
@@ -57,4 +57,4 @@ public function getMessages($type='')
}
return isset($this->_messages[$type]) ? $this->_messages[$type] : array();
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Core/Helper/Abstract.php b/app/code/core/Mage/Core/Helper/Abstract.php
index a64b2b76b9..80015eff15 100644
--- a/app/code/core/Mage/Core/Helper/Abstract.php
+++ b/app/code/core/Mage/Core/Helper/Abstract.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
/**
@@ -171,7 +171,7 @@ public function htmlEscape($data, $allowedTags = null)
if (is_array($data)) {
$result = array();
foreach ($data as $item) {
- $result[] = $this->htmlEscape($item);
+ $result[] = $this->htmlEscape($item);
}
} else {
// process single item
@@ -296,4 +296,4 @@ public function translateArray($arr = array())
}
return $arr;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Core/Helper/Data.php b/app/code/core/Mage/Core/Helper/Data.php
index 8f2b56869f..2a891f46f6 100644
--- a/app/code/core/Mage/Core/Helper/Data.php
+++ b/app/code/core/Mage/Core/Helper/Data.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
/**
@@ -588,4 +588,14 @@ public function jsonDecode($encodedValue, $objectDecodeType = Zend_Json::TYPE_AR
{
return Zend_Json::decode($encodedValue, $objectDecodeType);
}
+
+ /**
+ * Generate a hash from unique ID
+ * @param $prefix
+ * @return string
+ */
+ public function uniqHash($prefix = '')
+ {
+ return $prefix . md5(uniqid(microtime(), true));
+ }
}
diff --git a/app/code/core/Mage/Core/Helper/Http.php b/app/code/core/Mage/Core/Helper/Http.php
index d364883c7a..7215757b14 100644
--- a/app/code/core/Mage/Core/Helper/Http.php
+++ b/app/code/core/Mage/Core/Helper/Http.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Core
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
diff --git a/app/code/core/Mage/Core/Helper/Js.php b/app/code/core/Mage/Core/Helper/Js.php
index 01253e18ad..c6f13078e3 100644
--- a/app/code/core/Mage/Core/Helper/Js.php
+++ b/app/code/core/Mage/Core/Helper/Js.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
/**
@@ -122,58 +122,58 @@ public function getJsSkinUrl($file)
protected function _getTranslateData()
{
if ($this->_translateData ===null) {
- $this->_translateData = array(
- 'Please select an option.' => $this->__('Please select an option.'),
- 'This is a required field.' => $this->__('This is a required field.'),
- 'Please enter a valid number in this field.' => $this->__('Please enter a valid number in this field.'),
- 'Please use numbers only in this field. please avoid spaces or other characters such as dots or commas.' =>
- $this->__('Please use numbers only in this field. please avoid spaces or other characters such as dots or commas.'),
- 'Please use letters only (a-z) in this field.' => $this->__('Please use letters only (a-z) in this field.'),
- 'Please use only letters (a-z), numbers (0-9) or underscore(_) in this field, first character should be a letter.' =>
- $this->__('Please use only letters (a-z), numbers (0-9) or underscore(_) in this field, first character should be a letter.'),
- 'Please use only letters (a-z) or numbers (0-9) only in this field. No spaces or other characters are allowed.' =>
- $this->__('Please use only letters (a-z) or numbers (0-9) only in this field. No spaces or other characters are allowed.'),
- 'Please use only letters (a-z) or numbers (0-9) or spaces and # only in this field.' =>
- $this->__('Please use only letters (a-z) or numbers (0-9) or spaces and # only in this field.'),
- 'Please enter a valid phone number. For example (123) 456-7890 or 123-456-7890.' =>
- $this->__('Please enter a valid phone number. For example (123) 456-7890 or 123-456-7890.'),
- 'Please enter a valid date.' => $this->__('Please enter a valid date.'),
- 'Please enter a valid email address. For example johndoe@domain.com.' =>
- $this->__('Please enter a valid email address. For example johndoe@domain.com.'),
- 'Please enter 6 or more characters.' => $this->__('Please enter 6 or more characters.'),
- 'Please make sure your passwords match.' => $this->__('Please make sure your passwords match.'),
- 'Please enter a valid URL. http:// is required' => $this->__('Please enter a valid URL. http:// is required'),
- 'Please enter a valid URL. For example http://www.example.com or www.example.com' =>
- $this->__('Please enter a valid URL. For example http://www.example.com or www.example.com'),
- 'Please enter a valid social security number. For example 123-45-6789.' =>
- $this->__('Please enter a valid social security number. For example 123-45-6789.'),
- 'Please enter a valid zip code. For example 90602 or 90602-1234.' =>
- $this->__('Please enter a valid zip code. For example 90602 or 90602-1234.'),
- 'Please enter a valid zip code.' => $this->__('Please enter a valid zip code.'),
- 'Please use this date format: dd/mm/yyyy. For example 17/03/2006 for the 17th of March, 2006.' =>
- $this->__('Please use this date format: dd/mm/yyyy. For example 17/03/2006 for the 17th of March, 2006.'),
- 'Please enter a valid $ amount. For example $100.00.' =>
- $this->__('Please enter a valid $ amount. For example $100.00.'),
- 'Please select one of the above options.' => $this->__('Please select one of the above options.'),
- 'Please select one of the options.' => $this->__('Please select one of the options.'),
- 'Please enter a valid number in this field.' => $this->__('Please enter a valid number in this field.'),
- 'Please select State/Province.' => $this->__('Please select State/Province.'),
- 'Please enter valid password.' => $this->__('Please enter valid password.'),
- 'Please enter 6 or more characters. Leading or trailing spaces will be ignored.' =>
- $this->__('Please enter 6 or more characters. Leading or trailing spaces will be ignored.'),
- 'Please use letters only (a-z or A-Z) in this field.' => $this->__('Please use letters only (a-z or A-Z) in this field.'),
- 'Please enter a number greater than 0 in this field.' =>
- $this->__('Please enter a number greater than 0 in this field.'),
- 'Please enter a valid credit card number.' => $this->__('Please enter a valid credit card number.'),
- 'Please wait, loading...' => $this->__('Please wait, loading...'),
- 'Please choose to register or to checkout as a guest' => $this->__('Please choose to register or to checkout as a guest'),
- 'Error: Passwords do not match' => $this->__('Error: Passwords do not match'),
- 'Your order can not be completed at this time as there is no shipping methods available for it. Please make necessary changes in your shipping address.' =>
- $this->__('Your order can not be completed at this time as there is no shipping methods available for it. Please make necessary changes in your shipping address.'),
- 'Please specify shipping method.' => $this->__('Please specify shipping method.'),
- 'Your order can not be completed at this time as there is no payment methods available for it.' =>
- $this->__('Your order can not be completed at this time as there is no payment methods available for it.'),
- 'Please specify payment method.' => $this->__('Please specify payment method.'),
+ $this->_translateData = array(
+ 'Please select an option.' => $this->__('Please select an option.'),
+ 'This is a required field.' => $this->__('This is a required field.'),
+ 'Please enter a valid number in this field.' => $this->__('Please enter a valid number in this field.'),
+ 'Please use numbers only in this field. please avoid spaces or other characters such as dots or commas.' =>
+ $this->__('Please use numbers only in this field. please avoid spaces or other characters such as dots or commas.'),
+ 'Please use letters only (a-z) in this field.' => $this->__('Please use letters only (a-z) in this field.'),
+ 'Please use only letters (a-z), numbers (0-9) or underscore(_) in this field, first character should be a letter.' =>
+ $this->__('Please use only letters (a-z), numbers (0-9) or underscore(_) in this field, first character should be a letter.'),
+ 'Please use only letters (a-z) or numbers (0-9) only in this field. No spaces or other characters are allowed.' =>
+ $this->__('Please use only letters (a-z) or numbers (0-9) only in this field. No spaces or other characters are allowed.'),
+ 'Please use only letters (a-z) or numbers (0-9) or spaces and # only in this field.' =>
+ $this->__('Please use only letters (a-z) or numbers (0-9) or spaces and # only in this field.'),
+ 'Please enter a valid phone number. For example (123) 456-7890 or 123-456-7890.' =>
+ $this->__('Please enter a valid phone number. For example (123) 456-7890 or 123-456-7890.'),
+ 'Please enter a valid date.' => $this->__('Please enter a valid date.'),
+ 'Please enter a valid email address. For example johndoe@domain.com.' =>
+ $this->__('Please enter a valid email address. For example johndoe@domain.com.'),
+ 'Please enter 6 or more characters.' => $this->__('Please enter 6 or more characters.'),
+ 'Please make sure your passwords match.' => $this->__('Please make sure your passwords match.'),
+ 'Please enter a valid URL. http:// is required' => $this->__('Please enter a valid URL. http:// is required'),
+ 'Please enter a valid URL. For example http://www.example.com or www.example.com' =>
+ $this->__('Please enter a valid URL. For example http://www.example.com or www.example.com'),
+ 'Please enter a valid social security number. For example 123-45-6789.' =>
+ $this->__('Please enter a valid social security number. For example 123-45-6789.'),
+ 'Please enter a valid zip code. For example 90602 or 90602-1234.' =>
+ $this->__('Please enter a valid zip code. For example 90602 or 90602-1234.'),
+ 'Please enter a valid zip code.' => $this->__('Please enter a valid zip code.'),
+ 'Please use this date format: dd/mm/yyyy. For example 17/03/2006 for the 17th of March, 2006.' =>
+ $this->__('Please use this date format: dd/mm/yyyy. For example 17/03/2006 for the 17th of March, 2006.'),
+ 'Please enter a valid $ amount. For example $100.00.' =>
+ $this->__('Please enter a valid $ amount. For example $100.00.'),
+ 'Please select one of the above options.' => $this->__('Please select one of the above options.'),
+ 'Please select one of the options.' => $this->__('Please select one of the options.'),
+ 'Please enter a valid number in this field.' => $this->__('Please enter a valid number in this field.'),
+ 'Please select State/Province.' => $this->__('Please select State/Province.'),
+ 'Please enter valid password.' => $this->__('Please enter valid password.'),
+ 'Please enter 6 or more characters. Leading or trailing spaces will be ignored.' =>
+ $this->__('Please enter 6 or more characters. Leading or trailing spaces will be ignored.'),
+ 'Please use letters only (a-z or A-Z) in this field.' => $this->__('Please use letters only (a-z or A-Z) in this field.'),
+ 'Please enter a number greater than 0 in this field.' =>
+ $this->__('Please enter a number greater than 0 in this field.'),
+ 'Please enter a valid credit card number.' => $this->__('Please enter a valid credit card number.'),
+ 'Please wait, loading...' => $this->__('Please wait, loading...'),
+ 'Please choose to register or to checkout as a guest' => $this->__('Please choose to register or to checkout as a guest'),
+ 'Error: Passwords do not match' => $this->__('Error: Passwords do not match'),
+ 'Your order can not be completed at this time as there is no shipping methods available for it. Please make necessary changes in your shipping address.' =>
+ $this->__('Your order can not be completed at this time as there is no shipping methods available for it. Please make necessary changes in your shipping address.'),
+ 'Please specify shipping method.' => $this->__('Please specify shipping method.'),
+ 'Your order can not be completed at this time as there is no payment methods available for it.' =>
+ $this->__('Your order can not be completed at this time as there is no payment methods available for it.'),
+ 'Please specify payment method.' => $this->__('Please specify payment method.'),
'Credit card number doesn\'t match credit card type' => $this->__('Credit card number doesn\'t match credit card type'),
'Card type doesn\'t match credit card number' => $this->__('Card type doesn\'t match credit card number'),
'Please enter a valid credit card verification number.' => $this->__('Please enter a valid credit card verification number.'),
@@ -183,16 +183,16 @@ protected function _getTranslateData()
'Maximum length exceeded.' => $this->__('Maximum length exceeded.'),
- //Mage_Rule
+ //Mage_Rule
- 'Your session has been expired, you will be relogged in now.' => $this->__('Your session has been expired, you will be relogged in now.'),
- 'Incorrect credit card expiration date' => $this->__('Incorrect credit card expiration date'),
- );
- foreach ($this->_translateData as $key=>$value) {
- if ($key == $value) {
- unset($this->_translateData[$key]);
- }
- }
+ 'Your session has been expired, you will be relogged in now.' => $this->__('Your session has been expired, you will be relogged in now.'),
+ 'Incorrect credit card expiration date' => $this->__('Incorrect credit card expiration date'),
+ );
+ foreach ($this->_translateData as $key=>$value) {
+ if ($key == $value) {
+ unset($this->_translateData[$key]);
+ }
+ }
}
return $this->_translateData;
}
diff --git a/app/code/core/Mage/Core/Helper/String.php b/app/code/core/Mage/Core/Helper/String.php
index 03780a5d2e..1950443ba7 100644
--- a/app/code/core/Mage/Core/Helper/String.php
+++ b/app/code/core/Mage/Core/Helper/String.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Core/Helper/Url.php b/app/code/core/Mage/Core/Helper/Url.php
index ca735a6afe..ce88fe0f04 100644
--- a/app/code/core/Mage/Core/Helper/Url.php
+++ b/app/code/core/Mage/Core/Helper/Url.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Core
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
diff --git a/app/code/core/Mage/Core/Model/Abstract.php b/app/code/core/Mage/Core/Model/Abstract.php
index 80e5b1d94f..c7aff1b872 100644
--- a/app/code/core/Mage/Core/Model/Abstract.php
+++ b/app/code/core/Mage/Core/Model/Abstract.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
diff --git a/app/code/core/Mage/Core/Model/App.php b/app/code/core/Mage/Core/Model/App.php
index d4a7d6ebee..607e2c8812 100644
--- a/app/code/core/Mage/Core/Model/App.php
+++ b/app/code/core/Mage/Core/Model/App.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Core
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
@@ -723,7 +723,7 @@ public function getWebsite($id=null)
} elseif ($id instanceof Mage_Core_Model_Website) {
return $id;
} elseif ($id === true) {
- return $this->_website;
+ return $this->_website;
}
if (empty($this->_websites[$id])) {
diff --git a/app/code/core/Mage/Core/Model/App/Area.php b/app/code/core/Mage/Core/Model/App/Area.php
index b29e0ba259..04a5807f04 100644
--- a/app/code/core/Mage/Core/Model/App/Area.php
+++ b/app/code/core/Mage/Core/Model/App/Area.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Core/Model/Config.php b/app/code/core/Mage/Core/Model/Config.php
index 7c80eef899..f294b5326a 100644
--- a/app/code/core/Mage/Core/Model/Config.php
+++ b/app/code/core/Mage/Core/Model/Config.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
diff --git a/app/code/core/Mage/Core/Model/Config/Base.php b/app/code/core/Mage/Core/Model/Config/Base.php
index 8343f0d791..206bef6dd9 100644
--- a/app/code/core/Mage/Core/Model/Config/Base.php
+++ b/app/code/core/Mage/Core/Model/Config/Base.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
@@ -46,4 +46,4 @@ public function __construct($sourceData=null)
$this->_elementClass = 'Mage_Core_Model_Config_Element';
parent::__construct($sourceData);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Core/Model/Config/Data.php b/app/code/core/Mage/Core/Model/Config/Data.php
index b08369d787..217a96677f 100644
--- a/app/code/core/Mage/Core/Model/Config/Data.php
+++ b/app/code/core/Mage/Core/Model/Config/Data.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
diff --git a/app/code/core/Mage/Core/Model/Config/Element.php b/app/code/core/Mage/Core/Model/Config/Element.php
index b61339e0ed..e5b5293815 100644
--- a/app/code/core/Mage/Core/Model/Config/Element.php
+++ b/app/code/core/Mage/Core/Model/Config/Element.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
diff --git a/app/code/core/Mage/Core/Model/Config/Options.php b/app/code/core/Mage/Core/Model/Config/Options.php
index 84cf952648..0863a8cb18 100644
--- a/app/code/core/Mage/Core/Model/Config/Options.php
+++ b/app/code/core/Mage/Core/Model/Config/Options.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Core/Model/Config/System.php b/app/code/core/Mage/Core/Model/Config/System.php
index 47175bef3b..7365a799ba 100644
--- a/app/code/core/Mage/Core/Model/Config/System.php
+++ b/app/code/core/Mage/Core/Model/Config/System.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
/**
@@ -44,4 +44,4 @@ public function load($module)
$this->loadFile($file);
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Core/Model/Convert.php b/app/code/core/Mage/Core/Model/Convert.php
index 3624979189..c5ad74e531 100644
--- a/app/code/core/Mage/Core/Model/Convert.php
+++ b/app/code/core/Mage/Core/Model/Convert.php
@@ -1,5 +1,4 @@
_init('core/design');
- }
+ protected function _construct()
+ {
+ $this->_init('core/design');
+ }
public function validate()
{
diff --git a/app/code/core/Mage/Core/Model/Design/Package.php b/app/code/core/Mage/Core/Model/Design/Package.php
index 1d4bd1eca3..7cd7003da9 100644
--- a/app/code/core/Mage/Core/Model/Design/Package.php
+++ b/app/code/core/Mage/Core/Model/Design/Package.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
@@ -47,95 +47,95 @@ class Mage_Core_Model_Design_Package
*
* @var string
*/
- protected $_area;
-
- /**
- * Package name
- *
- * @var string
- */
- protected $_name;
-
- /**
- * Package theme
- *
- * @var string
- */
- protected $_theme;
-
- /**
- * Package root directory
- *
- * @var string
- */
- protected $_rootDir;
-
- protected $_config = null;
-
- /**
- * Set store
- *
- * @param string|integer|Mage_Core_Model_Store $store
- * @return Mage_Core_Model_Design_Package
- */
- public function setStore($store)
- {
- $this->_store = $store;
- return $this;
- }
-
- /**
- * Retrieve store
- *
- * @return string|integer|Mage_Core_Model_Store
- */
- public function getStore()
- {
- if ($this->_store === null) {
- return Mage::app()->getStore();
- }
- return $this->_store;
- }
-
- /**
- * Set package area
- *
- * @param string $area
- * @return Mage_Core_Model_Design_Package
- */
- public function setArea($area)
- {
- $this->_area = $area;
- return $this;
- }
-
- /**
- * Retrieve package area
- *
- * @return unknown
- */
- public function getArea()
- {
- if (is_null($this->_area)) {
- $this->_area = self::DEFAULT_AREA;
- }
- return $this->_area;
- }
-
- /**
- * Set package name
- * In case of any problem, the default will be set.
- *
- * @param string $name
- * @return Mage_Core_Model_Design_Package
- */
- public function setPackageName($name = '')
- {
+ protected $_area;
+
+ /**
+ * Package name
+ *
+ * @var string
+ */
+ protected $_name;
+
+ /**
+ * Package theme
+ *
+ * @var string
+ */
+ protected $_theme;
+
+ /**
+ * Package root directory
+ *
+ * @var string
+ */
+ protected $_rootDir;
+
+ protected $_config = null;
+
+ /**
+ * Set store
+ *
+ * @param string|integer|Mage_Core_Model_Store $store
+ * @return Mage_Core_Model_Design_Package
+ */
+ public function setStore($store)
+ {
+ $this->_store = $store;
+ return $this;
+ }
+
+ /**
+ * Retrieve store
+ *
+ * @return string|integer|Mage_Core_Model_Store
+ */
+ public function getStore()
+ {
+ if ($this->_store === null) {
+ return Mage::app()->getStore();
+ }
+ return $this->_store;
+ }
+
+ /**
+ * Set package area
+ *
+ * @param string $area
+ * @return Mage_Core_Model_Design_Package
+ */
+ public function setArea($area)
+ {
+ $this->_area = $area;
+ return $this;
+ }
+
+ /**
+ * Retrieve package area
+ *
+ * @return unknown
+ */
+ public function getArea()
+ {
+ if (is_null($this->_area)) {
+ $this->_area = self::DEFAULT_AREA;
+ }
+ return $this->_area;
+ }
+
+ /**
+ * Set package name
+ * In case of any problem, the default will be set.
+ *
+ * @param string $name
+ * @return Mage_Core_Model_Design_Package
+ */
+ public function setPackageName($name = '')
+ {
if (empty($name)) {
// see, if exceptions for user-agents defined in config
- $customPackage = $this->_checkUserAgentAgainstRegexps('design/package/ua_regexp');
- if ($customPackage) {
- $this->_name = $customPackage;
+ $customPackage = $this->_checkUserAgentAgainstRegexps('design/package/ua_regexp');
+ if ($customPackage) {
+ $this->_name = $customPackage;
}
else {
$this->_name = Mage::getStoreConfig('design/package/name', $this->getStore());
@@ -146,164 +146,164 @@ public function setPackageName($name = '')
}
// make sure not to crash, if wrong package specified
if (!$this->designPackageExists($this->_name, $this->getArea())) {
- $this->_name = self::DEFAULT_PACKAGE;
- }
- return $this;
- }
-
- /**
- * Set store/package/area at once, and get respective values, that were before
- *
- * $storePackageArea must be assoc array. The keys may be:
- * 'store', 'package', 'area'
- *
- * @param array $storePackageArea
- * @return array
- */
- public function setAllGetOld($storePackageArea)
- {
- $oldValues = array();
- if (array_key_exists('store', $storePackageArea)) {
- $oldValues['store'] = $this->getStore();
- $this->setStore($storePackageArea['store']);
- }
- if (array_key_exists('package', $storePackageArea)) {
- $oldValues['package'] = $this->getPackageName();
- $this->setPackageName($storePackageArea['package']);
- }
- if (array_key_exists('area', $storePackageArea)) {
- $oldValues['area'] = $this->getArea();
- $this->setArea($storePackageArea['area']);
- }
- return $oldValues;
- }
-
- /**
- * Retrieve package name
- *
- * @return string
- */
- public function getPackageName()
- {
- if (null === $this->_name) {
- $this->setPackageName();
- }
- return $this->_name;
- }
-
- public function designPackageExists($packageName, $area = self::DEFAULT_AREA)
- {
- return is_dir(Mage::getBaseDir('design') . DS . $area . DS . $packageName);
- }
-
- /**
- * Declare design package theme params
- *
- * @return Mage_Core_Model_Design_Package
- */
- public function setTheme()
- {
- switch (func_num_args()) {
- case 1:
- foreach (array('layout', 'template', 'skin', 'locale') as $type) {
- $this->_theme[$type] = func_get_arg(0);
- }
- break;
-
- case 2:
- $this->_theme[func_get_arg(0)] = func_get_arg(1);
- break;
-
- default:
- throw Mage::exception(Mage::helper('core')->__('Wrong number of arguments for %s', __METHOD__));
- }
- return $this;
- }
-
- public function getTheme($type)
- {
- if (empty($this->_theme[$type])) {
- $this->_theme[$type] = Mage::getStoreConfig('design/theme/'.$type, $this->getStore());
- if ($type!=='default' && empty($this->_theme[$type])) {
- $this->_theme[$type] = $this->getTheme('default');
- if (empty($this->_theme[$type])) {
- $this->_theme[$type] = self::DEFAULT_THEME;
- }
-
- // "locale", "layout", "template"
- }
- }
-
- // + "default", "skin"
-
- // set exception value for theme, if defined in config
+ $this->_name = self::DEFAULT_PACKAGE;
+ }
+ return $this;
+ }
+
+ /**
+ * Set store/package/area at once, and get respective values, that were before
+ *
+ * $storePackageArea must be assoc array. The keys may be:
+ * 'store', 'package', 'area'
+ *
+ * @param array $storePackageArea
+ * @return array
+ */
+ public function setAllGetOld($storePackageArea)
+ {
+ $oldValues = array();
+ if (array_key_exists('store', $storePackageArea)) {
+ $oldValues['store'] = $this->getStore();
+ $this->setStore($storePackageArea['store']);
+ }
+ if (array_key_exists('package', $storePackageArea)) {
+ $oldValues['package'] = $this->getPackageName();
+ $this->setPackageName($storePackageArea['package']);
+ }
+ if (array_key_exists('area', $storePackageArea)) {
+ $oldValues['area'] = $this->getArea();
+ $this->setArea($storePackageArea['area']);
+ }
+ return $oldValues;
+ }
+
+ /**
+ * Retrieve package name
+ *
+ * @return string
+ */
+ public function getPackageName()
+ {
+ if (null === $this->_name) {
+ $this->setPackageName();
+ }
+ return $this->_name;
+ }
+
+ public function designPackageExists($packageName, $area = self::DEFAULT_AREA)
+ {
+ return is_dir(Mage::getBaseDir('design') . DS . $area . DS . $packageName);
+ }
+
+ /**
+ * Declare design package theme params
+ *
+ * @return Mage_Core_Model_Design_Package
+ */
+ public function setTheme()
+ {
+ switch (func_num_args()) {
+ case 1:
+ foreach (array('layout', 'template', 'skin', 'locale') as $type) {
+ $this->_theme[$type] = func_get_arg(0);
+ }
+ break;
+
+ case 2:
+ $this->_theme[func_get_arg(0)] = func_get_arg(1);
+ break;
+
+ default:
+ throw Mage::exception(Mage::helper('core')->__('Wrong number of arguments for %s', __METHOD__));
+ }
+ return $this;
+ }
+
+ public function getTheme($type)
+ {
+ if (empty($this->_theme[$type])) {
+ $this->_theme[$type] = Mage::getStoreConfig('design/theme/'.$type, $this->getStore());
+ if ($type!=='default' && empty($this->_theme[$type])) {
+ $this->_theme[$type] = $this->getTheme('default');
+ if (empty($this->_theme[$type])) {
+ $this->_theme[$type] = self::DEFAULT_THEME;
+ }
+
+ // "locale", "layout", "template"
+ }
+ }
+
+ // + "default", "skin"
+
+ // set exception value for theme, if defined in config
$customThemeType = $this->_checkUserAgentAgainstRegexps("design/theme/{$type}_ua_regexp");
if ($customThemeType) {
$this->_theme[$type] = $customThemeType;
}
- return $this->_theme[$type];
- }
-
- public function getDefaultTheme()
- {
- return self::DEFAULT_THEME;
- }
-
- public function updateParamDefaults(array &$params)
- {
- if ($this->getStore()) {
- $params['_store'] = $this->getStore();
- }
- if (empty($params['_area'])) {
- $params['_area'] = $this->getArea();
- }
- if (empty($params['_package'])) {
- $params['_package'] = $this->getPackageName();
- }
- if (empty($params['_theme'])) {
- $params['_theme'] = $this->getTheme( (isset($params['_type'])) ? $params['_type'] : '' );
- }
- if (empty($params['_default'])) {
- $params['_default'] = false;
- }
- return $this;
- }
-
- public function getBaseDir(array $params)
- {
- $this->updateParamDefaults($params);
- $baseDir = (empty($params['_relative']) ? Mage::getBaseDir('design').DS : '').
- $params['_area'].DS.$params['_package'].DS.$params['_theme'].DS.$params['_type'];
- return $baseDir;
- }
-
- public function getSkinBaseDir(array $params=array())
- {
- $this->updateParamDefaults($params);
- $baseDir = (empty($params['_relative']) ? Mage::getBaseDir('skin').DS : '').
- $params['_area'].DS.$params['_package'].DS.$params['_theme'];
- return $baseDir;
- }
-
- public function getLocaleBaseDir(array $params=array())
- {
- $this->updateParamDefaults($params);
- $baseDir = (empty($params['_relative']) ? Mage::getBaseDir('design').DS : '').
- $params['_area'].DS.$params['_package'].DS.$params['_theme'] . DS . 'locale' . DS .
- Mage::app()->getLocale()->getLocaleCode();
- return $baseDir;
- }
-
- public function getSkinBaseUrl(array $params=array())
- {
- $this->updateParamDefaults($params);
- $baseUrl = Mage::getBaseUrl('skin', isset($params['_secure'])?(bool)$params['_secure']:null)
- .$params['_area'].'/'.$params['_package'].'/'.$params['_theme'].'/';
- return $baseUrl;
- }
-
- /**
+ return $this->_theme[$type];
+ }
+
+ public function getDefaultTheme()
+ {
+ return self::DEFAULT_THEME;
+ }
+
+ public function updateParamDefaults(array &$params)
+ {
+ if ($this->getStore()) {
+ $params['_store'] = $this->getStore();
+ }
+ if (empty($params['_area'])) {
+ $params['_area'] = $this->getArea();
+ }
+ if (empty($params['_package'])) {
+ $params['_package'] = $this->getPackageName();
+ }
+ if (empty($params['_theme'])) {
+ $params['_theme'] = $this->getTheme( (isset($params['_type'])) ? $params['_type'] : '' );
+ }
+ if (empty($params['_default'])) {
+ $params['_default'] = false;
+ }
+ return $this;
+ }
+
+ public function getBaseDir(array $params)
+ {
+ $this->updateParamDefaults($params);
+ $baseDir = (empty($params['_relative']) ? Mage::getBaseDir('design').DS : '').
+ $params['_area'].DS.$params['_package'].DS.$params['_theme'].DS.$params['_type'];
+ return $baseDir;
+ }
+
+ public function getSkinBaseDir(array $params=array())
+ {
+ $this->updateParamDefaults($params);
+ $baseDir = (empty($params['_relative']) ? Mage::getBaseDir('skin').DS : '').
+ $params['_area'].DS.$params['_package'].DS.$params['_theme'];
+ return $baseDir;
+ }
+
+ public function getLocaleBaseDir(array $params=array())
+ {
+ $this->updateParamDefaults($params);
+ $baseDir = (empty($params['_relative']) ? Mage::getBaseDir('design').DS : '').
+ $params['_area'].DS.$params['_package'].DS.$params['_theme'] . DS . 'locale' . DS .
+ Mage::app()->getLocale()->getLocaleCode();
+ return $baseDir;
+ }
+
+ public function getSkinBaseUrl(array $params=array())
+ {
+ $this->updateParamDefaults($params);
+ $baseUrl = Mage::getBaseUrl('skin', isset($params['_secure'])?(bool)$params['_secure']:null)
+ .$params['_area'].'/'.$params['_package'].'/'.$params['_theme'].'/';
+ return $baseUrl;
+ }
+
+ /**
* Get absolute file path for requested file or false if doesn't exist
*
* Possible params:
@@ -324,29 +324,29 @@ public function getSkinBaseUrl(array $params=array())
*/
public function validateFile($file, array $params)
{
- Varien_Profiler::start(__METHOD__);
- switch ($params['_type']) {
- case 'skin':
- $fileName = $this->getSkinBaseDir($params);
- break;
-
- case 'locale':
- $fileName = $this->getLocaleBasedir($params);
- break;
-
- default:
- $fileName = $this->getBaseDir($params);
- break;
- }
- $fileName.= DS.$file;
-
- $testFile = (empty($params['_relative']) ? '' : Mage::getBaseDir('design').DS) . $fileName;
-
- if ($this->getDefaultTheme()!==$params['_theme'] && !file_exists($testFile)) {
- return false;
- }
- Varien_Profiler::stop(__METHOD__);
- return $fileName;
+ Varien_Profiler::start(__METHOD__);
+ switch ($params['_type']) {
+ case 'skin':
+ $fileName = $this->getSkinBaseDir($params);
+ break;
+
+ case 'locale':
+ $fileName = $this->getLocaleBasedir($params);
+ break;
+
+ default:
+ $fileName = $this->getBaseDir($params);
+ break;
+ }
+ $fileName.= DS.$file;
+
+ $testFile = (empty($params['_relative']) ? '' : Mage::getBaseDir('design').DS) . $fileName;
+
+ if ($this->getDefaultTheme()!==$params['_theme'] && !file_exists($testFile)) {
+ return false;
+ }
+ Varien_Profiler::stop(__METHOD__);
+ return $fileName;
}
/**
@@ -360,25 +360,25 @@ public function validateFile($file, array $params)
*/
public function getFilename($file, array $params)
{
- Varien_Profiler::start(__METHOD__);
- $this->updateParamDefaults($params);
- $filename = $this->validateFile($file, $params);
- if (false===$filename) {
- $params['_theme'] = $this->getFallbackTheme();
- $filename = $this->validateFile($file, $params);
- if (false===$filename) {
- if ($this->getDefaultTheme()===$params['_theme']) {
- return $params['_default'];
- }
- $params['_theme'] = $this->getDefaultTheme();
- $filename = $this->validateFile($file, $params);
- if (false===$filename) {
- return $params['_default'];
- }
- }
- }
- Varien_Profiler::stop(__METHOD__);
- return $filename;
+ Varien_Profiler::start(__METHOD__);
+ $this->updateParamDefaults($params);
+ $filename = $this->validateFile($file, $params);
+ if (false===$filename) {
+ $params['_theme'] = $this->getFallbackTheme();
+ $filename = $this->validateFile($file, $params);
+ if (false===$filename) {
+ if ($this->getDefaultTheme()===$params['_theme']) {
+ return $params['_default'];
+ }
+ $params['_theme'] = $this->getDefaultTheme();
+ $filename = $this->validateFile($file, $params);
+ if (false===$filename) {
+ return $params['_default'];
+ }
+ }
+ }
+ Varien_Profiler::stop(__METHOD__);
+ return $filename;
}
public function getFallbackTheme()
@@ -388,20 +388,20 @@ public function getFallbackTheme()
public function getLayoutFilename($file, array $params=array())
{
- $params['_type'] = 'layout';
- return $this->getFilename($file, $params);
+ $params['_type'] = 'layout';
+ return $this->getFilename($file, $params);
}
public function getTemplateFilename($file, array $params=array())
{
- $params['_type'] = 'template';
- return $this->getFilename($file, $params);
+ $params['_type'] = 'template';
+ return $this->getFilename($file, $params);
}
public function getLocaleFileName($file, array $params=array())
{
$params['_type'] = 'locale';
- return $this->getFilename($file, $params);
+ return $this->getFilename($file, $params);
}
/**
@@ -413,37 +413,37 @@ public function getLocaleFileName($file, array $params=array())
*/
public function getSkinUrl($file=null, array $params=array())
{
- Varien_Profiler::start(__METHOD__);
- if (empty($params['_type'])) {
- $params['_type'] = 'skin';
- }
- if (empty($params['_default'])) {
- $params['_default'] = false;
- }
- $this->updateParamDefaults($params);
- if (!empty($file)) {
- $filename = $this->validateFile($file, $params);
- if (false===$filename) {
-
- $params['_theme'] = $this->getFallbackTheme();
- $filename = $this->validateFile($file, $params);
- if (false===$filename) {
- if ($this->getDefaultTheme()===$params['_theme']) {
- return $params['_default'];
- }
- $params['_theme'] = $this->getDefaultTheme();
- $filename = $this->validateFile($file, $params);
- if (false===$filename) {
- return $params['_default'];
- }
- }
-
- }
- }
-
- $url = $this->getSkinBaseUrl($params).(!empty($file) ? $file : '');
- Varien_Profiler::stop(__METHOD__);
- return $url;
+ Varien_Profiler::start(__METHOD__);
+ if (empty($params['_type'])) {
+ $params['_type'] = 'skin';
+ }
+ if (empty($params['_default'])) {
+ $params['_default'] = false;
+ }
+ $this->updateParamDefaults($params);
+ if (!empty($file)) {
+ $filename = $this->validateFile($file, $params);
+ if (false===$filename) {
+
+ $params['_theme'] = $this->getFallbackTheme();
+ $filename = $this->validateFile($file, $params);
+ if (false===$filename) {
+ if ($this->getDefaultTheme()===$params['_theme']) {
+ return $params['_default'];
+ }
+ $params['_theme'] = $this->getDefaultTheme();
+ $filename = $this->validateFile($file, $params);
+ if (false===$filename) {
+ return $params['_default'];
+ }
+ }
+
+ }
+ }
+
+ $url = $this->getSkinBaseUrl($params).(!empty($file) ? $file : '');
+ Varien_Profiler::stop(__METHOD__);
+ return $url;
}
public function getPackageList()
@@ -472,17 +472,17 @@ private function _listDirectories($path, $fullPath = false){
$result = array();
$dir = opendir($path);
if ($dir) {
- while ($entry = readdir($dir)) {
- if (substr($entry, 0, 1) == '.' || !is_dir($path . DS . $entry)){
- continue;
- }
- if ($fullPath) {
- $entry = $path . DS . $entry;
- }
- $result[] = $entry;
- }
- unset($entry);
- closedir($dir);
+ while ($entry = readdir($dir)) {
+ if (substr($entry, 0, 1) == '.' || !is_dir($path . DS . $entry)){
+ continue;
+ }
+ if ($fullPath) {
+ $entry = $path . DS . $entry;
+ }
+ $result[] = $entry;
+ }
+ unset($entry);
+ closedir($dir);
}
return $result;
diff --git a/app/code/core/Mage/Core/Model/Design/Source/Apply.php b/app/code/core/Mage/Core/Model/Design/Source/Apply.php
index a051583bec..1300048ea9 100644
--- a/app/code/core/Mage/Core/Model/Design/Source/Apply.php
+++ b/app/code/core/Mage/Core/Model/Design/Source/Apply.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
@@ -44,4 +44,4 @@ public function getAllOptions()
return $this->_options;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Core/Model/Design/Source/Design.php b/app/code/core/Mage/Core/Model/Design/Source/Design.php
index fd920f911f..c42092a186 100644
--- a/app/code/core/Mage/Core/Model/Design/Source/Design.php
+++ b/app/code/core/Mage/Core/Model/Design/Source/Design.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
@@ -99,4 +99,4 @@ public function getOptionText($value)
return $value;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Core/Model/Email.php b/app/code/core/Mage/Core/Model/Email.php
index 0edcfe412d..d233ccf5ad 100644
--- a/app/code/core/Mage/Core/Model/Email.php
+++ b/app/code/core/Mage/Core/Model/Email.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
@@ -38,7 +38,7 @@
*/
class Mage_Core_Model_Email extends Varien_Object
{
- protected $_tplVars = array();
+ protected $_tplVars = array();
protected $_block;
public function __construct()
@@ -116,4 +116,4 @@ public function send()
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Core/Model/Email/Template.php b/app/code/core/Mage/Core/Model/Email/Template.php
index 659ae977bf..c24f9faf5b 100644
--- a/app/code/core/Mage/Core/Model/Email/Template.php
+++ b/app/code/core/Mage/Core/Model/Email/Template.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
/**
@@ -561,4 +561,4 @@ public function setReplyTo($email)
$this->getMail()->addHeader('Reply-To', $email);
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Core/Model/Email/Template/Filter.php b/app/code/core/Mage/Core/Model/Email/Template/Filter.php
index acc4599f52..9649e6eeae 100644
--- a/app/code/core/Mage/Core/Model/Email/Template/Filter.php
+++ b/app/code/core/Mage/Core/Model/Email/Template/Filter.php
@@ -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_Core
- * @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)
+ * @category Mage
+ * @package Mage_Core
+ * @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)
*/
@@ -42,15 +42,14 @@ class Mage_Core_Model_Email_Template_Filter extends Varien_Filter_Template
protected $_useAbsoluteLinks = false;
/**
- * Use session in URL flag
+ * Whether to allow SID in store directive: NO
*
* @var bool
*/
- protected $_useSessionInUrl;
+ protected $_useSessionInUrl = false;
/**
- * Url Instance
- *
+ * @deprecated after 1.4.0.0-alpha2
* @var Mage_Core_Model_Url
*/
protected static $_urlInstance;
@@ -84,14 +83,14 @@ public function setUseAbsoluteLinks($flag)
}
/**
- * Set Use session in URL flag
+ * Setter whether SID is allowed in store directive
+ * Doesn't set anything intentionally, since SID is not allowed in any kind of emails
*
* @param bool $flag
* @return Mage_Core_Model_Email_Template_Filter
*/
public function setUseSessionInUrl($flag)
{
- $this->_useSessionInUrl = (bool)$flag;
return $this;
}
@@ -266,29 +265,7 @@ public function storeDirective($construction)
unset($params['url']);
}
- if (!self::$_urlInstance) {
- self::$_urlInstance = Mage::getModel('core/url')->setStore(
- Mage::app()->getStore(Mage::getDesign()->getStore())->getId()
- );
- }
- $_urlInstanceOldStore = null;
- if (!empty($path) && !Mage::getStoreConfigFlag(Mage_Core_Model_Store::XML_PATH_STORE_IN_URL)
- && !Mage::app()->isSingleStoreMode())
- {
- $params['_query']['___store'] = Mage::app()->getStore(Mage::getDesign()->getStore())->getCode();
- } elseif (!empty($path) && Mage::getStoreConfigFlag(Mage_Core_Model_Store::XML_PATH_STORE_IN_URL)
- && !Mage::app()->isSingleStoreMode())
- {
- $_urlInstanceOldStore = self::$_urlInstance->getStore();
- self::$_urlInstance->setStore(Mage::app()->getStore(Mage::getDesign()->getStore())->getCode());
- }
-
- $url = self::$_urlInstance->getUrl($path, $params);
- if (null ==! $_urlInstanceOldStore) {
- self::$_urlInstance->setStore($_urlInstanceOldStore);
- }
-
- return $url;
+ return Mage::app()->getStore(Mage::getDesign()->getStore())->getUrl($path, $params);
}
/**
diff --git a/app/code/core/Mage/Core/Model/Email/Transport.php b/app/code/core/Mage/Core/Model/Email/Transport.php
index c2f5a18f7c..6c8ae16c3f 100644
--- a/app/code/core/Mage/Core/Model/Email/Transport.php
+++ b/app/code/core/Mage/Core/Model/Email/Transport.php
@@ -18,14 +18,14 @@
* 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_Core
- * @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_Core
+ * @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_Core_Model_Email_Transport extends Zend_Mail_Transport_Sendmail
+class Mage_Core_Model_Email_Transport extends Zend_Mail_Transport_Sendmail
{
-
-}
\ No newline at end of file
+
+}
diff --git a/app/code/core/Mage/Core/Model/Encryption.php b/app/code/core/Mage/Core/Model/Encryption.php
index 5efacf4e46..7f61a2b874 100644
--- a/app/code/core/Mage/Core/Model/Encryption.php
+++ b/app/code/core/Mage/Core/Model/Encryption.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Core/Model/Flag.php b/app/code/core/Mage/Core/Model/Flag.php
index 9119ab7e98..6626a343aa 100644
--- a/app/code/core/Mage/Core/Model/Flag.php
+++ b/app/code/core/Mage/Core/Model/Flag.php
@@ -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_Core
- * @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)
+ * @category Mage
+ * @package Mage_Core
+ * @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)
*/
@@ -105,4 +105,4 @@ public function loadSelf()
return $this->load($this->_flagCode, 'flag_code');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Core/Model/Language.php b/app/code/core/Mage/Core/Model/Language.php
index 70d4a89ddf..9c74ef76ab 100644
--- a/app/code/core/Mage/Core/Model/Language.php
+++ b/app/code/core/Mage/Core/Model/Language.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
@@ -31,4 +31,4 @@ protected function _construct()
{
$this->_init('core/language');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Core/Model/Layout.php b/app/code/core/Mage/Core/Model/Layout.php
index 9ee4bc554e..7037d7c385 100644
--- a/app/code/core/Mage/Core/Model/Layout.php
+++ b/app/code/core/Mage/Core/Model/Layout.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
diff --git a/app/code/core/Mage/Core/Model/Layout/Data.php b/app/code/core/Mage/Core/Model/Layout/Data.php
index 29f58751af..0c58fcf15c 100644
--- a/app/code/core/Mage/Core/Model/Layout/Data.php
+++ b/app/code/core/Mage/Core/Model/Layout/Data.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
@@ -31,4 +31,4 @@ protected function _construct()
{
$this->_init('core/layout');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Core/Model/Layout/Element.php b/app/code/core/Mage/Core/Model/Layout/Element.php
index f8676767e5..352a9e87be 100644
--- a/app/code/core/Mage/Core/Model/Layout/Element.php
+++ b/app/code/core/Mage/Core/Model/Layout/Element.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
@@ -111,4 +111,4 @@ public function prepareActionArgument($args)
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Core/Model/Layout/Update.php b/app/code/core/Mage/Core/Model/Layout/Update.php
index 68abaddefc..f052963390 100644
--- a/app/code/core/Mage/Core/Model/Layout/Update.php
+++ b/app/code/core/Mage/Core/Model/Layout/Update.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
diff --git a/app/code/core/Mage/Core/Model/Locale.php b/app/code/core/Mage/Core/Model/Locale.php
index 9996482077..863e14220c 100644
--- a/app/code/core/Mage/Core/Model/Locale.php
+++ b/app/code/core/Mage/Core/Model/Locale.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
/**
@@ -757,14 +757,14 @@ public function getCountryTranslationList()
}
/**
- * Is Store dat in iterval
+ * Checks if current date of the given store (in the store timezone) is within the range
*
* @param int|string|Mage_Core_Model_Store $store
* @param string|null $dateFrom
* @param string|null $dateTo
* @return bool
*/
- public function IsStoreDateInInterval($store, $dateFrom = null, $dateTo = null)
+ public function isStoreDateInInterval($store, $dateFrom = null, $dateTo = null)
{
if (!$store instanceof Mage_Core_Model_Store) {
$store = Mage::app()->getStore($store);
diff --git a/app/code/core/Mage/Core/Model/Message.php b/app/code/core/Mage/Core/Model/Message.php
index 70b8e1f223..21267ea754 100644
--- a/app/code/core/Mage/Core/Model/Message.php
+++ b/app/code/core/Mage/Core/Model/Message.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
/**
@@ -79,4 +79,4 @@ public function success($code, $class='', $method='')
{
return $this->_factory($code, self::SUCCESS, $class, $method);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Core/Model/Message/Abstract.php b/app/code/core/Mage/Core/Model/Message/Abstract.php
index 2dba4b25b5..ddd5c7495e 100644
--- a/app/code/core/Mage/Core/Model/Message/Abstract.php
+++ b/app/code/core/Mage/Core/Model/Message/Abstract.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Core/Model/Message/Collection.php b/app/code/core/Mage/Core/Model/Message/Collection.php
index 0087b3c8ff..23d901dd46 100644
--- a/app/code/core/Mage/Core/Model/Message/Collection.php
+++ b/app/code/core/Mage/Core/Model/Message/Collection.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
/**
@@ -196,4 +196,4 @@ public function count($type=null)
}
return count($this->_messages);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Core/Model/Message/Error.php b/app/code/core/Mage/Core/Model/Message/Error.php
index 5f6823c29c..3f750850c2 100644
--- a/app/code/core/Mage/Core/Model/Message/Error.php
+++ b/app/code/core/Mage/Core/Model/Message/Error.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
diff --git a/app/code/core/Mage/Core/Model/Message/Notice.php b/app/code/core/Mage/Core/Model/Message/Notice.php
index 5fe7a807e2..94840307c8 100644
--- a/app/code/core/Mage/Core/Model/Message/Notice.php
+++ b/app/code/core/Mage/Core/Model/Message/Notice.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
@@ -31,4 +31,4 @@ public function __construct($code)
{
parent::__construct(Mage_Core_Model_Message::NOTICE, $code);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Core/Model/Message/Success.php b/app/code/core/Mage/Core/Model/Message/Success.php
index 0ad1331330..8d42140871 100644
--- a/app/code/core/Mage/Core/Model/Message/Success.php
+++ b/app/code/core/Mage/Core/Model/Message/Success.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
@@ -31,4 +31,4 @@ public function __construct($code)
{
parent::__construct(Mage_Core_Model_Message::SUCCESS, $code);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Core/Model/Message/Warning.php b/app/code/core/Mage/Core/Model/Message/Warning.php
index 001fe0ab31..ab2e340036 100644
--- a/app/code/core/Mage/Core/Model/Message/Warning.php
+++ b/app/code/core/Mage/Core/Model/Message/Warning.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
@@ -31,4 +31,4 @@ public function __construct($code)
{
parent::__construct(Mage_Core_Model_Message::WARNING, $code);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Abstract.php b/app/code/core/Mage/Core/Model/Mysql4/Abstract.php
index aed549d3cd..1ea958fe2e 100644
--- a/app/code/core/Mage/Core/Model/Mysql4/Abstract.php
+++ b/app/code/core/Mage/Core/Model/Mysql4/Abstract.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Collection/Abstract.php b/app/code/core/Mage/Core/Model/Mysql4/Collection/Abstract.php
index 16e8f2febc..21f0cd41d6 100644
--- a/app/code/core/Mage/Core/Model/Mysql4/Collection/Abstract.php
+++ b/app/code/core/Mage/Core/Model/Mysql4/Collection/Abstract.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
@@ -237,9 +237,9 @@ protected function _getCacheTags()
{
$tags = parent::_getCacheTags();
foreach ($tags as $key => $value) {
- $tags[$key] = Mage::app()->prepareCacheId($value);
+ $tags[$key] = Mage::app()->prepareCacheId($value);
}
$tags[] = Mage_Core_Model_App::CACHE_TAG;
return $tags;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Config.php b/app/code/core/Mage/Core/Model/Mysql4/Config.php
index 5f2780dfa2..66fa80e34e 100644
--- a/app/code/core/Mage/Core/Model/Mysql4/Config.php
+++ b/app/code/core/Mage/Core/Model/Mysql4/Config.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
@@ -230,4 +230,4 @@ public function deleteConfig($path, $scope, $scopeId)
));
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Config/Data.php b/app/code/core/Mage/Core/Model/Mysql4/Config/Data.php
index 7aab169eb2..356b33004b 100644
--- a/app/code/core/Mage/Core/Model/Mysql4/Config/Data.php
+++ b/app/code/core/Mage/Core/Model/Mysql4/Config/Data.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
@@ -38,4 +38,4 @@ protected function _beforeSave(Mage_Core_Model_Abstract $object)
$object->setValue(join(',', $object->getValue()));
}
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Config/Data/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Config/Data/Collection.php
index ead31ce3fd..386a20ed59 100644
--- a/app/code/core/Mage/Core/Model/Mysql4/Config/Data/Collection.php
+++ b/app/code/core/Mage/Core/Model/Mysql4/Config/Data/Collection.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
/**
@@ -59,4 +59,4 @@ public function addValueFilter($value)
$this->getSelect()->where('value=?', $value);
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Convert/History.php b/app/code/core/Mage/Core/Model/Mysql4/Convert/History.php
index 662927a558..3d527761af 100644
--- a/app/code/core/Mage/Core/Model/Mysql4/Convert/History.php
+++ b/app/code/core/Mage/Core/Model/Mysql4/Convert/History.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
/**
@@ -46,4 +46,4 @@ protected function _beforeSave(Mage_Core_Model_Abstract $object)
parent::_beforeSave($object);
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Convert/History/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Convert/History/Collection.php
index 84fd34e487..9d5d58a645 100644
--- a/app/code/core/Mage/Core/Model/Mysql4/Convert/History/Collection.php
+++ b/app/code/core/Mage/Core/Model/Mysql4/Convert/History/Collection.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
/**
@@ -38,4 +38,4 @@ protected function _construct()
$this->_init('core/convert_history');
parent::_construct();
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Convert/Profile.php b/app/code/core/Mage/Core/Model/Mysql4/Convert/Profile.php
index fc108da496..db110c6ead 100644
--- a/app/code/core/Mage/Core/Model/Mysql4/Convert/Profile.php
+++ b/app/code/core/Mage/Core/Model/Mysql4/Convert/Profile.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
/**
@@ -46,4 +46,4 @@ protected function _beforeSave(Mage_Core_Model_Abstract $object)
$object->setUpdatedAt($this->formatDate(time()));
parent::_beforeSave($object);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Convert/Profile/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Convert/Profile/Collection.php
index 5007f0bb25..b7686eb0d0 100644
--- a/app/code/core/Mage/Core/Model/Mysql4/Convert/Profile/Collection.php
+++ b/app/code/core/Mage/Core/Model/Mysql4/Convert/Profile/Collection.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
/**
@@ -37,4 +37,4 @@ protected function _construct()
{
$this->_init('core/convert_profile');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Design.php b/app/code/core/Mage/Core/Model/Mysql4/Design.php
index 42dd1e5648..21f45f8a7a 100644
--- a/app/code/core/Mage/Core/Model/Mysql4/Design.php
+++ b/app/code/core/Mage/Core/Model/Mysql4/Design.php
@@ -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_Core
+ * @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)
*/
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Design/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Design/Collection.php
index 31510016e1..4eb9e3265e 100644
--- a/app/code/core/Mage/Core/Model/Mysql4/Design/Collection.php
+++ b/app/code/core/Mage/Core/Model/Mysql4/Design/Collection.php
@@ -18,28 +18,28 @@
* 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_Core
+ * @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_Core_Model_Mysql4_Design_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract
{
- protected function _construct()
- {
- $this->_init('core/design');
- }
+ protected function _construct()
+ {
+ $this->_init('core/design');
+ }
- public function joinStore(){
- $this->getSelect()
+ public function joinStore(){
+ $this->getSelect()
->join(array('s'=>$this->getTable('core/store')), 's.store_id = main_table.store_id', array('s.name'));
- return $this;
- }
+ return $this;
+ }
- public function addDateFilter($date = null)
+ public function addDateFilter($date = null)
{
if (is_null($date))
$date = date("Y-m-d");
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Design/Package/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Design/Package/Collection.php
index 60e32ad581..2ce2389943 100644
--- a/app/code/core/Mage/Core/Model/Mysql4/Design/Package/Collection.php
+++ b/app/code/core/Mage/Core/Model/Mysql4/Design/Package/Collection.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
@@ -49,4 +49,4 @@ public function toOptionArray()
return $options;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Design/Theme/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Design/Theme/Collection.php
index f5769fa7a4..b01a43f8f7 100644
--- a/app/code/core/Mage/Core/Model/Mysql4/Design/Theme/Collection.php
+++ b/app/code/core/Mage/Core/Model/Mysql4/Design/Theme/Collection.php
@@ -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_Core
- * @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_Core
+ * @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_Core_Model_Mysql4_Design_Theme extends Varien_Directory_Collection
@@ -48,4 +48,4 @@ public function toOptionArray()
return $options;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Email/Template.php b/app/code/core/Mage/Core/Model/Mysql4/Email/Template.php
index dbdc2fd38f..188a1050e8 100644
--- a/app/code/core/Mage/Core/Model/Mysql4/Email/Template.php
+++ b/app/code/core/Mage/Core/Model/Mysql4/Email/Template.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
/**
@@ -176,8 +176,8 @@ protected function _prepareSave(Mage_Core_Model_Email_Template $template)
$data['template_sender_email'] = $template->getTemplateSenderEmail();
if(!$template->getAddedAt()) {
- $template->setAddedAt(Mage::getSingleton('core/date')->gmtDate());
- $template->setModifiedAt(Mage::getSingleton('core/date')->gmtDate());
+ $template->setAddedAt(Mage::getSingleton('core/date')->gmtDate());
+ $template->setModifiedAt(Mage::getSingleton('core/date')->gmtDate());
}
$data['modified_at'] = $template->getModifiedAt();
@@ -199,13 +199,13 @@ protected function _prepareSave(Mage_Core_Model_Email_Template $template)
$errorString = '';
foreach($validateInput->getMessages() as $message) {
- if(is_array($message)) {
- foreach($message as $str) {
- $errorString.= $str . "\n";
- }
- } else {
- $errorString.= $message . "\n";
- }
+ if(is_array($message)) {
+ foreach($message as $str) {
+ $errorString.= $str . "\n";
+ }
+ } else {
+ $errorString.= $message . "\n";
+ }
}
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Email/Template/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Email/Template/Collection.php
index 4bf4fe4d0d..92e9a4a5bd 100644
--- a/app/code/core/Mage/Core/Model/Mysql4/Email/Template/Collection.php
+++ b/app/code/core/Mage/Core/Model/Mysql4/Email/Template/Collection.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
/**
@@ -58,4 +58,4 @@ public function toOptionArray()
return $this->_toOptionArray('template_id', 'template_code');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Flag.php b/app/code/core/Mage/Core/Model/Mysql4/Flag.php
index 32ef78ff79..6d6ef5c7de 100644
--- a/app/code/core/Mage/Core/Model/Mysql4/Flag.php
+++ b/app/code/core/Mage/Core/Model/Mysql4/Flag.php
@@ -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_Core
- * @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_Core
+ * @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_Core_Model_Mysql4_Flag extends Mage_Core_Model_Mysql4_Abstract
@@ -30,4 +30,4 @@ protected function _construct()
{
$this->_init('core/flag', 'flag_id');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Core/Model/Mysql4/History.php b/app/code/core/Mage/Core/Model/Mysql4/History.php
index af67c9f18e..f83760255f 100644
--- a/app/code/core/Mage/Core/Model/Mysql4/History.php
+++ b/app/code/core/Mage/Core/Model/Mysql4/History.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
/**
@@ -62,4 +62,4 @@ public function addChanges($code, $userId, $data)
{
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Language.php b/app/code/core/Mage/Core/Model/Mysql4/Language.php
index 6d3d258429..ff2ba4d501 100644
--- a/app/code/core/Mage/Core/Model/Mysql4/Language.php
+++ b/app/code/core/Mage/Core/Model/Mysql4/Language.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
@@ -31,4 +31,4 @@ protected function _construct()
{
$this->_init('core/language', 'language_code');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Language/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Language/Collection.php
index 40fa34cabd..54b172f3ef 100644
--- a/app/code/core/Mage/Core/Model/Mysql4/Language/Collection.php
+++ b/app/code/core/Mage/Core/Model/Mysql4/Language/Collection.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
@@ -41,4 +41,4 @@ public function toOptionHash()
{
return $this->_toOptionHash('language_code', 'language_title');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Layout.php b/app/code/core/Mage/Core/Model/Mysql4/Layout.php
index 049ea8ec34..10387a5d8e 100644
--- a/app/code/core/Mage/Core/Model/Mysql4/Layout.php
+++ b/app/code/core/Mage/Core/Model/Mysql4/Layout.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
@@ -51,10 +51,11 @@ public function fetchUpdatesByHandle($handle, $params = array())
$select = $readAdapter->select()
->from(array('update'=>$this->getMainTable()), array('xml'))
->join(array('link'=>$this->getTable('core/layout_link')), 'link.layout_update_id=update.layout_update_id', '')
- ->where('link.store_id=?', $storeId)
+ ->where('link.store_id IN (0, ?)', $storeId)
->where('link.package=?', $package)
->where('link.theme=?', $theme)
- ->where('update.handle = ?', $handle);
+ ->where('update.handle = ?', $handle)
+ ->order('update.sort_order ASC');
foreach ($readAdapter->fetchAll($select) as $update) {
$updateStr .= $update['xml'];
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Resource.php b/app/code/core/Mage/Core/Model/Mysql4/Resource.php
index 59dfacb1d1..fbb9241b16 100644
--- a/app/code/core/Mage/Core/Model/Mysql4/Resource.php
+++ b/app/code/core/Mage/Core/Model/Mysql4/Resource.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
#require_once 'Mage/Core/Model/Mysql4.php';
@@ -84,12 +84,12 @@ function setDbVersion($resName, $version)
if ($this -> getDbVersion($resName)) {
self::$_versions[$resName] = $version;
- $condition = $this->_write->quoteInto('code=?', $resName);
- return $this->_write->update($this->_resTable, $dbModuleInfo, $condition);
+ $condition = $this->_write->quoteInto('code=?', $resName);
+ return $this->_write->update($this->_resTable, $dbModuleInfo, $condition);
}
else {
self::$_versions[$resName] = $version;
- return $this->_write->insert($this->_resTable, $dbModuleInfo);
+ return $this->_write->insert($this->_resTable, $dbModuleInfo);
}
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Session.php b/app/code/core/Mage/Core/Model/Mysql4/Session.php
index af05d7a7a7..8adeaa7bf1 100644
--- a/app/code/core/Mage/Core/Model/Mysql4/Session.php
+++ b/app/code/core/Mage/Core/Model/Mysql4/Session.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Store.php b/app/code/core/Mage/Core/Model/Mysql4/Store.php
index eabfb3e442..a6c672392d 100644
--- a/app/code/core/Mage/Core/Model/Mysql4/Store.php
+++ b/app/code/core/Mage/Core/Model/Mysql4/Store.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
@@ -116,4 +116,4 @@ protected function _getLoadSelect($field, $value, $object)
return $select;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Store/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Store/Collection.php
index c6ad7e0b60..2e643d428c 100644
--- a/app/code/core/Mage/Core/Model/Mysql4/Store/Collection.php
+++ b/app/code/core/Mage/Core/Model/Mysql4/Store/Collection.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
/**
@@ -166,4 +166,4 @@ public function addRootCategoryIdAttribute()
);
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Store/Group.php b/app/code/core/Mage/Core/Model/Mysql4/Store/Group.php
index 9f8b237b49..76878d925b 100644
--- a/app/code/core/Mage/Core/Model/Mysql4/Store/Group.php
+++ b/app/code/core/Mage/Core/Model/Mysql4/Store/Group.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
/**
@@ -98,4 +98,4 @@ protected function _saveDefaultStore($groupId, $storeId)
$this->_getWriteAdapter()->update($this->getMainTable(), $bind, $condition);
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Store/Group/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Store/Group/Collection.php
index 2e25340d29..6ae3486b2a 100644
--- a/app/code/core/Mage/Core/Model/Mysql4/Store/Group/Collection.php
+++ b/app/code/core/Mage/Core/Model/Mysql4/Store/Group/Collection.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Translate.php b/app/code/core/Mage/Core/Model/Mysql4/Translate.php
index 14da5e51f1..7702826bcb 100644
--- a/app/code/core/Mage/Core/Model/Mysql4/Translate.php
+++ b/app/code/core/Mage/Core/Model/Mysql4/Translate.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Translate/String.php b/app/code/core/Mage/Core/Model/Mysql4/Translate/String.php
index 3f036a7b58..314dc75f9a 100644
--- a/app/code/core/Mage/Core/Model/Mysql4/Translate/String.php
+++ b/app/code/core/Mage/Core/Model/Mysql4/Translate/String.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
/**
@@ -50,7 +50,7 @@ public function load(Mage_Core_Model_Abstract $object, $value, $field=null)
return $result;
}
else {
- return parent::load($object, $value, $field);
+ return parent::load($object, $value, $field);
}
}
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Url/Rewrite.php b/app/code/core/Mage/Core/Model/Mysql4/Url/Rewrite.php
index b963717606..dd61457f1a 100644
--- a/app/code/core/Mage/Core/Model/Mysql4/Url/Rewrite.php
+++ b/app/code/core/Mage/Core/Model/Mysql4/Url/Rewrite.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Url/Rewrite/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Url/Rewrite/Collection.php
index 03d528965a..31539af2b0 100644
--- a/app/code/core/Mage/Core/Model/Mysql4/Url/Rewrite/Collection.php
+++ b/app/code/core/Mage/Core/Model/Mysql4/Url/Rewrite/Collection.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
@@ -98,4 +98,4 @@ public function filterAllByCategory()
->where('id_path like ?', "category%");
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Website.php b/app/code/core/Mage/Core/Model/Mysql4/Website.php
index e99b898ef4..b36ccfaf20 100644
--- a/app/code/core/Mage/Core/Model/Mysql4/Website.php
+++ b/app/code/core/Mage/Core/Model/Mysql4/Website.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
@@ -115,4 +115,4 @@ public function getDefaultStoresSelect($withDefault = false) {
return $select;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Core/Model/Mysql4/Website/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Website/Collection.php
index 3923ccabe9..97657b1e0c 100644
--- a/app/code/core/Mage/Core/Model/Mysql4/Website/Collection.php
+++ b/app/code/core/Mage/Core/Model/Mysql4/Website/Collection.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Core/Model/Resource.php b/app/code/core/Mage/Core/Model/Resource.php
index d93a9ee277..7012c6b7b8 100644
--- a/app/code/core/Mage/Core/Model/Resource.php
+++ b/app/code/core/Mage/Core/Model/Resource.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
@@ -60,7 +60,7 @@ class Mage_Core_Model_Resource
* @var array
*/
protected $_entities = array();
-
+
protected $_mappedTableNames;
/**
@@ -161,14 +161,14 @@ public function getTableName($modelEntity)
} else {
$tableName = $modelEntity;
}
-
+
Mage::dispatchEvent('resource_get_tablename', array('resource' => $this, 'model_entity' => $modelEntity, 'table_name' => $tableName));
$mappedTableName = $this->getMappedTableName($tableName);
if ($mappedTableName) {
- $tableName = $mappedTableName;
+ $tableName = $mappedTableName;
} else {
- $tablePrefix = (string)Mage::getConfig()->getTablePrefix();
- $tableName = $tablePrefix . $tableName;
+ $tablePrefix = (string)Mage::getConfig()->getTablePrefix();
+ $tableName = $tablePrefix . $tableName;
}
return $tableName;
@@ -176,19 +176,19 @@ public function getTableName($modelEntity)
public function setMappedTableName($tableName, $mappedName)
{
- $this->_mappedTableNames[$tableName] = $mappedName;
- return $this;
+ $this->_mappedTableNames[$tableName] = $mappedName;
+ return $this;
}
-
+
public function getMappedTableName($tableName)
{
- if (isset($this->_mappedTableNames[$tableName])) {
- return $this->_mappedTableNames[$tableName];
- } else {
- return false;
- }
+ if (isset($this->_mappedTableNames[$tableName])) {
+ return $this->_mappedTableNames[$tableName];
+ } else {
+ return false;
+ }
}
-
+
public function cleanDbRow(&$row)
{
if (!empty($row) && is_array($row)) {
@@ -212,9 +212,9 @@ public function createConnection($name, $type, $config)
public function checkDbConnection()
{
- if (!$this->getConnection('core_read')) {
- //Mage::app()->getResponse()->setRedirect(Mage::getUrl('install'));
- }
+ if (!$this->getConnection('core_read')) {
+ //Mage::app()->getResponse()->setRedirect(Mage::getUrl('install'));
+ }
}
public function getAutoUpdate()
diff --git a/app/code/core/Mage/Core/Model/Resource/Abstract.php b/app/code/core/Mage/Core/Model/Resource/Abstract.php
index 3d8aae0474..56dd5bb45d 100644
--- a/app/code/core/Mage/Core/Model/Resource/Abstract.php
+++ b/app/code/core/Mage/Core/Model/Resource/Abstract.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
/**
@@ -104,9 +104,9 @@ public function formatDate($date, $includeTime=true)
}
}
- if (empty($date)) {
- return new Zend_Db_Expr('NULL');
- }
+ if (empty($date)) {
+ return new Zend_Db_Expr('NULL');
+ }
if (!is_numeric($date)) {
$date = strtotime($date);
diff --git a/app/code/core/Mage/Core/Model/Resource/Entity/Abstract.php b/app/code/core/Mage/Core/Model/Resource/Entity/Abstract.php
index 291c3f451a..1d66204756 100644
--- a/app/code/core/Mage/Core/Model/Resource/Entity/Abstract.php
+++ b/app/code/core/Mage/Core/Model/Resource/Entity/Abstract.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
@@ -29,20 +29,20 @@ abstract class Mage_Core_Model_Resource_Entity_Abstract
{
protected $_name = null;
protected $_config = array();
-
+
public function __construct($config)
{
$this->_config = $config;
}
-
+
public function getConfig($key='')
{
if (''===$key) {
- return $this->_config;
+ return $this->_config;
} elseif (isset($this->_config->$key)) {
- return $this->_config->$key;
+ return $this->_config->$key;
} else {
return false;
}
- }
-}
\ No newline at end of file
+ }
+}
diff --git a/app/code/core/Mage/Core/Model/Resource/Entity/Table.php b/app/code/core/Mage/Core/Model/Resource/Entity/Table.php
index e0a8a9dccc..c6f21e4f4e 100644
--- a/app/code/core/Mage/Core/Model/Resource/Entity/Table.php
+++ b/app/code/core/Mage/Core/Model/Resource/Entity/Table.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
@@ -35,4 +35,4 @@ function getTable()
{
return $this->getConfig('table');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Core/Model/Resource/Iterator.php b/app/code/core/Mage/Core/Model/Resource/Iterator.php
index 9420a3b423..c7c6c4e463 100644
--- a/app/code/core/Mage/Core/Model/Resource/Iterator.php
+++ b/app/code/core/Mage/Core/Model/Resource/Iterator.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
/**
@@ -86,4 +86,4 @@ protected function _getStatement($query, $conn=null)
Mage::throwException($hlp->__('Invalid query'));
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Core/Model/Resource/Setup.php b/app/code/core/Mage/Core/Model/Resource/Setup.php
index b3b2e3902f..aefdb45f01 100644
--- a/app/code/core/Mage/Core/Model/Resource/Setup.php
+++ b/app/code/core/Mage/Core/Model/Resource/Setup.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
/**
@@ -63,7 +63,7 @@ public function __construct($resourceName)
} else {
$this->_connectionConfig = $config->getResourceConnectionConfig(self::DEFAULT_SETUP_CONNECTION);
}
-
+
$modName = (string)$this->_resourceConfig->setup->module;
$this->_moduleConfig = $config->getModuleConfig($modName);
$this->_conn = Mage::getSingleton('core/resource')->getConnection($this->_resourceName);
@@ -388,7 +388,6 @@ public function getTableRow($table, $idField, $id, $field=null, $parentField=nul
$sql .= $this->_conn->quoteInto(" and $parentField=?", $parentId);
}
$this->_setupCache[$table][$parentId][$id] = $this->_conn->fetchRow($sql, $id);
- $this->_conn->fetchAll($sql, $id);
}
if (is_null($field)) {
return $this->_setupCache[$table][$parentId][$id];
@@ -561,4 +560,4 @@ public function endSetup()
");
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Core/Model/Resource/Transaction.php b/app/code/core/Mage/Core/Model/Resource/Transaction.php
index e0e734b4bd..848bea9b68 100644
--- a/app/code/core/Mage/Core/Model/Resource/Transaction.php
+++ b/app/code/core/Mage/Core/Model/Resource/Transaction.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
diff --git a/app/code/core/Mage/Core/Model/Resource/Type/Abstract.php b/app/code/core/Mage/Core/Model/Resource/Type/Abstract.php
index d8689298b2..e0642ea42c 100644
--- a/app/code/core/Mage/Core/Model/Resource/Type/Abstract.php
+++ b/app/code/core/Mage/Core/Model/Resource/Type/Abstract.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
@@ -32,16 +32,16 @@ abstract class Mage_Core_Model_Resource_Type_Abstract
public function getEntityClass()
{
- return $this->_entityClass;
+ return $this->_entityClass;
}
-
+
public function setName($name)
{
$this->_name = $name;
}
-
+
public function getName()
{
return $this->_name;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Core/Model/Resource/Type/Db.php b/app/code/core/Mage/Core/Model/Resource/Type/Db.php
index a15296b65b..4297bb7f52 100644
--- a/app/code/core/Mage/Core/Model/Resource/Type/Db.php
+++ b/app/code/core/Mage/Core/Model/Resource/Type/Db.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
@@ -31,4 +31,4 @@ public function __construct()
{
$this->_entityClass = 'Mage_Core_Model_Resource_Entity_Table';
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Core/Model/Resource/Type/Db/Mysqli.php b/app/code/core/Mage/Core/Model/Resource/Type/Db/Mysqli.php
index bf7fdd9053..c285a3c4a7 100644
--- a/app/code/core/Mage/Core/Model/Resource/Type/Db/Mysqli.php
+++ b/app/code/core/Mage/Core/Model/Resource/Type/Db/Mysqli.php
@@ -18,16 +18,16 @@
* 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_Core
- * @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_Core
+ * @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)
*/
/**
* Mysqi Resource
- *
+ *
* @category Mage
* @package Mage_Core
* @module Core
@@ -36,15 +36,15 @@ class Mage_Core_Model_Resource_Type_Db_Mysqli extends Mage_Core_Model_Resource_T
{
public function getConnection($config)
{
- $configArr = (array)$config;
- $configArr['profiler'] = !empty($configArr['profiler']) && $configArr['profiler']!=='false';
-
+ $configArr = (array)$config;
+ $configArr['profiler'] = !empty($configArr['profiler']) && $configArr['profiler']!=='false';
+
$conn = new Varien_Db_Adapter_Mysqli($configArr);
-
+
if (!empty($configArr['initStatements']) && $conn) {
$conn->query($configArr['initStatements']);
}
return $conn;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Core/Model/Resource/Type/Db/Mysqli/Setup.php b/app/code/core/Mage/Core/Model/Resource/Type/Db/Mysqli/Setup.php
index 6e288921d7..fd846662f2 100644
--- a/app/code/core/Mage/Core/Model/Resource/Type/Db/Mysqli/Setup.php
+++ b/app/code/core/Mage/Core/Model/Resource/Type/Db/Mysqli/Setup.php
@@ -18,19 +18,19 @@
* 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_Core
- * @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_Core
+ * @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_Core_Model_Resource_Type_Db_Mysqli_Setup extends Mage_Core_Model_Resource_Type_Db
{
- public function getConnection($config)
- {
- $conn = new Varien_Db_Adapter_Mysqli((array)$config);
+ public function getConnection($config)
+ {
+ $conn = new Varien_Db_Adapter_Mysqli((array)$config);
- return $conn;
- }
-}
\ No newline at end of file
+ return $conn;
+ }
+}
diff --git a/app/code/core/Mage/Core/Model/Resource/Type/Db/Pdo/Mysql.php b/app/code/core/Mage/Core/Model/Resource/Type/Db/Pdo/Mysql.php
index 0220ccaab5..bf546262ca 100644
--- a/app/code/core/Mage/Core/Model/Resource/Type/Db/Pdo/Mysql.php
+++ b/app/code/core/Mage/Core/Model/Resource/Type/Db/Pdo/Mysql.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
@@ -36,8 +36,8 @@ class Mage_Core_Model_Resource_Type_Db_Pdo_Mysql extends Mage_Core_Model_Resourc
*/
public function getConnection($config)
{
- $configArr = (array)$config;
- $configArr['profiler'] = !empty($configArr['profiler']) && $configArr['profiler']!=='false';
+ $configArr = (array)$config;
+ $configArr['profiler'] = !empty($configArr['profiler']) && $configArr['profiler']!=='false';
$conn = $this->_getDbAdapterInstance($configArr);
diff --git a/app/code/core/Mage/Core/Model/Session.php b/app/code/core/Mage/Core/Model/Session.php
index 3a0d9b0738..453b416a0f 100644
--- a/app/code/core/Mage/Core/Model/Session.php
+++ b/app/code/core/Mage/Core/Model/Session.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
diff --git a/app/code/core/Mage/Core/Model/Session/Abstract.php b/app/code/core/Mage/Core/Model/Session/Abstract.php
index 2eae9de460..740bf4ba14 100644
--- a/app/code/core/Mage/Core/Model/Session/Abstract.php
+++ b/app/code/core/Mage/Core/Model/Session/Abstract.php
@@ -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_Core
- * @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)
+ * @category Mage
+ * @package Mage_Core
+ * @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)
*/
@@ -44,6 +44,7 @@ class Mage_Core_Model_Session_Abstract extends Mage_Core_Model_Session_Abstract_
const XML_PATH_USE_HTTP_VIA = 'web/session/use_http_via';
const XML_PATH_USE_X_FORWARDED = 'web/session/use_http_x_forwarded_for';
const XML_PATH_USE_USER_AGENT = 'web/session/use_http_user_agent';
+ const XML_PATH_USE_FRONTEND_SID = 'web/session/use_frontend_sid';
const XML_NODE_USET_AGENT_SKIP = 'global/session/validation/http_user_agent_skip';
const XML_PATH_LOG_EXCEPTION_FILE = 'dev/log/exception_file';
@@ -171,6 +172,17 @@ public function useValidateHttpUserAgent()
return (bool)$use;
}
+ /**
+ * Check whether SID can be used for session initialization
+ * Admin area will always have this feature enabled
+ *
+ * @return bool
+ */
+ public function useSid()
+ {
+ return Mage::app()->getStore()->isAdmin() || Mage::getStoreConfig(self::XML_PATH_USE_FRONTEND_SID);
+ }
+
/**
* Retrieve skip User Agent validation strings (Flash etc)
*
@@ -311,7 +323,7 @@ public function addMessages($messages)
*/
public function setSessionId($id=null)
{
- if (is_null($id)) {
+ if (is_null($id) && $this->useSid()) {
$_queryParam = $this->getSessionIdQueryParam();
if (isset($_GET[$_queryParam])) {
$id = $_GET[$_queryParam];
diff --git a/app/code/core/Mage/Core/Model/Session/Abstract/Varien.php b/app/code/core/Mage/Core/Model/Session/Abstract/Varien.php
index 36961c55e2..72bbcfadbc 100644
--- a/app/code/core/Mage/Core/Model/Session/Abstract/Varien.php
+++ b/app/code/core/Mage/Core/Model/Session/Abstract/Varien.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
diff --git a/app/code/core/Mage/Core/Model/Session/Abstract/Zend.php b/app/code/core/Mage/Core/Model/Session/Abstract/Zend.php
index cc989d9585..bc3bf7fc50 100644
--- a/app/code/core/Mage/Core/Model/Session/Abstract/Zend.php
+++ b/app/code/core/Mage/Core/Model/Session/Abstract/Zend.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
/**
@@ -42,24 +42,24 @@ abstract class Mage_Core_Model_Session_Abstract_Zend extends Varien_Object
public function getNamespace()
{
- return $this->_namespace;
+ return $this->_namespace;
}
public function start()
{
Varien_Profiler::start(__METHOD__.'/setOptions');
$options = array(
- 'save_path'=>Mage::getBaseDir('session'),
- 'use_only_cookies'=>'off',
+ 'save_path'=>Mage::getBaseDir('session'),
+ 'use_only_cookies'=>'off',
);
if ($this->getCookieDomain()) {
- $options['cookie_domain'] = $this->getCookieDomain();
+ $options['cookie_domain'] = $this->getCookieDomain();
}
if ($this->getCookiePath()) {
- $options['cookie_path'] = $this->getCookiePath();
+ $options['cookie_path'] = $this->getCookiePath();
}
if ($this->getCookieLifetime()) {
- $options['cookie_lifetime'] = $this->getCookieLifetime();
+ $options['cookie_lifetime'] = $this->getCookieLifetime();
}
Zend_Session::setOptions($options);
Varien_Profiler::stop(__METHOD__.'/setOptions');
@@ -67,7 +67,7 @@ public function start()
Varien_Profiler::start(__METHOD__.'/setHandler');
$sessionResource = Mage::getResourceSingleton('core/session');
if ($sessionResource->hasConnection()) {
- Zend_Session::setSaveHandler($sessionResource);
+ Zend_Session::setSaveHandler($sessionResource);
}
Varien_Profiler::stop(__METHOD__.'/setHandler');
*/
@@ -85,9 +85,9 @@ public function start()
*/
public function init($namespace)
{
- if (!Zend_Session::sessionExists()) {
- $this->start();
- }
+ if (!Zend_Session::sessionExists()) {
+ $this->start();
+ }
Varien_Profiler::start(__METHOD__.'/init');
$this->_namespace = new Zend_Session_Namespace($namespace, Zend_Session_Namespace::SINGLE_INSTANCE);
@@ -161,4 +161,4 @@ public function setSessionId($id=null)
}
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Core/Model/Session/Exception.php b/app/code/core/Mage/Core/Model/Session/Exception.php
index a5e3bb010d..d2d5f2180b 100644
--- a/app/code/core/Mage/Core/Model/Session/Exception.php
+++ b/app/code/core/Mage/Core/Model/Session/Exception.php
@@ -1,38 +1,38 @@
-
- */
-class Mage_Core_Model_Session_Exception extends Mage_Core_Exception
-{}
+
+ */
+class Mage_Core_Model_Session_Exception extends Mage_Core_Exception
+{}
diff --git a/app/code/core/Mage/Core/Model/Store.php b/app/code/core/Mage/Core/Model/Store.php
index 529969f4f4..785ba1d102 100644
--- a/app/code/core/Mage/Core/Model/Store.php
+++ b/app/code/core/Mage/Core/Model/Store.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
@@ -493,10 +493,10 @@ public function isAdmin()
public function isAdminUrlSecure()
{
if ($this->_isAdminSecure === null) {
- $this->_isAdminSecure = Mage::getStoreConfigFlag(
- Mage_Core_Model_Url::XML_PATH_SECURE_IN_ADMIN,
- $this->getId()
- );
+ $this->_isAdminSecure = Mage::getStoreConfigFlag(
+ Mage_Core_Model_Url::XML_PATH_SECURE_IN_ADMIN,
+ $this->getId()
+ );
}
return $this->_isAdminSecure;
}
@@ -504,10 +504,10 @@ public function isAdminUrlSecure()
public function isFrontUrlSecure()
{
if ($this->_isFrontSecure === null) {
- $this->_isFrontSecure = Mage::getStoreConfigFlag(
- Mage_Core_Model_Url::XML_PATH_SECURE_IN_FRONT,
- $this->getId()
- );
+ $this->_isFrontSecure = Mage::getStoreConfigFlag(
+ Mage_Core_Model_Url::XML_PATH_SECURE_IN_FRONT,
+ $this->getId()
+ );
}
return $this->_isFrontSecure;
}
@@ -841,9 +841,9 @@ public function getCurrentUrl($fromStore = true)
$query = Mage::getSingleton('core/url')->escape(ltrim(Mage::app()->getRequest()->getRequestString(), '/'));
if (Mage::app()->getStore()->isCurrentlySecure()) {
- $parsedUrl = parse_url($this->getUrl('', array('_secure' => true)));
+ $parsedUrl = parse_url($this->getUrl('', array('_secure' => true)));
} else {
- $parsedUrl = parse_url($this->getUrl(''));
+ $parsedUrl = parse_url($this->getUrl(''));
}
$parsedQuery = array();
if (isset($parsedUrl['query'])) {
@@ -897,9 +897,9 @@ protected function _beforeDelete()
*
* @return Mage_Core_Model_Store
*/
- protected function _afterDelte()
+ protected function _afterDelete()
{
- parent::_afterDelte();
+ parent::_afterDelete();
Mage::getConfig()->removeCache();
return $this;
}
diff --git a/app/code/core/Mage/Core/Model/Store/Exception.php b/app/code/core/Mage/Core/Model/Store/Exception.php
index 3e4df90d34..5e6bb4f60d 100644
--- a/app/code/core/Mage/Core/Model/Store/Exception.php
+++ b/app/code/core/Mage/Core/Model/Store/Exception.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
diff --git a/app/code/core/Mage/Core/Model/Store/Group.php b/app/code/core/Mage/Core/Model/Store/Group.php
index fb91ce24f0..e0d4d4e78b 100644
--- a/app/code/core/Mage/Core/Model/Store/Group.php
+++ b/app/code/core/Mage/Core/Model/Store/Group.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Core/Model/Translate.php b/app/code/core/Mage/Core/Model/Translate.php
index 2099e51bb8..d0db6d1628 100644
--- a/app/code/core/Mage/Core/Model/Translate.php
+++ b/app/code/core/Mage/Core/Model/Translate.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Core/Model/Translate/Abstract.php b/app/code/core/Mage/Core/Model/Translate/Abstract.php
index 2cc2dfea61..78b2ae7b8b 100644
--- a/app/code/core/Mage/Core/Model/Translate/Abstract.php
+++ b/app/code/core/Mage/Core/Model/Translate/Abstract.php
@@ -18,8 +18,8 @@
* 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_Core
- * @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_Core
+ * @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)
*/
diff --git a/app/code/core/Mage/Core/Model/Translate/Expr.php b/app/code/core/Mage/Core/Model/Translate/Expr.php
index beeb088dc3..1ce97c2117 100644
--- a/app/code/core/Mage/Core/Model/Translate/Expr.php
+++ b/app/code/core/Mage/Core/Model/Translate/Expr.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Core/Model/Translate/Inline.php b/app/code/core/Mage/Core/Model/Translate/Inline.php
index 7bec912c31..8ca144c992 100644
--- a/app/code/core/Mage/Core/Model/Translate/Inline.php
+++ b/app/code/core/Mage/Core/Model/Translate/Inline.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
diff --git a/app/code/core/Mage/Core/Model/Translate/String.php b/app/code/core/Mage/Core/Model/Translate/String.php
index 8039c16dd7..dc0548dcc3 100644
--- a/app/code/core/Mage/Core/Model/Translate/String.php
+++ b/app/code/core/Mage/Core/Model/Translate/String.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Core/Model/Url.php b/app/code/core/Mage/Core/Model/Url.php
index a60389d962..78bbef7deb 100644
--- a/app/code/core/Mage/Core/Model/Url.php
+++ b/app/code/core/Mage/Core/Model/Url.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
/**
@@ -978,4 +978,4 @@ public function sessionVarCallback($match)
}
return '';
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Core/Model/Url/Rewrite.php b/app/code/core/Mage/Core/Model/Url/Rewrite.php
index b3af300f32..ebdf32e151 100644
--- a/app/code/core/Mage/Core/Model/Url/Rewrite.php
+++ b/app/code/core/Mage/Core/Model/Url/Rewrite.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
@@ -84,12 +84,12 @@ public function loadByRequestPath($path)
foreach ($path as $pathInfo) {
$this->load($pathInfo, 'request_path');
if ($this->getId()) {
- return $this;
+ return $this;
}
}
}
else {
- $this->load($path, 'request_path');
+ $this->load($path, 'request_path');
}
return $this;
}
@@ -266,7 +266,7 @@ public function rewrite(Zend_Controller_Request_Http $request=null, Zend_Control
}
if ($queryString = $this->_getQueryString()) {
- $targetUrl .= '?'.$queryString;
+ $targetUrl .= '?'.$queryString;
}
$request->setRequestUri($targetUrl);
diff --git a/app/code/core/Mage/Core/Model/Website.php b/app/code/core/Mage/Core/Model/Website.php
index d64570bce4..f4cc38aac7 100644
--- a/app/code/core/Mage/Core/Model/Website.php
+++ b/app/code/core/Mage/Core/Model/Website.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Core/controllers/AjaxController.php b/app/code/core/Mage/Core/controllers/AjaxController.php
index 0ea0d174a7..19a1fb4f62 100644
--- a/app/code/core/Mage/Core/controllers/AjaxController.php
+++ b/app/code/core/Mage/Core/controllers/AjaxController.php
@@ -1,4 +1,4 @@
-getRequest()->getPost('translate')) {
- try {
- if ($area = $this->getRequest()->getPost('area')) {
- Mage::getDesign()->setArea($area);
- }
- Mage::getModel('core/translate_inline')->processAjaxPost($translate);
- echo "{success:true}";
- }
- catch (Exception $e) {
- echo "{error:true,message:'" . $e->getMessage() . "'}";
- }
- }
- exit();
- }
+ * @category Mage
+ * @package Mage_Core
+ * @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_Core_AjaxController extends Mage_Core_Controller_Front_Action
+{
+ public function translateAction ()
+ {
+ if ($translate = $this->getRequest()->getPost('translate')) {
+ try {
+ if ($area = $this->getRequest()->getPost('area')) {
+ Mage::getDesign()->setArea($area);
+ }
+ Mage::getModel('core/translate_inline')->processAjaxPost($translate);
+ echo "{success:true}";
+ }
+ catch (Exception $e) {
+ echo "{error:true,message:'" . $e->getMessage() . "'}";
+ }
+ }
+ exit();
+ }
}
diff --git a/app/code/core/Mage/Core/controllers/IndexController.php b/app/code/core/Mage/Core/controllers/IndexController.php
index fffbd95901..22c8bde3d4 100644
--- a/app/code/core/Mage/Core/controllers/IndexController.php
+++ b/app/code/core/Mage/Core/controllers/IndexController.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
diff --git a/app/code/core/Mage/Core/etc/config.xml b/app/code/core/Mage/Core/etc/config.xml
index 82a29cf4d4..c6166bfca1 100644
--- a/app/code/core/Mage/Core/etc/config.xml
+++ b/app/code/core/Mage/Core/etc/config.xml
@@ -19,16 +19,16 @@
* 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_Core
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ * @category Mage
+ * @package Mage_Core
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
- 0.8.13
+ 0.8.14
@@ -251,13 +251,14 @@
0
0
0
+ 1
1
1
-
+
diff --git a/app/code/core/Mage/Core/etc/system.xml b/app/code/core/Mage/Core/etc/system.xml
index 81c43ac546..c812bff435 100644
--- a/app/code/core/Mage/Core/etc/system.xml
+++ b/app/code/core/Mage/Core/etc/system.xml
@@ -19,10 +19,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_Core
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ * @category Mage
+ * @package Mage_Core
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
@@ -507,7 +507,7 @@
1
1
1
- Logging from Mage::log(). File is located in {{base_dir}}/var/log
+ Logging from Mage::log(). File is located in {{base_dir}}/var/log
@@ -516,7 +516,7 @@
1
1
1
- Logging from Mage::logException(). File is located in {{base_dir}}/var/log
+ Logging from Mage::logException(). File is located in {{base_dir}}/var/log
@@ -1136,6 +1136,16 @@
0
0
+
+
+ Allows Customers to stay logged in when switching between different Stores.
+ select
+ adminhtml/system_config_source_yesno
+ 50
+ 1
+ 1
+ 0
+
@@ -1156,7 +1166,7 @@
1
-
+
select
adminhtml/system_config_source_yesno
200
diff --git a/app/code/core/Mage/Core/functions.php b/app/code/core/Mage/Core/functions.php
index 1c50b92430..725c39ff45 100644
--- a/app/code/core/Mage/Core/functions.php
+++ b/app/code/core/Mage/Core/functions.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-install-0.7.0.php
index 37ad4ea2ea..0fe0ef6f99 100644
--- a/app/code/core/Mage/Core/sql/core_setup/mysql4-install-0.7.0.php
+++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-install-0.7.0.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-install-0.8.0.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-install-0.8.0.php
index a3dde857fa..7f475c7c48 100644
--- a/app/code/core/Mage/Core/sql/core_setup/mysql4-install-0.8.0.php
+++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-install-0.8.0.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
$installer = $this;
@@ -219,4 +219,4 @@
");
-$installer->endSetup();
\ No newline at end of file
+$installer->endSetup();
diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.6.26-0.7.0.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.6.26-0.7.0.php
index 1f13778894..d1d7c55777 100644
--- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.6.26-0.7.0.php
+++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.6.26-0.7.0.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.1-0.7.2.php
index 818dbc531a..082918c13d 100644
--- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.1-0.7.2.php
+++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.1-0.7.2.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.2-0.7.3.php
index 88cb33e949..f4c13c0f16 100644
--- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.2-0.7.3.php
+++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.2-0.7.3.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.3-0.7.4.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.3-0.7.4.php
index 6d30ee82a3..bfa1b8270f 100644
--- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.3-0.7.4.php
+++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.3-0.7.4.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.4-0.7.5.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.4-0.7.5.php
index 509cd1ce15..3105752244 100644
--- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.4-0.7.5.php
+++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.4-0.7.5.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.5-0.7.6.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.5-0.7.6.php
index dc282e1016..51d04c1e8f 100644
--- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.5-0.7.6.php
+++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.5-0.7.6.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.6-0.7.7.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.6-0.7.7.php
index 9dbe562f6c..76b530aca8 100644
--- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.6-0.7.7.php
+++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.6-0.7.7.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.7-0.7.8.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.7-0.7.8.php
index aa91b02def..8a0d87eb1d 100644
--- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.7-0.7.8.php
+++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.7-0.7.8.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.8-0.7.9.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.8-0.7.9.php
index 9416c7ff80..de596dbc3e 100644
--- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.8-0.7.9.php
+++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.8-0.7.9.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.0-0.8.1.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.0-0.8.1.php
index 3b0db45375..fef7b81c3f 100644
--- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.0-0.8.1.php
+++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.0-0.8.1.php
@@ -1,35 +1,35 @@
-startSetup();
-
-$installer->getConnection()->addColumn($this->getTable('core/url_rewrite'), 'entity_id', 'INT( 10 ) NOT NULL AFTER `store_id`');
-$installer->run("UPDATE {$this->getTable('core/url_rewrite')} set `entity_id` = SUBSTR(`id_path`, LOCATE('/', `id_path`)+1, IF(LOCATE('/', `id_path`, LOCATE('/', `id_path`)+1) = 0, LENGTH(`id_path`) , LOCATE('/', `id_path`, LOCATE('/', `id_path`)+1)) - LOCATE('/', `id_path`)+1);");
-
-$installer->endSetup();
\ No newline at end of file
+startSetup();
+
+$installer->getConnection()->addColumn($this->getTable('core/url_rewrite'), 'entity_id', 'INT( 10 ) NOT NULL AFTER `store_id`');
+$installer->run("UPDATE {$this->getTable('core/url_rewrite')} set `entity_id` = SUBSTR(`id_path`, LOCATE('/', `id_path`)+1, IF(LOCATE('/', `id_path`, LOCATE('/', `id_path`)+1) = 0, LENGTH(`id_path`) , LOCATE('/', `id_path`, LOCATE('/', `id_path`)+1)) - LOCATE('/', `id_path`)+1);");
+
+$installer->endSetup();
diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.1-0.8.2.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.1-0.8.2.php
index b904457f14..fed7bbc6d8 100644
--- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.1-0.8.2.php
+++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.1-0.8.2.php
@@ -1,34 +1,34 @@
-startSetup();
-
-$installer->run("CREATE INDEX entity_id ON {$this->getTable('core/url_rewrite')} (entity_id);");
-
-$installer->endSetup();
\ No newline at end of file
+startSetup();
+
+$installer->run("CREATE INDEX entity_id ON {$this->getTable('core/url_rewrite')} (entity_id);");
+
+$installer->endSetup();
diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.10-0.8.11.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.10-0.8.11.php
index 4b0b80e3b8..660fc907f5 100644
--- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.10-0.8.11.php
+++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.10-0.8.11.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
$installer = $this;
@@ -46,4 +46,4 @@
$installer->getTable('core_store'), 'store_id'
);
-$installer->endSetup();
\ No newline at end of file
+$installer->endSetup();
diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.11-0.8.12.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.11-0.8.12.php
index 253d6c9f3b..00198e726b 100644
--- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.11-0.8.12.php
+++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.11-0.8.12.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
@@ -38,4 +38,4 @@
$installer->getTable('core_store_group'), 'name', 'name', 'varchar(255) not null', true
);
-$installer->endSetup();
\ No newline at end of file
+$installer->endSetup();
diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.12-0.8.13.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.12-0.8.13.php
index a487f4efbb..9a82deec6b 100644
--- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.12-0.8.13.php
+++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.12-0.8.13.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.13-0.8.14.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.13-0.8.14.php
new file mode 100644
index 0000000000..c019358d31
--- /dev/null
+++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.13-0.8.14.php
@@ -0,0 +1,33 @@
+startSetup();
+$installer->getConnection()->addColumn($installer->getTable('core/layout_update'), 'sort_order', "smallint(5) NOT NULL DEFAULT '0'");
+$installer->endSetup();
diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.2-0.8.3.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.2-0.8.3.php
index 76905f9403..b9b3053e1d 100644
--- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.2-0.8.3.php
+++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.2-0.8.3.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
$installer = $this;
@@ -31,4 +31,4 @@
$installer->run("UPDATE {$this->getTable('core/url_rewrite')} SET type = IF(id_path LIKE 'category/%', 1, IF(id_path LIKE 'product/%', 2, 3));");
-$installer->endSetup();
\ No newline at end of file
+$installer->endSetup();
diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.3-0.8.4.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.3-0.8.4.php
index 3a36127677..c444a97d3b 100644
--- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.3-0.8.4.php
+++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.3-0.8.4.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
@@ -51,4 +51,4 @@
ADD INDEX `IDX_TARGET_PATH` (`store_id`, `target_path`);
DROP TABLE IF EXISTS `{$installer->getTable('core_url_rewrite_tag')}`;
");
-$installer->endSetup();
\ No newline at end of file
+$installer->endSetup();
diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.4-0.8.5.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.4-0.8.5.php
index bbe82f9c52..2c48043d33 100644
--- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.4-0.8.5.php
+++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.4-0.8.5.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.5-0.8.6.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.5-0.8.6.php
index be29356b3d..3c8813fae0 100644
--- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.5-0.8.6.php
+++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.5-0.8.6.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
@@ -53,4 +53,4 @@
);
}
-$installer->endSetup();
\ No newline at end of file
+$installer->endSetup();
diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.6-0.8.7.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.6-0.8.7.php
index f760e1ff2b..60d5940964 100644
--- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.6-0.8.7.php
+++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.6-0.8.7.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.7-0.8.8.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.7-0.8.8.php
index 962896b300..84173c49ee 100644
--- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.7-0.8.8.php
+++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.7-0.8.8.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.8-0.8.9.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.8-0.8.9.php
index 745e5a4afc..f7cf4b1d26 100644
--- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.8-0.8.9.php
+++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.8-0.8.9.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.9-0.8.10.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.9-0.8.10.php
index b7d2fa2736..9753e41c76 100644
--- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.9-0.8.10.php
+++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.9-0.8.10.php
@@ -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_Core
- * @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_Core
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/Cron/Exception.php b/app/code/core/Mage/Cron/Exception.php
index 8b5675d376..4fdaa2f5c7 100644
--- a/app/code/core/Mage/Cron/Exception.php
+++ b/app/code/core/Mage/Cron/Exception.php
@@ -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_Core
- * @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_Cron
+ * @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)
*/
@@ -34,4 +34,4 @@
class Mage_Cron_Exception extends Mage_Core_Exception
{
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Cron/Helper/Data.php b/app/code/core/Mage/Cron/Helper/Data.php
index 696e28120e..e17b8e1bce 100644
--- a/app/code/core/Mage/Cron/Helper/Data.php
+++ b/app/code/core/Mage/Cron/Helper/Data.php
@@ -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_Cron
- * @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_Cron
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Cron/Model/Mysql4/Schedule.php b/app/code/core/Mage/Cron/Model/Mysql4/Schedule.php
index a1b220de83..7336376053 100644
--- a/app/code/core/Mage/Cron/Model/Mysql4/Schedule.php
+++ b/app/code/core/Mage/Cron/Model/Mysql4/Schedule.php
@@ -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_Cron
- * @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_Cron
+ * @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)
*/
/**
@@ -37,4 +37,4 @@ public function _construct()
{
$this->_init('cron/schedule', 'schedule_id');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Cron/Model/Mysql4/Schedule/Collection.php b/app/code/core/Mage/Cron/Model/Mysql4/Schedule/Collection.php
index 30f3dac114..dcb024e85e 100644
--- a/app/code/core/Mage/Cron/Model/Mysql4/Schedule/Collection.php
+++ b/app/code/core/Mage/Cron/Model/Mysql4/Schedule/Collection.php
@@ -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_Cron
- * @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_Cron
+ * @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)
*/
/**
@@ -37,4 +37,4 @@ public function _construct()
{
$this->_init('cron/schedule');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Cron/Model/Observer.php b/app/code/core/Mage/Cron/Model/Observer.php
index 1d8c2cc731..336c6e1e9f 100644
--- a/app/code/core/Mage/Cron/Model/Observer.php
+++ b/app/code/core/Mage/Cron/Model/Observer.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Cron
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
@@ -152,7 +152,7 @@ public function generate()
*/
$config = Mage::getConfig()->getNode('crontab/jobs');
if ($config instanceof Mage_Core_Model_Config_Element) {
- $this->_generateJobs($config->children(), $exists);
+ $this->_generateJobs($config->children(), $exists);
}
/**
@@ -160,7 +160,7 @@ public function generate()
*/
$config = Mage::getConfig()->getNode('default/crontab/jobs');
if ($config instanceof Mage_Core_Model_Config_Element) {
- $this->_generateJobs($config->children(), $exists);
+ $this->_generateJobs($config->children(), $exists);
}
/**
@@ -250,4 +250,4 @@ public function cleanup()
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Cron/Model/Schedule.php b/app/code/core/Mage/Cron/Model/Schedule.php
index 8f45f0699a..83bfad63e9 100644
--- a/app/code/core/Mage/Cron/Model/Schedule.php
+++ b/app/code/core/Mage/Cron/Model/Schedule.php
@@ -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_Cron
- * @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_Cron
+ * @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)
*/
/**
@@ -186,4 +186,4 @@ public function getNumeric($value)
return false;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Cron/etc/config.xml b/app/code/core/Mage/Cron/etc/config.xml
index 8fa3ad147e..a87034812c 100644
--- a/app/code/core/Mage/Cron/etc/config.xml
+++ b/app/code/core/Mage/Cron/etc/config.xml
@@ -19,10 +19,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_Cron
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ * @category Mage
+ * @package Mage_Cron
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
diff --git a/app/code/core/Mage/Cron/etc/system.xml b/app/code/core/Mage/Cron/etc/system.xml
index 23aeadde81..364e970b78 100644
--- a/app/code/core/Mage/Cron/etc/system.xml
+++ b/app/code/core/Mage/Cron/etc/system.xml
@@ -19,10 +19,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_Cron
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ * @category Mage
+ * @package Mage_Cron
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
@@ -91,4 +91,4 @@
-
\ No newline at end of file
+
diff --git a/app/code/core/Mage/Cron/sql/cron_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Cron/sql/cron_setup/mysql4-install-0.7.0.php
index 67f9382084..febff9116a 100644
--- a/app/code/core/Mage/Cron/sql/cron_setup/mysql4-install-0.7.0.php
+++ b/app/code/core/Mage/Cron/sql/cron_setup/mysql4-install-0.7.0.php
@@ -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_Cron
- * @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_Cron
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/Cron/sql/cron_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Cron/sql/cron_setup/mysql4-upgrade-0.7.0-0.7.1.php
index 7d7538d9ed..0be0e454db 100644
--- a/app/code/core/Mage/Cron/sql/cron_setup/mysql4-upgrade-0.7.0-0.7.1.php
+++ b/app/code/core/Mage/Cron/sql/cron_setup/mysql4-upgrade-0.7.0-0.7.1.php
@@ -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_Cron
- * @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_Cron
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/Customer/Block/Account.php b/app/code/core/Mage/Customer/Block/Account.php
index 9e1eb959d2..ef61be5c80 100644
--- a/app/code/core/Mage/Customer/Block/Account.php
+++ b/app/code/core/Mage/Customer/Block/Account.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
/**
@@ -39,4 +39,4 @@ public function __construct()
$this->setTemplate('customer/account.phtml');
Mage::app()->getFrontController()->getAction()->getLayout()->getBlock('root')->setHeaderTitle(Mage::helper('customer')->__('My Account'));
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Customer/Block/Account/Dashboard.php b/app/code/core/Mage/Customer/Block/Account/Dashboard.php
index 3894122663..0a6940b29f 100644
--- a/app/code/core/Mage/Customer/Block/Account/Dashboard.php
+++ b/app/code/core/Mage/Customer/Block/Account/Dashboard.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
/**
@@ -33,7 +33,7 @@
*/
class Mage_Customer_Block_Account_Dashboard extends Mage_Core_Block_Template
{
- protected $_subscription = null;
+ protected $_subscription = null;
public function getCustomer()
{
@@ -77,25 +77,25 @@ public function getTagsUrl()
public function getSubscriptionObject()
{
- if(is_null($this->_subscription)) {
- $this->_subscription = Mage::getModel('newsletter/subscriber')->loadByCustomer($this->getCustomer());
- }
+ if(is_null($this->_subscription)) {
+ $this->_subscription = Mage::getModel('newsletter/subscriber')->loadByCustomer($this->getCustomer());
+ }
- return $this->_subscription;
+ return $this->_subscription;
}
public function getManageNewsletterUrl()
{
- return $this->getUrl('*/newsletter/manage');
+ return $this->getUrl('*/newsletter/manage');
}
public function getSubscriptionText()
{
- if($this->getSubscriptionObject()->isSubscribed()) {
- return Mage::helper('customer')->__('You are currently subscribed to our newsletter');
- }
+ if($this->getSubscriptionObject()->isSubscribed()) {
+ return Mage::helper('customer')->__('You are currently subscribed to our newsletter');
+ }
- return Mage::helper('customer')->__('You are currently not subscribed to our newsletter');
+ return Mage::helper('customer')->__('You are currently not subscribed to our newsletter');
}
public function getPrimaryAddresses()
@@ -124,4 +124,4 @@ public function getBackUrl()
}
return $this->getUrl('customer/account/');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Customer/Block/Account/Dashboard/Address.php b/app/code/core/Mage/Customer/Block/Account/Dashboard/Address.php
index a12d466307..cf6e728cb0 100644
--- a/app/code/core/Mage/Customer/Block/Account/Dashboard/Address.php
+++ b/app/code/core/Mage/Customer/Block/Account/Dashboard/Address.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
/**
@@ -34,10 +34,10 @@
class Mage_Customer_Block_Account_Dashboard_Address extends Mage_Core_Block_Template
{
- public function getCustomer()
- {
- return Mage::getSingleton('customer/session')->getCustomer();
- }
+ public function getCustomer()
+ {
+ return Mage::getSingleton('customer/session')->getCustomer();
+ }
public function getPrimaryShippingAddressHtml()
{
@@ -55,7 +55,7 @@ public function getPrimaryBillingAddressHtml()
$address = $this->getCustomer()->getPrimaryBillingAddress();
if( $address instanceof Varien_Object ) {
- return $address->format('html');
+ return $address->format('html');
} else {
return Mage::helper('customer')->__('You have not set a primary billing address.');
}
@@ -63,12 +63,12 @@ public function getPrimaryBillingAddressHtml()
public function getPrimaryShippingAddressEditUrl()
{
- return Mage::getUrl('customer/address/edit', array('id'=>$this->getCustomer()->getDefaultShipping()));
+ return Mage::getUrl('customer/address/edit', array('id'=>$this->getCustomer()->getDefaultShipping()));
}
public function getPrimaryBillingAddressEditUrl()
{
- return Mage::getUrl('customer/address/edit', array('id'=>$this->getCustomer()->getDefaultBilling()));
+ return Mage::getUrl('customer/address/edit', array('id'=>$this->getCustomer()->getDefaultBilling()));
}
public function getAddressBookUrl()
diff --git a/app/code/core/Mage/Customer/Block/Account/Dashboard/Block.php b/app/code/core/Mage/Customer/Block/Account/Dashboard/Block.php
index 95a070c412..7ad52e4b46 100644
--- a/app/code/core/Mage/Customer/Block/Account/Dashboard/Block.php
+++ b/app/code/core/Mage/Customer/Block/Account/Dashboard/Block.php
@@ -1,31 +1,31 @@
-getCustomer()->getName();
- }
-
-}
+getCustomer()->getName();
+ }
+
+}
diff --git a/app/code/core/Mage/Customer/Block/Account/Dashboard/Info.php b/app/code/core/Mage/Customer/Block/Account/Dashboard/Info.php
index 8a875c1aa4..63f283c645 100644
--- a/app/code/core/Mage/Customer/Block/Account/Dashboard/Info.php
+++ b/app/code/core/Mage/Customer/Block/Account/Dashboard/Info.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
/**
@@ -49,13 +49,13 @@ public function getChangePasswordUrl()
*
* @return Mage_Newsletter_Model_Subscriber
*/
- public function getSubscriptionObject()
+ public function getSubscriptionObject()
{
- if(is_null($this->_subscription)) {
- $this->_subscription = Mage::getModel('newsletter/subscriber')->loadByCustomer(Mage::getSingleton('customer/session')->getCustomer());
- }
+ if(is_null($this->_subscription)) {
+ $this->_subscription = Mage::getModel('newsletter/subscriber')->loadByCustomer(Mage::getSingleton('customer/session')->getCustomer());
+ }
- return $this->_subscription;
+ return $this->_subscription;
}
/**
@@ -65,7 +65,7 @@ public function getSubscriptionObject()
*/
public function getIsSubscribed()
{
- return $this->getSubscriptionObject()->isSubscribed();
+ return $this->getSubscriptionObject()->isSubscribed();
}
/**
@@ -77,4 +77,4 @@ public function isNewsletterEnabled()
{
return $this->getLayout()->getBlockSingleton('customer/form_register')->isNewsletterEnabled();
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Customer/Block/Account/Dashboard/Newsletter.php b/app/code/core/Mage/Customer/Block/Account/Dashboard/Newsletter.php
index 3bde446e31..9eb4761196 100644
--- a/app/code/core/Mage/Customer/Block/Account/Dashboard/Newsletter.php
+++ b/app/code/core/Mage/Customer/Block/Account/Dashboard/Newsletter.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
/**
@@ -42,4 +42,4 @@ public function getSubscriptionObject()
}
return $this->_subscription;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Customer/Block/Account/Dashboard/Sidebar.php b/app/code/core/Mage/Customer/Block/Account/Dashboard/Sidebar.php
index d623d10612..05528d8a48 100644
--- a/app/code/core/Mage/Customer/Block/Account/Dashboard/Sidebar.php
+++ b/app/code/core/Mage/Customer/Block/Account/Dashboard/Sidebar.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
/**
@@ -62,68 +62,68 @@ public function getCartItemsCount()
return $this->_cartItemsCount;
}
- public function getWishlist()
- {
- if( !$this->_wishlist ) {
- $this->_wishlist = Mage::getModel('wishlist/wishlist')
- ->loadByCustomer(Mage::getSingleton('customer/session')->getCustomer());
- $this->_wishlist->getItemCollection()
- ->addAttributeToSelect('name')
- ->addAttributeToSelect('price')
+ public function getWishlist()
+ {
+ if( !$this->_wishlist ) {
+ $this->_wishlist = Mage::getModel('wishlist/wishlist')
+ ->loadByCustomer(Mage::getSingleton('customer/session')->getCustomer());
+ $this->_wishlist->getItemCollection()
+ ->addAttributeToSelect('name')
+ ->addAttributeToSelect('price')
->addAttributeToSelect('small_image')
- ->addAttributeToFilter('store_id', array('in' => $this->_wishlist->getSharedStoreIds()))
- ->addAttributeToSort('added_at', 'desc')
+ ->addAttributeToFilter('store_id', array('in' => $this->_wishlist->getSharedStoreIds()))
+ ->addAttributeToSort('added_at', 'desc')
->setCurPage(1)
- ->setPageSize(3)
- ->load();
- }
-
- return $this->_wishlist->getItemCollection();
- }
-
- public function getWishlistCount()
- {
- return $this->getWishlist()->getSize();
- }
-
- public function getWishlistAddToCartLink($wishlistItem)
- {
- return Mage::getUrl('wishlist/index/cart', array('item' => $wishlistItem->getId()));
- }
-
- public function getCompareItems()
- {
- if( !$this->_compareItems ) {
- $this->_compareItems = Mage::getResourceModel('catalog/product_compare_item_collection')
- ->setStoreId(Mage::app()->getStore()->getId());
- $this->_compareItems->setCustomerId(Mage::getSingleton('customer/session')->getCustomerId());
- $this->_compareItems
- ->addAttributeToSelect('name')
- ->useProductItem()
- ->load();
-
- }
-
- return $this->_compareItems;
- }
-
- public function getCompareJsObjectName()
- {
- return "dashboardSidebarCompareJsObject";
- }
-
- public function getCompareRemoveUrlTemplate()
- {
- return $this->getUrl('catalog/product_compare/remove',array('product'=>'#{id}'));
- }
-
- public function getCompareAddUrlTemplate()
- {
- return $this->getUrl('catalog/product_compare/add',array('product'=>'#{id}'));
- }
-
- public function getCompareUrl()
- {
- return $this->getUrl('catalog/product_compare');
- }
-}
\ No newline at end of file
+ ->setPageSize(3)
+ ->load();
+ }
+
+ return $this->_wishlist->getItemCollection();
+ }
+
+ public function getWishlistCount()
+ {
+ return $this->getWishlist()->getSize();
+ }
+
+ public function getWishlistAddToCartLink($wishlistItem)
+ {
+ return Mage::getUrl('wishlist/index/cart', array('item' => $wishlistItem->getId()));
+ }
+
+ public function getCompareItems()
+ {
+ if( !$this->_compareItems ) {
+ $this->_compareItems = Mage::getResourceModel('catalog/product_compare_item_collection')
+ ->setStoreId(Mage::app()->getStore()->getId());
+ $this->_compareItems->setCustomerId(Mage::getSingleton('customer/session')->getCustomerId());
+ $this->_compareItems
+ ->addAttributeToSelect('name')
+ ->useProductItem()
+ ->load();
+
+ }
+
+ return $this->_compareItems;
+ }
+
+ public function getCompareJsObjectName()
+ {
+ return "dashboardSidebarCompareJsObject";
+ }
+
+ public function getCompareRemoveUrlTemplate()
+ {
+ return $this->getUrl('catalog/product_compare/remove',array('product'=>'#{id}'));
+ }
+
+ public function getCompareAddUrlTemplate()
+ {
+ return $this->getUrl('catalog/product_compare/add',array('product'=>'#{id}'));
+ }
+
+ public function getCompareUrl()
+ {
+ return $this->getUrl('catalog/product_compare');
+ }
+}
diff --git a/app/code/core/Mage/Customer/Block/Account/Forgotpassword.php b/app/code/core/Mage/Customer/Block/Account/Forgotpassword.php
index e31247eae3..da1584a1d2 100644
--- a/app/code/core/Mage/Customer/Block/Account/Forgotpassword.php
+++ b/app/code/core/Mage/Customer/Block/Account/Forgotpassword.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
/**
@@ -35,4 +35,4 @@
class Mage_Customer_Block_Account_Forgotpassword extends Mage_Core_Block_Template
{
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Customer/Block/Account/Navigation.php b/app/code/core/Mage/Customer/Block/Account/Navigation.php
index c22dce9c9f..5ca9831a73 100644
--- a/app/code/core/Mage/Customer/Block/Account/Navigation.php
+++ b/app/code/core/Mage/Customer/Block/Account/Navigation.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Customer/Block/Address/Book.php b/app/code/core/Mage/Customer/Block/Address/Book.php
index 040b4adaa8..a383367b02 100644
--- a/app/code/core/Mage/Customer/Block/Address/Book.php
+++ b/app/code/core/Mage/Customer/Block/Address/Book.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Customer/Block/Address/Edit.php b/app/code/core/Mage/Customer/Block/Address/Edit.php
index a4ec30dd6c..b59fb40d34 100644
--- a/app/code/core/Mage/Customer/Block/Address/Edit.php
+++ b/app/code/core/Mage/Customer/Block/Address/Edit.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Customer/Block/Address/Renderer/Default.php b/app/code/core/Mage/Customer/Block/Address/Renderer/Default.php
index bb465a75a9..76be84430a 100644
--- a/app/code/core/Mage/Customer/Block/Address/Renderer/Default.php
+++ b/app/code/core/Mage/Customer/Block/Address/Renderer/Default.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
@@ -86,7 +86,7 @@ public function render(Mage_Customer_Model_Address_Abstract $address, $format=nu
$data = $address->getData();
if ($this->getType()->getHtmlEscape()) {
foreach ($data as $key => $value) {
- $data[$key] = $this->htmlEscape($value);
+ $data[$key] = $this->htmlEscape($value);
}
}
$formater->setVariables(array_merge($data, array('country'=>$address->getCountryModel()->getName())));
diff --git a/app/code/core/Mage/Customer/Block/Address/Renderer/Interface.php b/app/code/core/Mage/Customer/Block/Address/Renderer/Interface.php
index 5564fa449a..0e0b767ca9 100644
--- a/app/code/core/Mage/Customer/Block/Address/Renderer/Interface.php
+++ b/app/code/core/Mage/Customer/Block/Address/Renderer/Interface.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
diff --git a/app/code/core/Mage/Customer/Block/Form/Edit.php b/app/code/core/Mage/Customer/Block/Form/Edit.php
index 4d55ac9bcb..5dbf7cecf1 100644
--- a/app/code/core/Mage/Customer/Block/Form/Edit.php
+++ b/app/code/core/Mage/Customer/Block/Form/Edit.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Customer/Block/Form/Login.php b/app/code/core/Mage/Customer/Block/Form/Login.php
index a48484ffaa..3a8c9e6a09 100644
--- a/app/code/core/Mage/Customer/Block/Form/Login.php
+++ b/app/code/core/Mage/Customer/Block/Form/Login.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Customer/Block/Form/Register.php b/app/code/core/Mage/Customer/Block/Form/Register.php
index 16c63729e9..3b0865fd1e 100644
--- a/app/code/core/Mage/Customer/Block/Form/Register.php
+++ b/app/code/core/Mage/Customer/Block/Form/Register.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
/**
@@ -114,4 +114,4 @@ public function isNewsletterEnabled()
{
return !Mage::getStoreConfigFlag('advanced/modules_disable_output/Mage_Newsletter');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Customer/Block/Newsletter.php b/app/code/core/Mage/Customer/Block/Newsletter.php
index f600dab9eb..0edebd88b6 100644
--- a/app/code/core/Mage/Customer/Block/Newsletter.php
+++ b/app/code/core/Mage/Customer/Block/Newsletter.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
diff --git a/app/code/core/Mage/Customer/Block/Widget/Abstract.php b/app/code/core/Mage/Customer/Block/Widget/Abstract.php
index cf7b104334..5bef3cfc50 100644
--- a/app/code/core/Mage/Customer/Block/Widget/Abstract.php
+++ b/app/code/core/Mage/Customer/Block/Widget/Abstract.php
@@ -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_Customer
- * @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_Customer
+ * @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_Customer_Block_Widget_Abstract extends Mage_Core_Block_Template
@@ -56,4 +56,4 @@ public function getFieldName($field)
{
return sprintf($this->getFieldNameFormat(), $field);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Customer/Block/Widget/Dob.php b/app/code/core/Mage/Customer/Block/Widget/Dob.php
index 5c4fe0eb0e..a489e2871f 100644
--- a/app/code/core/Mage/Customer/Block/Widget/Dob.php
+++ b/app/code/core/Mage/Customer/Block/Widget/Dob.php
@@ -18,14 +18,21 @@
* 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_Customer
- * @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_Customer
+ * @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_Customer_Block_Widget_Dob extends Mage_Customer_Block_Widget_Abstract
{
+ /**
+ * Date inputs
+ *
+ * @var array
+ */
+ protected $_dateInputs = array();
+
public function _construct()
{
parent::_construct();
@@ -75,4 +82,38 @@ public function getDateFormat()
{
return Mage::app()->getLocale()->getDateStrFormat(Mage_Core_Model_Locale::FORMAT_TYPE_SHORT);
}
-}
\ No newline at end of file
+
+ /**
+ * Add date input html
+ *
+ * @param string $code
+ * @param string $html
+ */
+ public function setDateInput($code, $html)
+ {
+ $this->_dateInputs[$code] = $html;
+ }
+
+ /**
+ * Sort date inputs by dateformat order of current locale
+ *
+ * @return string
+ */
+ public function getSortedDateInputs()
+ {
+ $strtr = array(
+ '%b' => '%1$s',
+ '%B' => '%1$s',
+ '%m' => '%1$s',
+ '%d' => '%2$s',
+ '%e' => '%2$s',
+ '%Y' => '%3$s',
+ '%y' => '%3$s'
+ );
+
+ $dateFormat = preg_replace('/[^\%\w]/', '\\1', $this->getDateFormat());
+
+ return sprintf(strtr($dateFormat, $strtr),
+ $this->_dateInputs['m'], $this->_dateInputs['d'], $this->_dateInputs['y']);
+ }
+}
diff --git a/app/code/core/Mage/Customer/Block/Widget/Gender.php b/app/code/core/Mage/Customer/Block/Widget/Gender.php
index c12043c1f4..9a65e1f890 100644
--- a/app/code/core/Mage/Customer/Block/Widget/Gender.php
+++ b/app/code/core/Mage/Customer/Block/Widget/Gender.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Customer/Block/Widget/Name.php b/app/code/core/Mage/Customer/Block/Widget/Name.php
index 4db1ac7c36..4b52f32c80 100644
--- a/app/code/core/Mage/Customer/Block/Widget/Name.php
+++ b/app/code/core/Mage/Customer/Block/Widget/Name.php
@@ -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_Customer
- * @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_Customer
+ * @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_Customer_Block_Widget_Name extends Mage_Customer_Block_Widget_Abstract
@@ -121,4 +121,4 @@ public function getContainerClassName()
$class .= $this->showSuffix() ? '-suffix' : '';
return $class;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Customer/Block/Widget/Taxvat.php b/app/code/core/Mage/Customer/Block/Widget/Taxvat.php
index 8afc0fd225..fd3cf25bc3 100644
--- a/app/code/core/Mage/Customer/Block/Widget/Taxvat.php
+++ b/app/code/core/Mage/Customer/Block/Widget/Taxvat.php
@@ -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_Customer
- * @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_Customer
+ * @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_Customer_Block_Widget_Taxvat extends Mage_Customer_Block_Widget_Abstract
diff --git a/app/code/core/Mage/Customer/Exception.php b/app/code/core/Mage/Customer/Exception.php
index a395111206..1f3b79942d 100644
--- a/app/code/core/Mage/Customer/Exception.php
+++ b/app/code/core/Mage/Customer/Exception.php
@@ -18,13 +18,13 @@
* 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_Customer
- * @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_Customer
+ * @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_Customer_Exception extends Mage_Core_Exception
{
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Customer/Helper/Address.php b/app/code/core/Mage/Customer/Helper/Address.php
index 65bd43d1e9..29832dd950 100644
--- a/app/code/core/Mage/Customer/Helper/Address.php
+++ b/app/code/core/Mage/Customer/Helper/Address.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Customer/Helper/Data.php b/app/code/core/Mage/Customer/Helper/Data.php
index 1dbbfc4294..95f360317e 100644
--- a/app/code/core/Mage/Customer/Helper/Data.php
+++ b/app/code/core/Mage/Customer/Helper/Data.php
@@ -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_Customer
- * @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)
+ * @category Mage
+ * @package Mage_Customer
+ * @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)
*/
diff --git a/app/code/core/Mage/Customer/Model/Address.php b/app/code/core/Mage/Customer/Model/Address.php
index d14018b0af..4983a771c5 100644
--- a/app/code/core/Mage/Customer/Model/Address.php
+++ b/app/code/core/Mage/Customer/Model/Address.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
/**
@@ -113,4 +113,4 @@ public function __clone()
{
$this->setId(null);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Customer/Model/Address/Abstract.php b/app/code/core/Mage/Customer/Model/Address/Abstract.php
index 1ac0d4c662..2b89d281a1 100644
--- a/app/code/core/Mage/Customer/Model/Address/Abstract.php
+++ b/app/code/core/Mage/Customer/Model/Address/Abstract.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
/**
@@ -167,28 +167,28 @@ public function getRegion()
$region = $this->getData('region');
if ($regionId) {
- if ($this->getRegionModel($regionId)->getCountryId() == $this->getCountryId()) {
- $region = $this->getRegionModel($regionId)->getName();
- $this->setData('region', $region);
- }
+ if ($this->getRegionModel($regionId)->getCountryId() == $this->getCountryId()) {
+ $region = $this->getRegionModel($regionId)->getName();
+ $this->setData('region', $region);
+ }
}
if (!empty($region) && is_string($region)) {
- $this->setData('region', $region);
- }
+ $this->setData('region', $region);
+ }
elseif (!$regionId && is_numeric($region)) {
if ($this->getRegionModel($region)->getCountryId() == $this->getCountryId()) {
$this->setData('region', $this->getRegionModel($region)->getName());
$this->setData('region_id', $region);
}
}
- elseif ($regionId && !$region) {
- if ($this->getRegionModel($regionId)->getCountryId() == $this->getCountryId()) {
- $this->setData('region', $this->getRegionModel($regionId)->getName());
- }
- }
+ elseif ($regionId && !$region) {
+ if ($this->getRegionModel($regionId)->getCountryId() == $this->getCountryId()) {
+ $this->setData('region', $this->getRegionModel($regionId)->getName());
+ }
+ }
- return $this->getData('region');
+ return $this->getData('region');
}
/**
@@ -205,15 +205,15 @@ public function getRegionCode()
$this->setData('region_code', $this->getRegionModel($region)->getCode());
}
}
- elseif ($regionId) {
- if ($this->getRegionModel($regionId)->getCountryId() == $this->getCountryId()) {
- $this->setData('region_code', $this->getRegionModel($regionId)->getCode());
- }
- }
+ elseif ($regionId) {
+ if ($this->getRegionModel($regionId)->getCountryId() == $this->getCountryId()) {
+ $this->setData('region_code', $this->getRegionModel($regionId)->getCode());
+ }
+ }
elseif (is_string($region)) {
- $this->setData('region_code', $region);
- }
- return $this->getData('region_code');
+ $this->setData('region_code', $region);
+ }
+ return $this->getData('region_code');
}
public function getRegionId()
@@ -234,12 +234,12 @@ public function getRegionId()
public function getCountry()
{
- /*if ($this->getData('country_id') && !$this->getData('country')) {
- $this->setData('country', Mage::getModel('directory/country')->load($this->getData('country_id'))->getIso2Code());
- }
- return $this->getData('country');*/
- $country = $this->getCountryId();
- return $country ? $country : $this->getData('country');
+ /*if ($this->getData('country_id') && !$this->getData('country')) {
+ $this->setData('country', Mage::getModel('directory/country')->load($this->getData('country_id'))->getIso2Code());
+ }
+ return $this->getData('country');*/
+ $country = $this->getCountryId();
+ return $country ? $country : $this->getData('country');
}
/**
@@ -287,7 +287,7 @@ public function getHtmlFormat()
*/
public function getFormated($html=false)
{
- return $this->format($html ? 'html' : 'text');//Mage::getModel('directory/country')->load($this->getCountryId())->formatAddress($this, $html);
+ return $this->format($html ? 'html' : 'text');//Mage::getModel('directory/country')->load($this->getCountryId())->formatAddress($this, $html);
}
public function format($type)
@@ -297,7 +297,7 @@ public function format($type)
return null;
}
- return $formatType->getRenderer()->render($this);
+ return $formatType->getRenderer()->render($this);
}
/**
@@ -366,4 +366,4 @@ public function validate()
}
return $errors;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Customer/Model/Address/Api.php b/app/code/core/Mage/Customer/Model/Address/Api.php
index 7136142749..f4237c7902 100644
--- a/app/code/core/Mage/Customer/Model/Address/Api.php
+++ b/app/code/core/Mage/Customer/Model/Address/Api.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
/**
@@ -234,4 +234,4 @@ public function delete($addressId)
return true;
}
-} // Class Mage_Customer_Model_Address_Api End
\ No newline at end of file
+} // Class Mage_Customer_Model_Address_Api End
diff --git a/app/code/core/Mage/Customer/Model/Address/Api/V2.php b/app/code/core/Mage/Customer/Model/Address/Api/V2.php
index 6b35df5187..0b186c6a48 100644
--- a/app/code/core/Mage/Customer/Model/Address/Api/V2.php
+++ b/app/code/core/Mage/Customer/Model/Address/Api/V2.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
/**
@@ -184,4 +184,4 @@ public function delete($addressId)
return true;
}
-} // Class Mage_Customer_Model_Address_Api End
\ No newline at end of file
+} // Class Mage_Customer_Model_Address_Api End
diff --git a/app/code/core/Mage/Customer/Model/Address/Config.php b/app/code/core/Mage/Customer/Model/Address/Config.php
index 0cca30b567..a3d79eec2b 100644
--- a/app/code/core/Mage/Customer/Model/Address/Config.php
+++ b/app/code/core/Mage/Customer/Model/Address/Config.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
diff --git a/app/code/core/Mage/Customer/Model/Api/Resource.php b/app/code/core/Mage/Customer/Model/Api/Resource.php
index ca8fb31738..2f23b744ea 100644
--- a/app/code/core/Mage/Customer/Model/Api/Resource.php
+++ b/app/code/core/Mage/Customer/Model/Api/Resource.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
/**
@@ -87,4 +87,4 @@ public function getAllowedAttributes($entity, array $filter = null)
return $result;
}
-} // Class Mage_Customer_Model_Api_Resource End
\ No newline at end of file
+} // Class Mage_Customer_Model_Api_Resource End
diff --git a/app/code/core/Mage/Customer/Model/Attribute.php b/app/code/core/Mage/Customer/Model/Attribute.php
index 5ea309f6ea..f527160c58 100644
--- a/app/code/core/Mage/Customer/Model/Attribute.php
+++ b/app/code/core/Mage/Customer/Model/Attribute.php
@@ -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_Customer
- * @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)
+ * @category Mage
+ * @package Mage_Customer
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Customer/Model/Config/Share.php b/app/code/core/Mage/Customer/Model/Config/Share.php
index 5c514fca3b..243247df93 100644
--- a/app/code/core/Mage/Customer/Model/Config/Share.php
+++ b/app/code/core/Mage/Customer/Model/Config/Share.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Customer/Model/Convert/Adapter/Customer.php b/app/code/core/Mage/Customer/Model/Convert/Adapter/Customer.php
index 3ad8246f15..cd1b0c98ff 100644
--- a/app/code/core/Mage/Customer/Model/Convert/Adapter/Customer.php
+++ b/app/code/core/Mage/Customer/Model/Convert/Adapter/Customer.php
@@ -1,5 +1,4 @@
$memory);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Customer/Model/Convert/Parser/Customer.php b/app/code/core/Mage/Customer/Model/Convert/Parser/Customer.php
index 3e04c3539e..78be0c793f 100644
--- a/app/code/core/Mage/Customer/Model/Convert/Parser/Customer.php
+++ b/app/code/core/Mage/Customer/Model/Convert/Parser/Customer.php
@@ -1,5 +1,4 @@
setData($this->_collections);
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Customer/Model/Customer.php b/app/code/core/Mage/Customer/Model/Customer.php
index c84d77db80..c5597107b8 100644
--- a/app/code/core/Mage/Customer/Model/Customer.php
+++ b/app/code/core/Mage/Customer/Model/Customer.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
/**
@@ -42,6 +42,7 @@ class Mage_Customer_Model_Customer extends Mage_Core_Model_Abstract
const EXCEPTION_EMAIL_NOT_CONFIRMED = 1;
const EXCEPTION_INVALID_EMAIL_OR_PASSWORD = 2;
+ const EXCEPTION_EMAIL_EXISTS = 3;
const SUBSCRIBED_YES = 'yes';
const SUBSCRIBED_NO = 'no';
@@ -97,10 +98,14 @@ public function authenticate($login, $password)
{
$this->loadByEmail($login);
if ($this->getConfirmation() && $this->isConfirmationRequired()) {
- throw new Exception(Mage::helper('customer')->__('This account is not confirmed.'), self::EXCEPTION_EMAIL_NOT_CONFIRMED);
+ throw Mage::exception('Mage_Core', Mage::helper('customer')->__('This account is not confirmed.'),
+ self::EXCEPTION_EMAIL_NOT_CONFIRMED
+ );
}
if (!$this->validatePassword($password)) {
- throw new Exception(Mage::helper('customer')->__('Invalid login or password.'), self::EXCEPTION_INVALID_EMAIL_OR_PASSWORD);
+ throw Mage::exception('Mage_Core', Mage::helper('customer')->__('Invalid login or password.'),
+ self::EXCEPTION_INVALID_EMAIL_OR_PASSWORD
+ );
}
Mage::dispatchEvent('customer_customer_authenticated', array(
'model' => $this,
@@ -1047,14 +1052,14 @@ public function canSkipConfirmation()
&& strtolower($this->getSkipConfirmationIfEmail()) === strtolower($this->getEmail());
}
- public function __clone()
+ public function __clone()
{
- $newAddressCollection = $this->getPrimaryAddresses();
- $newAddressCollection = array_merge($newAddressCollection, $this->getAdditionalAddresses());
- $this->setId(null);
- $this->cleanAllAddresses();
+ $newAddressCollection = $this->getPrimaryAddresses();
+ $newAddressCollection = array_merge($newAddressCollection, $this->getAdditionalAddresses());
+ $this->setId(null);
+ $this->cleanAllAddresses();
foreach ($newAddressCollection as $address) {
- $this->addAddress(clone $address);
+ $this->addAddress(clone $address);
}
}
}
diff --git a/app/code/core/Mage/Customer/Model/Customer/Api.php b/app/code/core/Mage/Customer/Model/Customer/Api.php
index c5faffb19d..e75a5bce6d 100644
--- a/app/code/core/Mage/Customer/Model/Customer/Api.php
+++ b/app/code/core/Mage/Customer/Model/Customer/Api.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
/**
@@ -181,4 +181,4 @@ public function delete($customerId)
return true;
}
-} // Class Mage_Customer_Model_Customer_Api End
\ No newline at end of file
+} // Class Mage_Customer_Model_Customer_Api End
diff --git a/app/code/core/Mage/Customer/Model/Customer/Api/V2.php b/app/code/core/Mage/Customer/Model/Customer/Api/V2.php
index abab42c5b8..ab0b8f2265 100644
--- a/app/code/core/Mage/Customer/Model/Customer/Api/V2.php
+++ b/app/code/core/Mage/Customer/Model/Customer/Api/V2.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
/**
@@ -151,4 +151,4 @@ public function update($customerId, $customerData)
$customer->save();
return true;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Billing.php b/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Billing.php
index 147e6f1788..1606de092a 100644
--- a/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Billing.php
+++ b/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Billing.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Password.php b/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Password.php
index 0d78fc9de6..ef3a689ede 100644
--- a/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Password.php
+++ b/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Password.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
/**
@@ -55,4 +55,4 @@ public function validate($object)
return parent::validate($object);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Shipping.php b/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Shipping.php
index 5d295efb49..1166aabff3 100644
--- a/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Shipping.php
+++ b/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Shipping.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Store.php b/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Store.php
index 3269cc940e..ec9f375739 100644
--- a/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Store.php
+++ b/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Store.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Website.php b/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Website.php
index ee51ab96d2..0abac03500 100644
--- a/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Website.php
+++ b/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Website.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Group.php b/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Group.php
index 3fc5de39f1..1e0cf5bb63 100644
--- a/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Group.php
+++ b/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Group.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Store.php b/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Store.php
index 21e10a183b..9b2d90c470 100644
--- a/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Store.php
+++ b/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Store.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
/**
@@ -80,4 +80,4 @@ public function getOptionText($value)
}
return false;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Website.php b/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Website.php
index dae6d54066..6a8fc7d1a8 100644
--- a/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Website.php
+++ b/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Website.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
/**
@@ -54,4 +54,4 @@ public function getOptionText($value)
}
return false;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Customer/Model/Entity/Address.php b/app/code/core/Mage/Customer/Model/Entity/Address.php
index 630c8d34e1..5dbc97e162 100644
--- a/app/code/core/Mage/Customer/Model/Entity/Address.php
+++ b/app/code/core/Mage/Customer/Model/Entity/Address.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
/**
@@ -85,4 +85,4 @@ public function setCustomerId($object, $id)
$object->setData('customer_id', $id);
return $object;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Backend/Region.php b/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Backend/Region.php
index b7294bee6a..f582c5ca30 100644
--- a/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Backend/Region.php
+++ b/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Backend/Region.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Backend/Street.php b/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Backend/Street.php
index 940807e6c5..0ea9312e34 100644
--- a/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Backend/Street.php
+++ b/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Backend/Street.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
/**
@@ -39,4 +39,4 @@ public function beforeSave($object)
$object->implodeStreetAddress();
}
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Collection.php b/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Collection.php
index 9b0743e89f..0be0ac7bae 100644
--- a/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Collection.php
+++ b/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Collection.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
diff --git a/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Source/Country.php b/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Source/Country.php
index 466aea9c10..4188b871d1 100644
--- a/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Source/Country.php
+++ b/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Source/Country.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
/**
@@ -39,7 +39,7 @@ public function getAllOptions()
$this->_options = Mage::getResourceModel('directory/country_collection')->load()->toOptionArray();
/*$baseUrl = Mage::getBaseUrl();
foreach ($this->_options as $index=>$option) {
- $this->_options[$index]['style'] = 'background-image:url('.$baseUrl.'skins/default/images/icons/flags/'.strtolower($option['title']).'.gif)';
+ $this->_options[$index]['style'] = 'background-image:url('.$baseUrl.'skins/default/images/icons/flags/'.strtolower($option['title']).'.gif)';
}*/
}
return $this->_options;
diff --git a/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Source/Region.php b/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Source/Region.php
index bf0b613594..886f368a30 100644
--- a/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Source/Region.php
+++ b/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Source/Region.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Customer/Model/Entity/Address/Collection.php b/app/code/core/Mage/Customer/Model/Entity/Address/Collection.php
index 9d8ee5e940..8acbae930e 100644
--- a/app/code/core/Mage/Customer/Model/Entity/Address/Collection.php
+++ b/app/code/core/Mage/Customer/Model/Entity/Address/Collection.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
/**
@@ -48,4 +48,4 @@ public function setCustomerFilter($customer)
}
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Customer/Model/Entity/Attribute.php b/app/code/core/Mage/Customer/Model/Entity/Attribute.php
index fa7eb6429e..7efdb5da7d 100644
--- a/app/code/core/Mage/Customer/Model/Entity/Attribute.php
+++ b/app/code/core/Mage/Customer/Model/Entity/Attribute.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
diff --git a/app/code/core/Mage/Customer/Model/Entity/Attribute/Collection.php b/app/code/core/Mage/Customer/Model/Entity/Attribute/Collection.php
index ba17cbb2f9..00e9cac689 100644
--- a/app/code/core/Mage/Customer/Model/Entity/Attribute/Collection.php
+++ b/app/code/core/Mage/Customer/Model/Entity/Attribute/Collection.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
diff --git a/app/code/core/Mage/Customer/Model/Entity/Customer.php b/app/code/core/Mage/Customer/Model/Entity/Customer.php
index 51fba527b7..cd295de22e 100644
--- a/app/code/core/Mage/Customer/Model/Entity/Customer.php
+++ b/app/code/core/Mage/Customer/Model/Entity/Customer.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
/**
@@ -75,6 +75,11 @@ protected function _getDefaultAttributes()
protected function _beforeSave(Varien_Object $customer)
{
parent::_beforeSave($customer);
+
+ if (!$customer->getEmail()) {
+ Mage::throwException(Mage::helper('customer')->__('Customer email is required'));
+ }
+
$select = $this->_getReadAdapter()->select()
->from($this->getEntityTable(), array($this->getEntityIdField()))
->where('email=?', $customer->getEmail());
@@ -86,7 +91,9 @@ protected function _beforeSave(Varien_Object $customer)
}
if ($this->_getWriteAdapter()->fetchOne($select)) {
- Mage::throwException(Mage::helper('customer')->__('Customer email already exists'));
+ throw Mage::exception('Mage_Core', Mage::helper('customer')->__('Customer email already exists'),
+ Mage_Customer_Model_Customer::EXCEPTION_EMAIL_EXISTS
+ );
}
// set confirmation key logic
diff --git a/app/code/core/Mage/Customer/Model/Entity/Customer/Collection.php b/app/code/core/Mage/Customer/Model/Entity/Customer/Collection.php
index 9579e8a19e..c1471fe319 100644
--- a/app/code/core/Mage/Customer/Model/Entity/Customer/Collection.php
+++ b/app/code/core/Mage/Customer/Model/Entity/Customer/Collection.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Customer/Model/Entity/Group.php b/app/code/core/Mage/Customer/Model/Entity/Group.php
index b946f06f47..620008d5af 100644
--- a/app/code/core/Mage/Customer/Model/Entity/Group.php
+++ b/app/code/core/Mage/Customer/Model/Entity/Group.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
/**
@@ -66,8 +66,8 @@ protected function _afterDelete(Mage_Core_Model_Abstract $group)
foreach ($customerCollection as $customer) {
$defaultGroupId = Mage::getStoreConfig(Mage_Customer_Model_Group::XML_PATH_DEFAULT_ID, $customer->getStoreId());
$customer->setGroupId($defaultGroupId);
- $customer->save();
+ $customer->save();
}
return parent::_afterDelete($group);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Customer/Model/Entity/Group/Collection.php b/app/code/core/Mage/Customer/Model/Entity/Group/Collection.php
index 64a61b536b..7e8c0741a9 100644
--- a/app/code/core/Mage/Customer/Model/Entity/Group/Collection.php
+++ b/app/code/core/Mage/Customer/Model/Entity/Group/Collection.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
/**
@@ -75,4 +75,4 @@ public function toOptionHash()
{
return parent::_toOptionHash('customer_group_id', 'customer_group_code');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Customer/Model/Entity/Setup.php b/app/code/core/Mage/Customer/Model/Entity/Setup.php
index 3d796143e7..cb75988e29 100644
--- a/app/code/core/Mage/Customer/Model/Entity/Setup.php
+++ b/app/code/core/Mage/Customer/Model/Entity/Setup.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
@@ -157,15 +157,22 @@ public function getDefaultEntities()
'backend' => 'customer/customer_attribute_backend_shipping',
),
'taxvat' => array(
- 'label' => 'Tax/VAT number',
+ 'label' => 'Tax/VAT Number',
'visible' => true,
'required' => false,
),
'confirmation' => array(
- 'label' => 'Is confirmed',
+ 'label' => 'Is Confirmed',
'visible' => false,
'required' => false,
),
+ 'created_at' => array(
+ 'type' => 'static',
+ 'label' => 'Created At',
+ 'visible' => false,
+ 'required' => false,
+ 'input' => 'date',
+ ),
),
),
diff --git a/app/code/core/Mage/Customer/Model/Entity/Wishlist/Collection.php b/app/code/core/Mage/Customer/Model/Entity/Wishlist/Collection.php
index 5b8e539991..a06946361e 100644
--- a/app/code/core/Mage/Customer/Model/Entity/Wishlist/Collection.php
+++ b/app/code/core/Mage/Customer/Model/Entity/Wishlist/Collection.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
/**
@@ -37,4 +37,4 @@ protected function _construct()
{
$this->setEntity(Mage::getResourceSingleton('customer/wishlist'));
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Customer/Model/Group.php b/app/code/core/Mage/Customer/Model/Group.php
index a8ecb7dd08..8e1028af7c 100644
--- a/app/code/core/Mage/Customer/Model/Group.php
+++ b/app/code/core/Mage/Customer/Model/Group.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Customer/Model/Group/Api.php b/app/code/core/Mage/Customer/Model/Group/Api.php
index daec990158..aadf2cc74a 100644
--- a/app/code/core/Mage/Customer/Model/Group/Api.php
+++ b/app/code/core/Mage/Customer/Model/Group/Api.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
/**
@@ -50,4 +50,4 @@ public function items()
return $result;
}
-} // Class Mage_Customer_Model_Group_Api End
\ No newline at end of file
+} // Class Mage_Customer_Model_Group_Api End
diff --git a/app/code/core/Mage/Customer/Model/Group/Api/V2.php b/app/code/core/Mage/Customer/Model/Group/Api/V2.php
index 9a2f69e154..220c1f4062 100644
--- a/app/code/core/Mage/Customer/Model/Group/Api/V2.php
+++ b/app/code/core/Mage/Customer/Model/Group/Api/V2.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
/**
@@ -33,4 +33,4 @@
*/
class Mage_Customer_Model_Group_Api_V2 extends Mage_Customer_Model_Group_Api
{
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Customer/Model/Observer.php b/app/code/core/Mage/Customer/Model/Observer.php
index e678a775e0..1f1c31bc09 100644
--- a/app/code/core/Mage/Customer/Model/Observer.php
+++ b/app/code/core/Mage/Customer/Model/Observer.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
/**
@@ -35,7 +35,7 @@ public function beforeLoadLayout($observer)
{
$loggedIn = Mage::getSingleton('customer/session')->isLoggedIn();
- $observer->getEvent()->getLayout()->getUpdate()
- ->addHandle('customer_logged_'.($loggedIn?'in':'out'));
+ $observer->getEvent()->getLayout()->getUpdate()
+ ->addHandle('customer_logged_'.($loggedIn?'in':'out'));
}
}
diff --git a/app/code/core/Mage/Customer/Model/Session.php b/app/code/core/Mage/Customer/Model/Session.php
index da5ba9b783..4847f7da68 100644
--- a/app/code/core/Mage/Customer/Model/Session.php
+++ b/app/code/core/Mage/Customer/Model/Session.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Customer/controllers/AccountController.php b/app/code/core/Mage/Customer/controllers/AccountController.php
index f942838099..fd6e5b9460 100644
--- a/app/code/core/Mage/Customer/controllers/AccountController.php
+++ b/app/code/core/Mage/Customer/controllers/AccountController.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
/**
@@ -137,8 +137,7 @@ public function loginPostAction()
if ($session->getCustomer()->getIsJustConfirmed()) {
$this->_welcomeCustomer($session->getCustomer(), true);
}
- }
- catch (Exception $e) {
+ } catch (Mage_Core_Exception $e) {
switch ($e->getCode()) {
case Mage_Customer_Model_Customer::EXCEPTION_EMAIL_NOT_CONFIRMED:
$message = Mage::helper('customer')->__('This account is not confirmed. Click here to resend confirmation email.',
@@ -153,6 +152,8 @@ public function loginPostAction()
}
$session->addError($message);
$session->setUsername($login['username']);
+ } catch (Exception $e) {
+ // Mage::logException($e); // PA DSS violation: this exception log can disclose customer password
}
} else {
$session->addError($this->__('Login and password are required'));
@@ -235,10 +236,12 @@ public function createAction()
*/
public function createPostAction()
{
- if ($this->_getSession()->isLoggedIn()) {
+ $session = $this->_getSession();
+ if ($session->isLoggedIn()) {
$this->_redirect('*/*/');
return;
}
+ $session->setEscapeMessages(true); // prevent XSS injection in user input
if ($this->getRequest()->isPost()) {
$errors = array();
@@ -289,45 +292,49 @@ public function createPostAction()
$customer->save();
if ($customer->isConfirmationRequired()) {
- $customer->sendNewAccountEmail('confirmation', $this->_getSession()->getBeforeAuthUrl());
- $this->_getSession()->addSuccess($this->__('Account confirmation is required. Please, check your e-mail for confirmation link. To resend confirmation email please click here.',
+ $customer->sendNewAccountEmail('confirmation', $session->getBeforeAuthUrl());
+ $session->addSuccess($this->__('Account confirmation is required. Please, check your e-mail for confirmation link. To resend confirmation email please click here.',
Mage::helper('customer')->getEmailConfirmationUrl($customer->getEmail())
));
$this->_redirectSuccess(Mage::getUrl('*/*/index', array('_secure'=>true)));
return;
}
else {
- $this->_getSession()->setCustomerAsLoggedIn($customer);
+ $session->setCustomerAsLoggedIn($customer);
$url = $this->_welcomeCustomer($customer);
$this->_redirectSuccess($url);
return;
}
} else {
- $this->_getSession()->setCustomerFormData($this->getRequest()->getPost());
+ $session->setCustomerFormData($this->getRequest()->getPost());
if (is_array($errors)) {
foreach ($errors as $errorMessage) {
- $this->_getSession()->addError($errorMessage);
+ $session->addError($errorMessage);
}
}
else {
- $this->_getSession()->addError($this->__('Invalid customer data'));
+ $session->addError($this->__('Invalid customer data'));
}
}
}
catch (Mage_Core_Exception $e) {
- $this->_getSession()->addError($e->getMessage())
- ->setCustomerFormData($this->getRequest()->getPost());
+ $session->setCustomerFormData($this->getRequest()->getPost());
+ if ($e->getCode() === Mage_Customer_Model_Customer::EXCEPTION_EMAIL_EXISTS) {
+ $url = Mage::getUrl('customer/account/forgotpassword');
+ $message = $this->__('There is already an account with this emails address. If you are sure that it is your email address, click here to get your password and access your account.', $url);
+ $session->setEscapeMessages(false);
+ }
+ else {
+ $message = $e->getMessage();
+ }
+ $session->addError($message);
}
catch (Exception $e) {
- $this->_getSession()->setCustomerFormData($this->getRequest()->getPost())
+ $session->setCustomerFormData($this->getRequest()->getPost())
->addException($e, $this->__('Can\'t save customer'));
}
}
- /**
- * Protect XSS injection in user input
- */
- $this->_getSession()->setEscapeMessages(true);
- $this->_redirectError(Mage::getUrl('*/*/create', array('_secure'=>true)));
+ $this->_redirectError(Mage::getUrl('*/*/create', array('_secure' => true)));
}
/**
diff --git a/app/code/core/Mage/Customer/controllers/AddressController.php b/app/code/core/Mage/Customer/controllers/AddressController.php
index a20899cb0d..c5df8fe66f 100644
--- a/app/code/core/Mage/Customer/controllers/AddressController.php
+++ b/app/code/core/Mage/Customer/controllers/AddressController.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
@@ -132,7 +132,7 @@ public function formPostAction()
$this->_getSession()->setAddressFormData($this->getRequest()->getPost());
if (is_array($accressValidation)) {
foreach ($accressValidation as $errorMessage) {
- $this->_getSession()->addError($errorMessage);
+ $this->_getSession()->addError($errorMessage);
}
} else {
$this->_getSession()->addError($this->__('Can\'t save address'));
diff --git a/app/code/core/Mage/Customer/controllers/ReviewController.php b/app/code/core/Mage/Customer/controllers/ReviewController.php
index 41c1c8cf34..c441979929 100644
--- a/app/code/core/Mage/Customer/controllers/ReviewController.php
+++ b/app/code/core/Mage/Customer/controllers/ReviewController.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Customer/etc/adminhtml.xml b/app/code/core/Mage/Customer/etc/adminhtml.xml
index 0fd6a9c9d0..0c741f4f75 100644
--- a/app/code/core/Mage/Customer/etc/adminhtml.xml
+++ b/app/code/core/Mage/Customer/etc/adminhtml.xml
@@ -19,10 +19,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_Customer
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ * @category Mage
+ * @package Mage_Customer
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
@@ -35,17 +35,17 @@
Manage Customers
adminhtml/customer/
- admin/customerlist
+ 0
Customer Groups
adminhtml/customer_group/
- admin/customer/group
+ 10
Online Customers
adminhtml/customer_online/
- admin/customer/online
+ 100
@@ -60,15 +60,15 @@
Customer Groups
- 0
+ 10
Manage Customers
- 10
+ 0
Online Customers
- 20
+ 100
diff --git a/app/code/core/Mage/Customer/etc/api.xml b/app/code/core/Mage/Customer/etc/api.xml
index dca680eade..ce4a21e07b 100644
--- a/app/code/core/Mage/Customer/etc/api.xml
+++ b/app/code/core/Mage/Customer/etc/api.xml
@@ -21,8 +21,8 @@
*
* @category Mage
* @package Mage_Customer
- * @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)
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
@@ -176,4 +176,4 @@
-
\ No newline at end of file
+
diff --git a/app/code/core/Mage/Customer/etc/config.xml b/app/code/core/Mage/Customer/etc/config.xml
index 36cd15f621..852b02935e 100644
--- a/app/code/core/Mage/Customer/etc/config.xml
+++ b/app/code/core/Mage/Customer/etc/config.xml
@@ -19,16 +19,16 @@
* 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_Customer
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ * @category Mage
+ * @package Mage_Customer
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
- 1.4.0.0.2
+ 1.4.0.0.4
@@ -312,4 +312,4 @@ T: {{var telephone}}
-
\ No newline at end of file
+
diff --git a/app/code/core/Mage/Customer/etc/system.xml b/app/code/core/Mage/Customer/etc/system.xml
index bd278e909d..98b6daf33d 100644
--- a/app/code/core/Mage/Customer/etc/system.xml
+++ b/app/code/core/Mage/Customer/etc/system.xml
@@ -19,10 +19,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_Customer
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ * @category Mage
+ * @package Mage_Customer
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-install-0.7.0.php
index 190ad8d72a..145ec4e04b 100644
--- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-install-0.7.0.php
+++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-install-0.7.0.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-install-0.8.0.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-install-0.8.0.php
index 6892ec64d0..2e41c29d6e 100644
--- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-install-0.8.0.php
+++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-install-0.8.0.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
@@ -245,4 +245,4 @@
INSERT INTO `{$installer->getTable('customer_group')}` VALUES(0, 'NOT LOGGED IN', 3), (1, 'General', 3), (2, 'Wholesale', 3), (3, 'Retailer', 3);
");
$installer->endSetup();
-$installer->installEntities();
\ No newline at end of file
+$installer->installEntities();
diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-install-1.4.0.0.0.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-install-1.4.0.0.0.php
index 06e482f0a2..a9c3ec365f 100644
--- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-install-1.4.0.0.0.php
+++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-install-1.4.0.0.0.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
@@ -637,4 +637,4 @@
'fieldset_id' => $fieldsetId,
'attribute_id' => $installer->getAttributeId($entityTypeId, 'country_id'),
'sort_order' => $elementSort++
-));
\ No newline at end of file
+));
diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.6.1-0.7.0.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.6.1-0.7.0.php
index 5432bb1db0..2f2b639cf1 100644
--- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.6.1-0.7.0.php
+++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.6.1-0.7.0.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
$this->startSetup()->run("
diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.7.0-0.7.1.php
index 7a91496064..e5fc69d2ba 100644
--- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.7.0-0.7.1.php
+++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.7.0-0.7.1.php
@@ -18,9 +18,9 @@
* 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_Customer
- * @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_Customer
+ * @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)
*/
diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.7.1-0.7.2.php
index 5cbce1c5d1..fe4d5f811f 100644
--- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.7.1-0.7.2.php
+++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.7.1-0.7.2.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
/**
@@ -73,4 +73,4 @@
$this->getConnection()->dropColumn($this->getTable('customer_address_entity_decimal'), 'store_id');
$this->getConnection()->dropColumn($this->getTable('customer_address_entity_datetime'), 'store_id');
-$installer->endSetup();
\ No newline at end of file
+$installer->endSetup();
diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.7.2-0.7.3.php
index 044bf865a9..48a93407a2 100644
--- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.7.2-0.7.3.php
+++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.7.2-0.7.3.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
$installer = $this;
@@ -63,4 +63,4 @@
$installer->getConnection()->dropColumn($this->getTable('customer_entity'), 'parent_id');
$installer->installEntities();
-$installer->endSetup();
\ No newline at end of file
+$installer->endSetup();
diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.0-0.8.1.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.0-0.8.1.php
index 8ec4abcbe9..4739858411 100644
--- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.0-0.8.1.php
+++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.0-0.8.1.php
@@ -1,27 +1,27 @@
-installEntities();
\ No newline at end of file
+installEntities();
diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.10-0.8.11.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.10-0.8.11.php
index d2bf9e7c0f..16a827df8d 100644
--- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.10-0.8.11.php
+++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.10-0.8.11.php
@@ -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_Customer
- * @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)
+ * @category Mage
+ * @package Mage_Customer
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.11-0.8.12.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.11-0.8.12.php
index ac5b35c2a7..ef7f975d3d 100644
--- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.11-0.8.12.php
+++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.11-0.8.12.php
@@ -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_Customer
- * @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)
+ * @category Mage
+ * @package Mage_Customer
+ * @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)
*/
diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.12-1.4.0.0.0.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.12-1.4.0.0.0.php
index b324bc9db4..337b529c6e 100644
--- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.12-1.4.0.0.0.php
+++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.12-1.4.0.0.0.php
@@ -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_Customer
- * @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)
+ * @category Mage
+ * @package Mage_Customer
+ * @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)
*/
/* @var $installer Mage_Customer_Model_Entity_Setup */
diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.2-0.8.3.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.2-0.8.3.php
index 7a91496064..e5fc69d2ba 100644
--- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.2-0.8.3.php
+++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.2-0.8.3.php
@@ -18,9 +18,9 @@
* 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_Customer
- * @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_Customer
+ * @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)
*/
diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.4-0.8.5.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.4-0.8.5.php
index 5c4d0106d7..8638597b9b 100644
--- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.4-0.8.5.php
+++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.4-0.8.5.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
if ($attrId = $this->getAttribute('customer', 'birthdate', 'attribute_id')) {
diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.5-0.8.6.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.5-0.8.6.php
index 08670e57d3..b006a7beec 100644
--- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.5-0.8.6.php
+++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.5-0.8.6.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.6-0.8.7.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.6-0.8.7.php
index 014af28901..8d6a30f91c 100644
--- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.6-0.8.7.php
+++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.6-0.8.7.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.7-0.8.8.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.7-0.8.8.php
index 88275e9d9e..e964dfcb2c 100644
--- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.7-0.8.8.php
+++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.7-0.8.8.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.8-0.8.9.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.8-0.8.9.php
index 29c1f45ac6..01bd201a15 100644
--- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.8-0.8.9.php
+++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.8-0.8.9.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
$installer = $this;
@@ -41,4 +41,4 @@
$installer->getConnection()->addKey($installer->getTable('customer_entity_text'), 'IDX_VALUE', array('entity_id', 'attribute_id'));
$installer->getConnection()->addKey($installer->getTable('customer_entity_varchar'), 'IDX_VALUE', array('entity_id', 'attribute_id', 'value'));
-$installer->endSetup();
\ No newline at end of file
+$installer->endSetup();
diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.9-0.8.10.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.9-0.8.10.php
index 44cede0737..ae7363da65 100644
--- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.9-0.8.10.php
+++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.9-0.8.10.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
$installer = $this;
@@ -60,4 +60,4 @@
$installer->getConnection()->addKey($tableName, 'IDX_ATTRIBUTE_VALUE', array('entity_id', 'attribute_id'), 'unique');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.0-1.4.0.0.1.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.0-1.4.0.0.1.php
index 9b2de6b41c..590264db5f 100644
--- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.0-1.4.0.0.1.php
+++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.0-1.4.0.0.1.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
$installer = $this;
@@ -46,7 +46,7 @@
$attributeId = (int)$installer->getAttribute('customer', 'gender', 'attribute_id');
foreach (array('Male', 'Female') as $sortOrder => $label) {
- // add option
+ // add option
$data = array(
'attribute_id' => $attributeId,
'sort_order' => $sortOrder,
diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.1-1.4.0.0.2.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.1-1.4.0.0.2.php
index f8b528eac9..716666eb8a 100644
--- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.1-1.4.0.0.2.php
+++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.1-1.4.0.0.2.php
@@ -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_Customer
- * @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_Customer
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.2-1.4.0.0.3.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.2-1.4.0.0.3.php
new file mode 100644
index 0000000000..fc9bfc17dc
--- /dev/null
+++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.2-1.4.0.0.3.php
@@ -0,0 +1,40 @@
+startSetup();
+
+$this->addAttribute('customer', 'created_at', array(
+ 'type' => 'static',
+ 'label' => 'Created At',
+ 'visible' => false,
+ 'required' => false,
+ 'input' => 'date',
+));
+
+$installer->endSetup();
diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.3-1.4.0.0.4.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.3-1.4.0.0.4.php
new file mode 100644
index 0000000000..cc55d396d2
--- /dev/null
+++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.3-1.4.0.0.4.php
@@ -0,0 +1,31 @@
+updateAttribute('customer_address', 'region_id', 'frontend_label', 'State/Province');
+
diff --git a/app/code/core/Mage/Cybermut/Block/Error.php b/app/code/core/Mage/Cybermut/Block/Error.php
index 84cf3fa4fd..41eff0b517 100644
--- a/app/code/core/Mage/Cybermut/Block/Error.php
+++ b/app/code/core/Mage/Cybermut/Block/Error.php
@@ -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_Cybermut
- * @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_Cybermut
+ * @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)
*/
/**
@@ -34,4 +34,4 @@
*/
class Mage_Cybermut_Block_Error extends Mage_Core_Block_Template
{
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Cybermut/Block/Form.php b/app/code/core/Mage/Cybermut/Block/Form.php
index 1a7d7f7dd9..b440ad58c7 100644
--- a/app/code/core/Mage/Cybermut/Block/Form.php
+++ b/app/code/core/Mage/Cybermut/Block/Form.php
@@ -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_Cybermut
- * @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_Cybermut
+ * @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)
*/
/**
@@ -40,4 +40,4 @@ protected function _construct()
parent::_construct();
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Cybermut/Block/Redirect.php b/app/code/core/Mage/Cybermut/Block/Redirect.php
index c190c31bc9..be8cc3e81a 100644
--- a/app/code/core/Mage/Cybermut/Block/Redirect.php
+++ b/app/code/core/Mage/Cybermut/Block/Redirect.php
@@ -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_Cybermut
- * @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_Cybermut
+ * @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)
*/
/**
@@ -64,4 +64,4 @@ protected function _toHtml()
return $html;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Cybermut/Helper/Data.php b/app/code/core/Mage/Cybermut/Helper/Data.php
index d74e0f7451..cfda934a0e 100644
--- a/app/code/core/Mage/Cybermut/Helper/Data.php
+++ b/app/code/core/Mage/Cybermut/Helper/Data.php
@@ -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_Cybermut
- * @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_Cybermut
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Cybermut/Model/Api/Debug.php b/app/code/core/Mage/Cybermut/Model/Api/Debug.php
index 3945524e6e..d81ed2c28f 100644
--- a/app/code/core/Mage/Cybermut/Model/Api/Debug.php
+++ b/app/code/core/Mage/Cybermut/Model/Api/Debug.php
@@ -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_Cybermut
- * @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_Cybermut
+ * @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)
*/
/**
@@ -38,4 +38,4 @@ protected function _construct()
{
$this->_init('cybermut/api_debug');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Cybermut/Model/Mysql4/Api/Debug.php b/app/code/core/Mage/Cybermut/Model/Mysql4/Api/Debug.php
index 77c8a9c873..03ffbd8e07 100644
--- a/app/code/core/Mage/Cybermut/Model/Mysql4/Api/Debug.php
+++ b/app/code/core/Mage/Cybermut/Model/Mysql4/Api/Debug.php
@@ -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_Cybermut
- * @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_Cybermut
+ * @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)
*/
/**
@@ -39,4 +39,4 @@ protected function _construct()
{
$this->_init('cybermut/api_debug', 'debug_id');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Cybermut/Model/Mysql4/Api/Debug/Collection.php b/app/code/core/Mage/Cybermut/Model/Mysql4/Api/Debug/Collection.php
index af8c6fdd21..96a02589da 100644
--- a/app/code/core/Mage/Cybermut/Model/Mysql4/Api/Debug/Collection.php
+++ b/app/code/core/Mage/Cybermut/Model/Mysql4/Api/Debug/Collection.php
@@ -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_Cybermut
- * @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_Cybermut
+ * @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)
*/
/**
@@ -38,4 +38,4 @@ protected function _construct()
{
$this->_init('cybermut/api_debug');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Cybermut/Model/Mysql4/Setup.php b/app/code/core/Mage/Cybermut/Model/Mysql4/Setup.php
index 6685e3e520..5ebe774184 100644
--- a/app/code/core/Mage/Cybermut/Model/Mysql4/Setup.php
+++ b/app/code/core/Mage/Cybermut/Model/Mysql4/Setup.php
@@ -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_Cybermut
- * @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_Cybermut
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Cybermut/Model/Payment.php b/app/code/core/Mage/Cybermut/Model/Payment.php
index 2503598703..12cb0ccb36 100644
--- a/app/code/core/Mage/Cybermut/Model/Payment.php
+++ b/app/code/core/Mage/Cybermut/Model/Payment.php
@@ -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_Cybermut
- * @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_Cybermut
+ * @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)
*/
/**
@@ -366,4 +366,4 @@ public function getErrorResponse()
return implode("\n", $response) . "\n";
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Cybermut/Model/Source/Bank.php b/app/code/core/Mage/Cybermut/Model/Source/Bank.php
index c2a88b1f18..01376f60ff 100644
--- a/app/code/core/Mage/Cybermut/Model/Source/Bank.php
+++ b/app/code/core/Mage/Cybermut/Model/Source/Bank.php
@@ -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_Cybermut
- * @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_Cybermut
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Cybermut/Model/Source/Language.php b/app/code/core/Mage/Cybermut/Model/Source/Language.php
index 40d2767b6d..f8b7d18235 100644
--- a/app/code/core/Mage/Cybermut/Model/Source/Language.php
+++ b/app/code/core/Mage/Cybermut/Model/Source/Language.php
@@ -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_Cybermut
- * @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_Cybermut
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Cybermut/controllers/PaymentController.php b/app/code/core/Mage/Cybermut/controllers/PaymentController.php
index c1954f7803..6e0710c84d 100644
--- a/app/code/core/Mage/Cybermut/controllers/PaymentController.php
+++ b/app/code/core/Mage/Cybermut/controllers/PaymentController.php
@@ -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_Cybermut
- * @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_Cybermut
+ * @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)
*/
/**
@@ -204,4 +204,4 @@ public function errorAction()
$this->renderLayout();
Mage::getSingleton('checkout/session')->unsLastRealOrderId();
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Cybermut/etc/config.xml b/app/code/core/Mage/Cybermut/etc/config.xml
index af1e5b0c80..3a21a03b95 100644
--- a/app/code/core/Mage/Cybermut/etc/config.xml
+++ b/app/code/core/Mage/Cybermut/etc/config.xml
@@ -19,10 +19,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_Cybermut
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ * @category Mage
+ * @package Mage_Cybermut
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
@@ -107,4 +107,4 @@
-
\ No newline at end of file
+
diff --git a/app/code/core/Mage/Cybermut/etc/system.xml b/app/code/core/Mage/Cybermut/etc/system.xml
index d6c6715109..035793feca 100644
--- a/app/code/core/Mage/Cybermut/etc/system.xml
+++ b/app/code/core/Mage/Cybermut/etc/system.xml
@@ -19,10 +19,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_Cybermut
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ * @category Mage
+ * @package Mage_Cybermut
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
@@ -171,4 +171,4 @@
-
\ No newline at end of file
+
diff --git a/app/code/core/Mage/Cybermut/sql/cybermut_setup/mysql4-install-0.1.0.php b/app/code/core/Mage/Cybermut/sql/cybermut_setup/mysql4-install-0.1.0.php
index 4654ce38db..78bd7163ce 100644
--- a/app/code/core/Mage/Cybermut/sql/cybermut_setup/mysql4-install-0.1.0.php
+++ b/app/code/core/Mage/Cybermut/sql/cybermut_setup/mysql4-install-0.1.0.php
@@ -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_Cybermut
- * @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_Cybermut
+ * @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)
*/
@@ -42,4 +42,4 @@
");
-$installer->endSetup();
\ No newline at end of file
+$installer->endSetup();
diff --git a/app/code/core/Mage/Cybersource/Block/Form.php b/app/code/core/Mage/Cybersource/Block/Form.php
index 4ef8fe0a67..5391c7ca43 100644
--- a/app/code/core/Mage/Cybersource/Block/Form.php
+++ b/app/code/core/Mage/Cybersource/Block/Form.php
@@ -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_Cybersource
- * @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_Cybersource
+ * @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)
*/
@@ -93,4 +93,4 @@ public function hasSsCardType()
return false;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Cybersource/Block/Info.php b/app/code/core/Mage/Cybersource/Block/Info.php
index b0b4ba4734..1028e1c058 100644
--- a/app/code/core/Mage/Cybersource/Block/Info.php
+++ b/app/code/core/Mage/Cybersource/Block/Info.php
@@ -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_Cybersource
- * @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_Cybersource
+ * @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)
*/
@@ -72,4 +72,4 @@ public function toPdf()
$this->setTemplate('cybersource/pdf/info.phtml');
return $this->toHtml();
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Cybersource/Helper/Data.php b/app/code/core/Mage/Cybersource/Helper/Data.php
index 45ecd1025e..2099d8735e 100644
--- a/app/code/core/Mage/Cybersource/Helper/Data.php
+++ b/app/code/core/Mage/Cybersource/Helper/Data.php
@@ -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_Cybersource
- * @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_Cybersource
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Cybersource/Model/Api/Debug.php b/app/code/core/Mage/Cybersource/Model/Api/Debug.php
index 9110d9bd7f..59dee8935b 100644
--- a/app/code/core/Mage/Cybersource/Model/Api/Debug.php
+++ b/app/code/core/Mage/Cybersource/Model/Api/Debug.php
@@ -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_Cybersource
- * @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_Cybersource
+ * @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)
*/
/**
@@ -35,4 +35,4 @@ protected function _construct()
{
$this->_init('cybersource/api_debug');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Cybersource/Model/Api/ExtendedSoapClient.php b/app/code/core/Mage/Cybersource/Model/Api/ExtendedSoapClient.php
index 1f4379f067..7ce6be9caa 100644
--- a/app/code/core/Mage/Cybersource/Model/Api/ExtendedSoapClient.php
+++ b/app/code/core/Mage/Cybersource/Model/Api/ExtendedSoapClient.php
@@ -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_Cybersource
- * @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_Cybersource
+ * @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_Cybersource_Model_Api_ExtendedSoapClient extends SoapClient
{
diff --git a/app/code/core/Mage/Cybersource/Model/Config.php b/app/code/core/Mage/Cybersource/Model/Config.php
index 62c9c2ed2b..9c0fd1e159 100644
--- a/app/code/core/Mage/Cybersource/Model/Config.php
+++ b/app/code/core/Mage/Cybersource/Model/Config.php
@@ -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_Cybersource
- * @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_Cybersource
+ * @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_Cybersource_Model_Config extends Mage_Payment_Model_Config
{
@@ -59,4 +59,4 @@ public function addExtraCcTypes()
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Cybersource/Model/Mysql4/Api/Debug.php b/app/code/core/Mage/Cybersource/Model/Mysql4/Api/Debug.php
index ad56f58673..fae3f152df 100644
--- a/app/code/core/Mage/Cybersource/Model/Mysql4/Api/Debug.php
+++ b/app/code/core/Mage/Cybersource/Model/Mysql4/Api/Debug.php
@@ -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_Cybersource
- * @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_Cybersource
+ * @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)
*/
/**
@@ -36,4 +36,4 @@ protected function _construct()
{
$this->_init('cybersource/api_debug', 'debug_id');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Cybersource/Model/Mysql4/Api/Debug/Collection.php b/app/code/core/Mage/Cybersource/Model/Mysql4/Api/Debug/Collection.php
index 3c3231f6ea..3d6cc2925d 100644
--- a/app/code/core/Mage/Cybersource/Model/Mysql4/Api/Debug/Collection.php
+++ b/app/code/core/Mage/Cybersource/Model/Mysql4/Api/Debug/Collection.php
@@ -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_Cybersource
- * @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_Cybersource
+ * @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)
*/
/**
@@ -36,4 +36,4 @@ protected function _construct()
{
$this->_init('cybersource/api_debug');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Cybersource/Model/Mysql4/Setup.php b/app/code/core/Mage/Cybersource/Model/Mysql4/Setup.php
index ce4af91562..0166b2eb15 100644
--- a/app/code/core/Mage/Cybersource/Model/Mysql4/Setup.php
+++ b/app/code/core/Mage/Cybersource/Model/Mysql4/Setup.php
@@ -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_Cybersource
- * @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_Cybersource
+ * @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)
*/
diff --git a/app/code/core/Mage/Cybersource/Model/Soap.php b/app/code/core/Mage/Cybersource/Model/Soap.php
index 282bed038e..8becec4ca6 100644
--- a/app/code/core/Mage/Cybersource/Model/Soap.php
+++ b/app/code/core/Mage/Cybersource/Model/Soap.php
@@ -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_cybersource
- * @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_Cybersource
+ * @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)
*/
@@ -167,7 +167,7 @@ public function validate()
$errorMsg = $this->_getHelper()->__('Credit card type is not allowed for this payment method');
}
- //validate credit card verification number
+ //validate credit card verification number
if ($errorMsg === false && $this->hasVerification()) {
$verifcationRegEx = $this->getVerificationRegEx();
$regExp = isset($verifcationRegEx[$info->getCcType()]) ? $verifcationRegEx[$info->getCcType()] : '';
@@ -217,7 +217,7 @@ protected function iniRequest()
*/
protected function _generateReferenceCode()
{
- return md5(microtime() . rand(0, time()));
+ return Mage::helper('core')->uniqHash();
}
/**
@@ -576,4 +576,4 @@ public function processCreditmemo($creditmemo, $payment)
$creditmemo->setCybersourceToken($payment->getLastCybersourceToken());
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Cybersource/Model/Source/Cctype.php b/app/code/core/Mage/Cybersource/Model/Source/Cctype.php
index 3dac091eba..6c8a974562 100644
--- a/app/code/core/Mage/Cybersource/Model/Source/Cctype.php
+++ b/app/code/core/Mage/Cybersource/Model/Source/Cctype.php
@@ -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_PaypalUk
- * @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_Cybersource
+ * @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_Cybersource_Model_Source_Cctype extends Mage_Payment_Model_Source_Cctype
@@ -30,4 +30,4 @@ public function getAllowedTypes()
{
return array('VI', 'MC', 'AE', 'DI', 'JCB', 'LASER', 'UATP', 'MCI', 'SS', 'OT');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Cybersource/Model/Source/PaymentAction.php b/app/code/core/Mage/Cybersource/Model/Source/PaymentAction.php
index 7670d516f8..71199b0dc1 100644
--- a/app/code/core/Mage/Cybersource/Model/Source/PaymentAction.php
+++ b/app/code/core/Mage/Cybersource/Model/Source/PaymentAction.php
@@ -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_Cybersource
- * @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_Cybersource
+ * @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)
*/
/**
@@ -39,4 +39,4 @@ public function toOptionArray()
array('value' => Mage_Payment_Model_Method_Abstract::ACTION_AUTHORIZE_CAPTURE, 'label' => Mage::helper('cybersource')->__('Sale')),
);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Cybersource/etc/config.xml b/app/code/core/Mage/Cybersource/etc/config.xml
index 7c78413b99..dfdc1738ec 100644
--- a/app/code/core/Mage/Cybersource/etc/config.xml
+++ b/app/code/core/Mage/Cybersource/etc/config.xml
@@ -19,10 +19,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_Cybersource
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ * @category Mage
+ * @package Mage_Cybersource
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
diff --git a/app/code/core/Mage/Cybersource/etc/system.xml b/app/code/core/Mage/Cybersource/etc/system.xml
index 82726a99e0..0333a94ade 100644
--- a/app/code/core/Mage/Cybersource/etc/system.xml
+++ b/app/code/core/Mage/Cybersource/etc/system.xml
@@ -19,10 +19,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_Paypal
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ * @category Mage
+ * @package Mage_Cybersource
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
@@ -157,4 +157,4 @@
-
\ No newline at end of file
+
diff --git a/app/code/core/Mage/Cybersource/sql/cybersource_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Cybersource/sql/cybersource_setup/mysql4-install-0.7.0.php
index 49ef373974..5cfd6dc68f 100644
--- a/app/code/core/Mage/Cybersource/sql/cybersource_setup/mysql4-install-0.7.0.php
+++ b/app/code/core/Mage/Cybersource/sql/cybersource_setup/mysql4-install-0.7.0.php
@@ -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_CyberSource
- * @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_Cybersource
+ * @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)
*/
diff --git a/app/code/core/Mage/Dataflow/Helper/Data.php b/app/code/core/Mage/Dataflow/Helper/Data.php
index b6df390565..b78ed5fe78 100644
--- a/app/code/core/Mage/Dataflow/Helper/Data.php
+++ b/app/code/core/Mage/Dataflow/Helper/Data.php
@@ -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_Dataflow
- * @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_Dataflow
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Dataflow/Model/Batch.php b/app/code/core/Mage/Dataflow/Model/Batch.php
index 1ec0f42e2d..45e96dfb34 100644
--- a/app/code/core/Mage/Dataflow/Model/Batch.php
+++ b/app/code/core/Mage/Dataflow/Model/Batch.php
@@ -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_Dataflow
- * @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_Dataflow
+ * @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)
*/
diff --git a/app/code/core/Mage/Dataflow/Model/Batch/Abstract.php b/app/code/core/Mage/Dataflow/Model/Batch/Abstract.php
index 2ebd914b0e..cecc99d0e7 100644
--- a/app/code/core/Mage/Dataflow/Model/Batch/Abstract.php
+++ b/app/code/core/Mage/Dataflow/Model/Batch/Abstract.php
@@ -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_Dataflow
- * @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_Dataflow
+ * @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)
*/
@@ -91,4 +91,4 @@ public function deleteCollection($batchId = null)
}
return $this->getResource()->deleteCollection($this);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Dataflow/Model/Batch/Export.php b/app/code/core/Mage/Dataflow/Model/Batch/Export.php
index afbebc1111..dde6bd7ad1 100644
--- a/app/code/core/Mage/Dataflow/Model/Batch/Export.php
+++ b/app/code/core/Mage/Dataflow/Model/Batch/Export.php
@@ -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_Dataflow
- * @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_Dataflow
+ * @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)
*/
@@ -38,4 +38,4 @@ protected function _construct()
{
$this->_init('dataflow/batch_export');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Dataflow/Model/Batch/Import.php b/app/code/core/Mage/Dataflow/Model/Batch/Import.php
index 838bb2d1c8..5e655cce11 100644
--- a/app/code/core/Mage/Dataflow/Model/Batch/Import.php
+++ b/app/code/core/Mage/Dataflow/Model/Batch/Import.php
@@ -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_Dataflow
- * @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_Dataflow
+ * @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)
*/
@@ -38,4 +38,4 @@ protected function _construct()
{
$this->_init('dataflow/batch_import');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Dataflow/Model/Batch/Io.php b/app/code/core/Mage/Dataflow/Model/Batch/Io.php
index 5d1da80bdc..4c756ecdb0 100644
--- a/app/code/core/Mage/Dataflow/Model/Batch/Io.php
+++ b/app/code/core/Mage/Dataflow/Model/Batch/Io.php
@@ -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_Dataflow
- * @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_Dataflow
+ * @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)
*/
@@ -203,4 +203,4 @@ public function getFileSize()
{
return $this->_fileSize;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Dataflow/Model/Convert.php b/app/code/core/Mage/Dataflow/Model/Convert.php
index 3c79bb5ce8..a8f21ac733 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert.php
@@ -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_Dataflow
- * @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_Dataflow
+ * @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)
*/
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Action.php b/app/code/core/Mage/Dataflow/Model/Convert/Action.php
index 2495ab30bb..558e27fb57 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Action.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Action.php
@@ -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_Dataflow
- * @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_Dataflow
+ * @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)
*/
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Action/Abstract.php b/app/code/core/Mage/Dataflow/Model/Convert/Action/Abstract.php
index de2681154b..52b86d0ead 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Action/Abstract.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Action/Abstract.php
@@ -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_Dataflow
- * @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_Dataflow
+ * @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)
*/
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Action/Interface.php b/app/code/core/Mage/Dataflow/Model/Convert/Action/Interface.php
index 04c0458252..233b604363 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Action/Interface.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Action/Interface.php
@@ -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_Dataflow
- * @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_Dataflow
+ * @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)
*/
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Abstract.php b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Abstract.php
index a3fd94862a..6abb821677 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Abstract.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Abstract.php
@@ -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_Dataflow
- * @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_Dataflow
+ * @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)
*/
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Db/Table.php b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Db/Table.php
index 035ba7c057..73c17b4170 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Db/Table.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Db/Table.php
@@ -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_Dataflow
- * @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_Dataflow
+ * @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)
*/
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Http.php b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Http.php
index f77d02ea34..f1ffc38dee 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Http.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Http.php
@@ -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_Dataflow
- * @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_Dataflow
+ * @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)
*/
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Http/Curl.php b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Http/Curl.php
index bf392890ab..b1c8ddcfc2 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Http/Curl.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Http/Curl.php
@@ -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_Dataflow
- * @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_Dataflow
+ * @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)
*/
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Interface.php b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Interface.php
index 1012da7a6b..f62f240998 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Interface.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Interface.php
@@ -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_Dataflow
- * @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_Dataflow
+ * @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)
*/
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Io.php b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Io.php
index 05320f9cf2..bf39d78449 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Io.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Io.php
@@ -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_Dataflow
- * @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_Dataflow
+ * @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)
*/
@@ -188,4 +188,4 @@ public function save()
}
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Soap.php b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Soap.php
index e8ac45f843..2278963fa8 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Soap.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Soap.php
@@ -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_Dataflow
- * @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_Dataflow
+ * @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)
*/
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Std.php b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Std.php
index 46c20b096a..44792dcfb7 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Std.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Std.php
@@ -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_Dataflow
- * @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_Dataflow
+ * @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)
*/
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Zend/Cache.php b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Zend/Cache.php
index 679d5a8e56..3b421423ed 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Zend/Cache.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Zend/Cache.php
@@ -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_Dataflow
- * @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_Dataflow
+ * @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)
*/
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Zend/Db.php b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Zend/Db.php
index 983feaea85..773021e2a2 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Zend/Db.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Zend/Db.php
@@ -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_Dataflow
- * @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_Dataflow
+ * @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)
*/
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Container/Abstract.php b/app/code/core/Mage/Dataflow/Model/Convert/Container/Abstract.php
index ac7535f813..00a90af337 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Container/Abstract.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Container/Abstract.php
@@ -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_Dataflow
- * @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_Dataflow
+ * @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)
*/
@@ -140,7 +140,7 @@ public function validateDataGrid($data=null)
if (count($data)==0) {
return true;
}
- $this->addException("Invalid data type, expecting 2D grid array.", Mage_Dataflow_Model_Convert_Exception::FATAL);
+ $this->addException("Invalid data type, expecting 2D grid array.", Mage_Dataflow_Model_Convert_Exception::FATAL);
}
return true;
}
@@ -198,4 +198,4 @@ public function getBatchParams($key = null)
}
return $this->_batchParams;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Container/Collection.php b/app/code/core/Mage/Dataflow/Model/Convert/Container/Collection.php
index 5cb5e39c03..75a9c272e1 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Container/Collection.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Container/Collection.php
@@ -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_Dataflow
- * @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_Dataflow
+ * @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)
*/
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Container/Generic.php b/app/code/core/Mage/Dataflow/Model/Convert/Container/Generic.php
index 24dd6607d4..df8efbc048 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Container/Generic.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Container/Generic.php
@@ -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_Dataflow
- * @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_Dataflow
+ * @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)
*/
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Container/Interface.php b/app/code/core/Mage/Dataflow/Model/Convert/Container/Interface.php
index c546218019..d36dd8b3d4 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Container/Interface.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Container/Interface.php
@@ -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_Dataflow
- * @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_Dataflow
+ * @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)
*/
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Exception.php b/app/code/core/Mage/Dataflow/Model/Convert/Exception.php
index 0fae53f821..5f56a88c63 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Exception.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Exception.php
@@ -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_Dataflow
- * @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_Dataflow
+ * @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)
*/
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Iterator.php b/app/code/core/Mage/Dataflow/Model/Convert/Iterator.php
index e20e78c188..62aa5f8078 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Iterator.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Iterator.php
@@ -1,5 +1,28 @@
cp($file, $this->getBatchModel()->getIoAdapter()->getFile(true));
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Csv.php b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Csv.php
index 1c9d1714c8..06911634e8 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Csv.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Csv.php
@@ -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_Dataflow
- * @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_Dataflow
+ * @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)
*/
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Interface.php b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Interface.php
index 7779fa3f3e..0dfee06d83 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Interface.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Interface.php
@@ -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_Dataflow
- * @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_Dataflow
+ * @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)
*/
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Serialize.php b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Serialize.php
index a810d2a85c..cc2279ebf2 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Serialize.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Serialize.php
@@ -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_Dataflow
- * @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_Dataflow
+ * @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)
*/
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Xml/Excel.php b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Xml/Excel.php
index 86968ed80b..b5dcc52e1b 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Xml/Excel.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Xml/Excel.php
@@ -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_Dataflow
- * @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_Dataflow
+ * @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)
*/
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Profile.php b/app/code/core/Mage/Dataflow/Model/Convert/Profile.php
index 874e337923..1bf7c3077c 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Profile.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Profile.php
@@ -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_Dataflow
- * @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_Dataflow
+ * @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)
*/
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Profile/Abstract.php b/app/code/core/Mage/Dataflow/Model/Convert/Profile/Abstract.php
index 0d3dd588b6..25225866fe 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Profile/Abstract.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Profile/Abstract.php
@@ -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_Dataflow
- * @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_Dataflow
+ * @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)
*/
@@ -159,4 +159,4 @@ function getDataflowProfile()
{
return $this->_dataflow_profile;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Profile/Collection.php b/app/code/core/Mage/Dataflow/Model/Convert/Profile/Collection.php
index 0ea13f2152..d231690e45 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Profile/Collection.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Profile/Collection.php
@@ -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_Dataflow
- * @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_Dataflow
+ * @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)
*/
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Profile/Interface.php b/app/code/core/Mage/Dataflow/Model/Convert/Profile/Interface.php
index 5167b89153..820ae6e67c 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Profile/Interface.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Profile/Interface.php
@@ -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_Dataflow
- * @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_Dataflow
+ * @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)
*/
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Validator/Abstract.php b/app/code/core/Mage/Dataflow/Model/Convert/Validator/Abstract.php
index 8b16d8e75d..b1dd15b95a 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Validator/Abstract.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Validator/Abstract.php
@@ -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_Dataflow
- * @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_Dataflow
+ * @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)
*/
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Validator/Column.php b/app/code/core/Mage/Dataflow/Model/Convert/Validator/Column.php
index 068c8ce0e1..eec300e830 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Validator/Column.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Validator/Column.php
@@ -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_Dataflow
- * @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_Dataflow
+ * @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)
*/
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Validator/Dryrun.php b/app/code/core/Mage/Dataflow/Model/Convert/Validator/Dryrun.php
index 04d090f188..91102887af 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Validator/Dryrun.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Validator/Dryrun.php
@@ -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_Dataflow
- * @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_Dataflow
+ * @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)
*/
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Validator/Interface.php b/app/code/core/Mage/Dataflow/Model/Convert/Validator/Interface.php
index 0878b0fa47..5d45e7faf1 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Validator/Interface.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Validator/Interface.php
@@ -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_Dataflow
- * @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_Dataflow
+ * @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)
*/
diff --git a/app/code/core/Mage/Dataflow/Model/Import.php b/app/code/core/Mage/Dataflow/Model/Import.php
index 2e968880c4..1d0678e076 100644
--- a/app/code/core/Mage/Dataflow/Model/Import.php
+++ b/app/code/core/Mage/Dataflow/Model/Import.php
@@ -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_Dataflow
- * @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_Dataflow
+ * @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)
*/
diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Batch.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Batch.php
index b06e1b1c3b..be7535df48 100644
--- a/app/code/core/Mage/Dataflow/Model/Mysql4/Batch.php
+++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Batch.php
@@ -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_Dataflow
- * @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_Dataflow
+ * @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)
*/
@@ -38,4 +38,4 @@ protected function _construct()
{
$this->_init('dataflow/batch', 'batch_id');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Abstract.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Abstract.php
index ccd778e8a8..7183126e0b 100644
--- a/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Abstract.php
+++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Abstract.php
@@ -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_Dataflow
- * @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_Dataflow
+ * @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)
*/
@@ -74,4 +74,4 @@ public function deleteCollection(Mage_Dataflow_Model_Batch_Abstract $object)
);
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Collection.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Collection.php
index 260aa77eaf..7bad96540b 100755
--- a/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Collection.php
+++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Collection.php
@@ -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_Dataflow
- * @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_Dataflow
+ * @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)
*/
@@ -56,4 +56,4 @@ public function addExpireFilter()
$this->getSelect()->where('created_at < ?', $expire);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Export.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Export.php
index 09f83a349f..f1c47e9e2a 100644
--- a/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Export.php
+++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Export.php
@@ -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_Dataflow
- * @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_Dataflow
+ * @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)
*/
@@ -38,4 +38,4 @@ protected function _construct()
{
$this->_init('dataflow/batch_export', 'batch_export_id');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Import.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Import.php
index 329b76672a..4825e777a4 100644
--- a/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Import.php
+++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Import.php
@@ -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_Dataflow
- * @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_Dataflow
+ * @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)
*/
@@ -38,4 +38,4 @@ protected function _construct()
{
$this->_init('dataflow/batch_import', 'batch_import_id');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Catalogold.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Catalogold.php
index 781c0a1118..3114c3386b 100644
--- a/app/code/core/Mage/Dataflow/Model/Mysql4/Catalogold.php
+++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Catalogold.php
@@ -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_Catalog
- * @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_Dataflow
+ * @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)
*/
@@ -29,202 +29,202 @@ class Mage_Catalog_Model_Mysql4_Convert
{
protected $_productsBySku;
protected $_productEntity;
- protected $_skuAttribute;
-
- public function getConnection()
- {
- return Mage::getSingleton('core/resource')->getConnection('catalog_write');
- }
-
- public function getSelect()
- {
- return $this->getConnection()->select();
- }
-
- public function getTable($table)
- {
- return Mage::getSingleton('core/resource')->getTableName($table);
- }
-
- public function getProductEntity($field=null)
- {
- if (!$this->_productEntity) {
- $this->_productEntity = Mage::getResourceModel('catalog/product')
- ->loadAllAttributes();
- }
- return is_null($field) ? $this->_productEntity : $this->_productEntity->getData($field);
- }
-
- public function getSkuAttribute($field='attribute_id')
- {
- if (!$this->_skuAttribute) {
- $this->_skuAttribute = $this->getProductEntity()->getAttribute('sku');
- }
- return $this->_skuAttribute->getData($field);
- }
-
- public function getProductIdBySku($sku)
- {
- if (!$this->_productsBySku) {
- $select = $this->getSelect()
- ->from($this->getTable('catalog/product'), array('entity_id', 'sku'));
- $products = $this->getConnection()->fetchAll($select);
-
- $this->_productsBySku = array();
- foreach ($products as $p) {
- $this->_productsBySku[$p['sku']] = $p['entity_id'];
- }
- }
- return isset($this->_productsBySku[$sku]) ? $this->_productsBySku[$sku] : false;
- }
-
- public function addProductToStore($productId, $storeId)
- {
- $write = $this->getConnection();
- $table = $this->getTable('catalog/product_store');
+ protected $_skuAttribute;
+
+ public function getConnection()
+ {
+ return Mage::getSingleton('core/resource')->getConnection('catalog_write');
+ }
+
+ public function getSelect()
+ {
+ return $this->getConnection()->select();
+ }
+
+ public function getTable($table)
+ {
+ return Mage::getSingleton('core/resource')->getTableName($table);
+ }
+
+ public function getProductEntity($field=null)
+ {
+ if (!$this->_productEntity) {
+ $this->_productEntity = Mage::getResourceModel('catalog/product')
+ ->loadAllAttributes();
+ }
+ return is_null($field) ? $this->_productEntity : $this->_productEntity->getData($field);
+ }
+
+ public function getSkuAttribute($field='attribute_id')
+ {
+ if (!$this->_skuAttribute) {
+ $this->_skuAttribute = $this->getProductEntity()->getAttribute('sku');
+ }
+ return $this->_skuAttribute->getData($field);
+ }
+
+ public function getProductIdBySku($sku)
+ {
+ if (!$this->_productsBySku) {
+ $select = $this->getSelect()
+ ->from($this->getTable('catalog/product'), array('entity_id', 'sku'));
+ $products = $this->getConnection()->fetchAll($select);
+
+ $this->_productsBySku = array();
+ foreach ($products as $p) {
+ $this->_productsBySku[$p['sku']] = $p['entity_id'];
+ }
+ }
+ return isset($this->_productsBySku[$sku]) ? $this->_productsBySku[$sku] : false;
+ }
+
+ public function addProductToStore($productId, $storeId)
+ {
+ $write = $this->getConnection();
+ $table = $this->getTable('catalog/product_store');
try {
- if (!$write->fetchOne("select * from $table where product_id=".(int)$productId." and store_id=".(int)$storeId)) {
+ if (!$write->fetchOne("select * from $table where product_id=".(int)$productId." and store_id=".(int)$storeId)) {
$write->query("insert into $table (product_id, store_id) values (".(int)$productId.",".(int)$storeId.")");
- }
+ }
} catch (Exception $e) {
throw $e;
}
- return $this;
- }
-
- public function exportAttributes()
- {
- $attributeFields = array(
- 'attribute_code',
- 'frontend_label', 'frontend_input', 'frontend_class', 'frontend_model',
- 'backend_type', 'backend_table', 'backend_model',
- 'source_model', 'attribute_model',
- 'is_visible', 'is_user_defined', 'is_global', 'is_required', 'is_unique',
- 'is_visible_on_front', 'is_searchable', 'is_filterable', 'is_comparable',
- 'default_value', 'apply_to', 'use_in_super_product',
- );
-
- $select = $this->getSelect()
- ->from(array('et'=>$this->getTable('eav/entity_type')), 'entity_type_code')
- ->join(array('a'=>$this->getTable('eav/attribute')), 'a.entity_type_id=et.entity_type_id', $attributeFields)
- ->where('et.entity_type_code in (?)', array('catalog_product', 'catalog_category'))
- ->order('if(not a.is_user_defined, 1, 2)')->order('attribute_code');
-
- $attributes = $this->getConnection()->fetchAll($select);
-
- return $attributes;
- }
-
- public function exportAttributeSets()
- {
- $select = $this->getSelect()
- ->from(array('et'=>$this->getTable('eav/entity_type')), 'entity_type_code')
- ->join(array('s'=>$this->getTable('eav/attribute_set')), 's.entity_type_id=et.entity_type_id', 'attribute_set_name')
- ->join(array('g'=>$this->getTable('eav/attribute_group')), 'g.attribute_set_id=s.attribute_set_id', 'attribute_group_name')
- ->join(array('ea'=>$this->getTable('eav/entity_attribute')), 'ea.attribute_group_id=g.attribute_group_id', array())
- ->join(array('a'=>$this->getTable('eav/attribute')), 'a.attribute_id=ea.attribute_id', 'attribute_code')
- ->where('et.entity_type_code in (?)', array('catalog_product', 'catalog_category'))
- ->order('et.entity_type_code')->order('s.sort_order')->order('g.sort_order');
-
- $sets = $this->getConnection()->fetchAll($select);
-
- return $sets;
- }
-
- public function exportAttributeOptions()
- {
- $select = $this->getSelect()
- ->from(array('et'=>$this->getTable('eav/entity_type')), 'entity_type_code')
- ->join(array('a'=>$this->getTable('eav/attribute')), 'a.entity_type_id=et.entity_type_id', 'attribute_code')
- ->join(array('ao'=>$this->getTable('eav/attribute_option')), 'ao.attribute_id=a.attribute_id', array())
- ->where('et.entity_type_code in (?)', array('catalog_product', 'catalog_category'))
- ->order('a.attribute_code')->order('ao.sort_order');
-
- $stores = Mage::getConfig()->getNode('stores')->children();
- foreach ($stores as $storeName=>$storeConfig) {
- $select->joinLeft(
- array($storeName=>$this->getTable('eav/attribute_option_value')),
- "$storeName.option_id=ao.option_id and $storeName.store_id=".$storeConfig->descend('system/store/id'),
- array($storeName=>"$storeName.value")
- );
- }
-
- $options = $this->getConnection()->fetchAll($select);
-
- return $options;
- }
-
- public function exportProductLinks()
- {
- $skuTable = $this->getTable('catalog/product').'_'.$this->getSkuAttribute('backend_type');
- $skuCond = ' and sku.store_id=0 and sku.attribute_id='.$this->getSkuAttribute('attribute_id');
-
- $select = $this->getSelect()
- ->from(array('lt'=>$this->getTable('catalog/product_link_type')), array('link_type'=>'code'))
- ->join(array('l'=>$this->getTable('catalog/product_link')), 'l.link_type_id=lt.link_type_id', array())
- ->join(array('sku'=>$skuTable), 'sku.entity_id=l.product_id'.$skuCond, array('sku'=>'value'))
- ->join(array('linked'=>$skuTable), 'linked.entity_id=l.product_id'.$skuCond, array('linked'=>'value'))
- ->order('sku')->order('link_type');
- $links = $this->getConnection()->fetchAll($select);
-
- return $links;
- }
-
- public function exportProductsInCategories()
- {
- $skuTable = $this->getTable('catalog/product').'_'.$this->getSkuAttribute('backend_type');
- $skuCond = ' and sku.store_id=0 and sku.attribute_id='.$this->getSkuAttribute('attribute_id');
-
- $select = $this->getSelect()
- ->from(array('cp'=>$this->getTable('catalog/category_product')), array('category_id', 'position'))
- ->join(array('sku'=>$skuTable), 'sku.entity_id=cp.product_id'.$skuCond, array('sku'=>'value'))
- ->order('category_id')->order('position')->order('sku');
-
- $prodCats = $this->getConnection()->fetchAll($select);
-
- return $prodCats;
- }
-
- public function exportProductsInStores()
- {
- $skuTable = $this->getTable('catalog/product').'_'.$this->getSkuAttribute('backend_type');
- $skuCond = ' and sku.store_id=0 and sku.attribute_id='.$this->getSkuAttribute('attribute_id');
-
- $select = $this->getSelect()
- ->from(array('ps'=>$this->getTable('catalog/product_store')), array())
- ->join(array('s'=>$this->getTable('core/store')), 's.store_id=ps.store_id', array('store'=>'code'))
- ->join(array('sku'=>$skuTable), 'sku.entity_id=ps.product_id'.$skuCond, array('sku'=>'value'))
- ->order('store')->order('sku');
-
- $prodStores = $this->getConnection()->fetchAll($select);
-
- return $prodStores;
- }
-
- public function exportCategories()
- {
- $collection = Mage::getResourceModel('catalog/category_collection')
- ->addAttributeToSelect('*')
- ->load();
-
- $categories = array();
- foreach ($collection as $object) {
- $row = $object->getData();
- $categories[] = $row;
- }
-
- return $categories;
- }
-
- public function exportProducts()
- {
- $attrSets = Mage::getResourceModel('eav/entity_attribute_set_collection')->load();
- $attrSetName = array();
- foreach ($attrSets as $attrSet) {
- $attrSetName[$attrSet->getId()] = $attrSet->getAttributeSetName();
- }
-
- $select = $this->getSelect()
+ return $this;
+ }
+
+ public function exportAttributes()
+ {
+ $attributeFields = array(
+ 'attribute_code',
+ 'frontend_label', 'frontend_input', 'frontend_class', 'frontend_model',
+ 'backend_type', 'backend_table', 'backend_model',
+ 'source_model', 'attribute_model',
+ 'is_visible', 'is_user_defined', 'is_global', 'is_required', 'is_unique',
+ 'is_visible_on_front', 'is_searchable', 'is_filterable', 'is_comparable',
+ 'default_value', 'apply_to', 'use_in_super_product',
+ );
+
+ $select = $this->getSelect()
+ ->from(array('et'=>$this->getTable('eav/entity_type')), 'entity_type_code')
+ ->join(array('a'=>$this->getTable('eav/attribute')), 'a.entity_type_id=et.entity_type_id', $attributeFields)
+ ->where('et.entity_type_code in (?)', array('catalog_product', 'catalog_category'))
+ ->order('if(not a.is_user_defined, 1, 2)')->order('attribute_code');
+
+ $attributes = $this->getConnection()->fetchAll($select);
+
+ return $attributes;
+ }
+
+ public function exportAttributeSets()
+ {
+ $select = $this->getSelect()
+ ->from(array('et'=>$this->getTable('eav/entity_type')), 'entity_type_code')
+ ->join(array('s'=>$this->getTable('eav/attribute_set')), 's.entity_type_id=et.entity_type_id', 'attribute_set_name')
+ ->join(array('g'=>$this->getTable('eav/attribute_group')), 'g.attribute_set_id=s.attribute_set_id', 'attribute_group_name')
+ ->join(array('ea'=>$this->getTable('eav/entity_attribute')), 'ea.attribute_group_id=g.attribute_group_id', array())
+ ->join(array('a'=>$this->getTable('eav/attribute')), 'a.attribute_id=ea.attribute_id', 'attribute_code')
+ ->where('et.entity_type_code in (?)', array('catalog_product', 'catalog_category'))
+ ->order('et.entity_type_code')->order('s.sort_order')->order('g.sort_order');
+
+ $sets = $this->getConnection()->fetchAll($select);
+
+ return $sets;
+ }
+
+ public function exportAttributeOptions()
+ {
+ $select = $this->getSelect()
+ ->from(array('et'=>$this->getTable('eav/entity_type')), 'entity_type_code')
+ ->join(array('a'=>$this->getTable('eav/attribute')), 'a.entity_type_id=et.entity_type_id', 'attribute_code')
+ ->join(array('ao'=>$this->getTable('eav/attribute_option')), 'ao.attribute_id=a.attribute_id', array())
+ ->where('et.entity_type_code in (?)', array('catalog_product', 'catalog_category'))
+ ->order('a.attribute_code')->order('ao.sort_order');
+
+ $stores = Mage::getConfig()->getNode('stores')->children();
+ foreach ($stores as $storeName=>$storeConfig) {
+ $select->joinLeft(
+ array($storeName=>$this->getTable('eav/attribute_option_value')),
+ "$storeName.option_id=ao.option_id and $storeName.store_id=".$storeConfig->descend('system/store/id'),
+ array($storeName=>"$storeName.value")
+ );
+ }
+
+ $options = $this->getConnection()->fetchAll($select);
+
+ return $options;
+ }
+
+ public function exportProductLinks()
+ {
+ $skuTable = $this->getTable('catalog/product').'_'.$this->getSkuAttribute('backend_type');
+ $skuCond = ' and sku.store_id=0 and sku.attribute_id='.$this->getSkuAttribute('attribute_id');
+
+ $select = $this->getSelect()
+ ->from(array('lt'=>$this->getTable('catalog/product_link_type')), array('link_type'=>'code'))
+ ->join(array('l'=>$this->getTable('catalog/product_link')), 'l.link_type_id=lt.link_type_id', array())
+ ->join(array('sku'=>$skuTable), 'sku.entity_id=l.product_id'.$skuCond, array('sku'=>'value'))
+ ->join(array('linked'=>$skuTable), 'linked.entity_id=l.product_id'.$skuCond, array('linked'=>'value'))
+ ->order('sku')->order('link_type');
+ $links = $this->getConnection()->fetchAll($select);
+
+ return $links;
+ }
+
+ public function exportProductsInCategories()
+ {
+ $skuTable = $this->getTable('catalog/product').'_'.$this->getSkuAttribute('backend_type');
+ $skuCond = ' and sku.store_id=0 and sku.attribute_id='.$this->getSkuAttribute('attribute_id');
+
+ $select = $this->getSelect()
+ ->from(array('cp'=>$this->getTable('catalog/category_product')), array('category_id', 'position'))
+ ->join(array('sku'=>$skuTable), 'sku.entity_id=cp.product_id'.$skuCond, array('sku'=>'value'))
+ ->order('category_id')->order('position')->order('sku');
+
+ $prodCats = $this->getConnection()->fetchAll($select);
+
+ return $prodCats;
+ }
+
+ public function exportProductsInStores()
+ {
+ $skuTable = $this->getTable('catalog/product').'_'.$this->getSkuAttribute('backend_type');
+ $skuCond = ' and sku.store_id=0 and sku.attribute_id='.$this->getSkuAttribute('attribute_id');
+
+ $select = $this->getSelect()
+ ->from(array('ps'=>$this->getTable('catalog/product_store')), array())
+ ->join(array('s'=>$this->getTable('core/store')), 's.store_id=ps.store_id', array('store'=>'code'))
+ ->join(array('sku'=>$skuTable), 'sku.entity_id=ps.product_id'.$skuCond, array('sku'=>'value'))
+ ->order('store')->order('sku');
+
+ $prodStores = $this->getConnection()->fetchAll($select);
+
+ return $prodStores;
+ }
+
+ public function exportCategories()
+ {
+ $collection = Mage::getResourceModel('catalog/category_collection')
+ ->addAttributeToSelect('*')
+ ->load();
+
+ $categories = array();
+ foreach ($collection as $object) {
+ $row = $object->getData();
+ $categories[] = $row;
+ }
+
+ return $categories;
+ }
+
+ public function exportProducts()
+ {
+ $attrSets = Mage::getResourceModel('eav/entity_attribute_set_collection')->load();
+ $attrSetName = array();
+ foreach ($attrSets as $attrSet) {
+ $attrSetName[$attrSet->getId()] = $attrSet->getAttributeSetName();
+ }
+
+ $select = $this->getSelect()
->from(array('ao'=>$this->getTable('eav/attribute_option')), array('attribute_id', 'option_id'))
->join(array('aov'=>$this->getTable('eav/attribute_option_value')), 'aov.option_id=ao.option_id', array('value_id', 'value'))
->where('aov.store_id=0');
@@ -232,47 +232,47 @@ public function exportProducts()
echo $select->__toString();
die();
- $collection = Mage::getResourceModel('catalog/product_collection')
- ->addAttributeToSelect('*')
- ->load();
-
- $products = array();
- foreach ($collection as $object) {
- $r = $object->getData();
-
- unset($r['entity_id'], $r['entity_type_id']);
- $r['attribute_set_id'] = $attrSetName[$r['attribute_set_id']];
-
- $products[] = $r;
- }
-
- return $products;
- }
-
- public function exportImageGallery()
- {
- return array();
- }
-
- public function getProductAttributeOption($attribute, $value)
- {
- #$attribute = Mage::get
- }
-
- public function importProducts(array $data)
- {
- /*
- $entity = Mage::getResourceModel('catalog/product')
- ->loadAllAttributes();
-
- $options =
-
- foreach ($data as $row) {
- if (empty($row['sku'])) {
- continue;
- }
- $sku = $row['sku'];
- }
- */
- }
-}
\ No newline at end of file
+ $collection = Mage::getResourceModel('catalog/product_collection')
+ ->addAttributeToSelect('*')
+ ->load();
+
+ $products = array();
+ foreach ($collection as $object) {
+ $r = $object->getData();
+
+ unset($r['entity_id'], $r['entity_type_id']);
+ $r['attribute_set_id'] = $attrSetName[$r['attribute_set_id']];
+
+ $products[] = $r;
+ }
+
+ return $products;
+ }
+
+ public function exportImageGallery()
+ {
+ return array();
+ }
+
+ public function getProductAttributeOption($attribute, $value)
+ {
+ #$attribute = Mage::get
+ }
+
+ public function importProducts(array $data)
+ {
+ /*
+ $entity = Mage::getResourceModel('catalog/product')
+ ->loadAllAttributes();
+
+ $options =
+
+ foreach ($data as $row) {
+ if (empty($row['sku'])) {
+ continue;
+ }
+ $sku = $row['sku'];
+ }
+ */
+ }
+}
diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Import.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Import.php
index 54ae451522..bc727566e3 100644
--- a/app/code/core/Mage/Dataflow/Model/Mysql4/Import.php
+++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Import.php
@@ -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_Dataflow
- * @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_Dataflow
+ * @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)
*/
diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Import/Collection.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Import/Collection.php
index 89f7b5b359..aa97ca547d 100644
--- a/app/code/core/Mage/Dataflow/Model/Mysql4/Import/Collection.php
+++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Import/Collection.php
@@ -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_Dataflow
- * @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_Dataflow
+ * @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)
*/
diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Profile.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Profile.php
index d55d17aade..7a8f13a741 100644
--- a/app/code/core/Mage/Dataflow/Model/Mysql4/Profile.php
+++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Profile.php
@@ -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_Dataflow
- * @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_Dataflow
+ * @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)
*/
/**
@@ -58,4 +58,4 @@ public function isProfileExists($name, $id = null)
return $this->_getReadAdapter()->fetchOne($select);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/Collection.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/Collection.php
index 8f2da7a123..8521c90558 100644
--- a/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/Collection.php
+++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/Collection.php
@@ -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_Dataflow
- * @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_Dataflow
+ * @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)
*/
/**
@@ -49,4 +49,4 @@ public function addStoreFilter($storeIds)
$this->getSelect()->where('main_table.store_id IN (?)', array(0, $storeIds));
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/History.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/History.php
index 76e57b4b5e..591733329d 100644
--- a/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/History.php
+++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/History.php
@@ -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_Dataflow
- * @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_Dataflow
+ * @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)
*/
/**
@@ -46,4 +46,4 @@ protected function _beforeSave(Mage_Core_Model_Abstract $object)
parent::_beforeSave($object);
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/History/Collection.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/History/Collection.php
index 641373d955..def546bac3 100644
--- a/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/History/Collection.php
+++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/History/Collection.php
@@ -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_Dataflow
- * @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_Dataflow
+ * @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)
*/
/**
@@ -48,4 +48,4 @@ public function joinAdminUser()
);
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Session.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Session.php
index 607e6aaead..691e59802e 100644
--- a/app/code/core/Mage/Dataflow/Model/Mysql4/Session.php
+++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Session.php
@@ -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_Dataflow
- * @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_Dataflow
+ * @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)
*/
diff --git a/app/code/core/Mage/Dataflow/Model/Profile.php b/app/code/core/Mage/Dataflow/Model/Profile.php
index 38b15e0fbd..7d569bcba8 100644
--- a/app/code/core/Mage/Dataflow/Model/Profile.php
+++ b/app/code/core/Mage/Dataflow/Model/Profile.php
@@ -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_Dataflow
- * @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_Dataflow
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Dataflow/Model/Profile/History.php b/app/code/core/Mage/Dataflow/Model/Profile/History.php
index 87f3d4e60d..59d46f7184 100644
--- a/app/code/core/Mage/Dataflow/Model/Profile/History.php
+++ b/app/code/core/Mage/Dataflow/Model/Profile/History.php
@@ -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_Dataflow
- * @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_Dataflow
+ * @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)
*/
/**
@@ -51,4 +51,4 @@ protected function _beforeSave()
parent::_beforeSave();
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Dataflow/Model/Session.php b/app/code/core/Mage/Dataflow/Model/Session.php
index cfa0ef482b..d6cdb185bb 100644
--- a/app/code/core/Mage/Dataflow/Model/Session.php
+++ b/app/code/core/Mage/Dataflow/Model/Session.php
@@ -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_Dataflow
- * @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_Dataflow
+ * @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)
*/
diff --git a/app/code/core/Mage/Dataflow/Model/Session/Adapter/Http.php b/app/code/core/Mage/Dataflow/Model/Session/Adapter/Http.php
index b559dd14a1..9bff11cdc6 100644
--- a/app/code/core/Mage/Dataflow/Model/Session/Adapter/Http.php
+++ b/app/code/core/Mage/Dataflow/Model/Session/Adapter/Http.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Dataflow
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
@@ -85,4 +85,3 @@ public function load()
}
}
-
\ No newline at end of file
diff --git a/app/code/core/Mage/Dataflow/Model/Session/Parser/Csv.php b/app/code/core/Mage/Dataflow/Model/Session/Parser/Csv.php
index 669b5cb81c..3871c5f870 100644
--- a/app/code/core/Mage/Dataflow/Model/Session/Parser/Csv.php
+++ b/app/code/core/Mage/Dataflow/Model/Session/Parser/Csv.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Dataflow
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
@@ -35,7 +35,7 @@
class Mage_Dataflow_Model_Session_Parser_Csv extends Mage_Dataflow_Model_Convert_Parser_Abstract
{
- public function parse()
+ public function parse()
{
$fDel = $this->getVar('delimiter', ',');
$fEnc = $this->getVar('enclose', '"');
diff --git a/app/code/core/Mage/Dataflow/etc/config.xml b/app/code/core/Mage/Dataflow/etc/config.xml
index 2e877f8ef4..053a41bddb 100644
--- a/app/code/core/Mage/Dataflow/etc/config.xml
+++ b/app/code/core/Mage/Dataflow/etc/config.xml
@@ -19,10 +19,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_Dataflow
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ * @category Mage
+ * @package Mage_Dataflow
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
@@ -72,4 +72,4 @@
-
\ No newline at end of file
+
diff --git a/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-install-0.7.0.php
index 2f6116eeca..8139790187 100644
--- a/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-install-0.7.0.php
+++ b/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-install-0.7.0.php
@@ -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_Dataflow
- * @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_Dataflow
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.0-0.7.1.php
index ab2cacffe6..eb32118ae2 100644
--- a/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.0-0.7.1.php
+++ b/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.0-0.7.1.php
@@ -1,5 +1,28 @@
startSetup()->run("
drop table if exists {$this->getTable('dataflow_profile')};
@@ -40,4 +63,4 @@
");
}
-$this->endSetup();
\ No newline at end of file
+$this->endSetup();
diff --git a/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.1-0.7.2.php
index 5ebd5b71fe..9deabb042f 100755
--- a/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.1-0.7.2.php
+++ b/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.1-0.7.2.php
@@ -1,5 +1,28 @@
startSetup()->run("
INSERT INTO `{$this->getTable('dataflow_profile')}` (`profile_id`, `name`, `created_at`, `updated_at`, `actions_xml`, `gui_data`, `direction`, `entity_type`, `store_id`, `data_transfer`) VALUES
(NULL, 'Export All Products', NOW(), NOW(), '\r\n \r\n\r\n\r\n\r\n \r\n\r\n\r\n\r\n\r\n\r\n\r\n \r\n \r\n true\r\n\r\n\r\n\r\n file\r\n var/export\r\n \r\n\r\n\r\n', 'a:5:{s:4:\"file\";a:7:{s:4:\"type\";s:4:\"file\";s:8:\"filename\";s:23:\"export_all_products.csv\";s:4:\"path\";s:10:\"var/export\";s:4:\"host\";s:0:\"\";s:4:\"user\";s:0:\"\";s:8:\"password\";s:0:\"\";s:7:\"passive\";s:0:\"\";}s:5:\"parse\";a:5:{s:4:\"type\";s:3:\"csv\";s:12:\"single_sheet\";s:0:\"\";s:9:\"delimiter\";s:1:\",\";s:7:\"enclose\";s:1:\"\"\";s:10:\"fieldnames\";s:4:\"true\";}s:3:\"map\";a:3:{s:14:\"only_specified\";s:0:\"\";s:7:\"product\";a:2:{s:2:\"db\";a:0:{}s:4:\"file\";a:0:{}}s:8:\"customer\";a:2:{s:2:\"db\";a:0:{}s:4:\"file\";a:0:{}}}s:7:\"product\";a:1:{s:6:\"filter\";a:8:{s:4:\"name\";s:0:\"\";s:3:\"sku\";s:0:\"\";s:4:\"type\";s:1:\"0\";s:13:\"attribute_set\";s:0:\"\";s:5:\"price\";a:2:{s:4:\"from\";s:0:\"\";s:2:\"to\";s:0:\"\";}s:3:\"qty\";a:2:{s:4:\"from\";s:0:\"\";s:2:\"to\";s:0:\"\";}s:10:\"visibility\";s:1:\"0\";s:6:\"status\";s:1:\"0\";}}s:8:\"customer\";a:1:{s:6:\"filter\";a:10:{s:9:\"firstname\";s:0:\"\";s:8:\"lastname\";s:0:\"\";s:5:\"email\";s:0:\"\";s:5:\"group\";s:1:\"0\";s:10:\"adressType\";s:15:\"default_billing\";s:9:\"telephone\";s:0:\"\";s:8:\"postcode\";s:0:\"\";s:7:\"country\";s:0:\"\";s:6:\"region\";s:0:\"\";s:10:\"created_at\";a:2:{s:4:\"from\";s:0:\"\";s:2:\"to\";s:0:\"\";}}}}', 'export', 'product', 0, 'file'),
@@ -10,4 +33,4 @@
(NULL, 'Import Customers', NOW(), NOW(), '\r\n \r\n \r\n true\r\n \r\n customer/convert_adapter_customer\r\n parse\r\n', 'a:5:{s:4:\"file\";a:7:{s:4:\"type\";s:4:\"file\";s:8:\"filename\";s:19:\"export_customer.csv\";s:4:\"path\";s:10:\"var/export\";s:4:\"host\";s:0:\"\";s:4:\"user\";s:0:\"\";s:8:\"password\";s:0:\"\";s:7:\"passive\";s:0:\"\";}s:5:\"parse\";a:5:{s:4:\"type\";s:3:\"csv\";s:12:\"single_sheet\";s:0:\"\";s:9:\"delimiter\";s:1:\",\";s:7:\"enclose\";s:1:\"\"\";s:10:\"fieldnames\";s:4:\"true\";}s:3:\"map\";a:3:{s:14:\"only_specified\";s:0:\"\";s:7:\"product\";a:2:{s:2:\"db\";a:0:{}s:4:\"file\";a:0:{}}s:8:\"customer\";a:2:{s:2:\"db\";a:0:{}s:4:\"file\";a:0:{}}}s:7:\"product\";a:1:{s:6:\"filter\";a:8:{s:4:\"name\";s:0:\"\";s:3:\"sku\";s:0:\"\";s:4:\"type\";s:1:\"0\";s:13:\"attribute_set\";s:0:\"\";s:5:\"price\";a:2:{s:4:\"from\";s:0:\"\";s:2:\"to\";s:0:\"\";}s:3:\"qty\";a:2:{s:4:\"from\";s:0:\"\";s:2:\"to\";s:0:\"\";}s:10:\"visibility\";s:1:\"0\";s:6:\"status\";s:1:\"0\";}}s:8:\"customer\";a:1:{s:6:\"filter\";a:10:{s:9:\"firstname\";s:0:\"\";s:8:\"lastname\";s:0:\"\";s:5:\"email\";s:0:\"\";s:5:\"group\";s:1:\"0\";s:10:\"adressType\";s:15:\"default_billing\";s:9:\"telephone\";s:0:\"\";s:8:\"postcode\";s:0:\"\";s:7:\"country\";s:0:\"\";s:6:\"region\";s:0:\"\";s:10:\"created_at\";a:2:{s:4:\"from\";s:0:\"\";s:2:\"to\";s:0:\"\";}}}}', 'import', 'customer', 0, 'interactive');
");
-$this->endSetup();
\ No newline at end of file
+$this->endSetup();
diff --git a/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.2-0.7.3.php
index cebb37e875..fd5f75c09e 100644
--- a/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.2-0.7.3.php
+++ b/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.2-0.7.3.php
@@ -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_Dataflow
- * @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_Dataflow
+ * @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)
*/
@@ -77,4 +77,4 @@
CONSTRAINT `FK_DATAFLOW_BATCH_IMPORT_BATCH` FOREIGN KEY (`batch_id`) REFERENCES `{$installer->getTable('dataflow_batch')}` (`batch_id`) ON DELETE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
");
-$installer->endSetup();
\ No newline at end of file
+$installer->endSetup();
diff --git a/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.3-0.7.4.php b/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.3-0.7.4.php
index e7af1c78f7..1c032055e7 100644
--- a/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.3-0.7.4.php
+++ b/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.3-0.7.4.php
@@ -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_Dataflow
- * @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_Dataflow
+ * @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)
*/
@@ -30,4 +30,4 @@
$installer->startSetup();
$installer->getConnection()->addColumn($installer->getTable('dataflow_batch'), 'params', 'text default NULL AFTER adapter');
-$installer->endSetup();
\ No newline at end of file
+$installer->endSetup();
diff --git a/app/code/core/Mage/Directory/Block/Adminhtml/Frontend/Currency/Base.php b/app/code/core/Mage/Directory/Block/Adminhtml/Frontend/Currency/Base.php
index 77ea4daf24..53b3b5c06c 100644
--- a/app/code/core/Mage/Directory/Block/Adminhtml/Frontend/Currency/Base.php
+++ b/app/code/core/Mage/Directory/Block/Adminhtml/Frontend/Currency/Base.php
@@ -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_Directory
- * @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_Directory
+ * @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)
*/
/**
@@ -42,4 +42,4 @@ public function render(Varien_Data_Form_Element_Abstract $element)
}
return parent::render($element);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Directory/Block/Adminhtml/Frontend/Region/Updater.php b/app/code/core/Mage/Directory/Block/Adminhtml/Frontend/Region/Updater.php
index ba70726bf2..fbd11a5471 100644
--- a/app/code/core/Mage/Directory/Block/Adminhtml/Frontend/Region/Updater.php
+++ b/app/code/core/Mage/Directory/Block/Adminhtml/Frontend/Region/Updater.php
@@ -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 design_default
- * @package Mage
- * @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_Directory
+ * @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_Directory_Block_Adminhtml_Frontend_Region_Updater
diff --git a/app/code/core/Mage/Directory/Block/Currency.php b/app/code/core/Mage/Directory/Block/Currency.php
index 99e0e2adda..dedd936ee8 100644
--- a/app/code/core/Mage/Directory/Block/Currency.php
+++ b/app/code/core/Mage/Directory/Block/Currency.php
@@ -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_Directory
- * @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_Directory
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Directory/Block/Data.php b/app/code/core/Mage/Directory/Block/Data.php
index cc70d18c70..635026f9c3 100644
--- a/app/code/core/Mage/Directory/Block/Data.php
+++ b/app/code/core/Mage/Directory/Block/Data.php
@@ -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_Directory
- * @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_Directory
+ * @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)
*/
/**
@@ -53,18 +53,18 @@ public function getCountryCollection()
public function getCountryHtmlSelect($defValue=null, $name='country_id', $id='country', $title='Country')
{
Varien_Profiler::start('TEST: '.__METHOD__);
- if (is_null($defValue)) {
- $defValue = $this->getCountryId();
- }
- $cacheKey = 'DIRECTORY_COUNTRY_SELECT_STORE_'.Mage::app()->getStore()->getCode();
- if (Mage::app()->useCache('config') && $cache = Mage::app()->loadCache($cacheKey)) {
- $options = unserialize($cache);
- } else {
- $options = $this->getCountryCollection()->toOptionArray();
- if (Mage::app()->useCache('config')) {
- Mage::app()->saveCache(serialize($options), $cacheKey, array('config'));
- }
- }
+ if (is_null($defValue)) {
+ $defValue = $this->getCountryId();
+ }
+ $cacheKey = 'DIRECTORY_COUNTRY_SELECT_STORE_'.Mage::app()->getStore()->getCode();
+ if (Mage::app()->useCache('config') && $cache = Mage::app()->loadCache($cacheKey)) {
+ $options = unserialize($cache);
+ } else {
+ $options = $this->getCountryCollection()->toOptionArray();
+ if (Mage::app()->useCache('config')) {
+ Mage::app()->saveCache(serialize($options), $cacheKey, array('config'));
+ }
+ }
$html = $this->getLayout()->createBlock('core/html_select')
->setName($name)
->setId($id)
@@ -95,15 +95,15 @@ public function getRegionCollection()
public function getRegionHtmlSelect()
{
Varien_Profiler::start('TEST: '.__METHOD__);
- $cacheKey = 'DIRECTORY_REGION_SELECT_STORE'.Mage::app()->getStore()->getId();
- if (Mage::app()->useCache('config') && $cache = Mage::app()->loadCache($cacheKey)) {
- $options = unserialize($cache);
- } else {
- $options = $this->getRegionCollection()->toOptionArray();
- if (Mage::app()->useCache('config')) {
- Mage::app()->saveCache(serialize($options), $cacheKey, array('config'));
- }
- }
+ $cacheKey = 'DIRECTORY_REGION_SELECT_STORE'.Mage::app()->getStore()->getId();
+ if (Mage::app()->useCache('config') && $cache = Mage::app()->loadCache($cacheKey)) {
+ $options = unserialize($cache);
+ } else {
+ $options = $this->getRegionCollection()->toOptionArray();
+ if (Mage::app()->useCache('config')) {
+ Mage::app()->saveCache(serialize($options), $cacheKey, array('config'));
+ }
+ }
$html = $this->getLayout()->createBlock('core/html_select')
->setName('region')
->setTitle(Mage::helper('directory')->__('State/Province'))
@@ -128,28 +128,28 @@ public function getCountryId()
public function getRegionsJs()
{
Varien_Profiler::start('TEST: '.__METHOD__);
- $regionsJs = $this->getData('regions_js');
- if (!$regionsJs) {
- $countryIds = array();
- foreach ($this->getCountryCollection() as $country) {
- $countryIds[] = $country->getCountryId();
- }
- $collection = Mage::getModel('directory/region')->getResourceCollection()
- ->addCountryFilter($countryIds)
- ->load();
- $regions = array();
- foreach ($collection as $region) {
- if (!$region->getRegionId()) {
- continue;
- }
- $regions[$region->getCountryId()][$region->getRegionId()] = array(
- 'code'=>$region->getCode(),
- 'name'=>$region->getName()
- );
- }
- $regionsJs = Mage::helper('core')->jsonEncode($regions);
- }
- Varien_Profiler::stop('TEST: '.__METHOD__);
- return $regionsJs;
+ $regionsJs = $this->getData('regions_js');
+ if (!$regionsJs) {
+ $countryIds = array();
+ foreach ($this->getCountryCollection() as $country) {
+ $countryIds[] = $country->getCountryId();
+ }
+ $collection = Mage::getModel('directory/region')->getResourceCollection()
+ ->addCountryFilter($countryIds)
+ ->load();
+ $regions = array();
+ foreach ($collection as $region) {
+ if (!$region->getRegionId()) {
+ continue;
+ }
+ $regions[$region->getCountryId()][$region->getRegionId()] = array(
+ 'code'=>$region->getCode(),
+ 'name'=>$region->getName()
+ );
+ }
+ $regionsJs = Mage::helper('core')->jsonEncode($regions);
+ }
+ Varien_Profiler::stop('TEST: '.__METHOD__);
+ return $regionsJs;
}
}
diff --git a/app/code/core/Mage/Directory/Exception.php b/app/code/core/Mage/Directory/Exception.php
index 285bdf0394..a14e660c0f 100644
--- a/app/code/core/Mage/Directory/Exception.php
+++ b/app/code/core/Mage/Directory/Exception.php
@@ -18,13 +18,13 @@
* 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_Directory
- * @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_Directory
+ * @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_Directory_Exception extends Mage_Core_Exception
{
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Directory/Helper/Data.php b/app/code/core/Mage/Directory/Helper/Data.php
index 20f5b48d41..c06df2977e 100644
--- a/app/code/core/Mage/Directory/Helper/Data.php
+++ b/app/code/core/Mage/Directory/Helper/Data.php
@@ -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_Directory
- * @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_Directory
+ * @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)
*/
/**
@@ -64,41 +64,41 @@ public function getCountryCollection()
public function getRegionJson()
{
- Varien_Profiler::start('TEST: '.__METHOD__);
- if (!$this->_regionJson) {
- $cacheKey = 'DIRECTORY_REGIONS_JSON_STORE'.Mage::app()->getStore()->getId();
- if (Mage::app()->useCache('config')) {
- $json = Mage::app()->loadCache($cacheKey);
- }
- if (empty($json)) {
- $countryIds = array();
- foreach ($this->getCountryCollection() as $country) {
- $countryIds[] = $country->getCountryId();
- }
- $collection = Mage::getModel('directory/region')->getResourceCollection()
- ->addCountryFilter($countryIds)
- ->load();
- $regions = array();
- foreach ($collection as $region) {
- if (!$region->getRegionId()) {
- continue;
- }
- $regions[$region->getCountryId()][$region->getRegionId()] = array(
- 'code'=>$region->getCode(),
- 'name'=>$region->getName()
- );
- }
- $json = Mage::helper('core')->jsonEncode($regions);
+ Varien_Profiler::start('TEST: '.__METHOD__);
+ if (!$this->_regionJson) {
+ $cacheKey = 'DIRECTORY_REGIONS_JSON_STORE'.Mage::app()->getStore()->getId();
+ if (Mage::app()->useCache('config')) {
+ $json = Mage::app()->loadCache($cacheKey);
+ }
+ if (empty($json)) {
+ $countryIds = array();
+ foreach ($this->getCountryCollection() as $country) {
+ $countryIds[] = $country->getCountryId();
+ }
+ $collection = Mage::getModel('directory/region')->getResourceCollection()
+ ->addCountryFilter($countryIds)
+ ->load();
+ $regions = array();
+ foreach ($collection as $region) {
+ if (!$region->getRegionId()) {
+ continue;
+ }
+ $regions[$region->getCountryId()][$region->getRegionId()] = array(
+ 'code'=>$region->getCode(),
+ 'name'=>$region->getName()
+ );
+ }
+ $json = Mage::helper('core')->jsonEncode($regions);
- if (Mage::app()->useCache('config')) {
- Mage::app()->saveCache($json, $cacheKey, array('config'));
+ if (Mage::app()->useCache('config')) {
+ Mage::app()->saveCache($json, $cacheKey, array('config'));
}
- }
- $this->_regionJson = $json;
- }
+ }
+ $this->_regionJson = $json;
+ }
- Varien_Profiler::stop('TEST: '.__METHOD__);
- return $this->_regionJson;
+ Varien_Profiler::stop('TEST: '.__METHOD__);
+ return $this->_regionJson;
}
public function currencyConvert($amount, $from, $to=null)
diff --git a/app/code/core/Mage/Directory/Helper/Url.php b/app/code/core/Mage/Directory/Helper/Url.php
index dd1460acf7..0c783546c9 100644
--- a/app/code/core/Mage/Directory/Helper/Url.php
+++ b/app/code/core/Mage/Directory/Helper/Url.php
@@ -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_Directory
- * @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_Directory
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Directory/Model/Country.php b/app/code/core/Mage/Directory/Model/Country.php
index 048340caad..ff95bbcf37 100644
--- a/app/code/core/Mage/Directory/Model/Country.php
+++ b/app/code/core/Mage/Directory/Model/Country.php
@@ -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_Directory
- * @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_Directory
+ * @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)
*/
/**
@@ -151,4 +151,4 @@ public function getName()
return $this->getData('name');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Directory/Model/Country/Api.php b/app/code/core/Mage/Directory/Model/Country/Api.php
index b431a02742..d448aeb161 100644
--- a/app/code/core/Mage/Directory/Model/Country/Api.php
+++ b/app/code/core/Mage/Directory/Model/Country/Api.php
@@ -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_Directory
- * @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_Directory
+ * @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)
*/
/**
@@ -51,4 +51,4 @@ public function items()
return $result;
}
-} // Class Mage_Directory_Model_Country_Api End
\ No newline at end of file
+} // Class Mage_Directory_Model_Country_Api End
diff --git a/app/code/core/Mage/Directory/Model/Country/Api/V2.php b/app/code/core/Mage/Directory/Model/Country/Api/V2.php
index 7e81432ca6..150377ee3c 100644
--- a/app/code/core/Mage/Directory/Model/Country/Api/V2.php
+++ b/app/code/core/Mage/Directory/Model/Country/Api/V2.php
@@ -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_Directory
- * @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_Directory
+ * @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)
*/
/**
@@ -33,4 +33,4 @@
*/
class Mage_Directory_Model_Country_Api_V2 extends Mage_Directory_Model_Country_Api
{
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Directory/Model/Country/Format.php b/app/code/core/Mage/Directory/Model/Country/Format.php
index 433cbf6076..65c1aff148 100644
--- a/app/code/core/Mage/Directory/Model/Country/Format.php
+++ b/app/code/core/Mage/Directory/Model/Country/Format.php
@@ -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_Directory
- * @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_Directory
+ * @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)
*/
diff --git a/app/code/core/Mage/Directory/Model/Currency.php b/app/code/core/Mage/Directory/Model/Currency.php
index cb8714f201..c83f59a9e2 100644
--- a/app/code/core/Mage/Directory/Model/Currency.php
+++ b/app/code/core/Mage/Directory/Model/Currency.php
@@ -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_Directory
- * @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_Directory
+ * @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)
*/
/**
@@ -128,8 +128,8 @@ public function getRate($toCurrency)
}
return $rates[$code];
}
-
- /**
+
+ /**
* Get currency rate (base=>allowed or allowed=>base)
*
* @param string $toCurrency
@@ -302,4 +302,4 @@ public function saveRates($rates)
$this->_getResource()->saveRates($rates);
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Directory/Model/Currency/Filter.php b/app/code/core/Mage/Directory/Model/Currency/Filter.php
index dd0dc901ec..da992a4009 100644
--- a/app/code/core/Mage/Directory/Model/Currency/Filter.php
+++ b/app/code/core/Mage/Directory/Model/Currency/Filter.php
@@ -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_Directory
- * @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_Directory
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Directory/Model/Currency/Import/Abstract.php b/app/code/core/Mage/Directory/Model/Currency/Import/Abstract.php
index a926815b46..ad2e6c254d 100644
--- a/app/code/core/Mage/Directory/Model/Currency/Import/Abstract.php
+++ b/app/code/core/Mage/Directory/Model/Currency/Import/Abstract.php
@@ -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_Directory
- * @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_Directory
+ * @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)
*/
/**
@@ -69,7 +69,7 @@ abstract protected function _convert($currencyFrom, $currencyTo);
protected function _saveRates($rates)
{
foreach ($rates as $currencyCode => $currencyRates) {
- Mage::getModel('directory/currency')
+ Mage::getModel('directory/currency')
->setId($currencyCode)
->setRates($currencyRates)
->save();
@@ -100,15 +100,15 @@ public function fetchRates()
$data[$currencyFrom] = array();
}
- foreach ($currencies as $currencyTo) {
- if ($currencyFrom == $currencyTo) {
- $data[$currencyFrom][$currencyTo] = $this->_numberFormat(1);
- }
- else {
- $data[$currencyFrom][$currencyTo] = $this->_numberFormat($this->_convert($currencyFrom, $currencyTo));
- }
- }
- ksort($data[$currencyFrom]);
+ foreach ($currencies as $currencyTo) {
+ if ($currencyFrom == $currencyTo) {
+ $data[$currencyFrom][$currencyTo] = $this->_numberFormat(1);
+ }
+ else {
+ $data[$currencyFrom][$currencyTo] = $this->_numberFormat($this->_convert($currencyFrom, $currencyTo));
+ }
+ }
+ ksort($data[$currencyFrom]);
}
return $data;
diff --git a/app/code/core/Mage/Directory/Model/Currency/Import/Webservicex.php b/app/code/core/Mage/Directory/Model/Currency/Import/Webservicex.php
index b5ed10a963..aad48557f9 100644
--- a/app/code/core/Mage/Directory/Model/Currency/Import/Webservicex.php
+++ b/app/code/core/Mage/Directory/Model/Currency/Import/Webservicex.php
@@ -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_Directory
- * @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_Directory
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Directory/Model/Mysql4/Country.php b/app/code/core/Mage/Directory/Model/Mysql4/Country.php
index 840d0efe15..52ea430a41 100644
--- a/app/code/core/Mage/Directory/Model/Mysql4/Country.php
+++ b/app/code/core/Mage/Directory/Model/Mysql4/Country.php
@@ -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_Directory
- * @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_Directory
+ * @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)
*/
diff --git a/app/code/core/Mage/Directory/Model/Mysql4/Country/Collection.php b/app/code/core/Mage/Directory/Model/Mysql4/Country/Collection.php
index 2d3cd545f7..b83e14b5f5 100644
--- a/app/code/core/Mage/Directory/Model/Mysql4/Country/Collection.php
+++ b/app/code/core/Mage/Directory/Model/Mysql4/Country/Collection.php
@@ -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_Directory
- * @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_Directory
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Directory/Model/Mysql4/Country/Format.php b/app/code/core/Mage/Directory/Model/Mysql4/Country/Format.php
index 6dfedbfe78..c4ade781fc 100644
--- a/app/code/core/Mage/Directory/Model/Mysql4/Country/Format.php
+++ b/app/code/core/Mage/Directory/Model/Mysql4/Country/Format.php
@@ -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_Directory
- * @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_Directory
+ * @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)
*/
diff --git a/app/code/core/Mage/Directory/Model/Mysql4/Country/Format/Collection.php b/app/code/core/Mage/Directory/Model/Mysql4/Country/Format/Collection.php
index 5c7f091071..cbe843f0b1 100644
--- a/app/code/core/Mage/Directory/Model/Mysql4/Country/Format/Collection.php
+++ b/app/code/core/Mage/Directory/Model/Mysql4/Country/Format/Collection.php
@@ -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_Directory
- * @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_Directory
+ * @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)
*/
diff --git a/app/code/core/Mage/Directory/Model/Mysql4/Currency.php b/app/code/core/Mage/Directory/Model/Mysql4/Currency.php
index bd07677ff4..5b55d9796b 100644
--- a/app/code/core/Mage/Directory/Model/Mysql4/Currency.php
+++ b/app/code/core/Mage/Directory/Model/Mysql4/Currency.php
@@ -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_Directory
- * @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_Directory
+ * @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)
*/
/**
@@ -93,8 +93,8 @@ public function getRate($currencyFrom, $currencyTo)
return self::$_rateCache[$currencyFrom][$currencyTo];
}
-
- /**
+
+ /**
* Retrieve currency rate (base=>allowed or allowed=>base)
*
* @param string $currencyFrom
@@ -126,7 +126,7 @@ public function getAnyRate($currencyFrom, $currencyTo)
self::$_rateCache[$currencyFrom][$currencyTo] = $read->fetchOne($select);
}
-
+
return self::$_rateCache[$currencyFrom][$currencyTo];
}
diff --git a/app/code/core/Mage/Directory/Model/Mysql4/Currency/Collection.php b/app/code/core/Mage/Directory/Model/Mysql4/Currency/Collection.php
index cc451946bc..2068fbb5de 100644
--- a/app/code/core/Mage/Directory/Model/Mysql4/Currency/Collection.php
+++ b/app/code/core/Mage/Directory/Model/Mysql4/Currency/Collection.php
@@ -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_Directory
- * @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_Directory
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Directory/Model/Mysql4/Region.php b/app/code/core/Mage/Directory/Model/Mysql4/Region.php
index 3bd8d1dde9..201fa95475 100644
--- a/app/code/core/Mage/Directory/Model/Mysql4/Region.php
+++ b/app/code/core/Mage/Directory/Model/Mysql4/Region.php
@@ -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_Directory
- * @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_Directory
+ * @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)
*/
diff --git a/app/code/core/Mage/Directory/Model/Mysql4/Region/Collection.php b/app/code/core/Mage/Directory/Model/Mysql4/Region/Collection.php
index 3eab19d4af..fd1d8c77f8 100644
--- a/app/code/core/Mage/Directory/Model/Mysql4/Region/Collection.php
+++ b/app/code/core/Mage/Directory/Model/Mysql4/Region/Collection.php
@@ -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_Directory
- * @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_Directory
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Directory/Model/Observer.php b/app/code/core/Mage/Directory/Model/Observer.php
index 6f00cb7b61..b00134b838 100644
--- a/app/code/core/Mage/Directory/Model/Observer.php
+++ b/app/code/core/Mage/Directory/Model/Observer.php
@@ -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_Directory
- * @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_Directory
+ * @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)
*/
/**
@@ -62,7 +62,7 @@ public function scheduledUpdateCurrencyRates($schedule)
if( sizeof($errors) > 0 ) {
foreach ($errors as $error) {
- $importWarnings[] = Mage::helper('directory')->__('WARNING:') . ' ' . $error;
+ $importWarnings[] = Mage::helper('directory')->__('WARNING:') . ' ' . $error;
}
}
@@ -91,4 +91,4 @@ public function scheduledUpdateCurrencyRates($schedule)
$translate->setTranslateInline(true);
}
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Directory/Model/Region.php b/app/code/core/Mage/Directory/Model/Region.php
index 6c6d91d255..5ea0f8cdba 100644
--- a/app/code/core/Mage/Directory/Model/Region.php
+++ b/app/code/core/Mage/Directory/Model/Region.php
@@ -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_Directory
- * @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_Directory
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Directory/Model/Region/Api.php b/app/code/core/Mage/Directory/Model/Region/Api.php
index 7e89c1991a..848b59229d 100644
--- a/app/code/core/Mage/Directory/Model/Region/Api.php
+++ b/app/code/core/Mage/Directory/Model/Region/Api.php
@@ -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_Directory
- * @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_Directory
+ * @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)
*/
/**
@@ -59,4 +59,4 @@ public function items($country)
return $result;
}
-} // Class Mage_Directory_Model_Region_Api End
\ No newline at end of file
+} // Class Mage_Directory_Model_Region_Api End
diff --git a/app/code/core/Mage/Directory/Model/Region/Api/V2.php b/app/code/core/Mage/Directory/Model/Region/Api/V2.php
index 4696f7ae67..ac873481bb 100644
--- a/app/code/core/Mage/Directory/Model/Region/Api/V2.php
+++ b/app/code/core/Mage/Directory/Model/Region/Api/V2.php
@@ -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_Directory
- * @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_Directory
+ * @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)
*/
/**
@@ -33,4 +33,4 @@
*/
class Mage_Directory_Model_Region_Api_V2 extends Mage_Directory_Model_Region_Api
{
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Directory/controllers/CurrencyController.php b/app/code/core/Mage/Directory/controllers/CurrencyController.php
index d6f573463d..432a1bbbea 100644
--- a/app/code/core/Mage/Directory/controllers/CurrencyController.php
+++ b/app/code/core/Mage/Directory/controllers/CurrencyController.php
@@ -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_Directory
- * @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_Directory
+ * @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)
*/
/**
@@ -38,11 +38,6 @@ public function switchAction()
if ($curency = (string) $this->getRequest()->getParam('currency')) {
Mage::app()->getStore()->setCurrentCurrencyCode($curency);
}
- if (Mage::getSingleton('checkout/session')->getQuote()) {
- Mage::getSingleton('checkout/session')->getQuote()
- ->collectTotals()
- ->save();
- }
$this->_redirectReferer(Mage::getBaseUrl());
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Directory/etc/api.xml b/app/code/core/Mage/Directory/etc/api.xml
index 2f06f91f8a..0eb939c9ec 100644
--- a/app/code/core/Mage/Directory/etc/api.xml
+++ b/app/code/core/Mage/Directory/etc/api.xml
@@ -21,8 +21,8 @@
*
* @category Mage
* @package Mage_Directory
- * @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)
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
@@ -82,4 +82,4 @@
-
\ No newline at end of file
+
diff --git a/app/code/core/Mage/Directory/etc/config.xml b/app/code/core/Mage/Directory/etc/config.xml
index 339b4416d8..8b7396b933 100644
--- a/app/code/core/Mage/Directory/etc/config.xml
+++ b/app/code/core/Mage/Directory/etc/config.xml
@@ -19,16 +19,16 @@
* 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_Directory
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ * @category Mage
+ * @package Mage_Directory
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
- 0.8.5
+ 0.8.7
diff --git a/app/code/core/Mage/Directory/etc/system.xml b/app/code/core/Mage/Directory/etc/system.xml
index bb0b0cb5ad..176a4f85be 100644
--- a/app/code/core/Mage/Directory/etc/system.xml
+++ b/app/code/core/Mage/Directory/etc/system.xml
@@ -1,23 +1,29 @@
diff --git a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-install-0.7.0.php
index 640b7bb6e2..59fe48d421 100644
--- a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-install-0.7.0.php
+++ b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-install-0.7.0.php
@@ -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_Directory
- * @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_Directory
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-install-0.8.0.php b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-install-0.8.0.php
index 0e7f85ce4d..fef123648a 100644
--- a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-install-0.8.0.php
+++ b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-install-0.8.0.php
@@ -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_Directory
- * @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_Directory
+ * @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)
*/
@@ -277,4 +277,4 @@
('EUR', 'EUR', 1.000000000000),('EUR', 'USD', 1.415000000000),
('USD', 'EUR', 0.706700000000),('USD', 'USD', 1.000000000000);
");
-$installer->endSetup();
\ No newline at end of file
+$installer->endSetup();
diff --git a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.7.0-0.7.1.php
index 3bf5374fd7..0874804133 100644
--- a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.7.0-0.7.1.php
+++ b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.7.0-0.7.1.php
@@ -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_Directory
- * @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_Directory
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.7.1-0.7.2.php
index 53e64278fe..46c82f8870 100644
--- a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.7.1-0.7.2.php
+++ b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.7.1-0.7.2.php
@@ -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_Directory
- * @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_Directory
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.0-0.8.1.php b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.0-0.8.1.php
index 9702f7d0a2..004fc2a981 100644
--- a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.0-0.8.1.php
+++ b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.0-0.8.1.php
@@ -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_Directory
- * @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_Directory
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.1-0.8.2.php b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.1-0.8.2.php
index 5db208e2ce..ba7de18916 100644
--- a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.1-0.8.2.php
+++ b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.1-0.8.2.php
@@ -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_Directory
- * @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_Directory
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.2-0.8.3.php b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.2-0.8.3.php
index d6695fece5..5ca9296e2d 100644
--- a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.2-0.8.3.php
+++ b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.2-0.8.3.php
@@ -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_Directory
- * @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_Directory
+ * @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)
*/
diff --git a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.3-0.8.4.php b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.3-0.8.4.php
index bf83948be7..a250256667 100644
--- a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.3-0.8.4.php
+++ b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.3-0.8.4.php
@@ -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_Directory
- * @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_Directory
+ * @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)
*/
diff --git a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.4-0.8.5.php b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.4-0.8.5.php
index 95fec9c964..ff93cc2f40 100644
--- a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.4-0.8.5.php
+++ b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.4-0.8.5.php
@@ -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_Directory
- * @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_Directory
+ * @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)
*/
diff --git a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.5-0.8.6.php b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.5-0.8.6.php
new file mode 100644
index 0000000000..b14149526e
--- /dev/null
+++ b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.5-0.8.6.php
@@ -0,0 +1,39 @@
+startSetup();
+
+$installer->run("
+ UPDATE {$installer->getTable('directory/country')}
+ SET iso3_code = 'ROU'
+ WHERE country_id = 'RO'
+");
+
+$installer->endSetup();
diff --git a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.6-0.8.7.php b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.6-0.8.7.php
new file mode 100644
index 0000000000..e633189d19
--- /dev/null
+++ b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.6-0.8.7.php
@@ -0,0 +1,39 @@
+startSetup();
+
+// Delelte non-existent and unofficial iso-3166-1 codes
+$installer->run("
+ DELETE FROM {$installer->getTable('directory/country')}
+ WHERE country_id IN('FX','CS')
+");
+
+$installer->endSetup();
diff --git a/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php b/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php
index c74d21e845..c966ecb608 100644
--- a/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php
+++ b/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Downloadable
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
diff --git a/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php b/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
index a015e936d7..240220334b 100644
--- a/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
+++ b/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Downloadable
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
diff --git a/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php b/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php
index d990998445..a896639ea0 100644
--- a/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php
+++ b/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Downloadable
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
diff --git a/app/code/core/Mage/Downloadable/Block/Adminhtml/Sales/Items/Column/Downloadable/Name.php b/app/code/core/Mage/Downloadable/Block/Adminhtml/Sales/Items/Column/Downloadable/Name.php
index eeba7a3671..97eac571ec 100644
--- a/app/code/core/Mage/Downloadable/Block/Adminhtml/Sales/Items/Column/Downloadable/Name.php
+++ b/app/code/core/Mage/Downloadable/Block/Adminhtml/Sales/Items/Column/Downloadable/Name.php
@@ -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_Downloadable
- * @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_Downloadable
+ * @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)
*/
@@ -53,4 +53,4 @@ public function getLinksTitle()
return Mage::getStoreConfig(Mage_Downloadable_Model_Link::XML_PATH_LINKS_TITLE);
}
}
-?>
\ No newline at end of file
+?>
diff --git a/app/code/core/Mage/Downloadable/Block/Catalog/Product/Links.php b/app/code/core/Mage/Downloadable/Block/Catalog/Product/Links.php
index 6a095f8763..7fd8061515 100644
--- a/app/code/core/Mage/Downloadable/Block/Catalog/Product/Links.php
+++ b/app/code/core/Mage/Downloadable/Block/Catalog/Product/Links.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Downloadable
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
diff --git a/app/code/core/Mage/Downloadable/Block/Catalog/Product/Samples.php b/app/code/core/Mage/Downloadable/Block/Catalog/Product/Samples.php
index 95524f67a7..7d5ef1662e 100644
--- a/app/code/core/Mage/Downloadable/Block/Catalog/Product/Samples.php
+++ b/app/code/core/Mage/Downloadable/Block/Catalog/Product/Samples.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Downloadable
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
diff --git a/app/code/core/Mage/Downloadable/Block/Catalog/Product/View/Type.php b/app/code/core/Mage/Downloadable/Block/Catalog/Product/View/Type.php
index c5b93f92d4..babc4219b1 100644
--- a/app/code/core/Mage/Downloadable/Block/Catalog/Product/View/Type.php
+++ b/app/code/core/Mage/Downloadable/Block/Catalog/Product/View/Type.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Downloadable
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
diff --git a/app/code/core/Mage/Downloadable/Block/Checkout/Cart/Item/Renderer.php b/app/code/core/Mage/Downloadable/Block/Checkout/Cart/Item/Renderer.php
index e3c5eef04e..644db79cb1 100644
--- a/app/code/core/Mage/Downloadable/Block/Checkout/Cart/Item/Renderer.php
+++ b/app/code/core/Mage/Downloadable/Block/Checkout/Cart/Item/Renderer.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Downloadable
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
@@ -67,4 +67,4 @@ public function getLinksTitle()
return Mage::getStoreConfig(Mage_Downloadable_Model_Link::XML_PATH_LINKS_TITLE);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Downloadable/Block/Checkout/Success.php b/app/code/core/Mage/Downloadable/Block/Checkout/Success.php
index e83cc362bd..05efa6f9e2 100644
--- a/app/code/core/Mage/Downloadable/Block/Checkout/Success.php
+++ b/app/code/core/Mage/Downloadable/Block/Checkout/Success.php
@@ -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_Downloadable
- * @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_Downloadable
+ * @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)
*/
/**
@@ -64,4 +64,4 @@ public function getDownloadableProductsUrl()
{
return $this->getUrl('downloadable/customer/products', array('_secure' => true));
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Downloadable/Block/Customer/Products/List.php b/app/code/core/Mage/Downloadable/Block/Customer/Products/List.php
index 83fd10c222..ed2bd7ff43 100644
--- a/app/code/core/Mage/Downloadable/Block/Customer/Products/List.php
+++ b/app/code/core/Mage/Downloadable/Block/Customer/Products/List.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Downloadable
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
diff --git a/app/code/core/Mage/Downloadable/Block/Sales/Order/Email/Items/Downloadable.php b/app/code/core/Mage/Downloadable/Block/Sales/Order/Email/Items/Downloadable.php
index b7a000ae32..45c4b8771b 100644
--- a/app/code/core/Mage/Downloadable/Block/Sales/Order/Email/Items/Downloadable.php
+++ b/app/code/core/Mage/Downloadable/Block/Sales/Order/Email/Items/Downloadable.php
@@ -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_Downloadable
- * @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_Downloadable
+ * @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)
*/
@@ -69,4 +69,4 @@ public function getPurchasedLinkUrl($item)
'_nosid' => true
));
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Downloadable/Block/Sales/Order/Email/Items/Order/Downloadable.php b/app/code/core/Mage/Downloadable/Block/Sales/Order/Email/Items/Order/Downloadable.php
index 3809286e80..836aa343c9 100644
--- a/app/code/core/Mage/Downloadable/Block/Sales/Order/Email/Items/Order/Downloadable.php
+++ b/app/code/core/Mage/Downloadable/Block/Sales/Order/Email/Items/Order/Downloadable.php
@@ -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_Downloadable
- * @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_Downloadable
+ * @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)
*/
@@ -69,4 +69,4 @@ public function getPurchasedLinkUrl($item)
'_nosid' => true
));
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Downloadable/Block/Sales/Order/Item/Renderer/Downloadable.php b/app/code/core/Mage/Downloadable/Block/Sales/Order/Item/Renderer/Downloadable.php
index b9d5c69199..40637de665 100644
--- a/app/code/core/Mage/Downloadable/Block/Sales/Order/Item/Renderer/Downloadable.php
+++ b/app/code/core/Mage/Downloadable/Block/Sales/Order/Item/Renderer/Downloadable.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Downloadable
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
@@ -59,4 +59,4 @@ public function getLinksTitle()
return Mage::getStoreConfig(Mage_Downloadable_Model_Link::XML_PATH_LINKS_TITLE);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Downloadable/Helper/Data.php b/app/code/core/Mage/Downloadable/Helper/Data.php
index ca30d221e3..997852314c 100644
--- a/app/code/core/Mage/Downloadable/Helper/Data.php
+++ b/app/code/core/Mage/Downloadable/Helper/Data.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Downloadable
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
diff --git a/app/code/core/Mage/Downloadable/Helper/Download.php b/app/code/core/Mage/Downloadable/Helper/Download.php
index e1082334e2..d8ae34ef47 100644
--- a/app/code/core/Mage/Downloadable/Helper/Download.php
+++ b/app/code/core/Mage/Downloadable/Helper/Download.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Downloadable
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
diff --git a/app/code/core/Mage/Downloadable/Helper/File.php b/app/code/core/Mage/Downloadable/Helper/File.php
index 56011856c7..f826925f1c 100644
--- a/app/code/core/Mage/Downloadable/Helper/File.php
+++ b/app/code/core/Mage/Downloadable/Helper/File.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Downloadable
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
diff --git a/app/code/core/Mage/Downloadable/Model/CatalogIndex/Data/Downloadable.php b/app/code/core/Mage/Downloadable/Model/CatalogIndex/Data/Downloadable.php
index 9b8d956042..791d9c854d 100644
--- a/app/code/core/Mage/Downloadable/Model/CatalogIndex/Data/Downloadable.php
+++ b/app/code/core/Mage/Downloadable/Model/CatalogIndex/Data/Downloadable.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Downloadable
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
diff --git a/app/code/core/Mage/Downloadable/Model/Link.php b/app/code/core/Mage/Downloadable/Model/Link.php
index f48ceb532e..ea8599d3e7 100644
--- a/app/code/core/Mage/Downloadable/Model/Link.php
+++ b/app/code/core/Mage/Downloadable/Model/Link.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Downloadable
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
diff --git a/app/code/core/Mage/Downloadable/Model/Link/Purchased.php b/app/code/core/Mage/Downloadable/Model/Link/Purchased.php
index 94cce588b2..9f454bc571 100644
--- a/app/code/core/Mage/Downloadable/Model/Link/Purchased.php
+++ b/app/code/core/Mage/Downloadable/Model/Link/Purchased.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Downloadable
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
@@ -43,4 +43,4 @@ protected function _construct()
parent::_construct();
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Downloadable/Model/Link/Purchased/Item.php b/app/code/core/Mage/Downloadable/Model/Link/Purchased/Item.php
index 2eb25cb3cd..f696d9e143 100644
--- a/app/code/core/Mage/Downloadable/Model/Link/Purchased/Item.php
+++ b/app/code/core/Mage/Downloadable/Model/Link/Purchased/Item.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Downloadable
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
@@ -50,4 +50,4 @@ protected function _construct()
parent::_construct();
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Downloadable/Model/Mysql4/Link.php b/app/code/core/Mage/Downloadable/Model/Mysql4/Link.php
index 551ab26cb7..9be6e46ead 100644
--- a/app/code/core/Mage/Downloadable/Model/Mysql4/Link.php
+++ b/app/code/core/Mage/Downloadable/Model/Mysql4/Link.php
@@ -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_Downloadable
- * @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_Downloadable
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Collection.php b/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Collection.php
index b3c975cecc..d744cc61bb 100644
--- a/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Collection.php
+++ b/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Collection.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Downloadable
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
diff --git a/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased.php b/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased.php
index d2d2424f95..8287918934 100644
--- a/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased.php
+++ b/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased.php
@@ -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_Downloadable
- * @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_Downloadable
+ * @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)
*/
/**
@@ -43,4 +43,4 @@ protected function _construct()
$this->_init('downloadable/link_purchased', 'purchased_id');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased/Collection.php b/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased/Collection.php
index d995fdbaad..61b4359574 100644
--- a/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased/Collection.php
+++ b/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased/Collection.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Downloadable
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
@@ -50,4 +50,4 @@ public function addPurchasedItemsToResult()
'`purchased_items`.purchased_id=`main_table`.purchased_id');
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased/Item.php b/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased/Item.php
index 2455dbb5af..27b7924408 100644
--- a/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased/Item.php
+++ b/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased/Item.php
@@ -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_Downloadable
- * @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_Downloadable
+ * @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)
*/
/**
@@ -43,4 +43,4 @@ protected function _construct()
$this->_init('downloadable/link_purchased_item', 'item_id');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased/Item/Collection.php b/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased/Item/Collection.php
index e16bdedaaf..679834cc15 100644
--- a/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased/Item/Collection.php
+++ b/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased/Item/Collection.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Downloadable
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
@@ -43,4 +43,4 @@ protected function _construct()
$this->_init('downloadable/link_purchased_item');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Downloadable/Model/Mysql4/Sample.php b/app/code/core/Mage/Downloadable/Model/Mysql4/Sample.php
index 525f43b76e..0628065c5d 100644
--- a/app/code/core/Mage/Downloadable/Model/Mysql4/Sample.php
+++ b/app/code/core/Mage/Downloadable/Model/Mysql4/Sample.php
@@ -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_Downloadable
- * @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_Downloadable
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Downloadable/Model/Mysql4/Sample/Collection.php b/app/code/core/Mage/Downloadable/Model/Mysql4/Sample/Collection.php
index 684df4f560..dfde419768 100644
--- a/app/code/core/Mage/Downloadable/Model/Mysql4/Sample/Collection.php
+++ b/app/code/core/Mage/Downloadable/Model/Mysql4/Sample/Collection.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Downloadable
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
diff --git a/app/code/core/Mage/Downloadable/Model/Observer.php b/app/code/core/Mage/Downloadable/Model/Observer.php
index 9d11ce4e02..865079160a 100644
--- a/app/code/core/Mage/Downloadable/Model/Observer.php
+++ b/app/code/core/Mage/Downloadable/Model/Observer.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Downloadable
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
diff --git a/app/code/core/Mage/Downloadable/Model/Product/Price.php b/app/code/core/Mage/Downloadable/Model/Product/Price.php
index 6e5fa18d97..6ecb5be455 100644
--- a/app/code/core/Mage/Downloadable/Model/Product/Price.php
+++ b/app/code/core/Mage/Downloadable/Model/Product/Price.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Downloadable
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
diff --git a/app/code/core/Mage/Downloadable/Model/Product/Type.php b/app/code/core/Mage/Downloadable/Model/Product/Type.php
index 39fe36f079..486a534c42 100644
--- a/app/code/core/Mage/Downloadable/Model/Product/Type.php
+++ b/app/code/core/Mage/Downloadable/Model/Product/Type.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Downloadable
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
@@ -374,6 +374,13 @@ public function beforeSave($product = null)
}
}
}
+
+ /*
+ * After "Downloadable Information" tab was made non-ajax we should
+ * set this flag "true" to force saving of 'required_options' attribute
+ */
+ $this->getProduct($product)->setCanSaveCustomOptions(true);
+
$this->getProduct($product)->setLinksExist($linksExist);
}
diff --git a/app/code/core/Mage/Downloadable/Model/Sales/Order/Pdf/Items/Abstract.php b/app/code/core/Mage/Downloadable/Model/Sales/Order/Pdf/Items/Abstract.php
index 90ddfeacf9..a3769a52a8 100644
--- a/app/code/core/Mage/Downloadable/Model/Sales/Order/Pdf/Items/Abstract.php
+++ b/app/code/core/Mage/Downloadable/Model/Sales/Order/Pdf/Items/Abstract.php
@@ -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_Downloadable
- * @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_Downloadable
+ * @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)
*/
diff --git a/app/code/core/Mage/Downloadable/Model/Sales/Order/Pdf/Items/Creditmemo.php b/app/code/core/Mage/Downloadable/Model/Sales/Order/Pdf/Items/Creditmemo.php
index 23dd80963a..e8b2c9c582 100644
--- a/app/code/core/Mage/Downloadable/Model/Sales/Order/Pdf/Items/Creditmemo.php
+++ b/app/code/core/Mage/Downloadable/Model/Sales/Order/Pdf/Items/Creditmemo.php
@@ -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_Downloadable
- * @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_Downloadable
+ * @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)
*/
diff --git a/app/code/core/Mage/Downloadable/Model/Sales/Order/Pdf/Items/Invoice.php b/app/code/core/Mage/Downloadable/Model/Sales/Order/Pdf/Items/Invoice.php
index b73e13198a..596a1d1cfc 100644
--- a/app/code/core/Mage/Downloadable/Model/Sales/Order/Pdf/Items/Invoice.php
+++ b/app/code/core/Mage/Downloadable/Model/Sales/Order/Pdf/Items/Invoice.php
@@ -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_Downloadable
- * @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_Downloadable
+ * @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)
*/
diff --git a/app/code/core/Mage/Downloadable/Model/Sample.php b/app/code/core/Mage/Downloadable/Model/Sample.php
index d50ce88bbb..e0e17a48d1 100644
--- a/app/code/core/Mage/Downloadable/Model/Sample.php
+++ b/app/code/core/Mage/Downloadable/Model/Sample.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Downloadable
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
diff --git a/app/code/core/Mage/Downloadable/Model/System/Config/Source/Contentdisposition.php b/app/code/core/Mage/Downloadable/Model/System/Config/Source/Contentdisposition.php
index 4ccf9aaa6e..99fe0edd41 100644
--- a/app/code/core/Mage/Downloadable/Model/System/Config/Source/Contentdisposition.php
+++ b/app/code/core/Mage/Downloadable/Model/System/Config/Source/Contentdisposition.php
@@ -1,50 +1,50 @@
-
- */
-class Mage_Downloadable_Model_System_Config_Source_Contentdisposition
-{
- public function toOptionArray()
- {
- return array(
- array(
- 'value' => 'attachment',
- 'label' => Mage::helper('downloadable')->__('attachment')
- ),
- array(
- 'value' => 'inline',
- 'label' => Mage::helper('downloadable')->__('inline')
- )
- );
- }
-}
-
+
+ */
+class Mage_Downloadable_Model_System_Config_Source_Contentdisposition
+{
+ public function toOptionArray()
+ {
+ return array(
+ array(
+ 'value' => 'attachment',
+ 'label' => Mage::helper('downloadable')->__('attachment')
+ ),
+ array(
+ 'value' => 'inline',
+ 'label' => Mage::helper('downloadable')->__('inline')
+ )
+ );
+ }
+}
+
diff --git a/app/code/core/Mage/Downloadable/Model/System/Config/Source/Orderitemstatus.php b/app/code/core/Mage/Downloadable/Model/System/Config/Source/Orderitemstatus.php
index 7e1f44d5c7..67c3eda1e0 100644
--- a/app/code/core/Mage/Downloadable/Model/System/Config/Source/Orderitemstatus.php
+++ b/app/code/core/Mage/Downloadable/Model/System/Config/Source/Orderitemstatus.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Downloadable
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
diff --git a/app/code/core/Mage/Downloadable/controllers/CustomerController.php b/app/code/core/Mage/Downloadable/controllers/CustomerController.php
index 63289406bc..9c0d8ff62d 100644
--- a/app/code/core/Mage/Downloadable/controllers/CustomerController.php
+++ b/app/code/core/Mage/Downloadable/controllers/CustomerController.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Downloadable
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
diff --git a/app/code/core/Mage/Downloadable/controllers/DownloadController.php b/app/code/core/Mage/Downloadable/controllers/DownloadController.php
index da5204a601..7b93f1b0ae 100644
--- a/app/code/core/Mage/Downloadable/controllers/DownloadController.php
+++ b/app/code/core/Mage/Downloadable/controllers/DownloadController.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Downloadable
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
diff --git a/app/code/core/Mage/Downloadable/controllers/FileController.php b/app/code/core/Mage/Downloadable/controllers/FileController.php
index faf0a6085d..495518c481 100644
--- a/app/code/core/Mage/Downloadable/controllers/FileController.php
+++ b/app/code/core/Mage/Downloadable/controllers/FileController.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Downloadable
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
diff --git a/app/code/core/Mage/Downloadable/controllers/Product/EditController.php b/app/code/core/Mage/Downloadable/controllers/Product/EditController.php
index 9170741552..68c52aab6e 100644
--- a/app/code/core/Mage/Downloadable/controllers/Product/EditController.php
+++ b/app/code/core/Mage/Downloadable/controllers/Product/EditController.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Downloadable
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
diff --git a/app/code/core/Mage/Downloadable/etc/adminhtml.xml b/app/code/core/Mage/Downloadable/etc/adminhtml.xml
index 9c0985e505..1a50c750ed 100644
--- a/app/code/core/Mage/Downloadable/etc/adminhtml.xml
+++ b/app/code/core/Mage/Downloadable/etc/adminhtml.xml
@@ -21,7 +21,7 @@
*
* @category Mage
* @package Mage_Downloadable
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
diff --git a/app/code/core/Mage/Downloadable/etc/config.xml b/app/code/core/Mage/Downloadable/etc/config.xml
index cfce6421fa..777697868e 100644
--- a/app/code/core/Mage/Downloadable/etc/config.xml
+++ b/app/code/core/Mage/Downloadable/etc/config.xml
@@ -21,7 +21,7 @@
*
* @category Mage
* @package Mage_Downloadable
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
diff --git a/app/code/core/Mage/Downloadable/etc/system.xml b/app/code/core/Mage/Downloadable/etc/system.xml
index ffd0f0dbad..85a457ff8d 100644
--- a/app/code/core/Mage/Downloadable/etc/system.xml
+++ b/app/code/core/Mage/Downloadable/etc/system.xml
@@ -21,7 +21,7 @@
*
* @category Mage
* @package Mage_Downloadable
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-install-0.1.0.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-install-0.1.0.php
index 586a691c90..955322a54c 100644
--- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-install-0.1.0.php
+++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-install-0.1.0.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Downloadable
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.0-0.1.1.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.0-0.1.1.php
index 4105ff3b9f..f1032f9463 100644
--- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.0-0.1.1.php
+++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.0-0.1.1.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Downloadable
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.1-0.1.2.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.1-0.1.2.php
index 2c8d71a136..58231e1f10 100644
--- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.1-0.1.2.php
+++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.1-0.1.2.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Downloadable
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.10-0.1.11.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.10-0.1.11.php
index 39a4ed774a..ad43746b91 100644
--- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.10-0.1.11.php
+++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.10-0.1.11.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Downloadable
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.11-0.1.12.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.11-0.1.12.php
index cca2a9dfac..7052a26d8b 100644
--- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.11-0.1.12.php
+++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.11-0.1.12.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Downloadable
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.12-0.1.13.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.12-0.1.13.php
index 588f6d87a8..f759efbae2 100644
--- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.12-0.1.13.php
+++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.12-0.1.13.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Downloadable
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.13-0.1.14.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.13-0.1.14.php
index dd547caf2f..846457a75d 100644
--- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.13-0.1.14.php
+++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.13-0.1.14.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Downloadable
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.15-0.1.16.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.15-0.1.16.php
index c30b3bcbd9..c67bb66ff6 100644
--- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.15-0.1.16.php
+++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.15-0.1.16.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Downloadable
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.2-0.1.3.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.2-0.1.3.php
index eb22389552..fa133af509 100644
--- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.2-0.1.3.php
+++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.2-0.1.3.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Downloadable
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.3-0.1.4.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.3-0.1.4.php
index a936d08a29..a3068f464e 100644
--- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.3-0.1.4.php
+++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.3-0.1.4.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Downloadable
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.4-0.1.5.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.4-0.1.5.php
index 54734960f3..1eb67c3a67 100644
--- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.4-0.1.5.php
+++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.4-0.1.5.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Downloadable
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.5-0.1.6.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.5-0.1.6.php
index 156223eba5..5a09b60604 100644
--- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.5-0.1.6.php
+++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.5-0.1.6.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Downloadable
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.6-0.1.7.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.6-0.1.7.php
index 6d8da15dee..12e1c034a9 100644
--- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.6-0.1.7.php
+++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.6-0.1.7.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Downloadable
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.7-0.1.8.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.7-0.1.8.php
index 3354f1d87e..75147cc052 100644
--- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.7-0.1.8.php
+++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.7-0.1.8.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Downloadable
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.8-0.1.9.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.8-0.1.9.php
index 64b33be879..14d67203e2 100644
--- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.8-0.1.9.php
+++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.8-0.1.9.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Downloadable
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.9-0.1.10.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.9-0.1.10.php
index 560dc747ff..1953f5d98c 100644
--- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.9-0.1.10.php
+++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.9-0.1.10.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Downloadable
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
diff --git a/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Js.php b/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Js.php
index 518b338fc3..01b584bc2b 100644
--- a/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Js.php
+++ b/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Js.php
@@ -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_Eav
- * @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_Eav
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Main/Abstract.php b/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Main/Abstract.php
index fead99b0e7..68ff057750 100644
--- a/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Main/Abstract.php
+++ b/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Main/Abstract.php
@@ -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_Eav
- * @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_Eav
+ * @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)
*/
diff --git a/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Options/Abstract.php b/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Options/Abstract.php
index e862f93d5c..ef78e45705 100644
--- a/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Options/Abstract.php
+++ b/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Options/Abstract.php
@@ -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_Eav
- * @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_Eav
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Grid/Abstract.php b/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Grid/Abstract.php
index e0bbed5c11..717f293c4b 100644
--- a/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Grid/Abstract.php
+++ b/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Grid/Abstract.php
@@ -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_Adminhtml
- * @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_Eav
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Eav/Exception.php b/app/code/core/Mage/Eav/Exception.php
index 959e229b2d..92253aba09 100644
--- a/app/code/core/Mage/Eav/Exception.php
+++ b/app/code/core/Mage/Eav/Exception.php
@@ -18,13 +18,13 @@
* 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_Eav
- * @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_Eav
+ * @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_Eav_Exception extends Mage_Core_Exception
{
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Eav/Helper/Data.php b/app/code/core/Mage/Eav/Helper/Data.php
index 7d810148b9..d166d909b3 100644
--- a/app/code/core/Mage/Eav/Helper/Data.php
+++ b/app/code/core/Mage/Eav/Helper/Data.php
@@ -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_Eav
- * @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_Eav
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Eav/Model/Adminhtml/System/Config/Source/Inputtype.php b/app/code/core/Mage/Eav/Model/Adminhtml/System/Config/Source/Inputtype.php
index 6c50db401e..d116ad3ba3 100644
--- a/app/code/core/Mage/Eav/Model/Adminhtml/System/Config/Source/Inputtype.php
+++ b/app/code/core/Mage/Eav/Model/Adminhtml/System/Config/Source/Inputtype.php
@@ -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_Eav
- * @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_Eav
+ * @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_Eav_Model_Adminhtml_System_Config_Source_Inputtype
{
diff --git a/app/code/core/Mage/Eav/Model/Config.php b/app/code/core/Mage/Eav/Model/Config.php
index 29bd286177..638a7d961d 100644
--- a/app/code/core/Mage/Eav/Model/Config.php
+++ b/app/code/core/Mage/Eav/Model/Config.php
@@ -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_Eav
- * @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_Eav
+ * @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)
*/
@@ -427,12 +427,15 @@ public function getAttribute($entityType, $code)
}
$attributeKey = $this->_getAttributeKey($entityTypeCode, $attribute->getAttributeCode());
} else {
- $attribute = Mage::getModel($entityType->getAttributeModel())->loadByCode($entityType, $code);
+ $attribute = Mage::getModel($entityType->getAttributeModel())
+ ->loadByCode($entityType, $code)
+ ->setAttributeCode($code);
}
}
if ($attribute) {
- $attribute->setEntityType($entityType);
+ $attribute->setEntityType($entityType)
+ ->setEntityTypeId($entityType->getId());
$this->_addAttributeReference($attribute->getId(), $attribute->getAttributeCode(), $entityTypeCode);
$this->_save($attribute, $attributeKey);
}
diff --git a/app/code/core/Mage/Eav/Model/Convert/Adapter/Entity.php b/app/code/core/Mage/Eav/Model/Convert/Adapter/Entity.php
index f8a9c96126..d6484732ab 100644
--- a/app/code/core/Mage/Eav/Model/Convert/Adapter/Entity.php
+++ b/app/code/core/Mage/Eav/Model/Convert/Adapter/Entity.php
@@ -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_Eav
- * @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_Eav
+ * @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)
*/
diff --git a/app/code/core/Mage/Eav/Model/Convert/Adapter/Grid.php b/app/code/core/Mage/Eav/Model/Convert/Adapter/Grid.php
index 3ffb2004c6..6cf8166f6e 100644
--- a/app/code/core/Mage/Eav/Model/Convert/Adapter/Grid.php
+++ b/app/code/core/Mage/Eav/Model/Convert/Adapter/Grid.php
@@ -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_Eav
- * @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_Eav
+ * @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)
*/
@@ -84,4 +84,4 @@ public function save()
}
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Eav/Model/Convert/Parser/Abstract.php b/app/code/core/Mage/Eav/Model/Convert/Parser/Abstract.php
index 0b8585f48b..a43100a983 100644
--- a/app/code/core/Mage/Eav/Model/Convert/Parser/Abstract.php
+++ b/app/code/core/Mage/Eav/Model/Convert/Parser/Abstract.php
@@ -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_Catalog
- * @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_Eav
+ * @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)
*/
@@ -55,7 +55,7 @@ public function getStoreIds($stores)
public function getStoreCode($storeId)
{
- return Mage::app()->getStore($storeId?$storeId:0)->getCode();
+ return Mage::app()->getStore($storeId?$storeId:0)->getCode();
}
public function loadAttributeSets($entityTypeId)
@@ -98,4 +98,4 @@ public function getSourceOptionId(Mage_Eav_Model_Entity_Attribute_Source_Interfa
}
return null;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Eav/Model/Entity.php b/app/code/core/Mage/Eav/Model/Entity.php
index 00b41248e8..1b421051fe 100644
--- a/app/code/core/Mage/Eav/Model/Entity.php
+++ b/app/code/core/Mage/Eav/Model/Entity.php
@@ -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_Eav
- * @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_Eav
+ * @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)
*/
diff --git a/app/code/core/Mage/Eav/Model/Entity/Abstract.php b/app/code/core/Mage/Eav/Model/Entity/Abstract.php
index 366358a26c..4d0b48e228 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Abstract.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Abstract.php
@@ -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_Eav
- * @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)
+ * @category Mage
+ * @package Mage_Eav
+ * @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)
*/
diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute.php b/app/code/core/Mage/Eav/Model/Entity/Attribute.php
index da6bc61177..0fa1231ae1 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Attribute.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Attribute.php
@@ -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_Eav
- * @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_Eav
+ * @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)
*/
diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Abstract.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Abstract.php
index f429f4ef2d..0bb782f1f1 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Abstract.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Abstract.php
@@ -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_Eav
- * @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_Eav
+ * @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)
*/
@@ -483,8 +483,8 @@ public function getBackendTable()
if ($this->_dataTable === null) {
if ($this->isStatic()) {
$this->_dataTable = $this->getEntityType()->getValueTablePrefix();
- } elseif ($this->_getData('backend_table')) {
- $this->_dataTable = $this->_getData('backend_table');
+ } elseif ($backendTable = trim($this->_getData('backend_table'))) {
+ $this->_dataTable = $backendTable;
} else {
$this->_dataTable = $this->getEntity()->getValueTablePrefix().'_'.$this->getBackendType();
}
diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Abstract.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Abstract.php
index a617392838..a05e50496e 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Abstract.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Abstract.php
@@ -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_Eav
- * @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_Eav
+ * @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)
*/
diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Array.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Array.php
index 54f6169a31..5363318d43 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Array.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Array.php
@@ -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_Eav
- * @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_Eav
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Datetime.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Datetime.php
index c3e54141a0..2a9b1397f4 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Datetime.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Datetime.php
@@ -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_Eav
- * @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_Eav
+ * @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_Eav_Model_Entity_Attribute_Backend_Datetime extends Mage_Eav_Model_Entity_Attribute_Backend_Abstract
diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Default.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Default.php
index d9bb5db7a1..bcc21a1cac 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Default.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Default.php
@@ -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_Eav
- * @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_Eav
+ * @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)
*/
/**
@@ -34,4 +34,4 @@
class Mage_Eav_Model_Entity_Attribute_Backend_Default extends Mage_Eav_Model_Entity_Attribute_Backend_Abstract
{
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Increment.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Increment.php
index 0d2efeb11d..ca6cb94701 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Increment.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Increment.php
@@ -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_Eav
- * @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_Eav
+ * @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)
*/
/**
@@ -39,4 +39,4 @@ public function beforeSave($object)
$this->getAttribute()->getEntity()->setNewIncrementId($object);
}
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Interface.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Interface.php
index bb09370ffb..4272fa62e1 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Interface.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Interface.php
@@ -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_Eav
- * @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_Eav
+ * @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)
*/
@@ -45,4 +45,4 @@ public function beforeSave($object);
public function afterSave($object);
public function beforeDelete($object);
public function afterDelete($object);
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Store.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Store.php
index cac891506d..b5aea37680 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Store.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Store.php
@@ -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_Eav
- * @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_Eav
+ * @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)
*/
@@ -33,4 +33,4 @@ protected function _beforeSave($object)
$object->setData($this->getAttribute()->getAttributeCode(), Mage::app()->getStore()->getId());
}
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Time/Created.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Time/Created.php
index 39ad33c7fd..b9c39f2fa2 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Time/Created.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Time/Created.php
@@ -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_Eav
- * @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_Eav
+ * @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)
*/
/**
@@ -39,4 +39,4 @@ public function beforeSave($object)
$object->setData($this->getAttribute()->getAttributeCode(), now());
}
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Time/Updated.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Time/Updated.php
index a8cda47f20..8f87f55985 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Time/Updated.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Time/Updated.php
@@ -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_Eav
- * @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_Eav
+ * @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)
*/
/**
@@ -37,4 +37,4 @@ public function beforeSave($object)
{
$object->setData($this->getAttribute()->getAttributeCode(), now());
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Exception.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Exception.php
index ca27b4dc65..1fd040e573 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Exception.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Exception.php
@@ -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_Eav
- * @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_Eav
+ * @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)
*/
@@ -91,4 +91,4 @@ public function getPart()
{
return $this->_part;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Abstract.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Abstract.php
index c206591980..b3e6b97408 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Abstract.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Abstract.php
@@ -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_Eav
- * @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_Eav
+ * @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)
*/
diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Datetime.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Datetime.php
index 80f6eed9df..e0265ff57e 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Datetime.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Datetime.php
@@ -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_Eav
- * @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_Eav
+ * @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)
*/
diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Default.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Default.php
index d6188b439c..a6d9a6fbd7 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Default.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Default.php
@@ -18,14 +18,14 @@
* 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_Eav
- * @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_Eav
+ * @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_Eav_Model_Entity_Attribute_Frontend_Default extends Mage_Eav_Model_Entity_Attribute_Frontend_Abstract
{
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Interface.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Interface.php
index 4e1e354386..64cba0406d 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Interface.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Interface.php
@@ -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_Eav
- * @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_Eav
+ * @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)
*/
@@ -34,4 +34,4 @@
interface Mage_Eav_Model_Entity_Attribute_Frontend_Interface
{
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Group.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Group.php
index b68451e107..d78e8242cd 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Group.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Group.php
@@ -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_Eav
- * @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_Eav
+ * @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)
*/
@@ -32,6 +32,11 @@ protected function _construct()
$this->_init('eav/entity_attribute_group');
}
+ /**
+ * Checks if current attribute group exists
+ *
+ * @return boolean
+ */
public function itemExists()
{
return $this->_getResource()->itemExists($this);
@@ -41,4 +46,4 @@ public function deleteGroups()
{
return $this->_getResource()->deleteGroups($this);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Interface.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Interface.php
index 6f8009f4e1..4b01d6e359 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Interface.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Interface.php
@@ -18,14 +18,14 @@
* 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_Eav
- * @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_Eav
+ * @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)
*/
interface Mage_Eav_Model_Entity_Attribute_Interface
{
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Option.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Option.php
index d6e8538320..20a93314e1 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Option.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Option.php
@@ -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_Eav
- * @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_Eav
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Set.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Set.php
index 2b0682a0ad..6dc6b64c44 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Set.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Set.php
@@ -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_Eav
- * @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)
+ * @category Mage
+ * @package Mage_Eav
+ * @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)
*/
@@ -94,6 +94,15 @@ public function organizeData($data)
{
$modelGroupArray = array();
$modelAttributeArray = array();
+ $attributeIds = array();
+ if ($data['attributes']) {
+ $ids = array();
+ foreach ($data['attributes'] as $attribute) {
+ $ids[] = $attribute[0];
+ }
+ $attributeIds = Mage::getResourceSingleton('eav/entity_attribute')
+ ->getValidAttributeIds($ids);
+ }
if( $data['groups'] ) {
foreach( $data['groups'] as $group ) {
$modelGroup = Mage::getModel('eav/entity_attribute_group');
@@ -104,7 +113,7 @@ public function organizeData($data)
if( $data['attributes'] ) {
foreach( $data['attributes'] as $attribute ) {
- if( $attribute[1] == $group[0] ) {
+ if( $attribute[1] == $group[0] && in_array($attribute[0], $attributeIds) ) {
$modelAttribute = Mage::getModel('eav/entity_attribute');
$modelAttribute->setId($attribute[0])
->setAttributeGroupId($attribute[1])
diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Abstract.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Abstract.php
index 366e9540ef..7285b2f519 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Abstract.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Abstract.php
@@ -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_Eav
- * @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_Eav
+ * @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)
*/
@@ -142,4 +142,4 @@ public function getFlatUpdateSelect($store)
{
return null;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Boolean.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Boolean.php
index f676ff80fc..4cc3869c1f 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Boolean.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Boolean.php
@@ -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_Eav
- * @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_Eav
+ * @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)
*/
diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Config.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Config.php
index ad9f3048a0..63546cd481 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Config.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Config.php
@@ -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_Eav
- * @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_Eav
+ * @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)
*/
diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Interface.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Interface.php
index a82956b745..0395cddbb5 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Interface.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Interface.php
@@ -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_Eav
- * @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_Eav
+ * @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)
*/
@@ -47,4 +47,4 @@ public function getAllOptions();
* @return mixed
*/
public function getOptionText($value);
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Store.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Store.php
index 5282146fe4..9171ad393f 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Store.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Store.php
@@ -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_Eav
- * @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_Eav
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Table.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Table.php
index ab7a60ec3e..864153e94e 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Table.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Table.php
@@ -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_Eav
- * @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_Eav
+ * @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)
*/
@@ -207,4 +207,4 @@ public function getFlatUpdateSelect($store)
return Mage::getResourceModel('eav/entity_attribute_option')
->getFlatUpdateSelect($this->getAttribute(), $store);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Eav/Model/Entity/Collection.php b/app/code/core/Mage/Eav/Model/Entity/Collection.php
index b138174022..26fccfed68 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Collection.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Collection.php
@@ -1,37 +1,37 @@
-getConnection('customeralert_type'));
-
- #$this->setConnection(Mage::getSingleton('core/resource')->getConnection('core_read'));
- }
-}
\ No newline at end of file
+getConnection('customeralert_type'));
+
+ #$this->setConnection(Mage::getSingleton('core/resource')->getConnection('core_read'));
+ }
+}
diff --git a/app/code/core/Mage/Eav/Model/Entity/Collection/Abstract.php b/app/code/core/Mage/Eav/Model/Entity/Collection/Abstract.php
index 3ad7d268d3..cdf387af51 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Collection/Abstract.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Collection/Abstract.php
@@ -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_Eav
- * @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_Eav
+ * @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)
*/
/**
@@ -989,7 +989,7 @@ public function _loadAttributes($printQuery = false, $logQuery = false)
foreach ($this->_selectAttributes as $attributeCode => $attributeId) {
$attribute = Mage::getSingleton('eav/config')->getCollectionAttribute($entity->getType(), $attributeCode);
if ($attribute && !$attribute->isStatic()) {
- $tableAttributes[$attribute->getBackendTable()][] = $attributeId;
+ $tableAttributes[$attribute->getBackendTable()][] = $attributeId;
}
}
@@ -1020,7 +1020,7 @@ public function _loadAttributes($printQuery = false, $logQuery = false)
protected function _getLoadAttributesSelect($table, $attributeIds=array())
{
if (empty($attributeIds)) {
- $attributeIds = $this->_selectAttributes;
+ $attributeIds = $this->_selectAttributes;
}
$entityIdField = $this->getEntity()->getEntityIdField();
$select = $this->getConnection()->select()
diff --git a/app/code/core/Mage/Eav/Model/Entity/Increment/Abstract.php b/app/code/core/Mage/Eav/Model/Entity/Increment/Abstract.php
index b437af87a2..d236460151 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Increment/Abstract.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Increment/Abstract.php
@@ -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_Eav
- * @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_Eav
+ * @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)
*/
@@ -68,4 +68,4 @@ public function frontendFormat($id)
$result = $id;
return $result;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Eav/Model/Entity/Increment/Alphanum.php b/app/code/core/Mage/Eav/Model/Entity/Increment/Alphanum.php
index 75fe5678f3..ac8bab5a7f 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Increment/Alphanum.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Increment/Alphanum.php
@@ -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_Eav
- * @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_Eav
+ * @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)
*/
diff --git a/app/code/core/Mage/Eav/Model/Entity/Increment/Interface.php b/app/code/core/Mage/Eav/Model/Entity/Increment/Interface.php
index 9788d32196..ac80f2eab3 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Increment/Interface.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Increment/Interface.php
@@ -18,14 +18,14 @@
* 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_Eav
- * @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_Eav
+ * @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)
*/
interface Mage_Eav_Model_Entity_Increment_Interface
{
public function getNextId();
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Eav/Model/Entity/Increment/Numeric.php b/app/code/core/Mage/Eav/Model/Entity/Increment/Numeric.php
index 419091d929..ee535d3fb9 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Increment/Numeric.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Increment/Numeric.php
@@ -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_Eav
- * @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_Eav
+ * @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)
*/
@@ -51,4 +51,4 @@ public function getNextId()
return $this->format($next);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Eav/Model/Entity/Interface.php b/app/code/core/Mage/Eav/Model/Entity/Interface.php
index 0f39227f77..bcb40c7158 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Interface.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Interface.php
@@ -18,14 +18,14 @@
* 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_Eav
- * @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_Eav
+ * @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)
*/
interface Mage_Eav_Model_Entity_Interface
{
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Eav/Model/Entity/Setup.php b/app/code/core/Mage/Eav/Model/Entity/Setup.php
index 206cec2313..4dc95a1dfc 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Setup.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Setup.php
@@ -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_Eav
- * @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)
+ * @category Mage
+ * @package Mage_Eav
+ * @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)
*/
@@ -458,6 +458,11 @@ public function getAttributeGroupId($entityTypeId, $setId, $groupId)
if (!is_numeric($groupId)) {
$groupId = $this->getAttributeGroup($entityTypeId, $setId, $groupId, 'attribute_group_id');
}
+
+ if (!is_numeric($groupId)) {
+ $groupId = $this->getDefaultAttributeGroupId($entityTypeId, $setId);
+ }
+
if (!is_numeric($groupId)) {
throw Mage::exception('Mage_Eav', Mage::helper('eav')->__('Wrong attribute group ID'));
}
@@ -764,42 +769,40 @@ protected function _updateAttributeAdditionalData($entityTypeId, $id, $field, $v
* @param string $field
* @return mixed
*/
- public function getAttribute($entityTypeId, $id, $field=null)
+ public function getAttribute($entityTypeId, $id, $field = null)
{
- $joinTable = $this->getEntityType($entityTypeId, 'additional_attribute_table');
- if (!$joinTable) {
- return $this->getTableRow('eav/attribute',
- is_numeric($id) ? 'attribute_id' : 'attribute_code', $id,
- $field,
- 'entity_type_id', $this->getEntityTypeId($entityTypeId)
- );
+ $additionalTable = $this->getEntityType($entityTypeId, 'additional_attribute_table');
+ $entityTypeId = $this->getEntityTypeId($entityTypeId);
+ $idField = (is_numeric($id) ? 'attribute_id' : 'attribute_code');
+ if (!$additionalTable) {
+ return $this->getTableRow('eav/attribute', $idField, $id, $field, 'entity_type_id', $entityTypeId);
}
- $mainTable = $this->getTable('eav/attribute');
- $joinTable = $this->getTable($joinTable);
- $parentId = $this->getEntityTypeId($entityTypeId);
- $idField = (is_numeric($id) ? 'attribute_id' : 'attribute_code');
- $table = $mainTable . '-' . $joinTable;
- if (empty($this->_setupCache[$table][$parentId][$id])) {
- $sql = "select
- $mainTable.*,
- $joinTable.*
- from
- $mainTable
- inner join $joinTable on $joinTable.attribute_id=$mainTable.attribute_id
- where
- $mainTable.$idField = :idField
- and $mainTable.entity_type_id = :parentId";
- $bind = array(
- 'idField' => $id,
- 'parentId' => $parentId
- );
- $this->_setupCache[$mainTable][$parentId][$id] = $this->_conn->fetchRow($sql, $bind);
- $this->_conn->fetchAll($sql, $bind);
+
+ $mainTable = $this->getTable('eav/attribute');
+ if (empty($this->_setupCache[$mainTable][$entityTypeId][$id])) {
+ $additionalTable = $this->getTable($additionalTable);
+ $select = $this->_conn->select()
+ ->from(array('main' => $mainTable))
+ ->join(
+ array('additional' => $additionalTable),
+ 'main.attribute_id=additional.attribute_id')
+ ->where("main.{$idField}=?", $id)
+ ->where("main.entity_type_id=?", $entityTypeId);
+ $row = $this->_conn->fetchRow($select);
+
+ if (!$row) {
+ $this->_setupCache[$mainTable][$entityTypeId][$id] = false;
+ } else {
+ $this->_setupCache[$mainTable][$entityTypeId][$row['attribute_id']] = $row;
+ $this->_setupCache[$mainTable][$entityTypeId][$row['attribute_code']] = $row;
+ }
}
- if (is_null($field)) {
- return $this->_setupCache[$mainTable][$parentId][$id];
+
+ $row = $this->_setupCache[$mainTable][$entityTypeId][$id];
+ if (!is_null($field)) {
+ return isset($row[$field]) ? $row[$field] : false;
}
- return isset($this->_setupCache[$mainTable][$parentId][$id][$field]) ? $this->_setupCache[$mainTable][$parentId][$id][$field] : false;
+ return $row;
}
/**
@@ -864,17 +867,12 @@ public function getAttributeTable($entityTypeId, $id)
*/
public function removeAttribute($entityTypeId, $code)
{
- $attributeId = $this->getAttributeId($entityTypeId, $code);
- $additionalTable = $this->getEntityType($entityTypeId, 'additional_attribute_table');
- if ($attributeId) {
- $this->deleteTableRow('eav/attribute', 'attribute_id', $attributeId);
- if ($additionalTable) {
- $additionalTable = $this->getTable($additionalTable);
- $condition = $this->_conn->quoteInto("attribute_id=?", $attributeId);
- $this->_conn->delete($additionalTable, $condition);
- if (isset($this->_setupCache[$table.'-'.$additionalTable][0][$attributeId])) {
- unset($this->_setupCache[$table][0][$attributeId]);
- }
+ $mainTable = $this->getTable('eav/attribute');
+ $attribute = $this->getAttribute($entityTypeId, $code);
+ if ($attribute) {
+ $this->deleteTableRow('eav/attribute', 'attribute_id', $attribute['attribute_id']);
+ if (isset($this->_setupCache[$mainTable][$attribute['entity_type_id']][$attribute['attribute_code']])) {
+ unset($this->_setupCache[$mainTable][$attribute['entity_type_id']][$attribute['attribute_code']]);
}
}
return $this;
diff --git a/app/code/core/Mage/Eav/Model/Entity/Store.php b/app/code/core/Mage/Eav/Model/Entity/Store.php
index cdfd5d298c..142b53a313 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Store.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Store.php
@@ -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_Eav
- * @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_Eav
+ * @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)
*/
@@ -37,4 +37,4 @@ public function loadByEntityStore($entityTypeId, $storeId)
$this->_getResource()->loadByEntityStore($this, $entityTypeId, $storeId);
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Eav/Model/Entity/Type.php b/app/code/core/Mage/Eav/Model/Entity/Type.php
index 7d085c82b7..bca739b455 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Type.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Type.php
@@ -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_Eav
- * @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_Eav
+ * @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)
*/
diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Config.php b/app/code/core/Mage/Eav/Model/Mysql4/Config.php
index 932e7436ff..cba3bf2d38 100644
--- a/app/code/core/Mage/Eav/Model/Mysql4/Config.php
+++ b/app/code/core/Mage/Eav/Model/Mysql4/Config.php
@@ -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_Eav
- * @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_Eav
+ * @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)
*/
@@ -51,8 +51,8 @@ protected function _loadTypes()
$select = $this->_getReadAdapter()->select()->from($this->getMainTable());
$data = $this->_getReadAdapter()->fetchAll($select);
foreach ($data as $row) {
- self::$_entityTypes['by_id'][$row['entity_type_id']] = $row;
- self::$_entityTypes['by_code'][$row['entity_type_code']] = $row;
+ self::$_entityTypes['by_id'][$row['entity_type_id']] = $row;
+ self::$_entityTypes['by_code'][$row['entity_type_code']] = $row;
}
}
@@ -86,10 +86,10 @@ public function fetchEntityTypeData($entityType)
$attributes = $this->_loadTypeAttributes($info['entity_type_id']);
$data['attributes'] = array();
foreach ($attributes as $attribute) {
- $data['attributes'][$attribute['attribute_id']] = $attribute;
- $data['attributes'][$attribute['attribute_code']] = $attribute['attribute_id'];
+ $data['attributes'][$attribute['attribute_id']] = $attribute;
+ $data['attributes'][$attribute['attribute_code']] = $attribute['attribute_id'];
}
}
return $data;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute.php
index f26893fe22..3671b94c7e 100644
--- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute.php
+++ b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute.php
@@ -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_Eav
- * @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_Eav
+ * @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)
*/
@@ -532,4 +532,18 @@ public function getStoreLabelsByAttributeId($attributeId)
}
return $values;
}
+
+ /**
+ * Load by given attributes ids and return only exist attribute ids
+ *
+ * @param array $attributeIds
+ * @return array
+ */
+ public function getValidAttributeIds($attributeIds)
+ {
+ $select = $this->_getReadAdapter()->select()
+ ->from($this->getMainTable(), array('attribute_id'))
+ ->where('attribute_id in (?)', $attributeIds);
+ return $this->_getReadAdapter()->fetchCol($select);
+ }
}
diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Collection.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Collection.php
index 69007a41d7..14dfdb638f 100644
--- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Collection.php
+++ b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Collection.php
@@ -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_Eav
- * @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_Eav
+ * @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)
*/
@@ -283,7 +283,7 @@ protected function _addSetInfo()
if ($this->_addSetInfoFlag) {
$attributeIds = array();
foreach ($this->_data as &$dataItem) {
- $attributeIds[] = $dataItem['attribute_id'];
+ $attributeIds[] = $dataItem['attribute_id'];
}
$attributeToSetInfo = array();
@@ -354,10 +354,10 @@ public function checkConfigurableProducts()
public function setCodeFilter($code)
{
if (empty($code)) {
- return $this;
+ return $this;
}
if (!is_array($code)) {
- $code = array($code);
+ $code = array($code);
}
$this->getSelect()->where('main_table.attribute_code IN(?)', $code);
return $this;
diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Group.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Group.php
index e4e651c825..7e8d0ae0a4 100644
--- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Group.php
+++ b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Group.php
@@ -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_Eav
- * @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_Eav
+ * @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)
*/
@@ -32,16 +32,22 @@ protected function _construct()
$this->_init('eav/attribute_group', 'attribute_group_id');
}
+ /**
+ * Checks if attribute group exists
+ *
+ * @param Mage_Eav_Model_Entity_Attribute_Group $object
+ * @return boolean
+ */
public function itemExists($object)
{
- $read = $this->_getReadAdapter();
- $select = $read->select()->from($this->getMainTable())
- ->where("attribute_group_name='{$object->getAttributeGroupName()}'");
- $data = $read->fetchRow($select);
- if (!$data) {
- return false;
+ $select = $this->_getReadAdapter()->select()
+ ->from($this->getMainTable())
+ ->where('attribute_set_id = ?', $object->getAttributeSetId())
+ ->where('attribute_group_name = ?', $object->getAttributeGroupName());
+ if ($this->_getReadAdapter()->fetchRow($select)) {
+ return true;
}
- return true;
+ return false;
}
/**
@@ -97,4 +103,4 @@ public function updateDefaultGroup($attributeSetId)
);
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Group/Collection.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Group/Collection.php
index 44371972b8..8ee97a2c92 100644
--- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Group/Collection.php
+++ b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Group/Collection.php
@@ -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_Eav
- * @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_Eav
+ * @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)
*/
@@ -48,4 +48,4 @@ public function setAttributeSetFilter($setId)
$this->getSelect()->order('main_table.sort_order');
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Option.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Option.php
index 33a6b6082a..ea983c5d05 100644
--- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Option.php
+++ b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Option.php
@@ -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_Eav
- * @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_Eav
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Option/Collection.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Option/Collection.php
index 1bcf827de9..b73e1aa02e 100644
--- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Option/Collection.php
+++ b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Option/Collection.php
@@ -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_Eav
- * @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_Eav
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Set.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Set.php
index 54f61f6a1f..f6e333fbfc 100644
--- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Set.php
+++ b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Set.php
@@ -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_Eav
- * @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)
+ * @category Mage
+ * @package Mage_Eav
+ * @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)
*/
@@ -52,9 +52,12 @@ protected function _construct()
protected function _afterSave(Mage_Core_Model_Abstract $object)
{
if ($object->getGroups()) {
+ /* @var $group Mage_Eav_Model_Entity_Attribute_Group */
foreach ($object->getGroups() as $group) {
- /* @var $group Mage_Eav_Model_Entity_Attribute_Group */
$group->setAttributeSetId($object->getId());
+ if ($group->itemExists() && !$group->getId()) {
+ continue;
+ }
$group->save();
}
}
diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Set/Collection.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Set/Collection.php
index 65991e408d..dfc4b1d888 100644
--- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Set/Collection.php
+++ b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Set/Collection.php
@@ -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_Eav
- * @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_Eav
+ * @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)
*/
@@ -47,4 +47,4 @@ public function toOptionHash()
{
return parent::_toOptionHash('attribute_set_id', 'attribute_set_name');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Store.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Store.php
index 9fe7e6a9ed..19d8fc0b2f 100644
--- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Store.php
+++ b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Store.php
@@ -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_Eav
- * @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_Eav
+ * @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)
*/
@@ -60,4 +60,4 @@ public function loadByEntityStore(Mage_Core_Model_Abstract $object, $entityTypeI
return true;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Type.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Type.php
index 40d134d94c..b5d9527186 100644
--- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Type.php
+++ b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Type.php
@@ -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_Eav
- * @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_Eav
+ * @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)
*/
diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Type/Collection.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Type/Collection.php
index 3b12a026b2..81bc915256 100644
--- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Type/Collection.php
+++ b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Type/Collection.php
@@ -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_Eav
- * @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_Eav
+ * @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)
*/
@@ -31,4 +31,4 @@ public function _construct()
{
$this->_init('eav/entity_type');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Eav/etc/config.xml b/app/code/core/Mage/Eav/etc/config.xml
index aaa0286d8a..6d0b0ed587 100644
--- a/app/code/core/Mage/Eav/etc/config.xml
+++ b/app/code/core/Mage/Eav/etc/config.xml
@@ -19,10 +19,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_Eav
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ * @category Mage
+ * @package Mage_Eav
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
diff --git a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-install-0.7.0.php
index 5f8c615669..045f3204fe 100644
--- a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-install-0.7.0.php
+++ b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-install-0.7.0.php
@@ -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_Eav
- * @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_Eav
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.0-0.7.1.php
index 53d4950f06..3581a22d7e 100644
--- a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.0-0.7.1.php
+++ b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.0-0.7.1.php
@@ -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_Eav
- * @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_Eav
+ * @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)
*/
$installer = $this;
@@ -32,4 +32,4 @@
$installer->run("
ALTER TABLE {$this->getTable('eav_attribute')} ADD COLUMN `is_configurable` TINYINT(1) UNSIGNED NOT NULL DEFAULT 1;
");
-$installer->endSetup();
\ No newline at end of file
+$installer->endSetup();
diff --git a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.1-0.7.2.php
index c7eeb555f2..245f0b1ca6 100644
--- a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.1-0.7.2.php
+++ b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.1-0.7.2.php
@@ -1,5 +1,5 @@
getTable('eav_attribute_group')}
CHANGE `default_id` `default_id` smallint unsigned NULL default '0';
");
-$installer->endSetup();
\ No newline at end of file
+$installer->endSetup();
diff --git a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.7-0.7.8.php b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.7-0.7.8.php
index 2af10b70ab..2c37771c47 100644
--- a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.7-0.7.8.php
+++ b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.7-0.7.8.php
@@ -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_Eav
- * @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_Eav
+ * @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)
*/
diff --git a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.8-0.7.9.php b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.8-0.7.9.php
index d29792776c..b7ba6509d9 100644
--- a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.8-0.7.9.php
+++ b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.8-0.7.9.php
@@ -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_Eav
- * @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_Eav
+ * @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)
*/
@@ -39,4 +39,4 @@
ALTER TABLE {$installer->getTable('eav_attribute_group')}
CHANGE `attribute_group_name` `attribute_group_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL default '';
");
-$installer->endSetup();
\ No newline at end of file
+$installer->endSetup();
diff --git a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.9-0.7.10.php b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.9-0.7.10.php
index 7d8f3cba5c..5f63770e40 100644
--- a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.9-0.7.10.php
+++ b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.9-0.7.10.php
@@ -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_Eav
- * @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_Eav
+ * @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)
*/
diff --git a/app/code/core/Mage/Eway/Block/Form.php b/app/code/core/Mage/Eway/Block/Form.php
index 0795cdef34..fc990f0840 100644
--- a/app/code/core/Mage/Eway/Block/Form.php
+++ b/app/code/core/Mage/Eway/Block/Form.php
@@ -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_Eway
- * @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_Eway
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Eway/Block/Info.php b/app/code/core/Mage/Eway/Block/Info.php
index 9ae51957d7..70ac6e0f06 100644
--- a/app/code/core/Mage/Eway/Block/Info.php
+++ b/app/code/core/Mage/Eway/Block/Info.php
@@ -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_Eway
- * @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_Eway
+ * @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)
*/
/**
@@ -45,4 +45,4 @@ public function toPdf()
return $this->toHtml();
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Eway/Block/Secure/Failure.php b/app/code/core/Mage/Eway/Block/Secure/Failure.php
index 71632de15b..9c76d62811 100644
--- a/app/code/core/Mage/Eway/Block/Secure/Failure.php
+++ b/app/code/core/Mage/Eway/Block/Secure/Failure.php
@@ -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_Eway
- * @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_Eway
+ * @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)
*/
/**
* Secure Failure Response Block
@@ -50,4 +50,4 @@ public function getContinueShoppingUrl()
{
return Mage::getUrl('checkout/cart');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Eway/Block/Secure/Form.php b/app/code/core/Mage/Eway/Block/Secure/Form.php
index 24f6335700..97e1fa6247 100644
--- a/app/code/core/Mage/Eway/Block/Secure/Form.php
+++ b/app/code/core/Mage/Eway/Block/Secure/Form.php
@@ -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_Eway
- * @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_Eway
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Eway/Block/Secure/Redirect.php b/app/code/core/Mage/Eway/Block/Secure/Redirect.php
index 365b5a0f44..d260871483 100644
--- a/app/code/core/Mage/Eway/Block/Secure/Redirect.php
+++ b/app/code/core/Mage/Eway/Block/Secure/Redirect.php
@@ -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_Eway
- * @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_Eway
+ * @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)
*/
/**
@@ -54,4 +54,4 @@ protected function _toHtml()
return $html;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Eway/Block/Shared/Failure.php b/app/code/core/Mage/Eway/Block/Shared/Failure.php
index 63d1881ebe..cee68baeca 100644
--- a/app/code/core/Mage/Eway/Block/Shared/Failure.php
+++ b/app/code/core/Mage/Eway/Block/Shared/Failure.php
@@ -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_Eway
- * @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_Eway
+ * @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)
*/
/**
* Shared Failure Response Block
@@ -52,4 +52,4 @@ public function getContinueShoppingUrl()
{
return Mage::getUrl('checkout/cart');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Eway/Block/Shared/Form.php b/app/code/core/Mage/Eway/Block/Shared/Form.php
index edf18d0e78..2ca04700b2 100644
--- a/app/code/core/Mage/Eway/Block/Shared/Form.php
+++ b/app/code/core/Mage/Eway/Block/Shared/Form.php
@@ -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_Eway
- * @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_Eway
+ * @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)
*/
@@ -39,4 +39,4 @@ protected function _construct()
$this->setTemplate('eway/shared/form.phtml');
parent::_construct();
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Eway/Block/Shared/Redirect.php b/app/code/core/Mage/Eway/Block/Shared/Redirect.php
index dce8a7115f..87bfdff22b 100644
--- a/app/code/core/Mage/Eway/Block/Shared/Redirect.php
+++ b/app/code/core/Mage/Eway/Block/Shared/Redirect.php
@@ -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_Eway
- * @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_Eway
+ * @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)
*/
/**
@@ -55,4 +55,4 @@ protected function _toHtml()
return $html;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Eway/Controller/Abstract.php b/app/code/core/Mage/Eway/Controller/Abstract.php
index 0f53dde9f1..612d60a145 100644
--- a/app/code/core/Mage/Eway/Controller/Abstract.php
+++ b/app/code/core/Mage/Eway/Controller/Abstract.php
@@ -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_Eway
- * @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_Eway
+ * @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)
*/
/**
@@ -175,4 +175,4 @@ protected function _checkReturnedPost()
return $status;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Eway/Helper/Data.php b/app/code/core/Mage/Eway/Helper/Data.php
index 326211e692..a2b4284463 100644
--- a/app/code/core/Mage/Eway/Helper/Data.php
+++ b/app/code/core/Mage/Eway/Helper/Data.php
@@ -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_Eway
- * @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_Eway
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Eway/Model/Api/Debug.php b/app/code/core/Mage/Eway/Model/Api/Debug.php
index 68fb947ab1..9ff7490362 100644
--- a/app/code/core/Mage/Eway/Model/Api/Debug.php
+++ b/app/code/core/Mage/Eway/Model/Api/Debug.php
@@ -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_Eway
- * @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_Eway
+ * @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)
*/
/**
@@ -37,4 +37,4 @@ protected function _construct()
{
$this->_init('eway/api_debug');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Eway/Model/Direct.php b/app/code/core/Mage/Eway/Model/Direct.php
index 7db6c2a91d..23cf0e7c25 100644
--- a/app/code/core/Mage/Eway/Model/Direct.php
+++ b/app/code/core/Mage/Eway/Model/Direct.php
@@ -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_Eway
- * @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_Eway
+ * @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)
*/
/**
@@ -293,4 +293,4 @@ public function parseXmlResponse($xmlResponse)
return $newResArr;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Eway/Model/Mysql4/Api/Debug.php b/app/code/core/Mage/Eway/Model/Mysql4/Api/Debug.php
index 87195fdf19..0b09086bba 100644
--- a/app/code/core/Mage/Eway/Model/Mysql4/Api/Debug.php
+++ b/app/code/core/Mage/Eway/Model/Mysql4/Api/Debug.php
@@ -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_Eway
- * @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_Eway
+ * @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)
*/
/**
@@ -37,4 +37,4 @@ protected function _construct()
{
$this->_init('eway/api_debug', 'debug_id');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Eway/Model/Mysql4/Api/Debug/Collection.php b/app/code/core/Mage/Eway/Model/Mysql4/Api/Debug/Collection.php
index f6d3877714..a68ddebd1d 100644
--- a/app/code/core/Mage/Eway/Model/Mysql4/Api/Debug/Collection.php
+++ b/app/code/core/Mage/Eway/Model/Mysql4/Api/Debug/Collection.php
@@ -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_Eway
- * @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_Eway
+ * @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)
*/
/**
@@ -37,4 +37,4 @@ protected function _construct()
{
$this->_init('eway/api_debug');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Eway/Model/Mysql4/Setup.php b/app/code/core/Mage/Eway/Model/Mysql4/Setup.php
index cc8f4abcf7..bb9fd49dc7 100644
--- a/app/code/core/Mage/Eway/Model/Mysql4/Setup.php
+++ b/app/code/core/Mage/Eway/Model/Mysql4/Setup.php
@@ -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_Eway
- * @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_Eway
+ * @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)
*/
diff --git a/app/code/core/Mage/Eway/Model/Secure.php b/app/code/core/Mage/Eway/Model/Secure.php
index 2f0d5fd60b..cb61ef1246 100644
--- a/app/code/core/Mage/Eway/Model/Secure.php
+++ b/app/code/core/Mage/Eway/Model/Secure.php
@@ -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_Eway
- * @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_Eway
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Eway/Model/Shared.php b/app/code/core/Mage/Eway/Model/Shared.php
index 40d59c898c..49a4117a86 100644
--- a/app/code/core/Mage/Eway/Model/Shared.php
+++ b/app/code/core/Mage/Eway/Model/Shared.php
@@ -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_Eway
- * @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_Eway
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Eway/Model/Source/Cctype.php b/app/code/core/Mage/Eway/Model/Source/Cctype.php
index 158714dca9..fa7e9bb201 100644
--- a/app/code/core/Mage/Eway/Model/Source/Cctype.php
+++ b/app/code/core/Mage/Eway/Model/Source/Cctype.php
@@ -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_Eway
- * @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_Eway
+ * @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)
*/
/**
@@ -37,4 +37,4 @@ public function getAllowedTypes()
{
return array('VI', 'MC', 'AE', 'DICL', 'JCB');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Eway/controllers/SecureController.php b/app/code/core/Mage/Eway/controllers/SecureController.php
index 8161feb5b8..a943e22765 100644
--- a/app/code/core/Mage/Eway/controllers/SecureController.php
+++ b/app/code/core/Mage/Eway/controllers/SecureController.php
@@ -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_Eway
- * @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_Eway
+ * @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)
*/
/**
@@ -39,4 +39,4 @@ class Mage_Eway_SecureController extends Mage_Eway_Controller_Abstract
* @var string
*/
protected $_redirectBlockType = 'eway/secure_redirect';
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Eway/controllers/SharedController.php b/app/code/core/Mage/Eway/controllers/SharedController.php
index 12378ba8c6..7b7fb08966 100644
--- a/app/code/core/Mage/Eway/controllers/SharedController.php
+++ b/app/code/core/Mage/Eway/controllers/SharedController.php
@@ -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_Eway
- * @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_Eway
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Eway/etc/config.xml b/app/code/core/Mage/Eway/etc/config.xml
index 4ccaf10d87..db507f6eb3 100644
--- a/app/code/core/Mage/Eway/etc/config.xml
+++ b/app/code/core/Mage/Eway/etc/config.xml
@@ -19,10 +19,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_Eway
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ * @category Mage
+ * @package Mage_Eway
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
diff --git a/app/code/core/Mage/Eway/etc/system.xml b/app/code/core/Mage/Eway/etc/system.xml
index 70600f34cb..0582ba05f1 100644
--- a/app/code/core/Mage/Eway/etc/system.xml
+++ b/app/code/core/Mage/Eway/etc/system.xml
@@ -19,10 +19,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_Eway
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ * @category Mage
+ * @package Mage_Eway
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
@@ -351,4 +351,4 @@
-
\ No newline at end of file
+
diff --git a/app/code/core/Mage/Eway/sql/eway_setup/mysql4-install-0.1.0.php b/app/code/core/Mage/Eway/sql/eway_setup/mysql4-install-0.1.0.php
index 6f9d3f2240..5ae7a86c74 100644
--- a/app/code/core/Mage/Eway/sql/eway_setup/mysql4-install-0.1.0.php
+++ b/app/code/core/Mage/Eway/sql/eway_setup/mysql4-install-0.1.0.php
@@ -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_Eway
- * @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_Eway
+ * @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)
*/
diff --git a/app/code/core/Mage/Flo2Cash/Block/Form.php b/app/code/core/Mage/Flo2Cash/Block/Form.php
index 2e5fe06ba1..6aa0622e51 100644
--- a/app/code/core/Mage/Flo2Cash/Block/Form.php
+++ b/app/code/core/Mage/Flo2Cash/Block/Form.php
@@ -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_Flo2Cash
- * @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_Flo2Cash
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Flo2Cash/Block/Info.php b/app/code/core/Mage/Flo2Cash/Block/Info.php
index bc5690b730..4dc447ec33 100644
--- a/app/code/core/Mage/Flo2Cash/Block/Info.php
+++ b/app/code/core/Mage/Flo2Cash/Block/Info.php
@@ -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_Flo2Cash
- * @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_Flo2Cash
+ * @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)
*/
/**
@@ -45,4 +45,4 @@ public function toPdf()
return $this->toHtml();
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Flo2Cash/Helper/Data.php b/app/code/core/Mage/Flo2Cash/Helper/Data.php
index 106473c46e..48a63f1c9f 100644
--- a/app/code/core/Mage/Flo2Cash/Helper/Data.php
+++ b/app/code/core/Mage/Flo2Cash/Helper/Data.php
@@ -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_Flo2Cash
- * @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_Flo2Cash
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Flo2Cash/Model/Api/Debug.php b/app/code/core/Mage/Flo2Cash/Model/Api/Debug.php
index 0f9c6ee75c..1de21ac89b 100644
--- a/app/code/core/Mage/Flo2Cash/Model/Api/Debug.php
+++ b/app/code/core/Mage/Flo2Cash/Model/Api/Debug.php
@@ -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_Flo2Cash
- * @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_Flo2Cash
+ * @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)
*/
/**
@@ -37,4 +37,4 @@ protected function _construct()
{
$this->_init('flo2cash/api_debug');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Flo2Cash/Model/Mysql4/Api/Debug.php b/app/code/core/Mage/Flo2Cash/Model/Mysql4/Api/Debug.php
index 43103febcb..3c51a72154 100644
--- a/app/code/core/Mage/Flo2Cash/Model/Mysql4/Api/Debug.php
+++ b/app/code/core/Mage/Flo2Cash/Model/Mysql4/Api/Debug.php
@@ -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_Flo2Cash
- * @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_Flo2Cash
+ * @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)
*/
/**
@@ -37,4 +37,4 @@ protected function _construct()
{
$this->_init('flo2cash/api_debug', 'debug_id');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Flo2Cash/Model/Mysql4/Api/Debug/Collection.php b/app/code/core/Mage/Flo2Cash/Model/Mysql4/Api/Debug/Collection.php
index be441e9b33..04ee7b7c88 100644
--- a/app/code/core/Mage/Flo2Cash/Model/Mysql4/Api/Debug/Collection.php
+++ b/app/code/core/Mage/Flo2Cash/Model/Mysql4/Api/Debug/Collection.php
@@ -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_Flo2Cash
- * @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_Flo2Cash
+ * @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)
*/
/**
@@ -37,4 +37,4 @@ protected function _construct()
{
$this->_init('flo2cash/api_debug');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Flo2Cash/Model/Mysql4/Setup.php b/app/code/core/Mage/Flo2Cash/Model/Mysql4/Setup.php
index 92d9d9d10e..0ade30fadd 100644
--- a/app/code/core/Mage/Flo2Cash/Model/Mysql4/Setup.php
+++ b/app/code/core/Mage/Flo2Cash/Model/Mysql4/Setup.php
@@ -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_Flo2Cash
- * @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_Flo2Cash
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/Flo2Cash/Model/Source/Cctype.php b/app/code/core/Mage/Flo2Cash/Model/Source/Cctype.php
index ea8dcb8ecc..d0d2124598 100644
--- a/app/code/core/Mage/Flo2Cash/Model/Source/Cctype.php
+++ b/app/code/core/Mage/Flo2Cash/Model/Source/Cctype.php
@@ -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_Flo2Cash
- * @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_Flo2Cash
+ * @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)
*/
/**
@@ -37,4 +37,4 @@ public function getAllowedTypes()
{
return array('VI', 'MC', 'AE', 'DICL');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Flo2Cash/Model/Source/PaymentAction.php b/app/code/core/Mage/Flo2Cash/Model/Source/PaymentAction.php
index 22b06c58cf..27d4e087ec 100644
--- a/app/code/core/Mage/Flo2Cash/Model/Source/PaymentAction.php
+++ b/app/code/core/Mage/Flo2Cash/Model/Source/PaymentAction.php
@@ -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_Flo2Cash
- * @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_Flo2Cash
+ * @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)
*/
/**
@@ -46,4 +46,4 @@ public function toOptionArray()
),
);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Flo2Cash/Model/Web.php b/app/code/core/Mage/Flo2Cash/Model/Web.php
index 489c71e02f..45698a0258 100644
--- a/app/code/core/Mage/Flo2Cash/Model/Web.php
+++ b/app/code/core/Mage/Flo2Cash/Model/Web.php
@@ -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_Flo2Cash
- * @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_Flo2Cash
+ * @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)
*/
/**
@@ -295,4 +295,4 @@ protected function _convertCcType($magentoCcType = 'VI')
{
return $this->_ccTypesConvert[$magentoCcType];
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Flo2Cash/etc/config.xml b/app/code/core/Mage/Flo2Cash/etc/config.xml
index b016454409..9d15f1c54c 100644
--- a/app/code/core/Mage/Flo2Cash/etc/config.xml
+++ b/app/code/core/Mage/Flo2Cash/etc/config.xml
@@ -19,10 +19,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_Flo2Cash
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ * @category Mage
+ * @package Mage_Flo2Cash
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
diff --git a/app/code/core/Mage/Flo2Cash/etc/system.xml b/app/code/core/Mage/Flo2Cash/etc/system.xml
index 741e2c0190..3522a3ca5e 100644
--- a/app/code/core/Mage/Flo2Cash/etc/system.xml
+++ b/app/code/core/Mage/Flo2Cash/etc/system.xml
@@ -19,10 +19,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_Flo2Cash
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ * @category Mage
+ * @package Mage_Flo2Cash
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
@@ -173,4 +173,4 @@
-
\ No newline at end of file
+
diff --git a/app/code/core/Mage/Flo2Cash/sql/flo2cash_setup/mysql4-install-0.1.0.php b/app/code/core/Mage/Flo2Cash/sql/flo2cash_setup/mysql4-install-0.1.0.php
index 1a5d25c5b8..c364ce918e 100644
--- a/app/code/core/Mage/Flo2Cash/sql/flo2cash_setup/mysql4-install-0.1.0.php
+++ b/app/code/core/Mage/Flo2Cash/sql/flo2cash_setup/mysql4-install-0.1.0.php
@@ -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_Flo2Cash
- * @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_Flo2Cash
+ * @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)
*/
diff --git a/app/code/core/Mage/Flo2Cash/sql/flo2cash_setup/mysql4-upgrade-0.1.0-0.1.1.php b/app/code/core/Mage/Flo2Cash/sql/flo2cash_setup/mysql4-upgrade-0.1.0-0.1.1.php
index ef49333af3..2d9ba52cf6 100644
--- a/app/code/core/Mage/Flo2Cash/sql/flo2cash_setup/mysql4-upgrade-0.1.0-0.1.1.php
+++ b/app/code/core/Mage/Flo2Cash/sql/flo2cash_setup/mysql4-upgrade-0.1.0-0.1.1.php
@@ -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_Flo2Cash
- * @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_Flo2Cash
+ * @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)
*/
$installer = $this;
@@ -29,4 +29,4 @@
$installer->addAttribute('order_payment', 'flo2cash_account_id', array());
-$installer->endSetup();
\ No newline at end of file
+$installer->endSetup();
diff --git a/app/code/core/Mage/GiftMessage/Block/Message/Form.php b/app/code/core/Mage/GiftMessage/Block/Message/Form.php
index 9d06478edd..f94217f21e 100644
--- a/app/code/core/Mage/GiftMessage/Block/Message/Form.php
+++ b/app/code/core/Mage/GiftMessage/Block/Message/Form.php
@@ -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_GiftMessage
- * @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_GiftMessage
+ * @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)
*/
diff --git a/app/code/core/Mage/GiftMessage/Block/Message/Helper.php b/app/code/core/Mage/GiftMessage/Block/Message/Helper.php
index 7a8213b6ed..5010a0b107 100644
--- a/app/code/core/Mage/GiftMessage/Block/Message/Helper.php
+++ b/app/code/core/Mage/GiftMessage/Block/Message/Helper.php
@@ -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_GiftMessage
- * @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_GiftMessage
+ * @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)
*/
diff --git a/app/code/core/Mage/GiftMessage/Block/Message/Inline.php b/app/code/core/Mage/GiftMessage/Block/Message/Inline.php
index 9cba6c6c89..d1671e3881 100644
--- a/app/code/core/Mage/GiftMessage/Block/Message/Inline.php
+++ b/app/code/core/Mage/GiftMessage/Block/Message/Inline.php
@@ -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_GiftMessage
- * @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_GiftMessage
+ * @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)
*/
diff --git a/app/code/core/Mage/GiftMessage/Helper/Data.php b/app/code/core/Mage/GiftMessage/Helper/Data.php
index 7292965c07..fb360320d2 100644
--- a/app/code/core/Mage/GiftMessage/Helper/Data.php
+++ b/app/code/core/Mage/GiftMessage/Helper/Data.php
@@ -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_GiftMessage
- * @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_GiftMessage
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/GiftMessage/Helper/Message.php b/app/code/core/Mage/GiftMessage/Helper/Message.php
index 6f06b90420..09cc65758a 100644
--- a/app/code/core/Mage/GiftMessage/Helper/Message.php
+++ b/app/code/core/Mage/GiftMessage/Helper/Message.php
@@ -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_GiftMessage
- * @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_GiftMessage
+ * @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)
*/
diff --git a/app/code/core/Mage/GiftMessage/Helper/Url.php b/app/code/core/Mage/GiftMessage/Helper/Url.php
index b7d2ae99b7..30ff381309 100644
--- a/app/code/core/Mage/GiftMessage/Helper/Url.php
+++ b/app/code/core/Mage/GiftMessage/Helper/Url.php
@@ -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_GiftMessage
- * @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_GiftMessage
+ * @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)
*/
diff --git a/app/code/core/Mage/GiftMessage/Model/Entity/Attribute/Backend/Boolean/Config.php b/app/code/core/Mage/GiftMessage/Model/Entity/Attribute/Backend/Boolean/Config.php
index df213b0aab..f013a01855 100644
--- a/app/code/core/Mage/GiftMessage/Model/Entity/Attribute/Backend/Boolean/Config.php
+++ b/app/code/core/Mage/GiftMessage/Model/Entity/Attribute/Backend/Boolean/Config.php
@@ -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_GiftMessage
- * @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_GiftMessage
+ * @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)
*/
diff --git a/app/code/core/Mage/GiftMessage/Model/Entity/Attribute/Source/Boolean/Config.php b/app/code/core/Mage/GiftMessage/Model/Entity/Attribute/Source/Boolean/Config.php
index cfaef7b3cc..9f3a754a3a 100644
--- a/app/code/core/Mage/GiftMessage/Model/Entity/Attribute/Source/Boolean/Config.php
+++ b/app/code/core/Mage/GiftMessage/Model/Entity/Attribute/Source/Boolean/Config.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_GiftMessage
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
diff --git a/app/code/core/Mage/GiftMessage/Model/Message.php b/app/code/core/Mage/GiftMessage/Model/Message.php
index 3c45576dd8..a7c2857137 100644
--- a/app/code/core/Mage/GiftMessage/Model/Message.php
+++ b/app/code/core/Mage/GiftMessage/Model/Message.php
@@ -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_GiftMessage
- * @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_GiftMessage
+ * @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)
*/
diff --git a/app/code/core/Mage/GiftMessage/Model/Mysql4/Message.php b/app/code/core/Mage/GiftMessage/Model/Mysql4/Message.php
index 0eb4291dc0..845688e631 100644
--- a/app/code/core/Mage/GiftMessage/Model/Mysql4/Message.php
+++ b/app/code/core/Mage/GiftMessage/Model/Mysql4/Message.php
@@ -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_GiftMessage
- * @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_GiftMessage
+ * @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)
*/
diff --git a/app/code/core/Mage/GiftMessage/Model/Mysql4/Message/Collection.php b/app/code/core/Mage/GiftMessage/Model/Mysql4/Message/Collection.php
index e5f8537ff1..f0163dd043 100644
--- a/app/code/core/Mage/GiftMessage/Model/Mysql4/Message/Collection.php
+++ b/app/code/core/Mage/GiftMessage/Model/Mysql4/Message/Collection.php
@@ -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_GiftMessage
- * @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_GiftMessage
+ * @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)
*/
diff --git a/app/code/core/Mage/GiftMessage/Model/Mysql4/Setup.php b/app/code/core/Mage/GiftMessage/Model/Mysql4/Setup.php
index 38621f172e..78182dd362 100644
--- a/app/code/core/Mage/GiftMessage/Model/Mysql4/Setup.php
+++ b/app/code/core/Mage/GiftMessage/Model/Mysql4/Setup.php
@@ -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_GiftMessage
- * @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_GiftMessage
+ * @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)
*/
diff --git a/app/code/core/Mage/GiftMessage/Model/Observer.php b/app/code/core/Mage/GiftMessage/Model/Observer.php
index 3d66b2b4b2..99d5b5ccd2 100644
--- a/app/code/core/Mage/GiftMessage/Model/Observer.php
+++ b/app/code/core/Mage/GiftMessage/Model/Observer.php
@@ -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_GiftMessage
- * @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_GiftMessage
+ * @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)
*/
diff --git a/app/code/core/Mage/GiftMessage/controllers/IndexController.php b/app/code/core/Mage/GiftMessage/controllers/IndexController.php
index d730e811d6..87ac4a3140 100644
--- a/app/code/core/Mage/GiftMessage/controllers/IndexController.php
+++ b/app/code/core/Mage/GiftMessage/controllers/IndexController.php
@@ -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_GiftMessage
- * @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_GiftMessage
+ * @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)
*/
diff --git a/app/code/core/Mage/GiftMessage/etc/config.xml b/app/code/core/Mage/GiftMessage/etc/config.xml
index 46edc99418..1b0edfd368 100644
--- a/app/code/core/Mage/GiftMessage/etc/config.xml
+++ b/app/code/core/Mage/GiftMessage/etc/config.xml
@@ -19,10 +19,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_GiftMessage
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ * @category Mage
+ * @package Mage_GiftMessage
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
@@ -230,4 +230,4 @@
-
\ No newline at end of file
+
diff --git a/app/code/core/Mage/GiftMessage/etc/system.xml b/app/code/core/Mage/GiftMessage/etc/system.xml
index 5d2a4f97dd..3ab12f0cfc 100644
--- a/app/code/core/Mage/GiftMessage/etc/system.xml
+++ b/app/code/core/Mage/GiftMessage/etc/system.xml
@@ -19,10 +19,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_GiftMessage
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ * @category Mage
+ * @package Mage_GiftMessage
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
@@ -60,4 +60,4 @@
-
\ No newline at end of file
+
diff --git a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-install-0.7.0.php
index 2d9b3d8174..07fcd7ceab 100644
--- a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-install-0.7.0.php
+++ b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-install-0.7.0.php
@@ -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_GiftMessage
- * @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_GiftMessage
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.1.3-0.7.0.php b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.1.3-0.7.0.php
index 009b315493..511cc1ed02 100644
--- a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.1.3-0.7.0.php
+++ b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.1.3-0.7.0.php
@@ -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_GiftMessage
- * @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_GiftMessage
+ * @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)
*/
$this->startSetup()
->addAttribute('quote', 'gift_message_id', array('type' => 'int', 'visible' => false, 'required' => false))
@@ -47,4 +47,4 @@
))
->removeAttribute('catalog_product', 'gift_message_aviable')
->setConfigData('sales/gift_messages/allow', 1)
- ->endSetup();
\ No newline at end of file
+ ->endSetup();
diff --git a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.0-0.7.1.php
index d6c561195a..f6e67f1c68 100644
--- a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.0-0.7.1.php
+++ b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.0-0.7.1.php
@@ -18,12 +18,12 @@
* 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_GiftMessage
- * @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_GiftMessage
+ * @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)
*/
$installer = $this;
/* @var $installer Mage_GiftMessage_Model_Mysql4_Setup */
-$installer->updateAttribute('catalog_product', 'gift_message_available', 'is_configurable', 0);
\ No newline at end of file
+$installer->updateAttribute('catalog_product', 'gift_message_available', 'is_configurable', 0);
diff --git a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.1-0.7.2.php
index 7f929dc975..62844eb507 100644
--- a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.1-0.7.2.php
+++ b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.1-0.7.2.php
@@ -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_GiftMessage
- * @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_GiftMessage
+ * @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)
*/
$installer = $this;
@@ -33,4 +33,4 @@
$installer->addAttribute('quote_address_item', 'gift_message_id', array('type' => 'int', 'visible' => false, 'required' => false));
$installer->addAttribute('order', 'gift_message_id', array('type' => 'int', 'visible' => false, 'required' => false));
$installer->addAttribute('order_item', 'gift_message_id', array('type' => 'int', 'visible' => false, 'required' => false));
-$installer->addAttribute('order_item', 'gift_message_available', array('type' => 'int', 'visible' => false, 'required' => false));
\ No newline at end of file
+$installer->addAttribute('order_item', 'gift_message_available', array('type' => 'int', 'visible' => false, 'required' => false));
diff --git a/app/code/core/Mage/GiftRegistry/Helper/Data.php b/app/code/core/Mage/GiftRegistry/Helper/Data.php
index e69de29bb2..8b13789179 100644
--- a/app/code/core/Mage/GiftRegistry/Helper/Data.php
+++ b/app/code/core/Mage/GiftRegistry/Helper/Data.php
@@ -0,0 +1 @@
+
diff --git a/app/code/core/Mage/GiftRegistry/Model/Gift.php b/app/code/core/Mage/GiftRegistry/Model/Gift.php
index ae46016bc0..29d935828d 100644
--- a/app/code/core/Mage/GiftRegistry/Model/Gift.php
+++ b/app/code/core/Mage/GiftRegistry/Model/Gift.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_GiftRegistry
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
diff --git a/app/code/core/Mage/GiftRegistry/Model/Mysql4/Gift.php b/app/code/core/Mage/GiftRegistry/Model/Mysql4/Gift.php
index 4e0f5993e6..0ca5521afb 100644
--- a/app/code/core/Mage/GiftRegistry/Model/Mysql4/Gift.php
+++ b/app/code/core/Mage/GiftRegistry/Model/Mysql4/Gift.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_GiftRegistry
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
diff --git a/app/code/core/Mage/GiftRegistry/Model/Mysql4/Gift/Collection.php b/app/code/core/Mage/GiftRegistry/Model/Mysql4/Gift/Collection.php
index 21031e988a..dcd855341b 100644
--- a/app/code/core/Mage/GiftRegistry/Model/Mysql4/Gift/Collection.php
+++ b/app/code/core/Mage/GiftRegistry/Model/Mysql4/Gift/Collection.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_GiftRegistry
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
diff --git a/app/code/core/Mage/GiftRegistry/etc/config.xml b/app/code/core/Mage/GiftRegistry/etc/config.xml
index da4eb9ab57..5daf735c5a 100644
--- a/app/code/core/Mage/GiftRegistry/etc/config.xml
+++ b/app/code/core/Mage/GiftRegistry/etc/config.xml
@@ -19,10 +19,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_GiftRegistry
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ * @category Mage
+ * @package Mage_GiftRegistry
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
@@ -81,4 +81,4 @@
-
\ No newline at end of file
+
diff --git a/app/code/core/Mage/GoogleAnalytics/Block/Ga.php b/app/code/core/Mage/GoogleAnalytics/Block/Ga.php
index 5fbe2acfcb..8da91fda9b 100644
--- a/app/code/core/Mage/GoogleAnalytics/Block/Ga.php
+++ b/app/code/core/Mage/GoogleAnalytics/Block/Ga.php
@@ -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_GoogleAnalytics
- * @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)
+ * @category Mage
+ * @package Mage_GoogleAnalytics
+ * @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)
*/
diff --git a/app/code/core/Mage/GoogleAnalytics/Helper/Data.php b/app/code/core/Mage/GoogleAnalytics/Helper/Data.php
index 575d0c92c4..d671d6b33d 100644
--- a/app/code/core/Mage/GoogleAnalytics/Helper/Data.php
+++ b/app/code/core/Mage/GoogleAnalytics/Helper/Data.php
@@ -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_GoogleAnalytics
- * @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_GoogleAnalytics
+ * @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)
*/
diff --git a/app/code/core/Mage/GoogleAnalytics/Model/Observer.php b/app/code/core/Mage/GoogleAnalytics/Model/Observer.php
index a9e5d1ebf5..65e7ffad5d 100644
--- a/app/code/core/Mage/GoogleAnalytics/Model/Observer.php
+++ b/app/code/core/Mage/GoogleAnalytics/Model/Observer.php
@@ -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_GoogleAnalytics
- * @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_GoogleAnalytics
+ * @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)
*/
diff --git a/app/code/core/Mage/GoogleAnalytics/etc/adminhtml.xml b/app/code/core/Mage/GoogleAnalytics/etc/adminhtml.xml
index cbfb8ca05c..9630768c7c 100644
--- a/app/code/core/Mage/GoogleAnalytics/etc/adminhtml.xml
+++ b/app/code/core/Mage/GoogleAnalytics/etc/adminhtml.xml
@@ -19,10 +19,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_GoogleAnalytics
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ * @category Mage
+ * @package Mage_GoogleAnalytics
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
diff --git a/app/code/core/Mage/GoogleAnalytics/etc/config.xml b/app/code/core/Mage/GoogleAnalytics/etc/config.xml
index d4472ca974..9112321580 100644
--- a/app/code/core/Mage/GoogleAnalytics/etc/config.xml
+++ b/app/code/core/Mage/GoogleAnalytics/etc/config.xml
@@ -19,10 +19,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_GoogleAnalytics
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ * @category Mage
+ * @package Mage_GoogleAnalytics
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
@@ -94,4 +94,4 @@
-
\ No newline at end of file
+
diff --git a/app/code/core/Mage/GoogleAnalytics/etc/system.xml b/app/code/core/Mage/GoogleAnalytics/etc/system.xml
index fc2c4c5e4f..7f84df0426 100644
--- a/app/code/core/Mage/GoogleAnalytics/etc/system.xml
+++ b/app/code/core/Mage/GoogleAnalytics/etc/system.xml
@@ -19,10 +19,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_GoogleAnalytics
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ * @category Mage
+ * @package Mage_GoogleAnalytics
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
@@ -66,4 +66,4 @@
-
\ No newline at end of file
+
diff --git a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Captcha.php b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Captcha.php
index c216a61de7..aecb519dcc 100644
--- a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Captcha.php
+++ b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Captcha.php
@@ -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_GoogleBase
- * @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_GoogleBase
+ * @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)
*/
@@ -54,4 +54,4 @@ public function getConfirmButtonHtml()
));
return $confirmButton->toHtml();
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Items.php b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Items.php
index 7e8866ba38..661dc2bd58 100644
--- a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Items.php
+++ b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Items.php
@@ -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_GoogleBase
- * @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_GoogleBase
+ * @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)
*/
/**
@@ -76,4 +76,4 @@ public function getStore()
{
return $this->_getData('store');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Items/Item.php b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Items/Item.php
index b1433402aa..87ac62c8d4 100644
--- a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Items/Item.php
+++ b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Items/Item.php
@@ -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_GoogleBase
- * @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_GoogleBase
+ * @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)
*/
/**
@@ -189,4 +189,4 @@ protected function _getStore()
{
return Mage::app()->getStore($this->getRequest()->getParam('store'));
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Items/Product.php b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Items/Product.php
index b781660ae1..46e86a98dc 100644
--- a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Items/Product.php
+++ b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Items/Product.php
@@ -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_GoogleBase
- * @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_GoogleBase
+ * @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)
*/
/**
@@ -155,4 +155,4 @@ protected function _getStore()
{
return Mage::app()->getStore($this->getRequest()->getParam('store'));
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Items/Renderer/Id.php b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Items/Renderer/Id.php
index 5b33cae2a9..d29e9603ac 100644
--- a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Items/Renderer/Id.php
+++ b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Items/Renderer/Id.php
@@ -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_Adminhtml
- * @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_GoogleBase
+ * @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)
*/
@@ -57,4 +57,4 @@ public function render(Varien_Object $row)
return sprintf('%s', $baseUrl . $itemId, $title, $title, $itemId);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Store/Switcher.php b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Store/Switcher.php
index 7d513f10e4..319718a40a 100644
--- a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Store/Switcher.php
+++ b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Store/Switcher.php
@@ -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_GoogleBase
- * @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_GoogleBase
+ * @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)
*/
/**
@@ -46,4 +46,4 @@ public function __construct()
parent::__construct();
$this->setUseConfirm(false)->setSwitchUrl($this->getUrl('*/*/*', array('store' => null)));
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types.php b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types.php
index 056d173909..eb54ba0f52 100644
--- a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types.php
+++ b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types.php
@@ -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_GoogleBase
- * @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_GoogleBase
+ * @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)
*/
/**
@@ -53,4 +53,4 @@ public function __construct()
// {
// return $this->getUrl('*/*/new', array('_current'=>true));
// }
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types/Edit.php b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types/Edit.php
index 80f1c1afe3..d3feb975fe 100644
--- a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types/Edit.php
+++ b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types/Edit.php
@@ -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_GoogleBase
- * @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_GoogleBase
+ * @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)
*/
/**
@@ -108,15 +108,15 @@ public function __construct()
}();
Event.observe(window, \'load\', function(){
- if ($("select_attribute_set")) {
- Event.observe($("select_attribute_set"), \'change\', itemType.updateAttributes);
- }
- if ($("select_itemtype")) {
- Event.observe($("select_itemtype"), \'change\', itemType.updateAttributes);
- }
- if ($("select_target_country")) {
- Event.observe($("select_target_country"), \'change\', itemType.reloadItemTypes);
- }
+ if ($("select_attribute_set")) {
+ Event.observe($("select_attribute_set"), \'change\', itemType.updateAttributes);
+ }
+ if ($("select_itemtype")) {
+ Event.observe($("select_itemtype"), \'change\', itemType.updateAttributes);
+ }
+ if ($("select_target_country")) {
+ Event.observe($("select_target_country"), \'change\', itemType.reloadItemTypes);
+ }
});
';
}
diff --git a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types/Edit/Attributes.php b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types/Edit/Attributes.php
index 501edcfea4..7499723495 100644
--- a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types/Edit/Attributes.php
+++ b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types/Edit/Attributes.php
@@ -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_GoogleBase
- * @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_GoogleBase
+ * @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)
*/
/**
@@ -137,4 +137,4 @@ protected function _toJson($data)
{
return Mage::helper('core')->jsonEncode($data);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types/Edit/Form.php b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types/Edit/Form.php
index 805abfef72..9fef5e6329 100644
--- a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types/Edit/Form.php
+++ b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types/Edit/Form.php
@@ -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_GoogleBase
- * @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_GoogleBase
+ * @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)
*/
/**
@@ -188,4 +188,4 @@ public function getSaveUrl()
{
return $this->getUrl('*/*/save', array('type_id' => $this->getItemType()->getId()));
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types/Grid.php b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types/Grid.php
index e8842d3c29..38ab3574f2 100644
--- a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types/Grid.php
+++ b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types/Grid.php
@@ -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_GoogleBase
- * @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_GoogleBase
+ * @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)
*/
/**
@@ -92,4 +92,4 @@ public function getGridUrl()
{
return $this->getUrl('*/*/grid', array('_current'=>true));
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types/Renderer/Country.php b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types/Renderer/Country.php
index 818101bcc1..0573e8556b 100644
--- a/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types/Renderer/Country.php
+++ b/app/code/core/Mage/GoogleBase/Block/Adminhtml/Types/Renderer/Country.php
@@ -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_Adminhtml
- * @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_GoogleBase
+ * @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)
*/
@@ -46,4 +46,4 @@ public function render(Varien_Object $row)
$iso = $row->getData($this->getColumn()->getIndex());
return Mage::getSingleton('googlebase/config')->getCountryInfo($iso, 'name');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/GoogleBase/Helper/Data.php b/app/code/core/Mage/GoogleBase/Helper/Data.php
index 449cc3364a..18373a805f 100644
--- a/app/code/core/Mage/GoogleBase/Helper/Data.php
+++ b/app/code/core/Mage/GoogleBase/Helper/Data.php
@@ -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_GoogleBase
- * @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_GoogleBase
+ * @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)
*/
/**
@@ -33,4 +33,4 @@
*/
class Mage_GoogleBase_Helper_Data extends Mage_Core_Helper_Abstract
{
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/GoogleBase/Model/Attribute.php b/app/code/core/Mage/GoogleBase/Model/Attribute.php
index 78118241e8..50af152f9a 100644
--- a/app/code/core/Mage/GoogleBase/Model/Attribute.php
+++ b/app/code/core/Mage/GoogleBase/Model/Attribute.php
@@ -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_GoogleBase
- * @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_GoogleBase
+ * @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)
*/
/**
@@ -113,4 +113,4 @@ public function getGbaseAttributeType($attribute)
return Mage_GoogleBase_Model_Service_Item::DEFAULT_ATTRIBUTE_TYPE;
}
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/GoogleBase/Model/Config.php b/app/code/core/Mage/GoogleBase/Model/Config.php
index c77ed4ccee..3157e6aed2 100644
--- a/app/code/core/Mage/GoogleBase/Model/Config.php
+++ b/app/code/core/Mage/GoogleBase/Model/Config.php
@@ -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_GoogleBase
- * @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_GoogleBase
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/GoogleBase/Model/Item.php b/app/code/core/Mage/GoogleBase/Model/Item.php
index c61aff2990..d7da07c486 100644
--- a/app/code/core/Mage/GoogleBase/Model/Item.php
+++ b/app/code/core/Mage/GoogleBase/Model/Item.php
@@ -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_GoogleBase
- * @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_GoogleBase
+ * @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)
*/
/**
@@ -357,4 +357,4 @@ protected function _getAttributesCollection()
Mage::register(self::ATTRIBUTES_REGISTRY_KEY, $registry);
return $collection;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/GoogleBase/Model/Mysql4/Attribute.php b/app/code/core/Mage/GoogleBase/Model/Mysql4/Attribute.php
index 7820765718..d06f772186 100644
--- a/app/code/core/Mage/GoogleBase/Model/Mysql4/Attribute.php
+++ b/app/code/core/Mage/GoogleBase/Model/Mysql4/Attribute.php
@@ -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_GoogleBase
- * @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_GoogleBase
+ * @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)
*/
/**
@@ -37,4 +37,4 @@ protected function _construct()
{
$this->_init('googlebase/attributes', 'id');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/GoogleBase/Model/Mysql4/Attribute/Collection.php b/app/code/core/Mage/GoogleBase/Model/Mysql4/Attribute/Collection.php
index 5bd5e5245e..f7ba575ef3 100644
--- a/app/code/core/Mage/GoogleBase/Model/Mysql4/Attribute/Collection.php
+++ b/app/code/core/Mage/GoogleBase/Model/Mysql4/Attribute/Collection.php
@@ -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_GoogleBase
- * @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_GoogleBase
+ * @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)
*/
/**
@@ -33,34 +33,34 @@
*/
class Mage_GoogleBase_Model_Mysql4_Attribute_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract
{
- /**
- * Whether to join attribute_set_id to attributes or not
- */
+ /**
+ * Whether to join attribute_set_id to attributes or not
+ */
protected $_joinAttributeSetFlag = true;
- protected function _construct()
- {
- $this->_init('googlebase/attribute');
- }
+ protected function _construct()
+ {
+ $this->_init('googlebase/attribute');
+ }
- public function addAttributeSetFilter($attributeSetId, $targetCountry)
- {
- if (!$this->getJoinAttributeSetFlag()) {
- return $this;
- }
- $this->getSelect()->where('attribute_set_id = ?', $attributeSetId);
- $this->getSelect()->where('target_country = ?', $targetCountry);
- return $this;
- }
+ public function addAttributeSetFilter($attributeSetId, $targetCountry)
+ {
+ if (!$this->getJoinAttributeSetFlag()) {
+ return $this;
+ }
+ $this->getSelect()->where('attribute_set_id = ?', $attributeSetId);
+ $this->getSelect()->where('target_country = ?', $targetCountry);
+ return $this;
+ }
- public function addTypeFilter($type_id)
- {
- $this->getSelect()->where('main_table.type_id = ?', $type_id);
- return $this;
- }
+ public function addTypeFilter($type_id)
+ {
+ $this->getSelect()->where('main_table.type_id = ?', $type_id);
+ return $this;
+ }
- public function load($printQuery = false, $logQuery = false)
+ public function load($printQuery = false, $logQuery = false)
{
if ($this->isLoaded()) {
return $this;
@@ -73,22 +73,22 @@ public function load($printQuery = false, $logQuery = false)
}
protected function _joinAttributeSet()
- {
+ {
$this->getSelect()
->joinInner(
array('types'=>$this->getTable('googlebase/types')),
'main_table.type_id=types.type_id',
array('attribute_set_id' => 'types.attribute_set_id', 'target_country' => 'types.target_country'));
return $this;
- }
+ }
- public function getJoinAttributeSetFlag()
- {
- return $this->_joinAttributeSetFlag;
- }
+ public function getJoinAttributeSetFlag()
+ {
+ return $this->_joinAttributeSetFlag;
+ }
- public function setJoinAttributeSetFlag($flag)
- {
- return $this->_joinAttributeSetFlag = (bool)$flag;
- }
-}
\ No newline at end of file
+ public function setJoinAttributeSetFlag($flag)
+ {
+ return $this->_joinAttributeSetFlag = (bool)$flag;
+ }
+}
diff --git a/app/code/core/Mage/GoogleBase/Model/Mysql4/Item.php b/app/code/core/Mage/GoogleBase/Model/Mysql4/Item.php
index ffd67c1324..22b2d23c59 100644
--- a/app/code/core/Mage/GoogleBase/Model/Mysql4/Item.php
+++ b/app/code/core/Mage/GoogleBase/Model/Mysql4/Item.php
@@ -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_GoogleBase
- * @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_GoogleBase
+ * @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)
*/
/**
@@ -68,4 +68,4 @@ public function loadByProduct($model)
}
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/GoogleBase/Model/Mysql4/Item/Collection.php b/app/code/core/Mage/GoogleBase/Model/Mysql4/Item/Collection.php
index 5cb75e8d91..27803d9906 100644
--- a/app/code/core/Mage/GoogleBase/Model/Mysql4/Item/Collection.php
+++ b/app/code/core/Mage/GoogleBase/Model/Mysql4/Item/Collection.php
@@ -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_GoogleBase
- * @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_GoogleBase
+ * @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)
*/
/**
@@ -33,10 +33,10 @@
*/
class Mage_GoogleBase_Model_Mysql4_Item_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract
{
- protected function _construct()
- {
- $this->_init('googlebase/item');
- }
+ protected function _construct()
+ {
+ $this->_init('googlebase/item');
+ }
protected function _initSelect()
{
@@ -77,7 +77,7 @@ public function addProductFilterId($productId)
public function addFieldToFilter($field, $condition=null)
{
if ($field == 'name') {
- $conditionSql = $this->_getConditionSql('p.value', $condition);
+ $conditionSql = $this->_getConditionSql('IFNULL(p.value, p_d.value)', $condition);
$this->getSelect()->where($conditionSql);
} else {
parent::addFieldToFilter($field, $condition);
@@ -121,4 +121,4 @@ protected function _joinTables()
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/GoogleBase/Model/Mysql4/Type.php b/app/code/core/Mage/GoogleBase/Model/Mysql4/Type.php
index 2a84c7ef7d..5644ce3ae5 100644
--- a/app/code/core/Mage/GoogleBase/Model/Mysql4/Type.php
+++ b/app/code/core/Mage/GoogleBase/Model/Mysql4/Type.php
@@ -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_GoogleBase
- * @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_GoogleBase
+ * @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)
*/
/**
@@ -54,4 +54,4 @@ public function getTypeIdByAttributeSetId($attributeSetId, $targetCountry)
return $this->_getReadAdapter()->fetchOne($select);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/GoogleBase/Model/Mysql4/Type/Collection.php b/app/code/core/Mage/GoogleBase/Model/Mysql4/Type/Collection.php
index 0c7898448b..786e5fad0a 100644
--- a/app/code/core/Mage/GoogleBase/Model/Mysql4/Type/Collection.php
+++ b/app/code/core/Mage/GoogleBase/Model/Mysql4/Type/Collection.php
@@ -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_GoogleBase
- * @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_GoogleBase
+ * @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)
*/
/**
@@ -34,25 +34,25 @@
class Mage_GoogleBase_Model_Mysql4_Type_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract
{
- protected function _construct()
- {
- $this->_init('googlebase/type');
- }
+ protected function _construct()
+ {
+ $this->_init('googlebase/type');
+ }
- protected function _initSelect()
- {
- parent::_initSelect();
- $this->_joinAttributeSet();
- return $this;
- }
+ protected function _initSelect()
+ {
+ parent::_initSelect();
+ $this->_joinAttributeSet();
+ return $this;
+ }
- /**
- * Add total count of Items for each type
- *
- * @return Mage_GoogleBase_Model_Mysql4_Type_Collection
- */
- public function addItemsCount()
- {
+ /**
+ * Add total count of Items for each type
+ *
+ * @return Mage_GoogleBase_Model_Mysql4_Type_Collection
+ */
+ public function addItemsCount()
+ {
$this->getSelect()
->joinLeft(
array('items'=>$this->getTable('googlebase/items')),
@@ -60,32 +60,32 @@ public function addItemsCount()
array('items_total' => 'COUNT(items.item_id)'))
->group('main_table.type_id');
return $this;
- }
+ }
- /**
- * Add country ISO filter to collection
- *
- * @param string $iso Two-letter country ISO code
- * @return Mage_GoogleBase_Model_Mysql4_Type_Collection
- */
- public function addCountryFilter($iso)
- {
+ /**
+ * Add country ISO filter to collection
+ *
+ * @param string $iso Two-letter country ISO code
+ * @return Mage_GoogleBase_Model_Mysql4_Type_Collection
+ */
+ public function addCountryFilter($iso)
+ {
$this->getSelect()->where('target_country=?', $iso);
return $this;
- }
+ }
- /**
- * Join Attribute Set data
- *
- * @return Mage_GoogleBase_Model_Mysql4_Type_Collection
- */
- protected function _joinAttributeSet()
- {
+ /**
+ * Join Attribute Set data
+ *
+ * @return Mage_GoogleBase_Model_Mysql4_Type_Collection
+ */
+ protected function _joinAttributeSet()
+ {
$this->getSelect()
->join(
array('set'=>$this->getTable('eav/attribute_set')),
'main_table.attribute_set_id=set.attribute_set_id',
array('attribute_set_name' => 'set.attribute_set_name'));
return $this;
- }
-}
\ No newline at end of file
+ }
+}
diff --git a/app/code/core/Mage/GoogleBase/Model/Observer.php b/app/code/core/Mage/GoogleBase/Model/Observer.php
index 056c6a5a5c..dd59fd1674 100644
--- a/app/code/core/Mage/GoogleBase/Model/Observer.php
+++ b/app/code/core/Mage/GoogleBase/Model/Observer.php
@@ -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_GoogleBase
- * @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_GoogleBase
+ * @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)
*/
/**
@@ -95,4 +95,4 @@ public function deleteProductItem($observer)
}
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/GoogleBase/Model/Service.php b/app/code/core/Mage/GoogleBase/Model/Service.php
index 0200b8f655..522d84fda9 100644
--- a/app/code/core/Mage/GoogleBase/Model/Service.php
+++ b/app/code/core/Mage/GoogleBase/Model/Service.php
@@ -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_GoogleBase
- * @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_GoogleBase
+ * @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)
*/
/**
@@ -118,4 +118,4 @@ public function getDryRun()
{
return $this->getDataSetDefault('dry_run', false);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/GoogleBase/Model/Service/Feed.php b/app/code/core/Mage/GoogleBase/Model/Service/Feed.php
index 54cc6baeb4..735eba7989 100644
--- a/app/code/core/Mage/GoogleBase/Model/Service/Feed.php
+++ b/app/code/core/Mage/GoogleBase/Model/Service/Feed.php
@@ -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_GoogleBase
- * @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_GoogleBase
+ * @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)
*/
/**
@@ -153,4 +153,4 @@ public function getAttributes($type, $targetCountry)
}
return array();
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/GoogleBase/Model/Service/Item.php b/app/code/core/Mage/GoogleBase/Model/Service/Item.php
index 3079398f73..7e1917f3a9 100644
--- a/app/code/core/Mage/GoogleBase/Model/Service/Item.php
+++ b/app/code/core/Mage/GoogleBase/Model/Service/Item.php
@@ -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_GoogleBase
- * @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_GoogleBase
+ * @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)
*/
/**
@@ -129,8 +129,8 @@ public function insert()
->setPublished($published);
if ($expires = $this->_getAttributeValue('expiration_date')) {
- $expires = $this->gBaseDate2DateTime($expires);
- $this->getItem()->setExpires($expires);
+ $expires = $this->gBaseDate2DateTime($expires);
+ $this->getItem()->setExpires($expires);
}
}
@@ -407,4 +407,4 @@ public function gBaseDate2DateTime($gBaseDate)
{
return Mage::getSingleton('core/date')->date(null, $gBaseDate);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/GoogleBase/Model/Source/Accounttype.php b/app/code/core/Mage/GoogleBase/Model/Source/Accounttype.php
index 387eddf14b..8f5acc2e2c 100644
--- a/app/code/core/Mage/GoogleBase/Model/Source/Accounttype.php
+++ b/app/code/core/Mage/GoogleBase/Model/Source/Accounttype.php
@@ -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_GoogleBase
- * @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_GoogleBase
+ * @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)
*/
/**
@@ -41,4 +41,4 @@ public function toOptionArray()
array('value' => 'HOSTED', 'label' => Mage::helper('googlebase')->__('Hosted'))
);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/GoogleBase/Model/Source/Authtype.php b/app/code/core/Mage/GoogleBase/Model/Source/Authtype.php
index 35af7621f7..5be114e735 100644
--- a/app/code/core/Mage/GoogleBase/Model/Source/Authtype.php
+++ b/app/code/core/Mage/GoogleBase/Model/Source/Authtype.php
@@ -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_GoogleBase
- * @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_GoogleBase
+ * @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)
*/
/**
@@ -40,4 +40,4 @@ public function toOptionArray()
array('value' => 'clientlogin', 'label' => Mage::helper('googlebase')->__('ClientLogin'))
);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/GoogleBase/Model/Source/Country.php b/app/code/core/Mage/GoogleBase/Model/Source/Country.php
index c999218b13..2156d636dc 100644
--- a/app/code/core/Mage/GoogleBase/Model/Source/Country.php
+++ b/app/code/core/Mage/GoogleBase/Model/Source/Country.php
@@ -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_GoogleBase
- * @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_GoogleBase
+ * @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)
*/
/**
@@ -42,4 +42,4 @@ public function toOptionArray()
}
return $result;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/GoogleBase/Model/Source/Statuses.php b/app/code/core/Mage/GoogleBase/Model/Source/Statuses.php
index b9b5421480..de53290d31 100644
--- a/app/code/core/Mage/GoogleBase/Model/Source/Statuses.php
+++ b/app/code/core/Mage/GoogleBase/Model/Source/Statuses.php
@@ -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_GoogleBase
- * @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_GoogleBase
+ * @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)
*/
/**
@@ -40,4 +40,4 @@ public function getStatuses()
'1' => Mage::helper('googlebase')->__('No')
);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/GoogleBase/Model/Type.php b/app/code/core/Mage/GoogleBase/Model/Type.php
index f44a7118ac..b728d87658 100644
--- a/app/code/core/Mage/GoogleBase/Model/Type.php
+++ b/app/code/core/Mage/GoogleBase/Model/Type.php
@@ -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_GoogleBase
- * @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_GoogleBase
+ * @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)
*/
/**
@@ -50,4 +50,4 @@ public function loadByAttributeSetId($attributeSetId, $targetCountry)
$typeId = $this->getResource()->getTypeIdByAttributeSetId($attributeSetId, $targetCountry);
return $this->load($typeId);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/GoogleBase/controllers/ItemsController.php b/app/code/core/Mage/GoogleBase/controllers/ItemsController.php
index 16041bd010..ab4e55a543 100644
--- a/app/code/core/Mage/GoogleBase/controllers/ItemsController.php
+++ b/app/code/core/Mage/GoogleBase/controllers/ItemsController.php
@@ -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_GoogleBase
- * @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_GoogleBase
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/GoogleBase/controllers/SelectionController.php b/app/code/core/Mage/GoogleBase/controllers/SelectionController.php
index 9b39361194..08991a8528 100644
--- a/app/code/core/Mage/GoogleBase/controllers/SelectionController.php
+++ b/app/code/core/Mage/GoogleBase/controllers/SelectionController.php
@@ -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_GoogleBase
- * @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_GoogleBase
+ * @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)
*/
/**
@@ -54,4 +54,4 @@ public function gridAction()
->toHtml()
);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/GoogleBase/controllers/TypesController.php b/app/code/core/Mage/GoogleBase/controllers/TypesController.php
index 71a7d8bf0a..d7712b7332 100644
--- a/app/code/core/Mage/GoogleBase/controllers/TypesController.php
+++ b/app/code/core/Mage/GoogleBase/controllers/TypesController.php
@@ -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_GoogleBase
- * @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_GoogleBase
+ * @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)
*/
/**
@@ -233,4 +233,4 @@ protected function _isAllowed()
{
return Mage::getSingleton('admin/session')->isAllowed('catalog/googlebase/types');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/GoogleBase/etc/adminhtml.xml b/app/code/core/Mage/GoogleBase/etc/adminhtml.xml
index 106f93d669..bd9066f18a 100644
--- a/app/code/core/Mage/GoogleBase/etc/adminhtml.xml
+++ b/app/code/core/Mage/GoogleBase/etc/adminhtml.xml
@@ -19,10 +19,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_GoogleBase
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ * @category Mage
+ * @package Mage_GoogleBase
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
@@ -41,6 +41,7 @@
googlebase/items
+ 70
diff --git a/app/code/core/Mage/GoogleBase/etc/config.xml b/app/code/core/Mage/GoogleBase/etc/config.xml
index 3f92f83588..05af802eae 100644
--- a/app/code/core/Mage/GoogleBase/etc/config.xml
+++ b/app/code/core/Mage/GoogleBase/etc/config.xml
@@ -19,10 +19,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_GoogleBase
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ * @category Mage
+ * @package Mage_GoogleBase
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
diff --git a/app/code/core/Mage/GoogleBase/etc/system.xml b/app/code/core/Mage/GoogleBase/etc/system.xml
index 01a49fbe3a..7ac81405fc 100644
--- a/app/code/core/Mage/GoogleBase/etc/system.xml
+++ b/app/code/core/Mage/GoogleBase/etc/system.xml
@@ -19,10 +19,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_GoogleBase
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ * @category Mage
+ * @package Mage_GoogleBase
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
@@ -85,4 +85,4 @@
-
\ No newline at end of file
+
diff --git a/app/code/core/Mage/GoogleBase/sql/googlebase_setup/mysql4-install-0.1.0.php b/app/code/core/Mage/GoogleBase/sql/googlebase_setup/mysql4-install-0.1.0.php
index c3e0b0e412..40bf3555ce 100644
--- a/app/code/core/Mage/GoogleBase/sql/googlebase_setup/mysql4-install-0.1.0.php
+++ b/app/code/core/Mage/GoogleBase/sql/googlebase_setup/mysql4-install-0.1.0.php
@@ -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_GoogleBase
- * @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_GoogleBase
+ * @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)
*/
$installer = $this;
@@ -71,4 +71,4 @@
");
-$installer->endSetup();
\ No newline at end of file
+$installer->endSetup();
diff --git a/app/code/core/Mage/GoogleBase/sql/googlebase_setup/mysql4-upgrade-0.1.0-0.1.1.php b/app/code/core/Mage/GoogleBase/sql/googlebase_setup/mysql4-upgrade-0.1.0-0.1.1.php
index 0f2992f9af..eca999f156 100644
--- a/app/code/core/Mage/GoogleBase/sql/googlebase_setup/mysql4-upgrade-0.1.0-0.1.1.php
+++ b/app/code/core/Mage/GoogleBase/sql/googlebase_setup/mysql4-upgrade-0.1.0-0.1.1.php
@@ -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_GoogleBase
- * @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_GoogleBase
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/GoogleCheckout/Block/Adminhtml/Shipping/Applicable/Countries.php b/app/code/core/Mage/GoogleCheckout/Block/Adminhtml/Shipping/Applicable/Countries.php
index a1a65d6e7e..fd2900f5c8 100644
--- a/app/code/core/Mage/GoogleCheckout/Block/Adminhtml/Shipping/Applicable/Countries.php
+++ b/app/code/core/Mage/GoogleCheckout/Block/Adminhtml/Shipping/Applicable/Countries.php
@@ -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 design_default
- * @package Mage
- * @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_GoogleCheckout
+ * @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_GoogleCheckout_Block_Adminhtml_Shipping_Applicable_Countries
@@ -32,8 +32,8 @@ class Mage_GoogleCheckout_Block_Adminhtml_Shipping_Applicable_Countries
protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element)
{
- $html = parent::_getElementHtml($element);
- $html .= $this->_appendJs($element);
+ $html = parent::_getElementHtml($element);
+ $html .= $this->_appendJs($element);
return $html;
}
diff --git a/app/code/core/Mage/GoogleCheckout/Block/Adminhtml/Shipping/Merchant.php b/app/code/core/Mage/GoogleCheckout/Block/Adminhtml/Shipping/Merchant.php
index acb6b694e2..fb7ab77aec 100644
--- a/app/code/core/Mage/GoogleCheckout/Block/Adminhtml/Shipping/Merchant.php
+++ b/app/code/core/Mage/GoogleCheckout/Block/Adminhtml/Shipping/Merchant.php
@@ -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 design_default
- * @package Mage
- * @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_GoogleCheckout
+ * @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_GoogleCheckout_Block_Adminhtml_Shipping_Merchant
@@ -69,12 +69,12 @@ protected function _getRowTemplateHtml($i=0)
$html .= '';
$html .= '';
- $html .= ' ';
+ $html .= ' ';
$html .= '_getDisabled().'/> ';
$html .= $this->_getRemoveRowButtonHtml();
$html .= '
';
- $html .= '';
+ $html .= '';
return $html;
}
@@ -162,4 +162,4 @@ protected function _getRemoveRowButtonHtml($selector='li', $title='Remove')
}
return $this->_removeRowButtonHtml;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/GoogleCheckout/Block/Form.php b/app/code/core/Mage/GoogleCheckout/Block/Form.php
index d6f6d33e9a..5552271b2b 100644
--- a/app/code/core/Mage/GoogleCheckout/Block/Form.php
+++ b/app/code/core/Mage/GoogleCheckout/Block/Form.php
@@ -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_GoogleCheckout
- * @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_GoogleCheckout
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/GoogleCheckout/Block/Link.php b/app/code/core/Mage/GoogleCheckout/Block/Link.php
index 161bcb4afb..44ff7beaff 100644
--- a/app/code/core/Mage/GoogleCheckout/Block/Link.php
+++ b/app/code/core/Mage/GoogleCheckout/Block/Link.php
@@ -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_GoogleCheckout
- * @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_GoogleCheckout
+ * @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)
*/
/**
@@ -99,4 +99,4 @@ public function getIsDisabled()
}
return false;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/GoogleCheckout/Block/Redirect.php b/app/code/core/Mage/GoogleCheckout/Block/Redirect.php
index fa1ab30aa5..6d75291e7f 100644
--- a/app/code/core/Mage/GoogleCheckout/Block/Redirect.php
+++ b/app/code/core/Mage/GoogleCheckout/Block/Redirect.php
@@ -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_GoogleCheckout
- * @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_GoogleCheckout
+ * @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)
*/
/**
@@ -53,4 +53,4 @@ public function getMessage ()
{
return $this->__('You will be redirected to GoogleCheckout in a few seconds.');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/GoogleCheckout/Exception.php b/app/code/core/Mage/GoogleCheckout/Exception.php
index c8d9194dc2..45bcae3d1f 100644
--- a/app/code/core/Mage/GoogleCheckout/Exception.php
+++ b/app/code/core/Mage/GoogleCheckout/Exception.php
@@ -18,13 +18,13 @@
* 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_GoogleCheckout
- * @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_GoogleCheckout
+ * @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_GoogleCheckout_Exception extends Mage_Core_Exception
{
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/GoogleCheckout/Helper/Data.php b/app/code/core/Mage/GoogleCheckout/Helper/Data.php
index d06fb5e4f6..e46232ac2a 100644
--- a/app/code/core/Mage/GoogleCheckout/Helper/Data.php
+++ b/app/code/core/Mage/GoogleCheckout/Helper/Data.php
@@ -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_GoogleCheckout
- * @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_GoogleCheckout
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/GoogleCheckout/Model/Api.php b/app/code/core/Mage/GoogleCheckout/Model/Api.php
index b7b55adc24..9d3e7d222d 100644
--- a/app/code/core/Mage/GoogleCheckout/Model/Api.php
+++ b/app/code/core/Mage/GoogleCheckout/Model/Api.php
@@ -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_GoogleCheckout
- * @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_GoogleCheckout
+ * @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_GoogleCheckout_Model_Api extends Varien_Object
@@ -196,4 +196,4 @@ public function processBeacon()
->setRequestBody($_SERVER['QUERY_STRING'])
->save();
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/GoogleCheckout/Model/Api/Debug.php b/app/code/core/Mage/GoogleCheckout/Model/Api/Debug.php
index 007cb2d9cb..917a637a7a 100644
--- a/app/code/core/Mage/GoogleCheckout/Model/Api/Debug.php
+++ b/app/code/core/Mage/GoogleCheckout/Model/Api/Debug.php
@@ -18,17 +18,17 @@
* 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_GoogleCheckout
- * @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_GoogleCheckout
+ * @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_GoogleCheckout_Model_Api_Debug extends Mage_Core_Model_Abstract
{
- protected function _construct()
- {
- $this->_init('googlecheckout/api_debug');
- }
-}
\ No newline at end of file
+ protected function _construct()
+ {
+ $this->_init('googlecheckout/api_debug');
+ }
+}
diff --git a/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Abstract.php b/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Abstract.php
index f48e322303..4dfec60a43 100644
--- a/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Abstract.php
+++ b/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Abstract.php
@@ -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_GoogleCheckout
- * @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_GoogleCheckout
+ * @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)
*/
set_include_path(get_include_path().PS.Mage::getBaseDir('lib').DS.'googlecheckout');
diff --git a/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Calculate.php b/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Calculate.php
index 414094abcc..f3ea099380 100644
--- a/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Calculate.php
+++ b/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Calculate.php
@@ -18,13 +18,13 @@
* 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_GoogleCheckout
- * @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_GoogleCheckout
+ * @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_GoogleCheckout_Model_Api_Xml_Calculate extends Mage_GoogleCheckout_Model_Api_Xml_Abstract
{
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Callback.php b/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Callback.php
index 042f85d94b..44d78bff20 100644
--- a/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Callback.php
+++ b/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Callback.php
@@ -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_GoogleCheckout
- * @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_GoogleCheckout
+ * @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_GoogleCheckout_Model_Api_Xml_Callback extends Mage_GoogleCheckout_Model_Api_Xml_Abstract
@@ -763,4 +763,4 @@ protected function _formatAmount($amount)
return Mage::helper('core')->currency($amount, true, false);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Checkout.php b/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Checkout.php
index f8431f6105..366174491a 100644
--- a/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Checkout.php
+++ b/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Checkout.php
@@ -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_GoogleCheckout
- * @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_GoogleCheckout
+ * @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_GoogleCheckout_Model_Api_Xml_Checkout extends Mage_GoogleCheckout_Model_Api_Xml_Abstract
diff --git a/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Order.php b/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Order.php
index eab62f67dc..ce26fea463 100644
--- a/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Order.php
+++ b/app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Order.php
@@ -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_GoogleCheckout
- * @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_GoogleCheckout
+ * @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_GoogleCheckout_Model_Api_Xml_Order extends Mage_GoogleCheckout_Model_Api_Xml_Abstract
@@ -175,4 +175,4 @@ public function addBuyerMessage($message, $sendMail=true)
->SendBuyerMessage($this->getGoogleOrderNumber(), $message, $sendMail?'true':'false');
return $this->_processGResponse($response);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/GoogleCheckout/Model/Mysql4/Api/Debug.php b/app/code/core/Mage/GoogleCheckout/Model/Mysql4/Api/Debug.php
index fa69b2f244..b873f125f2 100644
--- a/app/code/core/Mage/GoogleCheckout/Model/Mysql4/Api/Debug.php
+++ b/app/code/core/Mage/GoogleCheckout/Model/Mysql4/Api/Debug.php
@@ -18,17 +18,17 @@
* 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_Paygate
- * @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_GoogleCheckout
+ * @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_GoogleCheckout_Model_Mysql4_Api_Debug extends Mage_Core_Model_Mysql4_Abstract
{
- protected function _construct()
- {
- $this->_init('googlecheckout/api_debug', 'debug_id');
- }
-}
\ No newline at end of file
+ protected function _construct()
+ {
+ $this->_init('googlecheckout/api_debug', 'debug_id');
+ }
+}
diff --git a/app/code/core/Mage/GoogleCheckout/Model/Mysql4/Api/Debug/Collection.php b/app/code/core/Mage/GoogleCheckout/Model/Mysql4/Api/Debug/Collection.php
index a902831317..8aafaeb984 100644
--- a/app/code/core/Mage/GoogleCheckout/Model/Mysql4/Api/Debug/Collection.php
+++ b/app/code/core/Mage/GoogleCheckout/Model/Mysql4/Api/Debug/Collection.php
@@ -18,17 +18,17 @@
* 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_GoogleCheckout
- * @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_GoogleCheckout
+ * @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_GoogleCheckout_Model_Mysql4_Api_Debug_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract
{
- protected function _construct()
- {
- $this->_init('googlecheckout/api_debug');
- }
-}
\ No newline at end of file
+ protected function _construct()
+ {
+ $this->_init('googlecheckout/api_debug');
+ }
+}
diff --git a/app/code/core/Mage/GoogleCheckout/Model/Mysql4/Setup.php b/app/code/core/Mage/GoogleCheckout/Model/Mysql4/Setup.php
index 6e856b2ee3..b4a98e8ced 100644
--- a/app/code/core/Mage/GoogleCheckout/Model/Mysql4/Setup.php
+++ b/app/code/core/Mage/GoogleCheckout/Model/Mysql4/Setup.php
@@ -18,14 +18,14 @@
* 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_GoogleCheckout
- * @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_GoogleCheckout
+ * @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_GoogleCheckout_Model_Mysql4_Setup extends Mage_Catalog_Model_Resource_Eav_Mysql4_Setup
{
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/GoogleCheckout/Model/Mysql4/Tax.php b/app/code/core/Mage/GoogleCheckout/Model/Mysql4/Tax.php
index dcd0454b21..b504547bb6 100644
--- a/app/code/core/Mage/GoogleCheckout/Model/Mysql4/Tax.php
+++ b/app/code/core/Mage/GoogleCheckout/Model/Mysql4/Tax.php
@@ -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_GoogleCheckout
- * @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_GoogleCheckout
+ * @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_GoogleCheckout_Model_Mysql4_Tax extends Mage_Core_Model_Mysql4_Abstract
@@ -44,4 +44,4 @@ public function fetchRuleRatesForCustomerTaxClass($customerTaxClass)
return $rows;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/GoogleCheckout/Model/Observer.php b/app/code/core/Mage/GoogleCheckout/Model/Observer.php
index a63b3506e8..1ac987221d 100644
--- a/app/code/core/Mage/GoogleCheckout/Model/Observer.php
+++ b/app/code/core/Mage/GoogleCheckout/Model/Observer.php
@@ -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_GoogleCheckout
- * @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_GoogleCheckout
+ * @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)
*/
diff --git a/app/code/core/Mage/GoogleCheckout/Model/Payment.php b/app/code/core/Mage/GoogleCheckout/Model/Payment.php
index 7f2946b2c5..fd4d81e4e7 100644
--- a/app/code/core/Mage/GoogleCheckout/Model/Payment.php
+++ b/app/code/core/Mage/GoogleCheckout/Model/Payment.php
@@ -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_GoogleCheckout
- * @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_GoogleCheckout
+ * @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_GoogleCheckout_Model_Payment extends Mage_Payment_Model_Method_Abstract
@@ -162,4 +162,4 @@ public function cancel(Varien_Object $payment)
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/GoogleCheckout/Model/Shipping.php b/app/code/core/Mage/GoogleCheckout/Model/Shipping.php
index b6780c2986..6b705d16dd 100644
--- a/app/code/core/Mage/GoogleCheckout/Model/Shipping.php
+++ b/app/code/core/Mage/GoogleCheckout/Model/Shipping.php
@@ -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_GoogleCheckout
- * @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_GoogleCheckout
+ * @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)
*/
@@ -35,13 +35,13 @@ class Mage_GoogleCheckout_Model_Shipping extends Mage_Shipping_Model_Carrier_Abs
{
protected $_code = 'googlecheckout';
- /**
- * Enter description here...
- *
- * @param Mage_Shipping_Model_Rate_Request $data
- * @return Mage_Shipping_Model_Rate_Result
- */
- public function collectRates(Mage_Shipping_Model_Rate_Request $request)
+ /**
+ * Enter description here...
+ *
+ * @param Mage_Shipping_Model_Rate_Request $data
+ * @return Mage_Shipping_Model_Rate_Result
+ */
+ public function collectRates(Mage_Shipping_Model_Rate_Request $request)
{
// dummy placeholder
return $this;
diff --git a/app/code/core/Mage/GoogleCheckout/Model/Source/Checkout/Image.php b/app/code/core/Mage/GoogleCheckout/Model/Source/Checkout/Image.php
index 0fc094da5c..9e5de6f5a8 100644
--- a/app/code/core/Mage/GoogleCheckout/Model/Source/Checkout/Image.php
+++ b/app/code/core/Mage/GoogleCheckout/Model/Source/Checkout/Image.php
@@ -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_Adminhtml
- * @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_GoogleCheckout
+ * @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)
*/
@@ -52,4 +52,4 @@ public function toOptionArray()
return $options;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/GoogleCheckout/Model/Source/Locale.php b/app/code/core/Mage/GoogleCheckout/Model/Source/Locale.php
index cf2774a991..22bb4d30f4 100644
--- a/app/code/core/Mage/GoogleCheckout/Model/Source/Locale.php
+++ b/app/code/core/Mage/GoogleCheckout/Model/Source/Locale.php
@@ -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_Adminhtml
- * @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_GoogleCheckout
+ * @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)
*/
@@ -34,4 +34,4 @@ public function toOptionArray()
array('value'=>'en_GB', 'label'=>Mage::helper('googlecheckout')->__('United Kingdom')),
);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/GoogleCheckout/Model/Source/Shipping/Carrier.php b/app/code/core/Mage/GoogleCheckout/Model/Source/Shipping/Carrier.php
index 3c2bc123c0..b320cfc975 100644
--- a/app/code/core/Mage/GoogleCheckout/Model/Source/Shipping/Carrier.php
+++ b/app/code/core/Mage/GoogleCheckout/Model/Source/Shipping/Carrier.php
@@ -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_Adminhtml
- * @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_GoogleCheckout
+ * @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)
*/
@@ -57,4 +57,4 @@ public function toOptionArray()
)),
);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/GoogleCheckout/Model/Source/Shipping/Category.php b/app/code/core/Mage/GoogleCheckout/Model/Source/Shipping/Category.php
index e4a33d114f..7039dccc3f 100644
--- a/app/code/core/Mage/GoogleCheckout/Model/Source/Shipping/Category.php
+++ b/app/code/core/Mage/GoogleCheckout/Model/Source/Shipping/Category.php
@@ -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_Adminhtml
- * @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_GoogleCheckout
+ * @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)
*/
@@ -35,4 +35,4 @@ public function toOptionArray()
array('value'=>'RESIDENTIAL', 'label'=>$hlp->__('Residential')),
);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/GoogleCheckout/Model/Source/Shipping/Units.php b/app/code/core/Mage/GoogleCheckout/Model/Source/Shipping/Units.php
index b76ccce983..a0247b80e3 100644
--- a/app/code/core/Mage/GoogleCheckout/Model/Source/Shipping/Units.php
+++ b/app/code/core/Mage/GoogleCheckout/Model/Source/Shipping/Units.php
@@ -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_Adminhtml
- * @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_GoogleCheckout
+ * @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)
*/
@@ -34,4 +34,4 @@ public function toOptionArray()
array('value'=>'IN', 'label'=>$hlp->__('Inches')),
);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/GoogleCheckout/Model/Source/Shipping/Virtual/Method.php b/app/code/core/Mage/GoogleCheckout/Model/Source/Shipping/Virtual/Method.php
index 0f581e3f6b..9021bdc18b 100644
--- a/app/code/core/Mage/GoogleCheckout/Model/Source/Shipping/Virtual/Method.php
+++ b/app/code/core/Mage/GoogleCheckout/Model/Source/Shipping/Virtual/Method.php
@@ -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_Adminhtml
- * @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_GoogleCheckout
+ * @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)
*/
@@ -36,4 +36,4 @@ public function toOptionArray()
// array('value'=>'description_based', 'label'=>$hlp->__('Description-based delivery')),
);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/GoogleCheckout/Model/Source/Shipping/Virtual/Schedule.php b/app/code/core/Mage/GoogleCheckout/Model/Source/Shipping/Virtual/Schedule.php
index fde3fceae0..d67204cd9b 100644
--- a/app/code/core/Mage/GoogleCheckout/Model/Source/Shipping/Virtual/Schedule.php
+++ b/app/code/core/Mage/GoogleCheckout/Model/Source/Shipping/Virtual/Schedule.php
@@ -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_Adminhtml
- * @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_GoogleCheckout
+ * @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)
*/
@@ -35,4 +35,4 @@ public function toOptionArray()
array('value'=>'PESSIMISTIC', 'label'=>$hlp->__('Pessimistic')),
);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/GoogleCheckout/controllers/ApiController.php b/app/code/core/Mage/GoogleCheckout/controllers/ApiController.php
index bf0856b39a..a37d87e01b 100644
--- a/app/code/core/Mage/GoogleCheckout/controllers/ApiController.php
+++ b/app/code/core/Mage/GoogleCheckout/controllers/ApiController.php
@@ -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_GoogleCheckout
- * @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_GoogleCheckout
+ * @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_GoogleCheckout_ApiController extends Mage_Core_Controller_Front_Action
@@ -41,4 +41,4 @@ public function beaconAction()
{
Mage::getModel('googlecheckout/api')->processBeacon();
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/GoogleCheckout/controllers/RedirectController.php b/app/code/core/Mage/GoogleCheckout/controllers/RedirectController.php
index 8c38ef5a6d..58ef7c8a98 100644
--- a/app/code/core/Mage/GoogleCheckout/controllers/RedirectController.php
+++ b/app/code/core/Mage/GoogleCheckout/controllers/RedirectController.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_GoogleCheckout
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
diff --git a/app/code/core/Mage/GoogleCheckout/etc/adminhtml.xml b/app/code/core/Mage/GoogleCheckout/etc/adminhtml.xml
index c8ffa3e2f4..09fac3a8ea 100644
--- a/app/code/core/Mage/GoogleCheckout/etc/adminhtml.xml
+++ b/app/code/core/Mage/GoogleCheckout/etc/adminhtml.xml
@@ -20,9 +20,9 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Mage
- * @package Mage_GoogleCheckout
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ * @package Mage_GoogleCheckout
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
diff --git a/app/code/core/Mage/GoogleCheckout/etc/config.xml b/app/code/core/Mage/GoogleCheckout/etc/config.xml
index 2aeb2c5f9b..f088330a75 100644
--- a/app/code/core/Mage/GoogleCheckout/etc/config.xml
+++ b/app/code/core/Mage/GoogleCheckout/etc/config.xml
@@ -20,9 +20,9 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Mage
- * @package Mage_GoogleCheckout
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ * @package Mage_GoogleCheckout
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
@@ -165,6 +165,7 @@ Something like this is to be added to resolve bug #4890
0
0
+ 1
COMMERCIAL
diff --git a/app/code/core/Mage/GoogleCheckout/etc/system.xml b/app/code/core/Mage/GoogleCheckout/etc/system.xml
index 9c10af8677..9d95a4e23b 100644
--- a/app/code/core/Mage/GoogleCheckout/etc/system.xml
+++ b/app/code/core/Mage/GoogleCheckout/etc/system.xml
@@ -19,10 +19,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_GoogleAnalytics
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ * @category Mage
+ * @package Mage_GoogleCheckout
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
@@ -136,7 +136,7 @@
0
-
+
If enabled, cart contents will be hidden after clicking on the Google Checkout button in the shopping cart, and restored if "Edit Cart" link was activated.
select
adminhtml/system_config_source_yesno
@@ -333,7 +333,7 @@
select
24
adminhtml/system_config_source_shipping_allspecificcountries
- googlecheckout/adminhtml_shipping_applicable_countries
+ googlecheckout/adminhtml_shipping_applicable_countries
1
1
0
@@ -371,7 +371,7 @@
select
34
adminhtml/system_config_source_shipping_allspecificcountries
- googlecheckout/adminhtml_shipping_applicable_countries
+ googlecheckout/adminhtml_shipping_applicable_countries
1
1
0
@@ -408,7 +408,7 @@
select
44
adminhtml/system_config_source_shipping_allspecificcountries
- googlecheckout/adminhtml_shipping_applicable_countries
+ googlecheckout/adminhtml_shipping_applicable_countries
1
1
0
@@ -464,4 +464,4 @@
-
\ No newline at end of file
+
diff --git a/app/code/core/Mage/GoogleCheckout/sql/googlecheckout_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/GoogleCheckout/sql/googlecheckout_setup/mysql4-install-0.7.0.php
index 5f74c032c9..ee50e26c74 100644
--- a/app/code/core/Mage/GoogleCheckout/sql/googlecheckout_setup/mysql4-install-0.7.0.php
+++ b/app/code/core/Mage/GoogleCheckout/sql/googlecheckout_setup/mysql4-install-0.7.0.php
@@ -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_GoogleCheckout
- * @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_GoogleCheckout
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/GoogleCheckout/sql/googlecheckout_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/GoogleCheckout/sql/googlecheckout_setup/mysql4-upgrade-0.7.0-0.7.1.php
index bd535c13ff..349135d3ce 100644
--- a/app/code/core/Mage/GoogleCheckout/sql/googlecheckout_setup/mysql4-upgrade-0.7.0-0.7.1.php
+++ b/app/code/core/Mage/GoogleCheckout/sql/googlecheckout_setup/mysql4-upgrade-0.7.0-0.7.1.php
@@ -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_GoogleCheckout
- * @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_GoogleCheckout
+ * @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)
*/
$installer = $this;
@@ -61,4 +61,4 @@
}
$installer->addAttributeToSet('catalog_product', $attributeSetId, $attributeGroupId, $attributeId);
}
-$installer->endSetup();
\ No newline at end of file
+$installer->endSetup();
diff --git a/app/code/core/Mage/GoogleCheckout/sql/googlecheckout_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/GoogleCheckout/sql/googlecheckout_setup/mysql4-upgrade-0.7.1-0.7.2.php
index 8dfdceedee..275db718e9 100644
--- a/app/code/core/Mage/GoogleCheckout/sql/googlecheckout_setup/mysql4-upgrade-0.7.1-0.7.2.php
+++ b/app/code/core/Mage/GoogleCheckout/sql/googlecheckout_setup/mysql4-upgrade-0.7.1-0.7.2.php
@@ -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_GoogleCheckout
- * @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_GoogleCheckout
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/GoogleCheckout/sql/googlecheckout_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/GoogleCheckout/sql/googlecheckout_setup/mysql4-upgrade-0.7.2-0.7.3.php
index 9e71ca3e9d..2476f998e9 100644
--- a/app/code/core/Mage/GoogleCheckout/sql/googlecheckout_setup/mysql4-upgrade-0.7.2-0.7.3.php
+++ b/app/code/core/Mage/GoogleCheckout/sql/googlecheckout_setup/mysql4-upgrade-0.7.2-0.7.3.php
@@ -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_GoogleCheckout
- * @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_GoogleCheckout
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/GoogleOptimizer/Block/Adminhtml/Catalog/Category/Edit/Tab/Googleoptimizer.php b/app/code/core/Mage/GoogleOptimizer/Block/Adminhtml/Catalog/Category/Edit/Tab/Googleoptimizer.php
index c63a334ebf..67190c715f 100644
--- a/app/code/core/Mage/GoogleOptimizer/Block/Adminhtml/Catalog/Category/Edit/Tab/Googleoptimizer.php
+++ b/app/code/core/Mage/GoogleOptimizer/Block/Adminhtml/Catalog/Category/Edit/Tab/Googleoptimizer.php
@@ -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_Adminhtml
- * @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_GoogleOptimizer
+ * @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)
*/
/**
@@ -190,4 +190,4 @@ public function _prepareLayout()
return parent::_prepareLayout();
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/GoogleOptimizer/Block/Adminhtml/Catalog/Product/Edit/Tab/Googleoptimizer.php b/app/code/core/Mage/GoogleOptimizer/Block/Adminhtml/Catalog/Product/Edit/Tab/Googleoptimizer.php
index f4b34245ee..fea2c34c33 100644
--- a/app/code/core/Mage/GoogleOptimizer/Block/Adminhtml/Catalog/Product/Edit/Tab/Googleoptimizer.php
+++ b/app/code/core/Mage/GoogleOptimizer/Block/Adminhtml/Catalog/Product/Edit/Tab/Googleoptimizer.php
@@ -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_GoogleOptimizer
- * @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_GoogleOptimizer
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/GoogleOptimizer/Block/Adminhtml/Cms/Page/Edit/Enable.php b/app/code/core/Mage/GoogleOptimizer/Block/Adminhtml/Cms/Page/Edit/Enable.php
index 934935924b..338dc8eed5 100644
--- a/app/code/core/Mage/GoogleOptimizer/Block/Adminhtml/Cms/Page/Edit/Enable.php
+++ b/app/code/core/Mage/GoogleOptimizer/Block/Adminhtml/Cms/Page/Edit/Enable.php
@@ -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_GoogleOptimizer
- * @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_GoogleOptimizer
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/GoogleOptimizer/Block/Adminhtml/Cms/Page/Edit/Renderer/Conversion.php b/app/code/core/Mage/GoogleOptimizer/Block/Adminhtml/Cms/Page/Edit/Renderer/Conversion.php
index 77b82d2368..3ba600da07 100644
--- a/app/code/core/Mage/GoogleOptimizer/Block/Adminhtml/Cms/Page/Edit/Renderer/Conversion.php
+++ b/app/code/core/Mage/GoogleOptimizer/Block/Adminhtml/Cms/Page/Edit/Renderer/Conversion.php
@@ -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_GoogleOptimizer
- * @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_GoogleOptimizer
+ * @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)
*/
/**
@@ -75,4 +75,4 @@ public function getJsonConversionPagesUrl()
$storeViewsUrls = new Varien_Object($storeViewsUrls);
return $storeViewsUrls->toJson();
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/GoogleOptimizer/Block/Adminhtml/Cms/Page/Edit/Tab/Googleoptimizer.php b/app/code/core/Mage/GoogleOptimizer/Block/Adminhtml/Cms/Page/Edit/Tab/Googleoptimizer.php
index da8c0aedb5..f994085d59 100644
--- a/app/code/core/Mage/GoogleOptimizer/Block/Adminhtml/Cms/Page/Edit/Tab/Googleoptimizer.php
+++ b/app/code/core/Mage/GoogleOptimizer/Block/Adminhtml/Cms/Page/Edit/Tab/Googleoptimizer.php
@@ -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_GoogleOptimizer
- * @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_GoogleOptimizer
+ * @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)
*/
/**
diff --git a/app/code/core/Mage/GoogleOptimizer/Block/Code.php b/app/code/core/Mage/GoogleOptimizer/Block/Code.php
index 56e9c69262..e4cd2515eb 100644
--- a/app/code/core/Mage/GoogleOptimizer/Block/Code.php
+++ b/app/code/core/Mage/GoogleOptimizer/Block/Code.php
@@ -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_GoogleOptmizer
- * @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_GoogleOptimizer
+ * @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)
*/
@@ -108,4 +108,4 @@ public function setScriptType($scriptType)
}
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/GoogleOptimizer/Block/Code/Category.php b/app/code/core/Mage/GoogleOptimizer/Block/Code/Category.php
index 7d445d6fa1..70e970f267 100644
--- a/app/code/core/Mage/GoogleOptimizer/Block/Code/Category.php
+++ b/app/code/core/Mage/GoogleOptimizer/Block/Code/Category.php
@@ -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_GoogleOptmizer
- * @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_GoogleOptimizer
+ * @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)
*/
@@ -49,4 +49,4 @@ public function getGoogleOptimizer()
{
return $this->getCategory()->getGoogleOptimizerScripts();
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/GoogleOptimizer/Block/Code/Conversion.php b/app/code/core/Mage/GoogleOptimizer/Block/Code/Conversion.php
index 8755a089b8..ab5884af16 100644
--- a/app/code/core/Mage/GoogleOptimizer/Block/Code/Conversion.php
+++ b/app/code/core/Mage/GoogleOptimizer/Block/Code/Conversion.php
@@ -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_GoogleOptmizer
- * @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_GoogleOptimizer
+ * @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)
*/
@@ -68,4 +68,4 @@ public function getPageType()
{
return $this->_pageType;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/GoogleOptimizer/Block/Code/Page.php b/app/code/core/Mage/GoogleOptimizer/Block/Code/Page.php
index 8d579e2b98..61785ca3c7 100644
--- a/app/code/core/Mage/GoogleOptimizer/Block/Code/Page.php
+++ b/app/code/core/Mage/GoogleOptimizer/Block/Code/Page.php
@@ -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_GoogleOptmizer
- * @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_GoogleOptimizer
+ * @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)
*/
@@ -40,4 +40,4 @@ protected function _initGoogleOptimizerModel()
$this->_setGoogleOptimizerModel($cmsPage->getGoogleOptimizerScripts());
return parent::_initGoogleOptimizerModel();
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/GoogleOptimizer/Block/Code/Product.php b/app/code/core/Mage/GoogleOptimizer/Block/Code/Product.php
index b21fb5d04c..b105fff0de 100644
--- a/app/code/core/Mage/GoogleOptimizer/Block/Code/Product.php
+++ b/app/code/core/Mage/GoogleOptimizer/Block/Code/Product.php
@@ -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_GoogleOptmizer
- * @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_GoogleOptimizer
+ * @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)
*/
@@ -49,4 +49,4 @@ public function getGoogleOptimizer()
{
return $this->getProduct()->getGoogleOptimizerScripts();
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/GoogleOptimizer/Block/Js.php b/app/code/core/Mage/GoogleOptimizer/Block/Js.php
index a2ee0ff01c..769ac5452c 100644
--- a/app/code/core/Mage/GoogleOptimizer/Block/Js.php
+++ b/app/code/core/Mage/GoogleOptimizer/Block/Js.php
@@ -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_Adminhtml
- * @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_GoogleOptimizer
+ * @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)
*/
/**
@@ -62,4 +62,4 @@ public function getConversionFieldKey ()
{
return $this->getDataSetDefault('conversion_field_key', 'conversion_script');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/GoogleOptimizer/Helper/Data.php b/app/code/core/Mage/GoogleOptimizer/Helper/Data.php
index 126873f80a..b997ffb77c 100644
--- a/app/code/core/Mage/GoogleOptimizer/Helper/Data.php
+++ b/app/code/core/Mage/GoogleOptimizer/Helper/Data.php
@@ -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_GoogleOptimizer
- * @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_GoogleOptimizer
+ * @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)
*/
/**
@@ -232,4 +232,4 @@ public function getProductAttributes(Varien_Object $product)
}
return $optimizerAttributes;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/GoogleOptimizer/Model/Adminhtml/System/Config/Source/Googleoptimizer/Conversionpages.php b/app/code/core/Mage/GoogleOptimizer/Model/Adminhtml/System/Config/Source/Googleoptimizer/Conversionpages.php
index 39189087bf..0bd46d89b6 100644
--- a/app/code/core/Mage/GoogleOptimizer/Model/Adminhtml/System/Config/Source/Googleoptimizer/Conversionpages.php
+++ b/app/code/core/Mage/GoogleOptimizer/Model/Adminhtml/System/Config/Source/Googleoptimizer/Conversionpages.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_GoogleOptimizer
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
@@ -49,4 +49,4 @@ public function toOptionArray()
);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/GoogleOptimizer/Model/Code.php b/app/code/core/Mage/GoogleOptimizer/Model/Code.php
index 3cf1320389..57c1535414 100644
--- a/app/code/core/Mage/GoogleOptimizer/Model/Code.php
+++ b/app/code/core/Mage/GoogleOptimizer/Model/Code.php
@@ -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_GoogleOptimizer
- * @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_GoogleOptimizer
+ * @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)
*/
/**
@@ -180,4 +180,4 @@ public function deleteScripts($storeId)
$this->getResource()->deleteByEntityType($this, $storeId);
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/GoogleOptimizer/Model/Code/Category.php b/app/code/core/Mage/GoogleOptimizer/Model/Code/Category.php
index 1347269bee..01852bc9b7 100644
--- a/app/code/core/Mage/GoogleOptimizer/Model/Code/Category.php
+++ b/app/code/core/Mage/GoogleOptimizer/Model/Code/Category.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_GoogleOptimizer
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @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)
*/
diff --git a/app/code/core/Mage/GoogleOptimizer/Model/Code/Page.php b/app/code/core/Mage/GoogleOptimizer/Model/Code/Page.php
index 037fa60636..f0f54eef2f 100644
--- a/app/code/core/Mage/GoogleOptimizer/Model/Code/Page.php
+++ b/app/code/core/Mage/GoogleOptimizer/Model/Code/Page.php
@@ -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_GoogleOptimizer
- * @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_GoogleOptimizer
+ * @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)
*/
/**
@@ -68,4 +68,4 @@ protected function _validate()
return parent::_validate();
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/GoogleOptimizer/Model/Code/Product.php b/app/code/core/Mage/GoogleOptimizer/Model/Code/Product.php
index d40ad57a43..c6301851e9 100644
--- a/app/code/core/Mage/GoogleOptimizer/Model/Code/Product.php
+++ b/app/code/core/Mage/GoogleOptimizer/Model/Code/Product.php
@@ -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_GoogleOptimizer
- * @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_GoogleOptimizer
+ * @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)
*/
/**
@@ -68,9 +68,9 @@ protected function _validate()
if ($attributes = $this->getAttributes()) {
$attributesCount = 0;
foreach ($attributes as $_attributeId=>$_attributeValue) {
- if ($_attributeValue != '') {
+ if ($_attributeValue != '') {
$attributesCount++;
- }
+ }
}
if ($attributesCount && $attributesCount <= self::DEFAULT_COUNT_OF_ATTRIBUTES) {
$attributesFlag = true;
@@ -97,4 +97,4 @@ public function getAttributes()
}
return array();
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/GoogleOptimizer/Model/Mysql4/Code.php b/app/code/core/Mage/GoogleOptimizer/Model/Mysql4/Code.php
index a4a18ed1ed..56652d5bbc 100644
--- a/app/code/core/Mage/GoogleOptimizer/Model/Mysql4/Code.php
+++ b/app/code/core/Mage/GoogleOptimizer/Model/Mysql4/Code.php
@@ -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_GoogleOptimizer
- * @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_GoogleOptimizer
+ * @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)
*/
/**
@@ -107,4 +107,4 @@ public function deleteByEntityType($object, $store_id)
$this->_afterDelete($object);
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/GoogleOptimizer/Model/Mysql4/Code/Collection.php b/app/code/core/Mage/GoogleOptimizer/Model/Mysql4/Code/Collection.php
index 20099c90d8..5624f9d71b 100644
--- a/app/code/core/Mage/GoogleOptimizer/Model/Mysql4/Code/Collection.php
+++ b/app/code/core/Mage/GoogleOptimizer/Model/Mysql4/Code/Collection.php
@@ -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_GoogleOptimizer
- * @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_GoogleOptimizer
+ * @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)
*/
@@ -34,8 +34,8 @@
*/
class Mage_GoogleOptimizer_Model_Mysql4_Code_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract
{
- protected function _construct()
- {
- $this->_init('googleoptimizer/code');
- }
-}
\ No newline at end of file
+ protected function _construct()
+ {
+ $this->_init('googleoptimizer/code');
+ }
+}
diff --git a/app/code/core/Mage/GoogleOptimizer/Model/Observer.php b/app/code/core/Mage/GoogleOptimizer/Model/Observer.php
index 52a260a7e2..f59c294f00 100644
--- a/app/code/core/Mage/GoogleOptimizer/Model/Observer.php
+++ b/app/code/core/Mage/GoogleOptimizer/Model/Observer.php
@@ -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_GoogleOptimizer
- * @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_GoogleOptimizer
+ * @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)
*/
/**
@@ -281,4 +281,4 @@ public function deleteCategoryGoogleOptimizerScripts($observer)
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/GoogleOptimizer/controllers/IndexController.php b/app/code/core/Mage/GoogleOptimizer/controllers/IndexController.php
index 9db3cc4fa0..c4f6284ff7 100644
--- a/app/code/core/Mage/GoogleOptimizer/controllers/IndexController.php
+++ b/app/code/core/Mage/GoogleOptimizer/controllers/IndexController.php
@@ -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_GoogleOptimizer
- * @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_GoogleOptimizer
+ * @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)
*/
/**
@@ -54,4 +54,4 @@ public function codesAction()
$this->getResponse()->setBody( Mage::helper('core')->jsonEncode($result) );
}
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/GoogleOptimizer/etc/config.xml b/app/code/core/Mage/GoogleOptimizer/etc/config.xml
index eec8303a9b..c7cfc6311c 100644
--- a/app/code/core/Mage/GoogleOptimizer/etc/config.xml
+++ b/app/code/core/Mage/GoogleOptimizer/etc/config.xml
@@ -20,9 +20,9 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Mage
- * @package Mage_GoogleOptimizer
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ * @package Mage_GoogleOptimizer
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
diff --git a/app/code/core/Mage/GoogleOptimizer/etc/system.xml b/app/code/core/Mage/GoogleOptimizer/etc/system.xml
index 27bc7647fa..15bb9ac633 100644
--- a/app/code/core/Mage/GoogleOptimizer/etc/system.xml
+++ b/app/code/core/Mage/GoogleOptimizer/etc/system.xml
@@ -19,10 +19,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_GoogleAnalytics
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ * @category Mage
+ * @package Mage_GoogleOptimizer
+ * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
@@ -51,4 +51,4 @@
-
\ No newline at end of file
+
diff --git a/app/code/core/Mage/GoogleOptimizer/sql/googleoptimizer_setup/mysql4-install-0.1.0.php b/app/code/core/Mage/GoogleOptimizer/sql/googleoptimizer_setup/mysql4-install-0.1.0.php
index 2da94fc37c..6212c7fbc2 100644
--- a/app/code/core/Mage/GoogleOptimizer/sql/googleoptimizer_setup/mysql4-install-0.1.0.php
+++ b/app/code/core/Mage/GoogleOptimizer/sql/googleoptimizer_setup/mysql4-install-0.1.0.php
@@ -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_GoogleOptimizer
- * @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_GoogleOptimizer
+ * @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)
*/
$installer = $this;
diff --git a/app/code/core/Mage/GoogleOptimizer/sql/googleoptimizer_setup/mysql4-upgrade-0.1.0-0.1.1.php b/app/code/core/Mage/GoogleOptimizer/sql/googleoptimizer_setup/mysql4-upgrade-0.1.0-0.1.1.php
index 351b3e80c4..414347c6d9 100644
--- a/app/code/core/Mage/GoogleOptimizer/sql/googleoptimizer_setup/mysql4-upgrade-0.1.0-0.1.1.php
+++ b/app/code/core/Mage/GoogleOptimizer/sql/googleoptimizer_setup/mysql4-upgrade-0.1.0-0.1.1.php
@@ -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_Directory
- * @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_GoogleOptimizer
+ * @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)
*/
$installer = $this;
@@ -31,4 +31,4 @@
$installer->getConnection()->addColumn($installer->getTable('googleoptimizer/code'), 'conversion_page', "varchar(255) NOT NULL default ''");
-$installer->endSetup();
\ No newline at end of file
+$installer->endSetup();
diff --git a/app/code/core/Mage/GoogleOptimizer/sql/googleoptimizer_setup/mysql4-upgrade-0.1.1-0.1.2.php b/app/code/core/Mage/GoogleOptimizer/sql/googleoptimizer_setup/mysql4-upgrade-0.1.1-0.1.2.php
index 517bb751c5..199186061e 100644
--- a/app/code/core/Mage/GoogleOptimizer/sql/googleoptimizer_setup/mysql4-upgrade-0.1.1-0.1.2.php
+++ b/app/code/core/Mage/GoogleOptimizer/sql/googleoptimizer_setup/mysql4-upgrade-0.1.1-0.1.2.php
@@ -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_Directory
- * @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_GoogleOptimizer
+ * @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)
*/
$installer = $this;
@@ -31,4 +31,4 @@
$installer->getConnection()->addColumn($installer->getTable('googleoptimizer/code'), 'additional_data', "text");
-$installer->endSetup();
\ No newline at end of file
+$installer->endSetup();
diff --git a/app/code/core/Mage/Ideal/Block/Advanced/Failure.php b/app/code/core/Mage/Ideal/Block/Advanced/Failure.php
index 747e30d91e..a6e1701f6a 100644
--- a/app/code/core/Mage/Ideal/Block/Advanced/Failure.php
+++ b/app/code/core/Mage/Ideal/Block/Advanced/Failure.php
@@ -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_Ideal
- * @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_Ideal
+ * @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)
*/
/**
* Failure Response page from iDEAL
@@ -52,4 +52,4 @@ public function getContinueShoppingUrl()
{
return Mage::getUrl('checkout/cart');
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Ideal/Block/Advanced/Form.php b/app/code/core/Mage/Ideal/Block/Advanced/Form.php
index 7c06a376c2..79bcada000 100755
--- a/app/code/core/Mage/Ideal/Block/Advanced/Form.php
+++ b/app/code/core/Mage/Ideal/Block/Advanced/Form.php
@@ -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_Ideal
- * @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_Ideal
+ * @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)
*/
/**
@@ -49,4 +49,4 @@ public function getIssuerList()
{
return $this->getMethod()->getIssuerList();
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Ideal/Block/Advanced/Info.php b/app/code/core/Mage/Ideal/Block/Advanced/Info.php
index 7124e37bdf..12f026cd95 100644
--- a/app/code/core/Mage/Ideal/Block/Advanced/Info.php
+++ b/app/code/core/Mage/Ideal/Block/Advanced/Info.php
@@ -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_Ideal
- * @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_Ideal
+ * @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)
*/
/**
@@ -60,4 +60,4 @@ public function getIssuerTitle()
}
}
-}
\ No newline at end of file
+}
diff --git a/app/code/core/Mage/Ideal/Block/Advanced/Redirect.php b/app/code/core/Mage/Ideal/Block/Advanced/Redirect.php
index 7be67e4f6c..f8b0180092 100755
--- a/app/code/core/Mage/Ideal/Block/Advanced/Redirect.php
+++ b/app/code/core/Mage/Ideal/Block/Advanced/Redirect.php
@@ -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_Ideal
- * @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_Ideal
+ * @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)
*/
/**
@@ -42,4 +42,4 @@ protected function _toHtml()
$html.= '