Fix Trac #296: Incorrect display of Service/Subcategory localized characters in the portal.

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@898 a333f486-631f-4898-b8df-5754b55c2be0

portal/index.php

@@ -121,9 +121,8 @@ function SelectService($oP, $oUserOrg)
 		{
 			$sChecked = "checked";
 		}
-		$oP->p("<tr><td style=\"vertical-align:top\"><p><input name=\"attr_service_id\" $sChecked type=\"radio\" id=\"svc_$id\" value=\"$id\"></p></td><td style=\"vertical-align:top\"><p><b><label for=\"svc_$id\">".htmlentities($oService->GetName())."</label></b></p>");
-		$oP->p("<p>".htmlentities($oService->Get('description'))."</p></td></tr>");	DumpHiddenParams($oP, array('service_id'), $aParameters);
-		
+		$oP->p("<tr><td style=\"vertical-align:top\"><p><input name=\"attr_service_id\" $sChecked type=\"radio\" id=\"svc_$id\" value=\"$id\"></p></td><td style=\"vertical-align:top\"><p><b><label for=\"svc_$id\">".htmlentities($oService->GetName(), ENT_QUOTES, 'UTF-8')."</label></b></p>");
+		$oP->p("<p>".htmlentities($oService->Get('description'), ENT_QUOTES, 'UTF-8')."</p></td></tr>");		
 	}
 	$oP->add("</table>\n");	
 	DumpHiddenParams($oP, array('service_id'), $aParameters);
@@ -163,7 +162,7 @@ function SelectSubService($oP, $oUserOrg)
 	if (is_object($oService))
 	{
 		$oP->add("<div class=\"wizContainer\" id=\"form_select_servicesubcategory\">\n");
-		$oP->add("<h1 id=\"select_subcategory\">".Dict::Format('Portal:SelectSubcategoryFrom_Service', htmlentities($oService->GetName()))."</h1>\n");
+		$oP->add("<h1 id=\"select_subcategory\">".Dict::Format('Portal:SelectSubcategoryFrom_Service', htmlentities($oService->GetName(), ENT_QUOTES, 'UTF-8'))."</h1>\n");
 		$oP->add("<form id=\"request_form\" method=\"get\">\n");
 		$oP->add("<table>\n");
 		while($oSubService = $oSet->Fetch())
@@ -174,8 +173,8 @@ function SelectSubService($oP, $oUserOrg)
 			{
 				$sChecked = "checked";
 			}
-			$oP->p("<tr><td style=\"vertical-align:top\"><p><input name=\"attr_servicesubcategory_id\" $sChecked type=\"radio\" id=\"subsvc_$id\" value=\"$id\"></p></td><td style=\"vertical-align:top\"><p><b><label for=\"subsvc_$id\">".htmlentities($oSubService->GetName())."</label></b></p>");
-			$oP->p("<p>".htmlentities($oSubService->Get('description'))."</p></td></tr>");
+			$oP->p("<tr><td style=\"vertical-align:top\"><p><input name=\"attr_servicesubcategory_id\" $sChecked type=\"radio\" id=\"subsvc_$id\" value=\"$id\"></p></td><td style=\"vertical-align:top\"><p><b><label for=\"subsvc_$id\">".htmlentities($oSubService->GetName(), ENT_QUOTES, 'UTF-8')."</label></b></p>");
+			$oP->p("<p>".htmlentities($oSubService->Get('description'), ENT_QUOTES, 'UTF-8')."</p></td></tr>");
 		}
 		$sMessage = Dict::S('Portal:PleaseSelectAServiceSubCategory');
 		$oP->add_ready_script(
@@ -220,9 +219,9 @@ function RequestCreationForm($oP, $oUserOrg)
 		$oRequest->Set('servicesubcategory_id', $aParameters['servicesubcategory_id']);
 		
 		$oAttDef = MetaModel::GetAttributeDef('UserRequest', 'service_id');
-		$aDetails[] = array('label' => $oAttDef->GetLabel(), 'value' => htmlentities($oService->GetName()));
+		$aDetails[] = array('label' => $oAttDef->GetLabel(), 'value' => htmlentities($oService->GetName(), ENT_QUOTES, 'UTF-8'));
 		$oAttDef = MetaModel::GetAttributeDef('UserRequest', 'servicesubcategory_id');
-		$aDetails[] = array('label' => $oAttDef->GetLabel(), 'value' => htmlentities($oSubService->GetName()));
+		$aDetails[] = array('label' => $oAttDef->GetLabel(), 'value' => htmlentities($oSubService->GetName(), ENT_QUOTES, 'UTF-8'));
 		$iFlags = 0;
 		foreach($aList as $sAttCode)
 		{
@@ -372,7 +371,7 @@ function CreateRequest(WebPage $oP, Organization $oUserOrg)
 		
 		case 2:
 		$oP->AddMenuButton('cancel', 'UI:Button:Cancel', './index.php?operation=welcome');
-		RequestCreationForm($oP, $oUserOrg);
+			RequestCreationForm($oP, $oUserOrg);
 		break;
 
 		case 3: