phpwebsite-comm-cvs-commits

[Eloi G. <ada...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/article/inc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3900/inc

Modified Files:
	AM_view_archives.php 
Log Message:
Bug Fixes

Index: AM_view_archives.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/article/inc/AM_view_archives.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AM_view_archives.php	19 Feb 2004 21:46:46 -0000	1.1
--- AM_view_archives.php	22 Apr 2004 17:05:28 -0000	1.2
***************
*** 49,56 ****
  	  $this->arc_filter['datelabel']=$_SESSION['translate']->it('Published');
  	}
! 	if (isset($_REQUEST['current']) && $_REQUEST['current']==1)
! 	  $viewable_sql = $this->get_published_sql();
! 	else 
  	  $viewable_sql = 'approved';
  
    if ($this->arc_filter['year'] && $this->arc_filter['month'] && $this->arc_filter['day'])
--- 49,56 ----
  	  $this->arc_filter['datelabel']=$_SESSION['translate']->it('Published');
  	}
! 	if (isset($_REQUEST['all']) && $_REQUEST['all']==1 && $_SESSION['OBJ_user']->allow_access('article', 'edit_articles'))
  	  $viewable_sql = 'approved';
+ 	else 
+ 	  $viewable_sql = $this->get_published_sql();
  
    if ($this->arc_filter['year'] && $this->arc_filter['month'] && $this->arc_filter['day'])
***************
*** 60,65 ****
            ,$this->arc_filter['month'],$this->arc_filter['day'],$this->arc_filter['year']))
        . '" AND '.$this->arc_filter['datetype'].'<"'.date('Y-m-d H:i:s', mktime(0,0,0
!           ,$this->arc_filter['month'],($this->arc_filter['day']+1),$this->arc_filter['year']))
!       . '" ORDER BY '.$this->arc_filter['datetype'].' ASC'; 
      $start_date = date('F j, Y', mktime(0,0,0
            ,$this->arc_filter['month'],$this->arc_filter['day'],$this->arc_filter['year']));
--- 60,64 ----
            ,$this->arc_filter['month'],$this->arc_filter['day'],$this->arc_filter['year']))
        . '" AND '.$this->arc_filter['datetype'].'<"'.date('Y-m-d H:i:s', mktime(0,0,0
!           ,$this->arc_filter['month'],($this->arc_filter['day']+1),$this->arc_filter['year'])) . '"'; 
      $start_date = date('F j, Y', mktime(0,0,0
            ,$this->arc_filter['month'],$this->arc_filter['day'],$this->arc_filter['year']));
***************
*** 71,76 ****
            ,$this->arc_filter['month'],1,$this->arc_filter['year']))
        . '" AND '.$this->arc_filter['datetype'].'<"'.date('Y-m-d H:i:s', mktime(0,0,0
!           ,($this->arc_filter['month']+1),1,$this->arc_filter['year']))
!       . '" ORDER BY '.$this->arc_filter['datetype'].' ASC';
      $start_date = date('F, Y', mktime(0,0,0
            ,$this->arc_filter['month'],1,$this->arc_filter['year']));
--- 70,74 ----
            ,$this->arc_filter['month'],1,$this->arc_filter['year']))
        . '" AND '.$this->arc_filter['datetype'].'<"'.date('Y-m-d H:i:s', mktime(0,0,0
!           ,($this->arc_filter['month']+1),1,$this->arc_filter['year'])) . '"';
      $start_date = date('F, Y', mktime(0,0,0
            ,$this->arc_filter['month'],1,$this->arc_filter['year']));
***************
*** 82,94 ****
            ,1,1,$this->arc_filter['year']))
        . '" AND '.$this->arc_filter['datetype'].'<"'.date('Y-m-d H:i:s', mktime(0,0,0
!           ,1,1,($this->arc_filter['year']+1)))
!       . '" ORDER BY '.$this->arc_filter['datetype'].' ASC';
      $start_date = date('Y', mktime(0,0,0,1,1,$this->arc_filter['year']));
    }
    $this->arc_filter['title'] = $_SESSION['translate']->it('All Articles [var1] in [var2]'
        , $this->arc_filter['datelabel'], $start_date);
  
    $result = $GLOBALS['core']->getCol('SELECT id FROM ' . $this->sql_article_table 
!       . ' WHERE ' .$viewable_sql.' AND mainarticle=0'.$this->sql_predicate . $filter);
    $this->pager->setData($result);
    $result = NULL;
--- 80,96 ----
            ,1,1,$this->arc_filter['year']))
        . '" AND '.$this->arc_filter['datetype'].'<"'.date('Y-m-d H:i:s', mktime(0,0,0
!           ,1,1,($this->arc_filter['year']+1))) . '"';
      $start_date = date('Y', mktime(0,0,0,1,1,$this->arc_filter['year']));
    }
+   else
+   {
+     $start_date = $_SESSION['translate']->it('this lifetime');
+   }
    $this->arc_filter['title'] = $_SESSION['translate']->it('All Articles [var1] in [var2]'
        , $this->arc_filter['datelabel'], $start_date);
  
    $result = $GLOBALS['core']->getCol('SELECT id FROM ' . $this->sql_article_table 
!       . ' WHERE ' .$viewable_sql.' AND mainarticle=0'.$this->sql_predicate . $filter
!       . ' ORDER BY '.$this->arc_filter['datetype'].' DESC');
    $this->pager->setData($result);
    $result = NULL;
***************
*** 100,104 ****
  	/* Retrieve all article listings for this page */
    $sql = 'SELECT * FROM ' . $this->sql_article_table
!           . ' WHERE id IN (' . $data . ') ORDER BY '.$this->arc_filter['datetype'].' ASC';
    if(!$result = $GLOBALS['core']->query($sql)) 
      return;
--- 102,106 ----
  	/* Retrieve all article listings for this page */
    $sql = 'SELECT * FROM ' . $this->sql_article_table
!           . ' WHERE id IN (' . $data . ') ORDER BY '.$this->arc_filter['datetype'].' DESC';
    if(!$result = $GLOBALS['core']->query($sql)) 
      return;