Mercurial > defr > drupal > ad

changeset 4:0d1c70d51fbe ad

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maj premiere release officielle 2 module advertisement
author sly
date Mon, 27 Apr 2009 10:27:29 +0000
parents 416ea999ed76
children cd53a6ba3f97
files ad.info cache/file/ad_cache_file.info channel/ad_channel.info channel/ad_channel.module documentation/CHANGELOG.txt embed/ad_embed.info external/ad_external.info html/ad_html.info image/ad_image.info notify/ad_notify.info owners/ad_owners.info remote/ad_remote.info report/ad_report.info statistics/click_filter/click_filter.info text/ad_text.info weight/probability/ad_weight_probability.info weight/probability/ad_weight_probability.module
diffstat 17 files changed, 78 insertions(+), 67 deletions(-) [+]
line wrap: on
line diff
--- a/ad.info	Mon Apr 20 09:49:37 2009 +0000
+++ b/ad.info	Mon Apr 27 10:27:29 2009 +0000
@@ -4,9 +4,9 @@
 dependencies[] = taxonomy
 description = An advertising system for Drupal powered websites.
 core = 6.x
-; Information added by drupal.org packaging script on 2009-04-17
-version = "6.x-2.0-rc1"
+; Information added by drupal.org packaging script on 2009-04-24
+version = "6.x-2.0"
 core = "6.x"
 project = "ad"
-datestamp = "1239975926"
+datestamp = "1240608904"
 
--- a/cache/file/ad_cache_file.info	Mon Apr 20 09:49:37 2009 +0000
+++ b/cache/file/ad_cache_file.info	Mon Apr 27 10:27:29 2009 +0000
@@ -1,13 +1,13 @@
-; $Id: ad_cache_file.info,v 1.1.2.1.2.1.2.1 2009/04/07 17:18:30 jeremy Exp $
-name = File cache
+; $Id: ad_cache_file.info,v 1.1.2.1.2.1.2.2 2009/04/17 19:20:52 jeremy Exp $
+name = Ad file cache
 package = Ad
 dependencies[] = ad_owners
 description = Provides a file-caching mechanism to improve ad serving performance.
 core = 6.x
 
-; Information added by drupal.org packaging script on 2009-04-17
-version = "6.x-2.0-rc1"
+; Information added by drupal.org packaging script on 2009-04-24
+version = "6.x-2.0"
 core = "6.x"
 project = "ad"
-datestamp = "1239975926"
+datestamp = "1240608904"
 
--- a/channel/ad_channel.info	Mon Apr 20 09:49:37 2009 +0000
+++ b/channel/ad_channel.info	Mon Apr 27 10:27:29 2009 +0000
@@ -5,9 +5,9 @@
 description = Provides the ability to create advertisement channels, about which rules can be defined.
 core = 6.x
 
-; Information added by drupal.org packaging script on 2009-04-17
-version = "6.x-2.0-rc1"
+; Information added by drupal.org packaging script on 2009-04-24
+version = "6.x-2.0"
 core = "6.x"
 project = "ad"
-datestamp = "1239975926"
+datestamp = "1240608904"
 
--- a/channel/ad_channel.module	Mon Apr 20 09:49:37 2009 +0000
+++ b/channel/ad_channel.module	Mon Apr 27 10:27:29 2009 +0000
@@ -1,5 +1,5 @@
 <?php
-// $Id: ad_channel.module,v 1.1.4.20 2009/04/09 22:04:49 jeremy Exp $
+// $Id: ad_channel.module,v 1.1.4.21 2009/04/22 15:14:46 jeremy Exp $
 
 /**
  * @file
@@ -449,12 +449,11 @@
       return _ad_channel_load_node($node);
     case 'insert':
     case 'update':
-      // Fully load the node object to confirm that we are working with an
-      // advertisement.
-      $ad = node_load($node->nid);
-      if (isset($ad->adtype)) {
+      if (is_object($node) && isset($node->adtype) &&
+          isset($node->probability) && isset($node->nid)) {
         return _ad_channel_save_node($node);
       }
+      break;
     case 'delete':
       return _ad_channel_delete_node($node);
     case 'validate':
--- a/documentation/CHANGELOG.txt	Mon Apr 20 09:49:37 2009 +0000
+++ b/documentation/CHANGELOG.txt	Mon Apr 27 10:27:29 2009 +0000
@@ -1,6 +1,17 @@
-$Id: CHANGELOG.txt,v 1.2.2.40.2.176.2.41.2.77 2009/04/16 14:24:55 jeremy Exp $
+$Id: CHANGELOG.txt,v 1.2.2.40.2.176.2.41.2.80 2009/04/22 15:14:46 jeremy Exp $
 
-April 16th, 2009
+April 22nd, 2009
+ - ad_channel.module
+    o bug #436234: allow nodes to save properly on creation
+ - ad_weight_percentage.module
+    o bug #436234: allow nodes to save properly on creation
+
+April 17th, 2009
+ - ad_cache_file.install
+    o bug #436926: be sure the file cache is disabled when the ad file cache
+      module is disabled (patch thanks to Garrett Albright)
+
+April 16th, 2009 (-rc1)
  - ad.module
     o feature #170497: introduce configurable option to remove ad nodes from
       search results, enabled by default.  Advertisements will still show up
--- a/embed/ad_embed.info	Mon Apr 20 09:49:37 2009 +0000
+++ b/embed/ad_embed.info	Mon Apr 27 10:27:29 2009 +0000
@@ -1,12 +1,13 @@
-; $Id: ad_embed.info,v 1.1.2.1.2.1 2008/08/11 21:15:26 jeremy Exp $
-name = Embed
+; $Id: ad_embed.info,v 1.1.2.1.2.1.2.1 2009/04/17 19:20:54 jeremy Exp $
+name = Ad embed
 package = Ad
 dependencies[] = ad
 description = Embed ads in content.
 core = 6.x
-; Information added by drupal.org packaging script on 2009-04-17
-version = "6.x-2.0-rc1"
+
+; Information added by drupal.org packaging script on 2009-04-24
+version = "6.x-2.0"
 core = "6.x"
 project = "ad"
-datestamp = "1239975926"
+datestamp = "1240608904"
 
--- a/external/ad_external.info	Mon Apr 20 09:49:37 2009 +0000
+++ b/external/ad_external.info	Mon Apr 27 10:27:29 2009 +0000
@@ -4,9 +4,9 @@
 dependencies[] = ad
 description = Enhances the ad module to support externally hosted ads.  Typically combined with IFrames.
 core = 6.x
-; Information added by drupal.org packaging script on 2009-04-17
-version = "6.x-2.0-rc1"
+; Information added by drupal.org packaging script on 2009-04-24
+version = "6.x-2.0"
 core = "6.x"
 project = "ad"
-datestamp = "1239975926"
+datestamp = "1240608904"
 
--- a/html/ad_html.info	Mon Apr 20 09:49:37 2009 +0000
+++ b/html/ad_html.info	Mon Apr 27 10:27:29 2009 +0000
@@ -4,9 +4,9 @@
 dependencies[] = ad
 description = Enhances the ad module to support html-based ads, such as those defined by many advertising affiliate websites.
 core = 6.x
-; Information added by drupal.org packaging script on 2009-04-17
-version = "6.x-2.0-rc1"
+; Information added by drupal.org packaging script on 2009-04-24
+version = "6.x-2.0"
 core = "6.x"
 project = "ad"
-datestamp = "1239975926"
+datestamp = "1240608904"
 
--- a/image/ad_image.info	Mon Apr 20 09:49:37 2009 +0000
+++ b/image/ad_image.info	Mon Apr 27 10:27:29 2009 +0000
@@ -5,9 +5,9 @@
 dependencies[] = upload
 description = Enhances the ad module to support banner ads.
 core = 6.x
-; Information added by drupal.org packaging script on 2009-04-17
-version = "6.x-2.0-rc1"
+; Information added by drupal.org packaging script on 2009-04-24
+version = "6.x-2.0"
 core = "6.x"
 project = "ad"
-datestamp = "1239975926"
+datestamp = "1240608904"
 
--- a/notify/ad_notify.info	Mon Apr 20 09:49:37 2009 +0000
+++ b/notify/ad_notify.info	Mon Apr 27 10:27:29 2009 +0000
@@ -1,14 +1,14 @@
-; $Id: ad_notify.info,v 1.1.2.1.2.3.2.1 2009/03/05 22:29:00 jeremy Exp $
-name = Notify
+; $Id: ad_notify.info,v 1.1.2.1.2.3.2.2 2009/04/17 19:20:55 jeremy Exp $
+name = Ad notify
 package = Ad
 dependencies[] = ad_owners
 dependencies[] = token
 description = Receive email notifications regarding ads.
 core = 6.x
 
-; Information added by drupal.org packaging script on 2009-04-17
-version = "6.x-2.0-rc1"
+; Information added by drupal.org packaging script on 2009-04-24
+version = "6.x-2.0"
 core = "6.x"
 project = "ad"
-datestamp = "1239975926"
+datestamp = "1240608904"
 
--- a/owners/ad_owners.info	Mon Apr 20 09:49:37 2009 +0000
+++ b/owners/ad_owners.info	Mon Apr 27 10:27:29 2009 +0000
@@ -5,9 +5,9 @@
 description = Enhances the ad module to support ad owners.
 core = 6.x
 
-; Information added by drupal.org packaging script on 2009-04-17
-version = "6.x-2.0-rc1"
+; Information added by drupal.org packaging script on 2009-04-24
+version = "6.x-2.0"
 core = "6.x"
 project = "ad"
-datestamp = "1239975926"
+datestamp = "1240608904"
 
--- a/remote/ad_remote.info	Mon Apr 20 09:49:37 2009 +0000
+++ b/remote/ad_remote.info	Mon Apr 27 10:27:29 2009 +0000
@@ -1,13 +1,13 @@
-; $Id: ad_remote.info,v 1.1.2.1.2.2 2009/02/12 12:47:55 jeremy Exp $
-name = Remote
+; $Id: ad_remote.info,v 1.1.2.1.2.2.2.1 2009/04/17 19:20:56 jeremy Exp $
+name = Remote ads
 package = Ad
 dependencies[] = ad_owners
 description = Generates cut-and-paste source snippets allowing ads to be easily displayed on remote websites.
 core = 6.x
 
-; Information added by drupal.org packaging script on 2009-04-17
-version = "6.x-2.0-rc1"
+; Information added by drupal.org packaging script on 2009-04-24
+version = "6.x-2.0"
 core = "6.x"
 project = "ad"
-datestamp = "1239975926"
+datestamp = "1240608904"
 
--- a/report/ad_report.info	Mon Apr 20 09:49:37 2009 +0000
+++ b/report/ad_report.info	Mon Apr 27 10:27:29 2009 +0000
@@ -1,13 +1,13 @@
-; $Id: ad_report.info,v 1.1.2.1.2.2.2.1 2009/02/23 22:39:05 jeremy Exp $
-name = Report
+; $Id: ad_report.info,v 1.1.2.1.2.2.2.2 2009/04/17 19:20:56 jeremy Exp $
+name = Ad report
 package = Ad
 dependencies[] = ad
 description = Provides comprehensive charts and reports about advertising statistics.
 core = 6.x
 
-; Information added by drupal.org packaging script on 2009-04-17
-version = "6.x-2.0-rc1"
+; Information added by drupal.org packaging script on 2009-04-24
+version = "6.x-2.0"
 core = "6.x"
 project = "ad"
-datestamp = "1239975926"
+datestamp = "1240608904"
 
--- a/statistics/click_filter/click_filter.info	Mon Apr 20 09:49:37 2009 +0000
+++ b/statistics/click_filter/click_filter.info	Mon Apr 27 10:27:29 2009 +0000
@@ -1,12 +1,13 @@
-; $Id: click_filter.info,v 1.1.2.1.2.1 2008/08/11 21:15:27 jeremy Exp $
-name = Click filter
+; $Id: click_filter.info,v 1.1.2.1.2.1.2.1 2009/04/17 19:20:57 jeremy Exp $
+name = Ad click filter
 package = Ad
 dependencies[] = ad
 description = Filter duplicate click statistics.
 core = 6.x
-; Information added by drupal.org packaging script on 2009-04-17
-version = "6.x-2.0-rc1"
+
+; Information added by drupal.org packaging script on 2009-04-24
+version = "6.x-2.0"
 core = "6.x"
 project = "ad"
-datestamp = "1239975926"
+datestamp = "1240608904"
 
--- a/text/ad_text.info	Mon Apr 20 09:49:37 2009 +0000
+++ b/text/ad_text.info	Mon Apr 27 10:27:29 2009 +0000
@@ -4,9 +4,9 @@
 dependencies[] = ad
 description = Enhances the ad module to support static text ads.
 core = 6.x
-; Information added by drupal.org packaging script on 2009-04-17
-version = "6.x-2.0-rc1"
+; Information added by drupal.org packaging script on 2009-04-24
+version = "6.x-2.0"
 core = "6.x"
 project = "ad"
-datestamp = "1239975926"
+datestamp = "1240608904"
 
--- a/weight/probability/ad_weight_probability.info	Mon Apr 20 09:49:37 2009 +0000
+++ b/weight/probability/ad_weight_probability.info	Mon Apr 27 10:27:29 2009 +0000
@@ -5,9 +5,9 @@
 description = Allow admin to adjust the probability that an ad will be displayed.
 core = 6.x
 
-; Information added by drupal.org packaging script on 2009-04-17
-version = "6.x-2.0-rc1"
+; Information added by drupal.org packaging script on 2009-04-24
+version = "6.x-2.0"
 core = "6.x"
 project = "ad"
-datestamp = "1239975926"
+datestamp = "1240608904"
 
--- a/weight/probability/ad_weight_probability.module	Mon Apr 20 09:49:37 2009 +0000
+++ b/weight/probability/ad_weight_probability.module	Mon Apr 27 10:27:29 2009 +0000
@@ -1,5 +1,5 @@
 <?php
-// $Id: ad_weight_probability.module,v 1.1.4.5 2009/03/27 19:11:50 jeremy Exp $
+// $Id: ad_weight_probability.module,v 1.1.4.6 2009/04/22 15:14:46 jeremy Exp $
 
 /**
  * @file
@@ -48,13 +48,12 @@
     case 'insert':
     case 'update':
       if (user_access('configure ad probability')) {
-        // Fully load the node object to confirm that we are working with an
-        // advertisement.
-        $ad = node_load($node->nid);
-        if (isset($ad->adtype)) {
+        if (is_object($node) && isset($node->adtype) &&
+            isset($node->probability) && isset($node->nid)) {
           return _ad_weight_probability_node_save($node, $op);
         }
       }
+      break;
     case 'delete':
       return _ad_weight_probability_node_delete($node);
   }
@@ -99,7 +98,7 @@
  * Helper function, save the probability to the database.
  */
 function _ad_weight_probability_node_save($node) {
-  if (is_object($node) && $node->nid) {
+  if (isset($node->nid) && $node->nid) {
     db_query('UPDATE {ad_weight_probability} SET probability = %d WHERE aid = %d', $node->probability, $node->nid);
     if (!db_affected_rows()) {
       db_query('INSERT INTO {ad_weight_probability} (aid, probability) VALUES(%d, %d)', $node->nid, $node->probability);