phpslash-commit Mailing List for phpSlash (Page 49)
Brought to you by:
joestewart,
nhruby
Menu
▾
▴
phpslash-commit — A list for automatically mailed SCM Commits
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(11) |
Nov
(59) |
Dec
(60) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(52) |
Feb
(77) |
Mar
(118) |
Apr
(76) |
May
(106) |
Jun
(145) |
Jul
(9) |
Aug
(15) |
Sep
(78) |
Oct
(83) |
Nov
(105) |
Dec
(51) |
| 2003 |
Jan
(105) |
Feb
(100) |
Mar
(111) |
Apr
(149) |
May
(95) |
Jun
(56) |
Jul
(8) |
Aug
(2) |
Sep
|
Oct
(22) |
Nov
(117) |
Dec
(6) |
| 2004 |
Jan
(1) |
Feb
|
Mar
(3) |
Apr
(25) |
May
|
Jun
(11) |
Jul
(26) |
Aug
(85) |
Sep
(119) |
Oct
(312) |
Nov
(271) |
Dec
(5) |
| 2005 |
Jan
(6) |
Feb
|
Mar
|
Apr
(12) |
May
(7) |
Jun
(8) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
(5) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Joe S. <joe...@us...> - 2003-04-28 19:30:28
|
Update of /cvsroot/phpslash/phpslash-dev/include/class
In directory sc8-pr-cvs1:/tmp/cvs-serv27034/phpslash-dev/include/class
Modified Files:
slashTemplate.class
Log Message:
alternate module template locations
Index: slashTemplate.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/include/class/slashTemplate.class,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** slashTemplate.class 21 Apr 2003 20:36:57 -0000 1.2
--- slashTemplate.class 28 Apr 2003 19:30:19 -0000 1.3
***************
*** 28,34 ****
*/
function slashTemplate($root = ".", $unknowns = "remove") {
! global $_PSL;
$this->psl = &$_PSL;
if ($this->debug & 4) {
--- 28,35 ----
*/
function slashTemplate($root = ".", $unknowns = "remove") {
! global $_PSL, $ary;
$this->psl = &$_PSL;
+ $this->ary = &$ary;
if ($this->debug & 4) {
***************
*** 82,87 ****
$status = false;
!
if( file_exists($filepath)) {
$status = Template::set_file($varname, $filepath);
} elseif(!file_exists($templatedir ."/skin.ini")) {
--- 83,97 ----
$status = false;
!
if( file_exists($filepath)) {
+ // module templates in skin directory
+ $status = Template::set_file($varname, $filepath);
+ } elseif(file_exists($this->psl['moduledir'] ."/". $this->psl['module'][$this->ary['module']] ."/templates/" . basename($filename))) {
+ // module templates in module subdirectory
+ $filepath = $this->psl['moduledir'] ."/". $this->psl['module'][$this->ary['module']] ."/templates/" . basename($filename);
+ $status = Template::set_file($varname, $filepath);
+ } elseif( file_exists($templatedir ."/". $this->psl['module'][$this->ary['module']] ."/". basename($filename))) {
+ // module templates in subdirectory of skin
+ $filepath = $templatedir ."/". $this->psl['module'][$this->ary['module']] ."/". basename($filename);
$status = Template::set_file($varname, $filepath);
} elseif(!file_exists($templatedir ."/skin.ini")) {
|
|
From: Joe S. <joe...@us...> - 2003-04-28 19:30:23
|
Update of /cvsroot/phpslash/phpslash-dev In directory sc8-pr-cvs1:/tmp/cvs-serv27034/phpslash-dev Modified Files: CHANGES Log Message: alternate module template locations Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/CHANGES,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** CHANGES 28 Apr 2003 15:26:51 -0000 1.13 --- CHANGES 28 Apr 2003 19:30:18 -0000 1.14 *************** *** 13,16 **** --- 13,20 ---- 9 - Removal of something (kill -9 :) + 2003-April-28 2:30PM CDT Joe Stewart <joe...@us...> + [E] - slashTemplate.class - experimental support for module templates to + be contained in a "templates" subdirectory. + 2003-April-28 10:00AM CDT Joe Stewart <joe...@us...> [BT] - Story.class, Story_base.class - "also text" fix, reduce warnings. |
|
From: Joe S. <joe...@us...> - 2003-04-28 15:27:29
|
Update of /cvsroot/phpslash/phpslash-dev/public_html
In directory sc8-pr-cvs1:/tmp/cvs-serv10168/phpslash-dev/public_html
Modified Files:
comment.php
Log Message:
tweak url in notification email.
Index: comment.php
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/public_html/comment.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** comment.php 12 Mar 2003 16:12:56 -0000 1.1.1.1
--- comment.php 28 Apr 2003 15:26:52 -0000 1.2
***************
*** 26,30 ****
$email = $ary['email'];
$url = $ary['url'];
!
if(!empty($ary['name'])) {
$comment_name = $ary['name'];
--- 26,30 ----
$email = $ary['email'];
$url = $ary['url'];
!
if(!empty($ary['name'])) {
$comment_name = $ary['name'];
***************
*** 36,48 ****
$sess->register("comment_url");
}
!
!
$cmt = pslNew("Comment",$ary);
!
switch( $submit) {
case "preview":
!
! // when you are previewing a comment before submitting
$ary['ip'] = gethostbyaddr($HTTP_SERVER_VARS['REMOTE_ADDR']); /* add the poster's IP addr */
--- 36,48 ----
$sess->register("comment_url");
}
!
!
$cmt = pslNew("Comment",$ary);
!
switch( $submit) {
case "preview":
!
! // when you are previewing a comment before submitting
$ary['ip'] = gethostbyaddr($HTTP_SERVER_VARS['REMOTE_ADDR']); /* add the poster's IP addr */
***************
*** 50,54 ****
$content .= $cmt->getForm($ary);
break;
!
case "save":
case "Submit Comment":
--- 50,54 ----
$content .= $cmt->getForm($ary);
break;
!
case "save":
case "Submit Comment":
***************
*** 68,78 ****
if(function_exists('jpcache_gc')) {
jpcache_gc('string', "-story_id-" . $ary['story_id'], "100");
! }
$content .= getMessage($cmt->getMessage());
$comment_ary = $cmt->getCommentArray($id);
$content .= $cmt->formatComment($comment_ary);
// send email for new submission.
! if ($_PSL['commentnotify']) {
$mail_ary['tpl'] = "emailNotifyComment";
$mail_ary['vars'] = $ary;
$success = emailNotify($mail_ary);
--- 68,80 ----
if(function_exists('jpcache_gc')) {
jpcache_gc('string', "-story_id-" . $ary['story_id'], "100");
! jpcache_gc('string', "-question_id-" . $ary['story_id'], "100");
! }
$content .= getMessage($cmt->getMessage());
$comment_ary = $cmt->getCommentArray($id);
$content .= $cmt->formatComment($comment_ary);
// send email for new submission.
! if (array_key_exists('commentnotify',$_PSL)) {
$mail_ary['tpl'] = "emailNotifyComment";
+ $ary['comment_id'] = $id;
$mail_ary['vars'] = $ary;
$success = emailNotify($mail_ary);
***************
*** 81,90 ****
$content .= getError($cmt->getMessage());
}
! header("Location: $return_link");
break;
}
!
} elseif (!empty($HTTP_GET_VARS['submit'])) {
--- 83,92 ----
$content .= getError($cmt->getMessage());
}
! header("Location: $return_link");
break;
}
!
} elseif (!empty($HTTP_GET_VARS['submit'])) {
***************
*** 95,102 ****
$ary['parent_id'] = 0;
}
!
if ($sess->is_registered("comment_name")) {
$ary['name'] = $comment_name;
! $ary['email'] = $comment_email;
}
--- 97,104 ----
$ary['parent_id'] = 0;
}
!
if ($sess->is_registered("comment_name")) {
$ary['name'] = $comment_name;
! $ary['email'] = $comment_email;
}
***************
*** 217,220 ****
--- 219,223 ----
$template->set_var(array(
+ 'SKIN' => $_PSL['skin'],
'QUERYSTRING' => $QUERY_STRING,
'ROOTDIR' => $_PSL['rooturl'],
|
|
From: Joe S. <joe...@us...> - 2003-04-28 15:27:28
|
Update of /cvsroot/phpslash/phpslash-dev In directory sc8-pr-cvs1:/tmp/cvs-serv10168/phpslash-dev Modified Files: CHANGES Log Message: tweak url in notification email. Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/CHANGES,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** CHANGES 25 Apr 2003 20:00:15 -0000 1.12 --- CHANGES 28 Apr 2003 15:26:51 -0000 1.13 *************** *** 13,16 **** --- 13,21 ---- 9 - Removal of something (kill -9 :) + 2003-April-28 10:00AM CDT Joe Stewart <joe...@us...> + [BT] - Story.class, Story_base.class - "also text" fix, reduce warnings. + comment.php3, emailNotifyComment.tpl, emailNotifySubmission.tpl - + tweak url in notification email. + 2003-April-25 3:00PM CDT Joe Stewart <joe...@us...> [B] - author/index.php - ensure that profile options are predefined. |
|
From: Joe S. <joe...@us...> - 2003-04-28 15:27:28
|
Update of /cvsroot/phpslash/phpslash-dev/doc/html
In directory sc8-pr-cvs1:/tmp/cvs-serv10168/phpslash-dev/doc/html
Modified Files:
phpslash.sgml
Log Message:
tweak url in notification email.
Index: phpslash.sgml
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/doc/html/phpslash.sgml,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** phpslash.sgml 12 Mar 2003 16:12:49 -0000 1.1.1.1
--- phpslash.sgml 28 Apr 2003 15:26:52 -0000 1.2
***************
*** 966,970 ****
<tscreen><code>
! searchPage.tpl
</code></tscreen>
--- 966,981 ----
<tscreen><code>
! authorNew.tpl
! authorProfile.tpl
! blockEdit.tpl
! emailNotifyComment.tpl
! emailNotifySubmission.tpl
! fmblock.tpl
! loginblock.tpl
! loginformCR.tpl
! searchPage.tpl
! sectionNew.tpl
! storyList.tpl
! storyNew.tpl
</code></tscreen>
***************
*** 975,978 ****
--- 986,995 ----
<sect2> Troubleshooting
+ <p>
+
+ <itemize>
+ <item>If you find yourself troubleshooting a problem, it might be helpful to turn the output cache off temporarily. Change config.php3: $JPCACHE_ON = 0.
+
+ </itemize>
<p>
|
|
From: Joe S. <joe...@us...> - 2003-04-28 15:27:02
|
Update of /cvsroot/phpslash/phpslash-dev/include/templates/en/default
In directory sc8-pr-cvs1:/tmp/cvs-serv10168/phpslash-dev/include/templates/en/default
Modified Files:
emailNotifyComment.tpl emailNotifySubmission.tpl
Log Message:
tweak url in notification email.
Index: emailNotifyComment.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/include/templates/en/default/emailNotifyComment.tpl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** emailNotifyComment.tpl 12 Mar 2003 16:12:53 -0000 1.1.1.1
--- emailNotifyComment.tpl 28 Apr 2003 15:26:56 -0000 1.2
***************
*** 15,19 ****
Notice: A new comment has been submitted to {SITE_NAME}.
! {ROOTURL}/comment.php?submit=view&story_id={STORY_ID}&parent_id={PARENT_ID}.
+=+=+=+=+=+=+=+=+=+=+=+=++=+=+=++=+=+=++=++=+=+=+
--- 15,19 ----
Notice: A new comment has been submitted to {SITE_NAME}.
! <{ROOTURL}/article.php3?story_id={STORY_ID}#{COMMENT_ID}>.
+=+=+=+=+=+=+=+=+=+=+=+=++=+=+=++=+=+=++=++=+=+=+
Index: emailNotifySubmission.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/include/templates/en/default/emailNotifySubmission.tpl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** emailNotifySubmission.tpl 12 Mar 2003 16:12:53 -0000 1.1.1.1
--- emailNotifySubmission.tpl 28 Apr 2003 15:26:57 -0000 1.2
***************
*** 16,19 ****
--- 16,20 ----
You now need to login and check the Submissions.
+ <{ROOTURL}>/admin/submissionAdmin.php3>
+=+=+=+=+=+=+=+=+=+=+=+=++=+=+=++=+=+=++=++=+=+=+
|
|
From: Joe S. <joe...@us...> - 2003-04-28 15:27:01
|
Update of /cvsroot/phpslash/phpslash-dev/include/templates/en/basic
In directory sc8-pr-cvs1:/tmp/cvs-serv10168/phpslash-dev/include/templates/en/basic
Modified Files:
emailNotifyComment.tpl emailNotifySubmission.tpl
Log Message:
tweak url in notification email.
Index: emailNotifyComment.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/include/templates/en/basic/emailNotifyComment.tpl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** emailNotifyComment.tpl 12 Mar 2003 16:12:52 -0000 1.1.1.1
--- emailNotifyComment.tpl 28 Apr 2003 15:26:56 -0000 1.2
***************
*** 15,19 ****
Notice: A new comment has been submitted to {SITE_NAME}.
! {ROOTURL}/comment.php?submit=view&story_id={STORY_ID}&parent_id={PARENT_ID}.
+=+=+=+=+=+=+=+=+=+=+=+=++=+=+=++=+=+=++=++=+=+=+
--- 15,19 ----
Notice: A new comment has been submitted to {SITE_NAME}.
! <{ROOTURL}/article.php3?story_id={STORY_ID}#{COMMENT_ID}>.
+=+=+=+=+=+=+=+=+=+=+=+=++=+=+=++=+=+=++=++=+=+=+
Index: emailNotifySubmission.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/include/templates/en/basic/emailNotifySubmission.tpl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** emailNotifySubmission.tpl 12 Mar 2003 16:12:52 -0000 1.1.1.1
--- emailNotifySubmission.tpl 28 Apr 2003 15:26:56 -0000 1.2
***************
*** 16,19 ****
--- 16,20 ----
You now need to login and check the Submissions.
+ <{ROOTURL}>/admin/submissionAdmin.php3>
+=+=+=+=+=+=+=+=+=+=+=+=++=+=+=++=+=+=++=++=+=+=+
|
|
From: Joe S. <joe...@us...> - 2003-04-28 15:27:01
|
Update of /cvsroot/phpslash/phpslash-dev/include/modules/story
In directory sc8-pr-cvs1:/tmp/cvs-serv10168/phpslash-dev/include/modules/story
Modified Files:
Story.class Story_base.class
Log Message:
tweak url in notification email.
Index: Story.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/story/Story.class,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Story.class 21 Apr 2003 20:36:58 -0000 1.2
--- Story.class 28 Apr 2003 15:26:53 -0000 1.3
***************
*** 373,377 ****
'LIST_TOPIC_URL' => ""
));
! if (is_array($topic_id_ary)) {
$this->template->parse("alsoblock", "alsotext", true);
--- 373,377 ----
'LIST_TOPIC_URL' => ""
));
! if (is_array($topic_id_ary) && !empty($topic_id_ary)) {
$this->template->parse("alsoblock", "alsotext", true);
Index: Story_base.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/story/Story_base.class,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Story_base.class 21 Apr 2003 20:36:58 -0000 1.2
--- Story_base.class 28 Apr 2003 15:26:55 -0000 1.3
***************
*** 705,709 ****
$expired = '';
! if(!array_key_exists('update', $ary[$field])) {
$ary[$field]['update'] = 0;
}
--- 705,709 ----
$expired = '';
! if(empty($ary[$field]['update'])) {
$ary[$field]['update'] = 0;
}
|
|
From: Joe S. <joe...@us...> - 2003-04-28 15:22:56
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default
In directory sc8-pr-cvs1:/tmp/cvs-serv8487/phpslash-ft/public_html/templates/en/default
Modified Files:
emailNotifyComment.tpl
Log Message:
tweak url in notification email
Index: emailNotifyComment.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default/emailNotifyComment.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** emailNotifyComment.tpl 31 May 2002 19:30:28 -0000 1.1
--- emailNotifyComment.tpl 28 Apr 2003 15:22:52 -0000 1.2
***************
*** 15,19 ****
Notice: A new comment has been submitted to {SITE_NAME}.
! {ROOTURL}/comment.php3?submit=view&story_id={STORY_ID}&parent_id={PARENT_ID}.
+=+=+=+=+=+=+=+=+=+=+=+=++=+=+=++=+=+=++=++=+=+=+
--- 15,19 ----
Notice: A new comment has been submitted to {SITE_NAME}.
! <{ROOTURL}/article.php3?story_id={STORY_ID}#{COMMENT_ID}>.
+=+=+=+=+=+=+=+=+=+=+=+=++=+=+=++=+=+=++=++=+=+=+
|
|
From: Joe S. <joe...@us...> - 2003-04-28 15:22:08
|
Update of /cvsroot/phpslash/phpslash-ft/doc/html
In directory sc8-pr-cvs1:/tmp/cvs-serv7903/phpslash-ft/doc/html
Modified Files:
phpslash.sgml
Log Message:
tweak url in notification email
Index: phpslash.sgml
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/doc/html/phpslash.sgml,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -d -r1.74 -r1.75
*** phpslash.sgml 14 Apr 2003 17:42:54 -0000 1.74
--- phpslash.sgml 28 Apr 2003 15:21:34 -0000 1.75
***************
*** 969,972 ****
--- 969,974 ----
authorProfile.tpl
blockEdit.tpl
+ emailNotifyComment.tpl
+ emailNotifySubmission.tpl
fmblock.tpl
loginblock.tpl
|
|
From: Joe S. <joe...@us...> - 2003-04-28 15:22:08
|
Update of /cvsroot/phpslash/phpslash-ft In directory sc8-pr-cvs1:/tmp/cvs-serv7903/phpslash-ft Modified Files: CHANGES Log Message: tweak url in notification email Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.761 retrieving revision 1.762 diff -C2 -d -r1.761 -r1.762 *** CHANGES 25 Apr 2003 18:33:08 -0000 1.761 --- CHANGES 28 Apr 2003 15:21:32 -0000 1.762 *************** *** 13,16 **** --- 13,21 ---- 9 - Removal of something (kill -9 :) + 2003-April-28 10:00AM CDT Joe Stewart <joe...@us...> + [BT] - Story.class, Story_base.class - "also text" fix, reduce warnings. + comment.php3, emailNotifyComment.tpl, emailNotifySubmission.tpl - + tweak url in notification email. + 2003-April-25 1:30PM CDT Joe Stewart <joe...@us...> [B] - profile.php3 - ensure that options are predefined. |
|
From: Joe S. <joe...@us...> - 2003-04-28 15:21:42
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basic
In directory sc8-pr-cvs1:/tmp/cvs-serv7903/phpslash-ft/public_html/templates/en/basic
Modified Files:
emailNotifyComment.tpl emailNotifySubmission.tpl
Log Message:
tweak url in notification email
Index: emailNotifyComment.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basic/emailNotifyComment.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** emailNotifyComment.tpl 31 May 2002 19:30:28 -0000 1.1
--- emailNotifyComment.tpl 28 Apr 2003 15:21:37 -0000 1.2
***************
*** 15,19 ****
Notice: A new comment has been submitted to {SITE_NAME}.
! {ROOTURL}/comment.php3?submit=view&story_id={STORY_ID}&parent_id={PARENT_ID}.
+=+=+=+=+=+=+=+=+=+=+=+=++=+=+=++=+=+=++=++=+=+=+
--- 15,19 ----
Notice: A new comment has been submitted to {SITE_NAME}.
! <{ROOTURL}/article.php3?story_id={STORY_ID}#{COMMENT_ID}>.
+=+=+=+=+=+=+=+=+=+=+=+=++=+=+=++=+=+=++=++=+=+=+
Index: emailNotifySubmission.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basic/emailNotifySubmission.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** emailNotifySubmission.tpl 31 May 2002 19:39:54 -0000 1.2
--- emailNotifySubmission.tpl 28 Apr 2003 15:21:37 -0000 1.3
***************
*** 16,19 ****
--- 16,20 ----
You now need to login and check the Submissions.
+ <{ROOTURL}>/admin/submissionAdmin.php3>
+=+=+=+=+=+=+=+=+=+=+=+=++=+=+=++=+=+=++=++=+=+=+
|
|
From: Joe S. <joe...@us...> - 2003-04-28 15:21:42
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default
In directory sc8-pr-cvs1:/tmp/cvs-serv7903/phpslash-ft/public_html/templates/en/default
Modified Files:
emailNotifySubmission.tpl
Log Message:
tweak url in notification email
Index: emailNotifySubmission.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default/emailNotifySubmission.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** emailNotifySubmission.tpl 31 May 2002 19:30:28 -0000 1.1
--- emailNotifySubmission.tpl 28 Apr 2003 15:21:38 -0000 1.2
***************
*** 16,19 ****
--- 16,20 ----
You now need to login and check the Submissions.
+ <{ROOTURL}>/admin/submissionAdmin.php3>
+=+=+=+=+=+=+=+=+=+=+=+=++=+=+=++=+=+=++=++=+=+=+
|
|
From: Joe S. <joe...@us...> - 2003-04-28 15:21:41
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory sc8-pr-cvs1:/tmp/cvs-serv7903/phpslash-ft/class
Modified Files:
Story.class Story_base.class
Log Message:
tweak url in notification email
Index: Story.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Story.class,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** Story.class 11 Apr 2003 16:06:11 -0000 1.55
--- Story.class 28 Apr 2003 15:21:34 -0000 1.56
***************
*** 301,306 ****
$cache_ary[$related_name]['expire'] = $this->psl['expirerelated'];
}
!
! $name_mod = implode('', $argv_ary);
$story_name = basename($this->psl['languagefile']) . $this->psl['skin'] ."story" . $name_mod;
$cache_ary[$story_name]['expire'] = $cache_ary['story']['expire'];
--- 301,308 ----
$cache_ary[$related_name]['expire'] = $this->psl['expirerelated'];
}
! $name_mod = '';
! if(is_array( $argv_ary)) {
! $name_mod = implode('', $argv_ary);
! }
$story_name = basename($this->psl['languagefile']) . $this->psl['skin'] ."story" . $name_mod;
$cache_ary[$story_name]['expire'] = $cache_ary['story']['expire'];
***************
*** 373,377 ****
'LIST_TOPIC_URL' => ""
));
! if (is_array($topic_id_ary)) {
$this->template->parse("alsoblock", "alsotext", true);
--- 375,379 ----
'LIST_TOPIC_URL' => ""
));
! if (is_array($topic_id_ary) && !empty($topic_id_ary)) {
$this->template->parse("alsoblock", "alsotext", true);
Index: Story_base.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Story_base.class,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** Story_base.class 11 Apr 2003 16:06:09 -0000 1.26
--- Story_base.class 28 Apr 2003 15:21:36 -0000 1.27
***************
*** 705,709 ****
$expired = '';
! if(!array_key_exists('update', $ary[$field])) {
$ary[$field]['update'] = 0;
}
--- 705,709 ----
$expired = '';
! if(empty($ary[$field]['update'])) {
$ary[$field]['update'] = 0;
}
|
|
From: Joe S. <joe...@us...> - 2003-04-28 15:21:41
|
Update of /cvsroot/phpslash/phpslash-ft/public_html
In directory sc8-pr-cvs1:/tmp/cvs-serv7903/phpslash-ft/public_html
Modified Files:
comment.php3
Log Message:
tweak url in notification email
Index: comment.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/comment.php3,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** comment.php3 3 Apr 2003 20:08:44 -0000 1.33
--- comment.php3 28 Apr 2003 15:21:37 -0000 1.34
***************
*** 69,74 ****
$content .= $cmt->formatComment($comment_ary);
// send email for new submission.
! if ($_PSL['commentnotify']) {
$mail_ary['tpl'] = "emailNotifyComment";
$mail_ary['vars'] = $ary;
$success = emailNotify($mail_ary);
--- 69,75 ----
$content .= $cmt->formatComment($comment_ary);
// send email for new submission.
! if (array_key_exists('commentnotify',$_PSL)) {
$mail_ary['tpl'] = "emailNotifyComment";
+ $ary['comment_id'] = $id;
$mail_ary['vars'] = $ary;
$success = emailNotify($mail_ary);
|
|
From: Luis M <le...@us...> - 2003-04-25 20:30:33
|
Update of /cvsroot/phpslash/phpslash-dev/include/modules/mailinglist
In directory sc8-pr-cvs1:/tmp/cvs-serv32282
Modified Files:
MailingList.class
Log Message:
cleanups + mailing users weekly works like a charm
Index: MailingList.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/mailinglist/MailingList.class,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** MailingList.class 25 Apr 2003 16:27:14 -0000 1.6
--- MailingList.class 25 Apr 2003 20:30:28 -0000 1.7
***************
*** 25,29 ****
/* Templates */
! $this->templ = pslNew("slashTemplate",$this->psl['templatedir']);
$this->templ->debug = 0;
$this->templ->set_file(array(
--- 25,29 ----
/* Templates */
! $this->templ = pslNew("slashTemplate",$this->psl["templatedir"]);
$this->templ->debug = 0;
$this->templ->set_file(array(
***************
*** 48,53 ****
$this->templ->set_var(array(
'TITLEBAR' => getTitlebar("100%",pslgetText("Email Headline Updates")),
! 'ACTION_URL' => $this->psl['phpself'],
! 'SITEOWNER' => $this->psl['site_owner']
));
--- 48,53 ----
$this->templ->set_var(array(
'TITLEBAR' => getTitlebar("100%",pslgetText("Email Headline Updates")),
! 'ACTION_URL' => $this->psl["phpself"],
! 'SITEOWNER' => $this->psl["site_owner"]
));
***************
*** 122,128 ****
$this->templ->set_var(array(
! 'SITENAME' => $this->psl['site_name'],
! 'SITEOWNER' => $this->psl['site_owner'],
! 'MAILINGLIST_URL' => $this->psl['rooturl'] . "/mailinglist.php",
'ADDRESS' => $to_address
));
--- 122,128 ----
$this->templ->set_var(array(
! 'SITENAME' => $this->psl["site_name"],
! 'SITEOWNER' => $this->psl["site_owner"],
! 'MAILINGLIST_URL' => $this->psl["rooturl"] . "/mailinglist.php",
'ADDRESS' => $to_address
));
***************
*** 138,142 ****
};
! if(@mail($to_address, $this->psl['mailinglist_subject'], $body, "From: ".$this->psl['site_owner']."")){
return true;
} else {
--- 138,142 ----
};
! if(@mail($to_address, $this->psl["mailinglist_subject"], $body, "From: ".$this->psl["site_owner"]."")){
return true;
} else {
***************
*** 150,157 ****
$ary = clean($ary);
! if (!$ary['name']) {
! $ary['name'] = "Subscriber";
}
! if (!$ary['subscribe_address']) {
$this->message = pslgetText("You need to enter an email address");
return;
--- 150,157 ----
$ary = clean($ary);
! if (!$ary["name"]) {
! $ary["name"] = "Subscriber";
}
! if (!$ary["subscribe_address"]) {
$this->message = pslgetText("You need to enter an email address");
return;
***************
*** 256,260 ****
$this->templ->set_var(array(
! 'ACTION_URL' => $this->psl['phpself']
));
--- 256,260 ----
$this->templ->set_var(array(
! 'ACTION_URL' => $this->psl["phpself"]
));
***************
*** 289,295 ****
$this->templ->set_var(array(
'NEWSLETTER_BODY' => $body,
! 'ACTION_URL' => $this->psl['phpself'],
! 'FROM' => $this->psl['site_owner'],
! 'SUBJECT' => $this->psl['mailinglist_subject'],
'FROM_MONTH' => "$from_month",
'FROM_DATE' => "$from_day",
--- 289,295 ----
$this->templ->set_var(array(
'NEWSLETTER_BODY' => $body,
! 'ACTION_URL' => $this->psl["phpself"],
! 'FROM' => $this->psl["site_owner"],
! 'SUBJECT' => $this->psl["mailinglist_subject"],
'FROM_MONTH' => "$from_month",
'FROM_DATE' => "$from_day",
***************
*** 306,310 ****
function build_body($ary, $offset) { //BEGIN FUNCTION
!
$db = pslNew("slashDB");
--- 306,310 ----
function build_body($ary, $offset) { //BEGIN FUNCTION
!
$db = pslNew("slashDB");
***************
*** 326,336 ****
$begtimestamp = mktime(0,0,0,$ary["bmonth"],$ary["bday"],$ary["byear"]);
! // TODO BUG?:
! // the +1 to $ary[eday] could make that future stories get emailed
! // before being posted to the page, is this really necessary?
! // note that the query does a "<=" (less than OR equal) comparison.
! // Luis
! $endtimestamp = mktime(0,0,0,$ary["emonth"],$ary["eday"] + 1,$ary["eyear"]);
!
$begdate = date("Y-m-d H:i:s", $begtimestamp);
$enddate = date("Y-m-d H:i:s", $endtimestamp);
--- 326,332 ----
$begtimestamp = mktime(0,0,0,$ary["bmonth"],$ary["bday"],$ary["byear"]);
! // $endtimestamp = mktime(0,0,0,$ary["emonth"],$ary["eday"] + 1,$ary["eyear"]);
! $endtimestamp = time();
!
$begdate = date("Y-m-d H:i:s", $begtimestamp);
$enddate = date("Y-m-d H:i:s", $endtimestamp);
***************
*** 357,362 ****
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(
'AUTHOR_NAME' => $db->Record["name"],
--- 353,357 ----
while($db->next_record()) {
! $url = $this->psl["rooturl"] . "/article.php?story_id=" . $db->Record["story_id"];
$this->templ->set_var(array(
'AUTHOR_NAME' => $db->Record["name"],
***************
*** 373,380 ****
if ($success == true) {
! return $this->templ->parse('OUT',array("messagebodymail"));
! } else {
! return false;
}
// return $this->templ->get('OUT');
} //END FUNCTION
--- 368,378 ----
if ($success == true) {
! $success = $this->templ->parse('OUT',array("messagebodymail"));
}
+ // reset previous values
+ unset($this->templ->varvals["messagebodymail"]);
+ unset($this->templ->varkeys["messagebodymail"]);
+ $this->templ->set_var('rows', '');
+ return $success;
// return $this->templ->get('OUT');
} //END FUNCTION
***************
*** 383,399 ****
function newsletterSend($ary) {
! if ( $ary['subject'] ) {
// Allow extra news submitted in form
! $extra_message = $ary['body'];
! $ary['body'] = '';
! if ( $ary['freqoverride'] ) {
debug("MailingList", "Frequency Override in effect!");
$sql = "SELECT email,
name
FROM psl_mailinglist";
! if ( !$ary['override']) {
! $ary['body'] = $this->build_body($ary,0);
}
} else {
--- 381,397 ----
function newsletterSend($ary) {
! if ( $ary["subject"] ) {
// Allow extra news submitted in form
! $extra_message = $ary["body"];
! $ary["body"] = '';
! if ( $ary["freqoverride"] ) {
debug("MailingList", "Frequency Override in effect!");
$sql = "SELECT email,
name
FROM psl_mailinglist";
! if ( !$ary["override"]) {
! $ary["body"] = $this->build_body($ary,0);
}
} else {
***************
*** 433,437 ****
$email = $this->db->Record["email"];
$dayback = $this->db->Record["dayback"];
! if ( $ary['freqoverride'] ) {
$frequency = '';
} else {
--- 431,435 ----
$email = $this->db->Record["email"];
$dayback = $this->db->Record["dayback"];
! if ( $ary["freqoverride"] ) {
$frequency = '';
} else {
***************
*** 441,446 ****
$this->message .= "To: $email <$name>";
! if (($dayback != $tmpDay) && ( !($ary['override']) ) ) {
! $ary['body'] = $this->build_body($ary,$dayback);
}
--- 439,444 ----
$this->message .= "To: $email <$name>";
! if (($dayback != $tmpDay) && ( !($ary["override"]) ) ) {
! $ary["body"] = $this->build_body($ary,$dayback);
}
***************
*** 449,462 ****
//$this->message .= " Frequency: $frequency";
- // TODO use this switch/case to set the bday var in $ary
switch ($frequency) {
case "DAY":
! $mail_subject = $ary['subject']." for today ($today)";
break;
case "[0-9]":
! $mail_subject = $ary['subject']." for the past $dayback ($today)";
break;
case "MONTH":
! $mail_subject = $ary['subject']." for the past month ($today)";
break;
case "SUNDAY":
--- 447,459 ----
//$this->message .= " Frequency: $frequency";
switch ($frequency) {
case "DAY":
! $mail_subject = $ary["subject"]." for today ($today)";
break;
case "[0-9]":
! $mail_subject = $ary["subject"]." for the past $dayback ($today)";
break;
case "MONTH":
! $mail_subject = $ary["subject"]." for the past month ($today)";
break;
case "SUNDAY":
***************
*** 468,480 ****
case "SATURDAY":
! $mail_subject = $ary['subject']." since last ".$frequency;
break;
default:
! $mail_subject = $ary['subject'];
}
$this->message .= " Subject: $mail_subject -> ";
$this->templ->set_var(array(
! 'MESSAGE_BODY' => $ary['body'],
'EXTRA_MESSAGE' => $extra_message
));
--- 465,477 ----
case "SATURDAY":
! $mail_subject = $ary["subject"]." since last ".$frequency;
break;
default:
! $mail_subject = $ary["subject"];
}
$this->message .= " Subject: $mail_subject -> ";
$this->templ->set_var(array(
! 'MESSAGE_BODY' => $ary["body"],
'EXTRA_MESSAGE' => $extra_message
));
***************
*** 482,488 ****
$final_body = $this->templ->get('OUT');
! if(empty($ary['body']) && empty($extra_message)){
$this->message .= pslgetText("Nothing to send")."<br />\n";
! } elseif ( mail($email, $mail_subject, $final_body, "From: ".$ary['sender']) ) {
$this->message .= pslgetText("Mail Sent Successfully!")."<br>\n";
} else {
--- 479,485 ----
$final_body = $this->templ->get('OUT');
! if(empty($ary["body"]) && empty($extra_message)){
$this->message .= pslgetText("Nothing to send")."<br />\n";
! } elseif ( mail($email, $mail_subject, $final_body, "From: ".$ary["sender"]) ) {
$this->message .= pslgetText("Mail Sent Successfully!")."<br>\n";
} else {
***************
*** 498,502 ****
$this->message ="</td>".pslgetText("You didn't give a email subject! Halting.")."<br>\n";
return false;
! } // End: if ( $ary['subject'] && $ary['body'] )
} // End of function
--- 495,499 ----
$this->message ="</td>".pslgetText("You didn't give a email subject! Halting.")."<br>\n";
return false;
! } // End: if ( $ary["subject"] && $ary["body"] )
} // End of function
|
|
From: Joe S. <joe...@us...> - 2003-04-25 20:00:56
|
Update of /cvsroot/phpslash/phpslash-dev/tables/0.7 In directory sc8-pr-cvs1:/tmp/cvs-serv20030/phpslash-dev/tables/0.7 Modified Files: 65_to_7.sql Log Message: add missing new submission permission for public. Index: 65_to_7.sql =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/tables/0.7/65_to_7.sql,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** 65_to_7.sql 12 Mar 2003 16:12:59 -0000 1.1.1.1 --- 65_to_7.sql 25 Apr 2003 20:00:18 -0000 1.2 *************** *** 211,214 **** --- 211,215 ---- INSERT INTO psl_group_permission_lut VALUES (107,23,76); INSERT INTO psl_group_permission_lut VALUES (108,23,80); + INSERT INTO psl_group_permission_lut VALUES (109,20,12); INSERT INTO psl_group_permission_lut VALUES (110,20,81); INSERT INTO psl_group_permission_lut VALUES (111,8,82); |
|
From: Joe S. <joe...@us...> - 2003-04-25 20:00:53
|
Update of /cvsroot/phpslash/phpslash-dev In directory sc8-pr-cvs1:/tmp/cvs-serv20030/phpslash-dev Modified Files: CHANGES Log Message: add missing new submission permission for public. Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/CHANGES,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** CHANGES 23 Apr 2003 15:35:03 -0000 1.11 --- CHANGES 25 Apr 2003 20:00:15 -0000 1.12 *************** *** 13,16 **** --- 13,20 ---- 9 - Removal of something (kill -9 :) + 2003-April-25 3:00PM CDT Joe Stewart <joe...@us...> + [B] - author/index.php - ensure that profile options are predefined. + 65_to_7.sql - add missing new submission permission for public. + 2003-April 23 10:30AM CDT Joe Stewart <joe...@us...> [B] - functions.inc - sync with -ft cvs. |
|
From: Joe S. <joe...@us...> - 2003-04-25 20:00:31
|
Update of /cvsroot/phpslash/phpslash-dev/include/modules/author
In directory sc8-pr-cvs1:/tmp/cvs-serv20030/phpslash-dev/include/modules/author
Modified Files:
index.php
Log Message:
add missing new submission permission for public.
Index: index.php
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/author/index.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** index.php 12 Mar 2003 16:12:55 -0000 1.1.1.1
--- index.php 25 Apr 2003 20:00:21 -0000 1.2
***************
*** 3,6 ****
--- 3,8 ----
/* $Id$ */
+ global $_PSL, $auth, $perm, $HTTP_GET_VARS, $HTTP_POST_VARS;
+
AddClassRequirement("author",$_PSL['moduledir'] ."/". $_PSL['module']['module.current'] ."/Author.class");
***************
*** 41,45 ****
case "edit":
default:
! $content .= $author->editAuthor($auth->auth['uid'], 'authorProfile');
}
--- 43,50 ----
case "edit":
default:
! // don't display any extra form fieds
! $_PSL['author_optioncount'] = 0;
!
! $content .= $author->editAuthor($auth->auth['uid'], 'authorProfile');
}
|
|
From: Luis M <le...@us...> - 2003-04-25 19:08:29
|
Update of /cvsroot/phpslash/phpslash-dev/include/templates/en/basic
In directory sc8-pr-cvs1:/tmp/cvs-serv29647
Modified Files:
mailinglistMessageBody.tpl
Log Message:
fixed spelling: missing closing parenthesis
Index: mailinglistMessageBody.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/include/templates/en/basic/mailinglistMessageBody.tpl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** mailinglistMessageBody.tpl 12 Mar 2003 16:12:52 -0000 1.1.1.1
--- mailinglistMessageBody.tpl 25 Apr 2003 19:08:25 -0000 1.2
***************
*** 1,10 ****
! <!-- BEGIN row -->
! Story Title: {TITLE}
! From the: "{DEPT}" dept.
! Posted by: "{AUTHOR_NAME}" on: {DATE}
! Intro story text (There may be additional text on the site:
! {STORY}
!
! {URL}
! ---------------------------------------------------------------------------
! <!-- END row -->
--- 1,10 ----
! <!-- BEGIN row -->
! Story Title: {TITLE}
! From the: "{DEPT}" dept.
! Posted by: "{AUTHOR_NAME}" on: {DATE}
! Intro story text (There may be additional text on the site):
! {STORY}
!
! {URL}
! ---------------------------------------------------------------------------
! <!-- END row -->
|
|
From: Joe S. <joe...@us...> - 2003-04-25 18:35:40
|
Update of /cvsroot/phpslash/phpslash-ft/tables/0.7 In directory sc8-pr-cvs1:/tmp/cvs-serv15885/phpslash-ft/tables/0.7 Modified Files: 65_to_7.sql Log Message: add missing new submission permission for public. Index: 65_to_7.sql =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/tables/0.7/65_to_7.sql,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** 65_to_7.sql 20 Mar 2003 21:39:28 -0000 1.16 --- 65_to_7.sql 25 Apr 2003 18:35:36 -0000 1.17 *************** *** 211,214 **** --- 211,215 ---- INSERT INTO psl_group_permission_lut VALUES (107,23,76); INSERT INTO psl_group_permission_lut VALUES (108,23,80); + INSERT INTO psl_group_permission_lut VALUES (109,20,12); INSERT INTO psl_group_permission_lut VALUES (110,20,81); INSERT INTO psl_group_permission_lut VALUES (111,8,82); |
|
From: Joe S. <joe...@us...> - 2003-04-25 18:33:14
|
Update of /cvsroot/phpslash/phpslash-ft/public_html
In directory sc8-pr-cvs1:/tmp/cvs-serv15016/phpslash-ft/public_html
Modified Files:
profile.php3
Log Message:
add missing new submission permission for public.
Index: profile.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/profile.php3,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** profile.php3 9 Apr 2003 14:48:08 -0000 1.13
--- profile.php3 25 Apr 2003 18:33:09 -0000 1.14
***************
*** 12,17 ****
$xsiteobject = pslgetText("Profile"); // Defines The META TAG Page Type
- // page_open(array("sess"=>"slashSess","auth"=>"slashAuth","perm"=>"slashPerm"));
-
/*****************************
START OF PAGE
--- 12,15 ----
***************
*** 53,57 ****
case "edit":
default:
! $content .= $author->editAuthor($auth->auth['uid'], 'authorProfile');
}
--- 51,58 ----
case "edit":
default:
! // don't display any extra form fieds
! $_PSL['author_optioncount'] = 0;
!
! $content .= $author->editAuthor($auth->auth['uid'], 'authorProfile');
}
|
|
From: Joe S. <joe...@us...> - 2003-04-25 18:33:13
|
Update of /cvsroot/phpslash/phpslash-ft In directory sc8-pr-cvs1:/tmp/cvs-serv15016/phpslash-ft Modified Files: CHANGES Log Message: add missing new submission permission for public. Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.760 retrieving revision 1.761 diff -C2 -d -r1.760 -r1.761 *** CHANGES 23 Apr 2003 15:14:47 -0000 1.760 --- CHANGES 25 Apr 2003 18:33:08 -0000 1.761 *************** *** 13,16 **** --- 13,20 ---- 9 - Removal of something (kill -9 :) + 2003-April-25 1:30PM CDT Joe Stewart <joe...@us...> + [B] - profile.php3 - ensure that options are predefined. + 65_to_7.sql - add missing new submission permission for public. + 2003-April-23 10:00AM CDT Joe Stewart <joe...@us...> [B] - Block.class - doParse only updates the db if expire length is set. |
|
From: Luis M <le...@us...> - 2003-04-25 16:27:19
|
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";
|
|
From: Luis M <le...@us...> - 2003-04-25 15:45:52
|
Update of /cvsroot/phpslash/phpslash-dev/include/templates/en/basic
In directory sc8-pr-cvs1:/tmp/cvs-serv7124
Modified Files:
mailinglistMessageForm.tpl
Log Message:
fixed spellings
Index: mailinglistMessageForm.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/include/templates/en/basic/mailinglistMessageForm.tpl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** mailinglistMessageForm.tpl 12 Mar 2003 16:12:52 -0000 1.1.1.1
--- mailinglistMessageForm.tpl 25 Apr 2003 15:45:48 -0000 1.2
***************
*** 1,69 ****
! <!-- start mailinglistMessageForm.tpl -->
! <div id="mailingListMessageForm">
! <h2>Send a Newsletter</h2>
! <form action="{ACTION_URL}" method="post">
! <table cellspacing="2" cellpadding="3" border="0">
! <tr>
! <td class="descr">FROM:</td>
! <td><input type="text" name="sender" size="50" value="{FROM}" /></td>
! </tr>
! <tr>
! <td class="descr">SUBJECT:</td>
! <td><input type="text" name="subject" size="50" value="{SUBJECT}" /></td>
! </tr>
! <tr>
! <td class="descr">
! Newsletter:<br />
! <p class="hint">Leave this box blank if you just want to send headlines.</p>
! <p class="hint">Enter text here if you want to have a message prefixed to your newslestter.</p>
! <p class="hint">Selecting "Override Headline Body" below will omit headlines and only send the text you type here.</p>
! </td>
! <td>
! <textarea cols="50" rows="25" name="body">{NEWSLETTER_BODY}</textarea>
! </td>
! </tr>
! <tr>
! <td class="descr">Enter Begin Date</td>
! <td>
! <p class="date">MM: <input type ="text" name="bmonth" size="2" value="{FROM_MONTH}" /></p>
! <p class="date">DD: <input type ="text" name="bday" size="2" value="{FROM_DATE}" /></p>
! <p class="date">YYYY: <input type ="text" name="byear" size="4" value="{FROM_YEAR}" /></p>
! </td>
! </tr>
! <tr>
! <td class="descr">Enter End Date</td>
! <td>
! <p class="date">MM: <input type ="text" name="emonth" size="2" value="{TO_MONTH}" /></p>
! <p class="date">DD: <input type ="text" name="eday" size="2" value="{TO_DATE}" /></p>
! <p class="date">YYYY: <input type ="text" name="eyear" size="4" value="{TO_YEAR}" /></p>
! </td>
! </tr>
! <tr>
! <td>
! Check here to override headline body
! <input type ="checkbox" name ="override" value ="true" />
! </td>
! </tr>
! <tr>
! <td colspan = "2">
! Check here to override frequency (will send to all list recpients regardless of what day they requested to have headlines sent to them)
! <input type ="checkbox" name ="freqoverride" value ="true" />
! </td>
! </tr>
! <tr>
! <td colspan = "2">
! Check here to override the rage of dates sent in the news letter
! <input type ="checkbox" name ="dateoverride" value ="true" checked="checked" />
! </td>
! </tr>
! <tr>
! <td colspan="2">
! <input type="submit" name="action" value="send_newsletter" />
! </td>
! </tr>
! </table>
! </form>
! </div> <!-- id="mailingListMessageForm" -->
! <!-- end mailinglistMessageForm.tpl -->
!
!
--- 1,69 ----
! <!-- start mailinglistMessageForm.tpl -->
! <div id="mailingListMessageForm">
! <h2>Send a Newsletter</h2>
! <form action="{ACTION_URL}" method="post">
! <table cellspacing="2" cellpadding="3" border="0">
! <tr>
! <td class="descr">FROM:</td>
! <td><input type="text" name="sender" size="50" value="{FROM}" /></td>
! </tr>
! <tr>
! <td class="descr">SUBJECT:</td>
! <td><input type="text" name="subject" size="50" value="{SUBJECT}" /></td>
! </tr>
! <tr>
! <td class="descr">
! Newsletter:<br />
! <p class="hint">Leave this box blank if you just want to send headlines.</p>
! <p class="hint">Enter text here if you want to have a message prefixed to your newslestter.</p>
! <p class="hint">Selecting "Override Headline Body" below will omit headlines and only send the text you type here.</p>
! </td>
! <td>
! <textarea cols="50" rows="25" name="body">{NEWSLETTER_BODY}</textarea>
! </td>
! </tr>
! <tr>
! <td class="descr">Enter Begin Date</td>
! <td>
! <p class="date">MM: <input type ="text" name="bmonth" size="2" value="{FROM_MONTH}" /></p>
! <p class="date">DD: <input type ="text" name="bday" size="2" value="{FROM_DATE}" /></p>
! <p class="date">YYYY: <input type ="text" name="byear" size="4" value="{FROM_YEAR}" /></p>
! </td>
! </tr>
! <tr>
! <td class="descr">Enter End Date</td>
! <td>
! <p class="date">MM: <input type ="text" name="emonth" size="2" value="{TO_MONTH}" /></p>
! <p class="date">DD: <input type ="text" name="eday" size="2" value="{TO_DATE}" /></p>
! <p class="date">YYYY: <input type ="text" name="eyear" size="4" value="{TO_YEAR}" /></p>
! </td>
! </tr>
! <tr>
! <td>
! Check here to override headline body
! <input type ="checkbox" name ="override" value ="true" />
! </td>
! </tr>
! <tr>
! <td colspan = "2">
! Check here to override frequency (will send to all list recipients regardless of what day they requested to have headlines sent to them)
! <input type ="checkbox" name ="freqoverride" value ="true" />
! </td>
! </tr>
! <tr>
! <td colspan = "2">
! Check here to override the range of dates sent in the news letter
! <input type ="checkbox" name ="dateoverride" value ="true" checked="checked" />
! </td>
! </tr>
! <tr>
! <td colspan="2">
! <input type="submit" name="action" value="send_newsletter" />
! </td>
! </tr>
! </table>
! </form>
! </div> <!-- id="mailingListMessageForm" -->
! <!-- end mailinglistMessageForm.tpl -->
!
!
|
2 messages has been excluded from this view by a project administrator.
