[Phpgroupware-cvs] CVS: news_admin/inc class.sonews.inc.php, 1.1.2.1.2.6, 1.1.2.1.2.7 class.uinews.inc.php, 1.10.2.6.2.5, 1.10.2.6.2.6

[Dave Hall <address@hidden>]

Update of /cvsroot/phpgroupware/news_admin/inc
In directory subversions:/tmp/cvs-serv2120

Modified Files:
      Tag: Version-0_9_16-branch
        class.sonews.inc.php class.uinews.inc.php 
Log Message:
few bug and formatting fixes

Index: class.sonews.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/news_admin/inc/Attic/class.sonews.inc.php,v
retrieving revision 1.1.2.1.2.6
retrieving revision 1.1.2.1.2.7
diff -C2 -r1.1.2.1.2.6 -r1.1.2.1.2.7
*** class.sonews.inc.php        11 Jul 2003 10:57:00 -0000      1.1.2.1.2.6
--- class.sonews.inc.php        17 Jul 2003 02:09:16 -0000      1.1.2.1.2.7
***************
*** 119,124 ****
                                . 'news_end=' . intval($news['end']) . ', '
                                . 'news_cat=' . intval($news['category']) . ' '
!                               . 'is_html=' . ($news['is_html'] ? 1 : 0)
!                               . "WHERE news_id=" . 
intval($news['id']),__LINE__,__FILE__);
                }
  
--- 119,124 ----
                                . 'news_end=' . intval($news['end']) . ', '
                                . 'news_cat=' . intval($news['category']) . ' '
!                               . 'is_html=' . ($news['is_html'] ? 1 : 0) .' '
!                               . 'WHERE news_id=' . 
intval($news['id']),__LINE__,__FILE__);
                }
  
***************
*** 134,147 ****
  
                        $item = array(
!                               'id'          => $this->db->f('news_id'),
!                               'date'        => $this->db->f('news_date'),
!                               'subject'     => $this->db->f('news_subject', 
True),
!                               'submittedby' => 
$this->db->f('news_submittedby'),
!                               'teaser'                        => 
$this->db->f('news_teaser', True),
!                               'content'     => $this->db->f('news_content', 
True),
!                               'begin'                         => 
$this->db->f('news_begin'),
!                               'end'                           => 
$this->db->f('news_end'),
!                               'category'    => $this->db->f('news_cat'),
!                               'is_html'                       => 
($this->db->f('is_html') ? True : False),
                        );
                        return $item;
--- 134,147 ----
  
                        $item = array(
!                               'id'            => $this->db->f('news_id'),
!                               'date'          => $this->db->f('news_date'),
!                               'subject'       => $this->db->f('news_subject', 
True),
!                               'submittedby'   => 
$this->db->f('news_submittedby'),
!                               'teaser'        => $this->db->f('news_teaser', 
True),
!                               'content'       => $this->db->f('news_content', 
True),
!                               'begin'         => $this->db->f('news_begin'),
!                               'end'           => $this->db->f('news_end'),
!                               'category'      => $this->db->f('news_cat'),
!                               'is_html'       => ($this->db->f('is_html') ? 
True : False),
                        );
                        return $item;

Index: class.uinews.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/news_admin/inc/Attic/class.uinews.inc.php,v
retrieving revision 1.10.2.6.2.5
retrieving revision 1.10.2.6.2.6
diff -C2 -r1.10.2.6.2.5 -r1.10.2.6.2.6
*** class.uinews.inc.php        11 Jul 2003 10:57:00 -0000      1.10.2.6.2.5
--- class.uinews.inc.php        17 Jul 2003 02:09:16 -0000      1.10.2.6.2.6
***************
*** 101,105 ****
                        $var['lang_read'] = lang('Read');
                        $var['lang_write'] = lang('Write');
!                       $var['readable'] = $this->selectlist('read', 
$_SERVER['QUERY_STRING']);
                        $var['maintainlink'] = (($this->cat_id != 'all') && 
$this->bo->acl->is_permitted($this->cat_id,PHPGW_ACL_ADD)) ? 
                                ('<a href="' . 
$GLOBALS['phpgw']->link('/index.php','menuaction=news_admin.uinews.write_news&start=0&cat_id='.$this->cat_id)
 .
--- 101,105 ----
                        $var['lang_read'] = lang('Read');
                        $var['lang_write'] = lang('Write');
!                       $var['readable'] = $this->selectlist('read');
                        $var['maintainlink'] = (($this->cat_id != 'all') && 
$this->bo->acl->is_permitted($this->cat_id,PHPGW_ACL_ADD)) ? 
                                ('<a href="' . 
$GLOBALS['phpgw']->link('/index.php','menuaction=news_admin.uinews.write_news&start=0&cat_id='.$this->cat_id)
 .
***************
*** 418,422 ****
                                'value_teaser' => '<input name="news[teaser]" 
size="60" value="' . htmlentities($this->news_data['teaser']) . '" 
maxLength=100>',
                                'label_content' => lang('Content') . ':',
!                               'value_content' => '<textarea cols="60" 
rows="6" name="news[content]" wrap="virtual">' . 
htmlentities($this->news_data['content']) . '</textarea>',
                                'label_category' => lang('Category') . ':',
                                'value_category' => '<select 
name="news[category]">' . $this->selectlist('write', 
intval($this->news_data['category'])) . '</select>',
--- 418,422 ----
                                'value_teaser' => '<input name="news[teaser]" 
size="60" value="' . htmlentities($this->news_data['teaser']) . '" 
maxLength=100>',
                                'label_content' => lang('Content') . ':',
!                               'value_content' => '<textarea cols="60" 
rows="6" name="news[content]" wrap="virtual">' . $this->news_data['content'] . 
'</textarea>',
                                'label_category' => lang('Category') . ':',
                                'value_category' => '<select 
name="news[category]">' . $this->selectlist('write', 
intval($this->news_data['category'])) . '</select>',