pagantis / oscommerce

config/configure_admin.php

Spacing +14 added lines, -14 removed lines

@@ -17,21 +17,21 @@
 define('DIR_WS_HTTPS_CATALOG', '/');
 define('DIR_FS_CATALOG', '/var/www/html/');
 define('DIR_WS_IMAGES', 'images/');
-define('DIR_WS_ICONS', DIR_WS_IMAGES . 'icons/');
-define('DIR_WS_CATALOG_IMAGES', DIR_WS_CATALOG . 'images/');
+define('DIR_WS_ICONS', DIR_WS_IMAGES.'icons/');
+define('DIR_WS_CATALOG_IMAGES', DIR_WS_CATALOG.'images/');
 define('DIR_WS_INCLUDES', 'includes/');
-define('DIR_WS_BOXES', DIR_WS_INCLUDES . 'boxes/');
-define('DIR_WS_FUNCTIONS', DIR_WS_INCLUDES . 'functions/');
-define('DIR_WS_CLASSES', DIR_WS_INCLUDES . 'classes/');
-define('DIR_WS_MODULES', DIR_WS_INCLUDES . 'modules/');
-define('DIR_WS_LANGUAGES', DIR_WS_INCLUDES . 'languages/');
-define('DIR_WS_CATALOG_LANGUAGES', DIR_WS_CATALOG . 'includes/languages/');
-define('DIR_FS_CATALOG_LANGUAGES', DIR_FS_CATALOG . 'includes/languages/');
-define('DIR_FS_CATALOG_IMAGES', DIR_FS_CATALOG . 'images/');
-define('DIR_FS_CATALOG_MODULES', DIR_FS_CATALOG . 'includes/modules/');
-define('DIR_FS_BACKUP', DIR_FS_ADMIN . 'backups/');
-define('DIR_FS_DOWNLOAD', DIR_FS_CATALOG . 'download/');
-define('DIR_FS_DOWNLOAD_PUBLIC', DIR_FS_CATALOG . 'pub/');
+define('DIR_WS_BOXES', DIR_WS_INCLUDES.'boxes/');
+define('DIR_WS_FUNCTIONS', DIR_WS_INCLUDES.'functions/');
+define('DIR_WS_CLASSES', DIR_WS_INCLUDES.'classes/');
+define('DIR_WS_MODULES', DIR_WS_INCLUDES.'modules/');
+define('DIR_WS_LANGUAGES', DIR_WS_INCLUDES.'languages/');
+define('DIR_WS_CATALOG_LANGUAGES', DIR_WS_CATALOG.'includes/languages/');
+define('DIR_FS_CATALOG_LANGUAGES', DIR_FS_CATALOG.'includes/languages/');
+define('DIR_FS_CATALOG_IMAGES', DIR_FS_CATALOG.'images/');
+define('DIR_FS_CATALOG_MODULES', DIR_FS_CATALOG.'includes/modules/');
+define('DIR_FS_BACKUP', DIR_FS_ADMIN.'backups/');
+define('DIR_FS_DOWNLOAD', DIR_FS_CATALOG.'download/');
+define('DIR_FS_DOWNLOAD_PUBLIC', DIR_FS_CATALOG.'pub/');
 
 define('DB_SERVER', getenv('OSCOMMERCE_DB_HOST'));
 define('DB_SERVER_USERNAME', getenv('OSCOMMERCE_DB_USER'));

config/configure.php

Spacing +7 added lines, -7 removed lines

@@ -9,17 +9,17 @@
 define('DIR_WS_HTTP_CATALOG', '/');
 define('DIR_WS_HTTPS_CATALOG', '/');
 define('DIR_WS_IMAGES', 'images/');
-define('DIR_WS_ICONS', DIR_WS_IMAGES . 'icons/');
+define('DIR_WS_ICONS', DIR_WS_IMAGES.'icons/');
 define('DIR_WS_INCLUDES', 'includes/');
-define('DIR_WS_FUNCTIONS', DIR_WS_INCLUDES . 'functions/');
-define('DIR_WS_CLASSES', DIR_WS_INCLUDES . 'classes/');
-define('DIR_WS_MODULES', DIR_WS_INCLUDES . 'modules/');
-define('DIR_WS_LANGUAGES', DIR_WS_INCLUDES . 'languages/');
+define('DIR_WS_FUNCTIONS', DIR_WS_INCLUDES.'functions/');
+define('DIR_WS_CLASSES', DIR_WS_INCLUDES.'classes/');
+define('DIR_WS_MODULES', DIR_WS_INCLUDES.'modules/');
+define('DIR_WS_LANGUAGES', DIR_WS_INCLUDES.'languages/');
 
 define('DIR_WS_DOWNLOAD_PUBLIC', 'pub/');
 define('DIR_FS_CATALOG', '/var/www/html');
-define('DIR_FS_DOWNLOAD', DIR_FS_CATALOG . 'download/');
-define('DIR_FS_DOWNLOAD_PUBLIC', DIR_FS_CATALOG . 'pub/');
+define('DIR_FS_DOWNLOAD', DIR_FS_CATALOG.'download/');
+define('DIR_FS_DOWNLOAD_PUBLIC', DIR_FS_CATALOG.'pub/');
 
 define('DB_SERVER', getenv('OSCOMMERCE_DB_HOST'));
 define('DB_SERVER_USERNAME', getenv('OSCOMMERCE_DB_USER'));

catalog/ext/modules/payment/pagantis/bypass.php

Spacing +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
     $destUrl = $_POST['formUrl'];
 } elseif ($_POST['cancelUrl']) {
     $destUrl = $_POST['cancelUrl'];
-} else {
+}else {
     $destUrl = $_SERVER['HTTP_REFERER'];
 }
 

catalog/ext/modules/payment/pagantis/configController.php

Spacing +4 added lines, -4 removed lines

@@ -41,22 +41,22 @@
 } elseif ($_SERVER['REQUEST_METHOD'] == 'POST') {
     if (count($_POST)) {
         foreach ($_POST as $config => $value) {
-            if (isset($defaultConfigs[$config]) && $response['status']==null) {
+            if (isset($defaultConfigs[$config]) && $response['status'] == null) {
                 $updateQuery = "update ".TABLE_PAGANTIS_CONFIG." set value='$value' where config='$config'";
                 $resultsSelect = tep_db_query($updateQuery);
-            } else {
+            }else {
                 $response['status'] = 400;
                 $response['result'] = 'Bad request';
             }
         }
-    } else {
+    }else {
         $response['status'] = 422;
         $response['result'] = 'Empty data';
     }
 }
 
 $formattedResult = array();
-if ($response['status']==null) {
+if ($response['status'] == null) {
     $query = "select * from ".TABLE_PAGANTIS_CONFIG;
     $resultsSelect = tep_db_query($query);
     while ($orderRow = tep_db_fetch_array($resultsSelect)) {

catalog/ext/modules/payment/pagantis/logController.php

Spacing +7 added lines, -7 removed lines

@@ -11,8 +11,8 @@ 
 $orderRow = tep_db_fetch_array($resultsSelect);
 $privateKey = $orderRow['configuration_value'];
 
-if ($secretKey!='' && $privateKey!='') {
-    $query ="select log, createdAt from ".TABLE_PAGANTIS_LOG;
+if ($secretKey != '' && $privateKey != '') {
+    $query = "select log, createdAt from ".TABLE_PAGANTIS_LOG;
 
     $where = array();
     if (isset($_GET['from'])) {
@@ -24,16 +24,16 @@ 
     }
 
 
-    if (count($where)>0) {
-        $query.=" where ";
+    if (count($where) > 0) {
+        $query .= " where ";
         foreach ((array)$where as $clause) {
-            $query.=" $clause AND";
+            $query .= " $clause AND";
         }
         $query = substr($query, 0, -3);
     }
 
     $limit = ($_GET['limit']) ? $_GET['limit'] : 50;
-    $query.=" order by createdAt desc limit $limit";
+    $query .= " order by createdAt desc limit $limit";
 
     $response = array();
     $resultsSelect = tep_db_query($query);
@@ -44,7 +44,7 @@ 
             $response[$i]['log']       = $orderRow['log'];
             $i++;
         }
-    } else {
+    }else {
         $response['result'] = 'Error';
     }
 

catalog/ext/modules/payment/pagantis/callback.php

Spacing +2 added lines, -2 removed lines

@@ -16,8 +16,8 @@
         tep_session_register($var);
     }
     $destUrl = tep_href_link(FILENAME_CHECKOUT_PROCESS, '', 'SSL', true, false);
-    $destUrl.="?order_id=$_GET[order_id]&from=notify";
-} else {
+    $destUrl .= "?order_id=$_GET[order_id]&from=notify";
+}else {
     $destUrl = tep_href_link(FILENAME_CHECKOUT_SHIPPING, '', 'SSL', true, false);
 }
 

test/PagantisOscommerceTest.php

Spacing +8 added lines, -8 removed lines

@@ -64,12 +64,12 @@ 
         $faker = Factory::create();
         $this->configuration['dni'] = $this->getDNI();
         $this->configuration['firstname'] = $faker->firstName;
-        $this->configuration['lastname'] = $faker->lastName . ' ' . $faker->lastName;
+        $this->configuration['lastname'] = $faker->lastName.' '.$faker->lastName;
         $this->configuration['company'] = $faker->company;
         $this->configuration['zip'] = '28'.$faker->randomNumber(3, true);
         $this->configuration['address'] = $faker->streetAddress;
-        $this->configuration['phone'] = '6' . $faker->randomNumber(8);
-        $this->configuration['email'] = date('ymd') . '@pagantis.com';
+        $this->configuration['phone'] = '6'.$faker->randomNumber(8);
+        $this->configuration['email'] = date('ymd').'@pagantis.com';
         parent::__construct($name, $data, $dataName);
     }
     /**
@@ -77,12 +77,12 @@ 
      */
     protected function getDNI()
     {
-        $dni = '0000' . rand(pow(10, 4-1), pow(10, 4)-1);
-        $value = (int) ($dni / 23);
+        $dni = '0000'.rand(pow(10, 4 - 1), pow(10, 4) - 1);
+        $value = (int)($dni / 23);
         $value *= 23;
-        $value= $dni - $value;
-        $letter= "TRWAGMYFPDXBNJZSQVHLCKEO";
-        $dniLetter= substr($letter, $value, 1);
+        $value = $dni - $value;
+        $letter = "TRWAGMYFPDXBNJZSQVHLCKEO";
+        $dniLetter = substr($letter, $value, 1);
         return $dni.$dniLetter;
     }
 

catalog/admin/promotion.php

Spacing +4 added lines, -4 removed lines

@@ -3,12 +3,12 @@ 
 require('includes/application_top.php');
 
 define('TABLE_PAGANTIS_CONFIG', 'pagantis_config');
-define('TABLE_PRODUCTS_DESCRIPTIONS','products_description');
+define('TABLE_PRODUCTS_DESCRIPTIONS', 'products_description');
 
 //Check if module is installed
-$result = tep_db_query("select * from " . TABLE_CONFIGURATION . " where configuration_key='MODULE_PAYMENT_PAGANTIS_STATUS'");
+$result = tep_db_query("select * from ".TABLE_CONFIGURATION." where configuration_key='MODULE_PAYMENT_PAGANTIS_STATUS'");
 $resultSelect = tep_db_fetch_array($result);
-if (tep_db_num_rows($result) == 0 || $resultSelect['configuration_value'] !=='True') {
+if (tep_db_num_rows($result) == 0 || $resultSelect['configuration_value'] !== 'True') {
     tep_redirect('/admin/index.php');
 }
 
@@ -31,7 +31,7 @@ 
     $resultSelect = tep_db_fetch_array($result);
     if ($resultSelect['value'] == '') {
         $promotedProducts = array();
-    } else {
+    }else {
         $promotedProducts = array_values((array)unserialize($resultSelect['value']));
     }
 }

test/Buy/AbstractBuy.php

Spacing +5 added lines, -5 removed lines

@@ -120,7 +120,7 @@ 
         sleep(3);
         $productLinkElement->click();
         $this->assertSame(
-            self::PRODUCT_NAME . ', ' . self::TITLE,
+            self::PRODUCT_NAME.', '.self::TITLE,
             $this->webDriver->getTitle()
         );
     }
@@ -232,9 +232,9 @@ 
         $paymentFormElement = WebDriverBy::className('FieldsPreview-desc');
         $condition = WebDriverExpectedCondition::visibilityOfElementLocated($paymentFormElement);
         $this->webDriver->wait()->until($condition);
-        $this->assertTrue((bool) $condition);
+        $this->assertTrue((bool)$condition);
         $this->assertSame(
-            $this->configuration['firstname'] . ' ' . $this->configuration['lastname'],
+            $this->configuration['firstname'].' '.$this->configuration['lastname'],
             $this->findByClass('FieldsPreview-desc')->getText()
         );
     }
@@ -294,7 +294,7 @@ 
      */
     protected function checkPagantisOrderId()
     {
-        $orderId=0;
+        $orderId = 0;
         $notifyUrl = self::OSCURL.self::NOTIFICATION_FOLDER.'?order='.$orderId;
         $this->assertNotEmpty($notifyUrl, $notifyUrl);
         $response = Request::post($notifyUrl)->expects('json')->send();
@@ -304,7 +304,7 @@ 
         $this->assertEquals(
             $response->body->merchant_order_id,
             $orderId,
-            $response->body->merchant_order_id.'!='. $orderId
+            $response->body->merchant_order_id.'!='.$orderId
         );
         $this->assertContains(
             NoIdentificationException::ERROR_MESSAGE,