[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8978] fixed display of html char
|
From: |
Erik Holm-Larsen |
|
Subject: |
[Fmsystem-commits] [8978] fixed display of html char |
|
Date: |
Wed, 14 Mar 2012 12:42:22 +0000 |
Revision: 8978
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8978
Author: erikhl
Date: 2012-03-14 12:42:22 +0000 (Wed, 14 Mar 2012)
Log Message:
-----------
fixed display of html char
Modified Paths:
--------------
trunk/controller/inc/class.uidocument.inc.php
trunk/controller/inc/class.uiprocedure.inc.php
Modified: trunk/controller/inc/class.uidocument.inc.php
===================================================================
--- trunk/controller/inc/class.uidocument.inc.php 2012-03-14 12:22:13 UTC
(rev 8977)
+++ trunk/controller/inc/class.uidocument.inc.php 2012-03-14 12:42:22 UTC
(rev 8978)
@@ -220,6 +220,7 @@
$document->set_name($_FILES["file_path"]["name"]);
$document->set_type_id(phpgw::get_var('document_type'));
$desc =
phpgw::get_var('document_description','html');
+ $desc = str_replace(" ", " ", $desc);
//var_dump($desc);
$document->set_description($desc);
$document->set_procedure_id($procedure_id);
@@ -435,6 +436,10 @@
foreach($documents as $document)
{
+ /*
+ * hack to fix display of char
+ */
+
$document->set_description(str_replace(" ", "
",$document->get_description()));
$doc_array = $document->toArray();
$doc_array['link'] =
self::link(array('menuaction' => 'controller.uidocument.view', 'id' =>
$doc_array['id']));
$table_values[] = array('document' =>
$doc_array);
Modified: trunk/controller/inc/class.uiprocedure.inc.php
===================================================================
--- trunk/controller/inc/class.uiprocedure.inc.php 2012-03-14 12:22:13 UTC
(rev 8977)
+++ trunk/controller/inc/class.uiprocedure.inc.php 2012-03-14 12:42:22 UTC
(rev 8978)
@@ -186,11 +186,17 @@
{
if(isset($procedure)) // Edit procedure
{
+ $description_txt =
phpgw::get_var('description','html');
+ $description_txt =
str_replace(" ", " ", $description_txt);
+ $purpose_txt =
phpgw::get_var('purpose','html');
+ $purpose_txt = str_replace(" ", "
", $purpose_txt);
+ $reference_txt =
phpgw::get_var('reference','html');
+ $reference_txt = str_replace(" ",
" ", $reference_txt);
$procedure->set_title(phpgw::get_var('title'));
-
$procedure->set_purpose(phpgw::get_var('purpose','html'));
+ $procedure->set_purpose($purpose_txt);
$procedure->set_responsibility(phpgw::get_var('responsibility'));
-
$procedure->set_description(phpgw::get_var('description','html'));
-
$procedure->set_reference(phpgw::get_var('reference','html'));
+
$procedure->set_description($description_txt);
+
$procedure->set_reference($reference_txt);
$procedure->set_attachment(phpgw::get_var('attachment'));
$procedure->set_start_date(strtotime(phpgw::get_var('start_date_hidden')));
$procedure->set_end_date(strtotime(phpgw::get_var('end_date_hidden')));
@@ -249,11 +255,18 @@
{
$procedure->set_revision_no(2);
}
+
+ $description_txt =
phpgw::get_var('description','html');
+ $description_txt =
str_replace(" ", " ", $description_txt);
+ $purpose_txt =
phpgw::get_var('purpose','html');
+ $purpose_txt = str_replace(" ", "
", $purpose_txt);
+ $reference_txt =
phpgw::get_var('reference','html');
+ $reference_txt = str_replace(" ",
" ", $reference_txt);
$procedure->set_title(phpgw::get_var('title'));
-
$procedure->set_purpose(phpgw::get_var('purpose','html'));
+ $procedure->set_purpose($purpose_txt);
$procedure->set_responsibility(phpgw::get_var('responsibility'));
-
$procedure->set_description(phpgw::get_var('description','html'));
-
$procedure->set_reference(phpgw::get_var('reference','html'));
+
$procedure->set_description($description_txt);
+
$procedure->set_reference($reference_txt);
$procedure->set_attachment(phpgw::get_var('attachment'));
$procedure->set_start_date(strtotime(phpgw::get_var('start_date_hidden')));
$procedure->set_end_date(strtotime(phpgw::get_var('end_date_hidden')));
@@ -307,6 +320,7 @@
$control_areas =
$cats->formatted_xslt_list(array('format'=>'filter','selected' =>
$procedure->get_control_area_id(),'globals' => true,'use_acl' =>
$this->_category_acl));
array_unshift($control_areas['cat_list'],array
('cat_id'=>'','name'=> lang('select value')));
$control_areas_array2 = array();
+ //_debug_array($control_areas);
foreach($control_areas['cat_list'] as $cat_list)
{
if($cat_list['cat_id'] ==
$procedure->get_control_area_id())
@@ -350,6 +364,14 @@
}
}
*/
+
+ /*
+ * hack to fix display of char
+ */
+
$procedure->set_description(str_replace(" ", "
",$procedure->get_description()));
+
$procedure->set_responsibility(str_replace(' ', ' ',
$procedure->get_responsibility()));
+ $procedure->set_reference(str_replace(' ',
' ', $procedure->get_reference()));
+
$procedure_array = $procedure->toArray();
//_debug_array($procedure_array);
@@ -441,6 +463,13 @@
$category =
execMethod('phpgwapi.categories.return_single',
$procedure->get_control_area_id());
$procedure->set_control_area_name($category[0]['name']);
+ /*
+ * hack to fix display of char
+ */
+
$procedure->set_description(str_replace(" ", "
",$procedure->get_description()));
+
$procedure->set_responsibility(str_replace(' ', ' ',
$procedure->get_responsibility()));
+ $procedure->set_reference(str_replace(' ',
' ', $procedure->get_reference()));
+
$procedure_array = $procedure->toArray();
if($procedure->get_start_date() &&
$procedure->get_start_date() != null)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8978] fixed display of html char,
Erik Holm-Larsen <=