phpslash-commit Mailing List for phpSlash (Page 79)
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-09-11 17:14:57
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv31714/phpslash-ft Modified Files: CHANGES Log Message: register_globals off Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.549 retrieving revision 1.550 diff -C2 -d -r1.549 -r1.550 *** CHANGES 10 Sep 2002 21:09:49 -0000 1.549 --- CHANGES 11 Sep 2002 17:14:21 -0000 1.550 *************** *** 13,16 **** --- 13,23 ---- 9 - Removal of something (kill -9 :) + 2002-September-11 12:30PM CDT Joe Stewart <joe...@us...> + [W] - more work towards register_globals off. Affected files - about.php3, + article.php3, errordocument.php3, glossary.php3, index.php3, login.php3, + mailinglist.php3, poll.php3, profile.php3, search.php3, submission.php3. + blockAdmin.php3 - removed debug statement. + + 2002-September-10 3:30PM CDT Joe Stewart <joe...@us...> [B] - Comment.class - comma typo. |
|
From: Joe S. <joe...@us...> - 2002-09-11 17:14:30
|
Update of /cvsroot/phpslash/phpslash-ft/public_html
In directory usw-pr-cvs1:/tmp/cvs-serv31714/phpslash-ft/public_html
Modified Files:
about.php3 article.php3 errordocument.php3 glossary.php3
index.php3 login.php3 mailinglist.php3 poll.php3 profile.php3
search.php3 submission.php3
Log Message:
register_globals off
Index: about.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/about.php3,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** about.php3 21 Feb 2002 00:13:04 -0000 1.15
--- about.php3 11 Sep 2002 17:14:23 -0000 1.16
***************
*** 22,27 ****
$ary[$key] = $val;
}
! /* defaults for main "index" page */
! if ((!$section) AND (!$section_id)){
$section = $_PSL['site_homesection'];
if(!$section) {
--- 22,27 ----
$ary[$key] = $val;
}
!
! if ((!$ary['section']) AND (!$ary['section_id'])){
$section = $_PSL['site_homesection'];
if(!$section) {
***************
*** 29,34 ****
}
$ary['section'] = $section;
- } else {
- $pagetitle .= " - $section";
}
--- 29,32 ----
Index: article.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/article.php3,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -d -r1.66 -r1.67
*** article.php3 12 Jun 2002 14:22:19 -0000 1.66
--- article.php3 11 Sep 2002 17:14:23 -0000 1.67
***************
*** 28,38 ****
$submit = $ary['submit'];
!
! if ((!$section) AND (!$section)) {
! $section = $_PSL[site_homesection];
if(!$section) {
$section = "Home";
}
$ary['section'] = $section;
}
--- 28,39 ----
$submit = $ary['submit'];
! if ((!$ary['section']) AND (!$ary['section_id'])){
! $section = $_PSL['site_homesection'];
if(!$section) {
$section = "Home";
}
$ary['section'] = $section;
+ } else {
+ $pagetitle .= " -". $ary['section'];
}
Index: errordocument.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/errordocument.php3,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** errordocument.php3 5 Mar 2002 16:48:28 -0000 1.2
--- errordocument.php3 11 Sep 2002 17:14:23 -0000 1.3
***************
*** 25,29 ****
/* defaults for main "index" page */
! if ((!$section) AND (!$section_id)){
$section = $_PSL['site_homesection'];
if(!$section) {
--- 25,29 ----
/* defaults for main "index" page */
! if ((!$ary['section']) AND (!$ary['section_id'])){
$section = $_PSL['site_homesection'];
if(!$section) {
Index: glossary.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/glossary.php3,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** glossary.php3 18 Jun 2002 16:35:07 -0000 1.12
--- glossary.php3 11 Sep 2002 17:14:23 -0000 1.13
***************
*** 13,18 ****
START OF PAGE
*****************************/
! if ((!$section) AND (!$section_id)){
$section = $_PSL['site_homesection'];
if(!$section) {
--- 13,19 ----
START OF PAGE
*****************************/
+ $ary = $HTTP_GET_VARS;
! if ((!$ary['section']) AND (!$ary['section_id'])){
$section = $_PSL['site_homesection'];
if(!$section) {
***************
*** 36,41 ****
$glossary = new Glossary;
! $content = $glossary->searchGlossary($search); // TODO: USE HTTP_*VARS, not a registered global
!
$block = new Block_i;
--- 37,41 ----
$glossary = new Glossary;
! $content = $glossary->searchGlossary($ary['search']);
$block = new Block_i;
Index: index.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/index.php3,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** index.php3 30 May 2002 16:00:16 -0000 1.58
--- index.php3 11 Sep 2002 17:14:23 -0000 1.59
***************
*** 25,30 ****
$ary = $HTTP_GET_VARS;
! /* defaults for main "index" page */
! if ((!$section) AND (!$section_id)){
$section = $_PSL['site_homesection'];
if(!$section) {
--- 25,29 ----
$ary = $HTTP_GET_VARS;
! if ((!$ary['section']) AND (!$ary['section_id'])){
$section = $_PSL['site_homesection'];
if(!$section) {
***************
*** 33,37 ****
$ary['section'] = $section;
} else {
! $pagetitle .= " - $section";
}
--- 32,36 ----
$ary['section'] = $section;
} else {
! $pagetitle .= $ary['section'];
}
Index: login.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/login.php3,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** login.php3 7 Jun 2002 16:24:58 -0000 1.20
--- login.php3 11 Sep 2002 17:14:24 -0000 1.21
***************
*** 45,51 ****
}
! // TODO: make the below use $HTTP_*_VARS
! /* defaults for main "index" page */
! if ((!$section) AND (!$section_id)) {
$section = $_PSL['site_homesection'];
if(!$section) {
--- 45,49 ----
}
! if ((!$ary['section']) AND (!$ary['section_id'])) {
$section = $_PSL['site_homesection'];
if(!$section) {
***************
*** 57,60 ****
--- 55,59 ----
}
+ // $ary['section'] = "Admin"; // Some may prefer these blocks.
$ary['section'] = "User";
***************
*** 75,82 ****
if (empty($rightblocks)) {
// $centerblocks = $block->getBlocks($ary);
! // $tplfile = "index1col.tpl";
! // default to 2 column for transparent upgrade
! $rightblocks = $block->getBlocks($ary);
! $tplfile = "index2colright.tpl";
} else {
$tplfile = "index2colright.tpl";
--- 74,78 ----
if (empty($rightblocks)) {
// $centerblocks = $block->getBlocks($ary);
! $tplfile = "index1col.tpl";
} else {
$tplfile = "index2colright.tpl";
Index: mailinglist.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/mailinglist.php3,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** mailinglist.php3 17 Jun 2002 18:02:05 -0000 1.6
--- mailinglist.php3 11 Sep 2002 17:14:24 -0000 1.7
***************
*** 14,18 ****
*****************************/
! if ((!$section) AND (!$section_id)){
$section = $_PSL['site_homesection'];
if(!$section) {
--- 14,20 ----
*****************************/
! $ary = $HTTP_GET_VARS;
!
! if ((!$ary['section']) AND (!$ary['section_id'])){
$section = $_PSL['site_homesection'];
if(!$section) {
***************
*** 35,39 ****
$content = '';
! switch ($action) {
case "subscribe":
if($list->subscribe($HTTP_POST_VARS)) {
--- 37,41 ----
$content = '';
! switch ($ary['action']) {
case "subscribe":
if($list->subscribe($HTTP_POST_VARS)) {
***************
*** 44,48 ****
break;
case "unsubscribe":
! if($list->unsubscribe($unsubscribe_address)) {
$content .= getMessage($list->message);
} else {
--- 46,50 ----
break;
case "unsubscribe":
! if($list->unsubscribe($HTTP_POST_VARS['unsubscribe_address'])) {
$content .= getMessage($list->message);
} else {
***************
*** 56,60 ****
$block = new Block_i;
! $breadcrumb = breadcrumb($ary);
$_PSL['metatags']['object'] = $xsiteobject;
--- 58,62 ----
$block = new Block_i;
! // $breadcrumb = breadcrumb($ary);
$_PSL['metatags']['object'] = $xsiteobject;
Index: poll.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/poll.php3,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** poll.php3 25 Jun 2002 22:51:20 -0000 1.14
--- poll.php3 11 Sep 2002 17:14:24 -0000 1.15
***************
*** 14,18 ****
}
! if ((!$section) AND (!$section_id)){
$section = $_PSL['site_homesection'];
if(!$section) {
--- 14,18 ----
}
! if ((!$ary['section']) AND (!$ary['section_id'])){
$section = $_PSL['site_homesection'];
if(!$section) {
***************
*** 24,28 ****
}
- // TODO: Make this work with $HTTP_*_VARS
/* the comment stuff is using "story_id" so we have to funky
fix it here. */
--- 24,27 ----
***************
*** 47,51 ****
switch ($ary['submit']) {
case "vote":
! if($poll->vote($question_id, $answer_id, $REMOTE_ADDR)) {
$content .= pslgetText('VOTE: ') . $poll->message . "<BR>\n";
} else {
--- 46,50 ----
switch ($ary['submit']) {
case "vote":
! if($poll->vote($question_id, $ary['answer_id'], $REMOTE_ADDR)) {
$content .= pslgetText('VOTE: ') . $poll->message . "<BR>\n";
} else {
***************
*** 86,90 ****
$block = new Block_i;
! $breadcrumb = breadcrumb($ary);
$_PSL['metatags']['object'] = $xsiteobject;
--- 85,89 ----
$block = new Block_i;
! // $breadcrumb = breadcrumb($ary);
$_PSL['metatags']['object'] = $xsiteobject;
Index: profile.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/profile.php3,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** profile.php3 12 Jun 2002 14:22:20 -0000 1.3
--- profile.php3 11 Sep 2002 17:14:24 -0000 1.4
***************
*** 67,74 ****
$block = new Block_i;
! $section = "Admin";
! /* defaults for main "index" page */
! if ((!$section) AND (!$section_id)){
$section = $_PSL['site_homesection'];
if(!$section) {
--- 67,73 ----
$block = new Block_i;
! $ary = $HTTP_GET_VARS;
! if ((!$ary['section']) AND (!$ary['section_id'])){
$section = $_PSL['site_homesection'];
if(!$section) {
Index: search.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/search.php3,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** search.php3 25 Mar 2002 16:45:51 -0000 1.47
--- search.php3 11 Sep 2002 17:14:24 -0000 1.48
***************
*** 125,136 ****
}
! $search_topic_id = getTopicID($topic_id, $topic_name);
! $search_section_id = getSectionID($section_id, $section_name);
! $search_author_id = getAuthorID($author_id, $author_name);
/*** DEBUG ***/
! debug("HTTP_POST_VARS", $HTTP_POST_VARS);
! debug("HTTP_GET_VARS", $HTTP_GET_VARS);
/*************/
--- 125,138 ----
}
! $ary = $HTTP_GET_VARS;
!
! $search_topic_id = getTopicID($ary['topic_id'], $ary['topic_name']);
! $search_section_id = getSectionID($ary['section_id'], $ary['section_name']);
! $search_author_id = getAuthorID($ary['author_id'], $ary['author_name']);
/*** DEBUG ***/
! // debug("HTTP_POST_VARS", $HTTP_POST_VARS);
! // debug("HTTP_GET_VARS", $HTTP_GET_VARS);
/*************/
***************
*** 143,150 ****
/*************PAGE START*******************/
! $ary = $HTTP_GET_VARS;
!
! /* defaults for main "index" page */
! if ((!$section) AND (!$section_id)){
$section = $_PSL['site_homesection'];
if(!$section) {
--- 145,149 ----
/*************PAGE START*******************/
! if ((!$ary['section']) AND (!$ary['section_id'])){
$section = $_PSL['site_homesection'];
if(!$section) {
***************
*** 154,157 ****
--- 153,158 ----
}
+ $query = $ary['query'];
+
$breadcrumb = breadcrumb( $ary);
***************
*** 287,295 ****
/* print matches */
! if ($min == "") {
! $min = 0;
}
! $prev = $min - $maxsearchresults;
$templ->set_block('searchpage','previous_match');
--- 288,296 ----
/* print matches */
! if ($ary['min'] == "") {
! $ary['min'] = 0;
}
! $prev = $ary['min'] - $maxsearchresults;
$templ->set_block('searchpage','previous_match');
***************
*** 383,387 ****
AND topics.story_id=story.story_id";
! $q .= "\n ORDER BY story.time DESC LIMIT $min,$maxsearchresults";
// echo "<FONT SIZE=2><PRE>$q</PRE></FONT><BR>\n";
--- 384,388 ----
AND topics.story_id=story.story_id";
! $q .= "\n ORDER BY story.time DESC LIMIT $ary[min],$maxsearchresults";
// echo "<FONT SIZE=2><PRE>$q</PRE></FONT><BR>\n";
Index: submission.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/submission.php3,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** submission.php3 17 Jun 2002 15:31:19 -0000 1.9
--- submission.php3 11 Sep 2002 17:14:25 -0000 1.10
***************
*** 8,14 ****
page_open(array("sess"=>"slashSess","auth"=>"slashAuth","perm"=>"slashPerm"));
! if (isset($cookie)) {
! $submission_name = $name;
! $submission_email = $email;
$sess->register("submission_name");
$sess->register("submission_email");
--- 8,17 ----
page_open(array("sess"=>"slashSess","auth"=>"slashAuth","perm"=>"slashPerm"));
! $ary_post = $HTTP_POST_VARS;
! $ary = $HTTP_GET_VARS;
!
! if (isset($ary_post['cookie'])) {
! $submission_name = $ary_post['name'];
! $submission_email = $ary_post['email'];
$sess->register("submission_name");
$sess->register("submission_email");
***************
*** 19,24 ****
*****************************/
- $ary = $HTTP_GET_VARS;
-
$_PSL['metatags']['object'] = $xsiteobject;
--- 22,25 ----
***************
*** 32,36 ****
$submission = new Submission;
! switch ($submit) {
case "save":
--- 33,37 ----
$submission = new Submission;
! switch ($ary_post['submit']) {
case "save":
***************
*** 64,68 ****
$block = new Block_i;
! if ((!$section) AND (!$section_id)){
$section = $_PSL['site_homesection'];
if(!$section) {
--- 65,69 ----
$block = new Block_i;
! if ((!$ary['section']) AND (!$ary['section_id'])){
$section = $_PSL['site_homesection'];
if(!$section) {
|
|
From: Joe S. <joe...@us...> - 2002-09-10 21:09:53
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/admin
In directory usw-pr-cvs1:/tmp/cvs-serv6968/phpslash-ft/public_html/admin
Modified Files:
authorAdmin.php3 blockAdmin.php3 commentAdmin.php3
glossaryAdmin.php3 groupAdmin.php3 infologAdmin.php3
mailinglistAdmin.php3 pollAdmin.php3 sectionAdmin.php3
storyAdmin.php3 submissionAdmin.php3 topicAdmin.php3
variableAdmin.php3
Log Message:
admin script register_globals
Index: authorAdmin.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/admin/authorAdmin.php3,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** authorAdmin.php3 7 Jun 2002 16:24:59 -0000 1.10
--- authorAdmin.php3 10 Sep 2002 21:09:50 -0000 1.11
***************
*** 19,27 ****
$author = new Author;
switch ($submit) {
case "delete":
if ($perm->have_perm("authorDelete")) {
! $success = $author->deleteAuthor($id, $auth->auth["uid"]);
if($success) {
$content .= getMessage( pslgetText($author->message));
--- 19,35 ----
$author = new Author;
+ if(!empty($HTTP_POST_VARS['submit'])) {
+ $submit = $HTTP_POST_VARS['submit'];
+ } elseif (!empty($HTTP_GET_VARS['submit'])) {
+ $submit = $HTTP_GET_VARS['submit'];
+ } else {
+ $submit = '';
+ }
+
switch ($submit) {
case "delete":
if ($perm->have_perm("authorDelete")) {
! $success = $author->deleteAuthor($HTTP_GET_VARS['id'], $auth->auth["uid"]);
if($success) {
$content .= getMessage( pslgetText($author->message));
***************
*** 39,43 ****
case "edit":
if ($perm->have_perm("authorEdit")) {
! $content .= $author->editAuthor($id);
}
if ($perm->have_perm("authorList")) {
--- 47,51 ----
case "edit":
if ($perm->have_perm("authorEdit")) {
! $content .= $author->editAuthor($HTTP_GET_VARS['id']);
}
if ($perm->have_perm("authorList")) {
***************
*** 89,93 ****
$ary['section'] = "Admin";
! $breadcrumb = breadcrumb($ary);
$_PSL['metatags']['object'] = $xsiteobject;
--- 97,101 ----
$ary['section'] = "Admin";
! // $breadcrumb = breadcrumb($ary);
$_PSL['metatags']['object'] = $xsiteobject;
Index: blockAdmin.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/admin/blockAdmin.php3,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** blockAdmin.php3 29 Aug 2002 13:29:56 -0000 1.6
--- blockAdmin.php3 10 Sep 2002 21:09:50 -0000 1.7
***************
*** 26,34 ****
$content = '';
/* First do stuff that we have to */
switch ($submit) {
case "delete":
if ($perm->have_perm("blockDelete")) {
! if ($block->delBlock($id)) {
$content .= "The Block has been Deleted<BR>\n";
}
--- 26,45 ----
$content = '';
+ if(!empty($HTTP_POST_VARS['submit'])) {
+ $submit = $HTTP_POST_VARS['submit'];
+ } elseif (!empty($HTTP_GET_VARS['submit'])) {
+ $submit = $HTTP_GET_VARS['submit'];
+ $_PSL['debug'] = true;
+ debug("GET_VARS", $HTTP_GET_VARS);
+ $_PSL['debug'] = false;
+ } else {
+ $submit = '';
+ }
+
/* First do stuff that we have to */
switch ($submit) {
case "delete":
if ($perm->have_perm("blockDelete")) {
! if ($block->delBlock($HTTP_GET_VARS['id'])) {
$content .= "The Block has been Deleted<BR>\n";
}
***************
*** 42,48 ****
break;
case "view":
! $block->getBlock($id);
$block->doParse(); /* refreshes block cache in db */
! $content .= $block->doBlock($id);
if ($perm->have_perm("blockList")) {
$content .= $block->listBlock(); /* prints a list of current blocks */
--- 53,59 ----
break;
case "view":
! $block->getBlock($HTTP_GET_VARS['id']);
$block->doParse(); /* refreshes block cache in db */
! $content .= $block->doBlock($HTTP_GET_VARS['id']);
if ($perm->have_perm("blockList")) {
$content .= $block->listBlock(); /* prints a list of current blocks */
***************
*** 56,60 ****
case "edit":
if ($perm->have_perm("blockEdit")) {
! $content .= $block->editBlock($id);
}
break;
--- 67,71 ----
case "edit":
if ($perm->have_perm("blockEdit")) {
! $content .= $block->editBlock($HTTP_GET_VARS['id']);
}
break;
***************
*** 70,74 ****
if ($perm->have_perm("blockList")) {
$content .= $block->listBlock(); /* prints a list of current blocks */
! $content .= $block->listBlockTypes($option, $name); /* optional block type management */
}
}
--- 81,85 ----
if ($perm->have_perm("blockList")) {
$content .= $block->listBlock(); /* prints a list of current blocks */
! $content .= $block->listBlockTypes($HTTP_GET_VARS['option'], $HTTP_GET_VARS['name']); /* optional block type management */
}
}
***************
*** 82,86 ****
$ary['section'] = "Admin";
! $breadcrumb = breadcrumb($ary);
$_PSL['metatags']['object'] = $xsiteobject;
--- 93,97 ----
$ary['section'] = "Admin";
! // $breadcrumb = breadcrumb($ary);
$_PSL['metatags']['object'] = $xsiteobject;
Index: commentAdmin.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/admin/commentAdmin.php3,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** commentAdmin.php3 18 Jun 2002 15:52:18 -0000 1.9
--- commentAdmin.php3 10 Sep 2002 21:09:50 -0000 1.10
***************
*** 28,36 ****
$content .= '';
if($perm->have_perm("comment")) {
switch ($action) {
case "delete":
! if ($cmt->delete($comment_id, $story_id)) {
$content .= "The comment was deleted<br>\n";
} else {
--- 28,44 ----
$content .= '';
+ if(!empty($HTTP_POST_VARS['action'])) {
+ $action = $HTTP_POST_VARS['action'];
+ } elseif (!empty($HTTP_GET_VARS['action'])) {
+ $action = $HTTP_GET_VARS['action'];
+ } else {
+ $action = '';
+ }
+
if($perm->have_perm("comment")) {
switch ($action) {
case "delete":
! if ($cmt->delete($HTTP_GET_VARS['comment_id'], $HTTP_GET_VARS['story_id'])) {
$content .= "The comment was deleted<br>\n";
} else {
***************
*** 40,52 ****
case pslgetText("Show Pending"):
! $content .= $cmt->showPending($story_id);
break;
case pslgetText("Bulk Delete"):
! if (count($bulkdel_ary) == 0) {
$content .= "You didn't select any items to delete!";
} else {
for ($i = 0 ; $i < count($bulkdel_ary) ; $i++) {
! if ($cmt->delete($bulkdel_ary[$i], $story_id)) {
$content .= "Comment #" . $bulkdel_ary[$i] . " has been deleted\n";
} else {
--- 48,61 ----
case pslgetText("Show Pending"):
! $content .= $cmt->showPending($HTTP_GET_VARS['story_id']);
break;
case pslgetText("Bulk Delete"):
! $bulkdel_ary = $HTTP_POST_VARS['bulkdel_ary'];
! if (count($bulkdel_ary) == 0) {
$content .= "You didn't select any items to delete!";
} else {
for ($i = 0 ; $i < count($bulkdel_ary) ; $i++) {
! if ($cmt->delete($bulkdel_ary[$i], $HTTP_POST_VARS['story_id'])) {
$content .= "Comment #" . $bulkdel_ary[$i] . " has been deleted\n";
} else {
***************
*** 59,72 ****
case "markpend":
$content .= getTitlebar("100%", "Mark Comment Pending");
! if ($cmt->markPending($comment_id, $story_id)) {
! $content .= getMessage("Marked comment # $comment_id as pending");
} else {
! $content .= getError("There was an ERROR <em>marking</em> comment # $comment_id as <em>pending</em>.");
}
break;
case "unmarkpend":
$content .= getTitlebar("100%","Unmark Pending Comment");
! if ($cmt->unmarkPending($comment_id, $story_id)) {
! $content .= getMessage("Unmarked pending comment $comment_id");
} else {
$content .= getError("There was an ERROR <em>unmarking</em> the comment as <em>pending</em>.");
--- 68,81 ----
case "markpend":
$content .= getTitlebar("100%", "Mark Comment Pending");
! if ($cmt->markPending($HTTP_GET_VARS['comment_id'], $HTTP_GET_VARS['story_id'])) {
! $content .= getMessage(sprintf("Marked comment # %s as pending", $HTTP_GET_VARS['comment_id']));
} else {
! $content .= getError(sprintf("There was an ERROR <em>marking</em> comment # %s as <em>pending</em>.", $HTTP_GET_VARS['comment_id']));
}
break;
case "unmarkpend":
$content .= getTitlebar("100%","Unmark Pending Comment");
! if ($cmt->unmarkPending($HTTP_GET_VARS['comment_id'], $HTTP_GET_VARS['story_id'])) {
! $content .= getMessage(sprintf("Unmarked pending comment %s", $HTTP_GET_VARS['comment_id']));
} else {
$content .= getError("There was an ERROR <em>unmarking</em> the comment as <em>pending</em>.");
***************
*** 75,79 ****
case "reparentupone":
! if ($cmt->reparentUp($comment_id, $story_id)) {
$content .= getMessage("The comment was moved up one level.");
} else {
--- 84,88 ----
case "reparentupone":
! if ($cmt->reparentUp($HTTP_GET_VARS['comment_id'], $HTTP_GET_VARS['story_id'])) {
$content .= getMessage("The comment was moved up one level.");
} else {
***************
*** 83,87 ****
case "reparentuptop":
! if ($cmt->reparentTop($comment_id, $story_id)) {
$content .= getMessage("The comment was moved to the top.");
} else {
--- 92,96 ----
case "reparentuptop":
! if ($cmt->reparentTop($HTTP_GET_VARS['comment_id'], $HTTP_GET_VARS['story_id'])) {
$content .= getMessage("The comment was moved to the top.");
} else {
***************
*** 130,134 ****
$ary['section'] = "Admin";
! $breadcrumb = breadcrumb($ary);
$_PSL['metatags']['object'] = $xsiteobject;
--- 139,143 ----
$ary['section'] = "Admin";
! // $breadcrumb = breadcrumb($ary);
$_PSL['metatags']['object'] = $xsiteobject;
Index: glossaryAdmin.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/admin/glossaryAdmin.php3,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** glossaryAdmin.php3 18 Jun 2002 16:35:07 -0000 1.3
--- glossaryAdmin.php3 10 Sep 2002 21:09:50 -0000 1.4
***************
*** 30,33 ****
--- 30,46 ----
$content = '';
+ if(!empty($HTTP_POST_VARS['submit'])) {
+ $submit = $HTTP_POST_VARS['submit'];
+ $glossary_ary = $HTTP_POST_VARS['glossary_ary'];
+ $glossary_id = $HTTP_POST_VARS['glossary_id'];
+ $glossary_term = $HTTP_POST_VARS['glossary_term'];
+ $glossary_def = $HTTP_POST_VARS['glossary_def'];
+
+ } elseif (!empty($HTTP_GET_VARS['submit'])) {
+ $submit = $HTTP_GET_VARS['submit'];
+ } else {
+ $submit = '';
+ }
+
if ($perm->have_perm("glossaryList")) {
switch ($submit) {
***************
*** 81,85 ****
$ary['section'] = "Admin";
! $breadcrumb = breadcrumb($ary);
$_PSL['metatags']['object'] = $xsiteobject;
--- 94,98 ----
$ary['section'] = "Admin";
! // $breadcrumb = breadcrumb($ary);
$_PSL['metatags']['object'] = $xsiteobject;
Index: groupAdmin.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/admin/groupAdmin.php3,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** groupAdmin.php3 17 Jun 2002 20:30:39 -0000 1.2
--- groupAdmin.php3 10 Sep 2002 21:09:50 -0000 1.3
***************
*** 29,32 ****
--- 29,43 ----
$content .= '';
+ if(!empty($HTTP_POST_VARS['submit'])) {
+ $submit = $HTTP_POST_VARS['submit'];
+ } elseif (!empty($HTTP_GET_VARS['submit'])) {
+ $submit = $HTTP_GET_VARS['submit'];
+ $group_id = $HTTP_GET_VARS['group_id'];
+ $permission_id = $HTTP_GET_VARS['permission_id'];
+
+ } else {
+ $submit = '';
+ }
+
if ($perm->have_perm("groupList")) {
switch ($submit) {
Index: infologAdmin.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/admin/infologAdmin.php3,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** infologAdmin.php3 17 Jun 2002 20:58:42 -0000 1.5
--- infologAdmin.php3 10 Sep 2002 21:09:50 -0000 1.6
***************
*** 26,30 ****
if ($perm->have_perm("infologList")) {
! switch ($submit) {
case "IdDelete":
// debug("loginfoadmin::infolog_ary", $infolog_ary);
--- 26,30 ----
if ($perm->have_perm("infologList")) {
! switch ($HTTP_POST_VARS['submit']) {
case "IdDelete":
// debug("loginfoadmin::infolog_ary", $infolog_ary);
***************
*** 57,61 ****
$ary['section'] = "Admin";
! $breadcrumb = breadcrumb($ary);
$_PSL['metatags']['object'] = $xsiteobject;
--- 57,61 ----
$ary['section'] = "Admin";
! // $breadcrumb = breadcrumb($ary);
$_PSL['metatags']['object'] = $xsiteobject;
Index: mailinglistAdmin.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/admin/mailinglistAdmin.php3,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** mailinglistAdmin.php3 17 Jun 2002 18:02:05 -0000 1.5
--- mailinglistAdmin.php3 10 Sep 2002 21:09:50 -0000 1.6
***************
*** 26,29 ****
--- 26,37 ----
$content = '';
+ if(!empty($HTTP_POST_VARS['action'])) {
+ $action = $HTTP_POST_VARS['action'];
+ } elseif (!empty($HTTP_GET_VARS['action'])) {
+ $action = $HTTP_GET_VARS['action'];
+ } else {
+ $action = '';
+ }
+
if ($perm->have_perm("mailinglist")) {
***************
*** 76,80 ****
$ary['section'] = "Admin";
! $breadcrumb = breadcrumb($ary);
$_PSL['metatags']['object'] = $xsiteobject;
--- 84,88 ----
$ary['section'] = "Admin";
! // $breadcrumb = breadcrumb($ary);
$_PSL['metatags']['object'] = $xsiteobject;
Index: pollAdmin.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/admin/pollAdmin.php3,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** pollAdmin.php3 18 Jun 2002 16:39:52 -0000 1.9
--- pollAdmin.php3 10 Sep 2002 21:09:50 -0000 1.10
***************
*** 24,27 ****
--- 24,38 ----
$content = '';
+ if(!empty($HTTP_POST_VARS['submit'])) {
+ $submit = $HTTP_POST_VARS['submit'];
+ $question_id = $HTTP_POST_VARS['question_id'];
+ } elseif (!empty($HTTP_GET_VARS['submit'])) {
+ $submit = $HTTP_GET_VARS['submit'];
+ $question_id = $HTTP_GET_VARS['question_id'];
+ $min = $HTTP_GET_VARS['min'];
+ } else {
+ $submit = '';
+ }
+
switch ($submit) {
case "edit":
***************
*** 71,75 ****
$ary['section'] = "Admin";
! $breadcrumb = breadcrumb($ary);
$_PSL['metatags']['object'] = $xsiteobject;
--- 82,86 ----
$ary['section'] = "Admin";
! // $breadcrumb = breadcrumb($ary);
$_PSL['metatags']['object'] = $xsiteobject;
Index: sectionAdmin.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/admin/sectionAdmin.php3,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** sectionAdmin.php3 14 Jun 2002 20:25:32 -0000 1.5
--- sectionAdmin.php3 10 Sep 2002 21:09:50 -0000 1.6
***************
*** 29,33 ****
$section = new Section;
! $ary = '';
if ($perm->have_perm("sectionList")) {
--- 29,40 ----
$section = new Section;
! if(!empty($HTTP_POST_VARS['submit'])) {
! $submit = $HTTP_POST_VARS['submit'];
! } elseif (!empty($HTTP_GET_VARS['submit'])) {
! $submit = $HTTP_GET_VARS['submit'];
! $section_id = $HTTP_GET_VARS['section_id'];
! } else {
! $submit = '';
! }
if ($perm->have_perm("sectionList")) {
***************
*** 74,81 ****
}
$block = new Block_i;
$ary['section'] = "Admin";
! $breadcrumb = breadcrumb($ary);
$_PSL['metatags']['object'] = $xsiteobject;
--- 81,91 ----
}
+
+ $ary = '';
+
$block = new Block_i;
$ary['section'] = "Admin";
! // $breadcrumb = breadcrumb($ary);
$_PSL['metatags']['object'] = $xsiteobject;
Index: storyAdmin.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/admin/storyAdmin.php3,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** storyAdmin.php3 13 Jun 2002 20:03:44 -0000 1.11
--- storyAdmin.php3 10 Sep 2002 21:09:50 -0000 1.12
***************
*** 13,19 ****
*****************************/
! $ary['author_id'] = $author_id;
! $ary['topic_id'] = $topic_id;
! $ary['section_id'] = $section_id;
$auth->login_if(!$perm->have_perm('storyList'));
--- 13,27 ----
*****************************/
!
! if(!empty($HTTP_POST_VARS['submit'])) {
! $submit = $HTTP_POST_VARS['submit'];
! } elseif (!empty($HTTP_GET_VARS['submit'])) {
! $submit = $HTTP_GET_VARS['submit'];
! $story_id = $HTTP_GET_VARS['story_id'];
! $next =$HTTP_GET_VARS['next'];
! $ary = $HTTP_GET_VARS;
! } else {
! $submit = '';
! }
$auth->login_if(!$perm->have_perm('storyList'));
***************
*** 23,26 ****
--- 31,35 ----
$story = new Story_admin;
+
if ($perm->have_perm("storyList")) {
***************
*** 98,102 ****
$ary['section'] = "Admin";
! $breadcrumb = breadcrumb($ary);
$_PSL['metatags']['object'] = $xsiteobject;
--- 107,111 ----
$ary['section'] = "Admin";
! // $breadcrumb = breadcrumb($ary);
$_PSL['metatags']['object'] = $xsiteobject;
Index: submissionAdmin.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/admin/submissionAdmin.php3,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** submissionAdmin.php3 17 Jun 2002 15:31:19 -0000 1.7
--- submissionAdmin.php3 10 Sep 2002 21:09:50 -0000 1.8
***************
*** 30,33 ****
--- 30,45 ----
$submission = new Submission;
+ if(!empty($HTTP_POST_VARS['submit'])) {
+ $submit = $HTTP_POST_VARS['submit'];
+ $submission_id_ary = $HTTP_POST_VARS['submission_id_ary'];
+
+ } elseif (!empty($HTTP_GET_VARS['submit'])) {
+ $submit = $HTTP_GET_VARS['submit'];
+ $submission_id = $HTTP_GET_VARS['submission_id'];
+ $next = $HTTP_GET_VARS['next'];
+ } else {
+ $submit = '';
+ }
+
if ($perm->have_perm("submissionEdit")) {
***************
*** 121,128 ****
}
$block = new Block_i;
$ary['section'] = "Admin";
! $breadcrumb = breadcrumb($ary);
$_PSL['metatags']['object'] = $xsiteobject;
--- 133,142 ----
}
+ $ary = '';
+
$block = new Block_i;
$ary['section'] = "Admin";
! // $breadcrumb = breadcrumb($ary);
$_PSL['metatags']['object'] = $xsiteobject;
Index: topicAdmin.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/admin/topicAdmin.php3,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** topicAdmin.php3 12 Jun 2002 18:07:57 -0000 1.4
--- topicAdmin.php3 10 Sep 2002 21:09:50 -0000 1.5
***************
*** 32,35 ****
--- 32,44 ----
$content = '';
+ if(!empty($HTTP_POST_VARS['submit'])) {
+ $submit = $HTTP_POST_VARS['submit'];
+ } elseif (!empty($HTTP_GET_VARS['submit'])) {
+ $submit = $HTTP_GET_VARS['submit'];
+ $topic_id = $HTTP_GET_VARS['topic_id'];
+ $option = $HTTP_GET_VARS['option'];
+ } else {
+ $submit = '';
+ }
if ($perm->have_perm("topicList")) {
***************
*** 84,91 ****
}
$block = new Block_i;
$ary['section'] = "Admin";
! $breadcrumb = breadcrumb($ary);
$_PSL['metatags']['object'] = $xsiteobject;
--- 93,102 ----
}
+ $ary = '';
+
$block = new Block_i;
$ary['section'] = "Admin";
! // $breadcrumb = breadcrumb($ary);
$_PSL['metatags']['object'] = $xsiteobject;
Index: variableAdmin.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/admin/variableAdmin.php3,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** variableAdmin.php3 18 Jun 2002 18:03:25 -0000 1.4
--- variableAdmin.php3 10 Sep 2002 21:09:50 -0000 1.5
***************
*** 28,31 ****
--- 28,45 ----
$content .= '';
+ if(!empty($HTTP_POST_VARS['submit'])) {
+ $submit = $HTTP_POST_VARS['submit'];
+ $variable_ary = $HTTP_POST_VARS['variable_ary'];
+ $variable_name = $HTTP_POST_VARS['variable_name'];
+ $variable_id = $HTTP_POST_VARS['variable_id'];
+ $description = $HTTP_POST_VARS['description'];
+ $variable_value = $HTTP_POST_VARS['variable_value'];
+ $variable_group = $HTTP_POST_VARS['variable_group'];
+ } elseif (!empty($HTTP_GET_VARS['submit'])) {
+ $submit = $HTTP_GET_VARS['submit'];
+ } else {
+ $submit = '';
+ }
+
if ($perm->have_perm("variableList")) {
switch ($submit) {
***************
*** 77,84 ****
}
$block = new Block_i;
$ary['section'] = "Admin";
! $breadcrumb = breadcrumb($ary);
$_PSL['metatags']['object'] = $xsiteobject;
--- 91,100 ----
}
+ $ary = '';
+
$block = new Block_i;
$ary['section'] = "Admin";
! // $breadcrumb = breadcrumb($ary);
$_PSL['metatags']['object'] = $xsiteobject;
|
|
From: Joe S. <joe...@us...> - 2002-09-10 21:09:52
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv6968/phpslash-ft/class
Modified Files:
Comment.class
Log Message:
admin script register_globals
Index: Comment.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Comment.class,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** Comment.class 3 Sep 2002 15:04:35 -0000 1.29
--- Comment.class 10 Sep 2002 21:09:50 -0000 1.30
***************
*** 112,116 ****
subject,
comment_text,
! date_format(date,\"%W, %M %d \@%h:%i%p\") AS time
UNIX_TIMESTAMP(date) AS timestamp
FROM psl_comment
--- 112,116 ----
subject,
comment_text,
! date_format(date,\"%W, %M %d \@%h:%i%p\") AS time,
UNIX_TIMESTAMP(date) AS timestamp
FROM psl_comment
|
|
From: Joe S. <joe...@us...> - 2002-09-10 21:09:52
|
Update of /cvsroot/phpslash/phpslash-ft/contrib
In directory usw-pr-cvs1:/tmp/cvs-serv6968/phpslash-ft/contrib
Added Files:
tz_test_basic.php3
Log Message:
admin script register_globals
--- NEW FILE: tz_test_basic.php3 ---
<?php
$fmt = "%A %B %e, %Y, %r %Z\n";
// set the time zone
tz_select('America/Los_Angeles');
echo get_class($_TZ['obj']);
?>
<?php
// now
echo tz_strftime($fmt,time());
?>
<?php
// when do we spring forward?
$t = gmmktime(9,59,59,4,7,2002);
echo tz_strftime($fmt,$t);
echo tz_strftime($fmt,++$t);
?>
<?php
// and fall back?
$t = gmmktime(8,59,59,10,27,2002);
echo tz_strftime($fmt,$t);
echo tz_strftime($fmt,++$t);
?>
<?php
// set the time zone again, this time with a string
tz_select('FST+3FDT,M4.1.0,M10.5.0');
echo get_class($_TZ['obj']);
?>
<?php
// now
echo tz_strftime($fmt,time());
?>
<?php
// when do we spring forward?
$t = gmmktime(4,59,59,4,7,2002);
echo tz_strftime($fmt,$t);
echo tz_strftime($fmt,++$t);
?>
<?php
// and fall back?
$t = gmmktime(3,59,59,10,27,2002);
echo tz_strftime($fmt,$t);
echo tz_strftime($fmt,++$t);
?>
|
|
From: Joe S. <joe...@us...> - 2002-09-10 21:09:52
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv6968/phpslash-ft Modified Files: CHANGES Log Message: admin script register_globals Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.548 retrieving revision 1.549 diff -C2 -d -r1.548 -r1.549 *** CHANGES 5 Sep 2002 00:41:56 -0000 1.548 --- CHANGES 10 Sep 2002 21:09:49 -0000 1.549 *************** *** 13,16 **** --- 13,22 ---- 9 - Removal of something (kill -9 :) + 2002-September-10 3:30PM CDT Joe Stewart <joe...@us...> + [B] - Comment.class - comma typo. + [W] - register_globals off should work for all admin files now. All scripts + in admin directory affected. + tz_test_basic.php3 wasn't added to contrib directory previously. + 2002-September-4 2:30PM CDT Joe Stewart <joe...@us...> [BT] - backendWml.tpl - removed carriage return. |
|
From: Joe S. <joe...@us...> - 2002-09-05 00:42:00
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basic In directory usw-pr-cvs1:/tmp/cvs-serv10180/phpslash-ft/public_html/templates/en/basic Modified Files: backendWml.tpl Log Message: bugfix [ 603504 ] and [ 558987 ] Index: backendWml.tpl =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basic/backendWml.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** backendWml.tpl 9 Apr 2002 16:53:34 -0000 1.1 --- backendWml.tpl 5 Sep 2002 00:41:57 -0000 1.2 *************** *** 1,5 **** <?xml version="1.0"?> ! <!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN" "http://www.wapforum.org/DTD ! /wml_1.1.xml"> <wml> <card id="nifcard" title="{SITE_NAME}"> --- 1,4 ---- <?xml version="1.0"?> ! <!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN" "http://www.wapforum.org/DTD/wml_1.1.xml"> <wml> <card id="nifcard" title="{SITE_NAME}"> |
|
From: Joe S. <joe...@us...> - 2002-09-05 00:42:00
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default In directory usw-pr-cvs1:/tmp/cvs-serv10180/phpslash-ft/public_html/templates/en/default Modified Files: backendWml.tpl Log Message: bugfix [ 603504 ] and [ 558987 ] Index: backendWml.tpl =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default/backendWml.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** backendWml.tpl 2 May 2001 21:28:12 -0000 1.1 --- backendWml.tpl 5 Sep 2002 00:41:57 -0000 1.2 *************** *** 1,5 **** <?xml version="1.0"?> ! <!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN" "http://www.wapforum.org/DTD ! /wml_1.1.xml"> <wml> <card id="nifcard" title="{SITE_NAME}"> --- 1,4 ---- <?xml version="1.0"?> ! <!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN" "http://www.wapforum.org/DTD/wml_1.1.xml"> <wml> <card id="nifcard" title="{SITE_NAME}"> |
|
From: Joe S. <joe...@us...> - 2002-09-05 00:42:00
|
Update of /cvsroot/phpslash/phpslash-ft/public_html
In directory usw-pr-cvs1:/tmp/cvs-serv10180/phpslash-ft/public_html
Modified Files:
backend.php3
Log Message:
bugfix [ 603504 ] and [ 558987 ]
Index: backend.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/backend.php3,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** backend.php3 23 Mar 2002 14:12:28 -0000 1.29
--- backend.php3 5 Sep 2002 00:41:57 -0000 1.30
***************
*** 155,159 ****
case 'l':
$description = $_PSL['site_name'] . ' - ';
! $description .= htmlspecialchars(strip_tags($stories[$i]["intro_text"]));
// $description .= format_mail(eregi_replace("<([font][^>]*)>", "",$stories[$i]["intro_text"]),"80", "scrub");
break;
--- 155,159 ----
case 'l':
$description = $_PSL['site_name'] . ' - ';
! $description .= htmlentities(strip_tags($stories[$i]["intro_text"]));
// $description .= format_mail(eregi_replace("<([font][^>]*)>", "",$stories[$i]["intro_text"]),"80", "scrub");
break;
***************
*** 161,175 ****
case '1':
default:
! $description = htmlspecialchars(strip_tags($stories[$i]["intro_text"]));
// $description = format_mail(eregi_replace("<([font][^>]*)>", "",$stories[$i]["intro_text"]),"80", "scrub");
break;
}
$template->set_var(array(
'STORY_ID' => $stories[$i]['story_id'],
! 'TITLE' => htmlspecialchars($stories[$i]['title']),
'INTRO_TEXT' => $description,
'IDX' => $i,
! 'DATEF' => $stories[$i]['datef']
));
--- 161,178 ----
case '1':
default:
! $description = htmlentities(strip_tags($stories[$i]["intro_text"]));
// $description = format_mail(eregi_replace("<([font][^>]*)>", "",$stories[$i]["intro_text"]),"80", "scrub");
break;
}
+
+
$template->set_var(array(
'STORY_ID' => $stories[$i]['story_id'],
! 'TITLE' => htmlentities($stories[$i]['title']),
'INTRO_TEXT' => $description,
'IDX' => $i,
! 'DATEF' => $stories[$i]['datef'],
! 'LINK' => $_PSL['rooturl'] . '/article.php3?story_id=' . $stories[$i][story_id]
));
|
|
From: Joe S. <joe...@us...> - 2002-09-05 00:42:00
|
Update of /cvsroot/phpslash/phpslash-ft/doc/html
In directory usw-pr-cvs1:/tmp/cvs-serv10180/phpslash-ft/doc/html
Modified Files:
phpslash.sgml
Log Message:
bugfix [ 603504 ] and [ 558987 ]
Index: phpslash.sgml
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/doc/html/phpslash.sgml,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** phpslash.sgml 3 Sep 2002 15:13:36 -0000 1.51
--- phpslash.sgml 5 Sep 2002 00:41:57 -0000 1.52
***************
*** 771,774 ****
--- 771,775 ----
authorNew.tpl
authorProfile.tpl
+ backendWml.tpl
blockEdit.tpl
blockList.tpl
|
|
From: Joe S. <joe...@us...> - 2002-09-05 00:41:59
|
Update of /cvsroot/phpslash/phpslash-ft
In directory usw-pr-cvs1:/tmp/cvs-serv10180/phpslash-ft
Modified Files:
CHANGES
Log Message:
bugfix [ 603504 ] and [ 558987 ]
Index: CHANGES
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v
retrieving revision 1.547
retrieving revision 1.548
diff -C2 -d -r1.547 -r1.548
*** CHANGES 3 Sep 2002 19:52:57 -0000 1.547
--- CHANGES 5 Sep 2002 00:41:56 -0000 1.548
***************
*** 13,16 ****
--- 13,22 ----
9 - Removal of something (kill -9 :)
+ 2002-September-4 2:30PM CDT Joe Stewart <joe...@us...>
+ [BT] - backendWml.tpl - removed carriage return.
+ backend.php3 - added LINK placeholder per Feature Request [ 558987 ]
+ Generalized XML/RSS/HTML output. Changed use of htmlspecialchars to
+ htmlentities to clear bug report [ 603504 ] backend.php3 tricks IE.
+
2002-September-3 2:30PM CDT Joe Stewart <joe...@us...>
[W] - Will Dyson's implementation of a base class for the block classes.
***************
*** 26,30 ****
2002-September-3 9:00AM CDT Joe Stewart <joe...@us...>
! [F] - Matthew Leingang's implementation of Site-wide date formats and TIMEZONES. Patch [ 580757 ] Site-wide date formats and TIMEZONES! and
Feature Request [ 513262 ] Consistent date/time formatting.
Affected files - Comment.class, Poll.class, Story_admin.class,
--- 32,36 ----
2002-September-3 9:00AM CDT Joe Stewart <joe...@us...>
! [FT] - Matthew Leingang's implementation of Site-wide date formats and TIMEZONES. Patch [ 580757 ] Site-wide date formats and TIMEZONES! and
Feature Request [ 513262 ] Consistent date/time formatting.
Affected files - Comment.class, Poll.class, Story_admin.class,
|
|
From: Joe S. <joe...@us...> - 2002-09-03 20:01:06
|
Update of /cvsroot/phpslash/phpslash-ft/class In directory usw-pr-cvs1:/tmp/cvs-serv32531/phpslash-ft/class Modified Files: Block_render_topic.class Log Message: Patches [ 565744 ] and [ 565749 ] Base class for Block_render_foo Index: Block_render_topic.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_topic.class,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Block_render_topic.class 3 Sep 2002 19:54:40 -0000 1.9 --- Block_render_topic.class 3 Sep 2002 20:01:03 -0000 1.10 *************** *** 2,6 **** /* Block_render_topic.class -> Methods for phpslash specfic blocks */ ! /* Id:$ */ /* pass the query in the "Source Url" form field in the format of: --- 2,6 ---- /* Block_render_topic.class -> Methods for phpslash specfic blocks */ ! /* $Id$ */ /* pass the query in the "Source Url" form field in the format of: |
|
From: Joe S. <joe...@us...> - 2002-09-03 20:00:19
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv32192/phpslash-ft/class
Modified Files:
Block_render_url.class
Log Message:
Patches [ 565744 ] and [ 565749 ] Base class for Block_render_foo
Index: Block_render_url.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_url.class,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Block_render_url.class 3 Sep 2002 19:54:40 -0000 1.3
--- Block_render_url.class 3 Sep 2002 20:00:09 -0000 1.4
***************
*** 2,6 ****
/* Block_render_url.class -> Methods for phpslash specfic blocks */
! /* Id:$ */
class Block_render_url extends Block_render_i {
--- 2,6 ----
/* Block_render_url.class -> Methods for phpslash specfic blocks */
! /* $Id$ */
class Block_render_url extends Block_render_i {
|
|
From: Joe S. <joe...@us...> - 2002-09-03 19:56:50
|
Update of /cvsroot/phpslash/phpslash-ft/class In directory usw-pr-cvs1:/tmp/cvs-serv31019/phpslash-ft/class Modified Files: Block_render_i.class Log Message: Patches [ 565744 ] and [ 565749 ] Base class for Block_render_foo Index: Block_render_i.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_i.class,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Block_render_i.class 3 Sep 2002 19:52:57 -0000 1.1 --- Block_render_i.class 3 Sep 2002 19:56:47 -0000 1.2 *************** *** 1,4 **** --- 1,5 ---- <?php /* Block_render_skel.class -> Base class for block renderers */ + /* $Id$ */ /** |
|
From: Joe S. <joe...@us...> - 2002-09-03 19:54:44
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv30230/phpslash-ft/class
Modified Files:
Block_render_quote.class Block_render_rss.class
Block_render_section.class Block_render_skin.class
Block_render_submission.class Block_render_topic.class
Block_render_url.class
Log Message:
Patches [ 565744 ] and [ 565749 ] Base class for Block_render_foo
Index: Block_render_quote.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_quote.class,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Block_render_quote.class 28 Apr 2002 01:32:39 -0000 1.5
--- Block_render_quote.class 3 Sep 2002 19:54:40 -0000 1.6
***************
*** 4,25 ****
/* $Id$ */
- class Block_render_quote {
-
- var $type;
- var $output;
- var $psl;
/* constructor */
function Block_render_quote() {
! global $_PSL;
!
$this->type = 'quote'; // set the 'type'
! $this->output = ''; // clear the output
! $this->psl = $_PSL;
! }
!
! /* returns the TYPE of this class */
! function getType() {
! return $this->type;
}
--- 4,16 ----
/* $Id$ */
+ class Block_render_quote extends Block_render_i {
+
/* constructor */
function Block_render_quote() {
! $this->Block_render_i();
!
$this->type = 'quote'; // set the 'type'
! $this->description = 'A block that shows a random quote';
}
***************
*** 82,90 ****
}
-
- function getFinal() {
- return $this->output;
- }
-
}
--- 73,76 ----
Index: Block_render_rss.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_rss.class,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Block_render_rss.class 20 Jun 2002 16:34:45 -0000 1.10
--- Block_render_rss.class 3 Sep 2002 19:54:40 -0000 1.11
***************
*** 296,314 ****
*/
! class Block_render_rss {
! /**
! * Blcok type = "rss"
! * @access public
! */
! var $type;
! /**
! * Output
! * @access public
! */
! var $output;
! /**
! * rdfparser object
! * @access private
! */
var $rdf;
--- 296,304 ----
*/
! class Block_render_rss extends Block_render_i {
! /**
! * rdfparser object
! * @access private
! */
var $rdf;
***************
*** 317,337 ****
*/
function Block_render_rss() {
! global $_PSL;
!
! $this->type = "rss"; /* set the 'type' */
! $this->output = ""; /* clear the output */
$this->rdf = new rdfparser;
! $this->psl = $_PSL;
! }
!
! /**
! * returns the TYPE of this class
! * @return string
! */
! function getType() {
! return $this->type;
}
-
/**
* Generates and stores html code
--- 307,317 ----
*/
function Block_render_rss() {
! $this->Block_render_i();
$this->rdf = new rdfparser;
!
! $this->type = "rss"; /* set the 'type' */
! $this->description = "A block that displays the headlines from another site, generated from their RDF file";
}
/**
* Generates and stores html code
***************
*** 516,527 ****
}
- }
-
- /**
- * Returns output
- * @return htmlstring
- */
- function getFinal() {
- return $this->output;
}
--- 496,499 ----
Index: Block_render_section.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_section.class,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Block_render_section.class 9 Jul 2002 18:14:25 -0000 1.10
--- Block_render_section.class 3 Sep 2002 19:54:40 -0000 1.11
***************
*** 20,24 ****
! class Block_render_section {
/*
--- 20,24 ----
! class Block_render_section extends Block_render_i {
/*
***************
*** 33,51 ****
*/
function Block_render_section() {
! global $_PSL;
!
$this->type = 'section'; /* set the 'type' */
! $this->output = ''; /* clear the output */
! $this->psl = $_PSL;
!
! }
!
! /**
! * returns the TYPE of this class
! *@return string
! *@access public
! */
! function getType() {
! return $this->type;
}
--- 33,40 ----
*/
function Block_render_section() {
! $this->Block_render_i();
!
$this->type = 'section'; /* set the 'type' */
! $this->description = "A block that displays links to all sections which contain stories";
}
***************
*** 151,166 ****
}
- /**
- * Returns the html for display
- *
- * Requires that parse() has already been called.
- *
- *@return htmlstring
- *@access public
- */
- function getFinal() {
- return $this->output;
- }
-
}
--- 140,143 ----
Index: Block_render_skin.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_skin.class,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Block_render_skin.class 30 May 2002 16:00:17 -0000 1.6
--- Block_render_skin.class 3 Sep 2002 19:54:40 -0000 1.7
***************
*** 2,6 ****
/* Block_render_skin.class -> Methods for phpslash skin blocks */
! /* Id:$ */
/**
--- 2,6 ----
/* Block_render_skin.class -> Methods for phpslash skin blocks */
! /* $Id$ */
/**
***************
*** 16,37 ****
! class Block_render_skin {
! var $type;
! var $output;
!
! /* constructor */
function Block_render_skin() {
!
! global $_PSL;
!
! $this->type = "skin"; /* set the 'type' */
! $this->output = ""; /* clear the output */
! $this->psl = $_PSL;
! }
!
! /* returns the TYPE of this class */
! function getType() {
! return $this->type;
}
--- 16,27 ----
! class Block_render_skin extends Block_render_i {
! // constructor
function Block_render_skin() {
! $this->Block_render_i();
!
! $this->type = 'skin'; // set the 'type'
! $this->description = 'A block that contains links to all the available skins';
}
***************
*** 112,119 ****
return $output;
- }
-
- function getFinal() {
- return $this->output;
}
--- 102,105 ----
Index: Block_render_submission.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_submission.class,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Block_render_submission.class 20 May 2002 17:52:47 -0000 1.1
--- Block_render_submission.class 3 Sep 2002 19:54:40 -0000 1.2
***************
*** 2,29 ****
/* Block_render_submission.class -> Methods for phpslash submission blocks */
! /* Id:$ */
/* These should only be displayed to logged in admin's with Submission perms.
*/
! class Block_render_submission {
- var $type;
- var $output;
- var $psl;
-
/* constructor */
function Block_render_submission() {
! global $_PSL;
$this->type = "submission"; /* set the 'type' */
! $this->output = ""; /* clear the output */
! $this->psl = $_PSL;
!
! }
!
! /* returns the TYPE of this class */
! function getType() {
! return $this->type;
}
--- 2,18 ----
/* Block_render_submission.class -> Methods for phpslash submission blocks */
! /* $Id$ */
/* These should only be displayed to logged in admin's with Submission perms.
*/
! class Block_render_submission extends Block_render_i {
/* constructor */
function Block_render_submission() {
! $this->Block_render_i();
$this->type = "submission"; /* set the 'type' */
! $this->description = "Block that displays stories that have been submitted for aproval. Should only be displayed to admins with Submission perms";
}
***************
*** 118,126 ****
return $submissions;
}
-
- function getFinal() {
- return $this->output;
- }
-
}
--- 107,110 ----
Index: Block_render_topic.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_topic.class,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Block_render_topic.class 27 Apr 2002 20:31:10 -0000 1.8
--- Block_render_topic.class 3 Sep 2002 19:54:40 -0000 1.9
***************
*** 16,39 ****
*/
! class Block_render_topic {
- var $type;
- var $output;
- var $psl;
-
/* constructor */
function Block_render_topic() {
!
! global $_PSL;
$this->type = "topic"; /* set the 'type' */
! $this->output = ""; /* clear the output */
! $this->psl = $_PSL;
!
! }
!
! /* returns the TYPE of this class */
! function getType() {
! return $this->type;
}
--- 16,27 ----
*/
! class Block_render_topic extends Block_render_i {
/* constructor */
function Block_render_topic() {
! $this->Block_render_i();
$this->type = "topic"; /* set the 'type' */
! $this->description = "A block that displays the topics in a section";
}
***************
*** 149,157 ****
}
-
- function getFinal() {
- return $this->output;
- }
-
}
--- 137,140 ----
Index: Block_render_url.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_url.class,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Block_render_url.class 20 Jun 2002 16:34:45 -0000 1.2
--- Block_render_url.class 3 Sep 2002 19:54:40 -0000 1.3
***************
*** 4,23 ****
/* Id:$ */
! class Block_render_url {
!
! var $type;
! var $output;
! /* constructor */
function Block_render_url() {
$this->type = "url"; /* set the 'type' */
! $this->output = ""; /* clear the output */
!
! }
!
! /* returns the TYPE of this class */
! function getType() {
! return $this->type;
}
--- 4,15 ----
/* Id:$ */
! class Block_render_url extends Block_render_i {
! // constructor
function Block_render_url() {
+ $this->Block_render_i();
$this->type = "url"; /* set the 'type' */
! $this->description = "A block that displays the HTML returned from the source URL";
}
***************
*** 61,69 ****
return true;
}
-
- function getFinal() {
- return $this->output;
- }
-
}
--- 53,56 ----
|
|
From: Joe S. <joe...@us...> - 2002-09-03 19:53:00
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv29542/phpslash-ft/class
Modified Files:
Block_render_cal.class Block_render_html.class
Block_render_login.class Block_render_navbar.class
Block_render_poll.class Block_render_query.class
Added Files:
Block_render_i.class
Log Message:
Patches [ 565744 ] and [ 565749 ] Base class for Block_render_foo
--- NEW FILE: Block_render_i.class ---
<?php
/* Block_render_skel.class -> Base class for block renderers */
/**
* Class that defines the interface to block renderers and implements
* common functionality
*
* @access public
* @author Will Dyson, June 2002
* @package phpslash
*/
class Block_render_i {
var $psl;
var $type;
var $description;
var $options;
var $output;
function Block_render_i() {
global $_PSL;
$this->psl = $_PSL;
$this->output = "";
$this->type = "";
$this->description = "No description";
$this->options = array(
"column" => "Which of the three columns this block should display in (required: left, center, right)",
"width" => "Width in pixels or percent (default: 100%)",
"box_type" => "Alternate box template. When box_type is foo, foobox.tpl is used (default: fancy)",
"perms" => "Permissions required to view block (default: any)",
);
}
function getType() {
return $this->type;
}
function getDesc() {
return $this->description;
}
function getOpts() {
return $this->options;
}
// should never actually be called
function parse($block_info) {
return 0;
}
function getFinal() {
return $this->output;
}
}
?>
Index: Block_render_cal.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_cal.class,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Block_render_cal.class 9 Jul 2002 19:48:46 -0000 1.7
--- Block_render_cal.class 3 Sep 2002 19:52:57 -0000 1.8
***************
*** 2,25 ****
/* Block_render_cal.class -> Methods for phpslash specfic blocks */
! /* Id:$ */
- class Block_render_cal {
! var $type;
! var $output;
! var $psl;
/* constructor */
function Block_render_cal() {
! global $_PSL;
!
$this->type = 'cal'; /* set the 'type' */
! $this->output = ''; /* clear the output */
! $this->psl = $_PSL;
! }
!
! /* returns the TYPE of this class */
! function getType() {
! return $this->type;
}
--- 2,16 ----
/* Block_render_cal.class -> Methods for phpslash specfic blocks */
! /* $Id$ */
! class Block_render_cal extends Block_render_i {
/* constructor */
function Block_render_cal() {
! $this->Block_render_i();
!
$this->type = 'cal'; /* set the 'type' */
! $this->description = 'A block that contains a calender, with links to all the stories posted each partiuclar day';
}
***************
*** 124,132 ****
unset($cal_q);
}
!
! function getFinal() {
! return $this->output;
! }
!
function getTitle() {
$montharray=array( "", "January", "February", "March", "April", "May", "June","July", "August", "September", "October", "November", "December");
--- 115,119 ----
unset($cal_q);
}
!
function getTitle() {
$montharray=array( "", "January", "February", "March", "April", "May", "June","July", "August", "September", "October", "November", "December");
Index: Block_render_html.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_html.class,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Block_render_html.class 5 Mar 2002 16:50:57 -0000 1.2
--- Block_render_html.class 3 Sep 2002 19:52:57 -0000 1.3
***************
*** 2,23 ****
/* Block_render_html.class -> Methods for phpslash specfic blocks */
! /* Id:$ */
- class Block_render_html {
! var $type;
! var $output;
/* constructor */
function Block_render_html() {
!
$this->type = "html"; /* set the 'type' */
! $this->output = ""; /* clear the output */
!
! }
!
! /* returns the TYPE of this class */
! function getType() {
! return $this->type;
}
--- 2,16 ----
/* Block_render_html.class -> Methods for phpslash specfic blocks */
! /* $Id$ */
! class Block_render_html extends Block_render_i {
/* constructor */
function Block_render_html() {
! $this->Block_render_i();
!
$this->type = "html"; /* set the 'type' */
! $this->description = "A block that displays HTML you specify";
}
***************
*** 43,51 ****
}
-
- function getFinal() {
- return $this->output;
- }
-
}
--- 36,39 ----
Index: Block_render_login.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_login.class,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Block_render_login.class 9 Jul 2002 19:48:46 -0000 1.2
--- Block_render_login.class 3 Sep 2002 19:52:57 -0000 1.3
***************
*** 4,31 ****
/* $Id$ */
! class Block_render_login {
- var $type;
- var $output;
var $auth;
var $perm;
- var $psl;
/* constructor */
function Block_render_login() {
!
! global $auth, $perm, $_PSL;
- $this->type = "login"; /* set the 'type' */
- $this->output = ""; /* clear the output */
$this->auth = $auth;
$this->perm = $perm;
- $this->psl = $_PSL;
! }
!
! /* returns the TYPE of this class */
! function getType() {
! return $this->type;
}
--- 4,23 ----
/* $Id$ */
! class Block_render_login extends Block_render_i {
var $auth;
var $perm;
/* constructor */
function Block_render_login() {
! global $auth, $perm;
!
! $this->Block_render_i();
$this->auth = $auth;
$this->perm = $perm;
! $this->type = "login"; /* set the 'type' */
! $this->description = "A block that contains forms for username and password, so that users can login";
}
***************
*** 80,87 ****
return $output;
- }
-
- function getFinal() {
- return $this->output;
}
--- 72,75 ----
Index: Block_render_navbar.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_navbar.class,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Block_render_navbar.class 20 May 2002 16:07:29 -0000 1.1
--- Block_render_navbar.class 3 Sep 2002 19:52:57 -0000 1.2
***************
*** 4,27 ****
/* $Id$ */
! class Block_render_navbar {
!
! var $type;
! var $output;
! var $psl;
/* constructor */
function Block_render_navbar() {
!
! global $_PSL;
!
$this->type = "navbar"; /* set the 'type' */
! $this->output = ""; /* clear the output */
! $this->psl = $_PSL;
!
! }
!
! /* returns the TYPE of this class */
! function getType() {
! return $this->type;
}
--- 4,15 ----
/* $Id$ */
! class Block_render_navbar extends Block_render_i {
/* constructor */
function Block_render_navbar() {
! $this->Block_render_i();
!
$this->type = "navbar"; /* set the 'type' */
! $this->description = "A block that contains all the links from the navbar that is normally at the top and bottom of each page";
}
***************
*** 46,52 ****
}
- function getFinal() {
- return $this->output;
- }
function getTitle($string = ""){
if (empty($string)) {
--- 34,37 ----
Index: Block_render_poll.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_poll.class,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Block_render_poll.class 5 Mar 2002 16:50:57 -0000 1.3
--- Block_render_poll.class 3 Sep 2002 19:52:57 -0000 1.4
***************
*** 2,26 ****
/* Block_render_poll.class -> Methods for phpslash specfic blocks */
! /* Id:$ */
! class Block_render_poll {
- var $type;
- var $output;
var $poll;
!
/* constructor */
function Block_render_poll() {
!
$this->type = "poll"; /* set the 'type' */
! $this->output = ""; /* clear the output */
!
! }
!
! /* returns the TYPE of this class */
! function getType() {
! return $this->type;
}
function parse($block_info) {
--- 2,20 ----
/* Block_render_poll.class -> Methods for phpslash specfic blocks */
! /* $Id$ */
! class Block_render_poll extends Block_render_i {
var $poll;
!
/* constructor */
function Block_render_poll() {
! $this->Block_render_i();
!
$this->type = "poll"; /* set the 'type' */
! $this->description = "A block that displays a poll";
}
+
function parse($block_info) {
***************
*** 35,42 ****
$this->output = $this->poll->getPollBooth($question_id);
unset($this->poll);
- }
-
- function getFinal() {
- return $this->output;
}
--- 29,32 ----
Index: Block_render_query.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_query.class,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Block_render_query.class 27 Apr 2002 20:31:10 -0000 1.7
--- Block_render_query.class 3 Sep 2002 19:52:57 -0000 1.8
***************
*** 2,6 ****
/* Block_render_query.class -> Methods for phpslash specfic blocks */
! /* Id:$ */
/* pass the query in the "Source Url" form field in the format of:
--- 2,6 ----
/* Block_render_query.class -> Methods for phpslash specfic blocks */
! /* $Id$ */
/* pass the query in the "Source Url" form field in the format of:
***************
*** 23,46 ****
*/
! class Block_render_query {
!
! var $type;
! var $output;
! var $psl;
!
/* constructor */
function Block_render_query() {
!
! global $_PSL;
$this->type = 'query'; /* set the 'type' */
! $this->output = ''; /* clear the output */
! $this->psl = $_PSL;
!
! }
!
! /* returns the TYPE of this class */
! function getType() {
! return $this->type;
}
--- 23,34 ----
*/
! class Block_render_query extends Block_render_i {
!
/* constructor */
function Block_render_query() {
! $this->Block_render_i();
$this->type = 'query'; /* set the 'type' */
! $this->description = 'A block that shows the results of a query against the story database';
}
***************
*** 136,144 ****
}
-
- function getFinal() {
- return $this->output;
- }
-
}
--- 124,127 ----
|
|
From: Joe S. <joe...@us...> - 2002-09-03 19:53:00
|
Update of /cvsroot/phpslash/phpslash-ft/public_html
In directory usw-pr-cvs1:/tmp/cvs-serv29542/phpslash-ft/public_html
Modified Files:
config.php3
Log Message:
Patches [ 565744 ] and [ 565749 ] Base class for Block_render_foo
Index: config.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/config.php3,v
retrieving revision 1.148
retrieving revision 1.149
diff -C2 -d -r1.148 -r1.149
*** config.php3 3 Sep 2002 15:46:54 -0000 1.148
--- config.php3 3 Sep 2002 19:52:57 -0000 1.149
***************
*** 547,550 ****
--- 547,551 ----
require($_PSL['classdir'] . "/Block_i.class");
require($_PSL['classdir'] . "/Block_admin.class");
+ require($_PSL['classdir'] . "/Block_render_i.class");
}
|
|
From: Joe S. <joe...@us...> - 2002-09-03 19:53:00
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv29542/phpslash-ft Modified Files: CHANGES Log Message: Patches [ 565744 ] and [ 565749 ] Base class for Block_render_foo Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.546 retrieving revision 1.547 diff -C2 -d -r1.546 -r1.547 *** CHANGES 3 Sep 2002 15:04:34 -0000 1.546 --- CHANGES 3 Sep 2002 19:52:57 -0000 1.547 *************** *** 13,16 **** --- 13,28 ---- 9 - Removal of something (kill -9 :) + 2002-September-3 2:30PM CDT Joe Stewart <joe...@us...> + [W] - Will Dyson's implementation of a base class for the block classes. + Patches [ 565744 ] Base class for Block_render_foo and + [ 565749 ] Make Block_renderer_foo extend base clas. + Affected files - Block_render_cal.class, Block_render_quote.class + Block_render_html.class, Block_render_rss.class, Block_render_i.class, + Block_render_section.class, Block_render_login.class, + Block_render_skin.class, Block_render_navbar.class, + Block_render_submission.class, Block_render_poll.class, + Block_render_topic.class, Block_render_query.class, Block_render_url.class and config.php3 + + 2002-September-3 9:00AM CDT Joe Stewart <joe...@us...> [F] - Matthew Leingang's implementation of Site-wide date formats and TIMEZONES. Patch [ 580757 ] Site-wide date formats and TIMEZONES! and |
|
From: Joe S. <joe...@us...> - 2002-09-03 15:46:58
|
Update of /cvsroot/phpslash/phpslash-ft/public_html In directory usw-pr-cvs1:/tmp/cvs-serv32035/public_html Modified Files: config.php3 Log Message: [ 580757 ] Site-wide date formats and TIMEZONES tweak Index: config.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/config.php3,v retrieving revision 1.147 retrieving revision 1.148 diff -C2 -d -r1.147 -r1.148 *** config.php3 3 Sep 2002 15:18:40 -0000 1.147 --- config.php3 3 Sep 2002 15:46:54 -0000 1.148 *************** *** 208,218 **** $_PSL['locale']['LC_MESSAGES'] = 'en'; - //;; [TZ] - //;; Time Zone information. - //;; Set this variable if you want to override your server's time zone. - $_PSL['TZ'] = 'America/New_York'; - //;; Set this to the directory where your time zone information is kept - $_PSL['TZDIR'] = '/usr/share/zoneinfo'; - //[timezone] --- 208,211 ---- |
|
From: Joe S. <joe...@us...> - 2002-09-03 15:18:44
|
Update of /cvsroot/phpslash/phpslash-ft/public_html
In directory usw-pr-cvs1:/tmp/cvs-serv21010/public_html
Modified Files:
config.php3
Log Message:
[ 580757 ] Site-wide date formats and TIMEZONES
Index: config.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/config.php3,v
retrieving revision 1.146
retrieving revision 1.147
diff -C2 -d -r1.146 -r1.147
*** config.php3 9 Jul 2002 18:14:25 -0000 1.146
--- config.php3 3 Sep 2002 15:18:40 -0000 1.147
***************
*** 196,199 ****
--- 196,254 ----
$_PSL['block_optioncount'] = 4;
+ // [locale]
+
+ // ;; You can enter a locale name for any of the categories except LC_ALL.
+ // ;; For instance, LC_TIME is used for formatting of date and time strings
+
+ $_PSL['locale']['LC_TIME'] = 'en_US';
+
+ // ;; LC_MESSAGES could be used for translation of messages.
+ // ;; Currently, that's derived from $_PSL['language']
+
+ $_PSL['locale']['LC_MESSAGES'] = 'en';
+
+ //;; [TZ]
+ //;; Time Zone information.
+ //;; Set this variable if you want to override your server's time zone.
+ $_PSL['TZ'] = 'America/New_York';
+ //;; Set this to the directory where your time zone information is kept
+ $_PSL['TZDIR'] = '/usr/share/zoneinfo';
+
+ //[timezone]
+
+ //;; Set this to something true if you want times to be calculated in a different time zone.
+
+ $_PSL['timezone']['engine'] = true;
+
+ //;; Now you have to choose the implementation of time zones. If you are
+ //;; on a UNIX platform and can set environment variables, native is probably
+ //;; the implemention for you.
+
+ $_PSL['timezone']['native'] = true;
+
+ //;; Otherwise, you can use the time zone classes which interface the
+ //;; time zone database, if you have one. Specify the directory here (good
+ //;; to do even if you are using native time zones):
+
+ $_PSL['timezone']['dir'] = '/usr/share/zoneinfo';
+
+ //;; If you can't do that either, you are stuck specifying time zones as
+ //;; POSIX-compatible strings. In any case, you need to specify the
+ //;; server's default time zone. If you are using native timezones and
+ //;; want the default to be the actual server's setting, enter it this
+ //;; way (find the right path):
+
+ ;;$_PSL['timezone']['default'] = ':/etc/localtime';
+
+ //;; If you are not using native timezones, but are using the time zone
+ //;; database, specify a meaningful time zone name here. You can also use
+ //;; this to fake the server's time zone.
+
+ //;; $_PSL['timezone']['name'] = 'America/Chicago';
+
+ //;; Finally, if all you are able to do is specify a string, do it like this:
+
+ //;; $_PSL['timezone']['name'] = 'GMT+0BST,M4.1.0/1,M10.5.0/2';
+
// 1.2) Other PHPLIB things not already included. Comment out if this
// is something you've already delt with in prepend.php3
***************
*** 232,235 ****
--- 287,314 ----
$_PSL['templatedir'] = setSkinTpl("", "cookie");
}
+
+ if ($_PSL['timezone']['engine']) {
+ include($_PSL['classdir'] . '/tz.class');
+ include($_PSL['classdir'] . '/tz_env.class');
+ include($_PSL['classdir'] . '/tz_nonnative.class');
+ include($_PSL['classdir'] . '/tz_posix.class');
+ include($_PSL['classdir'] . '/tz_file.class');
+ include($_PSL['classdir'] . '/tz_functions.inc');
+ // set up the time zone environment array
+ $_TZ = $_PSL['timezone'];
+ $_TZ['templatedir'] = $_PSL['templatedir'];
+ $_TZ['show_format'] = psl_getLocalInfo('LC_TIME','%a %b %e %H:%M:%S %Z %Y');
+ /* $_TZ['available'] = array("America/New_York",
+ "America/Chicago",
+ "America/Denver",
+ "America/Los_Angeles",
+ "Pacific/Honolulu");
+ */
+ // to enable setting of time zone in URL
+ set_TZ($HTTP_GET_VARS['TZ'],'cookie');
+ // to disable setting in URL and to set $_PSL['timezone']['name'] as the time zone
+ // set_TZ();
+ }
+
// NavBar Menu Definitions
|
|
From: Joe S. <joe...@us...> - 2002-09-03 15:15:12
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv19643/class
Modified Files:
Poll.class
Log Message:
[ 580757 ] Site-wide date formats and TIMEZONES
Index: Poll.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Poll.class,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** Poll.class 17 Jun 2002 16:54:51 -0000 1.18
--- Poll.class 3 Sep 2002 15:15:09 -0000 1.19
***************
*** 546,550 ****
$q = "SELECT question_id,
question_text,
! date_format(date,\"%W %M %D\") AS polldate
FROM psl_poll_question
ORDER BY date DESC";
--- 546,551 ----
$q = "SELECT question_id,
question_text,
! date_format(date,\"%W %M %D\") AS polldate,
! UNIX_TIMESTAMP(date) AS polltimestamp
FROM psl_poll_question
ORDER BY date DESC";
***************
*** 570,574 ****
'QUESTION_ID' => $this->db->f('question_id'),
'QUESTION' => $this->db->f('question_text'),
! 'POLLDATE' => $this->db->f('polldate'),
'ID' => $thisid
));
--- 571,575 ----
'QUESTION_ID' => $this->db->f('question_id'),
'QUESTION' => $this->db->f('question_text'),
! 'POLLDATE' => psl_dateTimeShort($this->db->f('polltimestamp')),
'ID' => $thisid
));
|
|
From: Joe S. <joe...@us...> - 2002-09-03 15:13:39
|
Update of /cvsroot/phpslash/phpslash-ft/doc/html
In directory usw-pr-cvs1:/tmp/cvs-serv19146/doc/html
Modified Files:
phpslash.sgml
Log Message:
[ 580757 ] Site-wide date formats and TIMEZONES
Index: phpslash.sgml
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/doc/html/phpslash.sgml,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** phpslash.sgml 30 Jun 2002 14:13:59 -0000 1.50
--- phpslash.sgml 3 Sep 2002 15:13:36 -0000 1.51
***************
*** 803,806 ****
--- 803,810 ----
topicNew.tpl
topicsDisplay.tpl
+ tz_bench.tpl
+ tz_form_confirm.tpl
+ tz_form_posix.tpl
+ tz_show.tpl
variableList.tpl
variableNew.tpl
***************
*** 1506,1509 ****
--- 1510,1517 ----
topicsDisplay.tpl - list of all images in topics directory
topicsblock.tpl - format of quote block contents
+ tz_bench.tpl - timezone benchmark and tests.
+ tz_form_confirm.tpl - timezone select
+ tz_form_posix.tpl - timezone select
+ tz_show.tpl - timezone select
variableList.tpl - deprecated
variableNew.tpl - deprecated
|
|
From: Joe S. <joe...@us...> - 2002-09-03 15:13:16
|
Update of /cvsroot/phpslash/phpslash-ft/class/locale
In directory usw-pr-cvs1:/tmp/cvs-serv18975/locale
Added Files:
en_GB.LC_TIME.php3 en_US.LC_TIME.php3 fr.LC_TIME.php3
fr_FR.LC_TIME.php3
Log Message:
[ 580757 ] Site-wide date formats and TIMEZONES
--- NEW FILE: en_GB.LC_TIME.php3 ---
<?php
/**
* Local date/time information for PHPSlash (en_GB locale)
*
* $Id: en_GB.LC_TIME.php3,v 1.1 2002/09/03 15:13:13 joestewart Exp $
*/
$pslstrings = array('date_format_long'=>'%e %B %Y',
'date_format_short'=>'%d/%m/%Y',
'time_format_12'=>'%I:%M%p',
'time_format_24'=>'%H:%M',
'date_time_format_long'=>'%A %e %B %Y, %I:%M%p',
'date_time_format_short'=>'%d/%m/%Y, %I:%M%p'
);
?>
--- NEW FILE: en_US.LC_TIME.php3 ---
<?php
/**
* Local date/time information for PHPSlash (en_US locale)
*
* $Id: en_US.LC_TIME.php3,v 1.1 2002/09/03 15:13:13 joestewart Exp $
*/
$pslstrings = array('date_format_long'=>'%B %e, %Y',
'date_format_short'=>'%m/%d/%Y',
'time_format_12'=>'%I:%M%p',
'time_format_24'=>'%H:%M',
'date_time_format_long'=>'%A %B %e, %Y %I:%M%p',
'date_time_format_short'=>'%m/%d/%Y %H:%M'
);
?>
--- NEW FILE: fr.LC_TIME.php3 ---
<?php
/**
* Local date/time information for PHPSlash (fr locale)
*
* $Id: fr.LC_TIME.php3,v 1.1 2002/09/03 15:13:13 joestewart Exp $
*/
$pslstrings = array('date_format_long'=>'le %e %B %Y',
'date_format_short'=>'%d/%m/%Y',
'time_format_12'=>'%Ih%M%p',
'time_format_24'=>'%Hh%M',
'date_time_format_long'=>'le %B %e %Y %Ih%M%p'
);
?>
--- NEW FILE: fr_FR.LC_TIME.php3 ---
<?php
/**
* Local date/time information for PHPSlash (fr_FR locale)
*
* $Id: fr_FR.LC_TIME.php3,v 1.1 2002/09/03 15:13:13 joestewart Exp $
*/
$pslstrings = array('date_format_long'=>'le %e %B %Y',
'date_format_short'=>'%d.%m.%Y',
'time_format_12'=>'%Ih%M%p',
'time_format_24'=>'%Hh%M',
'date_time_format_long'=>'%A le %e %B %Y %Hh%M',
'date_time_format_short'=>'%d.%m.%Y %Hh%M'
);
?>
|
|
From: Joe S. <joe...@us...> - 2002-09-03 15:11:59
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basic
In directory usw-pr-cvs1:/tmp/cvs-serv18550/basic
Added Files:
tz_bench.tpl tz_form_confirm.tpl tz_form_native.tpl
tz_form_posix.tpl tz_show.tpl
Log Message:
[ 580757 ] Site-wide date formats and TIMEZONES
--- NEW FILE: tz_bench.tpl ---
<html>
<head>
<title>Test/Benchmark of phptz</title>
</head>
<body>
<h1>Test/Benchmark of phptz</h1>
<p>
<b>file:</b> {FILENAME}
</p>
<p>
Available Tests:
<ul>
<!-- BEGIN each_link -->
<li><a href="{PHP_SELF}?filename={AVAILABLE_FILENAME}">{AVAILABLE_FILENAME}</a></li>
<!-- END each_link -->
</ul>
<table border="1">
<tr>
<th>Code</th>
<th>Native Time Zone</th>
<th>Non-Native Time Zone</th>
</tr>
<!-- BEGIN each_code_block -->
<tr>
<td rowspan="2">{CODE}</td>
<td><pre>{RESULT_NATIVE}</pre></td>
<td><pre>{RESULT_NONNATIVE}</pre></td>
</tr>
<tr>
<td>{TIME_NATIVE}</td>
<td>{TIME_NONNATIVE}</td>
</tr>
<!-- END each_code_block -->
<table>
</body>
</html>
--- NEW FILE: tz_form_confirm.tpl ---
{CURRENT_TIME}
<p>
Is that OK with you?
<ul>
<li><a href="{ACCEPT_URL}">Accept</a></li>
<li><a href="{REJECT_URL}">Try Again</a></li>
</ul>
</p>
--- NEW FILE: tz_form_native.tpl ---
<!-- $Id: tz_form_native.tpl,v 1.1 2002/09/03 15:11:55 joestewart Exp $ -->
<!-- Time zone selection form -- filesystem database -->
<script language="JavaScript" type="text/javascript"> <!--
/**
* @var array array of Selects
*/
var continentOptions = new Array();
var countryOptions = new Array();
var regionOptions = new Array();
<!-- BEGIN each_continent_array -->
continentOptions[{CONTINENT_INDEX}] = new Option("{CONTINENT_NAME}","{CONTINENT_KEY}");
countryOptions[{CONTINENT_INDEX}] = new Array();
regionOptions[{CONTINENT_INDEX}] = new Array();
<!-- BEGIN each_country_array -->
countryOptions[{CONTINENT_INDEX}][{COUNTRY_INDEX}] = new Option("{COUNTRY_NAME}","{COUNTRY_CODE}");
regionOptions[{CONTINENT_INDEX}][{COUNTRY_INDEX}] = new Array();
<!-- BEGIN each_region_array -->
regionOptions[{CONTINENT_INDEX}][{COUNTRY_INDEX}][{REGION_INDEX}] = new Option("{REGION_NAME}","{ZONE_NAME}");
<!-- END each_region_array -->
<!-- END each_country_array -->
<!-- END each_continent_array -->
function updateSelect(select,newOpts) {
select.options.length=0;
for (var i = 0; i < newOpts.length; i++) {
select.options[i] = newOpts[i];
}
select.options[0].selected = true;
return;
}
function update_continent(f) {
updateSelect(f.continent,continentOptions);
update_country(f);
}
function update_country(f) {
updateSelect(f.country,countryOptions[f.continent.selectedIndex]);
update_region(f);
f.country.focus();
return;
}
function update_region(f) {
updateSelect(f.region,regionOptions[f.continent.selectedIndex][f.country.selectedIndex]);
f.region.focus();
return;
}
function check_form(f) {
return true;
}
//-->
</script>
{CURRENT_TIME}
<p>
Select a time zone region below. Or, hit the "Drill Down" Button to
filter the time zones by geography (requires a JavaScript-enabled
browser).
</p>
<form action="{ACTION_URL}" method="{METHOD}" name="tzSelect">
<input type="button" name="drill_down" value="Drill Down" onClick="update_continent(this.form);" />
<table>
<tr>
<th>Continent/Ocean</th>
<th>Country</th>
<th>Region</th>
</tr>
<tr>
<td>
<select name="continent" size="5" onChange="update_country(this.form);">
<!-- BEGIN each_continent_option -->
<option value="{CONTINENT_INDEX}">{CONTINENT_NAME}</option>
<!-- END each_continent_option -->
</select>
</td>
<td>
<select name="country" size="5" onChange="update_region(this.form);">
<!-- BEGIN each_country_option -->
<option value="{COUNTRY_CODE}">{COUNTRY_NAME}</option>
<!-- END each_country_option -->
</select>
</td>
<td>
<select name="region" size="5">
<!-- BEGIN each_region_option -->
<option value="{ZONE_NAME}">{REGION_NAME}</option>
<!-- END each_region_option -->
</select>
</td>
</tr>
</table>
<input type="submit" value="Submit" name="submit">
</form>
--- NEW FILE: tz_form_posix.tpl ---
<!-- $Id: -->
<!-- time zone selection form for posix strings -->
{CURRENT_TIME}
<p>Please select a time zone.</p>
<form name="tz_form" action="{ACTION_URL}" method="{METHOD}">
<select name="region" size="5">
<!-- BEGIN each_zone -->
<option value="{ZONE_VALUE}">{ZONE_NAME}</option>
<!-- END each_zone -->
</select>
<input type="submit" name="submit" value="Submit" />
</form>
--- NEW FILE: tz_show.tpl ---
<p>
{ZONE_MESSAGE}: <b>{ZONE_NAME}</b><br />
{TIME_MESSAGE}: <b>{LOCAL_TIME}</b><br />
</p>
|
|
From: Joe S. <joe...@us...> - 2002-09-03 15:09:54
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default
In directory usw-pr-cvs1:/tmp/cvs-serv17714/default
Added Files:
tz_bench.tpl tz_form_confirm.tpl tz_form_native.tpl
tz_form_posix.tpl tz_show.tpl
Log Message:
[ 580757 ] Site-wide date formats and TIMEZONES
--- NEW FILE: tz_bench.tpl ---
<html>
<head>
<title>Test/Benchmark of phptz</title>
</head>
<body>
<h1>Test/Benchmark of phptz</h1>
<p>
<b>file:</b> {FILENAME}
</p>
<p>
Available Tests:
<ul>
<!-- BEGIN each_link -->
<li><a href="{PHP_SELF}?filename={AVAILABLE_FILENAME}">{AVAILABLE_FILENAME}</a></li>
<!-- END each_link -->
</ul>
<table border="1">
<tr>
<th>Code</th>
<th>Native Time Zone</th>
<th>Non-Native Time Zone</th>
</tr>
<!-- BEGIN each_code_block -->
<tr>
<td rowspan="2">{CODE}</td>
<td><pre>{RESULT_NATIVE}</pre></td>
<td><pre>{RESULT_NONNATIVE}</pre></td>
</tr>
<tr>
<td>{TIME_NATIVE}</td>
<td>{TIME_NONNATIVE}</td>
</tr>
<!-- END each_code_block -->
<table>
</body>
</html>
--- NEW FILE: tz_form_confirm.tpl ---
{CURRENT_TIME}
<p>
Is that OK with you?
<ul>
<li><a href="{ACCEPT_URL}">Accept</a></li>
<li><a href="{REJECT_URL}">Try Again</a></li>
</ul>
</p>
--- NEW FILE: tz_form_native.tpl ---
<!-- $Id: tz_form_native.tpl,v 1.1 2002/09/03 15:09:52 joestewart Exp $ -->
<!-- Time zone selection form -- filesystem database -->
<script language="JavaScript" type="text/javascript"> <!--
/**
* @var array array of Selects
*/
var continentOptions = new Array();
var countryOptions = new Array();
var regionOptions = new Array();
<!-- BEGIN each_continent_array -->
continentOptions[{CONTINENT_INDEX}] = new Option("{CONTINENT_NAME}","{CONTINENT_KEY}");
countryOptions[{CONTINENT_INDEX}] = new Array();
regionOptions[{CONTINENT_INDEX}] = new Array();
<!-- BEGIN each_country_array -->
countryOptions[{CONTINENT_INDEX}][{COUNTRY_INDEX}] = new Option("{COUNTRY_NAME}","{COUNTRY_CODE}");
regionOptions[{CONTINENT_INDEX}][{COUNTRY_INDEX}] = new Array();
<!-- BEGIN each_region_array -->
regionOptions[{CONTINENT_INDEX}][{COUNTRY_INDEX}][{REGION_INDEX}] = new Option("{REGION_NAME}","{ZONE_NAME}");
<!-- END each_region_array -->
<!-- END each_country_array -->
<!-- END each_continent_array -->
function updateSelect(select,newOpts) {
select.options.length=0;
for (var i = 0; i < newOpts.length; i++) {
select.options[i] = newOpts[i];
}
select.options[0].selected = true;
return;
}
function update_continent(f) {
updateSelect(f.continent,continentOptions);
update_country(f);
}
function update_country(f) {
updateSelect(f.country,countryOptions[f.continent.selectedIndex]);
update_region(f);
f.country.focus();
return;
}
function update_region(f) {
updateSelect(f.region,regionOptions[f.continent.selectedIndex][f.country.selectedIndex]);
f.region.focus();
return;
}
function check_form(f) {
return true;
}
//-->
</script>
{CURRENT_TIME}
<p>
Select a time zone region below. Or, hit the "Drill Down" Button to
filter the time zones by geography (requires a JavaScript-enabled
browser).
</p>
<form action="{ACTION_URL}" method="{METHOD}" name="tzSelect">
<input type="button" name="drill_down" value="Drill Down" onClick="update_continent(this.form);" />
<table>
<tr>
<th>Continent/Ocean</th>
<th>Country</th>
<th>Region</th>
</tr>
<tr>
<td>
<select name="continent" size="5" onChange="update_country(this.form);">
<!-- BEGIN each_continent_option -->
<option value="{CONTINENT_INDEX}">{CONTINENT_NAME}</option>
<!-- END each_continent_option -->
</select>
</td>
<td>
<select name="country" size="5" onChange="update_region(this.form);">
<!-- BEGIN each_country_option -->
<option value="{COUNTRY_CODE}">{COUNTRY_NAME}</option>
<!-- END each_country_option -->
</select>
</td>
<td>
<select name="region" size="5">
<!-- BEGIN each_region_option -->
<option value="{ZONE_NAME}">{REGION_NAME}</option>
<!-- END each_region_option -->
</select>
</td>
</tr>
</table>
<input type="submit" value="Submit" name="submit">
</form>
--- NEW FILE: tz_form_posix.tpl ---
<!-- $Id: -->
<!-- time zone selection form for posix strings -->
{CURRENT_TIME}
<p>Please select a time zone.</p>
<form name="tz_form" action="{ACTION_URL}" method="{METHOD}">
<select name="region" size="5">
<!-- BEGIN each_zone -->
<option value="{ZONE_VALUE}">{ZONE_NAME}</option>
<!-- END each_zone -->
</select>
<input type="submit" name="submit" value="Submit" />
</form>
--- NEW FILE: tz_show.tpl ---
<p>
{ZONE_MESSAGE}: <b>{ZONE_NAME}</b><br />
{TIME_MESSAGE}: <b>{LOCAL_TIME}</b><br />
</p>
|
2 messages has been excluded from this view by a project administrator.
