phpwebsite-comm-cvs-commits

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

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

Modified Files:
	admin.php 
Log Message:
Minor updates

Index: admin.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/ads/class/admin.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** admin.php	22 Feb 2008 03:53:11 -0000	1.19
--- admin.php	29 Mar 2008 17:01:25 -0000	1.20
***************
*** 51,55 ****
          }
  
!         $panel->setContent(Ads_Admin::route($action));
          Layout::add(PHPWS_ControlPanel::display($panel->display()));
      }
--- 51,55 ----
          }
  
!         $panel->setContent(Ads_Admin::route($action, $panel));
          Layout::add(PHPWS_ControlPanel::display($panel->display()));
      }
***************
*** 86,90 ****
      }
  
!     function route($action)
      {
          $title   = NULL;
--- 86,90 ----
      }
  
!     function route($action, &$panel)
      {
          $title   = NULL;
***************
*** 93,113 ****
          PHPWS_Core::initModClass('ads', 'advertiser.php');
  
!         if (isset($_REQUEST['zone_id']))
!         {
!             $zone = new Ads_Zone($_REQUEST['zone_id']);
!         }
!         else
!         {
!             $zone = new Ads_Zone();
!         }
! 
!         if (isset($_REQUEST['advertiser_id']))
!         {
!             $advertiser = new Ads_Advertiser($_REQUEST['advertiser_id']);
!         }
!         else
!         {
!             $advertiser = new Ads_Advertiser();
!         }
  
          if (isset($_REQUEST['campaign_id']))
--- 93,98 ----
          PHPWS_Core::initModClass('ads', 'advertiser.php');
  
!         $zone = new Ads_Zone(isset($_REQUEST['zone_id']) ? $_REQUEST['zone_id'] : NULL);
!         $advertiser = new Ads_Advertiser(isset($_REQUEST['advertiser_id']) ? $_REQUEST['advertiser_id'] : NULL);
  
          if (isset($_REQUEST['campaign_id']))
***************
*** 160,173 ****
  
              case 'hideZone':
!                 $result = $zone->toggle();
!                 if (PEAR::isError($result))
                  {
-                     PHPWS_Error::log($result);
                      Ads_Admin::sendMessage(dgettext('ads', 'Zone activation could not be changed'), 'manageZones');
                  }
!                 else
!                 {
!                     Ads_Admin::sendMessage(dgettext('ads', 'Zone activation changed'), 'manageZones');
!                 }
                  break;
  
--- 145,153 ----
  
              case 'hideZone':
!                 if (PHPWS_Error::logIfError($zone->toggle()))
                  {
                      Ads_Admin::sendMessage(dgettext('ads', 'Zone activation could not be changed'), 'manageZones');
                  }
!                 Ads_Admin::sendMessage(dgettext('ads', 'Zone activation changed'), 'manageZones');
                  break;
  
***************
*** 206,219 ****
                  else
                  {
!                     $result = $zone->save();
!                     if (PEAR::isError($result))
                      {
-                         PHPWS_Error::log($result);
                          Ads_Admin::sendMessage(dgettext('ads', 'Zone could not be saved'), 'manageZones');
                      }
!                     else
!                     {
!                         Ads_Admin::sendMessage(dgettext('ads', 'Zone saved'), 'manageZones');
!                     }
                  }
                  break;
--- 186,194 ----
                  else
                  {
!                     if (PHPWS_Error::logIfError($zone->save()))
                      {
                          Ads_Admin::sendMessage(dgettext('ads', 'Zone could not be saved'), 'manageZones');
                      }
!                     Ads_Admin::sendMessage(dgettext('ads', 'Zone saved'), 'manageZones');
                  }
                  break;
***************
*** 230,243 ****
                  else
                  {
!                     $result = $zone->save();
!                     if (PEAR::isError($result))
!                     {
!                         PHPWS_Error::log($result);
!                     }
!                     elseif (isset($_REQUEST['key_id']))
                      {
                          Ads_Admin::lockZone($zone->id, $_REQUEST['key_id']);
                      }
- 
                      javascript('close_refresh');
                  }
--- 205,212 ----
                  else
                  {
!                     if (!PHPWS_Error::logIfError($zone->save()) && isset($_REQUEST['key_id']))
                      {
                          Ads_Admin::lockZone($zone->id, $_REQUEST['key_id']);
                      }
                      javascript('close_refresh');
                  }
***************
*** 245,257 ****
  
              case 'lockZone':
!                 $result = Ads_Admin::lockZone($_GET['zone_id'], $_GET['key_id']);
!                 if (PEAR::isError($result))
!                 {
!                     PHPWS_Error::log($result);
!                 }
                  PHPWS_Core::goBack();
                  break;
  
              case 'manageZones':
                  $title = dgettext('ads', 'Manage Zones');
                  $content = Ads_Admin::listZones();
--- 214,224 ----
  
              case 'lockZone':
!                 PHPWS_Error::logIfError(Ads_Admin::lockZone($_GET['zone_id'], $_GET['key_id']));
                  PHPWS_Core::goBack();
                  break;
  
              case 'manageZones':
+                 /* Need to set tab in case we got here from another action. */
+                 $panel->setCurrentTab('manageZones');
                  $title = dgettext('ads', 'Manage Zones');
                  $content = Ads_Admin::listZones();
***************
*** 276,294 ****
                  if (Ads_Admin::postAdvertiser($advertiser))
                  {
!                     $result = $advertiser->save();
!                     if (PEAR::isError($result))
                      {
-                         PHPWS_Error::log($result);
                          Ads_Admin::sendMessage(dgettext('ads', 'Advertiser could not be saved'), 'manageAdvertisers');
                      }
!                     else
!                     {
!                         Ads_Admin::sendMessage(dgettext('ads', 'Advertiser saved'), 'manageAdvertisers');
!                     }
!                 }
!                 else
!                 {
!                     Ads_Admin::sendMessage(dgettext('ads', 'User not found or already advertiser'), 'manageAdvertisers');
                  }
                  break;
  
--- 243,253 ----
                  if (Ads_Admin::postAdvertiser($advertiser))
                  {
!                     if (PHPWS_Error::logIfError($advertiser->save()))
                      {
                          Ads_Admin::sendMessage(dgettext('ads', 'Advertiser could not be saved'), 'manageAdvertisers');
                      }
!                     Ads_Admin::sendMessage(dgettext('ads', 'Advertiser saved'), 'manageAdvertisers');
                  }
+                 Ads_Admin::sendMessage(dgettext('ads', 'User not found or already advertiser'), 'manageAdvertisers');
                  break;
  
***************
*** 298,308 ****
                      Ads_Admin::sendMessage(dgettext('ads', 'Advertiser deleted'), 'manageAdvertisers');
                  }
!                 else
!                 {
!                     Ads_Admin::sendMessage(dgettext('ads', 'Advertiser could not be deleted'), 'manageAdvertisers');
!                 }
                  break;
  
              case 'manageAdvertisers':
                  $title = dgettext('ads', 'Manage Advertisers');
                  $content = Ads_Admin::listAdvertisers();
--- 257,266 ----
                      Ads_Admin::sendMessage(dgettext('ads', 'Advertiser deleted'), 'manageAdvertisers');
                  }
!                 Ads_Admin::sendMessage(dgettext('ads', 'Advertiser could not be deleted'), 'manageAdvertisers');
                  break;
  
              case 'manageAdvertisers':
+                 /* Need to set tab in case we got here from another action. */
+                 $panel->setCurrentTab('manageAdvertisers');
                  $title = dgettext('ads', 'Manage Advertisers');
                  $content = Ads_Admin::listAdvertisers();
***************
*** 345,362 ****
                  else
                  {
!                     $result = $campaign->save();
!                     if (PEAR::isError($result))
                      {
-                         PHPWS_Error::log($result);
                          Ads_Admin::sendMessage(dgettext('ads', 'Campaign could not be saved'),
                                                 array('action'=>'manageCampaigns',
                                                 'advertiser_id'=>$campaign->getAdvertiserId()));
                      }
!                     else
!                     {
!                         Ads_Admin::sendMessage(dgettext('ads', 'Campaign saved'),
!                                                array('action'=>'manageCampaigns',
!                                                'advertiser_id'=>$campaign->getAdvertiserId()));
!                     }
                  }
                  break;
--- 303,314 ----
                  else
                  {
!                     if (PHPWS_Error::logIfError($campaign->save()))
                      {
                          Ads_Admin::sendMessage(dgettext('ads', 'Campaign could not be saved'),
                                                 array('action'=>'manageCampaigns',
                                                 'advertiser_id'=>$campaign->getAdvertiserId()));
                      }
!                     Ads_Admin::sendMessage(dgettext('ads', 'Campaign saved'), array('action'=>'manageCampaigns',
!                                            'advertiser_id'=>$campaign->getAdvertiserId()));
                  }
                  break;
***************
*** 369,386 ****
                                             'advertiser_id'=>$campaign->getAdvertiserId()));
                  }
!                 else
!                 {
!                     Ads_Admin::sendMessage(dgettext('ads', 'Campaign could not be deleted'),
!                                            array('action'=>'manageCampaigns',
!                                            'advertiser_id'=>$campaign->getAdvertiserId()));
!                 }
                  break;
  
              case 'lockCampaign':
!                 $result = Ads_Admin::lockCampaign($_GET['campaign_id'], $_GET['zone_id']);
!                 if (PEAR::isError($result))
!                 {
!                     PHPWS_Error::log($result);
!                 }
                  PHPWS_Core::goBack();
                  break;
--- 321,330 ----
                                             'advertiser_id'=>$campaign->getAdvertiserId()));
                  }
!                 Ads_Admin::sendMessage(dgettext('ads', 'Campaign could not be deleted'), array('action'=>'manageCampaigns',
!                                        'advertiser_id'=>$campaign->getAdvertiserId()));
                  break;
  
              case 'lockCampaign':
!                 PHPWS_Error::logIfError(Ads_Admin::lockCampaign($_GET['campaign_id'], $_GET['zone_id']));
                  PHPWS_Core::goBack();
                  break;
***************
*** 438,482 ****
                  else
                  {
!                     if (isset($_POST['approvalList']))
!                     {
!                         $newAction = 'approval';
!                     }
!                     else
!                     {
!                         $newAction = 'manageAds';
!                     }
  
!                     $result = $ad->save();
!                     if (PEAR::isError($result))
!                     {
!                         PHPWS_Error::log($result);
!                         Ads_Admin::sendMessage(dgettext('ads', 'Ad could not be saved'),
!                                                array('action'=>$newAction,
!                                                'campaign_id'=>$ad->getCampaignId()));
!                     }
!                     else
                      {
!                         Ads_Admin::sendMessage(dgettext('ads', 'Ad saved'),
!                                                array('action'=>$newAction,
                                                 'campaign_id'=>$ad->getCampaignId()));
                      }
                  }
                  break;
  
              case 'hideAd':
!                 $result = $ad->toggle();
!                 if (PEAR::isError($result))
                  {
-                     PHPWS_Error::log($result);
                      Ads_Admin::sendMessage(dgettext('ads', 'Ad activation could not be changed'),
!                                            array('action'=>'manageAds',
!                                            'campaign_id'=>$ad->getCampaignId()));
!                 }
!                 else
!                 {
!                     Ads_Admin::sendMessage(dgettext('ads', 'Ad activation changed'),
!                                            array('action'=>'manageAds',
!                                            'campaign_id'=>$ad->getCampaignId()));
                  }
                  break;
  
--- 382,405 ----
                  else
                  {
!                     $newAction = isset($_POST['approvalList']) ? 'approval' : 'manageAds';
  
!                     if (PHPWS_Error::logIfError($ad->save()))
                      {
!                         Ads_Admin::sendMessage(dgettext('ads', 'Ad could not be saved'), array('action'=>$newAction,
                                                 'campaign_id'=>$ad->getCampaignId()));
                      }
+                     Ads_Admin::sendMessage(dgettext('ads', 'Ad saved'), array('action'=>$newAction,
+                                            'campaign_id'=>$ad->getCampaignId()));
                  }
                  break;
  
              case 'hideAd':
!                 if (PHPWS_Error::logIfError($ad->toggle()))
                  {
                      Ads_Admin::sendMessage(dgettext('ads', 'Ad activation could not be changed'),
!                                            array('action'=>'manageAds', 'campaign_id'=>$ad->getCampaignId()));
                  }
+                 Ads_Admin::sendMessage(dgettext('ads', 'Ad activation changed'), array('action'=>'manageAds',
+                                        'campaign_id'=>$ad->getCampaignId()));
                  break;
  
***************
*** 485,497 ****
                  {
                      Ads_Admin::sendMessage(dgettext('ads', 'Ad deleted'),
!                                            array('action'=>'manageAds',
!                                            'campaign_id'=>$ad->getCampaignId()));
!                 }
!                 else
!                 {
!                     Ads_Admin::sendMessage(dgettext('ads', 'Ad could not be deleted'),
!                                            array('action'=>'manageAds',
!                                            'campaign_id'=>$ad->getCampaignId()));
                  }
                  break;
  
--- 408,415 ----
                  {
                      Ads_Admin::sendMessage(dgettext('ads', 'Ad deleted'),
!                                            array('action'=>'manageAds', 'campaign_id'=>$ad->getCampaignId()));
                  }
+                 Ads_Admin::sendMessage(dgettext('ads', 'Ad could not be deleted'),
+                                            array('action'=>'manageAds', 'campaign_id'=>$ad->getCampaignId()));
                  break;
  
***************
*** 539,553 ****
                  }
  
!                 $result = $version->delete();
!                 if (PEAR::isError($result))
                  {
-                     PHPWS_Error::log($result);
                      Ads_Admin::sendMessage(dgettext('ads', 'A problem occurred when trying to disapprove this ad.'),
                                             'approval');
                  }
!                 else
!                 {
!                     Ads_Admin::sendMessage(dgettext('ads', 'Ad disapproved.'), 'approval');
!                 }
                  break;
  
--- 457,466 ----
                  }
  
!                 if (PHPWS_Error::logIfError($version->delete()))
                  {
                      Ads_Admin::sendMessage(dgettext('ads', 'A problem occurred when trying to disapprove this ad.'),
                                             'approval');
                  }
!                 Ads_Admin::sendMessage(dgettext('ads', 'Ad disapproved.'), 'approval');
                  break;
  
***************
*** 565,578 ****
                  $version->setSource($ad);
                  $version->setApproved(TRUE);
!                 $result = $version->save();
!                 if (PEAR::isError($result))
                  {
-                     PHPWS_Error::log($result);
                      Ads_Admin::sendMessage(dgettext('ads', 'An error occurred when saving your version.'), 'approval');
                  }
!                 else
!                 {
!                     Ads_Admin::sendMessage(dgettext('ads', 'Ad approved.'), 'approval');
!                 }
                  break;
  
--- 478,486 ----
                  $version->setSource($ad);
                  $version->setApproved(TRUE);
!                 if (PHPWS_Error::logIfError($version->save()))
                  {
                      Ads_Admin::sendMessage(dgettext('ads', 'An error occurred when saving your version.'), 'approval');
                  }
!                 Ads_Admin::sendMessage(dgettext('ads', 'Ad approved.'), 'approval');
                  break;
  
***************
*** 595,612 ****
                  $version = new Version('ads', $_REQUEST['version_id']);
                  $ad_id = $version->source_id;
!                 $result = $version->delete();
!                 if (PEAR::isError($result))
                  {
-                     PHPWS_Error::log($result);
                      Ads_Admin::sendMessage(dgettext('ads', 'A problem occurred when trying to remove this ad version.'),
!                                            array('action'=>'versions',
!                                            'ad_id'=>$ad_id));
!                 }
!                 else
!                 {
!                     Ads_Admin::sendMessage(dgettext('ads', 'Ad version removed.'),
!                                            array('action'=>'versions',
!                                            'ad_id'=>$ad_id));
                  }
                  break;
  
--- 503,513 ----
                  $version = new Version('ads', $_REQUEST['version_id']);
                  $ad_id = $version->source_id;
!                 if (PHPWS_Error::logIfError($version->delete()))
                  {
                      Ads_Admin::sendMessage(dgettext('ads', 'A problem occurred when trying to remove this ad version.'),
!                                            array('action'=>'versions', 'ad_id'=>$ad_id));
                  }
+                 Ads_Admin::sendMessage(dgettext('ads', 'Ad version removed.'),
+                                        array('action'=>'versions', 'ad_id'=>$ad_id));
                  break;
  
***************
*** 614,631 ****
                  $version = new Version('ads', $_REQUEST['version_id']);
                  $ad_id = $version->source_id;
!                 $result = $version->restore();
!                 if (PEAR::isError($result))
                  {
-                     PHPWS_Error::log($result);
                      Ads_Admin::sendMessage(dgettext('ads', 'A problem occurred when trying to restore this ad version.'),
!                                            array('action'=>'versions',
!                                            'ad_id'=>$ad_id));
!                 }
!                 else
!                 {
!                     Ads_Admin::sendMessage(dgettext('ads', 'Ad version restored.'),
!                                            array('action'=>'versions',
!                                            'ad_id'=>$ad_id));
                  }
                  break;
  
--- 515,525 ----
                  $version = new Version('ads', $_REQUEST['version_id']);
                  $ad_id = $version->source_id;
!                 if (PHPWS_Error::logIfError($version->restore()))
                  {
                      Ads_Admin::sendMessage(dgettext('ads', 'A problem occurred when trying to restore this ad version.'),
!                                            array('action'=>'versions', 'ad_id'=>$ad_id));
                  }
+                 Ads_Admin::sendMessage(dgettext('ads', 'Ad version restored.'),
+                                        array('action'=>'versions', 'ad_id'=>$ad_id));
                  break;
  
***************
*** 655,662 ****
              PHPWS_Core::reroute(PHPWS_Text::linkAddress('ads', $command, TRUE));
          }
!         else
!         {
!             PHPWS_Core::reroute(PHPWS_Text::linkAddress('ads', array('action'=>$command), TRUE));
!         }
      }
  
--- 549,554 ----
              PHPWS_Core::reroute(PHPWS_Text::linkAddress('ads', $command, TRUE));
          }
! 
!         PHPWS_Core::reroute(PHPWS_Text::linkAddress('ads', array('action'=>$command), TRUE));
      }
  
***************
*** 752,783 ****
          $zone->setMaxNumAds($_POST['max_num_ads'] + 1);
  
!         if (isset($errors))
!         {
!             return $errors;
!         }
!         else
!         {
!             return TRUE;
!         }
      }
  
      function removeZonePin()
      {
!         if (!isset($_GET['zone_id']))
!         {
!             return;
!         }
! 
!         $db = new PHPWS_DB('ads_zone_pins');
!         $db->addWhere('zone_id', $_GET['zone_id']);
!         if (isset($_GET['key_id']))
!         {
!             $db->addWhere('key_id', $_GET['key_id']);
!         }
!         $result = $db->delete();
! 
!         if (PEAR::isError($result))
          {
!             PHPWS_Error::log($result);
          }
      }
--- 644,661 ----
          $zone->setMaxNumAds($_POST['max_num_ads'] + 1);
  
!         return isset($errors) ? $errors : true;
      }
  
      function removeZonePin()
      {
!         if (isset($_GET['zone_id']))
          {
!             $db = new PHPWS_DB('ads_zone_pins');
!             $db->addWhere('zone_id', $_GET['zone_id']);
!             if (isset($_GET['key_id']))
!             {
!                 $db->addWhere('key_id', $_GET['key_id']);
!             }
!             PHPWS_Error::logIfError($db->delete());
          }
      }
***************
*** 796,804 ****
          $pager->setModule('ads');
          $pager->setTemplate('zone/list.tpl');
!         $pager->addToggle(' class="bgcolor1"');
          $pager->addPageTags($pageTags);
          $pager->addRowTags('getTpl');
          $pager->setSearch('title', 'description');
          $pager->setDefaultOrder('title', 'asc');
  
          return $pager->get();
--- 674,683 ----
          $pager->setModule('ads');
          $pager->setTemplate('zone/list.tpl');
!         $pager->addToggle(PHPWS_LIST_TOGGLE_CLASS);
          $pager->addPageTags($pageTags);
          $pager->addRowTags('getTpl');
          $pager->setSearch('title', 'description');
          $pager->setDefaultOrder('title', 'asc');
+         $pager->setEmptyMessage(dgettext('ads', 'No zones found.'));
  
          return $pager->get();
***************
*** 810,814 ****
          $db = new PHPWS_DB('ads_zone_pins');
          $db->addWhere($values);
!         $result = $db->delete();
          $db->resetWhere();
  
--- 689,693 ----
          $db = new PHPWS_DB('ads_zone_pins');
          $db->addWhere($values);
!         PHPWS_Error::logIfError($db->delete());
          $db->resetWhere();
  
***************
*** 831,835 ****
          $db = new PHPWS_DB('ads_zone_pins');
          $db->addWhere($values);
!         $result = $db->delete();
          $db->addValue($values);
          return $db->insert();
--- 710,714 ----
          $db = new PHPWS_DB('ads_zone_pins');
          $db->addWhere($values);
!         PHPWS_Error::logIfError($db->delete());
          $db->addValue($values);
          return $db->insert();
***************
*** 864,905 ****
      function postAdvertiser(&$advertiser)
      {
!         if (empty($_POST['username']) || empty($_POST['business']))
!         {
!             return FALSE;
!         }
! 
!         // Check if user exists
!         $db = new PHPWS_DB('users');
!         $db->addWhere('username', $_POST['username']);
!         $db->addColumn('id');
!         $result = $db->select('col');
!         if (PEAR::isError($result))
!         {
!             PHPWS_Error::log($result);
!             return FALSE;
!         }
! 
!         if ($result != NULL)
          {
!             // Check that user is not already an advertiser
!             $db->setTable('ads_advertisers');
!             $db->resetWhere();
!             $db->columns = NULL;
!             $db->addWhere('user_id', $result[0]);
!             $result2 = $db->select();
! 
!             if (PEAR::isError($result2))
              {
!                 PHPWS_Error::log($result2);
!                 return FALSE;
!             }
  
!             if ($result2 == NULL)
!             {
!                 $advertiser->setUserId($result[0]);
!                 $advertiser->setUsername($_POST['username']);
!                 $advertiser->setBusiness($_POST['business']);
!                 $advertiser->setCreated(mktime());
!                 return TRUE;
              }
          }
--- 743,770 ----
      function postAdvertiser(&$advertiser)
      {
!         if (!empty($_POST['username']) && !empty($_POST['business']))
          {
!             // Check if user exists
!             $db = new PHPWS_DB('users');
!             $db->addWhere('username', $_POST['username']);
!             $db->addColumn('id');
!             $result = $db->select('col');
!             if (!PHPWS_Error::logIfError($result) && ($result != NULL))
              {
!                 // Check that user is not already an advertiser
!                 $db->setTable('ads_advertisers');
!                 $db->resetWhere();
!                 $db->columns = NULL;
!                 $db->addWhere('user_id', $result[0]);
!                 $result2 = $db->select();
  
!                 if (!PHPWS_Error::logIfError($result2) && ($result2 == NULL))
!                 {
!                     $advertiser->setUserId($result[0]);
!                     $advertiser->setUsername($_POST['username']);
!                     $advertiser->setBusiness($_POST['business']);
!                     $advertiser->setCreated(mktime());
!                     return TRUE;
!                 }
              }
          }
***************
*** 919,927 ****
          $pager->setModule('ads');
          $pager->setTemplate('advertiser/list.tpl');
!         $pager->addToggle(' class="bgcolor1"');
          $pager->addPageTags($pageTags);
          $pager->addRowTags('getTpl');
          $pager->setSearch('username', 'business');
          $pager->setDefaultOrder('business', 'asc');
  
          return $pager->get();
--- 784,793 ----
          $pager->setModule('ads');
          $pager->setTemplate('advertiser/list.tpl');
!         $pager->addToggle(PHPWS_LIST_TOGGLE_CLASS);
          $pager->addPageTags($pageTags);
          $pager->addRowTags('getTpl');
          $pager->setSearch('username', 'business');
          $pager->setDefaultOrder('business', 'asc');
+         $pager->setEmptyMessage(dgettext('ads', 'No advertisers found.'));
  
          return $pager->get();
***************
*** 976,1004 ****
          $campaign->setCreated(mktime());
  
!         if (isset($errors))
!         {
!             return $errors;
!         }
!         else
!         {
!             return TRUE;
!         }
      }
  
      function removeCampaignPin()
      {
!         if (!isset($_GET['campaign_id']) || !isset($_GET['zone_id']))
!         {
!             return;
!         }
! 
!         $db = new PHPWS_DB('ads_campaign_pins');
!         $db->addWhere('zone_id', $_GET['zone_id']);
!         $db->addWhere('campaign_id', $_GET['campaign_id']);
!         $result = $db->delete();
! 
!         if (PEAR::isError($result))
          {
!             PHPWS_Error::log($result);
          }
      }
--- 842,856 ----
          $campaign->setCreated(mktime());
  
!         return isset($errors) ? $errors : true;
      }
  
      function removeCampaignPin()
      {
!         if (isset($_GET['campaign_id']) && isset($_GET['zone_id']))
          {
!             $db = new PHPWS_DB('ads_campaign_pins');
!             $db->addWhere('zone_id', $_GET['zone_id']);
!             $db->addWhere('campaign_id', $_GET['campaign_id']);
!             PHPWS_Error::logIfError($db->delete());
          }
      }
***************
*** 1018,1022 ****
          $pager->setModule('ads');
          $pager->setTemplate('campaign/list.tpl');
!         $pager->addToggle(' class="bgcolor1"');
          $pager->addPageTags($pageTags);
          $pager->addRowTags('getTpl');
--- 870,874 ----
          $pager->setModule('ads');
          $pager->setTemplate('campaign/list.tpl');
!         $pager->addToggle(PHPWS_LIST_TOGGLE_CLASS);
          $pager->addPageTags($pageTags);
          $pager->addRowTags('getTpl');
***************
*** 1024,1027 ****
--- 876,880 ----
          $pager->setDefaultOrder('name', 'asc');
          $pager->addWhere('advertiser_id', $advertiser_id);
+         $pager->setEmptyMessage(dgettext('ads', 'No campaigns found.'));
  
          return $pager->get();
***************
*** 1040,1044 ****
          $db = new PHPWS_DB('ads_campaign_pins');
          $db->addWhere($values);
!         $result = $db->delete();
          $db->addValue($values);
          return $db->insert();
--- 893,897 ----
          $db = new PHPWS_DB('ads_campaign_pins');
          $db->addWhere($values);
!         PHPWS_Error::logIfError($db->delete());
          $db-...
 
[truncated message content]