openrat-cms

commit c4668bb2ba4a9a8a46a35fd9b1697061f15c356b
parent 99f8869a8c560b0fa71a99e3410eaafa33104425
Author: dankert <devnull@localhost>
Date:   Mon, 21 May 2007 22:04:10 +0200

Korrektur f?r Anzeige des Vorlagen-Quelltextes.

Diffstat:
actionClasses/TemplateAction.class.php
 | 
17
++++++++++-------
objectClasses/Element.class.php
 | 
5
++++-
themes/default/include/elements.ini.php
 | 
2
+-
themes/default/include/html/text.inc.php
 | 
2
+-

4 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/actionClasses/TemplateAction.class.php b/actionClasses/TemplateAction.class.php
@@ -20,6 +20,9 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // ---------------------------------------------------------------------------
 // $Log$
+// Revision 1.15  2007-05-21 20:04:10  dankert
+// Korrektur f?r Anzeige des Vorlagen-Quelltextes.
+//
 // Revision 1.14  2007-04-08 21:33:42  dankert
 // Bei Ausw?hlen einer Vorlage die Elementliste starten.
 //
@@ -333,34 +336,34 @@ class TemplateAction extends Action
 		{
 			$element = new Element( $elid );
 			$element->load();
-			$url = Html::url( 'element','edit',$this->template->templateid,array('elementid'=>$elid));
+			$url = Html::url( 'element','name',$elid );
 			
 			$text = str_replace('{{'.$elid.'}}',
 			                    '<a href="'.$url.'" class="el_'.
-			                    $element->type.'" target="cms_main_main" title="'.$element->desc.'">{{'.
+			                    $element->getTypeClass().'" target="cms_main_main" title="'.$element->desc.'">{{'.
 			                    $element->name.'}}</a>',
 			                    $text );
 			$text = str_replace('{{-&gt;'.$elid.'}}',
 			                    '<a href="'.$url.'" class="el_'.
-			                    $element->type.'" target="cms_main_main" title="'.$element->desc.'">{{-&gt;'.
+			                    $element->getTypeClass().'" target="cms_main_main" title="'.$element->desc.'">{{-&gt;'.
 			                    $element->name.'}}</a>',
 			                    $text );
 
 			$text = str_replace('{{IFEMPTY:'.$elid.':BEGIN}}',
-			                    '<a href="'.$url.'" class="el_'.$element->type.'" title="'.$element->desc.'">{{'.lang('TEMPLATE_SRC_IFEMPTY').':'.
+			                    '<a href="'.$url.'" class="el_'.$element->getTypeClass().'" title="'.$element->desc.'">{{'.lang('TEMPLATE_SRC_IFEMPTY').':'.
 			                    $element->name.':'.lang('TEMPLATE_SRC_BEGIN').'}}</a>',
 			                    $text );
 			$text = str_replace('{{IFEMPTY:'.$elid.':END}}',
-			                    '<a href="'.$url.'" class="el_'.$element->type.'" title="'.$element->desc.'">{{'.lang('TEMPLATE_SRC_IFEMPTY').':'.
+			                    '<a href="'.$url.'" class="el_'.$element->getTypeClass().'" title="'.$element->desc.'">{{'.lang('TEMPLATE_SRC_IFEMPTY').':'.
 			                    $element->name.':'.lang('TEMPLATE_SRC_END').'}}</a>',
 			                    $text );
 
 			$text = str_replace('{{IFNOTEMPTY:'.$elid.':BEGIN}}',
-			                    '<a href="'.$url.'" class="el_'.$element->type.'" title="'.$element->desc.'">{{'.lang('TEMPLATE_SRC_IFNOTEMPTY').':'.
+			                    '<a href="'.$url.'" class="el_'.$element->getTypeClass().'" title="'.$element->desc.'">{{'.lang('TEMPLATE_SRC_IFNOTEMPTY').':'.
 			                    $element->name.':'.lang('TEMPLATE_SRC_BEGIN').'}}</a>',
 			                    $text );
 			$text = str_replace('{{IFNOTEMPTY:'.$elid.':END}}',
-			                    '<a href="'.$url.'" class="el_'.$element->type.'" title="'.$element->desc.'">{{'.lang('TEMPLATE_SRC_IFNOTEMPTY').':'.
+			                    '<a href="'.$url.'" class="el_'.$element->getTypeClass().'" title="'.$element->desc.'">{{'.lang('TEMPLATE_SRC_IFNOTEMPTY').':'.
 			                    $element->name.':'.lang('TEMPLATE_SRC_END').'}}</a>',
 			                    $text );
 			                    
diff --git a/objectClasses/Element.class.php b/objectClasses/Element.class.php
@@ -20,6 +20,9 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // ---------------------------------------------------------------------------
 // $Log$
+// Revision 1.18  2007-05-21 20:04:10  dankert
+// Korrektur f?r Anzeige des Vorlagen-Quelltextes.
+//
 // Revision 1.17  2007-05-02 20:58:45  dankert
 // Ausw?hlen von Einstellungen f?r Elemente "linkinfo" und "copy".
 //
@@ -453,7 +456,7 @@ class Element
 	 * Ermittelt die Klasse des Element-Typs.<br>
 	 * Entweder "info", "text" oder "dynamic".
 	 * 
-	 * @return Array
+	 * @return String
 	 */
 	function getTypeClass()
 	{
diff --git a/themes/default/include/elements.ini.php b/themes/default/include/elements.ini.php
@@ -36,7 +36,7 @@ selectbox= list:*,name:*,default,onchange:,title:,class:
 radiobox = list:*,name:*,default,onchange:,title:,class:
 set      = var:*,value,key
 table    = class,width:100%,space:0px,padding:0px,widths,rowclasses:oddCOMMAeven,columnclasses
-text     = title,class:text,var,text,key,textvar,raw,maxlength,value,suffix,prefix,accesskey
+text     = title,class:text,var,text,key,textvar,raw,maxlength,value,suffix,prefix,accesskey,escape:true
 upload   = name:*,class:upload
 user     = user
 window   = title,name,icon,widths,width:93%,rowclasses:oddCOMMAeven,columnclasses:1COMMA2COMMA3 
\ No newline at end of file
diff --git a/themes/default/include/html/text.inc.php b/themes/default/include/html/text.inc.php
@@ -33,7 +33,7 @@
 	elseif (!empty($attr_key))
 		$tmp_text = lang($attr_key);
 	elseif (!empty($attr_var))
-		$tmp_text = isset($$attr_var)?htmlentities($$attr_var):'error: variable '.$attr_var.' not present';	
+		$tmp_text = isset($$attr_var)?($attr_escape?htmlentities($$attr_var):$$attr_var):'?'.$attr_var.'?';	
 	elseif (!empty($attr_raw))
 		$tmp_text = str_replace('_','&nbsp;',$attr_raw);
 	elseif (!empty($attr_value))