[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] sitemgr inc/class.Common_BO.inc.php inc/class.C... [s
|
From: |
Dave Hall |
|
Subject: |
[Phpgroupware-cvs] sitemgr inc/class.Common_BO.inc.php inc/class.C... [skwashd-16-compat] |
|
Date: |
Mon, 24 Jul 2006 03:31:54 +0000 |
CVSROOT: /cvsroot/phpgroupware
Module name: sitemgr
Branch: skwashd-16-compat
Changes by: Dave Hall <skwashd> 06/07/24 03:31:54
Modified files:
inc : class.Common_BO.inc.php class.Common_UI.inc.php
class.Sites_BO.inc.php class.Sites_SO.inc.php
class.Sites_UI.inc.php
modules : class.module_calendar.inc.php
class.module_toc_block.inc.php
setup : default_records.inc.php
sitemgr-site : functions.inc.php
Log message:
mods for head compat
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/sitemgr/inc/class.Common_BO.inc.php?cvsroot=phpgroupware&only_with_tag=skwashd-16-compat&r1=1.1.2.4&r2=1.1.2.4.4.1
http://cvs.savannah.gnu.org/viewcvs/sitemgr/inc/class.Common_UI.inc.php?cvsroot=phpgroupware&only_with_tag=skwashd-16-compat&r1=1.8.2.5.4.1&r2=1.8.2.5.4.2
http://cvs.savannah.gnu.org/viewcvs/sitemgr/inc/class.Sites_BO.inc.php?cvsroot=phpgroupware&only_with_tag=skwashd-16-compat&r1=1.7.2.1.4.1&r2=1.7.2.1.4.2
http://cvs.savannah.gnu.org/viewcvs/sitemgr/inc/class.Sites_SO.inc.php?cvsroot=phpgroupware&only_with_tag=skwashd-16-compat&r1=1.2.2.3.4.1&r2=1.2.2.3.4.2
http://cvs.savannah.gnu.org/viewcvs/sitemgr/inc/class.Sites_UI.inc.php?cvsroot=phpgroupware&only_with_tag=skwashd-16-compat&r1=1.6.2.1.4.1&r2=1.6.2.1.4.2
http://cvs.savannah.gnu.org/viewcvs/sitemgr/modules/class.module_calendar.inc.php?cvsroot=phpgroupware&only_with_tag=skwashd-16-compat&r1=1.1.2.1&r2=1.1.2.1.4.1
http://cvs.savannah.gnu.org/viewcvs/sitemgr/modules/class.module_toc_block.inc.php?cvsroot=phpgroupware&only_with_tag=skwashd-16-compat&r1=1.1.2.1.4.2&r2=1.1.2.1.4.3
http://cvs.savannah.gnu.org/viewcvs/sitemgr/setup/default_records.inc.php?cvsroot=phpgroupware&only_with_tag=skwashd-16-compat&r1=1.3.2.1&r2=1.3.2.1.4.1
http://cvs.savannah.gnu.org/viewcvs/sitemgr/sitemgr-site/functions.inc.php?cvsroot=phpgroupware&only_with_tag=skwashd-16-compat&r1=1.6.2.2&r2=1.6.2.2.4.1
Patches:
Index: inc/class.Common_BO.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.Common_BO.inc.php,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.4.4.1
diff -u -b -r1.1.2.4 -r1.1.2.4.4.1
--- inc/class.Common_BO.inc.php 30 Mar 2004 09:11:03 -0000 1.1.2.4
+++ inc/class.Common_BO.inc.php 24 Jul 2006 03:31:54 -0000 1.1.2.4.4.1
@@ -119,17 +119,17 @@
function get_othermenu()
{
$numberofsites =
$GLOBALS['Common_BO']->sites->getnumberofsites();
- $isadmin =
$GLOBALS['phpgw']->acl->check('run',1,'admin');
- if ($numberofsites < 2 && !$isadmin)
+ $isadmin =
isset($GLOBALS['phpgw_info']['user']['apps']['admin']);
+ if ($numberofsites <= 1 && !$isadmin)
{
- return false;
+ return array();
}
$menu_title = lang('Other websites');
if ($numberofsites > 1)
{
$link_data['menuaction'] =
'sitemgr.Common_UI.DisplayMenu';
$sites =
$GLOBALS['Common_BO']->sites->list_sites(False);
- while(list($site_id,$site) = @each($sites))
+ foreach ( $sites as $site_id => $site )
{
if ($site_id != CURRENT_SITE_ID)
{
Index: inc/class.Common_UI.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.Common_UI.inc.php,v
retrieving revision 1.8.2.5.4.1
retrieving revision 1.8.2.5.4.2
diff -u -b -r1.8.2.5.4.1 -r1.8.2.5.4.2
--- inc/class.Common_UI.inc.php 9 May 2006 05:04:50 -0000 1.8.2.5.4.1
+++ inc/class.Common_UI.inc.php 24 Jul 2006 03:31:54 -0000 1.8.2.5.4.2
@@ -7,7 +7,7 @@
* Free Software Foundation; either version 2 of the License, or (at
your *
* option) any later version.
*
\***************************************************************************/
- /* $Id: class.Common_UI.inc.php,v 1.8.2.5.4.1 2006/05/09 05:04:50
skwashd Exp $ */
+ /* $Id: class.Common_UI.inc.php,v 1.8.2.5.4.2 2006/07/24 03:31:54
skwashd Exp $ */
class Common_UI
{
@@ -52,7 +52,7 @@
$this->t->set_block('MainMenu','switch','switchhandle');
$this->t->set_block('MainMenu','menuentry','entry');
$this->t->set_var('lang_sitemenu',lang('Website') . ' '
. $GLOBALS['Common_BO']->sites->current_site['site_name']);
- reset($GLOBALS['Common_BO']->sitemenu);
+
foreach($GLOBALS['Common_BO']->sitemenu as $ignored =>
$values)
{
if ($values['text'] == '_NewLine_')
@@ -62,24 +62,23 @@
$this->t->set_var(array('value'=>$values['url'],'display'=>lang($values['text'])));
$this->t->parse('sitemenu','menuentry', true);
}
- if ($GLOBALS['Common_BO']->othermenu)
+ if ( is_array($GLOBALS['Common_BO']->othermenu) &&
count($GLOBALS['Common_BO']->othermenu) )
{
- $this->t->set_var('lang_othermenu',lang('Other
websites'));
- reset($GLOBALS['Common_BO']->othermenu);
+ $this->t->set_var('lang_othermenu', lang('Other
websites'));
foreach($GLOBALS['Common_BO']->othermenu as
$ignored => $values)
{
if ($values['text'] == '_NewLine_')
{
continue;
}
-
$this->t->set_var(array('value'=>$values['url'],'display'=>lang($values['text'])));
+ $this->t->set_var(array('value' =>
$values['url'], 'display' => lang($values['text'])));
$this->t->parse('othermenu','menuentry', true);
}
$this->t->parse('switchhandle','switch');
}
else
{
-
$this->t->set_var('switchhandle','testtesttest');
+ $this->t->set_var('switchhandle','');
}
$this->t->pfp('out','MainMenu');
$this->DisplayFooter();
@@ -361,7 +360,8 @@
if ($this->do_sites_exist)
{
- if
($GLOBALS['phpgw_info']['server']['template_set'] == 'idots')
+ if (
$GLOBALS['phpgw_info']['server']['template_set'] == 'idots'
+ ||
$GLOBALS['phpgw_info']['server']['template_set'] == 'desktop' )
{
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
Index: inc/class.Sites_BO.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.Sites_BO.inc.php,v
retrieving revision 1.7.2.1.4.1
retrieving revision 1.7.2.1.4.2
diff -u -b -r1.7.2.1.4.1 -r1.7.2.1.4.2
--- inc/class.Sites_BO.inc.php 27 Mar 2006 13:13:24 -0000 1.7.2.1.4.1
+++ inc/class.Sites_BO.inc.php 24 Jul 2006 03:31:54 -0000 1.7.2.1.4.2
@@ -9,7 +9,7 @@
* option) any later version. *
\**************************************************************************/
- /* $Id: class.Sites_BO.inc.php,v 1.7.2.1.4.1 2006/03/27 13:13:24 skwashd Exp
$ */
+ /* $Id: class.Sites_BO.inc.php,v 1.7.2.1.4.2 2006/07/24 03:31:54 skwashd Exp
$ */
class Sites_BO
{
@@ -73,7 +73,7 @@
function list_sites($limit=True)
{
- return
$this->so->getWebsites($limit,$this->start,$this->sort,$this->order,$this->query,$this->total);
+ return $this->so->getWebsites($limit, $this->start,
$this->sort, $this->order, $this->query, $this->total);
}
function getnumberofsites()
Index: inc/class.Sites_SO.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.Sites_SO.inc.php,v
retrieving revision 1.2.2.3.4.1
retrieving revision 1.2.2.3.4.2
diff -u -b -r1.2.2.3.4.1 -r1.2.2.3.4.2
--- inc/class.Sites_SO.inc.php 27 Mar 2006 13:13:24 -0000 1.2.2.3.4.1
+++ inc/class.Sites_SO.inc.php 24 Jul 2006 03:31:54 -0000 1.2.2.3.4.2
@@ -22,6 +22,7 @@
function getWebsites($limit,$start,$sort,$order,$query,&$total)
{
+ $result = array();
if ($limit)
{
if (!$sort)
Index: inc/class.Sites_UI.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.Sites_UI.inc.php,v
retrieving revision 1.6.2.1.4.1
retrieving revision 1.6.2.1.4.2
diff -u -b -r1.6.2.1.4.1 -r1.6.2.1.4.2
--- inc/class.Sites_UI.inc.php 9 May 2006 05:04:50 -0000 1.6.2.1.4.1
+++ inc/class.Sites_UI.inc.php 24 Jul 2006 03:31:54 -0000 1.6.2.1.4.2
@@ -9,7 +9,7 @@
* option) any later version. *
\**************************************************************************/
- /* $Id: class.Sites_UI.inc.php,v 1.6.2.1.4.1 2006/05/09 05:04:50 skwashd Exp
$ */
+ /* $Id: class.Sites_UI.inc.php,v 1.6.2.1.4.2 2006/07/24 03:31:54 skwashd Exp
$ */
//copied from class admin.uiservers
class Sites_UI
@@ -72,7 +72,7 @@
{
$this->common_ui->DisplayHeader();
- if (!$GLOBALS['phpgw']->acl->check('run',1,'admin'))
+ if (
!isset($GLOBALS['phpgw_info']['user']['apps']['admin']) )
{
$this->deny();
}
@@ -94,7 +94,6 @@
}
$this->save_sessiondata();
- $sites = $this->bo->list_sites();
$left =
$this->nextmatchs->left('/index.php',$this->start,$this->bo->total,'menuaction=sitemgr.Sites_UI.list_sites');
$right =
$this->nextmatchs->right('/index.php',$this->start,$this->bo->total,'menuaction=sitemgr.Sites_UI.list_sites');
@@ -114,7 +113,8 @@
)
));
- while(list($site_id,$site) = @each($sites))
+ $sites = $this->bo->list_sites();
+ foreach ( $sites as $site_id => $site )
{
$tr_color =
$this->nextmatchs->alternate_row_color($tr_color);
@@ -130,8 +130,7 @@
$GLOBALS['phpgw']->template->parse('list','site_list', true);
}
- $GLOBALS['phpgw']->template->parse('out','site_list_t',
true);
- $GLOBALS['phpgw']->template->p('out');
+ $GLOBALS['phpgw']->template->pfp('out','site_list_t',
true);
$this->common_ui->DisplayFooter();
}
@@ -144,7 +143,7 @@
}
$this->common_ui->DisplayHeader();
- if (!$GLOBALS['phpgw']->acl->check('run',1,'admin'))
+ if ( !
isset($GLOBALS['phpgw_info']['user']['apps']['admin']) )
{
$this->deny();
}
Index: modules/class.module_calendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/modules/class.module_calendar.inc.php,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.1.4.1
diff -u -b -r1.1.2.1 -r1.1.2.1.4.1
--- modules/class.module_calendar.inc.php 3 May 2003 21:10:40 -0000
1.1.2.1
+++ modules/class.module_calendar.inc.php 24 Jul 2006 03:31:54 -0000
1.1.2.1.4.1
@@ -23,196 +23,121 @@
function get_content(&$arguments,$properties)
{
- $t = Createobject('phpgwapi.Template');
- $t->set_root($this->find_template_dir());
- $t->set_file('mini_calendar','mini_cal.tpl');
+ //TODO Look at caching - skwashd jun-2006
+ $t = createObject('phpgwapi.Template');
- if (!$arguments['timestamp'])
- {
- $arguments['timestamp'] = time();
- }
- if ($arguments['prevmonth'])
- {
- $arguments['timestamp'] =
mktime(0,0,0,date("m",$arguments['timestamp'])-1,date("d",$arguments['timestamp']),
date("Y",$arguments['timestamp']));
- }
- elseif ($arguments['nextmonth'])
- {
- $arguments['timestamp'] =
mktime(0,0,0,date("m",$arguments['timestamp'])+1,date("d",$arguments['timestamp']),
date("Y",$arguments['timestamp']));
- }
-
- $date =
$GLOBALS['phpgw']->datetime->gmtdate($arguments['timestamp']);
- $month = $date['month'];
- $day = $date['day'];
- $year = $date['year'];
- $this->bo->read_holidays($year);
-
- $month_ago = intval(date('Ymd',mktime(0,0,0,$month -
1,$day,$year)));
- $month_ahead = intval(date('Ymd',mktime(0,0,0,$month +
1,$day,$year)));
- $monthstart = intval(date('Ymd',mktime(0,0,0,$month,1,$year)));
- $monthend = intval(date('Ymd',mktime(0,0,0,$month +
1,0,$year)));
-
- $weekstarttime =
$GLOBALS['phpgw']->datetime->get_weekday_start($year,$month,1);
-
- $t->set_block('mini_calendar','mini_cal','mini_cal');
- $t->set_block('mini_calendar','mini_week','mini_week');
- $t->set_block('mini_calendar','mini_day','mini_day');
+ $this->bo->read_holidays(date('Y'));
- $linkdata['menuaction'] = 'calendar.uicalendar.month';
- $linkdata['month'] =
$GLOBALS['phpgw']->common->show_date($date['raw'],'m');
- $linkdata['year'] =
$GLOBALS['phpgw']->common->show_date($date['raw'],'Y');
+ $cal = createObject('calendar.socalendar', array('owner' =>
$GLOBALS['phpgw_info']['user']['person_id']));
- $month = '<a href="'
.$GLOBALS['phpgw']->link('/index.php',$linkdata) . '" class="minicalendar">' .
lang($GLOBALS['phpgw']->common->show_date($date['raw'],'F')).'
'.$GLOBALS['phpgw']->common->show_date($date['raw'],'Y').'</a>';
+ $start = $end = array(); //initialize arrays
+ list($start['d'], $start['m'], $start['y']) = explode('-',
date('d-n-Y'));
+ list($end['d'], $end['m'], $end['y']) = explode('-',
date('d-n-Y', strtotime('+1 month')));
- $var = Array(
- 'cal_img_root' =>
$GLOBALS['phpgw']->common->image('calendar','mini-calendar-bar'),
- 'bgcolor' =>
$calui->theme['bg_color'],
- 'bgcolor1' =>
$calui->theme['bg_color'],
- 'month' => $month,
- 'bgcolor2' =>
$calui->theme['cal_dayview'],
- 'holiday_color' => $calui->holiday_color,
- 'navig' => '<form method="post">' .
- $this->build_post_element('prevmonth') .
' ' .
- $this->build_post_element('nextmonth') .
'</form>'
- );
+ $str = $this->_get_css();
- $t->set_var($var);
+ $ids = array();
+ $ids += $cal->list_events($start['y'], $start['m'],
$start['d'], $end['y'], $end['m'], $end['d']);
+ $ids += $cal->list_repeated_events($start['y'], $start['m'],
$start['d'], $end['y'], $end['m'], $end['d']);
- if(!$t->get_var('daynames'))
+ if ( !count($ids) )
{
- for($i=0;$i<7;$i++)
- {
- $var = Array(
- 'dayname' => '<b>' .
substr(lang($GLOBALS['phpgw']->datetime->days[$i]),0,2) . '</b>',
- 'day_image' => ''
- );
-
$this->output_template_array($t,'daynames','mini_day',$var);
- }
+ return lang('no events');
}
- $today =
date('Ymd',$GLOBALS['phpgw']->datetime->users_localtime);
- unset($date);
- for($i=$weekstarttime +
$GLOBALS['phpgw']->datetime->tz_offset;date('Ymd',$i)<=$monthend;$i += (24 *
3600 * 7))
- {
- unset($var);
- $daily = $this->set_week_array($i -
$GLOBALS['phpgw']->datetime->tz_offset,$cellcolor,$weekly);
- @reset($daily);
- while(list($date,$day_params) = each($daily))
- {
- $year = intval(substr($date,0,4));
- $month = intval(substr($date,4,2));
- $day = intval(substr($date,6,2));
- $str = '';
-
- unset($linkdata);
- $linkdata['menuaction'] =
'calendar.uicalendar.day';
- $linkdata['date']= $date;
- $str = '<a href="'
.$GLOBALS['phpgw']->link('/index.php',$linkdata) .'" class="'
.$day_params['class'] .'">' .$day .'</a>';
- $var[] = Array(
- 'day_image' =>
$day_params['day_image'],
- 'dayname' => $str
- );
- }
- for($l=0;$l<count($var);$l++)
+ foreach ( $ids as $id )
{
-
$this->output_template_array($t,'monthweek_day','mini_day',$var[$l]);
- }
- $t->parse('display_monthweek','mini_week',True);
- $t->set_var('dayname','');
- $t->set_var('monthweek_day','');
- }
+ $event = $cal->read_entry($id);
+ $time_str =
$GLOBALS['phpgw_info']['user']['preferences']['common']['timeformat'] == 12 ?
'g:i a' : 'H:i';
+ $date_str = date("d M||$time_str",
mktime($event['start']['hour'], $event['start']['min'], $event['start']['sec'],
$event['start']['month'], $event['start']['mday'], $event['start']['year']));
+ list($fmtd_date, $fmtd_time) = explode('||', $date_str);
+/* TODO Consider implementing the hcal microformat - need some more work and a
decision on xhtml - skwashd jun-2006
+$str .= <<<EOT
- $return_value = $t->fp('out','mini_cal');
- $t->set_var('display_monthweek','');
-// $t->set_var('daynames','');
-// unset($p);
- return $return_value;
- }
+ <div id="cal_123" class="cal_block vevent">
+ <abbr class="dtstart dtstamp"
title="2005-10-05">{$fmtd_date}</abbr>
+ <span class="details"
onclick="document.getElementById('descr_123').style.display = 'block'; return
true;">
+ <h3>
+ <abbr class="dtend"
title="2005-10-08">7:00 am</abbr> -
+ <span class="summary">Demo Event</span>
+ </h3>
+ <span class="location">Somewhere</span>
+ <p class="description" id="descr_123">
+ More info here<br>
+ <a href="#" class="url">[more info]</a>
+ </p>
+ </div>
+EOT;
+*/
+ $str .= <<<EOT
+
+ <div id="cal_123" class="vevent">
+ <span class="event_date">{$fmtd_date}</span>
+ <span class="event_details"
onclick="document.getElementById('descr_{$id}').style.display = 'block'; return
true;">
+ <h3>
+ <span
class="event_start">{$fmtd_time}</span> -
+ <span
class="event_summary">{$event['title']}</span>
+ </h3>
+ <span
class="location">{$event['location']}</span>
+ <p class="event_description" id="descr_{$id}">
+ {$event['description']}
+ </p>
+ </div>
+EOT;
- function output_template_array(&$p,$row,$list,$var)
- {
- if (!isset($var['hidden_vars']))
- {
- $var['hidden_vars'] = '';
}
- $p->set_var($var);
- $p->parse($row,$list,True);
+ //FIXME use templates - skwashd jun-2006
+ return $str;
}
- function set_week_array($startdate,$cellcolor,$weekly)
- {
- for ($j=0,$datetime=$startdate;$j<7;$j++,$datetime += 86400)
- {
- $date = date('Ymd',$datetime + (60 * 60 * 2));
-
- if($this->bo->cached_events[$date])
+ function _get_css()
{
- $appts = True;
- }
- else
+ //FIXME move to template stylesheet definitions - dependent on
final decision re xhtml/hcal - skwashd jun-2006
+ $str = <<<EOT
+ <style type="text/css">
+ .vevent
{
- $appts = False;
+ clear: both;
}
- $holidays = $this->bo->cached_holidays[$date];
- if($weekly)
+ .vevent a
{
- $cellcolor =
$GLOBALS['phpgw']->nextmatchs->alternate_row_color($cellcolor);
+ text-decoration: none;
}
- $day_image = '';
- if($holidays)
- {
- $extra = '
bgcolor="'.$this->bo->holiday_color.'"';
- $class = ($appts?'b':'').'minicalhol';
- if ($date == $this->bo->today)
- {
- $day_image = '
background="'.$GLOBALS['phpgw']->common->image('calendar','mini_day_block').'"';
- }
- }
- elseif ($date != $this->bo->today)
+ .event_date
{
- $extra = ' bgcolor="'.$cellcolor.'"';
- $class = ($appts?'b':'').'minicalendar';
- }
- else
- {
- $extra = '
bgcolor="'.$GLOBALS['phpgw_info']['theme']['cal_today'].'"';
- $class = ($appts?'b':'').'minicalendar';
- $day_image = '
background="'.$GLOBALS['phpgw']->common->image('calendar','mini_day_block').'"';
+ background-color: #eee;
+ border: 0px solid #000;
+ border-width: 0px 1px 1px 0px;
+ display: block;
+ font-size: 20px;
+ font-weight: bold;
+ float: left;
+ margin: 2px 10px;
+ padding: 3px;
+ text-align: center;
+ width: 50px;
}
- if($this->bo->check_perms(PHPGW_ACL_ADD))
+ .vevent p
{
- $new_event = True;
+ margin: 3px 0px;
}
- else
- {
- $new_event = False;
- }
- $holiday_name = Array();
- if($holidays)
- {
- for($k=0;$k<count($holidays);$k++)
+
+ .vevent .event_description
{
- $holiday_name[] = $holidays[$k]['name'];
- }
+ display: none;
}
- $week = '';
- if (!$j || (!$weekly && $j && substr($date,6,2) ==
'01'))
+
+ .vevent .event_details
{
- $week = lang('week').'
'.(int)((date('z',($startdate+(24*3600*4)))+7)/7);
+ display: block;
+ margin-left: 75px;
}
- $daily[$date] = Array(
- 'extra' => $extra,
- 'new_event' => $new_event,
- 'holidays' => $holiday_name,
- 'appts' => $appts,
- 'week' => $week,
- 'day_image' => $day_image,
- 'class' => $class
- );
- }
-
- return $daily;
+ </style>
+EOT;
+ return $str;
}
}
+?>
Index: modules/class.module_toc_block.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/modules/class.module_toc_block.inc.php,v
retrieving revision 1.1.2.1.4.2
retrieving revision 1.1.2.1.4.3
diff -u -b -r1.1.2.1.4.2 -r1.1.2.1.4.3
--- modules/class.module_toc_block.inc.php 15 May 2006 10:48:36 -0000
1.1.2.1.4.2
+++ modules/class.module_toc_block.inc.php 24 Jul 2006 03:31:54 -0000
1.1.2.1.4.3
@@ -33,13 +33,13 @@
$content .= "</li>\n</ul>\n</li>\n";
}
- $content .= '<li' . ($cat_id == $cur_cat ? '
class="active">' : '>') . $cat['link'];
-
if ( $depth < $cat['depth'] )
{
$content .= "<ul>\n";
}
+ $content .= '<li' . ($cat_id == $cur_cat ? '
class="active">' : '>') . $cat['link'];
+
$pages = $GLOBALS['objbo']->getPageLinks($cat_id,
false);
if ( is_array($pages) && count($pages) )
{
Index: setup/default_records.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/setup/default_records.inc.php,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.1.4.1
diff -u -b -r1.3.2.1 -r1.3.2.1.4.1
--- setup/default_records.inc.php 23 Jun 2003 20:31:21 -0000 1.3.2.1
+++ setup/default_records.inc.php 24 Jul 2006 03:31:54 -0000
1.3.2.1.4.1
@@ -7,7 +7,7 @@
$oProc->next_record();
$siteurl = $oProc->f('config_value') . SEP . 'sitemgr' . SEP .
'sitemgr-site' . SEP;
$sitedir = PHPGW_INCLUDE_ROOT . SEP . 'sitemgr' . SEP . 'sitemgr-site';
- $oProc->query("INSERT INTO phpgw_sitemgr_sites
(site_id,site_name,site_url,site_dir,themesel,site_languages,home_page_id,anonymous_user,anonymous_passwd)
VALUES ($site_id,'Default
Website','$siteurl','$sitedir','phpgroupware','en',0,'anonymous','anonymous')");
+ $oProc->query("INSERT INTO phpgw_sitemgr_sites
(site_id,site_name,site_url,site_dir,themesel,site_languages,home_page_id,anonymous_user,anonymous_passwd)
VALUES ($site_id,
'Default','$siteurl','$sitedir','phpgroupware','en',0,'anonymous','anonymous')");
foreach (array('html','index','toc') as $module)
{
Index: sitemgr-site/functions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/sitemgr-site/functions.inc.php,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.2.4.1
diff -u -b -r1.6.2.2 -r1.6.2.2.4.1
--- sitemgr-site/functions.inc.php 30 Mar 2004 09:11:04 -0000 1.6.2.2
+++ sitemgr-site/functions.inc.php 24 Jul 2006 03:31:54 -0000
1.6.2.2.4.1
@@ -67,7 +67,7 @@
{
if (!empty($new_extravars))
{
- $new_extravars .= '&';
+ $new_extravars .= '&';
}
$new_extravars .= (($value == '') ? $key :
($key . '=' . urlencode($value)) );
}
@@ -84,8 +84,8 @@
else
{
$sessionID = 'sessionid=' .
@$GLOBALS['phpgw_info']['user']['sessionid'];
- $sessionID .= '&kp3=' . $kp3;
- $sessionID .= '&domain=' .
@$GLOBALS['phpgw_info']['user']['domain'];
+ $sessionID .= '&kp3=' . $kp3;
+ $sessionID .= '&domain=' .
@$GLOBALS['phpgw_info']['user']['domain'];
// This doesn't belong in the API.
// Its up to the app to pass this value. (jengo)
// Putting it into the app requires a massive number of
updates in email app.
@@ -93,11 +93,11 @@
if (isset($GLOBALS['phpgw_info']['flags']['newsmode'])
&&
$GLOBALS['phpgw_info']['flags']['newsmode'])
{
- $url .= '&newsmode=on';
+ $url .= '&newsmode=on';
}
if ($extravars)
{
- $url .= '?' . $extravars . '&' . $sessionID;
+ $url .= '?' . $extravars . '&' . $sessionID;
}
else
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] sitemgr inc/class.Common_BO.inc.php inc/class.C... [skwashd-16-compat],
Dave Hall <=