[phpws-comm-commits] modules/ads/class advertiser.php,1.6,1.7

[Greg M. <bli...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/ads/class
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19938/class

Modified Files:
	advertiser.php 
Log Message:
Advertisers deleted when associated site user is deleted.

Index: advertiser.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/ads/class/advertiser.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** advertiser.php	28 May 2007 21:21:49 -0000	1.6
--- advertiser.php	22 Jun 2008 14:27:46 -0000	1.7
***************
*** 34,45 ****
      function Ads_Advertiser($id=NULL)
      {
!         if (empty($id))
          {
!             return;
!         }
!         $this->setId($id);
  
!         $db = new PHPWS_DB('ads_advertisers');
!         $db->loadObject($this);
      }
  
--- 34,44 ----
      function Ads_Advertiser($id=NULL)
      {
!         if (!empty($id))
          {
!             $this->setId($id);
  
!             $db = new PHPWS_DB('ads_advertisers');
!             $db->loadObject($this);
!         }
      }
  
***************
*** 115,123 ****
          $db->addWhere('advertiser_id', $this->id);
          $campaigns = $db->getObjects('Ads_Campaign');
!         if (PEAR::isError($campaigns))
!         {
!             PHPWS_Error::log($campaigns);
!         }
!         else if ($campaigns != NULL)
          {
              foreach ($campaigns as $campaign)
--- 114,119 ----
          $db->addWhere('advertiser_id', $this->id);
          $campaigns = $db->getObjects('Ads_Campaign');
! 
!         if (!PHPWS_Error::logIfError($campaigns) && ($campaigns != NULL))
          {
              foreach ($campaigns as $campaign)
***************
*** 128,134 ****
      }
  
!     function kill()
      {
!         if (!Current_User::authorized('ads', 'delete_advertisers', $this->id))
          {
              Current_User::disallow();
--- 124,135 ----
      }
  
!     /**
!      * Removes advertiser and associated campaigns from the database.
!      *
!      * @param  override  Should ONLY be used when user being deleted (see remove_user.php).
!      */
!     function kill($override=false)
      {
!         if (!Current_User::authorized('ads', 'delete_advertisers', $this->id) && !$override)
          {
              Current_User::disallow();
***************
*** 140,150 ****
          $db->addWhere('id', $this->id);
  
!         $result = $db->delete();
!         if (PEAR::isError($result))
!         {
!             PHPWS_Error::log($result);
!             return FALSE;
!         }
!         return TRUE;
      }
  
--- 141,145 ----
          $db->addWhere('id', $this->id);
  
!         return !PHPWS_Error::logIfError($db->delete());
      }