[Phpslash-commit] CVS: phpslash-dev/include/modules/mailinglist MailingList.class,1.5,1.6

[Luis M <le...@us...>]

Update of /cvsroot/phpslash/phpslash-dev/include/modules/mailinglist
In directory sc8-pr-cvs1:/tmp/cvs-serv24071

Modified Files:
	MailingList.class 
Log Message:
cleanups plus minor tweaks. still getting empty body emails for certain situations

Index: MailingList.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/mailinglist/MailingList.class,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** MailingList.class	25 Apr 2003 15:11:36 -0000	1.5
--- MailingList.class	25 Apr 2003 16:27:14 -0000	1.6
***************
*** 313,317 ****
          $ary["bday"] = ($ary["bday"]>0) ? $ary["bday"] : (30 + $ary["bday"]);
        }
-       //$this->message .= " bday: ".$ary["bday"];
  
        if ($ary["dateoverride"]) {
--- 313,316 ----
***************
*** 337,342 ****
        $enddate = date("Y-m-d H:i:s", $endtimestamp);
      
-       $this->message .= " bday ".$ary["bday"]." begin-time: $begtimestamp\t end-time: $endtimestamp ";
- 
        $q = "SELECT story.story_id,
                     story.title,
--- 336,339 ----
***************
*** 355,373 ****
        $db->query($q);
  
!       $this->templ->set_block("messagebodymail", "row", "rowS");
  
        $success = false;
        
-       // TODO 
-       // is this loop right?
-       // this is looping and setting the variables every time
-       // so, if there is more than one story pulled from the database
-       // only the last story pulled will be emailed...
-       // shouldn't it be creating a list of all stories?
-       // Unless of course that's what parse("rows","row",true) is doing
-       // Luis
- 
        while($db->next_record()) {
! 
           $url = $this->psl['rooturl'] . "/article.php?story_id=" . $db->Record["story_id"];
           $this->templ->set_var(array(
--- 352,361 ----
        $db->query($q);
  
!       $this->templ->set_block("messagebodymail", "row", "rows");
  
        $success = false;
        
        while($db->next_record()) {
!          // TODO REMOVE $this->message .= $db->Record['intro_text']."\n";
           $url = $this->psl['rooturl'] . "/article.php?story_id=" . $db->Record["story_id"];
           $this->templ->set_var(array(
***************
*** 493,497 ****
              $this->templ->parse('OUT',array("messagemail"));
              $final_body = $this->templ->get('OUT');
!             
              if(empty($ary['body']) && empty($extra_message)){
                 $this->message .= pslgetText("Nothing to send")."<br />\n";
--- 481,485 ----
              $this->templ->parse('OUT',array("messagemail"));
              $final_body = $this->templ->get('OUT');
!           
              if(empty($ary['body']) && empty($extra_message)){
                 $this->message .= pslgetText("Nothing to send")."<br />\n";