some line changes

proudcommerce · Jun 5, 2013 · 7234196 · 7234196
1 parent de96740
commit 7234196
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -7,8 +7,9 @@ Free Module for OXID eShop.
 
 Features
 
-	- configure different urls for CSS/IMG/JS files in config.inc.php
-	  (info: https://developers.google.com/speed/docs/best-practices/request?hl=de-DE#ServeFromCookielessDomain, https://developers.google.com/speed/docs/best-practices/rtt?hl=de-DE#ParallelizeDownloads)
+	- configure different URLs/domains in config.inc.php
+	  (https://developers.google.com/speed/docs/best-practices/request?hl=de-DE#ServeFromCookielessDomain)
+	  (https://developers.google.com/speed/docs/best-practices/rtt?hl=de-DE#ParallelizeDownloads)
 
 
 Installation

diff --git a/changed_full/config.inc.php b/changed_full/config.inc.php
@@ -187,11 +187,13 @@
      */
     $this->blUseCron = false;
 
-	// psCDN | start
-    if (!isset($_SERVER['HTTPS']) && ($_SERVER['HTTPS'] != '1' || strtolower($_SERVER['HTTPS']) != 'on')) {
-        $this->sShopURLPsSrc   = 'http://js.yourdomain.com';					// oxstyle
-        $this->sShopURLPsCss   = 'http://css.yourdomain.com';					// oxscript
-        $this->sShopURLPsImg   = 'http://img.yourdomain.com';					// getImageUrl()
-        $this->sAltImageDir    = "http://pics.yourdomain.com/out/pictures";		// article pics
+    // psCDN | start
+    // all domains should point on the same as your shop url
+    if (!isset($_SERVER['HTTPS']) && ($_SERVER['HTTPS'] != '1' || strtolower($_SERVER['HTTPS']) != 'on'))
+    {
+        $this->sShopURLPsSrc   = 'http://js.yourdomain.com';                // oxstyle
+        $this->sShopURLPsCss   = 'http://css.yourdomain.com';               // oxscript
+        $this->sShopURLPsImg   = 'http://img.yourdomain.com';               // getImageUrl()
+        $this->sAltImageDir    = "http://pics.yourdomain.com/out/pictures"; // article pics
     }
     // psCDN | end
diff --git a/copy_this/modules/proudsourcing/psCDN/core/pscdn_oxviewconfig.php b/copy_this/modules/proudsourcing/psCDN/core/pscdn_oxviewconfig.php
@@ -1,4 +1,15 @@
 <?php
+/**
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * @copyright (c) Proud Sourcing GmbH | 2013
+ * @link www.proudcommerce.com
+ * @package psCDN
+ * @version 1.0.0
+**/
 class pscdn_oxViewConfig extends pscdn_oxViewConfig_parent
 {
 
@@ -21,7 +32,8 @@ public function getImageUrl( $sFile = null )
         // psCDN | start
         $sShopImgURL = $this->getConfig()->getConfigParam( 'sShopURLPsImg' );
         $sShopURL = $this->getConfig()->getConfigParam( 'sShopURL' );
-        if(!$this->isAdmin() && !empty($sShopImgURL)) {
+        if(!$this->isAdmin() && !empty($sShopImgURL))
+        {
             return str_replace($sShopURL, $sShopImgURL.'/', $sValue);
         }
         // psCDN | end