openrat-cms

commit 6b54e7e601d83b572b2dd7a56be82c10d9ab468c
parent f116c7c68636cf3ef0a4be831b32ee76216a633a
Author: dankert <devnull@localhost>
Date:   Sat, 25 Dec 2004 22:05:29 +0100

Korrektur Edit-Icons

Diffstat:
objectClasses/Page.class.php
 | 
12
++++++++----
objectClasses/Value.class.php
 | 
12
+++++-------

2 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/objectClasses/Page.class.php b/objectClasses/Page.class.php
@@ -20,7 +20,10 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // ---------------------------------------------------------------------------
 // $Log$
-// Revision 1.14  2004-12-19 21:48:31  dankert
+// Revision 1.15  2004-12-25 21:05:29  dankert
+// Korrektur Edit-Icons
+//
+// Revision 1.14  2004/12/19 21:48:31  dankert
 // Links auf andere Objekte korrigiert
 //
 // Revision 1.13  2004/12/19 15:23:06  dankert
@@ -673,7 +676,7 @@ class Page extends Object
 			}
 			else
 			{
-				// Wenn Feld gef?llt
+				// Wenn Feld gefuellt
 				$src = str_replace( '{{IFNOTEMPTY:'.$id.':BEGIN}}','',$src );
 				$src = str_replace( '{{IFNOTEMPTY:'.$id.':END}}'  ,'',$src );
 
@@ -681,8 +684,9 @@ class Page extends Object
 			}
 			
 			if   ( $this->icons )
-				$src = str_replace( '{{->'.$id.'}}','<a href="'.Html::url(array('action'=>'pagelement','elementid'=>$id,'subaction'=>'edit')).'" title="'.$value->element->desc.'" target="cms_main_main"><img src="'.$conf['directories']['themedir'].'/images/icon_el_'.$value->element->type.'.png" border="0"></a>',$src );
-			else	$src = str_replace( '{{->'.$id.'}}','',$src );
+				$src = str_replace( '{{->'.$id.'}}','<a href="'.Html::url('pageelement','edit',array('elementid'=>$id)).'" title="'.$value->element->desc.'" target="cms_main_main"><img src="'.OR_THEMES_DIR.$conf['interface']['theme'].'/images/icon_el_'.$value->element->type.IMG_EXT.'" border="0"></a>',$src );
+			else
+				$src = str_replace( '{{->'.$id.'}}','',$src );
 		}
 
 		$this->value = &$src;
diff --git a/objectClasses/Value.class.php b/objectClasses/Value.class.php
@@ -737,9 +737,7 @@ class Value
 		if	( intval($this->valueid)==0 )
 			$this->load();
 		$db = db_connection();
-		global $conf,
-		       $conf_tmpdir,
-		       $SESS;
+		global $conf;
 	
 		$inhalt = '';
 
@@ -958,7 +956,7 @@ class Value
 
 						if	( method_exists( $dynEl,'execute' ) )
 						{
-							$dynEl->delOutput();
+							//$dynEl->delOutput();
 							$dynEl->objectid = $this->page->objectid;
 							$dynEl->page    = &$this->page;
 
@@ -1061,13 +1059,13 @@ class Value
 						$inhalt = '';
 						break;
 					case 'edit_url':
-						$inhalt = Html::url(array('objectid'=>$this->page->objectid,'dbid'=>$SESS['dbid']));
+						$inhalt = Html::url('index','object',$this->page->objectid,array('dbid'=>$db->dbid));
 						break;
 					case 'edit_fullurl':
 						$inhalt = 'http://';
 						$inhalt .= getenv('SERVER_NAME');
 						$inhalt .= dirname(getenv('SCRIPT_NAME'));
-						$inhalt .= '/'.Html::url(array('objectid'=>$this->page->objectid,'dbid'=>$SESS['dbid']));;
+						$inhalt .= '/'.Html::url('index','object',$this->page->objectid,array('dbid'=>$db->dbid));;
 						break;
 					case 'lastch_user_username':
 						$user = new User($this->page->lastchange_userid);
@@ -1153,7 +1151,7 @@ class Value
 		}
 		
 		if   ( $this->page->icons && $this->element->withIcon )
-			$inhalt = '<a href="'.Html::url(array('action'=>'pageelement','elementid'=>$this->element->elementid,'objectid'=>$this->page->objectid,'subaction'=>'edit')).'" title="'.$this->element->desc.'" target="cms_main_main"><img src="'.$conf['directories']['themedir'].'/images/icon_el_'.$this->element->type.'.png" border="0" align="left"></a>'.$inhalt;
+			$inhalt = '<a href="'.Html::url('pageelement','edit',$this->page->objectid,array('elementid'=>$this->element->elementid)).'" title="'.$this->element->desc.'" target="cms_main_main"><img src="'.OR_THEMES_DIR.$conf['interface']['theme'].'/images/icon_el_'.$this->element->type.IMG_EXT.'" border="0" align="left"></a>'.$inhalt;
 		
 		$this->value = $inhalt;
 	}