phpslash-commit Mailing List for phpSlash (Page 97)
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...> - 2002-03-14 17:55:24
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv545/phpslash-ft Modified Files: CHANGES Log Message: login cancel url typo Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.420 retrieving revision 1.421 diff -C2 -d -r1.420 -r1.421 *** CHANGES 13 Mar 2002 22:11:02 -0000 1.420 --- CHANGES 14 Mar 2002 17:55:09 -0000 1.421 *************** *** 13,16 **** --- 13,22 ---- 9 - Removal of something (kill -9 :) + 2002-Mar-14 11:30AM CST Joe Stewart <jo...@be...> + [B] - login.php3 - cancel url typo. + [T] - backend.php3, backendRSS91.tpl, backendRSS1.tpl - tweak to provide + image alt text, webmaster, managingEditor, updatePeriod, + and updateFrequency as in the RSS specs. + 2002-Mar-13 4:00PM CST Joe Stewart <jo...@be...> [B] - functions.inc - breadcrumb was using ROOTDIR instead of ROOTURL. |
|
From: Joe S. <joe...@us...> - 2002-03-14 17:55:23
|
Update of /cvsroot/phpslash/phpslash-ft/public_html
In directory usw-pr-cvs1:/tmp/cvs-serv545/phpslash-ft/public_html
Modified Files:
login.php3
Log Message:
login cancel url typo
Index: login.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/login.php3,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** login.php3 11 Mar 2002 16:19:08 -0000 1.17
--- login.php3 14 Mar 2002 17:55:09 -0000 1.18
***************
*** 7,11 ****
if (isset($HTTP_POST_VARS['cancel'])) {
! Header("Location: " . $_PSL['rooturl' ."/"]); // go home
die("\n"); // Kill script if not dead already, possible memory leak
}
--- 7,11 ----
if (isset($HTTP_POST_VARS['cancel'])) {
! Header("Location: " . $_PSL['rooturl'] ."/"); // go home
die("\n"); // Kill script if not dead already, possible memory leak
}
|
|
From: Joe S. <joe...@us...> - 2002-03-13 22:11:06
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv2991/phpslash-ft Modified Files: CHANGES Log Message: ROOTURL in breadcrumb Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.419 retrieving revision 1.420 diff -C2 -d -r1.419 -r1.420 *** CHANGES 13 Mar 2002 20:05:17 -0000 1.419 --- CHANGES 13 Mar 2002 22:11:02 -0000 1.420 *************** *** 13,16 **** --- 13,19 ---- 9 - Removal of something (kill -9 :) + 2002-Mar-13 4:00PM CST Joe Stewart <jo...@be...> + [B] - functions.inc - breadcrumb was using ROOTDIR instead of ROOTURL. + 2002-Mar-13 2:00PM CST Joe Stewart <jo...@be...> [B] - Story.class, storyAdmin.php3 - More Auth checks before |
|
From: Joe S. <joe...@us...> - 2002-03-13 22:11:06
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv2991/phpslash-ft/class
Modified Files:
functions.inc
Log Message:
ROOTURL in breadcrumb
Index: functions.inc
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/functions.inc,v
retrieving revision 1.97
retrieving revision 1.98
diff -C2 -d -r1.97 -r1.98
*** functions.inc 12 Mar 2002 19:00:23 -0000 1.97
--- functions.inc 13 Mar 2002 22:11:03 -0000 1.98
***************
*** 664,668 ****
$template->set_block ("breadcrumb", "each_crumb", "crumb_block");
$template->set_var(array(
! 'ROOTDIR' => $_PSL['rooturl']
));
--- 664,668 ----
$template->set_block ("breadcrumb", "each_crumb", "crumb_block");
$template->set_var(array(
! 'ROOTURL' => $_PSL['rooturl']
));
|
|
From: Joe S. <joe...@us...> - 2002-03-13 20:05:23
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv32039/phpslash-ft Modified Files: CHANGES Log Message: deleteStory auth checks Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.418 retrieving revision 1.419 diff -C2 -d -r1.418 -r1.419 *** CHANGES 13 Mar 2002 19:14:19 -0000 1.418 --- CHANGES 13 Mar 2002 20:05:17 -0000 1.419 *************** *** 13,16 **** --- 13,20 ---- 9 - Removal of something (kill -9 :) + 2002-Mar-13 2:00PM CST Joe Stewart <jo...@be...> + [B] - Story.class, storyAdmin.php3 - More Auth checks before + deleting a story. + 2002-Mar-13 1:00PM CST Joe Stewart <jo...@be...> [B] - Story.class, storyAdmin.php3 - More Auth checks before |
|
From: Joe S. <joe...@us...> - 2002-03-13 20:05:23
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/admin
In directory usw-pr-cvs1:/tmp/cvs-serv32039/phpslash-ft/public_html/admin
Modified Files:
storyAdmin.php3
Log Message:
deleteStory auth checks
Index: storyAdmin.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/admin/storyAdmin.php3,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** storyAdmin.php3 13 Mar 2002 19:14:21 -0000 1.7
--- storyAdmin.php3 13 Mar 2002 20:05:18 -0000 1.8
***************
*** 25,30 ****
case "delete":
! $story->deleteStory($story_id);
! $story->listStory($ary,$next);
break;
--- 25,32 ----
case "delete":
! if(!$story->deleteStory($story_id)) {
! error(pslgetText("Sorry. You do not have the necessary privilege to view this page."));
! }
! $story->listStory($ary,$next);
break;
|
|
From: Joe S. <joe...@us...> - 2002-03-13 20:05:23
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv32039/phpslash-ft/class
Modified Files:
Story.class
Log Message:
deleteStory auth checks
Index: Story.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Story.class,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** Story.class 13 Mar 2002 19:14:21 -0000 1.29
--- Story.class 13 Mar 2002 20:05:18 -0000 1.30
***************
*** 558,561 ****
--- 558,570 ----
function deleteStory($story_id) {
+ // gotta get the story user_id
+ $story_ary = $this->extractStory($story_id, "Full");
+ $user_id = $story_ary['user_id'];
+
+ if((!$this->perm->have_perm('story,root')) AND
+ ( $user_id != $this->auth->auth['uid'])) {
+ return false;
+ }
+
echo "The storyid is: $story_id<BR>\n";
$comment = new Comment;
***************
*** 587,590 ****
--- 596,600 ----
echo "removed the story<BR>\n";
}
+ return true;
}
***************
*** 878,882 ****
));
$this->template->parse("authors", "each_author", "true");
! while (list(, $cur_Author) = each($author_array)) {
$this->template->set_var(array(
"AUTHOR_ID" => $cur_Author['id'],
--- 888,892 ----
));
$this->template->parse("authors", "each_author", "true");
! while (list(, $cur_Author) = @each($author_array)) {
$this->template->set_var(array(
"AUTHOR_ID" => $cur_Author['id'],
|
|
From: Joe S. <joe...@us...> - 2002-03-13 19:14:25
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/admin
In directory usw-pr-cvs1:/tmp/cvs-serv18487/phpslash-ft/public_html/admin
Modified Files:
storyAdmin.php3
Log Message:
newStory auth checks
Index: storyAdmin.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/admin/storyAdmin.php3,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** storyAdmin.php3 3 Feb 2002 22:09:12 -0000 1.6
--- storyAdmin.php3 13 Mar 2002 19:14:21 -0000 1.7
***************
*** 53,58 ****
case "edit":
$HTTP_POST_VARS['story_id'] = $story_id;
! $story->newStory($HTTP_POST_VARS, "database");
! break;
case "new":
--- 53,60 ----
case "edit":
$HTTP_POST_VARS['story_id'] = $story_id;
! if(!$story->newStory($HTTP_POST_VARS, "database")) {
! error(pslgetText("Sorry. You do not have the necessary privilege to view this page."));
! }
! break;
case "new":
|
|
From: Joe S. <joe...@us...> - 2002-03-13 19:14:25
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv18487/phpslash-ft/class
Modified Files:
Story.class
Log Message:
newStory auth checks
Index: Story.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Story.class,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** Story.class 3 Feb 2002 02:49:40 -0000 1.28
--- Story.class 13 Mar 2002 19:14:21 -0000 1.29
***************
*** 1116,1119 ****
--- 1116,1125 ----
$user_id = $this->db->Record['user_id'];
+ // Normal users can't edit another user's stories
+ if((!$this->perm->have_perm('story,root')) AND
+ ( $user_id != $this->auth->auth['uid'])) {
+ return false;
+ }
+
/* if god-level, enable setting of date, otherwise display date */
if (!$this->perm->have_perm("story,root")) {
***************
*** 1224,1228 ****
$this->template->parse('OUT',array("newstory"));
$this->template->p('OUT');
!
}
--- 1230,1234 ----
$this->template->parse('OUT',array("newstory"));
$this->template->p('OUT');
! return true;
}
|
|
From: Joe S. <joe...@us...> - 2002-03-13 19:14:24
|
Update of /cvsroot/phpslash/phpslash-ft/public_html
In directory usw-pr-cvs1:/tmp/cvs-serv18487/phpslash-ft/public_html
Modified Files:
article.php3
Log Message:
newStory auth checks
Index: article.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/article.php3,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** article.php3 11 Feb 2002 18:24:56 -0000 1.59
--- article.php3 13 Mar 2002 19:14:20 -0000 1.60
***************
*** 99,102 ****
--- 99,108 ----
$related = $story->getRelated($story_id);
+ if($perm->have_perm('story')) {
+ if( ($auth->auth['uid'] == $story->story_ary['user_id']) OR
+ ($perm->have_perm('root'))) {
+ $related .= "<a href=\"".$_PSL['adminurl']."/storyAdmin.php3?submit=edit&story_id=".$story_id."\">".pslgetText('Modify Story')."</a>";
+ }
+ }
$arrows = $story->getNextPrev($story_id);
|
|
From: Joe S. <joe...@us...> - 2002-03-13 19:14:24
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv18487/phpslash-ft Modified Files: CHANGES Log Message: newStory auth checks Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.417 retrieving revision 1.418 diff -C2 -d -r1.417 -r1.418 *** CHANGES 13 Mar 2002 16:37:55 -0000 1.417 --- CHANGES 13 Mar 2002 19:14:19 -0000 1.418 *************** *** 13,16 **** --- 13,21 ---- 9 - Removal of something (kill -9 :) + 2002-Mar-13 1:00PM CST Joe Stewart <jo...@be...> + [B] - Story.class, storyAdmin.php3 - More Auth checks before + displaying story edit form. + article.php3 - "Modify Story" link for authorized user. + 2002-Mar-13 10:30AM CST Joe Stewart <jo...@be...> [B] - slash-all.sql - typo in psl_section_block_lut_seq. |
|
From: Joe S. <joe...@us...> - 2002-03-13 16:38:00
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv968/phpslash-ft Modified Files: CHANGES Log Message: typo in slash-all.sql Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.416 retrieving revision 1.417 diff -C2 -d -r1.416 -r1.417 *** CHANGES 12 Mar 2002 19:00:22 -0000 1.416 --- CHANGES 13 Mar 2002 16:37:55 -0000 1.417 *************** *** 13,16 **** --- 13,19 ---- 9 - Removal of something (kill -9 :) + 2002-Mar-13 10:30AM CST Joe Stewart <jo...@be...> + [B] - slash-all.sql - typo in psl_section_block_lut_seq. + 2002-Mar-12 6:30AM CST Joe Stewart <jo...@be...> [B] - pollAdmin.php3 wasn't display errors when deleting. |
|
From: Joe S. <joe...@us...> - 2002-03-13 16:37:59
|
Update of /cvsroot/phpslash/phpslash-ft/tables/0.65 In directory usw-pr-cvs1:/tmp/cvs-serv968/phpslash-ft/tables/0.65 Modified Files: slash-all.sql Log Message: typo in slash-all.sql Index: slash-all.sql =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/tables/0.65/slash-all.sql,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** slash-all.sql 11 Mar 2002 16:19:09 -0000 1.13 --- slash-all.sql 13 Mar 2002 16:37:56 -0000 1.14 *************** *** 137,142 **** INSERT INTO db_sequence (seq_name, nextid) VALUES ( 'psl_mailinglist_seq', '2'); INSERT INTO db_sequence (seq_name, nextid) VALUES ( 'psl_glossary_seq', '1'); ! INSERT INTO db_sequence (seq_name, nextid) VALUES ( 'psl_blocktype_seq ', '10'); INSERT INTO db_sequence (seq_name, nextid) VALUES ( 'psl_section_block_lut_seq', '270'); ! --- 137,142 ---- INSERT INTO db_sequence (seq_name, nextid) VALUES ( 'psl_mailinglist_seq', '2'); INSERT INTO db_sequence (seq_name, nextid) VALUES ( 'psl_glossary_seq', '1'); ! INSERT INTO db_sequence (seq_name, nextid) VALUES ( 'psl_blocktype_seq ', '10'); ! INSERT INTO db_sequence (seq_name, nextid) VALUES ( 'psl_section_block_lut_seq', '280'); |
|
From: Joe S. <joe...@us...> - 2002-03-12 19:07:50
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default
In directory usw-pr-cvs1:/tmp/cvs-serv11811
Modified Files:
mailinglistUnsubscribe.tpl
Log Message:
display error and message text better
Index: mailinglistUnsubscribe.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default/mailinglistUnsubscribe.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** mailinglistUnsubscribe.tpl 12 Mar 2002 19:00:23 -0000 1.3
--- mailinglistUnsubscribe.tpl 12 Mar 2002 19:07:48 -0000 1.4
***************
*** 1,5 ****
Thank you for your subscription to {SITENAME}.
! If there is anything we can do to improve our service, please be sure to let us know by sending us and email at {SITEOWNER}.\n\n
You have been removed from the list, you won't hear from us again.
--- 1,5 ----
Thank you for your subscription to {SITENAME}.
! If there is anything we can do to improve our service, please be sure to let us know by sending us and email at {SITEOWNER}.
You have been removed from the list, you won't hear from us again.
|
|
From: Joe S. <joe...@us...> - 2002-03-12 19:00:26
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/admin
In directory usw-pr-cvs1:/tmp/cvs-serv8879/phpslash-ft/public_html/admin
Modified Files:
pollAdmin.php3
Log Message:
display error and message text better
Index: pollAdmin.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/admin/pollAdmin.php3,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** pollAdmin.php3 18 Feb 2002 21:09:40 -0000 1.6
--- pollAdmin.php3 12 Mar 2002 19:00:23 -0000 1.7
***************
*** 37,48 ****
echo "</center>";
} else {
! echo "ERROR: $poll->message<BR>\n";
}
break;
case "delete":
titlebar ("100%", "Deleting poll");
! $poll->deletePoll($question_id);
case "makecurrent":
! $poll->makeCurrent($question_id);
default:
$poll->listPolls($min);
--- 37,54 ----
echo "</center>";
} else {
! error($poll->message);
}
break;
case "delete":
titlebar ("100%", "Deleting poll");
! if($poll->deletePoll($question_id)) {
! message($poll->message);
! } else {
! error($poll->message);
! }
case "makecurrent":
! if(!$poll->makeCurrent($question_id)) {
! error($poll->message);
! }
default:
$poll->listPolls($min);
|
|
From: Joe S. <joe...@us...> - 2002-03-12 19:00:26
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default
In directory usw-pr-cvs1:/tmp/cvs-serv8879/phpslash-ft/public_html/templates/en/default
Modified Files:
mailinglistUnsubscribe.tpl
Log Message:
display error and message text better
Index: mailinglistUnsubscribe.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default/mailinglistUnsubscribe.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mailinglistUnsubscribe.tpl 2 Dec 2000 17:39:15 -0000 1.2
--- mailinglistUnsubscribe.tpl 12 Mar 2002 19:00:23 -0000 1.3
***************
*** 1,6 ****
! Thank you for your subscription to {SITENAME}
!
! If there is anything we can do to improve our service, please be sure to
! let us know by sending us and email at {SITEOWNER}
!
! You have been removed from the list, you won't hear from us again.
--- 1,5 ----
! Thank you for your subscription to {SITENAME}.
!
! If there is anything we can do to improve our service, please be sure to let us know by sending us and email at {SITEOWNER}.\n\n
!
! You have been removed from the list, you won't hear from us again.
|
|
From: Joe S. <joe...@us...> - 2002-03-12 19:00:26
|
Update of /cvsroot/phpslash/phpslash-ft/public_html
In directory usw-pr-cvs1:/tmp/cvs-serv8879/phpslash-ft/public_html
Modified Files:
mailinglist.php3
Log Message:
display error and message text better
Index: mailinglist.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/mailinglist.php3,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** mailinglist.php3 6 Mar 2002 04:29:54 -0000 1.3
--- mailinglist.php3 12 Mar 2002 19:00:23 -0000 1.4
***************
*** 29,36 ****
switch ($action) {
case "subscribe":
! $list->subscribe($HTTP_POST_VARS);
break;
case "unsubscribe":
! $list->unsubscribe($unsubscribe_address);
break;
default:
--- 29,44 ----
switch ($action) {
case "subscribe":
! if($list->subscribe($HTTP_POST_VARS)) {
! message($list->message);
! } else {
! error($list->message);
! }
break;
case "unsubscribe":
! if($list->unsubscribe($unsubscribe_address)) {
! message($list->message);
! } else {
! error($list->message);
! }
break;
default:
|
|
From: Joe S. <joe...@us...> - 2002-03-12 19:00:26
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv8879/phpslash-ft/class
Modified Files:
functions.inc
Log Message:
display error and message text better
Index: functions.inc
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/functions.inc,v
retrieving revision 1.96
retrieving revision 1.97
diff -C2 -d -r1.96 -r1.97
*** functions.inc 11 Mar 2002 04:20:18 -0000 1.96
--- functions.inc 12 Mar 2002 19:00:23 -0000 1.97
***************
*** 23,27 ****
global $_PSL;
! $template = "error.tpl";
/* Templates */
--- 23,27 ----
global $_PSL;
! $template = "message.tpl";
/* Templates */
|
|
From: Joe S. <joe...@us...> - 2002-03-12 19:00:26
|
Update of /cvsroot/phpslash/phpslash-ft/doc/html
In directory usw-pr-cvs1:/tmp/cvs-serv8879/phpslash-ft/doc/html
Modified Files:
phpslash.sgml
Log Message:
display error and message text better
Index: phpslash.sgml
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/doc/html/phpslash.sgml,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** phpslash.sgml 9 Mar 2002 16:25:27 -0000 1.18
--- phpslash.sgml 12 Mar 2002 19:00:23 -0000 1.19
***************
*** 645,648 ****
--- 645,649 ----
mailinglistMessageForm.tpl
mailinglistSubscribe.tpl
+ message.tpl
messageStrike.tpl
notfound.tpl
***************
*** 1175,1178 ****
--- 1176,1180 ----
mailinglistSubscribe.tpl - subscribe confirmation text
mailinglistUnsubscribe.tpl - unsubscribe confirmation text
+ message.tpl - display confirmation messages, etc.
messageStrike.tpl - used to strike out text that is not translated.
navbar.tpl - top Navigation bar (Home, About, etc.)
|
|
From: Joe S. <joe...@us...> - 2002-03-12 19:00:26
|
Update of /cvsroot/phpslash/phpslash-ft
In directory usw-pr-cvs1:/tmp/cvs-serv8879/phpslash-ft
Modified Files:
CHANGES
Log Message:
display error and message text better
Index: CHANGES
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v
retrieving revision 1.415
retrieving revision 1.416
diff -C2 -d -r1.415 -r1.416
*** CHANGES 12 Mar 2002 12:20:59 -0000 1.415
--- CHANGES 12 Mar 2002 19:00:22 -0000 1.416
***************
*** 14,17 ****
--- 14,27 ----
2002-Mar-12 6:30AM CST Joe Stewart <jo...@be...>
+ [B] - pollAdmin.php3 wasn't display errors when deleting.
+ mailinglist.php3 wasn't displaying confirmation screen.
+ (Thanks Luis!).
+ [T] - added message.tpl for the above programs.
+ functions.inc - changed message functions template to
+ message.tpl.
+ [T] - mailinglistUnsubscribe.tpl - Added spaces between sentences.
+ [D] - phpslash.sgml - added message.tpl
+
+ 2002-Mar-12 6:30AM CST Joe Stewart <jo...@be...>
[B] - [ 528861 ] cronmail.php3 that works with 0.65-pre1.
Luis' update of cronmail.php3.
|
|
From: Joe S. <joe...@us...> - 2002-03-12 18:58:59
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default
In directory usw-pr-cvs1:/tmp/cvs-serv8124
Added Files:
message.tpl
Log Message:
initial commit
--- NEW FILE: message.tpl ---
<BR><BR>
<FONT SIZE=+1>{ERROR}</FONT>
<BR><BR>
|
|
From: Joe S. <joe...@us...> - 2002-03-12 12:21:03
|
Update of /cvsroot/phpslash/phpslash-ft/contrib
In directory usw-pr-cvs1:/tmp/cvs-serv16635/phpslash-ft/contrib
Modified Files:
cronmail.php3
Log Message:
[ 528861 ] cronmail.php3 that works with 0.65-pre1
Index: cronmail.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/contrib/cronmail.php3,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** cronmail.php3 23 Nov 2001 18:59:24 -0000 1.1
--- cronmail.php3 12 Mar 2002 12:20:59 -0000 1.2
***************
*** 1,11 ****
<?php
! // $Id:
! // TODO: Uses old style semantics. Does not use templates
! // WARNING: DO NOT PUT IN DOC ROOT!! CALL FROM CRON
- // Be sure to change this
- require("./config.php3");
/////////////////// send_mailing_list.php3 /////////////////////////
function format_mail($str, $char_len, $scrub) {
if ($scrub)
--- 1,69 ----
+ #!/usr/bin/php
<?php
! /*
! * $Id$
! * Last modified: 2002-Mar-12
! * Luis Mondesi < le...@ho... >
! *
! * NOTE: originally created by ... modified for
! * phpslash 0.65-pre1 by Luis Mondesi
! *
! * USAGE: Run this from a cron job (CGI version of php),
! * even though it should
! * run just fine from your current site root. For as long
! * as you keep in mind that anybody might be able to run this...
! * unless of course, page_open(PERMISSIONS) and page_close()
! * are used to protect the code using PHPLIB's session management
! * routines.
! * This script requires a directory called 'text' parallel to it.
! * This directory should be writable by which ever user runs this
! * cron script, or by whichever user runs your server (if apache's
! * mod_php is used).
! * To run as a cron...
! */
! // example for cron:
! // 00 */24 * * * php /path/to/cronmail.php3 2>&1 > /dev/null
! /* Basically, send this headlines every 24 hours and don't show
! * any errors please...
! * Another even better option would be to put this file
! * in /etc/cron.daily and make sure you have:
! * #!/path/to/php
! * at the beginning of this script
! *
! * that's all...
! *
! *
! * There is no need to touch anything in this script. All your
! * customizations should be done in your current config.php3
! * You should put a .htaccess file in the directory from which
! * this is going to run containing the following customization
! * options (for PHP 4.x and up):
! *
! * php_flag magic_quotes_gpc Off
! * php_value include_path ".:/path/to/phplib:/path/to/phpslash"
! * #optional:
! * #php_value disable_functions phpinfo,readfile,system
! * #optional: do not report errors : ~E_ALL
! * #php_value error_reporting E_ALL
! *
! * Do they look familiar? basically it's the same set of
! * options that you might be using for phpslash...
! *
! * TODO: template this baby! :-)
! */
!
! require_once("prepend.php3");
! require_once("config.php3");
!
! // variable initialization (do not modify)
! $str_out = "";
! $freqoverride = 0;
! $errors = array();
! $row = array();
! $sql = "";
/////////////////// send_mailing_list.php3 /////////////////////////
+ if (!function_exists('format_mail')) {
function format_mail($str, $char_len, $scrub) {
if ($scrub)
***************
*** 35,41 ****
return $str_out;
}
!
function build_body($offset) {
!
$slash_q = new slashDB;
--- 93,99 ----
return $str_out;
}
! }//end if not function_exists
function build_body($offset) {
! global $_PSL;
$slash_q = new slashDB;
***************
*** 49,63 ****
$enddate = date("Y-m-d H:i:s", mktime(0,0,0,$emonth,$eday + 1,$eyear));
! $sql="SELECT sid, title, dept, aid, time, introtext FROM stories
! WHERE time >= '$begdate' AND time <= '$enddate' ORDER BY time desc";
$slash_q->query($sql);
! $site = "yourdamnsite.com";
while($slash_q->next_record())
{
$headline = $slash_q->Record["title"] . "\n";
$headline .= " From the: \"" . $slash_q->Record["dept"] . "\" dept.\n";
! $headline .= " Posted by: \"" . $slash_q->Record["aid"] . "\" on: " . $slash_q->Record["time"] . "\n";
! $headline .= " Story: " . format_mail($slash_q->Record["introtext"],76,True) . "\n";
! $headline .= " $site" . "article.php3?sid=" . $slash_q->Record["sid"] . "\n";
$headline .= "---------------------------------------------------------------------------------------------\n\n";
$headline = stripslashes($headline);
--- 107,124 ----
$enddate = date("Y-m-d H:i:s", mktime(0,0,0,$emonth,$eday + 1,$eyear));
! $sql="SELECT story_id, title, dept, user_id, time, ".
! " intro_text, author_name, author_id FROM psl_story, psl_author ".
! " WHERE psl_story.time >= '$begdate' AND psl_story.time <= '$enddate' ".
! " AND psl_story.user_id = psl_author.author_id ".
! " ORDER BY time desc";
$slash_q->query($sql);
! $site = $_PSL["rooturl"];
while($slash_q->next_record())
{
$headline = $slash_q->Record["title"] . "\n";
$headline .= " From the: \"" . $slash_q->Record["dept"] . "\" dept.\n";
! $headline .= " Posted by: \"" . $slash_q->Record["author_name"] . "\" on: " . $slash_q->Record["time"] . "\n";
! $headline .= " Story: " . format_mail($slash_q->Record["intro_text"],76,True) . "\n";
! $headline .= " $site" . "/article.php3?story_id=" . $slash_q->Record["story_id"] . "\n";
$headline .= "---------------------------------------------------------------------------------------------\n\n";
$headline = stripslashes($headline);
***************
*** 102,109 ****
else {
$sql .= "SELECT email, name, dayback, frequency ";
! $sql .= "FROM mailing_list, mailing_frequency ";
! $sql .= "WHERE mailing_list.id = mailing_frequency.id ";
! $sql .= "AND (mailing_frequency.frequency='" . date("l") . "' ";
! $sql .= "OR mailing_frequency.frequency = 'DAY' ";
if (date("d") == 1) $sql .= "OR mailing_frequency.frequency = 'MONTH' ";
$sql .= ") ORDER BY dayback, mailing_frequency.frequency";
--- 163,170 ----
else {
$sql .= "SELECT email, name, dayback, frequency ";
! $sql .= "FROM psl_mailinglist, psl_mailinglist_frequency ";
! $sql .= "WHERE psl_mailinglist.id = psl_mailinglist_frequency.id ";
! $sql .= "AND (psl_mailinglist_frequency.frequency='" . date("l") . "' ";
! $sql .= "OR psl_mailinglist_frequency.frequency = 'DAY' ";
if (date("d") == 1) $sql .= "OR mailing_frequency.frequency = 'MONTH' ";
$sql .= ") ORDER BY dayback, mailing_frequency.frequency";
***************
*** 111,121 ****
// $db_results = mysql_query($sql, $slash_q) or die(mysql_error());
! $link = mysql_connect("location","Dbname","password");
! $db_results = mysql("databse","SELECT email, name, dayback, frequency
! FROM mailing_list, mailing_frequency
! WHERE mailing_list.id = mailing_frequency.id
! AND (mailing_frequency.frequency = 'DAY'
! OR mailing_frequency.frequency = 'DAY')
! ORDER BY dayback, mailing_frequency.frequency;",$link);
ignore_user_abort();
--- 172,182 ----
// $db_results = mysql_query($sql, $slash_q) or die(mysql_error());
! $link = mysql_pconnect($_PSL['DB_Host'],$_PSL['DB_User'],$_PSL['DB_Password']);
! $db_results = mysql_db_query($_PSL['DB_Database'],"SELECT email, name, dayback, frequency
! FROM psl_mailinglist, psl_mailinglist_frequency
! WHERE psl_mailinglist.id = psl_mailinglist_frequency.id
! AND (psl_mailinglist_frequency.frequency = 'DAY'
! OR psl_mailinglist_frequency.frequency = 'DAY')
! ORDER BY dayback, psl_mailinglist_frequency.frequency",$link);
ignore_user_abort();
***************
*** 123,127 ****
$tmpDay = '';
! $sender = "who...@yo...";
while($row = mysql_fetch_row($db_results)) {
set_time_limit(SLEEP + 30);
--- 184,188 ----
$tmpDay = '';
! $sender = preg_replace("/(.*)\@.*/i","noreply",$_PSL['site_owner']);
while($row = mysql_fetch_row($db_results)) {
set_time_limit(SLEEP + 30);
***************
*** 148,152 ****
//echo "\nTO: $row[0] Name: $row[1] DayBack: $row[2] Freq: $row[3]";
}
! $subject="Headlines For You";
if(mail($row[0], $subject, "Dear " . $row[1] . ",\n\n" . $header . "\n\n" . $body . "\n\n" . $footer, "From: " . $sender))
echo "\n" . $row[0] . "... sent";
--- 209,213 ----
//echo "\nTO: $row[0] Name: $row[1] DayBack: $row[2] Freq: $row[3]";
}
! $subject=$_PSL['mailinglist_subject'];
if(mail($row[0], $subject, "Dear " . $row[1] . ",\n\n" . $header . "\n\n" . $body . "\n\n" . $footer, "From: " . $sender))
echo "\n" . $row[0] . "... sent";
|
|
From: Joe S. <joe...@us...> - 2002-03-12 12:21:03
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv16635/phpslash-ft Modified Files: CHANGES Log Message: [ 528861 ] cronmail.php3 that works with 0.65-pre1 Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.414 retrieving revision 1.415 diff -C2 -d -r1.414 -r1.415 *** CHANGES 11 Mar 2002 19:01:37 -0000 1.414 --- CHANGES 12 Mar 2002 12:20:59 -0000 1.415 *************** *** 13,16 **** --- 13,20 ---- 9 - Removal of something (kill -9 :) + 2002-Mar-12 6:30AM CST Joe Stewart <jo...@be...> + [B] - [ 528861 ] cronmail.php3 that works with 0.65-pre1. + Luis' update of cronmail.php3. + 2002-Mar-11 1:00PM CST Joe Stewart <jo...@be...> [B] - Section.class - deleteSection can't delete if blocks |
|
From: Joe S. <joe...@us...> - 2002-03-11 19:01:40
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv23261/phpslash-ft/class
Modified Files:
Section.class
Log Message:
deleteSection checks for blocks
Index: Section.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Section.class,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Section.class 3 Feb 2002 02:49:40 -0000 1.9
--- Section.class 11 Mar 2002 19:01:37 -0000 1.10
***************
*** 155,160 ****
$story_id = $this->db->Record["story_id"];
$section_name = $this->db->Record["section_name"];
! #echo "<FONT COLOR=RED>SUBMISSION</FONT>: '$title'<BR>\n";
}
if (!$go_ahead) {
--- 155,176 ----
$story_id = $this->db->Record["story_id"];
$section_name = $this->db->Record["section_name"];
! echo "<FONT COLOR=RED>SUBMISSION</FONT>: '$title'<BR>\n";
! }
!
! $q = "SELECT psl_block.title,
! psl_block.id
! FROM psl_block,
! psl_section_block_lut
! WHERE psl_block.id = psl_section_block_lut.block_id
! AND psl_section_block_lut.section_id = '$section_id'";
! $this->db->query($q);
! while ($this->db->next_record()) {
! $go_ahead = false;
! $title = $this->db->Record["title"];
! $block_id = $this->db->Record["id"];
! $section_name = $this->db->Record["section_name"];
! error("<FONT COLOR=RED>BLOCK</FONT>($block_id): $title");
}
+
if (!$go_ahead) {
|
|
From: Joe S. <joe...@us...> - 2002-03-11 19:01:40
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv23261/phpslash-ft Modified Files: CHANGES Log Message: deleteSection checks for blocks Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.413 retrieving revision 1.414 diff -C2 -d -r1.413 -r1.414 *** CHANGES 11 Mar 2002 16:19:07 -0000 1.413 --- CHANGES 11 Mar 2002 19:01:37 -0000 1.414 *************** *** 13,16 **** --- 13,20 ---- 9 - Removal of something (kill -9 :) + 2002-Mar-11 1:00PM CST Joe Stewart <jo...@be...> + [B] - Section.class - deleteSection can't delete if blocks + are assigned to section. + 2002-Mar-11 10:00AM CST Joe Stewart <jo...@be...> [B] - login.php3 - shouldn't try to get stories. |
2 messages has been excluded from this view by a project administrator.
