Merge remote-tracking branch 'remotes/origin/develop'

loadedcommerce · Jan 23, 2014 · f0c240f · f0c240f
2 parents 1c6dcd3 + 728cbf6
commit f0c240f
Show file tree

Hide file tree

Showing 161 changed files with 6,589 additions and 2,447 deletions.
diff --git a/catalog/addons/Cash_On_Delivery/controller.php b/catalog/addons/Cash_On_Delivery/controller.php
@@ -2,7 +2,7 @@
 /**
   @package    catalog::addons
   @author     Loaded Commerce
-  @copyright  Copyright 2003-2014 Loaded Commerce, LLC
+  @copyright  Copyright 2003-2014 Loaded Commerce
   @copyright  Portions Copyright 2003 osCommerce
   @license    https://github.com/loadedcommerce/loaded7/blob/master/LICENSE.txt
   @version    $Id: controller.php v1.0 2013-08-08 datazen $
@@ -41,11 +41,11 @@ public function Cash_On_Delivery() {
    /**
     * The addon version
     */     
-    $this->_version = '1.0.0';
+    $this->_version = '1.0.1';
    /**
     * The Loaded 7 core compatibility version
     */     
-    $this->_compatibility = '7.0.0.4.1'; // the addon is compatible with this core version and later   
+    $this->_compatibility = '7.002.0.0'; // the addon is compatible with this core version and later   
    /**
     * The base64 encoded addon image used in the addons store listing
     */     

diff --git a/catalog/addons/Cash_On_Delivery/modules/payment/cod.php b/catalog/addons/Cash_On_Delivery/modules/payment/cod.php
@@ -2,7 +2,7 @@
 /**
   @package    catalog::addons::payment
   @author     Loaded Commerce
-  @copyright  Copyright 2003-2014 Loaded Commerce, LLC
+  @copyright  Copyright 2003-2014 Loaded Commerce
   @copyright  Portions Copyright 2003 osCommerce
   @license    https://github.com/loadedcommerce/loaded7/blob/master/LICENSE.txt
   @version    $Id: cod.php v1.0 2013-08-08 datazen $

diff --git a/catalog/addons/Free_Shipping/controller.php b/catalog/addons/Free_Shipping/controller.php
@@ -2,7 +2,7 @@
 /**
   @package    catalog::addons
   @author     Loaded Commerce
-  @copyright  Copyright 2003-2014 Loaded Commerce, LLC
+  @copyright  Copyright 2003-2014 Loaded Commerce
   @copyright  Portions Copyright 2003 osCommerce
   @license    https://github.com/loadedcommerce/loaded7/blob/master/LICENSE.txt
   @version    $Id: controller.php v1.0 2013-08-08 datazen $
@@ -41,11 +41,11 @@ public function Free_Shipping() {
    /**
     * The addon version
     */     
-    $this->_version = '1.0.0';
+    $this->_version = '1.0.1';
    /**
     * The Loaded 7 core compatibility version
     */     
-    $this->_compatibility = '7.0.0.4.1'; // the addon is compatible with this core version and later   
+    $this->_compatibility = '7.002.0.0'; // the addon is compatible with this core version and later   
    /**
     * The addon image used in the addons store listing
     */     
@@ -54,7 +54,7 @@ public function Free_Shipping() {
     * The addon enable/disable switch
     */    
     $this->_enabled = (defined('ADDONS_SHIPPING_' . strtoupper($this->_code) . '_STATUS') && @constant('ADDONS_SHIPPING_' . strtoupper($this->_code) . '_STATUS') == '1') ? true : false;
-    $this->_rating = '4';      
+    $this->_rating = '3';      
   }
  /**
   * Checks to see if the addon has been installed

diff --git a/catalog/addons/Free_Shipping/modules/shipping/free.php b/catalog/addons/Free_Shipping/modules/shipping/free.php
@@ -2,7 +2,7 @@
 /**
   @package    catalog::addons::payment
   @author     Loaded Commerce
-  @copyright  Copyright 2003-2014 Loaded Commerce, LLC
+  @copyright  Copyright 2003-2014 Loaded Commerce
   @copyright  Portions Copyright 2003 osCommerce
   @license    https://github.com/loadedcommerce/loaded7/blob/master/LICENSE.txt
   @version    $Id: controller.php v1.0 2013-08-08 datazen $

diff --git a/catalog/admin/external/vqmod/vqmod.php b/catalog/admin/external/vqmod/vqmod.php
@@ -310,12 +310,12 @@ private function _parseMods() {
     foreach($this->_modFileList as $modFileKey => $modFile) {
       if(file_exists($modFile)) {
 
-        if (function_exists('ioncube_read_file')) {
-           $xml = ioncube_read_file($modFile);
-           if (is_int($xml)) $xml = false;
-        } else {
+//        if (function_exists('ioncube_read_file')) {
+//           $xml = ioncube_read_file($modFile);
+//           if (is_int($xml)) $xml = false;
+//        } else {
           $xml = file_get_contents($modFile);
-        }        
+//        }        
 
         if(@$dom->loadXML($xml)) {
           $mod = $dom->getElementsByTagName('modification')->item(0);

diff --git a/catalog/admin/includes/application_top.php b/catalog/admin/includes/application_top.php
@@ -16,13 +16,13 @@
 
 // set the level of error reporting to E_ALL
 error_reporting(E_ALL & ~E_STRICT & ~E_NOTICE);
-ini_set("display_errors", 1);
+//ini_set("display_errors", 1);
 ini_set('log_errors', true);
 ini_set('error_log', DIR_FS_WORK . 'php_errors.log');
 
 // added for missing date.timezone in global php.ini
 if (!ini_get('date.timezone') && function_exists(date_default_timezone_set)) {
-   date_default_timezone_set('GMT');
+  date_default_timezone_set('GMT');
 }
 
 // virtual hook system
@@ -36,6 +36,7 @@
 } else {
   define('DIR_WS_CATALOG', DIR_WS_HTTPS_CATALOG);
 }
+define('API_VERSION', '1_0');
 
 if (!defined('DIR_WS_ADMIN')) define('DIR_WS_ADMIN', 'admin/');
 if (!defined('DIR_FS_ADMIN')) define('DIR_FS_ADMIN', DIR_FS_CATALOG . 'admin/');
@@ -166,6 +167,9 @@
 require('../includes/classes/BarcodeQR.php');
 $BarcodeQR = new BarcodeQR();
 
+/**
+ * TO DO: MAKE THESE LOAD DYNAMICALLY
+ */
 // templates general class
 require($lC_Vqmod->modCheck('templates/default/classes/general.php'));
 

diff --git a/catalog/admin/includes/applications/administrators/classes/administrators.php b/catalog/admin/includes/applications/administrators/classes/administrators.php
@@ -157,21 +157,23 @@ public static function save($id = null, $data) {
       if ( !$lC_Database->isError() ) {
         if ( !is_numeric($id) ) {
           $id = $lC_Database->nextID();
+          $new = 1;
         }
       } else {
-die($lC_Database->getError());        
         $error = true;
       }
 
-      if ( $error === false ) {
+      if ( $error === false  ) {
         $lC_Database->commitTransaction();
-        // check for language changes and set session accordingly
-        if ($data['language_id'] != $Qcheck->value('language_id')) {
-          $_SESSION['admin']['language_id'] = $data['language_id'];
+        if (!$new) {
+          // check for language changes and set session accordingly
+          if ($data['language_id'] != $Qcheck->value('language_id')) {
+            $_SESSION['admin']['language_id'] = $data['language_id'];
+          }
+          $_SESSION['admin']['username'] = $data['user_name'];
+          $_SESSION['admin']['firstname'] = $data['first_name'];
+          $_SESSION['admin']['lastname'] = $data['last_name'];
         }
-        $_SESSION['admin']['username'] = $data['user_name'];
-        $_SESSION['admin']['firstname'] = $data['first_name'];
-        $_SESSION['admin']['lastname'] = $data['last_name'];
       } else {
         $lC_Database->rollbackTransaction();
         $result['rpcStatus'] = -1;

diff --git a/catalog/admin/includes/applications/administrators/classes/rpc.php b/catalog/admin/includes/applications/administrators/classes/rpc.php
@@ -10,7 +10,7 @@
 */
 global $lC_Vqmod;
 
-require($lC_Vqmod->modCheck('includes/applications/administrators/classes/administrators.php'));
+require_once($lC_Vqmod->modCheck('includes/applications/administrators/classes/administrators.php'));
 require_once($lC_Vqmod->modCheck('includes/applications/languages/classes/languages.php'));
 
 class lC_Administrators_Admin_rpc {
@@ -142,8 +142,9 @@ public static function deleteGroup() {
   */
   public static function validatePassword() {
     $result = array();
-
-    $result = lC_Administrators_Admin::validatePassword($_GET['plain'], $_GET['encrypted']);
+    if (lc_validate_password($_GET['plain'], $_GET['encrypted'])) {
+      $result['rpcStatus'] = RPC_STATUS_SUCCESS; 
+    };
 
     echo json_encode($result);
   }

diff --git a/catalog/admin/includes/applications/banner_manager/classes/banner_manager.php b/catalog/admin/includes/applications/banner_manager/classes/banner_manager.php
@@ -38,11 +38,15 @@ public static function getAll() {
       $group = '<td>' . $Qbanners->valueProtected('banners_group') . '</td>';
       $stats = '<td>' . $Qstats->valueInt('banners_shown') . ' / ' . $Qstats->valueInt('banners_clicked') . '</td>';
 
-      $action = '<td class="align-right vertical-center"><span class="button-group compact">
-                   <a href="' . ((int)($_SESSION['admin']['access'][$_module] < 3) ? '#' : 'javascript://" onclick="editBanner(\'' . $Qbanners->valueInt('banners_id') . '\')') . '" class="button icon-pencil' . ((int)($_SESSION['admin']['access'][$_module] < 3) ? ' disabled' : NULL) . '">' . (($media === 'mobile-portrait' || $media === 'mobile-landscape') ? NULL : $lC_Language->get('icon_edit')) . '</a>
-                   <a href="' . ((int)($_SESSION['admin']['access'][$_module] < 2) ? '#' : 'javascript://" onclick="showStats(\'' . $Qbanners->valueInt('banners_id') . '\', \'' . urlencode($Qbanners->value('banners_title')) . '\')') . '" class="button icon-list with-tooltip' . ((int)($_SESSION['admin']['access'][$_module] < 2) ? ' disabled' : NULL) . '" title="' . $lC_Language->get('icon_statistics') . '"></a>
-                   <a href="' . ((int)($_SESSION['admin']['access'][$_module] < 4) ? '#' : 'javascript://" onclick="deleteBanner(\'' . $Qbanners->valueInt('banners_id') . '\', \'' . urlencode($Qbanners->value('banners_title')) . '\')') . '" class="button icon-trash with-tooltip' . ((int)($_SESSION['admin']['access'][$_module] < 4) ? ' disabled' : NULL) . '" title="' . $lC_Language->get('icon_delete') . '"></a>
-                 </span></td>';
+      $action = '<td class="align-right vertical-center">
+                   <span class="button-group">
+                     <a href="' . ((int)($_SESSION['admin']['access'][$_module] < 3) ? '#' : 'javascript://" onclick="editBanner(\'' . $Qbanners->valueInt('banners_id') . '\')') . '" class="button icon-pencil' . ((int)($_SESSION['admin']['access'][$_module] < 3) ? ' disabled' : NULL) . '">' . (($media === 'mobile-portrait' || $media === 'mobile-landscape') ? NULL : $lC_Language->get('icon_edit')) . '</a>
+                     <a href="' . ((int)($_SESSION['admin']['access'][$_module] < 2) ? '#' : 'javascript://" onclick="showStats(\'' . $Qbanners->valueInt('banners_id') . '\', \'' . urlencode($Qbanners->value('banners_title')) . '\')') . '" class="button icon-list with-tooltip' . ((int)($_SESSION['admin']['access'][$_module] < 2) ? ' disabled' : NULL) . '" title="' . $lC_Language->get('icon_statistics') . '"></a>
+                   </span>
+                   <span class="button-group">
+                     <a href="' . ((int)($_SESSION['admin']['access'][$_module] < 4) ? '#' : 'javascript://" onclick="deleteBanner(\'' . $Qbanners->valueInt('banners_id') . '\', \'' . urlencode($Qbanners->value('banners_title')) . '\')') . '" class="button icon-trash with-tooltip' . ((int)($_SESSION['admin']['access'][$_module] < 4) ? ' disabled' : NULL) . '" title="' . $lC_Language->get('icon_delete') . '"></a>
+                   </span>
+                 </td>';
 
       $result['aaData'][] = array("$check", "$banners", "$group", "$stats", "$action");
       $result['entries'][] = $Qbanners->toArray();

diff --git a/catalog/admin/includes/applications/branding_manager/branding_manager.php b/catalog/admin/includes/applications/branding_manager/branding_manager.php
@@ -7,32 +7,32 @@
   @copyright  Template built on Developr theme by DisplayInline http://themeforest.net/user/displayinline under Extended license 
   @license    https://github.com/loadedcommerce/loaded7/blob/master/LICENSE.txt
   @version    $Id: branding_manager.php v1.0 2013-08-08 datazen $
-*/
+*/ 
 require('includes/applications/branding_manager/classes/branding_manager.php');
 
 class lC_Application_Branding_manager extends lC_Template_Admin {
-  /*
+ /*
   * Protected variables
   */
   protected $_module = 'branding_manager',
-  $_page_title,
-  $_page_contents = 'edit.php';
-  /*
+            $_page_title,
+            $_page_contents = 'main.php';
+
+ /*
   * Class constructor
   */
-  public function __construct() {
+  function __construct() {
     global $lC_Language;
 
     $this->_page_title = $lC_Language->get('heading_title');
 
-    if ( !isset($_GET['action']) ) {
+    if (!isset($_GET['action'])) {
       $_GET['action'] = '';
     }
 
+    if (!empty($_GET['action']) && !($_SESSION['error'])) {
 
-    if ( !empty($_GET['action']) && !($_SESSION['error']) ) {
-
-      switch ( $_GET['action'] ) {
+      switch ($_GET['action']) {
         case 'save':
           $branding_image                = $_POST['branding_manager_logo'];
           $branding_name                 = $_POST['branding_name'];
@@ -59,38 +59,36 @@ public function __construct() {
           $branding_footer_text          = $_POST['branding_footer_text'];
           $branding_home_page_text       = $_POST['branding_home_page_text'];
 
-          $data = array('site_image' => $branding_image,
-            'name'                 => $branding_name,
-            'slogan'               => $branding_slogan,
-            'chat_code'            => $branding_chat_code,
-            'address'              => $branding_address,
-            'support_phone'        => $branding_support_phone,
-            'support_email'        => $branding_support_email,
-            'sales_phone'          => $branding_sales_phone,
-            'sales_email'          => $branding_sales_email,
-            'meta_description'     => $branding_meta_description,
-            'meta_keywords'        => $branding_meta_keywords,
-            'og_image'             => $branding_graph_site_thumbnail,
-            'meta_title'           => $branding_meta_title,
-            'meta_title_prefix'    => $branding_meta_title_prefix,
-            'meta_title_suffix'    => $branding_meta_title_suffix,
-            'meta_delimeter'       => $branding_meta_title_delimeter,
-            'social_facebook_page' => $branding_social_fb_page,
-            'social_twitter'       => $branding_social_twitter,
-            'social_pinterest'     => $branding_social_pinterest,
-            'social_google_plus'   => $branding_social_google_plus,
-            'social_youtube'       => $branding_social_youtube,
-            'social_linkedin'      => $branding_social_linkedin,
-            'footer_text'          => $branding_footer_text,
-            'home_page_text'       => $branding_home_page_text
-
-          );
+          $data = array('site_image'           => $branding_image,
+                        'name'                 => $branding_name,
+                        'slogan'               => $branding_slogan,
+                        'chat_code'            => $branding_chat_code,
+                        'address'              => $branding_address,
+                        'support_phone'        => $branding_support_phone,
+                        'support_email'        => $branding_support_email,
+                        'sales_phone'          => $branding_sales_phone,
+                        'sales_email'          => $branding_sales_email,
+                        'meta_description'     => $branding_meta_description,
+                        'meta_keywords'        => $branding_meta_keywords,
+                        'og_image'             => $branding_graph_site_thumbnail,
+                        'meta_title'           => $branding_meta_title,
+                        'meta_title_prefix'    => $branding_meta_title_prefix,
+                        'meta_title_suffix'    => $branding_meta_title_suffix,
+                        'meta_delimeter'       => $branding_meta_title_delimeter,
+                        'social_facebook_page' => $branding_social_fb_page,
+                        'social_twitter'       => $branding_social_twitter,
+                        'social_pinterest'     => $branding_social_pinterest,
+                        'social_google_plus'   => $branding_social_google_plus,
+                        'social_youtube'       => $branding_social_youtube,
+                        'social_linkedin'      => $branding_social_linkedin,
+                        'footer_text'          => $branding_footer_text,
+                        'home_page_text'       => $branding_home_page_text
+                        );
 
-          /*
-          * Save the banner information
+         /*
+          * Save the Branding information
           *
-          * @param integer $_GET['bid'] The banner id
-          * @param array $data The banner information
+          * @param array $data The Branding information
           * @access public
           * @return boolean
           */