Merge pull request #5 from mage-one-com/develop

T28444 : Test für QPS bauen

Author: Schrank

README.md

@@ -7,7 +7,10 @@ QPS is a request inspection module for Magento 1 stores. It receives its rule se
 The Magento cron job needs to run in order to obtain updated rule sets.
 
 # Install
-## with composer
+
+Make sure your **Magento cronjob** is running. 
+
+### with composer
 
 1. Add the repository with the module:
 
@@ -20,13 +23,22 @@ The Magento cron job needs to run in order to obtain updated rule sets.
 
 2. `composer require mage_one_com/qps`
 
-## with modman
+### with modman
 
     modman clone [email protected]:mage-one-com/qps.git
 
-## manually
+### manually
 [Download zip file](https://github.com/mage-one-com/qps/archive/master.zip) and copy the files from inside the `src` folder into your magento root directory
 
+## Clean cache/run install scripts
+
+After cleaning the cache, the install scripts should run automatically to create the table for the rules.
+
+## Username + key
+To use the QPS you need to [add your username and key in the configuration](https://my.mage-one.com/qps):
+
+    System > Konfiguration > General > Quick Protection System
+
 # Uninstall
 ## with composer
 - Remove module from `composer.json` and rerun `composer update mageone/qps`
@@ -41,6 +53,7 @@ The Magento cron job needs to run in order to obtain updated rule sets.
 The rule processing must be enabled manually in `System > Config > Quick Protection System (General Tab)`. 
 
 Rules can be automatically enabled after the hourly API sync, although we recommend enabling rules manually after testing them (this is our default setting).
+Enabling or disabling rules is possible in `System > Tools > MageOne QPS Rules`
 
 You have to enter a username and public key, which you can obtain from [https://my.mage-one.com/qps](https://my.mage-one.com/qps)
 

src/app/code/community/Mageone/Qps/Block/Rule.php

@@ -10,6 +10,11 @@ public function __construct()
         parent::__construct();
 
         $this->removeButton('add');
+
+        $this->_addButton('load_rules', array(
+            'label' => $this->__('Load rules'),
+            'onclick' => "setLocation('{$this->getUrl('*/*/load')}')",
+        ));
     }
 }
 

src/app/code/community/Mageone/Qps/Model/HTTP/Client/Curl.php

@@ -64,6 +64,6 @@ protected function validateHttpVersion(array $line): void
 
             return;
         }
-        $this->doError('Invalid response line returned from server: ' . $data);
+        $this->doError('Invalid response line returned from server: ' . implode(' ', $line));
     }
 }

src/app/code/community/Mageone/Qps/controllers/Adminhtml/QpsController.php

@@ -12,7 +12,7 @@ public function indexAction(): void
 
     public function editAction()
     {
-        $id    = $this->getRequest()->getParam('id');
+        $id = $this->getRequest()->getParam('id');
         $model = Mage::getModel('qps/rule');
 
         if (!$id) {
@@ -47,8 +47,8 @@ public function saveAction()
         $redirectBack = $this->getRequest()->getParam('back', false);
         if ($data = $this->getRequest()->getPost()) {
 
-            $id      = $this->getRequest()->getParam('id');
-            $model   = Mage::getModel('qps/rule');
+            $id = $this->getRequest()->getParam('id');
+            $model = Mage::getModel('qps/rule');
             $session = $this->_getSession();
             if (!$id) {
                 $session->addError('You can\'t create new rules. You can only change the status of existing rules.');
@@ -90,6 +90,14 @@ public function saveAction()
         $this->_redirect('*/*/index');
     }
 
+    public function loadAction()
+    {
+        $cron = Mage::getModel('qps/cron');
+        $cron->getRules();
+
+        $this->_redirect('*/*/index');
+    }
+
     protected function _isAllowed()
     {
         return Mage::getSingleton('admin/session')->isAllowed('system/config/qps_section');

src/app/locale/de_DE/Mageone_Qps.csv

@@ -14,7 +14,7 @@
 "Fixing Patch","Schützender Patch"
 "Auto-Enable New Rules","Neue Regeln automatisch aktivieren"
 "Enable module","Modul aktivieren"
-"Enable new Rules automatically. Rules will be updated every hour via our API. (We recommend to enable rules manually after intensive testing)","Neue Regeln automatisch aktivieren. Neue Regeln werden automatisch jede Stunde über die API abgeglichen. (Wir empfehlen, Regeln manuell nach intensen Tests zu aktivieren)"
+"Enable new Rules automatically. Rules will be updated every hour via our API. (We recommend to enable rules manually after intensive testing)","Neue Regeln automatisch aktivieren. Neue Regeln werden automatisch jede Stunde über die API abgeglichen. (Wir empfehlen, Regeln manuell nach intensiven Tests zu aktivieren)"
 "Your <a href=""https://my.mage-one.com/qps"">https://my.mage-one.com/qps</a> username","Ihr <a href=""https://my.mage-one.com/qps"">https://my.mage-one.com/qps</a> Benutzername"
 "Public key for encryption between API and store. This key can be copied from <a href=""https://my.mage-one.com"">https://my.mage-one.com/qps</a>","Öffentlicher Schlüssel für die Verschlüsselung zwischen API und Ihrem Shop. Diesen Key erhalten Sie von <a href=""https://my.mage-one.com/qps"">https://my.mage-one.com/qps</a>"
 "You can only enable and disable a rule.", "Sie können nur Regeln aktivieren und deaktivieren."