[Phpgroupware-cvs] CVS: nntp admin.php,1.25,1.26

[Mark A Peters <address@hidden>]

Update of /cvsroot/phpgroupware/nntp
In directory subversions:/tmp/cvs-serv11998/nntp

Modified Files:
        admin.php 
Log Message:
Something that needed to be done.

Index: admin.php
===================================================================
RCS file: /cvsroot/phpgroupware/nntp/admin.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** admin.php   18 Dec 2001 20:46:03 -0000      1.25
--- admin.php   15 Sep 2002 23:23:02 -0000      1.26
***************
*** 32,50 ****
        }
    
!       $phpgw_info['flags'] = $phpgw_flags;
        include('../header.inc.php');
  
        function get_tg()
        {
!               global $phpgw;
! 
!               $phpgw->db->query('SELECT count(con) FROM newsgroups');
!               $phpgw->db->next_record();
!               $tg = $phpgw->db->f(0);
                if($tg == 0)
                {
-                       global $nntp;
                        @set_time_limit(0);
!                       $nntp->load_table();
                        return get_tg();
                }
--- 32,47 ----
        }
    
!       $GLOBALS['phpgw_info']['flags'] = $phpgw_flags;
        include('../header.inc.php');
  
        function get_tg()
        {
!               $GLOBALS['phpgw']->db->query('SELECT count(con) FROM 
newsgroups');
!               $GLOBALS['phpgw']->db->next_record();
!               $tg = $GLOBALS['phpgw']->db->f(0);
                if($tg == 0)
                {
                        @set_time_limit(0);
!                       $GLOBALS['nntp']->load_table();
                        return get_tg();
                }
***************
*** 69,77 ****
                //echo parse_navbar();
  
!               $max = 
intval($phpgw_info['user']['preferences']['common']['maxmatchs']);
  
                $urlname = '/nntp/admin.php';
  
!               $p = 
CreateObject('phpgwapi.Template',$phpgw->common->get_tpl_dir('nntp'));
                $templates = Array(
                        'nntp_form'     =>      'nntp.tpl'
--- 66,74 ----
                //echo parse_navbar();
  
!               $max = 
intval($GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs']);
  
                $urlname = '/nntp/admin.php';
  
!               $p = 
CreateObject('phpgwapi.Template',$GLOBALS['phpgw']->common->get_tpl_dir('nntp'));
                $templates = Array(
                        'nntp_form'     =>      'nntp.tpl'
***************
*** 127,133 ****
                        }
                        
!                       $phpgw->db->limit_query("SELECT con FROM newsgroups 
WHERE name LIKE '%$query%'$orderby ",$start,__LINE__,__FILE__);
!                       $phpgw->db->next_record();
!                       $start = (int)$phpgw->db->f('con') - 1;
                        if($start < 0)
                        {
--- 124,130 ----
                        }
                        
!                       $GLOBALS['phpgw']->db->limit_query("SELECT con FROM 
newsgroups WHERE name LIKE '%$query%'$orderby ",$start,__LINE__,__FILE__);
!                       $GLOBALS['phpgw']->db->next_record();
!                       $start = (int)$GLOBALS['phpgw']->db->f('con') - 1;
                        if($start < 0)
                        {
***************
*** 161,174 ****
                        'search'                                =>      
lang('search'),
                        'next'                                  =>      
lang('next'),
!                       'nml'                                   =>      
$phpgw->nextmatchs->left($urlname,intval($start),intval($tg),$extra_parms),
!                       'nmr'                                   =>      
$phpgw->nextmatchs->right($urlname,intval($start),intval($tg),$extra_parms),
                        'title'                                 =>      
lang('Newsgroups'),
!                       'action_url'                    =>      
$phpgw->link('/nntp/admin.php'),
                        'common_hidden_vars'    =>      $common_hidden_vars,
!                       'th_bg'                                 =>      
$phpgw_info['theme']['th_bg'],
!                       'th_font'                               =>      
$phpgw_info['theme']['font'],
!                       'sort_con'                              =>      
$phpgw->nextmatchs->show_sort_order($sort,'1',$order,$urlname,' # ','&tg='.$tg),
!                       'sort_group'                    =>      
$phpgw->nextmatchs->show_sort_order($sort,'2',$order,$urlname,lang('Group'),'&tg='.$tg),
!                       'sort_active'                   =>      
$phpgw->nextmatchs->show_sort_order($sort,'3',$order,$urlname,lang('Active'),'&tg='.$tg)
                );
  
--- 158,171 ----
                        'search'                                =>      
lang('search'),
                        'next'                                  =>      
lang('next'),
!                       'nml'                                   =>      
$GLOBALS['phpgw']->nextmatchs->left($urlname,intval($start),intval($tg),$extra_parms),
!                       'nmr'                                   =>      
$GLOBALS['phpgw']->nextmatchs->right($urlname,intval($start),intval($tg),$extra_parms),
                        'title'                                 =>      
lang('Newsgroups'),
!                       'action_url'                    =>      
$GLOBALS['phpgw']->link('/nntp/admin.php'),
                        'common_hidden_vars'    =>      $common_hidden_vars,
!                       'th_bg'                                 =>      
$GLOBALS['phpgw_info']['theme']['th_bg'],
!                       'th_font'                               =>      
$GLOBALS['phpgw_info']['theme']['font'],
!                       'sort_con'                              =>      
$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'1',$order,$urlname,' # 
','&tg='.$tg),
!                       'sort_group'                    =>      
$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'2',$order,$urlname,lang('Group'),'&tg='.$tg),
!                       'sort_active'                   =>      
$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'3',$order,$urlname,lang('Active'),'&tg='.$tg)
                );
  
***************
*** 202,214 ****
                }
  
!               $phpgw->db->limit_query('SELECT con, name, active FROM 
newsgroups'.$orderby,$start);
  
                for ($i=0;$i<$totaltodisplay;$i++)
                {
!                       $phpgw->db->next_record();
!                       $tr_color = 
$phpgw->nextmatchs->alternate_row_color($tr_color);
!                       $con = $phpgw->db->f('con');
                        
!                       $name = $phpgw->db->f('name');
                        if (!$name)
                        {
--- 199,211 ----
                }
  
!               $GLOBALS['phpgw']->db->limit_query('SELECT con, name, active 
FROM newsgroups'.$orderby,$start);
  
                for ($i=0;$i<$totaltodisplay;$i++)
                {
!                       $GLOBALS['phpgw']->db->next_record();
!                       $tr_color = 
$GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color);
!                       $con = $GLOBALS['phpgw']->db->f('con');
                        
!                       $name = $GLOBALS['phpgw']->db->f('name');
                        if (!$name)
                        {
***************
*** 217,221 ****
                        $group_name = $name;
  
!                       $active = $phpgw->db->f('active');
                        if ($active == 'Y')
                        {
--- 214,218 ----
                        $group_name = $name;
  
!                       $active = $GLOBALS['phpgw']->db->f('active');
                        if ($active == 'Y')
                        {
***************
*** 241,245 ****
                $var = Array(
                        'lang_update'   =>      lang('update'),
!                       'checkmark'             =>      
$phpgw->common->get_image_path('email').'/check.gif'
                );
  
--- 238,242 ----
                $var = Array(
                        'lang_update'   =>      lang('update'),
!                       'checkmark'             =>      
$GLOBALS['phpgw']->common->get_image_path('email').'/check'
                );
  
***************
*** 248,266 ****
                $p->pparse('out','nntp');
  
!               $phpgw->common->phpgw_footer();
        }
        else
        {
!               $phpgw->db->lock('newsgroups');
  
!               $phpgw->db->query("UPDATE newsgroups SET active='N' WHERE 
con>=$start AND con<=$stop");
  
                for ($i=0;$i<count($nntplist);$i++)
                {
!                       $phpgw->db->query("UPDATE newsgroups SET active='Y' 
WHERE con=".$nntplist[$i]);
                }
!               $phpgw->db->unlock();
  
!               Header('Location: ' . 
$phpgw->link('/nntp/admin.php','start='.$start.'&tg='.$tg));
        }
  ?>
--- 245,263 ----
                $p->pparse('out','nntp');
  
!               $GLOBALS['phpgw']->common->phpgw_footer();
        }
        else
        {
!               $GLOBALS['phpgw']->db->lock('newsgroups');
  
!               $GLOBALS['phpgw']->db->query("UPDATE newsgroups SET active='N' 
WHERE con>=$start AND con<=$stop");
  
                for ($i=0;$i<count($nntplist);$i++)
                {
!                       $GLOBALS['phpgw']->db->query("UPDATE newsgroups SET 
active='Y' WHERE con=".$nntplist[$i]);
                }
!               $GLOBALS['phpgw']->db->unlock();
  
!               Header('Location: ' . 
$GLOBALS['phpgw']->link('/nntp/admin.php','start='.$start.'&tg='.$tg));
        }
  ?>