From bdabd3f51afa22b6b090c923144e75ca07a565e2 Mon Sep 17 00:00:00 2001
From: Romain Quetiez <romain.quetiez@combodo.com>
Date: Wed, 9 Jun 2010 15:57:28 +0000
Subject: [PATCH] Bulk delete: fixed a regression due to transaction management
 + cosmetics Error management: cope with context data that are not a string

SVN:trunk[450]
---
 core/event.class.inc.php | 14 +++++++++++---
 pages/UI.php             | 29 +++++++++++++----------------
 2 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/core/event.class.inc.php b/core/event.class.inc.php
index 303f4d0f4..882a8d9ac 100644
--- a/core/event.class.inc.php
+++ b/core/event.class.inc.php
@@ -187,13 +187,21 @@ class EventIssue extends Event
 			$aPost = array();
 			foreach($GLOBALS['_POST'] as $sKey => $sValue)
 			{
-				if (strlen($sValue) < 256)
+				if (is_string($sValue))
 				{
-					$aPost[$sKey] = $sValue;
+					if (strlen($sValue) < 256)
+					{
+						$aPost[$sKey] = $sValue;
+					}
+					else
+					{
+						$aPost[$sKey] = "!long string: ".strlen($sValue). " chars";
+					}
 				}
 				else
 				{
-					$aPost[$sKey] = "!long string: ".strlen($sValue). " chars";
+					// Not a string
+					$aPost[$sKey] = (string) $sValue;
 				}
 			}
 			$this->Set('arguments_post', $aPost);
diff --git a/pages/UI.php b/pages/UI.php
index ab9186825..1c362a224 100644
--- a/pages/UI.php
+++ b/pages/UI.php
@@ -307,8 +307,9 @@ function DeleteObjects(WebPage $oP, $sClass, $aObjects, $bDeleteConfirmed)
 				$oP->p(Dict::S('UI:Delete:PleaseDoTheManualOperations'));
 			}		
 			$oP->add("<form method=\"post\">\n");
+			$oP->add("<input type=\"hidden\" name=\"transaction_id\" value=\"".utils::ReadParam('transaction_id')."\">\n");
+			$oP->add("<input type=\"button\" onclick=\"window.history.back();\" value=\"".Dict::S('UI:Button:Back')."\">\n");
 			$oP->add("<input DISABLED type=\"submit\" name=\"\" value=\"".Dict::S('UI:Button:Delete')."\">\n");
-			$oP->add("<input type=\"button\" onclick=\"window.history.back();\" value=\"".Dict::S('UI:Button:Cancel')."\">\n");
 			$oP->add("</form>\n");
 		}
 		else
@@ -319,11 +320,12 @@ function DeleteObjects(WebPage $oP, $sClass, $aObjects, $bDeleteConfirmed)
 				$id = $oObj->GetKey();
 				$oP->p('<h1>'.Dict::Format('UI:Delect:Confirm_Object', $oObj->GetHyperLink()).'</h1>');
 				$oP->add("<form method=\"post\">\n");
+				$oP->add("<input type=\"hidden\" name=\"transaction_id\" value=\"".utils::ReadParam('transaction_id')."\">\n");
 				$oP->add("<input type=\"hidden\" name=\"operation\" value=\"delete_confirmed\">\n");
 				$oP->add("<input type=\"hidden\" name=\"class\" value=\"$sClass\">\n");
 				$oP->add("<input type=\"hidden\" name=\"id\" value=\"$id\">\n");
+				$oP->add("<input type=\"button\" onclick=\"window.history.back();\" value=\"".Dict::S('UI:Button:Back')."\">\n");
 				$oP->add("<input type=\"submit\" name=\"\" value=\"".Dict::S('UI:Button:Delete')."\">\n");
-				$oP->add("<input type=\"button\" onclick=\"window.history.back();\" value=\"".Dict::S('UI:Button:Cancel')."\">\n");
 				$oP->add("</form>\n");
 			}
 			else
@@ -332,14 +334,15 @@ function DeleteObjects(WebPage $oP, $sClass, $aObjects, $bDeleteConfirmed)
 				$oSet = CMDBobjectSet::FromArray($sClass, $aObjects);
 				CMDBAbstractObject::DisplaySet($oP, $oSet, array('display_limit' => false, 'menu' => false));
 				$oP->add("<form method=\"post\">\n");
+				$oP->add("<input type=\"hidden\" name=\"transaction_id\" value=\"".utils::ReadParam('transaction_id')."\">\n");
 				$oP->add("<input type=\"hidden\" name=\"operation\" value=\"bulk_delete_confirmed\">\n");
 				$oP->add("<input type=\"hidden\" name=\"class\" value=\"$sClass\">\n");
 				foreach($aObjects as $oObj)
 				{
 					$oP->add("<input type=\"hidden\" name=\"selectObject[]\" value=\"".$oObj->GetKey()."\">\n");
 				}
+				$oP->add("<input type=\"button\" onclick=\"window.history.back();\" value=\"".Dict::S('UI:Button:Back')."\">\n");
 				$oP->add("<input type=\"submit\" name=\"\" value=\"".Dict::S('UI:Button:Delete')."\">\n");
-				$oP->add("<input type=\"button\" onclick=\"window.history.back();\" value=\"".Dict::S('UI:Button:Cancel')."\">\n");
 				$oP->add("</form>\n");
 			}
 		}
@@ -850,7 +853,6 @@ try
 		case 'select_for_deletion':
 			$sFilter = utils::ReadParam('filter', '');
 			$sFormat = utils::ReadParam('format', '');
-			$bSearchForm = utils::ReadParam('search_form', true);
 			if (empty($sFilter))
 			{
 				throw new ApplicationException(Dict::Format('UI:Error:1ParametersMissing', 'filter'));
@@ -860,36 +862,31 @@ try
 			// TO DO: limit the search filter by the user context
 			$oFilter = CMDBSearchFilter::unserialize($sFilter); // TO DO : check that the filter is valid
 			$oSet = new DBObjectSet($oFilter);
-			if ($bSearchForm)
-			{
-				$oBlock = new DisplayBlock($oFilter, 'search', false);
-				$oBlock->Display($oP, 0);
-			}
 			$oBlock = new DisplayBlock($oFilter, 'list', false);
 			$oP->add("<form method=\"post\">\n");
 			$oP->add("<input type=\"hidden\" name=\"operation\" value=\"bulk_delete\">\n");
 			$oP->add("<input type=\"hidden\" name=\"class\" value=\"".$oFilter->GetClass()."\">\n");
 			$oP->add("<input type=\"hidden\" name=\"transaction_id\" value=\"".utils::GetNewTransactionId()."\">\n");
-			$oBlock->Display($oP, 1, array('selection_type' => 'multiple', 'selection_mode' => true, 'display_limit' => false));
+			$oBlock->Display($oP, 1, array('selection_type' => 'multiple', 'selection_mode' => true, 'display_limit' => false, 'menu' => false));
 			$oP->add("<input type=\"button\" value=\"".Dict::S('UI:Button:Cancel')."\" onClick=\"window.history.back()\">&nbsp;&nbsp;<input type=\"submit\" value=\"".Dict::S('UI:Button:Next')."\">\n");
 			$oP->add("</form>\n");
 		break;
 		
-		case 'bulk_delete':
 		case 'bulk_delete_confirmed':
+			$sTransactionId = utils::ReadPostedParam('transaction_id', '');
+			if (!utils::IsTransactionValid($sTransactionId))
+			{
+				throw new ApplicationException(Dict::S('UI:Error:ObjectsAlreadyDeleted'));
+			}
+		case 'bulk_delete':
 			$sClass = utils::ReadPostedParam('class', '');
 			$sClassLabel = MetaModel::GetName($sClass);
 			$aSelectObject = utils::ReadPostedParam('selectObject', '');
 			$aObjects = array();
-			$sTransactionId = utils::ReadPostedParam('transaction_id', '');
 			if ( empty($sClass) || empty($aSelectObject)) // TO DO: check that the class name is valid !
 			{
 				throw new ApplicationException(Dict::Format('UI:Error:2ParametersMissing', 'class', 'selectObject[]'));
 			}
-			if (!utils::IsTransactionValid($sTransactionId))
-			{
-				throw new ApplicationException(Dict::S('UI:Error:ObjectsAlreadyDeleted'));
-			}
 			foreach($aSelectObject as $iId)
 			{
 				$aObjects[] = $oContext->GetObject($sClass, $iId);