From 37130dd53caae3190bbc337dfe9863c618f582c0 Mon Sep 17 00:00:00 2001
From: aFolletete <alain.folletete@prestashop.com>
Date: Mon, 25 Apr 2011 12:07:31 +0000
Subject: [PATCH] // merge

---
 admin-dev/tabs/AdminCMSCategories.php | 2 +-
 admin-dev/tabs/AdminCMSContent.php    | 4 ++--
 admin-dev/tabs/AdminEmployees.php     | 9 +--------
 admin-dev/tabs/AdminHome.php          | 6 +++---
 4 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/admin-dev/tabs/AdminCMSCategories.php b/admin-dev/tabs/AdminCMSCategories.php
index 627183c4f..fc4d96676 100644
--- a/admin-dev/tabs/AdminCMSCategories.php
+++ b/admin-dev/tabs/AdminCMSCategories.php
@@ -109,7 +109,7 @@ class AdminCMSCategories extends AdminTab
 			}
 		}
 		/* Change object statuts (active, inactive) */
-		elseif (isset($_GET['status']) AND Tools::getValue($this->identifier))
+		elseif (isset($_GET['statuscms_category']) AND Tools::getValue($this->identifier))
 		{
 			if ($this->tabAccess['edit'] === '1')
 			{
diff --git a/admin-dev/tabs/AdminCMSContent.php b/admin-dev/tabs/AdminCMSContent.php
index 6188d3d10..4335261f2 100644
--- a/admin-dev/tabs/AdminCMSContent.php
+++ b/admin-dev/tabs/AdminCMSContent.php
@@ -75,9 +75,9 @@ class AdminCMSContent extends AdminTab
 
 	public function postProcess()
 	{
-		if (Tools::isSubmit('submitDelcms') OR Tools::isSubmit('previewSubmitAddcmsAndPreview') OR Tools::isSubmit('submitAddcms') OR isset($_GET['deletecms']) OR Tools::isSubmit('viewcms') OR (Tools::isSubmit('status') AND Tools::isSubmit('id_cms')) OR (Tools::isSubmit('position') AND !Tools::isSubmit('id_cms_category_to_move')))
+		if (Tools::isSubmit('submitDelcms') OR Tools::isSubmit('previewSubmitAddcmsAndPreview') OR Tools::isSubmit('submitAddcms') OR isset($_GET['deletecms']) OR Tools::isSubmit('viewcms') OR (Tools::isSubmit('statuscms') AND Tools::isSubmit('id_cms')) OR (Tools::isSubmit('position') AND !Tools::isSubmit('id_cms_category_to_move')))
 			$this->adminCMS->postProcess();
-		if(Tools::isSubmit('submitDelcms_category') OR Tools::isSubmit('submitAddcms_categoryAndBackToParent') OR Tools::isSubmit('submitAddcms_category') OR isset($_GET['deletecms_category']) OR (Tools::isSubmit('status') AND Tools::isSubmit('id_cms_category')) OR (Tools::isSubmit('position') AND Tools::isSubmit('id_cms_category_to_move')))
+		if(Tools::isSubmit('submitDelcms_category') OR Tools::isSubmit('submitAddcms_categoryAndBackToParent') OR Tools::isSubmit('submitAddcms_category') OR isset($_GET['deletecms_category']) OR (Tools::isSubmit('statuscms_category') AND Tools::isSubmit('id_cms_category')) OR (Tools::isSubmit('position') AND Tools::isSubmit('id_cms_category_to_move')))
 			$this->adminCMSCategories->postProcess();
 
 	}
diff --git a/admin-dev/tabs/AdminEmployees.php b/admin-dev/tabs/AdminEmployees.php
index 1ee802898..30f035cb5 100644
--- a/admin-dev/tabs/AdminEmployees.php
+++ b/admin-dev/tabs/AdminEmployees.php
@@ -179,7 +179,7 @@ class AdminEmployees extends AdminTab
 	{
 		global $cookie;
 		
-		if (Tools::isSubmit('deleteemployee') OR Tools::isSubmit('status'))
+		if (Tools::isSubmit('deleteemployee') OR Tools::isSubmit('status') OR Tools::isSubmit('statusemployee'))
 		{
 			if ($cookie->id_employee == Tools::getValue('id_employee'))
 			{
@@ -193,16 +193,9 @@ class AdminEmployees extends AdminTab
 					$this->_errors[] = Tools::displayError('You cannot disable or delete the last administrator account.');
 					return false;
 			}
-
 		}
 		elseif (Tools::isSubmit('submitAddemployee'))
 		{
-			if ($cookie->id_employee == Tools::getValue('id_employee') && Tools::getvalue('active') == 0)
-			{
-				$this->_errors[] = Tools::displayError('You cannot disable or delete the last administrator account.');
-				return false;
-			}
-		
 			$employee = new Employee(Tools::getValue('id_employee'));
 			if (!(int)$this->tabAccess['edit'])
 				$_POST['id_profile'] = $_GET['id_profile'] = $employee->id_profile;
diff --git a/admin-dev/tabs/AdminHome.php b/admin-dev/tabs/AdminHome.php
index 841aadc6b..f4517c5a1 100644
--- a/admin-dev/tabs/AdminHome.php
+++ b/admin-dev/tabs/AdminHome.php
@@ -49,18 +49,18 @@ class AdminHome extends AdminTab
 		
 		$htaccessAfterUpdate = 2;
 		$htaccessOptimized = (Configuration::get('PS_HTACCESS_CACHE_CONTROL') ? 2 : 0);
-		if (!file_exists(dirname(__FILE__).'/../.htaccess'))
+		if (!file_exists(dirname(__FILE__).'/../../.htaccess'))
 		{
 			if (Configuration::get('PS_HTACCESS_CACHE_CONTROL'))
 				$htaccessOptimized = 1;
 		}
 		else
 		{
-			$stat = stat(dirname(__FILE__).'/../.htaccess');
+			$stat = stat(dirname(__FILE__).'/../../.htaccess');
 			$dateUpdHtaccess = Db::getInstance()->getValue('SELECT date_upd FROM '._DB_PREFIX_.'configuration WHERE name = "PS_HTACCESS_CACHE_CONTROL"');
 			if (Configuration::get('PS_HTACCESS_CACHE_CONTROL') AND strtotime($dateUpdHtaccess) > $stat['mtime'])
 				$htaccessOptimized = 1;
-				
+			
 			$dateUpdate = Configuration::get('PS_LAST_SHOP_UPDATE');
 			if ($dateUpdate AND strtotime($dateUpdate) > $stat['mtime'])
 				$htaccessAfterUpdate = 0;