[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] calendar inc/class.bocalendar.inc.php inc/class...
|
From: |
Dave Hall |
|
Subject: |
[Phpgroupware-cvs] calendar inc/class.bocalendar.inc.php inc/class... |
|
Date: |
Thu, 28 Dec 2006 04:28:01 +0000 |
CVSROOT: /sources/phpgroupware
Module name: calendar
Changes by: Dave Hall <skwashd> 06/12/28 04:28:01
Modified files:
inc : class.bocalendar.inc.php
class.socalendar.inc.php
class.uicalendar.inc.php hook_home.inc.php
hook_home_day.inc.php
templates/base : day.tpl index.tpl week.tpl week_new.tpl
year.tpl
Log message:
remove printer friendly crap as it should be done via CSS and some
other minor tweaks
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/calendar/inc/class.bocalendar.inc.php?cvsroot=phpgroupware&r1=1.121&r2=1.122
http://cvs.savannah.gnu.org/viewcvs/calendar/inc/class.socalendar.inc.php?cvsroot=phpgroupware&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/calendar/inc/class.uicalendar.inc.php?cvsroot=phpgroupware&r1=1.147&r2=1.148
http://cvs.savannah.gnu.org/viewcvs/calendar/inc/hook_home.inc.php?cvsroot=phpgroupware&r1=1.45&r2=1.46
http://cvs.savannah.gnu.org/viewcvs/calendar/inc/hook_home_day.inc.php?cvsroot=phpgroupware&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/calendar/templates/base/day.tpl?cvsroot=phpgroupware&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/calendar/templates/base/index.tpl?cvsroot=phpgroupware&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/calendar/templates/base/week.tpl?cvsroot=phpgroupware&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/calendar/templates/base/week_new.tpl?cvsroot=phpgroupware&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/calendar/templates/base/year.tpl?cvsroot=phpgroupware&r1=1.1&r2=1.2
Patches:
Index: inc/class.bocalendar.inc.php
===================================================================
RCS file: /sources/phpgroupware/calendar/inc/class.bocalendar.inc.php,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -b -r1.121 -r1.122
--- inc/class.bocalendar.inc.php 12 Dec 2006 15:19:11 -0000 1.121
+++ inc/class.bocalendar.inc.php 28 Dec 2006 04:28:00 -0000 1.122
@@ -12,7 +12,7 @@
* option) any later version. *
\**************************************************************************/
- /* $Id: class.bocalendar.inc.php,v 1.121 2006/12/12 15:19:11 sigurdne
Exp $ */
+ /* $Id: class.bocalendar.inc.php,v 1.122 2006/12/28 04:28:00 skwashd
Exp $ */
class bocalendar
{
@@ -104,10 +104,10 @@
var $month;
var $year;
var $prefs;
+ var $date;
var $owner;
var $holiday_class = 'cal_holiday';
- var $printer_friendly = False;
var $cached_holidays;
@@ -240,8 +240,6 @@
$friendly =
(isset($_GET['friendly'])?$_GET['friendly']:'');
$friendly = ($friendly=='' &&
isset($_POST['friendly'])?$_POST['friendly']:$friendly);
- $this->printer_friendly = (intval($friendly) ==
1?True:False);
-
if(isset($_POST['filter'])) { $this->filter =
$_POST['filter']; }
if(isset($_POST['sortby'])) { $this->sortby =
$_POST['sortby']; }
if(isset($_POST['cat_id'])) { $this->cat_id =
$_POST['cat_id']; }
@@ -1570,11 +1568,6 @@
{
return 'private';
}
-// elseif(strlen($event[$field]) > 19 &&
!$this->printer_friendly)
- elseif(strlen($event[$field]) > 19 &&
$this->printer_friendly)
- {
- return substr($event[$field], 0 , 19) . '...';
- }
else
{
return $event[$field];
@@ -3112,7 +3105,6 @@
'defaultfilter' => 'all',
'default_private' => '0',
'display_minicals'=> '1',
- 'print_black_white'=>'0',
'show_descrpt_ovr'=> '1',
'show_descrpt_title'=> '1',
'show_time_line' => '1'
Index: inc/class.socalendar.inc.php
===================================================================
RCS file: /sources/phpgroupware/calendar/inc/class.socalendar.inc.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- inc/class.socalendar.inc.php 8 Dec 2006 15:12:33 -0000 1.35
+++ inc/class.socalendar.inc.php 28 Dec 2006 04:28:00 -0000 1.36
@@ -12,7 +12,7 @@
* option) any later version. *
\**************************************************************************/
- /* $Id: class.socalendar.inc.php,v 1.35 2006/12/08 15:12:33 sigurdne Exp $ */
+ /* $Id: class.socalendar.inc.php,v 1.36 2006/12/28 04:28:00 skwashd Exp $ */
class socalendar
{
@@ -89,7 +89,7 @@
if(!isset($GLOBALS['phpgw_info']['server']['calendar_type'])
||(isset($GLOBALS['phpgw_info']['server']['calendar_type']) &&
$GLOBALS['phpgw_info']['server']['calendar_type'] != 'sql'))
{
- return Array();
+ return array();
}
$starttime = mktime(0,0,0,$smonth,$sday,$syear) -
$GLOBALS['phpgw']->datetime->tz_offset;
Index: inc/class.uicalendar.inc.php
===================================================================
RCS file: /sources/phpgroupware/calendar/inc/class.uicalendar.inc.php,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -b -r1.147 -r1.148
--- inc/class.uicalendar.inc.php 14 Dec 2006 12:51:30 -0000 1.147
+++ inc/class.uicalendar.inc.php 28 Dec 2006 04:28:01 -0000 1.148
@@ -12,7 +12,7 @@
* option) any later version. *
\**************************************************************************/
- /* $Id: class.uicalendar.inc.php,v 1.147 2006/12/14 12:51:30 skwashd
Exp $ */
+ /* $Id: class.uicalendar.inc.php,v 1.148 2006/12/28 04:28:01 skwashd
Exp $ */
class uicalendar
{
@@ -356,18 +356,7 @@
)
);
- if (!$this->bo->printer_friendly)
- {
- $printer = '';
$param =
array('year'=>$this->bo->year,'month'=>$this->bo->month,'friendly'=>1);
- $print = '<a
href="'.$this->page('month',$param)."\" TARGET=\"_blank\">[".lang('Printer
Friendly').']</a>';
- }
- else
- {
- $printer = '<body class="printer">';
- $print = '';
- $GLOBALS['phpgw_info']['flags']['nofooter'] =
True;
- }
$this->bo->read_holidays();
@@ -379,8 +368,6 @@
: $this->bo->contacts->get_name_of_person_id($this->bo->owner) ),
'small_calendar_next' => $minical_next,
'large_month' =>
$this->display_month($this->bo->month,$this->bo->year,True,$this->bo->owner),
- 'printer_friendly' =>
$printer,
- 'print' =>
$print
);
$p =
CreateObject('phpgwapi.Template',$this->template_dir);
@@ -443,22 +430,9 @@
));
- if (!$this->bo->printer_friendly)
- {
$param =
array('friendly'=>1,'date'=>sprintf("%04d%02d%02d",$this->bo->year,$this->bo->month,$this->bo->day));
- $printer = '';
$prev_week_link = '<a href="'.
$this->page($week_type_name,array('date'=>$prev['full'])).'"><<</a>';
$next_week_link = '<a href="'.
$this->page($week_type_name,array('date'=>$next['full'])).'">>></a>';
- $print = '<a
href="'.$this->page('week',$param)."\" TARGET=\"_blank\">[".lang('Printer
Friendly').']</a>';
- }
- else
- {
- $printer = '<body class="printer">';
- $prev_week_link = '';
- $next_week_link = '';
- $print = '';
- $GLOBALS['phpgw_info']['flags']['nofooter'] =
True;
- }
$var = array(
'small_calendar_prev' => $minical_prev,
@@ -466,8 +440,6 @@
'small_calendar_this' => $minical_this,
'week_identifier' =>
$this->bo->get_week_label(),
'next_week_link' =>
$next_week_link,
- 'printer_friendly' =>
$printer,
- 'print' =>
$print,
'username' => (
$this->bo->is_group
? $GLOBALS['phpgw']->common->grab_owner_name($this->bo->owner)
: $this->bo->contacts->get_name_of_person_id($this->bo->owner) ),
@@ -510,28 +482,13 @@
function get_year()
{
- if(!$this->bo->printer_friendly)
- {
$param =
array('friendly'=>1,'year'=>$this->bo->year);
- $print = '';
$left_link = '<a
href="'.$this->page('year',array('year'=>($this->bo->year -
1))).'"><<</a>';
$right_link = '<a
href="'.$this->page('year',array('year'=>($this->bo->year +
1))).'">>></a>';
$link = 'day';
- $printer = '<a
href="'.$this->page('year',$param)."\" TARGET=\"_blank\">[".lang('Printer
Friendly').']</a>';
- }
- else
- {
- $print = '<body class="printer">';
- $left_link = '';
- $right_link = '';
- $link = '';
- $printer = '';
- }
$var = array
(
- 'print' => $print,
- 'printer_friendly'=> $printer,
'left_link' => $left_link,
'year_text' => $this->bo->year,
'right_link'=> $right_link,
@@ -1120,18 +1077,7 @@
$p->set_block('day_t','day','day');
$p->set_block('day_t','day_event','day_event');
- if (!$this->bo->printer_friendly)
- {
- $printer = '';
$param =
array('date'=>sprintf("%04d%02d%02d",$this->bo->year,$this->bo->month,$this->bo->day),'friendly'=>1);
- $print = '<a
href="'.$this->page('day',$param)."\" TARGET=\"_blank\">[".lang('Printer
Friendly').']</a>';
- }
- else
- {
- $GLOBALS['phpgw_info']['flags']['nofooter'] =
True;
- $printer = '<body class="printer">';
- $print = '';
- }
$var = array
(
@@ -1145,8 +1091,6 @@
'small_calendar' => $minical,
'date' =>
$this->bo->long_date($now),
'username' => (
$this->bo->is_group ?
$GLOBALS['phpgw']->common->grab_owner_name($this->bo->owner) :
$this->bo->contacts->get_name_of_person_id($this->bo->owner) ),
- 'print' => $print,
- 'printer_friendly' => $printer
);
if ( $this->bo->debug )
@@ -2328,10 +2272,7 @@
$this->header_included = true;
$GLOBALS['phpgw']->common->phpgw_header();
- if(!$this->bo->printer_friendly)
- {
echo parse_navbar();
- }
$cols = 8;
if($this->bo->check_perms(PHPGW_ACL_PRIVATE) == True)
@@ -2347,7 +2288,7 @@
{
$file = PHPGW_SERVER_ROOT .
'/calendar/templates/base/header.inc.php';
}
- if($local_header && !$this->bo->printer_friendly)
+ if($local_header)
{
include($file);
}
@@ -3185,8 +3126,6 @@
$cellcolor = $this->theme['row_off'];
-// $true_printer_friendly = $this->bo->printer_friendly;
-
if(is_array($owners))
{
$display_name = True;
Index: inc/hook_home.inc.php
===================================================================
RCS file: /sources/phpgroupware/calendar/inc/hook_home.inc.php,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- inc/hook_home.inc.php 10 Nov 2006 13:34:30 -0000 1.45
+++ inc/hook_home.inc.php 28 Dec 2006 04:28:01 -0000 1.46
@@ -12,12 +12,14 @@
* option) any later version. *
\**************************************************************************/
- /* $Id: hook_home.inc.php,v 1.45 2006/11/10 13:34:30 sigurdne Exp $ */
+ /* $Id: hook_home.inc.php,v 1.46 2006/12/28 04:28:01 skwashd Exp $ */
- if (
isset($GLOBALS['phpgw_info']['user']['preferences']['calendar']['mainscreen_showevents'])
- &&
$GLOBALS['phpgw_info']['user']['preferences']['calendar']['mainscreen_showevents']
)
+ if (
!isset($GLOBALS['phpgw_info']['user']['preferences']['calendar']['mainscreen_showevents'])
+ ||
!$GLOBALS['phpgw_info']['user']['preferences']['calendar']['mainscreen_showevents']
)
{
+ return;
+ }
$GLOBALS['phpgw']->translation->add_app('calendar');
if ( !isset($GLOBALS['phpgw']->datetime)
|| !is_object($GLOBALS['phpgw']->datetime) )
@@ -53,7 +55,7 @@
include_once(PHPGW_INCLUDE_ROOT.'/calendar/inc/hook_home_'.$_page.'.inc.php');
- $title = '<h2>'.lang('Calendar').'</h2>';
+ $title = lang('Calendar');
//TODO Make listbox css compliant
$portalbox = CreateObject('phpgwapi.listbox', array
@@ -87,6 +89,4 @@
echo "\n".'<!-- BEGIN Calendar info
-->'."\n".$portalbox->draw($GLOBALS['extra_data'])."\n".'<!-- END Calendar info
-->'."\n";
unset($cal);
- }
- flush();
?>
Index: inc/hook_home_day.inc.php
===================================================================
RCS file: /sources/phpgroupware/calendar/inc/hook_home_day.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- inc/hook_home_day.inc.php 15 May 2005 06:57:37 -0000 1.6
+++ inc/hook_home_day.inc.php 28 Dec 2006 04:28:01 -0000 1.7
@@ -12,15 +12,7 @@
* option) any later version. *
\**************************************************************************/
- /* $Id: hook_home_day.inc.php,v 1.6 2005/05/15 06:57:37 skwashd Exp $ */
-
- $d1 = strtolower(substr(PHPGW_APP_INC,0,3));
- if($d1 == 'htt' || $d1 == 'ftp' )
- {
- echo 'Failed attempt to break in via an old Security Hole!<br
/>'."\n";
- $GLOBALS['phpgw']->common->phpgw_exit();
- }
- unset($d1);
+ /* $Id: hook_home_day.inc.php,v 1.7 2006/12/28 04:28:01 skwashd Exp $ */
$GLOBALS['extra_data'] = $GLOBALS['css']."\n".'<td>'."\n".'<table
border="0" cols="3"><tr><td align="center" width="35%" valign="top">'
. ExecMethod('calendar.uicalendar.mini_calendar',
Index: templates/base/day.tpl
===================================================================
RCS file: /sources/phpgroupware/calendar/templates/base/day.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- templates/base/day.tpl 28 Jul 2006 03:30:43 -0000 1.1
+++ templates/base/day.tpl 28 Dec 2006 04:28:01 -0000 1.2
@@ -1,6 +1,5 @@
-<!-- $Id: day.tpl,v 1.1 2006/07/28 03:30:43 skwashd Exp $ -->
+<!-- $Id: day.tpl,v 1.2 2006/12/28 04:28:01 skwashd Exp $ -->
<!-- BEGIN day -->
-{printer_friendly}
<table border="0" width="100%">
<tr>
<td valign="top" width="70%">
@@ -25,7 +24,6 @@
</td>
</tr>
</table>
-{print}
<!-- END day -->
<!-- BEGIN day_event -->
<tr>
Index: templates/base/index.tpl
===================================================================
RCS file: /sources/phpgroupware/calendar/templates/base/index.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- templates/base/index.tpl 28 Jul 2006 03:30:43 -0000 1.1
+++ templates/base/index.tpl 28 Dec 2006 04:28:01 -0000 1.2
@@ -1,5 +1,4 @@
-<!-- $Id: index.tpl,v 1.1 2006/07/28 03:30:43 skwashd Exp $ -->
-{printer_friendly}
+<!-- $Id: index.tpl,v 1.2 2006/12/28 04:28:01 skwashd Exp $ -->
<table border="0" width="100%">
<tr>
<td align="left" valign="top">
@@ -17,5 +16,4 @@
{large_month}
<p>
<p>
-{print}
Index: templates/base/week.tpl
===================================================================
RCS file: /sources/phpgroupware/calendar/templates/base/week.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- templates/base/week.tpl 28 Jul 2006 03:30:43 -0000 1.1
+++ templates/base/week.tpl 28 Dec 2006 04:28:01 -0000 1.2
@@ -1,5 +1,4 @@
-<!-- $Id: week.tpl,v 1.1 2006/07/28 03:30:43 skwashd Exp $ -->
-{printer_friendly}
+<!-- $Id: week.tpl,v 1.2 2006/12/28 04:28:01 skwashd Exp $ -->
<table border="0" width="100%" cols="5">
<tr>
<td align="left" valign="top" width="20%">
@@ -25,4 +24,3 @@
</td>
</table>
{week_display}
-{print}
Index: templates/base/week_new.tpl
===================================================================
RCS file: /sources/phpgroupware/calendar/templates/base/week_new.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- templates/base/week_new.tpl 28 Jul 2006 03:30:43 -0000 1.1
+++ templates/base/week_new.tpl 28 Dec 2006 04:28:01 -0000 1.2
@@ -1,5 +1,4 @@
-<!-- $Id: week_new.tpl,v 1.1 2006/07/28 03:30:43 skwashd Exp $ -->
-{printer_friendly}
+<!-- $Id: week_new.tpl,v 1.2 2006/12/28 04:28:01 skwashd Exp $ -->
<table border="0" width="100%" cols="5">
<tr>
<td align="left" valign="top" width="20%">
@@ -25,5 +24,4 @@
</td>
</table>
{week_display}
-{print}
{tooltip_js}
Index: templates/base/year.tpl
===================================================================
RCS file: /sources/phpgroupware/calendar/templates/base/year.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- templates/base/year.tpl 28 Jul 2006 03:30:43 -0000 1.1
+++ templates/base/year.tpl 28 Dec 2006 04:28:01 -0000 1.2
@@ -1,5 +1,4 @@
<!-- BEGIN year -->
-{print}
<center>
<table border="0" cellspacing="3" cellpadding="4" cols=4>
<tr>
@@ -17,7 +16,6 @@
</table>
</center>
<p>
-{printer_friendly}
<!-- END year -->
<!-- BEGIN month -->
<td valign="top">