phpslash-commit Mailing List for phpSlash (Page 109)
Brought to you by:
joestewart,
nhruby
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: Ajay S. <aja...@us...> - 2001-10-17 17:11:29
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/admin In directory usw-pr-cvs1:/tmp/cvs-serv19148/phpslash-ft/public_html/admin Modified Files: storyAdmin.php3 Log Message: easier navigation in StoryAdmin, some comment fixes too... Index: storyAdmin.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/admin/storyAdmin.php3,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** storyAdmin.php3 2001/07/31 21:41:31 1.2 --- storyAdmin.php3 2001/10/17 17:11:27 1.3 *************** *** 13,16 **** --- 13,20 ---- *****************************/ + $ary[author_id] = $author_id; + $ary[topic_id] = $topic_id; + $ary[section_id] = $section_id; + slashhead($pagetitle,$xsiteobject); *************** *** 22,26 **** case "delete": $story->deleteStory($story_id); ! $story->listStory($author_id,$next); break; --- 26,30 ---- case "delete": $story->deleteStory($story_id); ! $story->listStory($ary,$next); break; *************** *** 30,38 **** $story->newStory($HTTP_POST_VARS, "array"); } ! $story->listStory($author_id,$next); break; case "modify": ! $story->listStory($author_id,$next); break; --- 34,42 ---- $story->newStory($HTTP_POST_VARS, "array"); } ! $story->listStory($ary,$next); break; case "modify": ! $story->listStory($ary,$next); break; *************** *** 57,61 **** default: ! $story->listStory($author_id, $next); } } else { --- 61,65 ---- default: ! $story->listStory($ary, $next); } } else { |
From: Ajay S. <aja...@us...> - 2001-10-17 17:11:29
|
Update of /cvsroot/phpslash/phpslash-ft/class In directory usw-pr-cvs1:/tmp/cvs-serv19148/phpslash-ft/class Modified Files: Author.class Comment.class Section.class Story.class Topic.class functions.inc slashAuth.class Log Message: easier navigation in StoryAdmin, some comment fixes too... Index: Author.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/Author.class,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Author.class 2001/08/31 19:19:51 1.5 --- Author.class 2001/10/17 17:11:26 1.6 *************** *** 284,286 **** --- 284,306 ---- } + function authorSelect($varname,$selected) { + + $q = "SELECT author_id, author_name + FROM psl_author"; + $this->db->query($q); + $output = "<SELECT NAME=\"$varname\">\n"; + $output .= " <OPTION VALUE=\"\">All</OPTION>\n"; + while ($this->db->next_record()) { + $id = $this->db->f("author_id"); + $name = $this->db->f("author_name"); + $output .= " <OPTION VALUE=\"$id\" "; + if ($id == $selected) { + $output .= " SELECTED"; + } + $output .= ">$name</OPTION>\n"; + } + $output .= "</SELECT>\n"; + return $output; + } + }; /* end of Author.class */ Index: Comment.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/Comment.class,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** Comment.class 2001/10/09 23:23:05 1.19 --- Comment.class 2001/10/17 17:11:26 1.20 *************** *** 35,39 **** */ function Comment ($ary = array()) { ! global $approvedtags,$_PSL, $perm; $this->psl = $_PSL; --- 35,39 ---- */ function Comment ($ary = array()) { ! global $_PSL, $perm; $this->psl = $_PSL; *************** *** 62,67 **** )); ! reset($approvedtags); ! while (list($k,$v) = each($approvedtags)) { $tags .= "<${k}>\n"; }; --- 62,67 ---- )); ! reset($this->psl[approvedtags]); ! while (list($k,$v) = each($this->psl[approvedtags])) { $tags .= "<${k}>\n"; }; Index: Section.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/Section.class,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Section.class 2001/07/31 21:41:31 1.3 --- Section.class 2001/10/17 17:11:26 1.4 *************** *** 180,182 **** --- 180,202 ---- } + function sectionSelect($varname,$selected) { + + $q = "SELECT section_id, section_name + FROM psl_section"; + $this->db->query($q); + $output = "<SELECT NAME=\"$varname\">\n"; + $output .= " <OPTION VALUE=\"\">All</OPTION>\n"; + while ($this->db->next_record()) { + $id = $this->db->f("section_id"); + $name = $this->db->f("section_name"); + $output .= " <OPTION VALUE=\"$id\" "; + if ($id == $selected) { + $output .= " SELECTED"; + } + $output .= ">$name</OPTION>\n"; + } + $output .= "</SELECT>\n"; + return $output; + } + }; /* end of Section.class */ Index: Story.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/Story.class,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** Story.class 2001/10/01 16:13:11 1.17 --- Story.class 2001/10/17 17:11:26 1.18 *************** *** 545,549 **** } /* end of function getStories */ ! function deleteStory($story_id) { --- 545,549 ---- } /* end of function getStories */ ! function deleteStory($story_id) { *************** *** 800,806 **** * Do we need this anywhere outside of admin???? */ ! function listStory($author_id, $first) { ! global $_PSL; $cmt_list = 10; /* num of stories to display before the "more" link */ --- 800,808 ---- * Do we need this anywhere outside of admin???? */ ! function listStory($ary, $first) { ! $author_id = $ary[author_id]; ! $topic_id = $ary[topic_id]; ! $section_id = $ary[section_id]; $cmt_list = 10; /* num of stories to display before the "more" link */ *************** *** 813,818 **** date_format(time,$this->admin_dateformat) AS df FROM psl_story story, ! psl_author author, ! psl_commentcount commentcount WHERE story.story_id = commentcount.count_id AND author.author_id = story.user_id "; --- 815,826 ---- date_format(time,$this->admin_dateformat) AS df FROM psl_story story, ! psl_author author,"; ! if ($topic_id) { ! $q .= " psl_topic_lut, "; ! } ! if ($section_id) { ! $q .= " psl_section_lut, "; ! } ! $q .= " psl_commentcount commentcount WHERE story.story_id = commentcount.count_id AND author.author_id = story.user_id "; *************** *** 824,827 **** --- 832,846 ---- AND '$user_id' = author.author_id "; } + if ($author_id) { + $q .= "AND '$author_id' = story.user_id "; + } + if ($topic_id) { + $q .= "AND story.story_id = psl_topic_lut.story_id "; + $q .= "AND '$topic_id' = psl_topic_lut.topic_id "; + } + if ($section_id) { + $q .= "AND story.story_id = psl_section_lut.story_id "; + $q .= "AND '$section_id' = psl_section_lut.section_id "; + } $q .= "ORDER BY time DESC"; *************** *** 831,836 **** $this->template->set_block("liststory", "row", "rows"); $this->template->set_var(array( ! ACTION_URL => $_PSL[phpself] )); --- 850,865 ---- $this->template->set_block("liststory", "row", "rows"); + $author = new Author; + $topic = new Topic; + $section = new Section; + $author_select_html = $author->authorSelect("author_id",$author_id); + $topic_select_html = $topic->topicSelect("topic_id",$topic_id); + $section_select_html = $section->sectionSelect("section_id",$section_id); + $this->template->set_var(array( ! ACTION_URL => $this->psl[phpself], ! TOPIC_SELECT => $topic_select_html, ! SECTION_SELECT => $section_select_html, ! AUTHOR_SELECT => $author_select_html )); *************** *** 842,848 **** if ( ($count > $first) and ($count <= ($first+$cmt_list)) ) { ! $view_url = "$_PSL[rooturl]/article.php3?story_id=$story_id"; ! $modify_url = "$_PSL[adminurl]/storyAdmin.php3?submit=edit&story_id=$story_id"; ! $delete_url = "$_PSL[adminurl]/storyAdmin.php3?submit=delete&story_id=$story_id"; $this->template->set_var(array( --- 871,877 ---- if ( ($count > $first) and ($count <= ($first+$cmt_list)) ) { ! $view_url = $this->psl[rooturl] . "/article.php3?story_id=$story_id"; ! $modify_url = $this->psl[adminurl] . "/storyAdmin.php3?submit=edit&story_id=$story_id"; ! $delete_url = $this->psl[adminurl] . "/storyAdmin.php3?submit=delete&story_id=$story_id"; $this->template->set_var(array( *************** *** 868,872 **** if ($count > $first) { $this->template->set_var(array( ! MORE_LINK => "<a href=\"$_PSL[phpself]?op=list&next=$first\">$left ". pslgetText("More")."</a>" )); } --- 897,905 ---- if ($count > $first) { $this->template->set_var(array( ! MORE_LINK => "<a href=\"" . $this->psl[phpself] . "?submit=modify" . $this->psl[amp] . ! "author_id=" . $author_id . $this->psl[amp] . ! "topic_id=" . $topic_id . $this->psl[amp] . ! "section_id=" . $section_id . $this->psl[amp] . ! "next=$first\">$left " . pslgetText("More")."</a>" )); } Index: Topic.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/Topic.class,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Topic.class 2001/07/31 21:41:31 1.4 --- Topic.class 2001/10/17 17:11:27 1.5 *************** *** 376,378 **** --- 376,399 ---- } + function topicSelect($varname,$selected) { + + $q = "SELECT topic_id, topic_name + FROM psl_topic"; + $this->db->query($q); + $output = "<SELECT NAME=\"$varname\">\n"; + $output .= " <OPTION VALUE=\"\">All</OPTION>\n"; + while ($this->db->next_record()) { + $id = $this->db->f("topic_id"); + $name = $this->db->f("topic_name"); + $output .= " <OPTION VALUE=\"$id\" "; + if ($id == $selected) { + $output .= " SELECTED"; + } + $output .= ">$name</OPTION>\n"; + } + $output .= "</SELECT>\n"; + return $output; + } + + }; /* end of Topic.class */ Index: functions.inc =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/functions.inc,v retrieving revision 1.77 retrieving revision 1.78 diff -C2 -d -r1.77 -r1.78 *** functions.inc 2001/10/08 16:47:33 1.77 --- functions.inc 2001/10/17 17:11:27 1.78 *************** *** 84,88 **** function stripBadHTML($str,$seclev=0) { ! global $approvedtags; $str = stripslashes($str); --- 84,90 ---- function stripBadHTML($str,$seclev=0) { ! global $_PSL; ! ! $approvedtags = $_PSL[approvedtags]; $str = stripslashes($str); Index: slashAuth.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/slashAuth.class,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** slashAuth.class 2001/10/01 15:13:21 1.1 --- slashAuth.class 2001/10/17 17:11:27 1.2 *************** *** 39,43 **** $templ->set_var(PHP_SELF, "$_PSL[phpself]"); - if (isset($this->auth["uname"])) { $templ->set_var(USERNAME,$this->auth["uname"]); --- 39,42 ---- |
From: Ajay S. <aja...@us...> - 2001-10-17 17:11:29
|
Update of /cvsroot/phpslash/phpslash-ft/public_html In directory usw-pr-cvs1:/tmp/cvs-serv19148/phpslash-ft/public_html Modified Files: config.php3 login.php3 Log Message: easier navigation in StoryAdmin, some comment fixes too... Index: config.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/config.php3,v retrieving revision 1.113 retrieving revision 1.114 diff -C2 -d -r1.113 -r1.114 *** config.php3 2001/10/08 16:45:47 1.113 --- config.php3 2001/10/17 17:11:27 1.114 *************** *** 42,52 **** $_PSL[classdir] = '/home/httpd/htdocs/phpslash-ft/class'; ! // $rootdir -> The base URL for the phpslash site $_PSL[rooturl] = 'http://superstar.odc.net/phpslash-ft/public_html'; ! // $admindir -> The base URL for the admin pages $_PSL[adminurl] = $_PSL[rooturl] . '/admin'; ! // $imagedir -> The base URL for images that pertain to phpslash $_PSL[imageurl] = $_PSL[rooturl] . '/images'; --- 42,52 ---- $_PSL[classdir] = '/home/httpd/htdocs/phpslash-ft/class'; ! // $rooturl -> The base URL for the phpslash site $_PSL[rooturl] = 'http://superstar.odc.net/phpslash-ft/public_html'; ! // $adminurl -> The base URL for the admin pages $_PSL[adminurl] = $_PSL[rooturl] . '/admin'; ! // $imageurl -> The base URL for images that pertain to phpslash $_PSL[imageurl] = $_PSL[rooturl] . '/images'; *************** *** 381,397 **** // 4.1) Approved HTML tags for user comments ! $approvedtags = array("p"=>2, // 2 means accept all qualifiers: <foo bar> ! "b"=>1, // 1 means accept the tag only: <foo> ! "i"=>1, ! "a"=>2, ! "em"=>1, ! "br"=>1, ! "strong"=>1, ! "blockquote"=>1, ! "tt"=>1, ! "hr"=>1, ! "li"=>1, ! "ol"=>1, ! "ul"=>1); /* ============= Things to deprecate ============= */ --- 381,403 ---- // 4.1) Approved HTML tags for user comments ! /** ! * 2 means accept all qualifiers: <foo bar> ! * 1 means accept the tag only: <foo> ! */ ! $_PSL[approvedtags] = array( ! "p"=>2, ! "b"=>1, ! "i"=>1, ! "a"=>2, ! "em"=>1, ! "br"=>1, ! "strong"=>1, ! "blockquote"=>1, ! "tt"=>1, ! "hr"=>1, ! "li"=>1, ! "ol"=>1, ! "ul"=>1 ! ); /* ============= Things to deprecate ============= */ Index: login.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/login.php3,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** login.php3 2001/10/09 23:28:12 1.8 --- login.php3 2001/10/17 17:11:27 1.9 *************** *** 22,25 **** --- 22,26 ---- // $auth->login_if($login); $auth->auth_loginform(); + } elseif ($perm->have_perm("user")) { |
From: Ajay S. <aja...@us...> - 2001-10-17 17:11:29
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv19148/phpslash-ft Modified Files: CHANGES Log Message: easier navigation in StoryAdmin, some comment fixes too... Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.310 retrieving revision 1.311 diff -C2 -d -r1.310 -r1.311 *** CHANGES 2001/10/09 23:28:12 1.310 --- CHANGES 2001/10/17 17:11:26 1.311 *************** *** 12,15 **** --- 12,22 ---- 2001-Oct-09 4:23PM PDT Ajay Sharma <ss...@od...> + [F] - The story admin is much friendly. You can select authors, + topics, and sections and modify the view like the search + page. + [T] - storyList.tpl has changed to allow the select boxes + [B] - $approvedtags is now $_PSL[approvedtags] + + 2001-Oct-09 4:23PM PDT Ajay Sharma <ss...@od...> [B] - removed the debug statement from the login.php3 script [T] - removed the "quickies" submit button from the submission page. |
From: Ajay S. <aja...@us...> - 2001-10-09 23:28:15
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv11655/phpslash-ft Modified Files: CHANGES Log Message: removed 'debug' stuff from the login script and removed the quickies switch option. Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.309 retrieving revision 1.310 diff -C2 -d -r1.309 -r1.310 *** CHANGES 2001/10/08 16:49:01 1.309 --- CHANGES 2001/10/09 23:28:12 1.310 *************** *** 11,14 **** --- 11,26 ---- R - RELEASE + 2001-Oct-09 4:23PM PDT Ajay Sharma <ss...@od...> + [B] - removed the debug statement from the login.php3 script + [T] - removed the "quickies" submit button from the submission page. + I haven't wrote the routine and don't plan to unless someone + asks for it. This was in submissionList.tpl + [B] - removed the 'quickies' switch option from the submissionAdmin + file. + [B] - removed some more global's from the Block_render_* files + [B] - Cleaned out some useless code in Submission.class + [B] - The Threaded, Nested, Flat, and Index options are now using the + pslGetText() function. + 2001-Oct-08 11:45AM CDT Joe Stewart <jo...@be...> [B] - functions.inc - typo in setLangTpl. |
From: Ajay S. <aja...@us...> - 2001-10-09 23:28:15
|
Update of /cvsroot/phpslash/phpslash-ft/public_html In directory usw-pr-cvs1:/tmp/cvs-serv11655/phpslash-ft/public_html Modified Files: login.php3 Log Message: removed 'debug' stuff from the login script and removed the quickies switch option. Index: login.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/login.php3,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** login.php3 2001/10/02 20:59:16 1.7 --- login.php3 2001/10/09 23:28:12 1.8 *************** *** 17,22 **** $auth->auth[perm] = ""; // slashhead($pagetitle,$xsiteobject); ! $debug = true; ! debug("Auth",$auth->auth); // $login = "yes"; // $auth->login_if($login); --- 17,22 ---- $auth->auth[perm] = ""; // slashhead($pagetitle,$xsiteobject); ! // $debug = true; ! // debug("Auth",$auth->auth); // $login = "yes"; // $auth->login_if($login); |
From: Ajay S. <aja...@us...> - 2001-10-09 23:28:15
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/admin In directory usw-pr-cvs1:/tmp/cvs-serv11655/phpslash-ft/public_html/admin Modified Files: submissionAdmin.php3 Log Message: removed 'debug' stuff from the login script and removed the quickies switch option. Index: submissionAdmin.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/admin/submissionAdmin.php3,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** submissionAdmin.php3 2001/09/06 17:20:27 1.3 --- submissionAdmin.php3 2001/10/09 23:28:12 1.4 *************** *** 58,65 **** break; - case "quickies": - echo "TODO: Write a Quickies routine<BR>\n"; - break; - case "preview": $submission->showSubmission($HTTP_POST_VARS); --- 58,61 ---- |
From: Ajay S. <aja...@us...> - 2001-10-09 23:24:17
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default In directory usw-pr-cvs1:/tmp/cvs-serv10765 Modified Files: submissionList.tpl Log Message: removed the quickies option... Index: submissionList.tpl =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default/submissionList.tpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** submissionList.tpl 2001/01/01 09:34:50 1.3 --- submissionList.tpl 2001/10/09 23:24:15 1.4 *************** *** 25,29 **** <B>{MORE_LINK}</B><BR> <INPUT TYPE="SUBMIT" NAME="submit" value="delete"> - <INPUT TYPE="SUBMIT" NAME="submit" value="quickies"> </FORM> --- 25,28 ---- |
From: Ajay S. <aja...@us...> - 2001-10-09 23:23:08
|
Update of /cvsroot/phpslash/phpslash-ft/class In directory usw-pr-cvs1:/tmp/cvs-serv10513 Modified Files: Comment.class Submission.class Log Message: Comments are better, cleaned out some extra junk in Submission class. Index: Comment.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/Comment.class,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** Comment.class 2001/09/25 19:23:53 1.18 --- Comment.class 2001/10/09 23:23:05 1.19 *************** *** 73,81 **** )); ! $this->comment_mode_array = array ("Threaded" => "thread", ! "Flat" => "flat", ! "Index" => "index", ! "Nested" => "nested", ! "No Comments" => "none"); } --- 73,83 ---- )); ! $this->comment_mode_array = array ( ! pslgetText("Threaded") => "thread", ! pslgetText("Flat") => "flat", ! pslgetText("Index") => "index", ! pslgetText("Nested") => "nested", ! pslgetText("No Comments") => "none" ! ); } *************** *** 200,204 **** * Formats ONE comment for display * - * * This function takes the stuff out of "ary" and returns one comment using * the template. --- 202,205 ---- *************** *** 266,270 **** if ($index) { $this->ctempl->set_var(array( ! MODE => "nested" )); $this->ctempl->parse(OUT,"indexcomment"); --- 267,271 ---- if ($index) { $this->ctempl->set_var(array( ! MODE => "thread" )); $this->ctempl->parse(OUT,"indexcomment"); Index: Submission.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/Submission.class,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Submission.class 2001/09/06 17:18:22 1.5 --- Submission.class 2001/10/09 23:23:05 1.6 *************** *** 43,56 **** if ($this->db->next_record()) { ! $subject = $this->db->Record["title"]; ! $story = $this->db->Record["intro_text"]; ! $name = $this->db->Record["name"]; ! $email = $this->db->Record["email"]; ! ! $ary[subject] = $subject; ! $ary[story] = $story; ! $ary[name] = $name; ! $ary[email] = $email; ! $ary[datef] = $datef; $this->showSubmission($ary); --- 43,51 ---- if ($this->db->next_record()) { ! $ary[subject] = $this->db->f("title"); ! $ary[story] = $this->db->f("intro_text"); ! $ary[name] = $this->db->f("name"); ! $ary[email] = $this->db->f("email"); ! $ary[datef] = $this->db->f("datef"); $this->showSubmission($ary); |
From: Ajay S. <aja...@us...> - 2001-10-09 23:21:48
|
Update of /cvsroot/phpslash/phpslash-ft/class In directory usw-pr-cvs1:/tmp/cvs-serv10283 Modified Files: Block_i.class Block_render_quote.class Block_render_topic.class Block_render_query.class Block_render_section.class Log Message: Just cleaning out some globals. Index: Block_i.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_i.class,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Block_i.class 2001/09/07 15:28:39 1.6 --- Block_i.class 2001/10/09 23:21:45 1.7 *************** *** 22,26 **** /* Here starts Block_i specfic construction */ - // global $PHP_SELF,$rootdir,$basedir,$imagedir, $templatedir; global $_PSL; --- 22,25 ---- Index: Block_render_quote.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_quote.class,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Block_render_quote.class 2001/05/15 22:36:15 1.1 --- Block_render_quote.class 2001/10/09 23:21:45 1.2 *************** *** 1,20 **** <?php - global $rootdir, $basedir; - /* Block_render_quote.class -> Random quote generator */ /* Id:$ */ - class Block_render_quote { var $type; var $output; /* constructor */ function Block_render_quote() { $this->type = "quote"; /* set the 'type' */ $this->output = ""; /* clear the output */ } --- 1,21 ---- <?php /* Block_render_quote.class -> Random quote generator */ /* 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; } *************** *** 33,38 **** function query( $block_info) { - global $rootdir, $basedir, $templatedir; - $default_tpl = "quoteblock.tpl"; --- 34,37 ---- *************** *** 45,49 **** if( empty($ary[tpl]) ) { $tpl = $default_tpl; ! } elseif ( file_exists($templatedir . "/" . basename($ary[tpl]) . ".tpl") ) { # should be secure as path directives are discarded and extension added $tpl = basename($ary[tpl]) . ".tpl"; --- 44,48 ---- if( empty($ary[tpl]) ) { $tpl = $default_tpl; ! } elseif ( file_exists($this->[templatedir] . "/" . basename($ary[tpl]) . ".tpl") ) { # should be secure as path directives are discarded and extension added $tpl = basename($ary[tpl]) . ".tpl"; *************** *** 53,57 **** } ! $template = new Template($templatedir); $template->debug = 0; $template->set_file(array( --- 52,56 ---- } ! $template = new Template($this->[templatedir]); $template->debug = 0; $template->set_file(array( Index: Block_render_topic.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_topic.class,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Block_render_topic.class 2001/09/06 17:18:22 1.3 --- Block_render_topic.class 2001/10/09 23:21:45 1.4 *************** *** 1,6 **** <?php - global $rootdir, $basedir, $templatedir; - /* Block_render_topic.class -> Methods for phpslash specfic blocks */ /* Id:$ */ --- 1,4 ---- *************** *** 18,23 **** */ - - class Block_render_topic { --- 16,19 ---- *************** *** 50,55 **** function topics( $block_info) { - global $rootdir, $basedir, $templatedir; - $db = new slashDB; --- 46,49 ---- *************** *** 59,72 **** } - $options = $block_info["source_url"]; parse_str( $options); - // $tpl = ""; // disable template option if( empty($tpl) ) { $tpl = $default_tpl; ! } elseif ( file_exists($templatedir . "/" . basename($tpl) . ".tpl") ) { $tpl = basename($tpl) . ".tpl"; } else { --- 53,64 ---- } $options = $block_info["source_url"]; parse_str( $options); // $tpl = ""; // disable template option if( empty($tpl) ) { $tpl = $default_tpl; ! } elseif ( file_exists($this->psl[templatedir] . "/" . basename($tpl) . ".tpl") ) { $tpl = basename($tpl) . ".tpl"; } else { *************** *** 75,79 **** } ! $template = new Template($templatedir); $template->debug = 0; $template->set_file(array( --- 67,71 ---- } ! $template = new Template($this->psl[templatedir]); $template->debug = 0; $template->set_file(array( *************** *** 145,150 **** $template->set_var(array( ! ROOTDIR => $rootdir, ! IMAGEDIR => $imagedir )); --- 137,142 ---- $template->set_var(array( ! ROOTDIR => $this->psl[rooturl], ! IMAGEDIR => $this->psl[imageurl] )); Index: Block_render_query.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_query.class,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Block_render_query.class 2001/06/29 15:55:17 1.2 --- Block_render_query.class 2001/10/09 23:21:45 1.3 *************** *** 1,6 **** <?php - global $rootdir, $basedir; - /* Block_render_query.class -> Methods for phpslash specfic blocks */ /* Id:$ */ --- 1,4 ---- *************** *** 25,39 **** */ - class Block_render_query { var $type; var $output; /* constructor */ function Block_render_query() { $this->type = "query"; /* set the 'type' */ $this->output = ""; /* clear the output */ } --- 23,40 ---- */ 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; } *************** *** 52,57 **** function query( $block_info) { - global $rootdir, $basedir, $templatedir; - $stories = new Story; --- 53,56 ---- *************** *** 67,71 **** if( empty($ary[tpl]) ) { $tpl = $default_tpl; ! } elseif ( file_exists($templatedir . "/" . basename($ary[tpl]) . ".tpl") ) { # should be secure as path directives are discarded and extension added $tpl = basename($ary[tpl]) . ".tpl"; --- 66,70 ---- if( empty($ary[tpl]) ) { $tpl = $default_tpl; ! } elseif ( file_exists($this->psl[templatedir] . "/" . basename($ary[tpl]) . ".tpl") ) { # should be secure as path directives are discarded and extension added $tpl = basename($ary[tpl]) . ".tpl"; *************** *** 75,79 **** } ! $template = new Template($templatedir); $template->debug = 0; $template->set_file(array( --- 74,78 ---- } ! $template = new Template($this->psl["templatedir"]); $template->debug = 0; $template->set_file(array( *************** *** 111,119 **** $template->set_var(array( ! ROOTDIR => $rootdir, ! IMAGEDIR => $imagedir )); ! return $template->parse(OUT,"block"); } --- 110,118 ---- $template->set_var(array( ! ROOTDIR => $this->psl[rooturl], ! IMAGEDIR => $this->psl[imageurl] )); ! return $template->parse(OUT,"block"); } Index: Block_render_section.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_section.class,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Block_render_section.class 2001/09/06 17:18:22 1.3 --- Block_render_section.class 2001/10/09 23:21:45 1.4 *************** *** 1,6 **** <?php - global $rootdir, $basedir, $templatedir; - /* Block_render_section.class -> Methods for phpslash specfic blocks */ /* Id:$ */ --- 1,4 ---- *************** *** 46,51 **** function sections( $block_info) { - global $rootdir, $basedir, $templatedir; - $db = new slashDB; --- 44,47 ---- *************** *** 65,69 **** if( empty($tpl) ) { $tpl = $default_tpl; ! } elseif ( file_exists($templatedir . "/" . basename($tpl) . ".tpl") ) { $tpl = basename($tpl) . ".tpl"; } else { --- 61,65 ---- if( empty($tpl) ) { $tpl = $default_tpl; ! } elseif ( file_exists($this->psl[templatedir] . "/" . basename($tpl) . ".tpl") ) { $tpl = basename($tpl) . ".tpl"; } else { *************** *** 72,76 **** } ! $template = new Template($templatedir); $template->debug = 0; $template->set_file(array( --- 68,72 ---- } ! $template = new Template($this->psl[templatedir]); $template->debug = 0; $template->set_file(array( *************** *** 112,117 **** $template->set_var(array( ! ROOTDIR => $rootdir, ! IMAGEDIR => $imagedir )); --- 108,113 ---- $template->set_var(array( ! ROOTDIR => $this->psl[rooturl], ! IMAGEDIR => $this->psl[imageurl] )); |