openrat-cms

commit f496a3a946c327bd2831e244dbd1f4ad3c152f05
parent 818ce8cd429269bf2aae99eeaee8e8f0e10f8241
Author: dankert <devnull@localhost>
Date:   Tue,  3 Jul 2007 23:17:04 +0200

Korrektur der Archiv-Funktionen.

Diffstat:
actionClasses/PageelementAction.class.php
 | 
71
++++++++++++++++++++++++++++++++++++-----------------------------------
actionClasses/PageelementAction.ini.php
 | 
1
+

2 files changed, 37 insertions(+), 35 deletions(-)
diff --git a/actionClasses/PageelementAction.class.php b/actionClasses/PageelementAction.class.php
@@ -848,8 +848,8 @@ class PageelementAction extends Action
 	{
 		$this->value->valueid = $this->getRequestVar('valueid');
 		
-		// Das ausgew?hlte Element f?r die Bearbeitung verwenden
-		$this->callSubAction('editlongtext');
+		// Das ausgew?hlte Element fuer die Bearbeitung verwenden
+		$this->callSubAction('edit');
 	}
 
 
@@ -896,7 +896,7 @@ class PageelementAction extends Action
 		$this->value->element->load();
 
 		$list         = array();
-		$version_list = array();
+//		$version_list = array();
 		$lfd_nr       = 0;
 
 		foreach( $this->value->getVersionList() as $value )
@@ -906,42 +906,45 @@ class PageelementAction extends Action
 			$value->page    = &$this->page;
 			$value->simple  = true;
 			$value->generate();
+			
 
-			$date = date( lang('DATE_FORMAT'),$value->lastchangeTimeStamp);
+//			$date = date( lang('DATE_FORMAT'),$value->lastchangeTimeStamp);
 			
-			if	( in_array(	$this->element->type,array('text','longtext') ) )
-				$version_list[ $value->valueid ] = '('.$lfd_nr.') '.$date;
+//			if	( in_array(	$this->element->type,array('text','longtext') ) )
+//				$version_list[ $value->valueid ] = '('.$lfd_nr.') '.$date;
+
+			$zeile = array(  'value'     => Text::maxLaenge( 50,$value->value),
+			                 'date'      => $value->lastchangeTimeStamp,	
+			                 'lfd_nr'    => $lfd_nr,	
+			                 'id'        => $value->valueid,	
+			                 'user'      => $value->lastchangeUserName );
 
+			// Nicht aktive Inhalte können direkt bearbeitet werden und sind
+			// nach dem Speichern dann wieder aktiv (natürlich als nächster/neuer Inhalt) 
 			if	( ! $value->active )
-				$useUrl = Html::url('pageelement','usevalue',$this->page->objectid,array('valueid'  =>$value->valueid));
-			else	$useUrl = '';
+				$zeile['useUrl'] = Html::url('pageelement','usevalue',$this->page->objectid,array('valueid'  =>$value->valueid));
 
+			// Freigeben des Inhaltes.
+			// Nur das aktive Inhaltselement kann freigegeben werden. Natürlich auch nur,
+			// wenn es nicht schon freigegeben ist.
 			if	( ! $value->publish && $value->active )
-				$releaseUrl = Html::url('pageelement','release',$this->page->objectid,array('valueid'  =>$value->valueid ));
-			else	$releaseUrl = '';
+				$zeile['releaseUrl'] = Html::url('pageelement','release',$this->page->objectid,array('valueid'  =>$value->valueid ));
 
-			if	( $value->publish )
-				$public = true;
-			else $public = false;
+			$zeile['public'] = $value->publish;
+			$zeile['active'] = $value->active;
 
-			if	( $value->active )
-				$active = true;
-			else $active = false;
-
-			$list[] = array( 'value'     => Text::maxLaenge( 50,$value->value),
-			                 'date'      => $date,	
-			                 'lfd_nr'    => $lfd_nr,	
-			                 'user'      => $value->lastchangeUserName,
-			                 'useUrl'    => $useUrl,
-			                 'public'    => $public,  
-			                 'active'    => $active,  
-			                 'releaseUrl'=> $releaseUrl );
+			$list[$lfd_nr] = $zeile;
+			             
 		}
 
-		$this->setTemplateVar('name'        ,$value->element->name);
-		$this->setTemplateVar('el'          ,$list);
-		$this->setTemplateVar('version_list',$version_list);
-		$this->forward('pageelement_archive');
+		
+		$this->setTemplateVar('compareid',$list[$lfd_nr-1]['id']);
+		$this->setTemplateVar('withid'   ,$list[$lfd_nr  ]['id']);
+		$this->setTemplateVar('name'     ,$value->element->name);
+		$this->setTemplateVar('el'       ,$list);
+		
+//		Html::debug( $this->templateVars);
+//		$this->setTemplateVar('version_list',$version_list);
 	}
 
 
@@ -965,8 +968,9 @@ class PageelementAction extends Action
 		
 		$value1->loadWithId();
 		$value2->loadWithId();
+//		Html::debug($value1,'Inhalt-1');
 
-		Logger::debug( 'comparing value '.$value1id.' with '.$value2id );
+//		Logger::debug( 'comparing value '.$value1id.' with '.$value2id );
 
 		$date1 = date( lang('DATE_FORMAT'),$value1->lastchangeTimeStamp);
 		$this->setTemplateVar('title1',$date1);
@@ -978,15 +982,12 @@ class PageelementAction extends Action
 		$text2 = explode("\n",$value2->text);
 
 		$res_diff = $this->textdiff($text1,$text2);
-		#echo "<pre>";
-		#print_r($res_diff);
-		#echo "</pre>";
+//		Html::debug($res_diff,'Diff');
+
 		list( $text1,$text2 ) = $res_diff;
 
 		$this->setTemplateVar('text1',$text1 );
 		$this->setTemplateVar('text2',$text2 );
-
-		$this->forward('pageelement_diff');
 	}
 
 
diff --git a/actionClasses/PageelementAction.ini.php b/actionClasses/PageelementAction.ini.php
@@ -24,6 +24,7 @@ menu=edit
 
 [archive]
 menu=edit
+target=diff
 
 [show]
 menu=edit