Merge remote branch 'origin/develop' into develop

files/.htaccess

@@ -0,0 +1,3 @@
+# secure directory by disabling script execution
+AddHandler cgi-script .php .pl .py .jsp .asp .htm .shtml .sh .cgi
+Options -ExecCGI

framework/modules/administration/controllers/administrationController.php

@@ -133,9 +133,9 @@ public function install_tables() {
 				}
 			}
 		}
-		ksort($tables);
     	exponent_sessions_clearCurrentUserSessionCache();
-	    assign_to_template(array('status'=>$tables));
+		ksort($tables);
+      assign_to_template(array('status'=>$tables));
 	}
 
     public function manage_unused_tables() {

framework/modules/ecommerce/controllers/storeController.php

@@ -28,11 +28,11 @@ class storeController extends expController {
         'showFullTree'=>'Categories - Show Full Tree',
         'showallSubcategories'=>'Categories - Subcategories of current category',
         'upcoming_events'=>'Event Registration - Upcomming Events',
-		'events_calendar'=>'Event Registration - Calendar View',
+		  'events_calendar'=>'Event Registration - Calendar View',
         'ecom_search'=>'Search - Autocomplete',
         'search_by_model_form'=>'Search - By Model',
         'quicklinks'=>'Links - Users Links',
-		'showall_category_featured_products' => 'Show Featured Products under the current category'
+		  'showall_category_featured_products' => 'Show Featured Products under the current category'
     );
 
     // hide the configs we don't need
@@ -98,7 +98,11 @@ function __construct($src=null,$params=array()) {
                 expSession::set('catid',$default_id);
             }
         } elseif (isset($this->config['show_first_category']) || (!expTheme::inAction() && $section==SITE_DEFAULT_SECTION)) {
-            $default_id = $db->selectValue('storeCategories', 'id', 'lft=1');
+            if (!empty($this->config['show_first_category'])) {
+              $default_id = $db->selectValue('storeCategories', 'id', 'lft=1');
+            } else {
+              $default_id = 0;
+            }
             expSession::set('catid',$default_id);
         } elseif (!isset($this->config['show_first_category']) && !expTheme::inAction()) {
             expSession::set('catid',0);

framework/modules/ecommerce/controllers/taxController.php

@@ -20,8 +20,13 @@
 class taxController extends expController {
     public $basemodel_name = 'taxclass';
 
-    //protected $permissions = array_merge(array("test"=>'Test'), array('copyProduct'=>"Copy Product"));
-    //protected $add_permissions = array();
+    protected $add_permissions = array(
+			'manage_zones'  =>'Manages Zones',
+			'edit_zone'     =>'Add/Edit Zone',
+			'update_zone'   =>'Update Zone',
+			'delete_zone'   =>'Delete Zone'
+		);
+
     public $useractions = null; // keeps it from showing up in available modules to activate
 
     function name() { return $this->displayname(); } //for backwards compat with old modules
@@ -159,16 +164,7 @@ function manage_zones() {
         global $db;
 
         expHistory::set('managable', $this->params);
-
-        $sql = "
-
-            SELECT 
-            *
-            FROM ".DB_TABLE_PREFIX."_tax_zone ORDER BY name ASC;
-
-            ";
-
-        $zones = $db->selectObjectsBySql($sql);
+        $zones = $db->selectObjects('tax_zone', null, 'name');
 
         assign_to_template(array('zones'=>$zones));
     }