[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] ged index.php inc/class.ged_ui.inc.php doc/TODO
|
From: |
Pascal Vilarem |
|
Subject: |
[Phpgroupware-cvs] ged index.php inc/class.ged_ui.inc.php doc/TODO |
|
Date: |
Sun, 25 Jun 2006 10:10:47 +0000 |
CVSROOT: /sources/phpgroupware
Module name: ged
Changes by: Pascal Vilarem <maat> 06/06/25 10:10:47
Modified files:
. : index.php
inc : class.ged_ui.inc.php
doc : TODO
Log message:
Cleaned template issue
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ged/index.php?cvsroot=phpgroupware&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/ged/inc/class.ged_ui.inc.php?cvsroot=phpgroupware&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/ged/doc/TODO?cvsroot=phpgroupware&r1=1.3&r2=1.4
Patches:
Index: index.php
===================================================================
RCS file: /sources/phpgroupware/ged/index.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- index.php 17 Jun 2006 18:19:25 -0000 1.4
+++ index.php 25 Jun 2006 10:10:46 -0000 1.5
@@ -21,4 +21,5 @@
include('../header.inc.php');
$GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction'=>'ged.ged_ui.browse'));
+ $GLOBALS['phpgw']->common->phpgw_exit();
?>
Index: inc/class.ged_ui.inc.php
===================================================================
RCS file: /sources/phpgroupware/ged/inc/class.ged_ui.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- inc/class.ged_ui.inc.php 17 Jun 2006 18:38:29 -0000 1.4
+++ inc/class.ged_ui.inc.php 25 Jun 2006 10:10:46 -0000 1.5
@@ -29,9 +29,9 @@
function ged_ui()
{
-
$this->theme=$GLOBALS['phpgw_info']['theme'];
- $this->t=&$GLOBALS['phpgw']->template;
+ $this->t=$GLOBALS['phpgw']->template;
+ $this->t->set_root(PHPGW_APP_TPL);
// Gestion des groupes et des droits
@@ -286,7 +286,7 @@
function display_app_header()
{
- $GLOBALS['phpgw']->common->phpgw_header(true);
+ $GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
//$this->t->set_file(array('header'=>'header.tpl'));
@@ -815,7 +815,11 @@
if ( ! $this->ged_dm->can_write($parent_id) )
{
- header('Location:
'.$GLOBALS['phpgw']->link('/index.php', $link_data));
+ $link_data=null;
+ $link_data['menuaction']='ged.ged_ui.browse';
+ $link_data['focused_id']=$parent_id;
+
+ $GLOBALS['phpgw']->redirect_link('/index.php',
$link_data);
}
$add_file=get_var('add_file',array('GET','POST'));
@@ -847,7 +851,7 @@
if ($file_added=='done')
{
- header('Location:
'.$GLOBALS['phpgw']->link('/index.php', $link_data));
+ $GLOBALS['phpgw']->redirect_link('/index.php',
$link_data);
}
}
@@ -918,7 +922,7 @@
if ( ! $this->ged_dm->can_write($element_id) )
{
- header('Location:
'.$GLOBALS['phpgw']->link('/index.php', $link_data));
+ $GLOBALS['phpgw']->redirect_link('/index.php',
$link_data);
}
@@ -976,7 +980,7 @@
$link_data['menuaction']='ged.ged_ui.browse';
$link_data['focused_id']=$element_id;
- header('Location:
'.$GLOBALS['phpgw']->link('/index.php', $link_data));
+ $GLOBALS['phpgw']->redirect_link('/index.php',
$link_data);
}
}
@@ -1000,7 +1004,7 @@
$link_data['menuaction']='ged.ged_ui.browse';
$link_data['focused_id']=$element_id;
- header('Location: '.$GLOBALS['phpgw']->link('/index.php', $link_data));
+ $GLOBALS['phpgw']->redirect_link('/index.php', $link_data);
}
else
print ( $version_added);
@@ -1028,7 +1032,7 @@
$link_data['menuaction']='ged.ged_ui.browse';
$link_data['focused_id']=$element_id;
- header('Location:
'.$GLOBALS['phpgw']->link('/index.php', $link_data));
+ $GLOBALS['phpgw']->redirect_link('/index.php',
$link_data);
}
else
print ( $version_updated);
@@ -1161,7 +1165,7 @@
$link_data=null;
$link_data['menuaction']='ged.ged_ui.browse';
$link_data['focused_id']=$element_id;
- header('Location:
'.$GLOBALS['phpgw']->link('/index.php', $link_data));
+ $GLOBALS['phpgw']->redirect_link('/index.php',
$link_data);
}
// Confirmation faite
@@ -1173,7 +1177,7 @@
$link_data['menuaction']='ged.ged_ui.browse';
$link_data['focused_id']=$parent_id;
- header('Location:
'.$GLOBALS['phpgw']->link('/index.php', $link_data));
+ $GLOBALS['phpgw']->redirect_link('/index.php',
$link_data);
}
//Affichage du formulaire de confirmation
@@ -1204,7 +1208,7 @@
if ( ! $this->ged_dm->can_write($parent_id) )
{
- header('Location:
'.$GLOBALS['phpgw']->link('/index.php', $link_data));
+ $GLOBALS['phpgw']->redirect_link('/index.php',
$link_data);
}
$add_folder=get_var('add_folder', array('GET', 'POST'));
@@ -1231,7 +1235,7 @@
if ($folder_added=='done')
{
- header('Location:
'.$GLOBALS['phpgw']->link('/index.php', $link_data));
+ $GLOBALS['phpgw']->redirect_link('/index.php',
$link_data);
}
}
@@ -1276,7 +1280,7 @@
if ( ! $this->ged_dm->can_write($element_id) )
{
- header('Location:
'.$GLOBALS['phpgw']->link('/index.php', $link_data));
+ $GLOBALS['phpgw']->redirect_link('/index.php',
$link_data);
}
@@ -1321,7 +1325,7 @@
$link_data['menuaction']='ged.ged_ui.browse';
$link_data['focused_id']=$element_id;
- header('Location:
'.$GLOBALS['phpgw']->link('/index.php', $link_data));
+ $GLOBALS['phpgw']->redirect_link('/index.php',
$link_data);
}
}
@@ -1362,7 +1366,7 @@
$link_data=null;
$link_data['menuaction']='ged.ged_ui.browse';
$link_data['focused_id']=$element_id;
- header('Location:
'.$GLOBALS['phpgw']->link('/index.php', $link_data));
+ $GLOBALS['phpgw']->redirect_link('/index.php',
$link_data);
}
// Confirmation faite
@@ -1374,7 +1378,7 @@
$link_data['menuaction']='ged.ged_ui.browse';
$link_data['focused_id']=$parent_id;
- header('Location:
'.$GLOBALS['phpgw']->link('/index.php', $link_data));
+ $GLOBALS['phpgw']->redirect_link('/index.php',
$link_data);
}
//Affichage du formulaire de confirmation
@@ -1568,7 +1572,7 @@
$link_data['menuaction']='ged.ged_ui.browse';
$link_data['focused_id']=$element_id;
- header('Location: '.$GLOBALS['phpgw']->link('/index.php',
$link_data));
+ $GLOBALS['phpgw']->redirect_link('/index.php', $link_data);
}
}
Index: doc/TODO
===================================================================
RCS file: /sources/phpgroupware/ged/doc/TODO,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- doc/TODO 17 Jun 2006 18:22:07 -0000 1.3
+++ doc/TODO 25 Jun 2006 10:10:47 -0000 1.4
@@ -130,8 +130,8 @@
DONE : $GLOBALS['phpgw']->redirect_link('/index.php', array('menuaction' =>
DONE : 'ged.ged_ui.browse'));
-Also always use arrays for the second arg for phpgwapi->link it is more
-efficient.
+DONE : Also always use arrays for the second arg for phpgwapi->link it is more
+DONE : efficient.
DONE : The last 2 lines are not needed in index.php
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] ged index.php inc/class.ged_ui.inc.php doc/TODO,
Pascal Vilarem <=