[phpws-comm-commits] modules/article/inc A_save.php, 1.25, 1.26 runtime.php, 1.20, 1.21

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

Update of /cvsroot/phpwebsite-comm/modules/article/inc
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv13381/inc

Modified Files:
	A_save.php runtime.php 
Log Message:
+ Times viewed is now stored in the associated Key for an article


Index: runtime.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/article/inc/runtime.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** runtime.php	2 Jan 2011 23:34:23 -0000	1.20
--- runtime.php	3 Jan 2011 06:02:05 -0000	1.21
***************
*** 31,36 ****
  		    $article = new PHPWS_Article($row);
  		  	Layout::add($article->view_full(), 'article', 'view', true);
- 		  	/* Increment the articleview counter */
- 		  	$article->increment_counter((int) $result);
  		}
    	unset($article);
--- 31,34 ----
***************
*** 57,64 ****
  		$db->addColumn('title');
  	    $db->addWhere('announce', '1');
- 	    $db->addOrder('hits desc');
  	    PHPWS_AM_Data::get_published_sql($db);
  		$db->setLimit($config['popular_articles']);
! 	    $result = $db->select();
  	    if (PHPWS_Error::logIfError($result)) 
  		     exit('Article::Runtime -- a database error occured.');
--- 55,63 ----
  		$db->addColumn('title');
  	    $db->addWhere('announce', '1');
  	    PHPWS_AM_Data::get_published_sql($db);
  		$db->setLimit($config['popular_articles']);
! 	    Key::restrictView($db, 'article', false);
! 	    $db->addOrder('phpws_key.times_viewed desc');
! 		$result = $db->select();
  	    if (PHPWS_Error::logIfError($result)) 
  		     exit('Article::Runtime -- a database error occured.');

Index: A_save.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/article/inc/A_save.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** A_save.php	2 Jan 2011 23:34:23 -0000	1.25
--- A_save.php	3 Jan 2011 06:02:05 -0000	1.26
***************
*** 92,95 ****
--- 92,98 ----
  	$this->_key->setSummary($this->summary);
  	$this->_key->active = 1;
+ 	// This is how the conversion script passes the old "hits" value
+ 	if (!empty($this->hits))
+ 		$this->_key->times_viewed = $this->hits;
  	$result = $this->_key->save();
  	$this->key_id = $this->_key->id;