1) improved referer handling

2) user-pref. to never hide the nextmatch line

infolog/inc/class.uiinfolog.inc.php

@@ -185,9 +185,17 @@
 			return $query['total'];
 		}
 
-		function index($values = 0,$action='',$action_id='',$referer=0,$extra_app_header=False,$return_html=False)
+		function index($values = 0,$action='',$action_id='',$referer=0,$extra_app_header=False,$return_html=False,$own_referer='')
 		{
-			$referer = is_array($values) ? $values['referer'] : $referer;
+			if (is_array($values))
+			{
+				$referer = $values['referer'];
+				$own_referer = $values['own_referer'];
+			}
+			elseif ($own_referer !== '')
+			{
+				$own_referer = ereg_replace('^.*'.$GLOBALS['egw_info']['server']['webserver_url'],'',$_SERVER['HTTP_REFERER']);
+			}
 			//echo "<p>uiinfolog::index(action='$action/$action_id',referer='$referer/$values[referer]') values=\n"; _debug_array($values);
 			if (!is_array($values))
 			{
@@ -219,6 +227,10 @@
 					list($type) = each($values['add']);
 					return $this->edit(0,$action,$action_id,$type,$referer);
 				}
+				elseif ($values['cancel'] && $own_referer)
+				{
+					$this->tmpl->location($own_referer);					
+				}
 				else
 				{
 					list($do,$do_id) = isset($values['main']) ? each($values['main']) : @each($values['nm']['rows']);
@@ -275,9 +287,12 @@
 				$values['nm']['header_left'] = 'infolog.index.header_left';
 			}
 			$values['nm']['bottom_too'] = True;
+			$values['nm']['never_hide'] = isset($GLOBALS['egw_info']['user']['preferences']['infolog']['never_hide']) ? 
+				$GLOBALS['egw_info']['user']['preferences']['infolog']['never_hide'] : $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'] > 15;
 			$persist['action'] = $values['nm']['action'] = $action;
 			$persist['action_id'] = $values['nm']['action_id'] = $action_id;
 			$persist['referer'] = $referer;
+			$persist['own_referer'] = $own_referer;
 
 			$all_stati = array();
 			foreach($this->bo->status as $typ => $stati)

infolog/inc/hook_settings.inc.php

@@ -49,3 +49,5 @@
 	create_select_box('Show in the InfoLog list','show_links',$show_links,
 		'Should InfoLog show the links to other applications and/or the file-attachments in the InfoLog list (normal view when u enter InfoLog).');
 	unset($show_links);
+	
+	create_check_box('Never hide search and filters','never_hide','If not set, the line with search and filters is hidden for less entries then "max matches per page" (as defined in your common preferences).');

infolog/setup/phpgw_de.lang

@@ -111,6 +111,7 @@ for which types should this field be used	infolog	de	f
 from	infolog	de	Von
 high	infolog	de	hoch
 id	infolog	de	Id
+if not set, the line with search and filters is hidden for less entries then "max matches per page" (as defined in your common preferences).	infolog	de	Falls nicht gesetzt, wird die Suche und die Filter ausgeblendet für weniger Einträge als "maximale Treffer pro Seite" (in ihren allg. Einstellungen definiert).
 import	infolog	de	Import
 import next set	infolog	de	Nächsten Satz importieren
 info log	common	de	InfoLog
@@ -142,6 +143,7 @@ max length of the input [, length of the inputfield (optional)]	infolog	de	max.
 max number of entries to display on the main screen	infolog	de	Wieviele Einträge sollen maximal auf der Startseite angezeigt werden
 name must not be empty !!!	infolog	de	Name darf nicht leer sein !!!
 name of new type to create	infolog	de	Name des neu anzulegenden Types
+never hide search and filters	infolog	de	Suche und Filter niemals ausblenden
 new name	infolog	de	neuer name
 new search	infolog	de	Neue Suche
 no - cancel	infolog	de	Nein - Abbruch

infolog/setup/phpgw_en.lang

@@ -111,6 +111,7 @@ for which types should this field be used	infolog	en	for which types should this
 from	infolog	en	From
 high	infolog	en	high
 id	infolog	en	Id
+if not set, the line with search and filters is hidden for less entries then "max matches per page" (as defined in your common preferences).	infolog	en	If not set, the line with search and filters is hidden for less entries then "max matches per page" (as defined in your common preferences).
 import	infolog	en	Import
 import next set	infolog	en	import next set
 info log	common	en	InfoLog
@@ -142,6 +143,7 @@ max length of the input [, length of the inputfield (optional)]	infolog	en	max l
 max number of entries to display on the main screen	infolog	en	Max number of entries to display on the main screen
 name must not be empty !!!	infolog	en	Name must not be empty !!!
 name of new type to create	infolog	en	name of new type to create
+never hide search and filters	infolog	en	Never hide search and filters
 new name	infolog	en	new name
 new search	infolog	en	New search
 no - cancel	infolog	en	No - Cancel