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

loadedcommerce · Dec 10, 2013 · 5b48110 · 5b48110
2 parents a152d53 + 6daeddc
commit 5b48110
Show file tree

Hide file tree

Showing 15 changed files with 148 additions and 124 deletions.
diff --git a/catalog/admin/includes/applications/login/pages/main.php b/catalog/admin/includes/applications/login/pages/main.php
@@ -195,7 +195,14 @@ function (data) {
   /*
   * Get Pro
   */
-  $('#activation_serial').keyup(function(event) {
+  $('#activation_serial').bind('paste', function(e){ 
+    // Short pause to wait for paste to complete
+    setTimeout( function() { _checkSerial(); }, 100);
+  })
+
+  $('#activation_serial').keyup(function(e) { _checkSerial(); });  
+
+  function _checkSerial() {
     var serial = $('#activation_serial').val();
     var format = /[A-Z0-9]{4}-[A-Z0-9]{4}-[A-Z0-9]{4}-[A-Z0-9]{4}-[A-Z0-9]{4}/;
     var found = serial.match(format);
@@ -217,7 +224,7 @@ function (data) {
       $('#activate-pro').removeClass('disabled');
       return true;
     }
-  });  
+  }
 
   /*
   * Register

diff --git a/catalog/admin/includes/applications/store/pages/main.php b/catalog/admin/includes/applications/store/pages/main.php
@@ -32,7 +32,7 @@
 <?php
 $typesArr = lC_Store_Admin::getAllTypes();
 foreach ($typesArr as $key => $value) {
-  echo ".store-menu-" . strtolower($value['text']) . " { background-size:16px 16px !important; background: url('templates/default/img/icons/16/" . $value['icon'] . "') no-repeat scroll 8px 15px transparent !important; }";
+  echo ".store-menu-" . strtolower(str_replace(' ', '-', $value['text'])) . " { background-size:16px 16px !important; background: url('templates/default/img/icons/16/" . $value['icon'] . "') no-repeat scroll 8px 15px transparent !important; }";
 }
 ?>   
 </style>

diff --git a/catalog/admin/includes/modules/services/seo.php b/catalog/admin/includes/modules/services/seo.php
@@ -39,7 +39,12 @@ public function install() {
 
     if ($exists == false) {
       $file = file_get_contents(DIR_FS_CATALOG . 'dot.htaccess');
-      $file = str_replace('RewriteBase /', 'RewriteBase ' . DIR_WS_HTTP_CATALOG, $file);
+      $lines = explode(PHP_EOL, $file);
+      foreach ($lines as $line) {
+        if (strpos($line, 'RewriteBase /')) {
+          $file = str_replace($line, '  RewriteBase ' . DIR_WS_HTTP_CATALOG, $file);
+        }
+      }
       file_put_contents(DIR_FS_CATALOG . 'dot.htaccess', $file);
       if (rename(DIR_FS_CATALOG . 'dot.htaccess', DIR_FS_CATALOG . '.htaccess')) {
       } else {
@@ -49,7 +54,7 @@ public function install() {
       return false;
     }
 
-    $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, use_public function, set_public function, date_added) VALUES ('Add Category Parent Permalinks?', 'SERVICE_SEO_URL_ADD_CATEGORY_PARENT', '-1', 'Add each parent permalink to the url structure as you drill down into categories and products?', '6', '0', 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))', now())");
+    $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, use_function, set_function, date_added) VALUES ('Add Category Parent Permalinks?', 'SERVICE_SEO_URL_ADD_CATEGORY_PARENT', '-1', 'Add each parent permalink to the url structure as you drill down into categories and products?', '6', '0', 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))', now())");
 
     lC_Cache::clear('category_tree');
     lC_Cache::clear('templates');

diff --git a/catalog/admin/templates/default/css/styles/jquery.loadmask.css b/catalog/admin/templates/default/css/styles/jquery.loadmask.css
@@ -1,45 +1,45 @@
 .loadmask {
-    z-index: 1000000;
-    position: absolute;
-    top:0;
-    left:0;
-    -moz-opacity: 0.5;
-    opacity: .50;
-    filter: alpha(opacity=50);
-    background-color: #333;
-    width: 100%;
-    height: 250%;
-    zoom: 1;
+  z-index: 1000000;
+  position: absolute;
+  top:0;
+  left:0;
+  -moz-opacity: 0.5;
+  opacity: .50;
+  filter: alpha(opacity=50);
+  background-color: #333;
+  width: 100%;
+  height: 250%;
+  zoom: 1;
 }
 .loadmask-msg {
-    z-index: 1100000;
-    position: absolute;
-    top: 0;
-    left: 0;
-    border:1px solid #6593cf;
-    background: #c3daf9;
-    padding:2px;
-    -moz-border-radius: 15px;
-    border-radius: 15px;
+  z-index: 1100000;
+  position: absolute;
+  top: 0;
+  left: 0;
+  border:1px solid #6593cf;
+  background: #c3daf9;
+  padding:2px;
+  -moz-border-radius: 15px;
+  border-radius: 15px;
 }
 .loadmask-msg div {
-    padding:6px 8px 5px 8px;
-    /* background: #fbfbfb url('../../img/loading.gif') no-repeat 5px 5px; */
-    background: #fbfbfb;
-    line-height: 16px;
-	  border:1px solid #a3bad9;
-    color:#222;
-    font:normal 11px tahoma, arial, helvetica, sans-serif;
-    cursor:wait;
-    -moz-border-radius: 15px;
-    border-radius: 15px;
+  padding:6px 8px 5px 8px;
+  /* background: #fbfbfb url('../../img/loading.gif') no-repeat 5px 5px; */
+  background: #fbfbfb;
+  line-height: 16px;
+  border:1px solid #a3bad9;
+  color:#222;
+  font:normal 11px tahoma, arial, helvetica, sans-serif;
+  cursor:wait;
+  -moz-border-radius: 15px;
+  border-radius: 15px;
 }
 .masked {
-   /* overflow: hidden !important; */
+  /* overflow: hidden !important; */
 }
 .masked-relative {
-    position: relative !important;
+  position: relative !important;
 }
 .masked-hidden {
-    visibility: hidden !important;
+  visibility: hidden !important;
 }
diff --git a/catalog/admin/templates/default/header.php b/catalog/admin/templates/default/header.php
@@ -13,7 +13,11 @@
 <header role="banner" id="title-bar">
   <div class="relative">
     <a id="logoRef" style="" href="<?php echo lc_href_link_admin(FILENAME_DEFAULT); ?>"><img id="logoImg" src="./templates/default/img/logo.png" border="0"></a>
-    <!-- VQMOD1 -->
+    <?php 
+    if (utility::isPro() === true) {
+      echo '<span style="vertical-align:50%;"><span class="tag red-gradient glossy" style="padding-top:2px; font-size:1.0em;">PRO</span></span>';
+    }
+    ?>
   </div>
 </header>
 <?php

diff --git a/catalog/includes/classes/database.php b/catalog/includes/classes/database.php
@@ -121,8 +121,11 @@ public function setDebug($boolean) {
 
   public function file_get_contents_utf8($fn) {
     $content = file_get_contents($fn);
-    return mb_convert_encoding($content, 'UTF-8',
-      mb_detect_encoding($content, 'UTF-8, ISO-8859-1', true));
+    if (extension_loaded('mbstring')) {
+      return mb_convert_encoding($content, 'UTF-8',
+        mb_detect_encoding($content, 'UTF-8, ISO-8859-1', true));
+    }
+    return $content;
   }    
 
   public function importSQL($sql_file, $database, $table_prefix = -1) {

diff --git a/catalog/includes/javascript/general.js.php b/catalog/includes/javascript/general.js.php
@@ -11,7 +11,7 @@
 ?>
 <script>
 $(document).ready(function() {
-
+  
   function setMaintenanceMode(s) {
     if (s == 'on') {
       $("body").mask('<span style="font-size:2em !important;"><?php echo $lC_Language->get('update_message_text1'); ?></span>');
@@ -28,7 +28,7 @@ function setMaintenanceMode(s) {
   } else {
     setMaintenanceMode('off');
   }
-  
+
   var showDebug = '<?php echo $lC_Template->showDebugMessages(); ?>';
   if (showDebug) {
     var debugOutput = <?php echo (isset($_SESSION['debugStack']) && !empty($_SESSION['debugStack'])) ? $_SESSION['debugStack'] : "''" ?>;

diff --git a/catalog/includes/languages/en_US.xml b/catalog/includes/languages/en_US.xml
@@ -2651,8 +2651,8 @@ Your friend, %s, thought that you would be interested in %s from %s.]]></value>
       <group>general</group>
     </definition> 
     <definition>
-      <key>update_message_text1</key>
-      <value><![CDATA[Please pardon our dust.  The store is temporarily offline for routine maintenance.  Please check back soon!]]></value>
+      <key>text_site_maintenance_message</key>
+      <value><![CDATA[Please pardon our dust.  The store is temporarily offline for routine maintenance.  Check back soon!]]></value>
       <group>general</group>
     </definition> 
     <definition>

diff --git a/catalog/install/loadedcommerce.sql b/catalog/install/loadedcommerce.sql
@@ -6104,11 +6104,11 @@ INSERT INTO lc_categories (categories_id, categories_image, parent_id, sort_orde
 INSERT INTO lc_categories (categories_id, categories_image, parent_id, sort_order, categories_mode, categories_link_target, categories_custom_url, categories_status, categories_visibility_nav, categories_visibility_box, date_added, last_modified) VALUES(4, 'privacy.jpg', 2, 20, 'page', 0, '', 1, 0, 1, '0000-00-00 00:00:00', NULL);
 INSERT INTO lc_categories (categories_id, categories_image, parent_id, sort_order, categories_mode, categories_link_target, categories_custom_url, categories_status, categories_visibility_nav, categories_visibility_box, date_added, last_modified) VALUES(5, 'terms.png', 2, 30, 'page', 0, '', 1, 0, 1, '0000-00-00 00:00:00', NULL);
 
-INSERT INTO lc_categories_description (categories_id, language_id, categories_name, categories_menu_name, categories_blurb, categories_description, categories_tags) VALUES(1, 1, 'Products', 'Products', 'Products Blurb', '<p>Products Content</p>', 'products, tags');
-INSERT INTO lc_categories_description (categories_id, language_id, categories_name, categories_menu_name, categories_blurb, categories_description, categories_tags) VALUES(2, 1, 'Information', 'Information', 'Information Blurb', '<p>Information Content</p>', 'information, tags');
-INSERT INTO lc_categories_description (categories_id, language_id, categories_name, categories_menu_name, categories_blurb, categories_description, categories_tags) VALUES(3, 1, 'Shipping & Returns', 'Shipping & Returns', 'Shipping & Returns Blurb', '<p>Shipping & Returns Content</p>', 'shipping, returns, tags'); 
-INSERT INTO lc_categories_description (categories_id, language_id, categories_name, categories_menu_name, categories_blurb, categories_description, categories_tags) VALUES(4, 1, 'Privacy Policy', 'Privacy Policy', 'Privacy Policy Blurb', '<p>Privacy Policy Content</p>', 'privacy, policy, tags');
-INSERT INTO lc_categories_description (categories_id, language_id, categories_name, categories_menu_name, categories_blurb, categories_description, categories_tags) VALUES(5, 1, 'Terms & Conditions', 'Terms & Conditions', 'Terms & Conditions Blurb', '<p>Terms & Conditions Content</p>', 'terms, conditions, tags');
+INSERT INTO lc_categories_description (categories_id, language_id, categories_name, categories_menu_name, categories_blurb, categories_description, categories_keyword, categories_tags) VALUES(1, 1, 'Products', 'Products', 'Products Blurb', '<p>Products Content</p>', 'products', 'tags');
+INSERT INTO lc_categories_description (categories_id, language_id, categories_name, categories_menu_name, categories_blurb, categories_description, categories_keyword, categories_tags) VALUES(2, 1, 'Information', 'Information', 'Information Blurb', '<p>Information Content</p>', 'information', 'tags');
+INSERT INTO lc_categories_description (categories_id, language_id, categories_name, categories_menu_name, categories_blurb, categories_description, categories_keyword, categories_tags) VALUES(3, 1, 'Shipping & Returns', 'Shipping & Returns', 'Shipping & Returns Blurb', '<p>Shipping & Returns Content</p>', 'shipping returns', 'tags'); 
+INSERT INTO lc_categories_description (categories_id, language_id, categories_name, categories_menu_name, categories_blurb, categories_description, categories_keyword, categories_tags) VALUES(4, 1, 'Privacy Policy', 'Privacy Policy', 'Privacy Policy Blurb', '<p>Privacy Policy Content</p>', 'privacy, policy', 'tags');
+INSERT INTO lc_categories_description (categories_id, language_id, categories_name, categories_menu_name, categories_blurb, categories_description, categories_keyword, categories_tags) VALUES(5, 1, 'Terms & Conditions', 'Terms & Conditions', 'Terms & Conditions Blurb', '<p>Terms & Conditions Content</p>', 'terms conditions', 'tags');
 
 INSERT INTO lc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Enable AddOn', 'ADDONS_PAYMENT_CASH_ON_DELIVERY_STATUS', '1', 'Do you want to enable this addon?', 6, 0, NULL, '2013-08-28 10:46:22', 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))');
 INSERT INTO lc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Payment Zone', 'ADDONS_PAYMENT_CASH_ON_DELIVERY_ZONE', '0', 'If a zone is selected, only enable this payment method for that zone.', 6, 0, NULL, '2013-08-28 10:46:22', 'lc_cfg_use_get_zone_class_title', 'lc_cfg_set_zone_classes_pull_down_menu');
@@ -6174,7 +6174,7 @@ INSERT INTO lc_tax_class VALUES (1, 'Taxable Goods', 'The following types of pro
 # USA/Florida
 INSERT INTO lc_tax_rates VALUES (1, 1, 1, 1, 7.0, 'FL TAX 7.0%', now(), now());
 INSERT INTO lc_geo_zones (geo_zone_id, geo_zone_name, geo_zone_description, date_added) VALUES (1, "Florida", "Florida local sales tax zone", now());
-INSERT INTO lc_zones_to_geo_zones (association_id, zone_country_id, zone_id, geo_zone_id, date_added) VALUES (1, 223, 4031, 1, now());
+INSERT INTO lc_zones_to_geo_zones (association_id, zone_country_id, zone_id, geo_zone_id, date_added) VALUES (1, 223, 4032, 1, now());
 
 INSERT INTO lc_templates (id, title, code, author_name, author_www, markup_version, css_based, `medium`) VALUES(1, 'Loaded Commerce Bootstrap 3.0 Core Template', 'core', 'Loaded Commerce', 'http://www.loadedcommerce.com', 'HTML 5.0', 1, 'Screen');
 

diff --git a/catalog/install/loadedcommerce_innodb.sql b/catalog/install/loadedcommerce_innodb.sql
@@ -6104,11 +6104,11 @@ INSERT INTO lc_categories (categories_id, categories_image, parent_id, sort_orde
 INSERT INTO lc_categories (categories_id, categories_image, parent_id, sort_order, categories_mode, categories_link_target, categories_custom_url, categories_status, categories_visibility_nav, categories_visibility_box, date_added, last_modified) VALUES(4, 'privacy.jpg', 2, 20, 'page', 0, '', 1, 0, 1, '0000-00-00 00:00:00', NULL);
 INSERT INTO lc_categories (categories_id, categories_image, parent_id, sort_order, categories_mode, categories_link_target, categories_custom_url, categories_status, categories_visibility_nav, categories_visibility_box, date_added, last_modified) VALUES(5, 'terms.png', 2, 30, 'page', 0, '', 1, 0, 1, '0000-00-00 00:00:00', NULL);
 
-INSERT INTO lc_categories_description (categories_id, language_id, categories_name, categories_menu_name, categories_blurb, categories_description, categories_tags) VALUES(1, 1, 'Products', 'Products', 'Products Blurb', '<p>Products Content</p>', 'products, tags');
-INSERT INTO lc_categories_description (categories_id, language_id, categories_name, categories_menu_name, categories_blurb, categories_description, categories_tags) VALUES(2, 1, 'Information', 'Information', 'Information Blurb', '<p>Information Content</p>', 'information, tags');
-INSERT INTO lc_categories_description (categories_id, language_id, categories_name, categories_menu_name, categories_blurb, categories_description, categories_tags) VALUES(3, 1, 'Shipping & Returns', 'Shipping & Returns', 'Shipping & Returns Blurb', '<p>Shipping & Returns Content</p>', 'shipping, returns, tags'); 
-INSERT INTO lc_categories_description (categories_id, language_id, categories_name, categories_menu_name, categories_blurb, categories_description, categories_tags) VALUES(4, 1, 'Privacy Policy', 'Privacy Policy', 'Privacy Policy Blurb', '<p>Privacy Policy Content</p>', 'privacy, policy, tags');
-INSERT INTO lc_categories_description (categories_id, language_id, categories_name, categories_menu_name, categories_blurb, categories_description, categories_tags) VALUES(5, 1, 'Terms & Conditions', 'Terms & Conditions', 'Terms & Conditions Blurb', '<p>Terms & Conditions Content</p>', 'terms, conditions, tags');
+INSERT INTO lc_categories_description (categories_id, language_id, categories_name, categories_menu_name, categories_blurb, categories_description, categories_keyword, categories_tags) VALUES(1, 1, 'Products', 'Products', 'Products Blurb', '<p>Products Content</p>', 'products', 'tags');
+INSERT INTO lc_categories_description (categories_id, language_id, categories_name, categories_menu_name, categories_blurb, categories_description, categories_keyword, categories_tags) VALUES(2, 1, 'Information', 'Information', 'Information Blurb', '<p>Information Content</p>', 'information', 'tags');
+INSERT INTO lc_categories_description (categories_id, language_id, categories_name, categories_menu_name, categories_blurb, categories_description, categories_keyword, categories_tags) VALUES(3, 1, 'Shipping & Returns', 'Shipping & Returns', 'Shipping & Returns Blurb', '<p>Shipping & Returns Content</p>', 'shipping returns', 'tags'); 
+INSERT INTO lc_categories_description (categories_id, language_id, categories_name, categories_menu_name, categories_blurb, categories_description, categories_keyword, categories_tags) VALUES(4, 1, 'Privacy Policy', 'Privacy Policy', 'Privacy Policy Blurb', '<p>Privacy Policy Content</p>', 'privacy, policy', 'tags');
+INSERT INTO lc_categories_description (categories_id, language_id, categories_name, categories_menu_name, categories_blurb, categories_description, categories_keyword, categories_tags) VALUES(5, 1, 'Terms & Conditions', 'Terms & Conditions', 'Terms & Conditions Blurb', '<p>Terms & Conditions Content</p>', 'terms conditions', 'tags');
 
 INSERT INTO lc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Enable AddOn', 'ADDONS_PAYMENT_CASH_ON_DELIVERY_STATUS', '1', 'Do you want to enable this addon?', 6, 0, NULL, '2013-08-28 10:46:22', 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))');
 INSERT INTO lc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Payment Zone', 'ADDONS_PAYMENT_CASH_ON_DELIVERY_ZONE', '0', 'If a zone is selected, only enable this payment method for that zone.', 6, 0, NULL, '2013-08-28 10:46:22', 'lc_cfg_use_get_zone_class_title', 'lc_cfg_set_zone_classes_pull_down_menu');
@@ -6174,7 +6174,7 @@ INSERT INTO lc_tax_class VALUES (1, 'Taxable Goods', 'The following types of pro
 # USA/Florida
 INSERT INTO lc_tax_rates VALUES (1, 1, 1, 1, 7.0, 'FL TAX 7.0%', now(), now());
 INSERT INTO lc_geo_zones (geo_zone_id, geo_zone_name, geo_zone_description, date_added) VALUES (1, "Florida", "Florida local sales tax zone", now());
-INSERT INTO lc_zones_to_geo_zones (association_id, zone_country_id, zone_id, geo_zone_id, date_added) VALUES (1, 223, 4031, 1, now());
+INSERT INTO lc_zones_to_geo_zones (association_id, zone_country_id, zone_id, geo_zone_id, date_added) VALUES (1, 223, 4032, 1, now());
 
 INSERT INTO lc_templates (id, title, code, author_name, author_www, markup_version, css_based, `medium`) VALUES(1, 'Loaded Commerce Bootstrap 3.0 Core Template', 'core', 'Loaded Commerce', 'http://www.loadedcommerce.com', 'HTML 5.0', 1, 'Screen');