extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-27 16:29:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

infolog now uses $HTTP_REFERER,$referer for edit/add/delete to come back to the caling page, even when not called from infolog itselft

Browse Source
This commit is contained in:
Ralf Becker 2001-07-13 11:10:19 +00:00
parent 3daaf14c25
commit 9c1f5e1b6b
2 changed files with 55 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
infolog/inc/class.html.inc.php
View File

@ -36,6 +36,10 @@ class html
return "<input type=\"submit\" name=\"$name\" value=\"".lang($lang)."\">\n"; return "<input type=\"submit\" name=\"$name\" value=\"".lang($lang)."\">\n";
} }
/*
* create absolute link: $url: phpgw-relative link, may include query
* $vars: query or array with query
*/
function link($url,$vars='') function link($url,$vars='')
{ {
global $phpgw; global $phpgw;
@ -51,6 +55,10 @@ class html
} }
$vars = implode('&',$v); $vars = implode('&',$v);
} }
list($url,$v) = explode('?',$url); // url may contain additional vars
if ($v)
$vars .= ($vars ? '&' : '') . $v;
return $phpgw->link($url,$vars); return $phpgw->link($url,$vars);
} }

66
infolog/inc/class.uiinfolog.inc.php
View File

@ -194,6 +194,21 @@
return $headers; return $headers;
} }
function get_referer( ) {
global $phpgw_info,$HTTP_REFERER,$referer;
if (!$referer)
$referer = $HTTP_REFERER;
$url = parse_url($referer);
$referer = str_replace($phpgw_info['server']['webserver_url'],'',
$url['path']);
if ($url['query'])
$referer .= '?'.$url['query'];
//echo "<p>referer: $HTTP_REFERER --> $referer</p>";
return $referer;
}
function get_list( ) { function get_list( ) {
global $phpgw,$phpgw_info; global $phpgw,$phpgw_info;
global $cat_filter,$cat_id,$sort,$order,$query,$start,$filter; global $cat_filter,$cat_id,$sort,$order,$query,$start,$filter;
@ -218,6 +233,10 @@
); );
$common_hidden_vars = $html->input_hidden($hidden_vars); $common_hidden_vars = $html->input_hidden($hidden_vars);
global $PHP_SELF,$QUERY_STRING; // set referer for form
$referer = $PHP_SELF.($QUERY_STRING ? '?'.$QUERY_STRING : '');
$common_hidden_vars .= $html->input_hidden('referer',$referer);
if ($action) if ($action)
$common_hidden_vars .= $html->input_hidden('action',$action); $common_hidden_vars .= $html->input_hidden('action',$action);
@ -227,13 +246,15 @@
$t->set_var(lang_info_action,lang('Info Log - Subprojects from')); $t->set_var(lang_info_action,lang('Info Log - Subprojects from'));
break; break;
case 'proj': case 'proj':
$common_hidden_vars .= $html->input_hidden('id_project',$proj_id); $common_hidden_vars .=$html->input_hidden(array(
'id_project' => $proj_id, 'proj_id' => $proj_id));
$proj = $this->bo->readProj($proj_id); $proj = $this->bo->readProj($proj_id);
$t->set_var(lang_info_action,lang('Info Log').' - '. $t->set_var(lang_info_action,lang('Info Log').' - '.
$proj['title']); $proj['title']);
break; break;
case 'addr': case 'addr':
$common_hidden_vars .= $html->input_hidden('id_addr',$addr_id); $common_hidden_vars .= $html->input_hidden(array(
'id_addr' => $addr_id, 'addr_id' => $addr_id ));
$addr = $this->bo->readAddr($addr_id); $addr = $this->bo->readAddr($addr_id);
$t->set_var(lang_info_action,lang('Info Log').' - '. $t->set_var(lang_info_action,lang('Info Log').' - '.
$this->bo->addr2name($addr)); $this->bo->addr2name($addr));
@ -318,8 +339,10 @@
$t->parse('projdetailshandle','projdetails',True); $t->parse('projdetailshandle','projdetails',True);
break; break;
case 'addr': case 'addr':
$nm_extra = "&addr_id=$addr_id";
break; break;
case 'proj': case 'proj':
$nm_extra = "&proj_id=$proj_id";
break; break;
} }
@ -333,7 +356,7 @@
// =========================================== // ===========================================
if (!$for_include) { if (!$for_include) {
$next_matchs = $this->nextmatchs->show_tpl('/index.php',$start, $next_matchs = $this->nextmatchs->show_tpl('/index.php',$start,
$total,"menuaction=infolog.uiinfolog.get_list&order=$order&filter=$filter&sort=$sort&query=$query&action=$action&info_id=$info_id&cat_id=$cat_id", $total,"menuaction=infolog.uiinfolog.get_list&order=$order&filter=$filter&sort=$sort&query=$query&action=$action$nm_extra&info_id=$info_id&cat_id=$cat_id",
'95%',$phpgw_info['theme']['th_bg']); '95%',$phpgw_info['theme']['th_bg']);
$t->set_var('next_matchs',$next_matchs); $t->set_var('next_matchs',$next_matchs);
if ($total > $maxmatchs) if ($total > $maxmatchs)
@ -451,6 +474,8 @@
'query' => $query,'start' => $start, 'query' => $query,'start' => $start,
'filter' => $filter,'cat_id' => $cat_id ); 'filter' => $filter,'cat_id' => $cat_id );
$referer = $this->get_referer();
if ((!isset($info_id) || !$info_id) && !$action) { if ((!isset($info_id) || !$info_id) && !$action) {
Header('Location: ' . Header('Location: ' .
$html->link('/index.php',$hidden_vars+$this->menuaction())); $html->link('/index.php',$hidden_vars+$this->menuaction()));
@ -535,15 +560,14 @@
)); ));
if (!$query_addr && !$query_project) { if (!$query_addr && !$query_project) {
Header('Location: ' . $html->link('/index.php', $hidden_vars + array( 'cd' => 15 ) + $this->menuaction())); Header('Location: ' . $html->link($referer, array('cd'=>15)));
} }
} }
} }
$this->bo->read( $info_id ); $this->bo->read( $info_id );
if ($info_id && $action == 'sp') { // new SubProject if ($info_id && $action == 'sp') { // new SubProject
if (!$this->bo->check_access($info_id,PHPGW_ACL_ADD)) { if (!$this->bo->check_access($info_id,PHPGW_ACL_ADD)) {
Header('Location: ' . Header('Location: ' . $html->link($referer));
$html->link('/index.php',$hidden_vars+$this->menuaction() ));
$phpgw->common->phpgw_exit(); $phpgw->common->phpgw_exit();
} }
$parent = $this->data; $parent = $this->data;
@ -560,19 +584,21 @@
$this->data['info_des'] = ''; $this->data['info_des'] = '';
} else { } else {
if ($info_id && !$this->bo->check_access($info_id,PHPGW_ACL_EDIT)) { if ($info_id && !$this->bo->check_access($info_id,PHPGW_ACL_EDIT)) {
Header('Location: ' . Header('Location: ' . $html->link($referer));
$html->link('/index.php',$hidden_vars+ $this->menuaction()));
$phpgw->common->phpgw_exit(); $phpgw->common->phpgw_exit();
} }
} }
$id_parent = $this->data['info_id_parent']; $id_parent = $this->data['info_id_parent'];
$common_hidden_vars = $html->input_hidden( $hidden_vars + $common_hidden_vars = $html->input_hidden( $hidden_vars + array(
array('info_id' => $info_id,'action' => $action,'id_parent' => $id_parent )); 'info_id' => $info_id,
'action' => $action,
'id_parent' => $id_parent,
'referer' => $referer
));
$phpgw->common->phpgw_header(); $phpgw->common->phpgw_header();
echo parse_navbar(); echo parse_navbar();
$t = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
$t->set_file(array('info_edit' => 'form.tpl')); $t->set_file(array('info_edit' => 'form.tpl'));
// ==================================================================== // ====================================================================
@ -677,8 +703,8 @@
if (!$action && $this->bo->check_access($info_id,PHPGW_ACL_DELETE)) { if (!$action && $this->bo->check_access($info_id,PHPGW_ACL_DELETE)) {
$t->set_var('delete_button',$html->form_1button('delete','Delete', $t->set_var('delete_button',$html->form_1button('delete','Delete',
$hidden_vars+$this->menuaction('delete'), array('referer'=>$referer),'/index.php',
'/index.php')); $this->menuaction('delete')+array('info_id'=>$info_id)));
} }
$t->set_var('edithandle',''); $t->set_var('edithandle','');
$t->set_var('addhandle',''); $t->set_var('addhandle','');
@ -694,19 +720,21 @@
$t = &$this->template; $html = &$this->html; $t = &$this->template; $html = &$this->html;
$referer = $this->get_referer();
$hidden_vars = array('sort' => $sort,'order' => $order, $hidden_vars = array('sort' => $sort,'order' => $order,
'query' => $query,'start' => $start, 'query' => $query,'start' => $start,
'filter' => $filter,'cat_id' => $cat_id ); 'filter' => $filter,'cat_id' => $cat_id,
'referer' => $referer );
if (!$info_id || if (!$info_id ||
!$this->bo->check_access($info_id,PHPGW_ACL_DELETE)) !$this->bo->check_access($info_id,PHPGW_ACL_DELETE))
{ {
Header('Location: ' . Header('Location: ' . $html->link($referer));
$html->link('/index.php',$hidden_vars+$this->menuaction()));
} }
if ($confirm) { if ($confirm) {
$this->bo->delete($info_id); $this->bo->delete($info_id);
Header('Location: ' . $html->link('/index.php',$hidden_vars + array( 'cd' => 16 )+$this->menuaction())); Header('Location: ' . $html->link($referer,array( 'cd' => 16 )));
} else { } else {
$phpgw->common->phpgw_header(); $phpgw->common->phpgw_header();
echo parse_navbar(); echo parse_navbar();
@ -720,9 +748,9 @@
$t->set_var('deleteheader',lang('Are you sure you want to delete this entry')); $t->set_var('deleteheader',lang('Are you sure you want to delete this entry'));
$t->set_var('no_button',$html->form_1button('no_button', $t->set_var('no_button',$html->form_1button('no_button',
'No - Cancel','','/index.php',$hidden_vars+$this->menuaction())); 'No - Cancel','',$referer));
$t->set_var('yes_button',$html->form_1button('yes_button', $t->set_var('yes_button',$html->form_1button('yes_button',
'Yes - Delete','','/index.php',$hidden_vars + 'Yes - Delete',$hidden_vars,'/index.php',
array('info_id' => $info_id,'confirm' => 'True')+ array('info_id' => $info_id,'confirm' => 'True')+
$this->menuaction('delete'))); $this->menuaction('delete')));
$t->pfp('out','info_delete'); $t->pfp('out','info_delete');