[Phpslash-commit] CVS: phpslash-ft/contrib cronmail.php3,1.8,1.9
Brought to you by:
joestewart,
nhruby
From: Joe S. <joe...@us...> - 2003-01-08 17:00:54
|
Update of /cvsroot/phpslash/phpslash-ft/contrib In directory sc8-pr-cvs1:/tmp/cvs-serv7820/phpslash-ft/contrib Modified Files: cronmail.php3 Log Message: Lars Kvanum provided fixes to cronmail.php3 Index: cronmail.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/contrib/cronmail.php3,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** cronmail.php3 21 Nov 2002 18:59:07 -0000 1.8 --- cronmail.php3 8 Jan 2003 17:00:45 -0000 1.9 *************** *** 138,142 **** $offset = "3"; } else { ! $offset = "2"; } $frequency = "DAY"; --- 138,142 ---- $offset = "3"; } else { ! $offset = "1"; } $frequency = "DAY"; *************** *** 148,152 **** $offset = "3"; } else { ! $offset = "2"; } $frequency = "DAY"; --- 148,152 ---- $offset = "3"; } else { ! $offset = "1"; } $frequency = "DAY"; *************** *** 158,162 **** $offset = "3"; } else { ! $offset = "2"; } $frequency = "DAY"; --- 158,162 ---- $offset = "3"; } else { ! $offset = "1"; } $frequency = "DAY"; *************** *** 168,172 **** $offset = "3"; } else { ! $offset = "2"; } $frequency = "DAY"; --- 168,172 ---- $offset = "3"; } else { ! $offset = "1"; } $frequency = "DAY"; *************** *** 179,183 **** $offset = "3"; } else { ! $offset = "2"; } $frequency = "DAY"; --- 179,183 ---- $offset = "3"; } else { ! $offset = "1"; } $frequency = "DAY"; *************** *** 189,193 **** $offset = "3"; } else { ! $offset = "2"; } $frequency = "DAY"; --- 189,193 ---- $offset = "3"; } else { ! $offset = "1"; } $frequency = "DAY"; *************** *** 199,203 **** $offset = "3"; } else { ! $offset = "2"; } $frequency = "DAY"; --- 199,203 ---- $offset = "3"; } else { ! $offset = "1"; } $frequency = "DAY"; *************** *** 209,213 **** $offset = "3"; } else { ! $offset = "2"; } $frequency = "DAY"; --- 209,213 ---- $offset = "3"; } else { ! $offset = "1"; } $frequency = "DAY"; *************** *** 219,223 **** $offset = "3"; } else { ! $offset = "2"; } $frequency = "DAY"; --- 219,223 ---- $offset = "3"; } else { ! $offset = "1"; } $frequency = "DAY"; *************** *** 229,233 **** $offset = "3"; } else { ! $offset = "2"; } $frequency = "DAY"; --- 229,233 ---- $offset = "3"; } else { ! $offset = "1"; } $frequency = "DAY"; *************** *** 239,243 **** $offset = "3"; } else { ! $offset = "2"; } $frequency = "DAY"; --- 239,243 ---- $offset = "3"; } else { ! $offset = "1"; } $frequency = "DAY"; *************** *** 249,253 **** $offset = "3"; } else { ! $offset = "2"; } $frequency = "DAY"; --- 249,253 ---- $offset = "3"; } else { ! $offset = "1"; } $frequency = "DAY"; *************** *** 259,263 **** $offset = "3"; } else { ! $offset = "2"; } $frequency = "DAY"; --- 259,263 ---- $offset = "3"; } else { ! $offset = "1"; } $frequency = "DAY"; *************** *** 269,273 **** $offset = "3"; } else { ! $offset = "2"; } $frequency = "DAY"; --- 269,273 ---- $offset = "3"; } else { ! $offset = "1"; } $frequency = "DAY"; *************** *** 405,413 **** $eyear = date("Y"); $begdate = date("Y-m-d H:i:s", mktime(0,0,0,$bmonth,$bday,$byear)); ! $enddate = date("Y-m-d H:i:s", mktime(0,0,0,$emonth,$eday + 1,$eyear)); // this should get the stories using the class // but, for the moment 2002-06-12 luis mondesi: $sql="SELECT story_id, title, dept, ". ! " date_available as timestamp, ". " intro_text FROM psl_story ". " WHERE time >= '$begdate' AND time <= '$enddate' ORDER BY time DESC"; --- 405,413 ---- $eyear = date("Y"); $begdate = date("Y-m-d H:i:s", mktime(0,0,0,$bmonth,$bday,$byear)); ! $enddate = date("Y-m-d H:i:s", mktime(0,0,0,$emonth,$eday,$eyear)); // this should get the stories using the class // but, for the moment 2002-06-12 luis mondesi: $sql="SELECT story_id, title, dept, ". ! " UNIX_TIMESTAMP(time) as pretty_time, ". " intro_text FROM psl_story ". " WHERE time >= '$begdate' AND time <= '$enddate' ORDER BY time DESC"; *************** *** 421,425 **** GLOBAL $siteurl; $headline = "\n" . pslgetText("Story") . ": ".format_mail($slash_q->Record["title"],500,true) . "\n"; ! $headline .= " " . pslgetText("Written") . ": " . psl_dateTimeLong($slash_q->Record["timestamp"]) . "\n"; $headline .= " " . pslgetText("Intro") . ": " . format_mail($slash_q->Record["intro_text"],500,true) . ".\n"; $headline .= " ".$siteurl."/article.php3?story_id=" . $slash_q->Record["story_id"]."\n"; --- 421,425 ---- GLOBAL $siteurl; $headline = "\n" . pslgetText("Story") . ": ".format_mail($slash_q->Record["title"],500,true) . "\n"; ! $headline .= " " . pslgetText("Written") . ": " . psl_dateTimeLong($slash_q->Record["pretty_time"]) . "\n"; $headline .= " " . pslgetText("Intro") . ": " . format_mail($slash_q->Record["intro_text"],500,true) . ".\n"; $headline .= " ".$siteurl."/article.php3?story_id=" . $slash_q->Record["story_id"]."\n"; *************** *** 447,451 **** $enddate = date("Y-m-d H:i:s", mktime(0,0,0,$emonth,$eday + 1,$eyear)); $sql=" SELECT story_id, title, dept, ". ! " date_available, ". " intro_text FROM psl_story ". " WHERE time >= '$begdate' AND time <= '$enddate' ORDER BY time DESC"; --- 447,451 ---- $enddate = date("Y-m-d H:i:s", mktime(0,0,0,$emonth,$eday + 1,$eyear)); $sql=" SELECT story_id, title, dept, ". ! " date_format(time, \"%W %M %d %h %i %p\") as pretty_time, ". " intro_text FROM psl_story ". " WHERE time >= '$begdate' AND time <= '$enddate' ORDER BY time DESC"; *************** *** 457,462 **** $headline = "<B>".format_mail($slash_q->Record["title"],500,true) . "</B><BR>\n"; $headline .= " From the: \"" . $slash_q->Record["dept"] . "\" dept.<BR>\n"; ! $headline .= " Posted on: \"" ! . psl_dateTimeLong($slash_q->Record["date_available"]) . "<BR>\n"; $headline .= " Story: " . format_mail(chopit($slash_q->Record["intro_text"]),500,true) . ".</I><BR>\n"; $headline .= "<A HREF=\"".$siteurl."/article.php3?story_id=" . $slash_q->Record["story_id"] . "\">Full Story</A>\n"; --- 457,461 ---- $headline = "<B>".format_mail($slash_q->Record["title"],500,true) . "</B><BR>\n"; $headline .= " From the: \"" . $slash_q->Record["dept"] . "\" dept.<BR>\n"; ! $headline .= " Posted on: \"" . $slash_q->Record["pretty_time"] . "<BR>\n"; $headline .= " Story: " . format_mail(chopit($slash_q->Record["intro_text"]),500,true) . ".</I><BR>\n"; $headline .= "<A HREF=\"".$siteurl."/article.php3?story_id=" . $slash_q->Record["story_id"] . "\">Full Story</A>\n"; |