daily pastebin goal
28%
SHARE
TWEET

Untitled

a guest Apr 17th, 2018 66 Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. app/Mage.php
  2. app/code/core/Mage/Admin/Helper/Data.php
  3. app/code/core/Mage/Admin/Model/Block.php
  4. app/code/core/Mage/Admin/Model/Resource/Block.php
  5. app/code/core/Mage/Admin/Model/User.php
  6. app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit/Form.php
  7. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Grid.php
  8. app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Sender.php
  9. app/code/core/Mage/Adminhtml/Block/Sales/Order/Grid.php
  10. app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Info.php
  11. app/code/core/Mage/Adminhtml/Block/System/Store/Edit/Form.php
  12. app/code/core/Mage/Adminhtml/Block/Tag/Assigned/Grid.php
  13. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Store.php
  14. app/code/core/Mage/Adminhtml/Block/Widget/Tabs.php
  15. app/code/core/Mage/Adminhtml/Model/Config/Data.php
  16. app/code/core/Mage/Adminhtml/Model/System/Store.php
  17. app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php
  18. app/code/core/Mage/Adminhtml/controllers/CustomerController.php
  19. app/code/core/Mage/Adminhtml/controllers/System/BackupController.php
  20. app/code/core/Mage/Core/Model/Session/Abstract/Varien.php
  21. app/code/core/Mage/Core/Model/Variable.php
  22. app/code/core/Mage/Customer/Helper/Data.php
  23. app/code/core/Mage/Customer/Model/Resource/Customer.php
  24. app/code/core/Mage/Customer/controllers/AccountController.php
  25. app/code/core/Mage/Customer/etc/config.xml
  26. app/code/core/Mage/Customer/sql/customer_setup/upgrade-1.6.2.0.1.1.1-1.6.2.0.1.1.2.php
  27. app/code/core/Mage/Downloadable/etc/config.xml
  28. app/code/core/Mage/Downloadable/etc/system.xml
  29. app/code/core/Mage/Downloadable/sql/downloadable_setup/upgrade-1.6.0.0.2.1.1-1.6.0.0.2.1.2.php
  30. app/code/core/Mage/ImportExport/Model/Import.php
  31. app/code/core/Mage/ImportExport/Model/Import/Entity/Product.php
  32. app/code/core/Mage/Shipping/Model/Info.php
  33. app/code/core/Mage/Widget/controllers/Adminhtml/Widget/InstanceController.php
  34. app/design/adminhtml/default/default/template/catalog/product/attribute/set/main.phtml
  35. app/design/adminhtml/default/default/template/customer/tab/view.phtml
  36. app/design/adminhtml/default/default/template/customer/tab/view/sales.phtml
  37. app/design/adminhtml/default/default/template/dashboard/store/switcher.phtml
  38. app/design/adminhtml/default/default/template/downloadable/product/composite/fieldset/downloadable.phtml
  39. app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable/links.phtml
  40. app/design/adminhtml/default/default/template/downloadable/sales/items/column/downloadable/creditmemo/name.phtml
  41. app/design/adminhtml/default/default/template/downloadable/sales/items/column/downloadable/invoice/name.phtml
  42. app/design/adminhtml/default/default/template/downloadable/sales/items/column/downloadable/name.phtml
  43. app/design/adminhtml/default/default/template/newsletter/preview/store.phtml
  44. app/design/adminhtml/default/default/template/report/store/switcher.phtml
  45. app/design/adminhtml/default/default/template/sales/order/view/info.phtml
  46. app/design/adminhtml/default/default/template/store/switcher.phtml
  47. app/design/adminhtml/default/default/template/store/switcher/enhanced.phtml
  48. app/design/adminhtml/default/default/template/system/convert/profile/wizard.phtml
  49. app/design/adminhtml/default/default/template/tax/rate/title.phtml
  50. app/design/adminhtml/default/default/template/widget/form/renderer/fieldset.phtml
  51. app/locale/en_US/Mage_Catalog.csv
  52. app/locale/en_US/Mage_ImportExport.csv
  53. lib/Zend/Mail/Transport/Sendmail.php
  54.    
  55. //         if ($this->useValidateSessionPasswordTimestamp()
  56. //             && isset($validatorData[self::VALIDATOR_PASSWORD_CREATE_TIMESTAMP])
  57. //             && isset($sessionData[self::VALIDATOR_SESSION_EXPIRE_TIMESTAMP])
  58. //             && $validatorData[self::VALIDATOR_PASSWORD_CREATE_TIMESTAMP]
  59. //             > $sessionData[self::VALIDATOR_SESSION_EXPIRE_TIMESTAMP] - $this->getCookie()->getLifetime()
  60. //         ) {
  61. //             return false;
  62. //         }
  63.  
  64. //         if ($this->useValidateSessionExpire()
  65. //             && isset($sessionData[self::VALIDATOR_SESSION_EXPIRE_TIMESTAMP])
  66. //             && $sessionData[self::VALIDATOR_SESSION_EXPIRE_TIMESTAMP] < time() ) {
  67. //             return false;
  68. //         } else {
  69. //             $this->_data[self::VALIDATOR_KEY][self::VALIDATOR_SESSION_EXPIRE_TIMESTAMP]
  70. //                 = $validatorData[self::VALIDATOR_SESSION_EXPIRE_TIMESTAMP];
  71. //         }
  72.    
  73. if ($this->useValidateSessionPasswordTimestamp()
  74.             && isset($validatorData[self::VALIDATOR_PASSWORD_CREATE_TIMESTAMP])
  75.             && isset($sessionData[self::VALIDATOR_SESSION_EXPIRE_TIMESTAMP])
  76.             && $validatorData[self::VALIDATOR_PASSWORD_CREATE_TIMESTAMP]
  77.             > $sessionData[self::VALIDATOR_SESSION_EXPIRE_TIMESTAMP] - $this->getCookie()->getLifetime()
  78.         ) {
  79.         return false;
  80.    
  81. if ($this->useValidateSessionExpire()
  82.         && isset($sessionData[self::VALIDATOR_SESSION_EXPIRE_TIMESTAMP])
  83.         && $sessionData[self::VALIDATOR_SESSION_EXPIRE_TIMESTAMP] < time() ) {
  84.         return false;
  85.     } else {
  86.         $this->_data[self::VALIDATOR_KEY][self::VALIDATOR_SESSION_EXPIRE_TIMESTAMP]
  87.             = $validatorData[self::VALIDATOR_SESSION_EXPIRE_TIMESTAMP];
  88.     }
  89.     if ($this->useValidateSessionPasswordTimestamp()
  90.         && isset($validatorData[self::VALIDATOR_PASSWORD_CREATE_TIMESTAMP])
  91.         && isset($sessionData[self::VALIDATOR_SESSION_EXPIRE_TIMESTAMP])
  92.         && $validatorData[self::VALIDATOR_PASSWORD_CREATE_TIMESTAMP]
  93.         > $sessionData[self::VALIDATOR_SESSION_EXPIRE_TIMESTAMP] - $this->getCookie()->getLifetime()
  94.     ) {
  95.         return false;
  96.     }
  97.    
  98. if ($this->useValidateSessionPasswordTimestamp()
  99.         && isset($validatorData[self::VALIDATOR_PASSWORD_CREATE_TIMESTAMP])
  100.         && isset($sessionData[self::VALIDATOR_SESSION_EXPIRE_TIMESTAMP])
  101.         && $validatorData[self::VALIDATOR_PASSWORD_CREATE_TIMESTAMP]
  102.         > $sessionData[self::VALIDATOR_SESSION_EXPIRE_TIMESTAMP] - $this->getCookie()->getLifetime()
  103.     ) {
  104.         return false;
  105.     }
  106.  
  107.     if ($this->useValidateSessionExpire()
  108.         && isset($sessionData[self::VALIDATOR_SESSION_EXPIRE_TIMESTAMP])
  109.         && $sessionData[self::VALIDATOR_SESSION_EXPIRE_TIMESTAMP] < time() ) {
  110.         return false;
  111.     } else {
  112.         $this->_data[self::VALIDATOR_KEY][self::VALIDATOR_SESSION_EXPIRE_TIMESTAMP]
  113.             = $validatorData[self::VALIDATOR_SESSION_EXPIRE_TIMESTAMP];
  114.     }
  115.    
  116.     if ($this->useValidateSessionExpire()
  117.         && isset($sessionData[self::VALIDATOR_SESSION_EXPIRE_TIMESTAMP])
  118.         && $sessionData[self::VALIDATOR_SESSION_EXPIRE_TIMESTAMP] < time() ) {
  119.         return false;
  120.     } else {
  121.         $this->_data[self::VALIDATOR_KEY][self::VALIDATOR_SESSION_EXPIRE_TIMESTAMP]
  122.             = $validatorData[self::VALIDATOR_SESSION_EXPIRE_TIMESTAMP];
  123.     }
  124.     if ($this->useValidateSessionPasswordTimestamp()
  125.         && isset($validatorData[self::VALIDATOR_PASSWORD_CREATE_TIMESTAMP])
  126.         && isset($sessionData[self::VALIDATOR_SESSION_EXPIRE_TIMESTAMP])
  127.         && $validatorData[self::VALIDATOR_PASSWORD_CREATE_TIMESTAMP]
  128.         > $sessionData[self::VALIDATOR_SESSION_EXPIRE_TIMESTAMP] - $this->getCookie()->getLifetime()
  129.     ) {
  130.         return false;
  131.     }
  132.    
  133. patching file lib/Zend/Mail/Transport/Sendmail.php
  134. Hunk #1 FAILED at 119.
  135. Hunk #2 FAILED at 130.
  136.    
  137. +    const VALIDATOR_PASSWORD_CREATE_TIMESTAMP   = 'password_create_timestamp';
  138.    
  139. +        if ($this->useValidateSessionPasswordTimestamp()
  140. +            && isset($validatorData[self::VALIDATOR_PASSWORD_CREATE_TIMESTAMP])
  141. +            && isset($sessionData[self::VALIDATOR_SESSION_EXPIRE_TIMESTAMP])
  142. +            && $validatorData[self::VALIDATOR_PASSWORD_CREATE_TIMESTAMP]
  143. +            > $sessionData[self::VALIDATOR_SESSION_EXPIRE_TIMESTAMP] - $this->getCookie()->getLifetime()
  144. +        ) {
  145. +            return false;
  146. +        }
  147.    
  148. PHP Fatal error:  Uncaught Error: Undefined class constant 'VALIDATOR_SESSION_EXPIRE_TIMESTAMP' in
  149. app/code/core/Mage/Core/Model/Session/Abstract/Varien.php:406
  150. Stack trace:
  151. #0
  152. app/code/core/Mage/Core/Model/Session/Abstract/Varien.php(358): Mage_Core_Model_Session_Abstract_Varien->_validate()
  153. #1
  154. app/code/core/Mage/Core/Model/Session/Abstract/Varien.php(176): Mage_Core_Model_Session_Abstract_Varien->validate()
  155. #2
  156. app/code/core/Mage/Core/Model/Session/Abstract.php(84): Mage_Core_Model_Session_Abstract_Varien->init('core', 'frontend')
  157. #3
  158. app/code/core/Mage/Core/Model/Session.php(42): Mage_Core_Model_Session_Abstract->init('core', 'frontend')
  159. #4
  160. app/code/core/Mage/Core/Model/Config.php(1354): Mage_Core_Model_Session->__construct(Array)
  161.    
  162. const VALIDATOR_SESSION_EXPIRE_TIMESTAMP = 'session_expire_timestamp';
  163.    
  164. $resource = Mage::getSingleton('core/resource');
  165.     $readConnection = $resource->getConnection('core_read');
  166.     $query = 'SELECT * FROM ' . $resource->getTableName('customer_entity').' WHERE `entity_id` = '.$customerId;
  167.     $results = $readConnection->fetchAll($query);
  168.     $result=$results[0];
  169.     $date_created = Varien_Date::toTimestamp($result['created_at']);
  170.     return $date_created;
  171.    
  172. /**
  173.  * Get customer password creation timestamp or customer account creation timestamp
  174.  *
  175.  * @param $customerId
  176.  * @return int
  177.  */
  178. public function getPasswordTimestamp($customerId)
  179. {
  180.     /** @var $customer Mage_Customer_Model_Customer */
  181.     $customer = Mage::getModel('customer/customer')
  182.         ->setWebsiteId(Mage::app()->getStore()->getWebsiteId())
  183.         ->load((int)$customerId);
  184.     $passwordCreatedAt = $customer->getPasswordCreatedAt();
  185.  
  186.     return is_null($passwordCreatedAt) ? $customer->getCreatedAtTimestamp() : $passwordCreatedAt;
  187. }
  188.    
  189. app/code/core/Enterprise/Cms/Block/Adminhtml/Cms/Hierarchy/Edit/Form.php
  190.     app/code/core/Enterprise/Cms/Block/Adminhtml/Cms/Hierarchy/Widget/Chooser.php
  191.     app/code/core/Enterprise/Cms/Block/Adminhtml/Cms/Page/Edit/Tab/Hierarchy.php
  192.     app/code/core/Enterprise/Cms/Block/Hierarchy/Menu.php
  193.     app/code/core/Enterprise/Customer/Block/Adminhtml/Customer/Attribute/Edit/Tab/Main.php
  194.     app/code/core/Enterprise/GiftRegistry/Model/Observer.php
  195.     app/code/core/Enterprise/Reward/Block/Adminhtml/Customer/Edit/Tab/Reward/Management/Update.php
  196.     app/code/core/Enterprise/Rma/Model/Shipping/Info.php
  197.     app/code/core/Enterprise/Staging/Block/Adminhtml/Backup/Grid.php
  198.     app/code/core/Enterprise/Staging/Block/Adminhtml/Staging/Grid.php
  199.  app/design/adminhtml/default/default/template/enterprise/cms/hierarchy/edit.phtml
  200.     app/design/adminhtml/default/default/template/enterprise/cms/hierarchy/manage.phtml
  201.     app/design/adminhtml/default/default/template/enterprise/cms/hierarchy/scope/switcher.phtml
  202.     app/design/adminhtml/default/default/template/enterprise/cms/hierarchy/widget/radio.phtml
  203.     app/design/adminhtml/default/default/template/enterprise/cms/page/preview/store.phtml
  204.     app/design/adminhtml/default/default/template/enterprise/customer/website/switcher.phtml
  205.     app/design/adminhtml/default/default/template/enterprise/invitation/view/tab/general.phtml
  206.     app/design/adminhtml/default/default/template/enterprise/staging/log/information/create.phtml
  207.     app/design/adminhtml/default/default/template/enterprise/staging/staging/edit/tabs/website.phtml
  208.     app/design/adminhtml/default/default/template/enterprise/staging/staging/edit/tabs/website/store.phtml
  209.     app/design/adminhtml/default/default/template/enterprise/staging/staging/merge/settings/website.phtml
  210.     app/design/adminhtml/default/default/template/enterprise/store/switcher.phtml
  211.     app/design/adminhtml/default/default/template/enterprise/store/switcher/enhanced.phtml
  212.     app/design/adminhtml/default/default/template/merchandiser/new/page/html/top-buttons.phtml
  213.     app/design/frontend/enterprise/default/template/cms/hierarchy/pagination.phtml
  214.    
  215. app/code/core/Mage/Adminhtml/controllers/CustomerController.php
  216. app/code/core/Mage/Core/Model/Session/Abstract/Varien.php
  217. app/code/core/Mage/Customer/Helper/Data.php
  218. app/code/core/Mage/Customer/Model/Resource/Customer.php
  219. app/code/core/Mage/Customer/controllers/AccountController.php
  220. app/code/core/Mage/Customer/sql/customer_setup/upgrade-1.6.2.0.5.1.1-1.6.2.0.5.1.2.php
  221.    
  222. diff --git app/design/adminhtml/default/default/template/enterprise/cms/hierarchy/manage.phtml app/design/adminhtml/default/default/template/enterprise/cms/hierarchy/manage.phtml
  223. index e45298c..8bee617 100644
  224. --- app/design/adminhtml/default/default/template/enterprise/cms/hierarchy/manage.phtml
  225. +++ app/design/adminhtml/default/default/template/enterprise/cms/hierarchy/manage.phtml
  226. @@ -36,7 +36,7 @@
  227.              <div class="cms-popup-description"></div>
  228.              <div class="fieldset">
  229.                  <div class="cms-hierarchy manage-form">
  230. -                    <?php echo $this->getFormHtml() ?>
  231. +                    <?php echo $this->escapeHtml($this->getFormHtml()); ?>
  232.                  </div>
  233.              </div>
  234.          </div>
  235.    
  236. checking file lib/Zend/Mail/Transport/Sendmail.php
  237. Hunk #1 FAILED at 119.
  238. Hunk #2 FAILED at 129.
  239. 2 out of 2 hunks FAILED
  240.    
  241. lib/Zend/Mail/Transport/Sendmail.php
  242.    
  243. PATCH_SUPEE-10570_CE_v1.9.0.1_v1-2018-02-23-06-18-06.sh
  244.    
  245. PATCH_SUPEE-10570_CE_v1.9.0.1_v1-2018-02-28-04-54-29.sh
RAW Paste Data
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy. OK, I Understand
 
Top