[phpws-comm-commits] modules/article/class Article.php, 1.63, 1.64 AM_EditForms.php, 1.14, 1.15 AM_

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	Article.php AM_EditForms.php AM_Actions.php AM_Data.php 
	AM_DisplayForms.php 
Log Message:
+ Assigning the return value of new by reference is deprecated in PHP 5. 

Index: AM_EditForms.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/article/class/AM_EditForms.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** AM_EditForms.php	26 Feb 2009 23:47:29 -0000	1.14
--- AM_EditForms.php	2 Jan 2011 23:34:26 -0000	1.15
***************
*** 22,26 ****
  	function edit_article (& $object, $req_page = 1)
  	{
! 		$form = & new PHPWS_Form('Edit_Article');
  		$form->useBreaker();

--- 22,26 ----
  	function edit_article (& $object, $req_page = 1)
  	{
! 		$form = new PHPWS_Form('Edit_Article');
  		$form->useBreaker();

***************
*** 238,242 ****
  			$result = Layout::getMetaPage($object->key_id);
  			if (!$result) {
! 				$db = & new PHPWS_DB('layout_config');
  				$result = $db->select('row');
  			}
--- 238,242 ----
  			$result = Layout::getMetaPage($object->key_id);
  			if (!$result) {
! 				$db = new PHPWS_DB('layout_config');
  				$result = $db->select('row');
  			}
***************
*** 296,300 ****
  	function edit_section (& $object, $section_position, $total_sections)
  	{
! 		$form = & new PHPWS_Form('SECTION_edit'.$object->id);
  		$form->useBreaker();

--- 296,300 ----
  	function edit_section (& $object, $section_position, $total_sections)
  	{
! 		$form = new PHPWS_Form('SECTION_edit'.$object->id);
  		$form->useBreaker();

***************
*** 391,395 ****
  	function edit_configuration ()
  	{
! 		$form = & new PHPWS_Form('Config');
  		$val = PHPWS_Settings::get('article');

--- 391,395 ----
  	function edit_configuration ()
  	{
! 		$form = new PHPWS_Form('Config');
  		$val = PHPWS_Settings::get('article');

Index: AM_Data.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/article/class/AM_Data.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** AM_Data.php	26 Feb 2009 23:47:29 -0000	1.22
--- AM_Data.php	2 Jan 2011 23:34:26 -0000	1.23
***************
*** 21,25 ****
  	function bulk_load_db ($id, $summary=false)
  	{
!         $db = & new PHPWS_DB('article');
  		$db->addColumn('id');
  		$db->addColumn('key_id');
--- 21,25 ----
  	function bulk_load_db ($id, $summary=false)
  	{
!         $db = new PHPWS_DB('article');
  		$db->addColumn('id');
  		$db->addColumn('key_id');

Index: AM_Actions.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/article/class/AM_Actions.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** AM_Actions.php	26 Feb 2009 23:47:29 -0000	1.18
--- AM_Actions.php	2 Jan 2011 23:34:26 -0000	1.19
***************
*** 23,27 ****
  			return;
  		$now = time();
!         $db = & new PHPWS_DB('article');
          $db->addValue('mainarticle', (int) (bool) $status);
          $db->addWhere('id', (int) $id);
--- 23,27 ----
  			return;
  		$now = time();
!         $db = new PHPWS_DB('article');
          $db->addValue('mainarticle', (int) (bool) $status);
          $db->addWhere('id', (int) $id);
***************
*** 96,100 ****
  	function purge_articles ()
  	{
! 		$db = & new PHPWS_DB('article');
  		$db->addColumn('id');
  		$db->addColumn('key_id');
--- 96,100 ----
  	function purge_articles ()
  	{
! 		$db = new PHPWS_DB('article');
  		$db->addColumn('id');
  		$db->addColumn('key_id');
***************
*** 115,119 ****
  		/* Delete all associated versions */
  		$db->reset();
! 		$db = & new PHPWS_DB('article_version');
  		$db->addWhere('id', $ids, 'IN');
  		$db->delete();
--- 115,119 ----
  		/* Delete all associated versions */
  		$db->reset();
! 		$db = new PHPWS_DB('article_version');
  		$db->addWhere('id', $ids, 'IN');
  		$db->delete();
***************
*** 149,158 ****
  		else
      	{
! 			$db = & new PHPWS_DB('article_seq');
  			$db->addColumn('id');
  			$max_id = $db->select('one');
  			if (PHPWS_Error::logIfError($max_id))
  				$max_id = 0;
! 			$form = & new PHPWS_Form('am_import');
  			$form->addhidden('module', 'article');
  			$form->addCheckBox('overwrite');
--- 149,158 ----
  		else
      	{
! 			$db = new PHPWS_DB('article_seq');
  			$db->addColumn('id');
  			$max_id = $db->select('one');
  			if (PHPWS_Error::logIfError($max_id))
  				$max_id = 0;
! 			$form = new PHPWS_Form('am_import');
  			$form->addhidden('module', 'article');
  			$form->addCheckBox('overwrite');
***************
*** 224,228 ****
  		// Instantiate the unserializer
  		require_once(PHPWS_SOURCE_DIR . 'lib/pear/XML/Unserializer.php');
! 		$unserializer = &new XML_unserializer();
  		$autodetect = true;
  		$overwritten = false;
--- 224,228 ----
  		// Instantiate the unserializer
  		require_once(PHPWS_SOURCE_DIR . 'lib/pear/XML/Unserializer.php');
! 		$unserializer = new XML_unserializer();
  		$autodetect = true;
  		$overwritten = false;
***************
*** 283,287 ****
  		/* Update next available id in the sequence table */
  		if (!$autodetect) {
! 			$db = & new PHPWS_DB('article');
  			$db->updateSequenceTable();
  		}
--- 283,287 ----
  		/* Update next available id in the sequence table */
  		if (!$autodetect) {
! 			$db = new PHPWS_DB('article');
  			$db->updateSequenceTable();
  		}

Index: AM_DisplayForms.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/article/class/AM_DisplayForms.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** AM_DisplayForms.php	21 Nov 2008 06:13:14 -0000	1.8
--- AM_DisplayForms.php	2 Jan 2011 23:34:26 -0000	1.9
***************
*** 34,38 ****

  		$and = dgettext('article', 'and');
!  	   	$form = & new PHPWS_Form('Article_Search');

  	   	/* owner */
--- 34,38 ----

  		$and = dgettext('article', 'and');
!  	   	$form = new PHPWS_Form('Article_Search');

  	   	/* owner */
***************
*** 280,284 ****
  		/* Retrieve the older article version */
  		PHPWS_Core::initModClass('version', 'Version.php');
! 		$version = & new Version('article', $oldversion);
  		$old_object = new PHPWS_Article;
  		$version->loadObject($old_object);
--- 280,284 ----
  		/* Retrieve the older article version */
  		PHPWS_Core::initModClass('version', 'Version.php');
! 		$version = new Version('article', $oldversion);
  		$old_object = new PHPWS_Article;
  		$version->loadObject($old_object);
***************
*** 290,294 ****

  		/* Retrieve the newer article version */
! 		$version = & new Version('article', $newversion);
  		$new_object = new PHPWS_Article;
  		$version->loadObject($new_object);
--- 290,294 ----

  		/* Retrieve the newer article version */
! 		$version = new Version('article', $newversion);
  		$new_object = new PHPWS_Article;
  		$version->loadObject($new_object);
***************
*** 307,313 ****
  		$lines1 = PHPWS_Text::sentence(strip_tags($old_object->view_full(), $allowedtags));
  		$lines2 = PHPWS_Text::sentence(strip_tags($new_object->view_full(), $allowedtags));
! 		$diff = &new Text_Diff($lines1, $lines2);
  		/* Determine what changes were made */
! 		$renderer = &new Text_Diff_Renderer_html(999);
  		$tags['DIFFCONTENT'] = $renderer->render($diff);
  		$tags['BACKLINK'] = '<a href="index.php?module=article&op=viewhistory&id='. $_REQUEST['id'].'">' . dgettext('article', 'Back To Revision History').'</a>';
--- 307,313 ----
  		$lines1 = PHPWS_Text::sentence(strip_tags($old_object->view_full(), $allowedtags));
  		$lines2 = PHPWS_Text::sentence(strip_tags($new_object->view_full(), $allowedtags));
! 		$diff = new Text_Diff($lines1, $lines2);
  		/* Determine what changes were made */
! 		$renderer = new Text_Diff_Renderer_html(999);
  		$tags['DIFFCONTENT'] = $renderer->render($diff);
  		$tags['BACKLINK'] = '<a href="index.php?module=article&op=viewhistory&id='. $_REQUEST['id'].'">' . dgettext('article', 'Back To Revision History').'</a>';

Index: Article.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/article/class/Article.php,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** Article.php	26 Feb 2009 23:47:29 -0000	1.63
--- Article.php	2 Jan 2011 23:34:26 -0000	1.64
***************
*** 188,192 ****
  		require_once(PHPWS_SOURCE_DIR . 'lib/pear/XML/Unserializer.php');
  		// Instantiate the unserializer
! 		$unserializer = &new XML_unserializer();
  		// Unserialize the data structure
  		$status = $unserializer->unserialize($this->pages);
--- 188,192 ----
  		require_once(PHPWS_SOURCE_DIR . 'lib/pear/XML/Unserializer.php');
  		// Instantiate the unserializer
! 		$unserializer =new XML_unserializer();
  		// Unserialize the data structure
  		$status = $unserializer->unserialize($this->pages);
***************
*** 433,437 ****
  			  return dgettext('article', 'The article you requested is not viewable.');
  		}
!         $key = & new Key($this->key_id);
          if (!$key->allowView()) 
              return dgettext('article', 'Sorry you do not have permission to view this article.');
--- 433,437 ----
  			  return dgettext('article', 'The article you requested is not viewable.');
  		}
!         $key = new Key($this->key_id);
          if (!$key->allowView()) 
              return dgettext('article', 'Sorry you do not have permission to view this article.');
***************
*** 570,574 ****
  	function delete ()
  	{
! 		$key = & new Key($this->key_id);
  		$key->active = 0;
  		$result = $key->save();
--- 570,574 ----
  	function delete ()
  	{
! 		$key = new Key($this->key_id);
  		$key->active = 0;
  		$result = $key->save();
***************
*** 832,836 ****
  		if (!$id)
  			$id = $this->id;
!         $db = & new PHPWS_DB('article');
          $db->addWhere('id', $id);
          $db->addValue('hits', ++$this->hits);
--- 832,836 ----
  		if (!$id)
  			$id = $this->id;
!         $db = new PHPWS_DB('article');
          $db->addWhere('id', $id);
          $db->addValue('hits', ++$this->hits);
***************
*** 848,857 ****
  	function set_data($data) 
  	{
!         $db = & new PHPWS_DB('article');
          $db->addWhere('id', $this->id);
          foreach ($data AS $row)
          	$db->addValue($row[0], $row[1]);
          $db->update();
!         $db = & new PHPWS_DB('article_version');
          $db->addWhere('vr_current', 1);
          $db->addWhere('vr_approved', 0, '=', 'or');
--- 848,857 ----
  	function set_data($data) 
  	{
!         $db = new PHPWS_DB('article');
          $db->addWhere('id', $this->id);
          foreach ($data AS $row)
          	$db->addValue($row[0], $row[1]);
          $db->update();
!         $db = new PHPWS_DB('article_version');
          $db->addWhere('vr_current', 1);
          $db->addWhere('vr_approved', 0, '=', 'or');
***************
*** 962,966 ****
  	*/
      function get_version_ids($sourceId){
!         $version_db = & new PHPWS_DB('article_version');
          $version_db->addColumn('id');
          $version_db->addWhere('source_id', $sourceId);
--- 962,966 ----
  	*/
      function get_version_ids($sourceId){
!         $version_db = new PHPWS_DB('article_version');
          $version_db->addColumn('id');
          $version_db->addWhere('source_id', $sourceId);
***************
*** 1042,1046 ****

  	   	PHPWS_Core::initModClass('version', 'Version.php');
! 	  	$version = & new Version('article', $this->_version_id);
  	    $version->loadObject($this);
  	    $this->unserialize_sections();
--- 1042,1046 ----

  	   	PHPWS_Core::initModClass('version', 'Version.php');
! 	  	$version = new Version('article', $this->_version_id);
  	    $version->loadObject($this);
  	    $this->unserialize_sections();

[phpws-comm-commits] modules/article/class Article.php, 1.63, 1.64 AM_EditForms.php, 1.14, 1.15 AM_

[phpws-comm-commits] modules/article/class Article.php, 1.63, 1.64 AM_EditForms.php, 1.14, 1.15 AM_Actions.php, 1.18, 1.19 AM_Data.php, 1.22, 1.23 AM_DisplayForms.php, 1.8, 1.9