[ljcom] r12224: LJSUP-12388: Implement notifications sub...

LJSUP-12388: Implement notifications subsystem

U   trunk/bin/upgrading/en_LJ.dat
U   trunk/cgi-bin/LJ/Pay/SelfPromo.pm

Modified: trunk/bin/upgrading/en_LJ.dat
===================================================================
--- trunk/bin/upgrading/en_LJ.dat	2012-07-04 11:26:20 UTC (rev 12223)
+++ trunk/bin/upgrading/en_LJ.dat	2012-07-04 11:52:37 UTC (rev 12224)
@@ -398,7 +398,7 @@
 [[siteroot]]
 .
 
-commercial.entry.notification.decline.user.subject=The entry is removed from commercial promo by promoter
+commercial.entry.notification.decline.user.subject=The entry is removed from commercial promo
 
 commercial.entry.notification.decline.user.body<<
 Dear [[user]]!
@@ -7946,7 +7946,7 @@
 
 selfpromo.entry.notification.deactivate.ineligible.poster_invisible.subject=Entry promotion discontinued
 
-selfpromo.entry.notification.deactivate.ineligible.same_in_commercial.body<<
+selfpromo.entry.notification.deactivate.ineligible.in_commpromo.body<<
 Dear [[user]],
 
 The entry [[object_url]] is withdrawn from commercial promo slot due to it disposition in commercial promo slot. 
@@ -7957,7 +7957,7 @@
 http://www.livejournal.com
 .
 
-selfpromo.entry.notification.deactivate.ineligible.same_in_commercial.subject=Withdrawl of the entry from selfpromo slot
+selfpromo.entry.notification.deactivate.ineligible.in_commpromo.subject=Withdrawl of the entry from selfpromo slot
 
 
 selfpromo.entry.notification.deactivate.owner.body<<

Modified: trunk/cgi-bin/LJ/Pay/SelfPromo.pm
===================================================================
--- trunk/cgi-bin/LJ/Pay/SelfPromo.pm	2012-07-04 11:26:20 UTC (rev 12223)
+++ trunk/cgi-bin/LJ/Pay/SelfPromo.pm	2012-07-04 11:52:37 UTC (rev 12224)
@@ -716,6 +716,7 @@
 =item get_promotions
  Return array of promotion object (for past, current, future) 
     Args: 
+        slot    - slot to use
         index   - index of the promo
         count   - max count of slots
     REQ: index <= 0
@@ -738,7 +739,7 @@
 #warn "index: $index, count: $count";
 
     return [] if ($index == 0 && $count == 0);
-    my $codirection = $index*$count >=0 ? 1 : 0;
+    my $codirection = $index*$count >= 0 ? 1 : 0;
 
     my $offset = $codirection ? abs($index) : abs ($index + $count - 1);
     my $limit = abs($count);
@@ -848,7 +849,7 @@
         my $cpromoted_object = $cslot->current_promoted_object();
         my $centry = $cpromoted_object->object();
         if ($centry && $promoted_object->is_the_same_object($centry)) {
-            $reason = 'same_in_commercial'; 
+            $reason = 'in_commpromo'; 
             $promotion->deactivate(
                 'reason'  => 'ineligible',
                 'details' => $reason,