phpgroupware-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Phpgroupware-cvs] CVS: sitemgr/modules class.module_administration.inc.


From: Michael Totschnig <address@hidden>
Subject: [Phpgroupware-cvs] CVS: sitemgr/modules class.module_administration.inc.php,1.1.2.1,1.1.2.2 class.module_appdir.inc.php,1.1.2.1,1.1.2.2 class.module_bookmarks.inc.php,1.2.2.2,1.2.2.3 class.module_currentsection.inc.php,1.1.2.1,1.1.2.2 class.module_galerie.inc.php,1.1.2.1,1.1.2.2 class.module_html.inc.php,1.1.2.1,1.1.2.2 class.module_lang_block.inc.php,1.1.2.1,1.1.2.2 class.module_news.inc.php,1.2.2.2,1.2.2.3 class.module_sitetree.inc.php,1.1.2.2,1.1.2.3 class.module_toc.inc.php,1.1.2.1,1.1.2.2 class.module_xml.inc.php,1.1.2.1,1.1.2.2
Date: Mon, 23 Jun 2003 16:31:23 -0400

Update of /cvsroot/phpgroupware/sitemgr/modules
In directory subversions:/tmp/cvs-serv14915/modules

Modified Files:
      Tag: Version-0_9_16-branch
        class.module_administration.inc.php 
        class.module_appdir.inc.php class.module_bookmarks.inc.php 
        class.module_currentsection.inc.php 
        class.module_galerie.inc.php class.module_html.inc.php 
        class.module_lang_block.inc.php class.module_news.inc.php 
        class.module_sitetree.inc.php class.module_toc.inc.php 
        class.module_xml.inc.php 
Log Message:
sync up with HEAD


Index: class.module_administration.inc.php
===================================================================
RCS file: 
/cvsroot/phpgroupware/sitemgr/modules/class.module_administration.inc.php,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** class.module_administration.inc.php 3 May 2003 21:10:40 -0000       1.1.2.1
--- class.module_administration.inc.php 23 Jun 2003 20:31:21 -0000      1.1.2.2
***************
*** 13,17 ****
        function get_content(&$arguments,$properties)
        {
!                       return 
'&nbsp;&nbsp;<strong><big>&middot;</big></strong><a 
href="'.phpgw_link('/sitemgr/index.php').'">' . lang('Content Manager') . 
'</a>';
        }
  
--- 13,27 ----
        function get_content(&$arguments,$properties)
        {
!               $content = '<form name="modeselect" method="post">' .
!                       '<select onChange="location.href=this.value" 
name="mode">';
!               foreach(array('Production','Draft','Edit') as $mode)
!               {
!                       $selected = ($GLOBALS['sitemgr_info']['mode'] == $mode) 
? ' selected="selected"' : '';
!                       $content .=     '<option value="' 
.$this->link(array('mode'=>$mode)) .'"' . $selected  . '>' . lang($mode . ' 
mode') . '</option>';
!               }
!               $content .= '</select></form>' .
!                       '&nbsp;&nbsp;<strong><big>&middot;</big></strong><a 
href="' . phpgw_link('/sitemgr/index.php') .
!                       '">' . lang('Content Manager') . '</a>';
!               return $content;
        }
  

Index: class.module_appdir.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/modules/class.module_appdir.inc.php,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** class.module_appdir.inc.php 3 May 2003 21:10:40 -0000       1.1.2.1
--- class.module_appdir.inc.php 23 Jun 2003 20:31:21 -0000      1.1.2.2
***************
*** 34,38 ****
                        foreach(array('name','maintainer','url','description') 
as $key)
                        {
!                               $elementname = 'element[' .$key . '][' . $i 
.']';
                                $element['label'] = ucfirst($key);
                                $element['form'] = $this->build_input_element(
--- 34,38 ----
                        foreach(array('name','maintainer','url','description') 
as $key)
                        {
!                               $elementname = 'element[' . 
$this->block->version . '][' .$key . '][' . $i .']';
                                $element['label'] = ucfirst($key);
                                $element['form'] = $this->build_input_element(
***************
*** 49,53 ****
                                array('type' => 'checkbox'),
                                False,
!                               'element[delete][' . $i . ']'
                        );
                        $interface[] = $element;
--- 49,53 ----
                                array('type' => 'checkbox'),
                                False,
!                               'element[' . $this->block->version . 
'][delete][' . $i . ']'
                        );
                        $interface[] = $element;
***************
*** 61,65 ****
                        array('type' => 'checkbox'),
                        False,
!                       'element[addnew]'
                );
                $interface[] = $element;
--- 61,65 ----
                        array('type' => 'checkbox'),
                        False,
!                       'element[' . $this->block->version . '][addnew]'
                );
                $interface[] = $element;
***************
*** 105,109 ****
        }
  
!       function set_block($block,$produce=False)
        {
                parent::set_block($block,$produce);
--- 105,109 ----
        }
  
!       function set_block(&$block,$produce=False)
        {
                parent::set_block($block,$produce);

Index: class.module_bookmarks.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/modules/class.module_bookmarks.inc.php,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C2 -r1.2.2.2 -r1.2.2.3
*** class.module_bookmarks.inc.php      3 May 2003 21:10:40 -0000       1.2.2.2
--- class.module_bookmarks.inc.php      23 Jun 2003 20:31:21 -0000      1.2.2.3
***************
*** 13,17 ****
                $this->arguments = array(
                        'category' => array(
!                               'type' => select, 
                                'label' => lang('Choose the categories to 
display'), 
                                'options' => array(),
--- 13,17 ----
                $this->arguments = array(
                        'category' => array(
!                               'type' => 'select', 
                                'label' => lang('Choose the categories to 
display'), 
                                'options' => array(),
***************
*** 28,32 ****
                while (list(,$category) = @each($cats))
                {
!                       $cat_ids[$category['id']] = $category['name'];
                }
                $this->arguments['category']['options'] = $cat_ids;
--- 28,32 ----
                while (list(,$category) = @each($cats))
                {
!                       $cat_ids[$category['id']] = 
$GLOBALS['phpgw']->strip_html($category['name']);
                }
                $this->arguments['category']['options'] = $cat_ids;
***************
*** 34,38 ****
        }
  
!       function set_block($block,$produce=False)
        {
                parent::set_block($block,$produce);
--- 34,38 ----
        }
  
!       function set_block(&$block,$produce=False)
        {
                parent::set_block($block,$produce);
***************
*** 41,45 ****
                {
                        require_once(PHPGW_INCLUDE_ROOT . SEP . 'sitemgr' . SEP 
. 'inc' . SEP . 'class.xslt_transform.inc.php');
!                       $this->add_transformer(new 
xslt_transform($this->find_template_dir() . SEP . 'xbel.xsl'));
                }
        }
--- 41,48 ----
                {
                        require_once(PHPGW_INCLUDE_ROOT . SEP . 'sitemgr' . SEP 
. 'inc' . SEP . 'class.xslt_transform.inc.php');
!                       $this->add_transformer(new xslt_transform(
!                               $this->find_template_dir() . SEP . 'xbel.xsl',
!                               array('blockid' => $this->block->id)
!                       ));
                }
        }

Index: class.module_currentsection.inc.php
===================================================================
RCS file: 
/cvsroot/phpgroupware/sitemgr/modules/class.module_currentsection.inc.php,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** class.module_currentsection.inc.php 3 May 2003 21:10:40 -0000       1.1.2.1
--- class.module_currentsection.inc.php 23 Jun 2003 20:31:21 -0000      1.1.2.2
***************
*** 14,23 ****
        {
                global $page;
!               $catlinks = 
$GLOBALS['objbo']->getCatLinks((int)$page->cat_id,false);
!               if (!$page->cat_id)
                {
                        return '';
                }
  
                $pagelinks = 
$GLOBALS['objbo']->getPageLinks($page->cat_id,false);
                $category = $GLOBALS['objbo']->getcatwrapper($page->cat_id);
--- 14,23 ----
        {
                global $page;
!               if ($page->cat_id == 
$GLOBALS['Common_BO']->current_site['site_id'])
                {
                        return '';
                }
  
+               $catlinks = 
$GLOBALS['objbo']->getCatLinks((int)$page->cat_id,false);
                $pagelinks = 
$GLOBALS['objbo']->getPageLinks($page->cat_id,false);
                $category = $GLOBALS['objbo']->getcatwrapper($page->cat_id);

Index: class.module_galerie.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/modules/class.module_galerie.inc.php,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** class.module_galerie.inc.php        3 May 2003 21:10:40 -0000       1.1.2.1
--- class.module_galerie.inc.php        23 Jun 2003 20:31:21 -0000      1.1.2.2
***************
*** 5,8 ****
--- 5,9 ----
        function module_galerie()
        {
+               $this->i18n = True;
                $this->arguments = array(
                        'imagedirurl' => array(
***************
*** 78,82 ****
        }
  
!       function set_block($block,$produce=False)
        {
                parent::set_block($block,$produce);
--- 79,83 ----
        }
  
!       function set_block(&$block,$produce=False)
        {
                parent::set_block($block,$produce);

Index: class.module_html.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/modules/class.module_html.inc.php,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** class.module_html.inc.php   3 May 2003 21:10:40 -0000       1.1.2.1
--- class.module_html.inc.php   23 Jun 2003 20:31:21 -0000      1.1.2.2
***************
*** 5,12 ****
                function module_html()
                {
                        $this->arguments = array(
                                'htmlcontent' => array(
                                        'type' => 'textarea', 
!                                       'label' => lang('Enter the page content 
here'), 
                                        'i18n' => True,
                                        'params' => Array('cols' => 50, 'rows' 
=> 15)
--- 5,13 ----
                function module_html()
                {
+                       $this->i18n = true;
                        $this->arguments = array(
                                'htmlcontent' => array(
                                        'type' => 'textarea', 
!                                       'label' => lang('Enter the block 
content here'), 
                                        'i18n' => True,
                                        'params' => Array('cols' => 50, 'rows' 
=> 15)

Index: class.module_lang_block.inc.php
===================================================================
RCS file: 
/cvsroot/phpgroupware/sitemgr/modules/class.module_lang_block.inc.php,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** class.module_lang_block.inc.php     3 May 2003 21:10:40 -0000       1.1.2.1
--- class.module_lang_block.inc.php     23 Jun 2003 20:31:21 -0000      1.1.2.2
***************
*** 16,20 ****
                        {
                                $content = '<form name="langselect" 
method="post">';
!                               $content .= '<select 
onChange="this.form.submit()" name="language">';
                                foreach 
($GLOBALS['sitemgr_info']['sitelanguages'] as $lang)
                                {
--- 16,20 ----
                        {
                                $content = '<form name="langselect" 
method="post">';
!                               $content .= '<select 
onChange="location.href=this.value" name="language">';
                                foreach 
($GLOBALS['sitemgr_info']['sitelanguages'] as $lang)
                                {
***************
*** 24,28 ****
                                                $selected = 
'selected="selected" ';
                                        }
!                                       $content .= '<option ' . $selected . 
'value="' . $lang . '">'. $GLOBALS['Common_BO']->getlangname($lang) . 
'</option>';
                                }
                                $content .= '</select>';
--- 24,28 ----
                                                $selected = 
'selected="selected" ';
                                        }
!                                       $content .= '<option ' . $selected . 
'value="' . $this->link(array('select'=>$lang)) . '">'. 
$GLOBALS['Common_BO']->getlangname($lang) . '</option>';
                                }
                                $content .= '</select>';

Index: class.module_news.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/modules/class.module_news.inc.php,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C2 -r1.2.2.2 -r1.2.2.3
*** class.module_news.inc.php   16 May 2003 15:58:25 -0000      1.2.2.2
--- class.module_news.inc.php   23 Jun 2003 20:31:21 -0000      1.2.2.3
***************
*** 1,28 ****
  <?php 
  
-       class news_transform
-       {
-               function news_transform(&$template)
-               {
-                       $this->template = $template;
-               }
- 
-               function apply_transform($title,$content)
-               {
-                       $result ='';
-                       while (list(,$newsitem) = @each($content))
-                       {
-                               $this->template->set_var(array(
-                                       'news_title' => $newsitem['subject'],
-                                       'news_submitter' => 
$GLOBALS['phpgw']->accounts->id2name($newsitem['submittedby']),
-                                       'news_date' => 
$GLOBALS['phpgw']->common->show_date($newsitem['submissiondate']),
-                                       'news_content' => $newsitem['content']
-                               ));
-                               $result .= $this->template->parse('out','news');
-                       }
-                       return $result;
-               }
-       }
- 
        class module_news extends Module
        {
--- 1,4 ----
***************
*** 30,37 ****
                {
                        //specification of options is postponed into the 
get_user_interface function
!                       $this->arguments = array('category' => array('type' => 
'select', 'label' => lang('Choose a category'), 'options' => array()));
                        $this->properties = array();
                        $this->title = lang('News module');
!                       $this->description = ('This module is just a first 
trial of hooking news_admin into sitmgr\'s new architecture.');
                }
  
--- 6,24 ----
                {
                        //specification of options is postponed into the 
get_user_interface function
!                       $this->arguments = array(
!                               'category' => array('type' => 'select', 'label' 
=> lang('Choose a category'), 'options' => array()),
!                               'rsslink' => array('type' => 'checkbox', 
'label' => lang('Do you want to publish a RSS feed for this news category')),
!                               'limit' => array(
!                                       'type' => 'textfield', 
!                                       'label' => lang('Number of news items 
to be displayed on page'),
!                                       'params' => array('size' => 3)
!                               )
!                       );
!                       $this->get = array('item','start');
!                       $this->session = array('item','start');
                        $this->properties = array();
                        $this->title = lang('News module');
!                       $this->description = lang('This module publishes news 
from the news_admin application on your website. Be aware of news_admin\'s ACL 
restrictions.');
!                       $this->template;
                }
  
***************
*** 41,46 ****
                        //and not when it is generated for the web site, thus 
speeding the latter up slightly
                        $cat = 
createobject('phpgwapi.categories','','news_admin');
!                       $cats = $cat->return_array('mains',0,False);
!                       $cat_ids = array(0 => lang('Mains'));
                        while (list(,$category) = @each($cats))
                        {
--- 28,32 ----
                        //and not when it is generated for the web site, thus 
speeding the latter up slightly
                        $cat = 
createobject('phpgwapi.categories','','news_admin');
!                       $cats = 
$cat->return_array('all',0,False,'','','cat_name',True);
                        while (list(,$category) = @each($cats))
                        {
***************
*** 51,70 ****
                }
  
!               function set_block($block,$produce=False)
                {
!                       parent::set_block($block,$produce);
!                       if ($produce)
                        {
!                               $t = Createobject('phpgwapi.Template');
!                               $t->set_root($this->find_template_dir());
!                               $t->set_file('news','newsblock.tpl');
!                               $this->add_transformer(new news_transform($t));
                        }
                }
  
!               function get_content(&$arguments,$properties)
                {
!                       $bonews = CreateObject('news_admin.bonews');
!                       return $bonews->get_NewsList($arguments['category'], 
false);
                }
        }
--- 37,114 ----
                }
  
!               function get_content(&$arguments,$properties)
                {
!                       $bonews = CreateObject('news_admin.bo');
! 
!                       $this->template = Createobject('phpgwapi.Template');
!                       $this->template->set_root($this->find_template_dir());
!                       $this->template->set_file('news','newsblock.tpl');
!                       
$this->template->set_block('news','NewsBlock','newsitem');
!                       
$this->template->set_block('news','RssBlock','rsshandle');
! 
!                       if ($arguments['rsslink'])
!                       {
!                               $this->template->set_var('rsslink',
!                                       
$GLOBALS['phpgw_info']['server']['webserver_url'] . 
'/news_admin/website/export.php?cat_id=' . $arguments['category']);
!                               $this->template->parse('rsshandle','RssBlock');
!                       }
!                       else
!                       {
!                               $this->template->set_var('rsshandle','');
!                       }
! 
!                       $item = $arguments['item'];
!                       if ($item)
                        {
!                               $newsitem = $bonews->get_news($item);
!                               if ($newsitem && ($newsitem['category'] == 
$arguments['category']))
!                               {
!                                       $this->render($newsitem);
!                                       $link_data['item'] = 0;
!                                       $this->template->set_var('morelink',
!                                               '<a href="' . 
$this->link($link_data) . '">' . lang('More news') . '</a>'
!                                       );
!                                       return 
$this->template->parse('out','news');
! //                                    return 
$this->template->get_var('newsitem');
!                               }
!                               else
!                               {
!                                       return lang('No matching news item');
!                               }
                        }
+ 
+                       $newslist = 
$bonews->get_newslist($arguments['category'],$arguments['start'],'','',$arguments['limit'],True);
+                       $total = $bonews->total($arguments['category'],True);
+ 
+                       while (list(,$newsitem) = @each($newslist))
+                       {
+                               $this->render($newsitem);
+                       }
+                       if ($arguments['start'])
+                       {
+                               $link_data['start'] = $arguments['start'] - 
$arguments['limit'];
+                               $this->template->set_var('lesslink',
+                                       '<a href="' . $this->link($link_data) . 
'">&lt;&lt;&lt;</a>'
+                               );
+                       }
+                       if ($total > $arguments['start'] + $arguments['limit'])
+                       {
+                               $link_data['start'] = $arguments['start'] + 
$arguments['limit'];
+                               $this->template->set_var('morelink',
+                                       '<a href="' . $this->link($link_data) . 
'">' . lang('More news') . '</a>'
+                               );
+                       }
+                       return $this->template->parse('out','news');
                }
  
!               function render($newsitem)
                {
!                       $this->template->set_var(array(
!                               'news_title' => $newsitem['subject'],
!                               'news_submitter' => 
$GLOBALS['phpgw']->accounts->id2name($newsitem['submittedby']),
!                               'news_date' => 
$GLOBALS['phpgw']->common->show_date($newsitem['date']),
!                               'news_content' => $newsitem['content']
!                       ));
!                       $this->template->parse('newsitem','NewsBlock',True);
                }
        }

Index: class.module_sitetree.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/modules/class.module_sitetree.inc.php,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -r1.1.2.2 -r1.1.2.3
*** class.module_sitetree.inc.php       3 May 2003 21:10:40 -0000       1.1.2.2
--- class.module_sitetree.inc.php       23 Jun 2003 20:31:21 -0000      1.1.2.3
***************
*** 85,89 ****
  function add(catid)
  {
!       document.cookie = '".$this->block->module_name."[menutree][' + catid + 
']=';
  }
  
--- 85,89 ----
  function add(catid)
  {
!       document.cookie = 'block[" . $this->block->id . "][menutree][' + catid 
+ ']=';
  }
  
***************
*** 91,95 ****
  {
        var now = new Date();
!       document.cookie = '".$this->block->module_name."[menutree][' + catid + 
']=; expires=' + now.toGMTString();
  }
  
--- 91,95 ----
  {
        var now = new Date();
!       document.cookie = 'block[" . $this->block->id . "][menutree][' + catid 
+ ']=; expires=' + now.toGMTString();
  }
  

Index: class.module_toc.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/modules/class.module_toc.inc.php,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** class.module_toc.inc.php    3 May 2003 21:10:40 -0000       1.1.2.1
--- class.module_toc.inc.php    23 Jun 2003 20:31:21 -0000      1.1.2.2
***************
*** 13,64 ****
                {
                        global $objbo;
                        $category_id = $arguments['category_id'];
                        if ($category_id)
                        {
!                               if($objbo->acl->can_read_category($category_id))
                                {
!                                       $links = 
$objbo->getPageLinks($category_id,true);
!                                       $cat = 
$objbo->getcatwrapper($category_id);
!                                       $content = '';
!                                       if ($cat)
                                        {
!                                               $content .= '<b><a 
href="'.sitemgr_link2('/index.php','toc=1').'">' . lang('Up to table of 
contents') . '</a></b>';
!                                               if ($cat->depth)
!                                               {
!                                                       $content .= ' | <b><a 
href="'.sitemgr_link2('/index.php','category_id='.$cat->parent).'">' . lang('Up 
to parent') . '</a></b>';
!                                               }
!                                               $children = 
$objbo->getCatLinks((int) $category_id,false);
!                                               if (count($children))
                                                {
!                                                       $content .= 
'<br><br><b>' . lang('Subcategories') . ':</b><br>';
!                                                       foreach ($children as 
$child)
!                                                       {
!                                                               $content .= 
'<br>&nbsp;&nbsp;&nbsp;&middot;&nbsp;<b>'.
!                                                                       
$child['link'].'</b> &ndash; '.$child['description'];
!                                                       }
                                                }
!                                               $content .= '<br><br><b>' . 
lang('Pages') . ':</b><br>';
!                                               $links = 
$objbo->getPageLinks($category_id,true);
!                                               if (count($links)>0)
                                                {
!                                                       foreach($links as $pg)
                                                        {
!                                                               $content .= 
"\n<br>".
!                                                                       
'&nbsp;&nbsp;&nbsp;&middot;&nbsp;'.$pg['link'];
!                                                               if 
(!empty($pg['subtitle']))
!                                                               {
!                                                                       
$content .= ' &ndash; <i>'.$pg['subtitle'].'</i>';
!                                                               }
!                                                               $content .= '';
                                                        }
!                                               }
!                                               else
!                                               {
!                                                       $content .= '<li>' . 
lang('There are no pages in this section') . '</li>';
                                                }
                                        }
                                        else
                                        {
!                                               $content = lang('There was an 
error accessing the requested page. Either you do not have permission to view 
this page, or the page does not exist.');
                                        }
                                }
--- 13,58 ----
                {
                        global $objbo;
+                       global $page;
                        $category_id = $arguments['category_id'];
                        if ($category_id)
                        {
!                               $cat = $objbo->getcatwrapper($category_id);
!                               if ($cat)
                                {
!                                       $page->title = lang('Category').' 
'.$cat->name;
!                                       $page->subtitle = 
'<i>'.$cat->description.'</i>';
!                                       $content = '<b><a 
href="'.sitemgr_link2('/index.php','toc=1').'">' . lang('Up to table of 
contents') . '</a></b>';
!                                       if ($cat->depth > 1)
                                        {
!                                               $content .= ' | <b><a 
href="'.sitemgr_link2('/index.php','category_id='.$cat->parent).'">' . lang('Up 
to parent') . '</a></b>';
!                                       }
!                                       $children = $objbo->getCatLinks((int) 
$category_id,false);
!                                       if (count($children))
!                                       {
!                                               $content .= '<br><br><b>' . 
lang('Subcategories') . ':</b><br>';
!                                               foreach ($children as $child)
                                                {
!                                                       $content .= 
'<br>&nbsp;&nbsp;&nbsp;&middot;&nbsp;<b>'.
!                                                               
$child['link'].'</b> &ndash; '.$child['description'];
                                                }
!                                       }
!                                       $content .= '<br><br><b>' . 
lang('Pages') . ':</b><br>';
!                                       $links = 
$objbo->getPageLinks($category_id,true);
!                                       if (count($links)>0)
!                                       {
!                                               foreach($links as $pg)
                                                {
!                                                       $content .= "\n<br>".
!                                                               
'&nbsp;&nbsp;&nbsp;&middot;&nbsp;'.$pg['link'];
!                                                       if 
(!empty($pg['subtitle']))
                                                        {
!                                                               $content .= ' 
&ndash; <i>'.$pg['subtitle'].'</i>';
                                                        }
!                                                       $content .= '';
                                                }
                                        }
                                        else
                                        {
!                                               $content .= '<li>' . 
lang('There are no pages in this section') . '</li>';
                                        }
                                }

Index: class.module_xml.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/modules/class.module_xml.inc.php,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** class.module_xml.inc.php    3 May 2003 21:10:40 -0000       1.1.2.1
--- class.module_xml.inc.php    23 Jun 2003 20:31:21 -0000      1.1.2.2
***************
*** 28,32 ****
        }
  
!       function set_block($block,$produce=False)
        {
                parent::set_block($block,$produce);
--- 28,32 ----
        }
  
!       function set_block(&$block,$produce=False)
        {
                parent::set_block($block,$produce);





reply via email to

[Prev in Thread] Current Thread [Next in Thread]