holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

"php5.2 fixes and hiding Export button for php4 or importexport not available"

Browse Source
This commit is contained in:
Ralf Becker 2007-05-09 08:21:26 +00:00
parent 20fcee771b
commit 4947ddfd99
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
timesheet/inc/class.botimesheet.inc.php
View File

@ -323,7 +323,7 @@ class botimesheet extends so_sql
if ($only_summary) return $this->summary;
if ($this->show_sums && strstr($order_by,'ts_start') && // sums only make sense if ordered by ts_start
if ($this->show_sums && strpos($order_by,'ts_start') !== false && // sums only make sense if ordered by ts_start
$this->db->capabilities['union'] && ($from_unixtime_ts_start = $this->db->from_unixtime('ts_start')))
{
$sum_sql = array(

5
timesheet/inc/class.uitimesheet.inc.php
View File

@ -86,7 +86,7 @@ class uitimesheet extends botimesheet
);
}
$referer = preg_match('/menuaction=([^&]+)/',$_SERVER['HTTP_REFERER'],$matches) ? $matches[1] :
(strstr($_SERVER['HTTP_REFERER'],'/infolog/index.php') ? 'infolog.uiinfolog.index' : TIMESHEET_APP.'.uitimesheet.index');
(strpos($_SERVER['HTTP_REFERER'],'/infolog/index.php') !== false ? 'infolog.uiinfolog.index' : TIMESHEET_APP.'.uitimesheet.index');
}
else
{
@ -635,6 +635,9 @@ class uitimesheet extends botimesheet
if (!is_array($projects)) $projects = array();
$sel_options['ts_project'] = $projects + array(lang('No project'));
}
// dont show [Export] button if app is not availible to the user or we are on php4
$readonlys['export'] = !$GLOBALS['egw_info']['user']['apps']['importexport'] || (int) phpversion() < 5;
return $etpl->exec(TIMESHEET_APP.'.uitimesheet.index',$content,$sel_options,$readonlys,$preserv);
}