phpslash-commit Mailing List for phpSlash (Page 56)
Brought to you by:
joestewart,
nhruby
This list is closed, nobody may subscribe to it.
2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(11) |
Nov
(59) |
Dec
(60) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2002 |
Jan
(52) |
Feb
(77) |
Mar
(118) |
Apr
(76) |
May
(106) |
Jun
(145) |
Jul
(9) |
Aug
(15) |
Sep
(78) |
Oct
(83) |
Nov
(105) |
Dec
(51) |
2003 |
Jan
(105) |
Feb
(100) |
Mar
(111) |
Apr
(149) |
May
(95) |
Jun
(56) |
Jul
(8) |
Aug
(2) |
Sep
|
Oct
(22) |
Nov
(117) |
Dec
(6) |
2004 |
Jan
(1) |
Feb
|
Mar
(3) |
Apr
(25) |
May
|
Jun
(11) |
Jul
(26) |
Aug
(85) |
Sep
(119) |
Oct
(312) |
Nov
(271) |
Dec
(5) |
2005 |
Jan
(6) |
Feb
|
Mar
|
Apr
(12) |
May
(7) |
Jun
(8) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2009 |
Jan
(5) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: Joe S. <joe...@us...> - 2003-03-26 14:40:47
|
Update of /cvsroot/phpslash/phpslash-ft/doc/html In directory sc8-pr-cvs1:/tmp/cvs-serv18743/phpslash-ft/doc/html Modified Files: phpslash.sgml Log Message: remove saved comment session variables when logging in and logging out. Index: phpslash.sgml =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/doc/html/phpslash.sgml,v retrieving revision 1.68 retrieving revision 1.69 diff -C2 -d -r1.68 -r1.69 *** phpslash.sgml 25 Mar 2003 21:27:04 -0000 1.68 --- phpslash.sgml 26 Mar 2003 14:40:39 -0000 1.69 *************** *** 1,3 **** ! a!doctype linuxdoc system> <!-- --- 1,3 ---- ! <!doctype linuxdoc system> <!-- |
From: Joe S. <joe...@us...> - 2003-03-25 22:09:24
|
Update of /cvsroot/phpslash/phpslash-ft In directory sc8-pr-cvs1:/tmp/cvs-serv17358/phpslash-ft Modified Files: CHANGES Log Message: return message when story is saved successfully Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.731 retrieving revision 1.732 diff -C2 -d -r1.731 -r1.732 *** CHANGES 25 Mar 2003 21:27:05 -0000 1.731 --- CHANGES 25 Mar 2003 22:09:15 -0000 1.732 *************** *** 13,16 **** --- 13,20 ---- 9 - Removal of something (kill -9 :) + 2003-March-25 3:30PM CST Joe Stewart <joe...@us...> + [W] - Story_base.class, storyAdmin.php3, en.php3 - return a message when + story is saved successfully. + 2003-March-25 2:30PM CST Joe Stewart <joe...@us...> [BT] - Mailinglist.class, en.php3 - Doesn't send empty emails. |
From: Joe S. <joe...@us...> - 2003-03-25 22:09:11
|
Update of /cvsroot/phpslash/phpslash-ft/class/locale In directory sc8-pr-cvs1:/tmp/cvs-serv17180/phpslash-ft/class/locale Modified Files: en.php3 Log Message: return message when story is saved successfully Index: en.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/locale/en.php3,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** en.php3 25 Mar 2003 21:27:19 -0000 1.17 --- en.php3 25 Mar 2003 22:09:05 -0000 1.18 *************** *** 902,906 **** "Topic bar could not be reorganized" => "Topic bar could not be reorganized", ! // Submission.class "Anonymous Coward" => --- 902,908 ---- "Topic bar could not be reorganized" => "Topic bar could not be reorganized", ! ! "story(%s) saved: %s" => ! "story(%s) saved: %s", // Submission.class "Anonymous Coward" => |
From: Joe S. <joe...@us...> - 2003-03-25 22:09:09
|
Update of /cvsroot/phpslash/phpslash-ft/class In directory sc8-pr-cvs1:/tmp/cvs-serv17180/phpslash-ft/class Modified Files: Story_base.class Log Message: return message when story is saved successfully Index: Story_base.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/Story_base.class,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** Story_base.class 23 Jan 2003 02:48:03 -0000 1.22 --- Story_base.class 25 Mar 2003 22:09:03 -0000 1.23 *************** *** 656,660 **** } } // end if auto_renorm ! return true; } --- 656,660 ---- } } // end if auto_renorm ! $this->message .= sprintf(pslgetText("story(%s) saved: %s"), $ary['story_id'], $ary['title']); return true; } |
From: Joe S. <joe...@us...> - 2003-03-25 21:36:56
|
Update of /cvsroot/phpslash/phpslash-ft/public_html In directory sc8-pr-cvs1:/tmp/cvs-serv3894/phpslash-ft/public_html Modified Files: config-dist.php3 Log Message: permission cleanup, mailinglist fix, fmsearch update Index: config-dist.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/config-dist.php3,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** config-dist.php3 25 Mar 2003 17:03:27 -0000 1.42 --- config-dist.php3 25 Mar 2003 21:36:51 -0000 1.43 *************** *** 486,490 **** 'name' => "Topic", 'link' => $_PSL['adminurl'] . "/topicAdmin.php3", ! 'perm' => "topic", 'module' => "" ); --- 486,490 ---- 'name' => "Topic", 'link' => $_PSL['adminurl'] . "/topicAdmin.php3", ! 'perm' => "topicList", 'module' => "" ); *************** *** 492,496 **** 'name' => "Story", 'link' => $_PSL['adminurl'] . "/storyAdmin.php3", ! 'perm' => "story", 'module' => "Story" ); --- 492,496 ---- 'name' => "Story", 'link' => $_PSL['adminurl'] . "/storyAdmin.php3", ! 'perm' => "storyList", 'module' => "Story" ); *************** *** 498,502 **** 'name' => "Submission", 'link' => $_PSL['adminurl'] . "/submissionAdmin.php3", ! 'perm' => "submission", 'module' => "Submission" ); --- 498,502 ---- 'name' => "Submission", 'link' => $_PSL['adminurl'] . "/submissionAdmin.php3", ! 'perm' => "submissionEdit", 'module' => "Submission" ); *************** *** 504,508 **** 'name' => "Section", 'link' => $_PSL['adminurl'] . "/sectionAdmin.php3", ! 'perm' => "section", 'module' => "Section" ); --- 504,508 ---- 'name' => "Section", 'link' => $_PSL['adminurl'] . "/sectionAdmin.php3", ! 'perm' => "sectionList", 'module' => "Section" ); *************** *** 510,514 **** 'name' => "Block", 'link' => $_PSL['adminurl'] . "/blockAdmin.php3", ! 'perm' => "block", 'module' => "Block" ); --- 510,514 ---- 'name' => "Block", 'link' => $_PSL['adminurl'] . "/blockAdmin.php3", ! 'perm' => "blockList", 'module' => "Block" ); *************** *** 516,520 **** 'name' => "Poll", 'link' => $_PSL['adminurl'] . "/pollAdmin.php3", ! 'perm' => "poll", 'module' => "Poll" ); --- 516,520 ---- 'name' => "Poll", 'link' => $_PSL['adminurl'] . "/pollAdmin.php3", ! 'perm' => "pollList", 'module' => "Poll" ); *************** *** 528,532 **** 'name' => "Author", 'link' => $_PSL['adminurl'] . "/authorAdmin.php3", ! 'perm' => "author", 'module' => "Author" ); --- 528,532 ---- 'name' => "Author", 'link' => $_PSL['adminurl'] . "/authorAdmin.php3", ! 'perm' => "authorList", 'module' => "Author" ); *************** *** 534,538 **** 'name' => "Glossary", 'link' => $_PSL['adminurl'] . "/glossaryAdmin.php3", ! 'perm' => "glossary", 'module' => "Glossary" ); --- 534,538 ---- 'name' => "Glossary", 'link' => $_PSL['adminurl'] . "/glossaryAdmin.php3", ! 'perm' => "glossaryList", 'module' => "Glossary" ); |
From: Joe S. <joe...@us...> - 2003-03-25 21:36:30
|
Update of /cvsroot/phpslash/phpslash-ft/class In directory sc8-pr-cvs1:/tmp/cvs-serv3750/phpslash-ft/class Modified Files: Submission.class Log Message: permission cleanup, mailinglist fix, fmsearch update Index: Submission.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/Submission.class,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** Submission.class 25 Mar 2003 21:27:15 -0000 1.17 --- Submission.class 25 Mar 2003 21:36:23 -0000 1.18 *************** *** 158,162 **** function newSubmission($ary,$data_source) { ! global $submission_name, $submission_email, $perm; $this->templ->set_block("formsubmission","topic_row","topic_rows"); --- 158,162 ---- function newSubmission($ary,$data_source) { ! global $submission_name, $submission_email; $this->templ->set_block("formsubmission","topic_row","topic_rows"); *************** *** 271,275 **** $this->db->query($q); while ($this->db->next_record()) { ! if (($perm->have_perm("submissionNew && ". ALLSECTIONS)) || ($perm->have_perm("submissionNew && section_id".$this->db->Record['section_id']))) { $this->templ->set_var(array( 'SECTION_ID' => $this->db->Record['section_id'], --- 271,275 ---- $this->db->query($q); while ($this->db->next_record()) { ! if (($this->perm->have_perm("submissionNew && ". ALLSECTIONS)) || ($this->perm->have_perm("submissionNew && section_id".$this->db->Record['section_id']))) { $this->templ->set_var(array( 'SECTION_ID' => $this->db->Record['section_id'], |
Update of /cvsroot/phpslash/phpslash-ft/class In directory sc8-pr-cvs1:/tmp/cvs-serv32422/phpslash-ft/class Modified Files: Author.class Block_render_fmsearch.class MailingList.class Story_admin.class Submission.class slashAuthCR.class Log Message: permission cleanup, mailinglist fix, fmsearch update Index: Author.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/Author.class,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** Author.class 11 Mar 2003 18:39:16 -0000 1.44 --- Author.class 25 Mar 2003 21:27:11 -0000 1.45 *************** *** 827,831 **** $q = "SELECT DISTINCT author_id, author_name FROM psl_author "; ! if ( !$ary[mode] == "all") { $q .= ", psl_story WHERE psl_story.user_id = psl_author.author_id "; --- 827,831 ---- $q = "SELECT DISTINCT author_id, author_name FROM psl_author "; ! if ( !$ary['mode'] == "all") { $q .= ", psl_story WHERE psl_story.user_id = psl_author.author_id "; *************** *** 836,844 **** while ($this->db->next_record()) { $author_array[] = array( ! "id" => $this->db->f("author_id"), ! "name" => $this->db->f("author_name") ! ); } return $author_array; } --- 836,875 ---- while ($this->db->next_record()) { $author_array[] = array( ! "id" => $this->db->f("author_id"), ! "name" => $this->db->f("author_name") ! ); } return $author_array; + } + + /** + * getAuthor - returns array with author record + * + * + * @access public + * @param $ary - id or name + * @return author_array; + */ + function getAuthor($ary) { + + $q = "SELECT DISTINCT author_id, + author_name, + author_realname, + url, + email, + quote, + seclev, + perms, + author_options + FROM psl_author "; + if ( !empty($ary['author_id'])) { + $q .= "WHERE author_id = '".$ary['author_id']."'"; + } elseif ( !empty($ary['author_name'])){ + $q .= "WHERE author_name = '".$ary['author_name']."'"; + } + $this->db->query($q); + + $this->db->next_record(); + return $this->db->Record; } Index: Block_render_fmsearch.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_fmsearch.class,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Block_render_fmsearch.class 5 Feb 2003 21:58:43 -0000 1.1 --- Block_render_fmsearch.class 25 Mar 2003 21:27:12 -0000 1.2 *************** *** 1,5 **** <?php /* Block_render_fmsearch.class -> Methods for parsing Freshmeat xml-search data * ! * ie : http://freshmeat.net/search-xml/?q=doc§ion=projects&filter=164,847 * /* $Id$ */ --- 1,5 ---- <?php /* Block_render_fmsearch.class -> Methods for parsing Freshmeat xml-search data * ! * ie : http://freshmeat.net/search-xml/?q=doc§ion=projects&filter=164,847 * /* $Id$ */ *************** *** 21,32 **** /** ! * Class to interpret and render a newsfeed (eg RSS 0.91). * * * @access private ! * @author ??. Code amended by Peter Cruickshank, Feb 2002 ! * @version 0.65 * @since version 0.65 * @package phpslash */ class fmparser { --- 21,36 ---- /** ! * Class to interpret and render a search result based on freshmeat xml search * * * @access private ! * @author code savated by to...@us..., March 2003 ! * @version 0.7RC3 * @since version 0.65 * @package phpslash + * @packagetype module + * @moduletype block + * @blocktype fmparser + * */ class fmparser { *************** *** 40,44 **** var $max_items; /** ! * Array listing tags to process (channel, image, item). All others are ignored * @access public */ --- 44,48 ---- var $max_items; /** ! * Array listing tags to process (resultset, image, item). All others are ignored * @access public */ *************** *** 48,55 **** /** ! * Output array of channel information (title, link, description) * @access public */ ! var $channel; /** * Output array of information on image (title, link, url) --- 52,59 ---- /** ! * Output array of result information (title, link, description) * @access public */ ! var $results; /** * Output array of information on image (title, link, url) *************** *** 78,82 **** var $xml; /** ! * Current container-element can be "" (ie channel), "match" or "image" (Should be a stack really, but nesting is only one deep) * @access private */ --- 82,86 ---- var $xml; /** ! * Current container-element can be "" (ie resultset), "match" or "image" (Should be a stack really, but nesting is only one deep) * @access private */ *************** *** 115,123 **** case $this->tags["match"]: case $this->tags["search-results"]: - case $this->tags["item"]: - case $this->tags["image"]: - case $this->tags["channel"]: $this->node = $element; ! // debug("rdf:start element+node","$element+".$this->node); break; --- 119,124 ---- case $this->tags["match"]: case $this->tags["search-results"]: $this->node = $element; ! // debug("freshmeat:start element+node","$element+".$this->node); break; *************** *** 149,153 **** /** ! * Store xml character data in appropriate place (items, image, channel) * * @param xml_parser $xml xml object (not used) --- 150,154 ---- /** ! * Store xml character data in appropriate place (items, image, resultset) * * @param xml_parser $xml xml object (not used) *************** *** 161,188 **** case $this->tags["match"]: switch ($this->current) { case $this->tags["projectname_full"]: $this->items[$this->count]["projectname_full"] .= $data; break; ! case $this->tags["url_homepage"]: ! $this->items[$this->count]["url_homepage"] .= $data; ! break; case $this->tags["desc_short"]: $this->items[$this->count]["desc_short"] .= $data; break; - default: - } - break; ! case $this->tags["search-results"]: ! switch ($this->current) { ! case $this->tags["projectname_full"]: ! $this->channel["projectname_full"] .= $data; break; case $this->tags["url_homepage"]: ! $this->channel["url_homepage"] .= $data; break; ! case $this->tags["desc_short"]: ! $this->channel["desc_short"] .= $data; break; default: } --- 162,262 ---- case $this->tags["match"]: switch ($this->current) { + + case $this->tags["match_count"]: + $this->items[$this->count]["match_count"] .= $data; + break; + + case $this->tags["project_id"]: + $this->items[$this->count]["project_id"] .= $data; + break; + + case $this->tags["date_added"]: + $this->items[$this->count]["date_added"] .= $data; + break; + + case $this->tags["date_updated"]: + $this->items[$this->count]["date_updated"] .= $data; + break; + + case $this->tags["projectname_short"]: + $this->items[$this->count]["projectname_short"] .= $data; + break; + case $this->tags["projectname_full"]: $this->items[$this->count]["projectname_full"] .= $data; break; ! case $this->tags["desc_short"]: $this->items[$this->count]["desc_short"] .= $data; break; ! case $this->tags["desc_full"]: ! $this->items[$this->count]["desc_full"] .= $data; ! break; ! ! case $this->tags["vitality_score"]: ! $this->items[$this->count]["vitality_score"] .= $data; break; + + case $this->tags["vitality_percent"]: + $this->items[$this->count]["vitality_percent"] .= $data; + break; + case $this->tags["url_homepage"]: ! $this->items[$this->count]["url_homepage"] .= $data; break; ! ! case $this->tags["url_tgz"]: ! $this->items[$this->count]["url_tgz"] .= $data; break; + + case $this->tags["url_bz2"]: + $this->items[$this->count]["url_bz2"] .= $data; + break; + + case $this->tags["url_zip"]: + $this->items[$this->count]["url_zip"] .= $data; + break; + + case $this->tags["url_changelog"]: + $this->items[$this->count]["url_changelog"] .= $data; + break; + + case $this->tags["url_rpm"]: + $this->items[$this->count]["url_rpm"] .= $data; + break; + + case $this->tags["url_deb"]: + $this->items[$this->count]["url_deb"] .= $data; + break; + + case $this->tags["url_osx"]: + $this->items[$this->count]["url_osx"] .= $data; + break; + + case $this->tags["url_purchase"]: + $this->items[$this->count]["url_purchase"] .= $data; + break; + + case $this->tags["url_cvs"]: + $this->items[$this->count]["url_cvs"] .= $data; + break; + + case $this->tags["url_list"]: + $this->items[$this->count]["url_list"] .= $data; + break; + + case $this->tags["url_mirror"]: + $this->items[$this->count]["url_mirror"] .= $data; + break; + + case $this->tags["url_demo"]: + $this->items[$this->count]["url_demo"] .= $data; + break; + + case $this->tags["license"]: + $this->items[$this->count]["license"] .= $data; + break; + default: } *************** *** 196,200 **** * Initialise class before it is called (allows for reuse of class if necessary) * ! * @param array $tags values of tags to parse. Default: CHANNEL,IMAGE, ITEM,TITLE, LINK,URL,DESCRIPTION * @param string $max_items (not used) * @access public --- 270,274 ---- * Initialise class before it is called (allows for reuse of class if necessary) * ! * @param array $tags values of tags to parse. Default: SEARCH-RESULTS, MATCH, MATCH_COUNT, PROJECT_ID, DATE_ADDED, DATE_UPDATED, PROJECTNAME_SHORT, PROJECTNAME_FULL, DESC_SHORT, DESC_FULL, VITALITY_SCORE, VITALITY_PERCENT, URL_HOMEPAGE, URL_TGZ, URL_BZ2, URL_ZIP, URL_CHANGELOG, URL_RPM, URL_DEB, URL_OSX, URL_PURCHASE, URL_CVS, URL_LIST, URL_MIRROR, URL_DEMO, LICENSE * @param string $max_items (not used) * @access public *************** *** 205,226 **** $this->tags = $tags; } else { ! // standard rdf setup - must be upper case (assuming case-folding is on which is PHP's default) ! $this->tags = array("search-results" => "SEARCH-RESULTS", ! "match" => "MATCH", ! "projectname_full" => "PROJECTNAME_FULL", ! "projectname_short" => "PROJECTNAME_SHORT", ! "url_homepage" => "URL_HOMEPAGE", ! "desc_short" => "DESC_SHORT", ! "desc_full" => "DESC_FULL" ); } // Internal initialisation $this->count = 0; ! $this->node = ""; // can be "" (ie channel), "match" or "image" $this->current = array(); // element stack $this->error_str = ""; ! $this->channel = array("projectname_full"=>"", "url_homepage"=>"", "desc_short" => ""); $this->image = array('url' =>'http://images.freshmeat.net/logo.gif', 'url_homepage'=>'http://freshmeat.net', 'projectname_full'=>'fm2'); $this->items = array(); --- 279,346 ---- $this->tags = $tags; } else { ! // standard freshmeat setup - must be upper case (assuming case-folding is on which is PHP's default) ! $this->tags = array( ! "search-results" => "SEARCH-RESULTS", ! "match" => "MATCH", ! "match_count" => "MATCH_COUNT", ! "project_id" => "PROJECT_ID", ! "date_added" => "DATE_ADDED", ! "date_updated" => "DATE_UPDATED", ! "projectname_short" => "PROJECTNAME_SHORT", ! "projectname_full" => "PROJECTNAME_FULL", ! "desc_short" => "DESC_SHORT", ! "desc_full" => "DESC_FULL", ! "vitality_score" => "VITALITY_SCORE", ! "vitality_percent" => "VITALITY_PERCENT", ! "url_homepage" => "URL_HOMEPAGE", ! "url_tgz" => "URL_TGZ", ! "url_bz2" => "URL_BZ2", ! "url_zip" => "URL_ZIP", ! "url_changelog" => "URL_CHANGELOG", ! "url_rpm" => "URL_RPM", ! "url_deb" => "URL_DEB", ! "url_osx" => "URL_OSX", ! "url_purchase" => "URL_PURCHASE", ! "url_cvs" => "URL_CVS", ! "url_list" => "URL_LIST", ! "url_mirror" => "URL_MIRROR", ! "url_demo" => "URL_DEMO", ! "license" => "LICENSE" ); } // Internal initialisation $this->count = 0; ! $this->node = ""; $this->current = array(); // element stack $this->error_str = ""; ! $this->results = array( ! "match_count" => "", ! "project_id" => "", ! "date_added" => "", ! "date_updated" => "", ! "projectname_short" => "", ! "projectname_full" => "", ! "desc_short" => "", ! "desc_full" => "", ! "vitality_score" => "", ! "vitality_percent" => "", ! "url_homepage" => "", ! "url_tgz" => "", ! "url_bz2" => "", ! "url_zip" => "", ! "url_changelog" => "", ! "url_rpm" => "", ! "url_deb" => "", ! "url_osx" => "", ! "url_purchase" => "", ! "url_cvs" => "", ! "url_list" => "", ! "url_mirror" => "", ! "url_demo" => "", ! "license" => "" ); ! ! // hardcoded data (to keep a bit of similarity with RSS -- tobozo --) $this->image = array('url' =>'http://images.freshmeat.net/logo.gif', 'url_homepage'=>'http://freshmeat.net', 'projectname_full'=>'fm2'); $this->items = array(); *************** *** 231,242 **** /** ! * Carry out parse of rss source defined by parse_setup() * ! * @param array $tags values of tags to parse. Default: CHANNEL,IMAGE, ITEM,TITLE, LINK,URL,DESCRIPTION * @param string $max_items (not used) * @access public */ function parse_file($url) { ! // debug("rdfparser::parse_file", "Now parsing $url"); /* check for url structure before opening it (you don't want /etc/passwd to be validated here -- tobozo -- */ --- 351,362 ---- /** ! * Carry out parse of xml source defined by parse_setup() * ! * @param array $tags values of tags to parse. Default: SEARCH-RESULTS, MATCH, MATCH_COUNT, PROJECT_ID, DATE_ADDED, DATE_UPDATED, PROJECTNAME_SHORT, PROJECTNAME_FULL, DESC_SHORT, DESC_FULL, VITALITY_SCORE, VITALITY_PERCENT, URL_HOMEPAGE, URL_TGZ, URL_BZ2, URL_ZIP, URL_CHANGELOG, URL_RPM, URL_DEB, URL_OSX, URL_PURCHASE, URL_CVS, URL_LIST, URL_MIRROR, URL_DEMO, LICENSE * @param string $max_items (not used) * @access public */ function parse_file($url) { ! // debug("freshmeatparser::parse_file", "Now parsing $url"); /* check for url structure before opening it (you don't want /etc/passwd to be validated here -- tobozo -- */ *************** *** 273,281 **** if ( !($fpread) ) { // error in opening url ! $this->error_str = "rdfparser::parse_file could not open $url"; ! // debug("rdfparser::parse_file", $this->error_str); // Where does $err* come from? ! // debug("rdfparser::parse_file", "$errstr $errno"); } else { while (($this->error_str == "") && ($data = fread($fpread, 4096))) { --- 393,401 ---- if ( !($fpread) ) { // error in opening url ! $this->error_str = "freshmeatparser::parse_file could not open $url"; ! // debug("freshmeatparser::parse_file", $this->error_str); // Where does $err* come from? ! // debug("freshmeatparser::parse_file", "$errstr $errno"); } else { while (($this->error_str == "") && ($data = fread($fpread, 4096))) { *************** *** 283,292 **** // error $this->error_str = xml_error_string(xml_get_error_code($this->xml)) . " at line " . xml_get_current_line_number($this->xml); ! debug("rdfparser::parse_file", $this->error_str); } } fclose($fpread); if ($this->error_str == "") { ! // debug("rdfparser::parse_file", "Data parsed successfully!"); } } --- 403,412 ---- // error $this->error_str = xml_error_string(xml_get_error_code($this->xml)) . " at line " . xml_get_current_line_number($this->xml); ! debug("freshmeatparser::parse_file", $this->error_str); } } fclose($fpread); if ($this->error_str == "") { ! // debug("freshmeatparser::parse_file", "Data parsed successfully!"); } } *************** *** 298,313 **** * * @access public ! * @author ?? - code amended by Peter Cruickshank, Feb 2002 ! * @version 0.65 * @since version 0.65 * @package phpslash */ class Block_render_fmsearch extends Block_render_i { /** ! * rdfparser object * @access private */ ! var $rdf; /** --- 418,437 ---- * * @access public ! * @author code savated by to...@us..., March 2003 ! * @version 0.7RC3 * @since version 0.65 * @package phpslash + * @packagetype module + * @moduletype block + * @blocktype fmparser + */ class Block_render_fmsearch extends Block_render_i { /** ! * freshmeatparser object * @access private */ ! var $freshmeat; /** *************** *** 318,325 **** $this->Block_render_i(); ! AddClassRequirement("fmparser",$_PSL['classdir'] . "/Block_render_fmsearch.class"); ! $this->rdf = pslNew("fmparser"); $this->type = "fmsearch"; /* set the 'type' */ --- 442,449 ---- $this->Block_render_i(); ! AddClassRequirement("fmparser",$_PSL['classdir'] . "/Block_render_fmsearch.class"); ! $this->freshmeat = pslNew("fmparser"); $this->type = "fmsearch"; /* set the 'type' */ *************** *** 333,339 **** function parse($block_info) { global $_PSL; ! // debug("Block_render_fmsearch::parse", "Starting RDF Block parsing"); ! $default_tpl = "rssblock.tpl"; --- 457,463 ---- function parse($block_info) { global $_PSL; ! // debug("Block_render_fmsearch::parse", "Starting freshmeat Block parsing"); ! $default_tpl = "fmblock.tpl"; *************** *** 346,386 **** if (is_array($block_info["block_options"])) { ! if (is_string($block_info["block_options"]["max_items"])) { ! $max_items = $block_info["block_options"]["max_items"]; ! unset($block_info["block_options"]["max_items"]); ! } ! if (is_string($block_info["block_options"]["target"])) { ! $target = $block_info["block_options"]["target"]; ! unset($block_info["block_options"]["target"]); ! } ! if (is_string($block_info["block_options"]["title"])) { ! $titletype = $block_info["block_options"]["title"]; ! unset($block_info["block_options"]["title"]); ! } ! if (is_string($block_info["block_options"]["tpl"])) { ! if (@file_exists($this->psl['templatedir'] . "/" . basename($block_info['block_options']['tpl']) . ".tpl") ) { ! // should be secure as path directives are discarded and extension added ! $tpl = basename($block_info["block_options"]["tpl"]) . ".tpl"; ! unset($block_info["block_options"]["tpl"]); ! } ! } ! } // debug("Block_render_fmsearch::parse", "setting parser with $item_element, $title_element, $link_element"); ! $this->rdf->parse_setup(); //$item_element, $title_element, $link_element); ! $this->rdf->parse_file($block_info['source_url']); ! if (empty($this->rdf->error_str)) { // debug("Block_render_fmsearch::parse", "xml has no errors, making block"); ! // debug("fmsearch::parse::channel",$this->rdf->channel); ! // debug("fmsearch::parse::image",$this->rdf->image); ! // debug("fmsearch::parse::items", $this->rdf->items); $template = pslNew("slashTemplate",$this->psl["templatedir"]); - $template->set_file ("block", $tpl); ! $template->set_block ("block", "channel_title","title_block"); ! $template->set_block ("block", "channel_image","image_block"); ! $template->set_block ("block", "channel_description","channeldescription_block"); $template->set_block ("block", "each_query", "query_block"); $template->set_block ("block", "each_description", "description_block"); --- 470,514 ---- if (is_array($block_info["block_options"])) { ! if (is_string($block_info["block_options"]["max_items"])) { ! $max_items = $block_info["block_options"]["max_items"]; ! unset($block_info["block_options"]["max_items"]); ! } ! if (is_string($block_info["block_options"]["target"])) { ! $target = $block_info["block_options"]["target"]; ! unset($block_info["block_options"]["target"]); ! } ! if (is_string($block_info["block_options"]["title"])) { ! $titletype = $block_info["block_options"]["title"]; ! unset($block_info["block_options"]["title"]); ! } ! if (is_string($block_info["block_options"]["tpl"])) { ! /* no more file_exists(), the $template->set_file() will handle it (eg allow database templates) --tobozo-- */ ! // should be secure as path directives are discarded and extension added ! $tpl = basename($block_info["block_options"]["tpl"]) . ".tpl"; ! unset($block_info["block_options"]["tpl"]); ! } ! ! } // debug("Block_render_fmsearch::parse", "setting parser with $item_element, $title_element, $link_element"); ! $this->freshmeat->parse_setup(); //$item_element, $title_element, $link_element); ! $this->freshmeat->parse_file($block_info['source_url']); ! if (empty($this->freshmeat->error_str)) { // debug("Block_render_fmsearch::parse", "xml has no errors, making block"); ! // debug("fmsearch::parse::image",$this->freshmeat->image); ! // debug("fmsearch::parse::items", $this->freshmeat->items); $template = pslNew("slashTemplate",$this->psl["templatedir"]); ! /* check for existing template */ ! if($template->set_file('block' , basename($tpl) . ".tpl" )) { ! } else { ! $template->set_file( 'block', $default_tpl); ! } ! ! $template->set_block ("block", "searchblock_title","title_block"); ! $template->set_block ("block", "searchblock_image","image_block"); ! $template->set_block ("block", "searchblock_description","shortdescription_block"); $template->set_block ("block", "each_query", "query_block"); $template->set_block ("block", "each_description", "description_block"); *************** *** 391,429 **** case "text": ! if ( !empty( $this->rdf->channel["projectname_full"]) ) { $template->set_var(array( ! "CHANNEL_TITLE" => $this->rdf->channel["projectname_full"], ! "CHANNEL_LINK" => empty($this->rdf->channel["url_homepage"])?"#":$this->rdf->channel["url_homepage"] ! )); ! $template->parse("title_block","channel_title"); } break; case "image": ! if ( !empty( $this->rdf->channel["image"]) ) { $template->set_var(array( ! "IMAGE_URL" => $this->rdf->image["url"], ! "IMAGE_TITLE" => $this->rdf->image["projectname_full"], ! "IMAGE_LINK" => $this->rdf->image["url_homepage"], )); ! $template->parse("image_block","channel_image"); } break; case "both": ! if ( !empty( $this->rdf->channel["projectname_full"]) ) { $template->set_var(array( ! "CHANNEL_TITLE" => $this->rdf->channel["projectname_full"], ! "CHANNEL_LINK" => empty($this->rdf->channel["url_homepage"])?"#":$this->rdf->channel["url_homepage"] ! )); ! $template->parse("title_block","channel_title"); } ! if ( !empty( $this->rdf->channel["image"]) ) { $template->set_var(array( ! "IMAGE_URL" => $this->rdf->image["url"], ! "IMAGE_TITLE" => $this->rdf->image["projectname_full"], ! "IMAGE_LINK" => $this->rdf->image["url_homepage"], )); ! $template->parse("image_block","channel_image"); } break; --- 519,557 ---- case "text": ! if ( !empty( $this->freshmeat->results["projectname_full"]) ) { $template->set_var(array( ! "SEARCH_TITLE" => $this->freshmeat->results["projectname_full"], ! "SEARCH_LINK" => empty($this->freshmeat->results["url_homepage"])?"#":$this->freshmeat->results["url_homepage"] ! )); ! $template->parse("title_block","searchblock_title"); } break; case "image": ! if ( !empty( $this->freshmeat->results["image"]) ) { $template->set_var(array( ! "IMAGE_URL" => $this->freshmeat->image["url"], ! "IMAGE_TITLE" => $this->freshmeat->image["projectname_full"], ! "IMAGE_LINK" => $this->freshmeat->image["url_homepage"], )); ! $template->parse("image_block","searchblock_image"); } break; case "both": ! if ( !empty( $this->freshmeat->results["projectname_full"]) ) { $template->set_var(array( ! "SEARCH_TITLE" => $this->freshmeat->results["projectname_full"], ! "SEARCH_LINK" => empty($this->freshmeat->results["url_homepage"]) ? "#" : $this->freshmeat->results["url_homepage"] ! )); ! $template->parse("title_block","searchblock_title"); } ! if ( !empty( $this->freshmeat->results["image"]) ) { $template->set_var(array( ! "IMAGE_URL" => $this->freshmeat->image["url"], ! "IMAGE_TITLE" => $this->freshmeat->image["projectname_full"], ! "IMAGE_LINK" => $this->freshmeat->image["url_homepage"], )); ! $template->parse("image_block","searchblock_image"); } break; *************** *** 433,470 **** // <title> and <image> tags seem to hold identical description and link info in most sites // ... so use an image if possible, else show title ! if (empty($this->rdf->image["url"])) { ! if ( !empty( $this->rdf->channel["projectname_full"]) ) { // No image, but there is a title $template->set_var(array( ! "CHANNEL_TITLE" => $this->rdf->channel["projectname_full"], ! "CHANNEL_LINK" => empty($this->rdf->channel["url_homepage"])?"#":$this->rdf->channel["url_homepage"] ! )); ! $template->parse("title_block","channel_title"); } } else { // ...we can show the image $template->set_var(array( ! "IMAGE_URL" => $this->rdf->image["url"], ! "IMAGE_TITLE" => $this->rdf->image["projectname_full"], ! "IMAGE_LINK" => $this->rdf->image["url_homepage"], ! )); ! $template->parse("image_block","channel_image"); } } ! if ( !empty( $this->rdf->channel["desc_short"]) ) { ! $template->set_var("CHANNEL_DESCRIPTION", $this->rdf->channel["desc_short"]); ! $template->parse("channeldescription_block","channel_description",true); } ! $numitems = min($max_items, $this->rdf->count); // debug("fmsearch::numitems",$numitems); for ($items = 0; $items < $numitems; $items++ ) { $template->set_var(array( ! "TITLE" => $this->rdf->items[$items]["projectname_full"], ! "LINK" => $this->rdf->items[$items]["url_homepage"] )); $template->parse ("query_block", "each_query", true); ! if (!empty($this->rdf->items[$items]["desc_short"] )) { ! $template->set_var("DESCRIPTION",$this->rdf->items[$items]["desc_short"] ); $template->parse ("query_block", "each_description", true); } --- 561,620 ---- // <title> and <image> tags seem to hold identical description and link info in most sites // ... so use an image if possible, else show title ! if (empty($this->freshmeat->image["url"])) { ! if ( !empty( $this->freshmeat->results["projectname_full"]) ) { // No image, but there is a title $template->set_var(array( ! "SEARCH_TITLE" => $this->freshmeat->results["projectname_full"], ! "SEARCH_LINK" => empty($this->freshmeat->results["url_homepage"])?"#":$this->freshmeat->results["url_homepage"] ! )); ! $template->parse("title_block","searchblock_title"); } } else { // ...we can show the image $template->set_var(array( ! "IMAGE_URL" => $this->freshmeat->image["url"], ! "IMAGE_TITLE" => $this->freshmeat->image["projectname_full"], ! "IMAGE_LINK" => $this->freshmeat->image["url_homepage"], ! )); ! $template->parse("image_block","searchblock_image"); } } ! if ( !empty( $this->freshmeat->results["desc_short"]) ) { ! $template->set_var("SHORT_DESCRIPTION", $this->freshmeat->results["desc_short"]); ! $template->parse("shortdescription_block","searchblock_description",true); } ! $numitems = min($max_items, $this->freshmeat->count); // debug("fmsearch::numitems",$numitems); for ($items = 0; $items < $numitems; $items++ ) { $template->set_var(array( ! "MATCH_COUNT" => empty($this->freshmeat->items[$items]["match_count"]) ? "#" : $this->freshmeat->items[$items]["match_count"], ! "PROJECT_ID" => empty($this->freshmeat->items[$items]["project_id"]) ? "#" : $this->freshmeat->items[$items]["project_id"], ! "DATE_ADDED" => empty($this->freshmeat->items[$items]["date_added"]) ? "#" : $this->freshmeat->items[$items]["date_added"], ! "DATE_UPDATED" => empty($this->freshmeat->items[$items]["date_updated"]) ? "#" : $this->freshmeat->items[$items]["date_updated"], ! "PROJECTNAME_SHORT" => empty($this->freshmeat->items[$items]["projectname_short"]) ? "#" : $this->freshmeat->items[$items]["projectname_short"], ! "PROJECTNAME_FULL" => empty($this->freshmeat->items[$items]["projectname_full"]) ? "#" : $this->freshmeat->items[$items]["projectname_full"], ! "DESC_SHORT" => empty($this->freshmeat->items[$items]["desc_short"]) ? "#" : $this->freshmeat->items[$items]["desc_short"], ! "DESC_FULL" => empty($this->freshmeat->items[$items]["desc_full"]) ? "#" : $this->freshmeat->items[$items]["desc_full"], ! "VITALITY_SCORE" => empty($this->freshmeat->items[$items]["vitality_score"]) ? "#" : $this->freshmeat->items[$items]["vitality_score"], ! "VITALITY_PERCENT" => empty($this->freshmeat->items[$items]["vitality_percent"]) ? "#" : $this->freshmeat->items[$items]["vitality_percent"], ! "URL_HOMEPAGE" => empty($this->freshmeat->items[$items]["url_homepage"]) ? "#" : $this->freshmeat->items[$items]["url_homepage"], ! "URL_TGZ" => empty($this->freshmeat->items[$items]["url_tgz"]) ? "#" : $this->freshmeat->items[$items]["url_tgz"], ! "URL_BZ2" => empty($this->freshmeat->items[$items]["url_bz2"]) ? "#" : $this->freshmeat->items[$items]["url_bz2"], ! "URL_ZIP" => empty($this->freshmeat->items[$items]["url_zip"]) ? "#" : $this->freshmeat->items[$items]["url_zip"], ! "URL_CHANGELOG" => empty($this->freshmeat->items[$items]["url_changelog"]) ? "#" : $this->freshmeat->items[$items]["url_changelog"], ! "URL_RPM" => empty($this->freshmeat->items[$items]["url_rpm"]) ? "#" : $this->freshmeat->items[$items]["url_rpm"], ! "URL_DEB" => empty($this->freshmeat->items[$items]["url_deb"]) ? "#" : $this->freshmeat->items[$items]["url_deb"], ! "URL_OSX" => empty($this->freshmeat->items[$items]["url_osx"]) ? "#" : $this->freshmeat->items[$items]["url_osx"], ! "URL_PURCHASE" => empty($this->freshmeat->items[$items]["url_purchase"]) ? "#" : $this->freshmeat->items[$items]["url_purchase"], ! "URL_CVS" => empty($this->freshmeat->items[$items]["url_cvs"]) ? "#" : $this->freshmeat->items[$items]["url_cvs"], ! "URL_LIST" => empty($this->freshmeat->items[$items]["url_list"]) ? "#" : $this->freshmeat->items[$items]["url_list"], ! "URL_MIRROR" => empty($this->freshmeat->items[$items]["url_mirror"]) ? "#" : $this->freshmeat->items[$items]["url_mirror"], ! "URL_DEMO" => empty($this->freshmeat->items[$items]["url_demo"]) ? "#" : $this->freshmeat->items[$items]["url_demo"], ! "LICENSE" => empty($this->freshmeat->items[$items]["license"]) ? "#" : $this->freshmeat->items[$items]["license"] )); $template->parse ("query_block", "each_query", true); ! if (!empty($this->freshmeat->items[$items]["desc_short"] )) { ! $template->set_var("DESCRIPTION",$this->freshmeat->items[$items]["desc_short"] ); $template->parse ("query_block", "each_description", true); } *************** *** 472,481 **** $template->set_var(array( ! "TARGET" => $target, ! "ROOTDIR" => $this->psl["rooturl"], ! "IMAGEDIR" => $this->psl["imageurl"] )); $this->output = $template->parse(OUT,"block"); ! $this->title = $this->rdf->channel["projectname_full"]; return true; --- 622,631 ---- $template->set_var(array( ! "TARGET" => $target, ! "ROOTDIR" => $this->psl["rooturl"], ! "IMAGEDIR" => $this->psl["imageurl"] )); $this->output = $template->parse(OUT,"block"); ! $this->title = $this->freshmeat->results["projectname_full"]; return true; *************** *** 485,489 **** $errors = $block_info["block_options"]["errors"]; ! $this->output = "Error in source file:".$this->rdf->error_str; logwrite("FMSearch Block ".$block_info['title']."(".$block_info['id'].")", $this->output); --- 635,639 ---- $errors = $block_info["block_options"]["errors"]; ! $this->output = "Error in source file:".$this->freshmeat->error_str; logwrite("FMSearch Block ".$block_info['title']."(".$block_info['id'].")", $this->output); *************** *** 524,525 **** --- 674,676 ---- } } + Index: MailingList.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/MailingList.class,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** MailingList.class 18 Mar 2003 16:23:24 -0000 1.18 --- MailingList.class 25 Mar 2003 21:27:13 -0000 1.19 *************** *** 305,309 **** function build_body($ary, $offset) { //BEGIN FUNCTION ! if ($date_override) { $ary['bday'] = date("d"); $ary['bday'] = $bday - $offset; --- 305,309 ---- function build_body($ary, $offset) { //BEGIN FUNCTION ! if ($ary['dateoverride']) { $ary['bday'] = date("d"); $ary['bday'] = $bday - $offset; *************** *** 342,345 **** --- 342,346 ---- $this->templ->set_block("messagebodymail", "row", "rows"); + $success = false; while($this->db->next_record()) { *************** *** 354,360 **** )); $this->templ->parse("rows","row",true); } //End While next_record ! ! return $this->templ->parse('OUT',array("messagebodymail")); // return $this->templ->get('OUT'); } //END FUNCTION --- 355,365 ---- )); $this->templ->parse("rows","row",true); + $success = true; } //End While next_record ! if ($success == true) { ! return $this->templ->parse('OUT',array("messagebodymail")); ! } else { ! return false; ! } // return $this->templ->get('OUT'); } //END FUNCTION *************** *** 447,452 **** $this->templ->parse('OUT',array("messagemail")); $final_body = $this->templ->get('OUT'); ! ! if ( mail($email, $mail_subject, $final_body, "From: ".$ary['sender']) ) { $this->message .= pslgetText("Mail Sent Successfully!")."<br>\n"; } else { --- 452,459 ---- $this->templ->parse('OUT',array("messagemail")); $final_body = $this->templ->get('OUT'); ! ! if(empty($ary['body']) && empty($extra_message)){ ! $this->message .= pslgetText("Nothing to send"); ! } elseif ( mail($email, $mail_subject, $final_body, "From: ".$ary['sender']) ) { $this->message .= pslgetText("Mail Sent Successfully!")."<br>\n"; } else { Index: Story_admin.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/Story_admin.class,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Story_admin.class 23 Jan 2003 02:48:03 -0000 1.11 --- Story_admin.class 25 Mar 2003 21:27:14 -0000 1.12 *************** *** 811,829 **** ORDER BY section_name"); while ($this->db->next_record()) { ! $this->template->set_var(array( ! 'SECTION_ID' => $this->db->Record['section_id'], ! 'SECTION_NAME' => $this->db->Record['section_name'] ! )); ! ! $this->template->set_var('SELECTED',""); ! for ($i = 0 ; $i < count($section_ary) ; $i++) { ! if ($section_ary[$i] == $this->db->Record['section_id']) { ! $this->template->set_var('SELECTED',"SELECTED"); ! } ! } ! $this->template->parse("section_rows","section_row",true); } - if (!$this->perm->have_perm("storylistothers")) { $this->template->set_var(array( --- 811,829 ---- ORDER BY section_name"); while ($this->db->next_record()) { ! if (($this->perm->have_perm("storyNew && ". ALLSECTIONS)) || ($this->perm->have_perm("storyNew && section_id".$this->db->Record['section_id']))) { ! $this->template->set_var(array( ! 'SECTION_ID' => $this->db->Record['section_id'], ! 'SECTION_NAME' => $this->db->Record['section_name'] ! )); ! $this->template->set_var('SELECTED',""); ! for ($i = 0 ; $i < count($section_ary) ; $i++) { ! if ($section_ary[$i] == $this->db->Record['section_id']) { ! $this->template->set_var('SELECTED',"SELECTED"); ! } ! } ! $this->template->parse("section_rows","section_row",true); ! } } if (!$this->perm->have_perm("storylistothers")) { $this->template->set_var(array( *************** *** 832,838 **** )); ! # $this->template->set_var('AUTHOR_SELECTED',""); ! $this->template->set_var('AUTHOR_SELECTED',"SELECTED"); ! $this->template->parse("author_rows","author_row",true); } else { --- 832,838 ---- )); ! # $this->template->set_var('AUTHOR_SELECTED',""); ! $this->template->set_var('AUTHOR_SELECTED',"SELECTED"); ! $this->template->parse("author_rows","author_row",true); } else { *************** *** 865,868 **** --- 865,879 ---- // $this->template->p('OUT'); // return true; + } + + /** + * getMessage - returns message text + * + * simply returns the contents of the message variable + * + * @access public + */ + function getMessage() { + return pslgetText($this->message); } Index: Submission.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/Submission.class,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** Submission.class 23 Jan 2003 02:48:03 -0000 1.16 --- Submission.class 25 Mar 2003 21:27:15 -0000 1.17 *************** *** 4,15 **** class Submission { ! var $templ, $db, $psl, $message; function Submission () { ! global $_PSL; $this->db = pslNew("slashDB"); ! $this->psl = $_PSL; $this->message = ''; /* Templates */ --- 4,17 ---- class Submission { ! var $templ, $db, $psl, $message, $perm, $auth; function Submission () { ! global $_PSL, $auth, $perm; $this->db = pslNew("slashDB"); ! $this->psl = &$_PSL; $this->message = ''; + $this->auth = &$auth; + $this->perm = &$perm; /* Templates */ *************** *** 156,160 **** function newSubmission($ary,$data_source) { ! global $submission_name, $submission_email; $this->templ->set_block("formsubmission","topic_row","topic_rows"); --- 158,162 ---- function newSubmission($ary,$data_source) { ! global $submission_name, $submission_email, $perm; $this->templ->set_block("formsubmission","topic_row","topic_rows"); *************** *** 269,283 **** $this->db->query($q); while ($this->db->next_record()) { ! $this->templ->set_var(array( ! 'SECTION_ID' => $this->db->Record['section_id'], ! 'SECTION_NAME' => $this->db->Record['section_name'] ! )); ! $this->templ->set_var('SELECTED',""); ! for ($i = 0 ; $i < count($section_ary) ; $i++) { ! if ($section_ary[$i] == $this->db->Record[section_id]) { ! $this->templ->set_var('SELECTED',"SELECTED"); ! } ! } ! $this->templ->parse("section_rows","section_row",true); } --- 271,287 ---- $this->db->query($q); while ($this->db->next_record()) { ! if (($perm->have_perm("submissionNew && ". ALLSECTIONS)) || ($perm->have_perm("submissionNew && section_id".$this->db->Record['section_id']))) { ! $this->templ->set_var(array( ! 'SECTION_ID' => $this->db->Record['section_id'], ! 'SECTION_NAME' => $this->db->Record['section_name'] ! )); ! $this->templ->set_var('SELECTED',""); ! for ($i = 0 ; $i < count($section_ary) ; $i++) { ! if ($section_ary[$i] == $this->db->Record[section_id]) { ! $this->templ->set_var('SELECTED',"SELECTED"); ! } ! } ! $this->templ->parse("section_rows","section_row",true); ! } } Index: slashAuthCR.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/slashAuthCR.class,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** slashAuthCR.class 7 Mar 2003 14:47:08 -0000 1.44 --- slashAuthCR.class 25 Mar 2003 21:27:16 -0000 1.45 *************** *** 109,113 **** )); ! if (isset($this->auth["uname"])) { $templ->set_var('USERNAME', htmlentities($this->auth["uname"])); } else { --- 109,113 ---- )); ! if (isset($this->auth["uname"]) && $this->auth["uname"] != "nobody") { $templ->set_var('USERNAME', htmlentities($this->auth["uname"])); } else { *************** *** 224,227 **** --- 224,228 ---- $this->auth["perm"] = $this->get_userperms($aid); $this->auth["dname"] = Author::getRealName($aid); + $this->auth["uname"] = Author::getName($aid); $this->auth["email"] = ''; return $aid; *************** *** 583,587 **** while ($db2->next_record()) { $section_perm = "section_id". $db2->Record['section_id']; - // debug("section_perm", $section_perm); $this->auth["perm"][$this->db->Record['group_name']][$section_perm] = true; } --- 584,587 ---- *************** *** 637,645 **** $q = "SELECT section_id FROM psl_group_section_lut ! WHERE group_id = '$group_id' "; $db3 = pslNew("slashDB"); $db3->query($q); while ($db3->next_record()) { ! $section_perm = $db3->Record['section_id']; $this->auth["perm"][$group_name][$childgroup_name][$section_perm] = true; } --- 637,646 ---- $q = "SELECT section_id FROM psl_group_section_lut ! WHERE group_id = '$childgroup_id' "; $db3 = pslNew("slashDB"); $db3->query($q); while ($db3->next_record()) { ! $section_perm = "section_id". $db3->Record['section_id']; ! $this->auth["perm"][$group_name][$childgroup_name][$section_perm] = true; } |
From: Joe S. <joe...@us...> - 2003-03-25 21:27:52
|
Update of /cvsroot/phpslash/phpslash-ft/class/locale In directory sc8-pr-cvs1:/tmp/cvs-serv32422/phpslash-ft/class/locale Modified Files: en.php3 Log Message: permission cleanup, mailinglist fix, fmsearch update Index: en.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/locale/en.php3,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** en.php3 12 Feb 2003 22:33:45 -0000 1.16 --- en.php3 25 Mar 2003 21:27:19 -0000 1.17 *************** *** 729,733 **** "You didn't give a email subject! Halting." => "You didn't give a email subject! Halting.", ! // Navbar.class "Login" => --- 729,736 ---- "You didn't give a email subject! Halting." => "You didn't give a email subject! Halting.", ! ! "Nothing to send, Halting." => ! "Nothing to send, Halting.", ! // Navbar.class "Login" => |
From: Joe S. <joe...@us...> - 2003-03-25 21:27:45
|
Update of /cvsroot/phpslash/phpslash-ft/public_html In directory sc8-pr-cvs1:/tmp/cvs-serv32422/phpslash-ft/public_html Modified Files: login.php3 Log Message: permission cleanup, mailinglist fix, fmsearch update Index: login.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/login.php3,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** login.php3 7 Mar 2003 14:47:05 -0000 1.39 --- login.php3 25 Mar 2003 21:27:09 -0000 1.40 *************** *** 34,39 **** // expire cache for this session ! jpcache_gc('string', "-slashSess-" . $sess->id, "100"); ! $username = $auth->auth['uname']; // $sess->delete(); // may be needed for phplib session4.inc --- 34,40 ---- // expire cache for this session ! if(function_exists('jpcache_gc')) { ! jpcache_gc('string', "-slashSess-" . $sess->id, "100"); ! } $username = $auth->auth['uname']; // $sess->delete(); // may be needed for phplib session4.inc *************** *** 43,46 **** --- 44,57 ---- $auth->auth['uid'] = 'nobody'; $auth->auth['perm'] = ""; + + // load the public user info. + $author = pslNew('Author'); + $aid = $author->getId($auth->auth['uid']); + $auth->auth["perm"] = $auth->get_userperms($aid); + $author_ary['author_id'] = $aid; + $author_ary = $author->getAuthor($author_ary); + $auth->auth["dname"] = $author_ary['author_realname']; + $auth->auth["uname"] = $author_ary['author_name']; + $auth->auth["url"] = $author_ary['url']; $HTTP_GET_VARS['logout'] = ''; |
From: Joe S. <joe...@us...> - 2003-03-25 21:27:43
|
Update of /cvsroot/phpslash/phpslash-ft In directory sc8-pr-cvs1:/tmp/cvs-serv32422/phpslash-ft Modified Files: CHANGES Log Message: permission cleanup, mailinglist fix, fmsearch update Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.730 retrieving revision 1.731 diff -C2 -d -r1.730 -r1.731 *** CHANGES 25 Mar 2003 17:03:29 -0000 1.730 --- CHANGES 25 Mar 2003 21:27:05 -0000 1.731 *************** *** 13,18 **** 9 - Removal of something (kill -9 :) 2003-March-25 11:00AM CST Joe Stewart <joe...@us...> ! [B] - NavBar.class - getNavBar now correctly the menu array "perm" entry for public users as well as logged in users. submission.php3, config.php3 - require "submissionNew" permission to --- 13,31 ---- 9 - Removal of something (kill -9 :) + 2003-March-25 2:30PM CST Joe Stewart <joe...@us...> + [BT] - Mailinglist.class, en.php3 - Doesn't send empty emails. + config-dist.php3 - match menu priv. with admin script privileges. + login.php3 - anonymous user info loaded when logging out. + slashAuthCR.class - squashed bug that prevented child groups from + limiting sections correctly. + Author.class - new method - getAuthor returns all fields of a author + record except password. + Submission.class, Story_admin.class, storyAdmin.php3 - limit posting + to allowed sections. + Block_render_fmsearch.class, fmblock.tpl - tobozo's updated Freshmeat + xml parsing block. + 2003-March-25 11:00AM CST Joe Stewart <joe...@us...> ! [B] - NavBar.class - getNavBar now correctly uses the menu array "perm" entry for public users as well as logged in users. submission.php3, config.php3 - require "submissionNew" permission to |
From: Joe S. <joe...@us...> - 2003-03-25 21:27:43
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/admin In directory sc8-pr-cvs1:/tmp/cvs-serv32422/phpslash-ft/public_html/admin Modified Files: storyAdmin.php3 Log Message: permission cleanup, mailinglist fix, fmsearch update Index: storyAdmin.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/admin/storyAdmin.php3,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** storyAdmin.php3 20 Dec 2002 22:17:32 -0000 1.19 --- storyAdmin.php3 25 Mar 2003 21:27:09 -0000 1.20 *************** *** 30,34 **** } ! $auth->login_if(!$perm->have_perm('storyList')); $content = ''; --- 30,34 ---- } ! // $auth->login_if(!$perm->have_perm('storyList')); $content = ''; *************** *** 36,40 **** $story = pslNew("Story_admin"); ! if ($perm->have_perm("storyList")) { switch ($submit) { --- 36,40 ---- $story = pslNew("Story_admin"); ! // if ($perm->have_perm("storyList")) { switch ($submit) { *************** *** 42,52 **** case "delete": if ($perm->have_perm("storyDelete")) { ! if(!$story->deleteStory($story_id)) { $content .= getError(pslgetText("Sorry. You do not have the necessary privilege to view this page.")); ! } ! } ! if ($perm->have_perm("storyList")) { ! $content .= $story->listStory($ary,$next); ! } break; --- 42,55 ---- case "delete": if ($perm->have_perm("storyDelete")) { ! $success = $story->deleteStory($story_id); ! if($success == false) { $content .= getError(pslgetText("Sorry. You do not have the necessary privilege to view this page.")); ! } else { ! $content .= $story->getMessage(); ! } ! } ! if ($perm->have_perm("storyList")) { ! $content .= $story->listStory($ary,$next); ! } break; *************** *** 59,68 **** } ! // expire cache for this story_id ! jpcache_gc('string', "-story_id-" . $HTTP_POST_VARS['story_id'], "100"); ! // expire cache for these section_id's ! $section_id_ary = $HTTP_POST_VARS['section_id_ary']; ! foreach($section_id_ary as $key => $value) { ! jpcache_gc('string', "-section_id-" . $value, "100"); } } --- 62,73 ---- } ! if(function_exists('jpcache_gc')) { ! // expire cache for this story_id ! jpcache_gc('string', "-story_id-" . $HTTP_POST_VARS['story_id'], "100"); ! // expire cache for these section_id's ! $section_id_ary = $HTTP_POST_VARS['section_id_ary']; ! foreach($section_id_ary as $key => $value) { ! jpcache_gc('string', "-section_id-" . $value, "100"); ! } } } *************** *** 109,115 **** if ($perm->have_perm("storyList")) { $content .= $story->listStory($ary,$next); ! } } ! } else { $content = getTitlebar("100%", "Error! Invalid Privileges"); $content .= getError(pslgetText("Sorry. You do not have the necessary privilege to view this page.")); --- 114,127 ---- if ($perm->have_perm("storyList")) { $content .= $story->listStory($ary,$next); ! } else { ! $content = getTitlebar("100%", "Error! Invalid Privileges"); ! $content .= getError(pslgetText("Sorry. You do not have the necessary privilege to view this page.")); ! ! } } ! // } else { ! if( $content == '') { ! $auth->auth['error'] = pslgetText("Sorry. You do not have the necessary privilege to view this page."); ! $auth->login_if(!$perm->have_perm('storyList')); $content = getTitlebar("100%", "Error! Invalid Privileges"); $content .= getError(pslgetText("Sorry. You do not have the necessary privilege to view this page.")); |
From: Joe S. <joe...@us...> - 2003-03-25 21:27:40
|
Update of /cvsroot/phpslash/phpslash-ft/doc/html In directory sc8-pr-cvs1:/tmp/cvs-serv32422/phpslash-ft/doc/html Modified Files: phpslash.sgml Log Message: permission cleanup, mailinglist fix, fmsearch update Index: phpslash.sgml =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/doc/html/phpslash.sgml,v retrieving revision 1.67 retrieving revision 1.68 diff -C2 -d -r1.67 -r1.68 *** phpslash.sgml 31 Jan 2003 19:36:32 -0000 1.67 --- phpslash.sgml 25 Mar 2003 21:27:04 -0000 1.68 *************** *** 1,3 **** ! <!doctype linuxdoc system> <!-- --- 1,3 ---- ! a!doctype linuxdoc system> <!-- *************** *** 937,940 **** --- 937,981 ---- </itemize> + + + <sect1>From versions 0.7 to 0.nn + <p> Versions of phpSlash greater than 0.6.2 <bf>will not</bf> support + upgrading a 0.5.x install. You will manually need to upgrade to 0.6.2 and + then upgrade from that point on. The reason for this is that the + database schema in 0.6x radically changed from 0.5x and supporting that + particular upgrade path is just not feasible or viable given the number of + developers we have. + + <sect2>Before you begin + + <P> + <itemize> + <item> Install phpslash 0.nn in a new directory and set all the path + related variables as documented in the INSTALL file. Oh yeah, copy over + any special logos or topic images that you will need from the old slash + directory to the new one. + </itemize> + + <sect2>The Upgrade + + <p> + <enum> + + <item>This is a list of template files that are new or changed since the + release of 0.7: + + <tscreen><code> + fmblock.tpl + searchPage.tpl + </code></tscreen> + + </enum> + + That should be it. If you get any errors, then send an email to the list + and we'll try to help out as best as we can. + + <sect2> Troubleshooting + + <p> <!-- SECTION START: User Documentation --> |
From: Joe S. <joe...@us...> - 2003-03-25 21:27:29
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default In directory sc8-pr-cvs1:/tmp/cvs-serv32422/phpslash-ft/public_html/templates/en/default Added Files: fmblock.tpl Log Message: permission cleanup, mailinglist fix, fmsearch update --- NEW FILE: fmblock.tpl --- <!-- BEGIN searchblock_title --> <b><a class="Link3" href="{SEARCH_LINK}" target="{TARGET}">{SEARCH_TITLE}</a></b><br> <!-- END searchblock_title --> <!-- BEGIN searchblock_image --> <a class="Link3" href="{IMAGE_LINK}" target="{TARGET}"><img src="{IMAGE_URL}" title="{IMAGE_TITLE}" alt="{IMAGE_TITLE}" border="0"></a> <!-- END searchblock_image --> <!-- BEGIN searchblock_description --> <i>{SHORT_DESCRIPTION}</i><br> <!-- END searchblock_description --> <!-- BEGIN each_query --> <table cellspacing="0" cellpadding="2" border="0" width="100%" summary="{DESC_FULL}"> <tr> <td valign="top" width="50%"> <!-- {MATCH_COUNT} --><a class="Link3" href="http://freshmeat.net/projects/{PROJECTNAME_SHORT}/">{PROJECTNAME_FULL}</a> <br> {DESC_SHORT} (#{PROJECT_ID}).<br><br> <a href="{URL_HOMEPAGE}"><img src="http://images.freshmeat.net/url_homepage.gif" width="16" height="16" alt="Homepage" title="Homepage" border="0"></a> <a href="{URL_TGZ}"><img src="http://images.freshmeat.net/url_tgz.gif" width="16" height="16" alt="Tar/GZ" title="Tar/GZ" border="0"></a> <a href="{URL_CHANGELOG}"><img src="http://images.freshmeat.net/url_changelog.gif" width="16" height="16" alt="Changelog" title="Changelog" border="0"></a> <!-- a href="{URL_BZ2}"><img src="http://images.freshmeat.net/url_bz2.gif" width="16" height="16" alt="Bz2" title="Bz2" border="0"></a --> <a href="{URL_ZIP}"><img src="http://images.freshmeat.net/url_zip.gif" width="16" height="16" alt="Zip" title="Zip" border="0"></a> <!-- a href="{URL_RPM}"><img src="images/fm/url_rpm.gif" width="16" height="16" alt="" title="" border="0"></a --> <!-- a href="{URL_DEB}"><img src="images/fm/url_deb.gif" width="16" height="16" alt="" title="" border="0"></a --> <!-- a href="{URL_OSX}"><img src="images/fm/url_osx.gif" width="16" height="16" alt="" title="" border="0"></a --> <!-- a href="{URL_CVS}"><img src="images/fm/url_cvs.gif" width="16" height="16" alt="" title="" border="0"></a --> <!-- a href="{URL_DEMO}"><img src="images/fm/url_demo.gif" width="16" height="16" alt="" title="" border="0"></a --> </td> <td valign="top"> <table cellspacing="0" cellpadding="1" border="0"> <tr> <td valign="top"><small>Added:</small></td> <td valign="top"><b><small>{DATE_ADDED}</small></b></td> </tr> <tr> <td valign="top"><small>Updated:</small></td> <td valign="top"><b><small>{DATE_UPDATED}</small></b></td> </tr> <tr> <td valign="top"><small>Vitality:</small></td> <td valign="top"><b><small>{VITALITY_SCORE}</small></b></td> </tr> <tr> <td valign="top"><small>Popularity:</small></td> <td valign="top"><b><small>{VITALITY_PERCENT}</small></b></td> </tr> <tr> <td valign="top"><small>License:</small></td> <td valign="top"><b><small>{LICENSE}</small></b></td> </tr> </table> </td> </tr> </table> <!-- END each_query --> <!-- BEGIN each_description --> <!-- br><i>{DESCRIPTION}</i --> <!-- END each_description --> |
From: Joe S. <joe...@us...> - 2003-03-25 21:27:25
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basic In directory sc8-pr-cvs1:/tmp/cvs-serv32422/phpslash-ft/public_html/templates/en/basic Added Files: fmblock.tpl Log Message: permission cleanup, mailinglist fix, fmsearch update --- NEW FILE: fmblock.tpl --- <!-- BEGIN searchblock_title --> <b><a class="Link3" href="{SEARCH_LINK}" target="{TARGET}">{SEARCH_TITLE}</a></b><br> <!-- END searchblock_title --> <!-- BEGIN searchblock_image --> <a class="Link3" href="{IMAGE_LINK}" target="{TARGET}"><img src="{IMAGE_URL}" title="{IMAGE_TITLE}" alt="{IMAGE_TITLE}" border="0"></a> <!-- END searchblock_image --> <!-- BEGIN searchblock_description --> <i>{SHORT_DESCRIPTION}</i><br> <!-- END searchblock_description --> <!-- BEGIN each_query --> <table cellspacing="0" cellpadding="2" border="0" width="100%" summary="{DESC_FULL}"> <tr> <td valign="top" width="50%"> <!-- {MATCH_COUNT} --><a class="Link3" href="http://freshmeat.net/projects/{PROJECTNAME_SHORT}/">{PROJECTNAME_FULL}</a> <br> {DESC_SHORT} (#{PROJECT_ID}).<br><br> <a href="{URL_HOMEPAGE}"><img src="http://images.freshmeat.net/url_homepage.gif" width="16" height="16" alt="Homepage" title="Homepage" border="0"></a> <a href="{URL_TGZ}"><img src="http://images.freshmeat.net/url_tgz.gif" width="16" height="16" alt="Tar/GZ" title="Tar/GZ" border="0"></a> <a href="{URL_CHANGELOG}"><img src="http://images.freshmeat.net/url_changelog.gif" width="16" height="16" alt="Changelog" title="Changelog" border="0"></a> <!-- a href="{URL_BZ2}"><img src="http://images.freshmeat.net/url_bz2.gif" width="16" height="16" alt="Bz2" title="Bz2" border="0"></a --> <a href="{URL_ZIP}"><img src="http://images.freshmeat.net/url_zip.gif" width="16" height="16" alt="Zip" title="Zip" border="0"></a> <!-- a href="{URL_RPM}"><img src="images/fm/url_rpm.gif" width="16" height="16" alt="" title="" border="0"></a --> <!-- a href="{URL_DEB}"><img src="images/fm/url_deb.gif" width="16" height="16" alt="" title="" border="0"></a --> <!-- a href="{URL_OSX}"><img src="images/fm/url_osx.gif" width="16" height="16" alt="" title="" border="0"></a --> <!-- a href="{URL_CVS}"><img src="images/fm/url_cvs.gif" width="16" height="16" alt="" title="" border="0"></a --> <!-- a href="{URL_DEMO}"><img src="images/fm/url_demo.gif" width="16" height="16" alt="" title="" border="0"></a --> </td> <td valign="top"> <table cellspacing="0" cellpadding="1" border="0"> <tr> <td valign="top"><small>Added:</small></td> <td valign="top"><b><small>{DATE_ADDED}</small></b></td> </tr> <tr> <td valign="top"><small>Updated:</small></td> <td valign="top"><b><small>{DATE_UPDATED}</small></b></td> </tr> <tr> <td valign="top"><small>Vitality:</small></td> <td valign="top"><b><small>{VITALITY_SCORE}</small></b></td> </tr> <tr> <td valign="top"><small>Popularity:</small></td> <td valign="top"><b><small>{VITALITY_PERCENT}</small></b></td> </tr> <tr> <td valign="top"><small>License:</small></td> <td valign="top"><b><small>{LICENSE}</small></b></td> </tr> </table> </td> </tr> </table> <!-- END each_query --> <!-- BEGIN each_description --> <!-- br><i>{DESCRIPTION}</i --> <!-- END each_description --> |
From: Joe S. <joe...@us...> - 2003-03-25 17:04:02
|
Update of /cvsroot/phpslash/phpslash-ft/class In directory sc8-pr-cvs1:/tmp/cvs-serv11170/phpslash-ft/class Modified Files: NavBar.class Log Message: navbar permission tweak, submissionNew permission require to submit a story Index: NavBar.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/NavBar.class,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** NavBar.class 7 Jan 2003 19:31:13 -0000 1.18 --- NavBar.class 25 Mar 2003 17:03:28 -0000 1.19 *************** *** 90,98 **** $this->parse($menu_ary[$i]['name'],$menu_ary[$i]['link'] ); } elseif ($auth->is_authenticated() and is_object($perm) ) { ! if($perm->have_perm('user') ) { ! if ($perm->have_perm($menu_ary[$i]['perm'])) { ! $this->parse($menu_ary[$i]['name'],$menu_ary[$i]['link'] ); ! } ! } elseif ($menu_ary[$i]['perm'] == "") { $this->parse($menu_ary[$i]['name'],$menu_ary[$i]['link'] ); } --- 90,96 ---- $this->parse($menu_ary[$i]['name'],$menu_ary[$i]['link'] ); } elseif ($auth->is_authenticated() and is_object($perm) ) { ! if ($perm->have_perm($menu_ary[$i]['perm'])) { ! $this->parse($menu_ary[$i]['name'],$menu_ary[$i]['link'] ); ! } elseif ($menu_ary[$i]['perm'] == "" && !$perm->have_perm('user')) { $this->parse($menu_ary[$i]['name'],$menu_ary[$i]['link'] ); } |
From: Joe S. <joe...@us...> - 2003-03-25 17:04:01
|
Update of /cvsroot/phpslash/phpslash-ft/public_html In directory sc8-pr-cvs1:/tmp/cvs-serv11170/phpslash-ft/public_html Modified Files: submission.php3 config-dist.php3 Log Message: navbar permission tweak, submissionNew permission require to submit a story Index: submission.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/submission.php3,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** submission.php3 23 Jan 2003 19:30:56 -0000 1.20 --- submission.php3 25 Mar 2003 17:03:27 -0000 1.21 *************** *** 9,13 **** // page_open(array("sess"=>"slashSess","auth"=>"slashAuth","perm"=>"slashPerm")); ! // $auth->login_if(!$perm->have_perm('submissionNew')); $ary = array(); --- 9,13 ---- // page_open(array("sess"=>"slashSess","auth"=>"slashAuth","perm"=>"slashPerm")); ! $auth->login_if(!$perm->have_perm('submissionNew')); $ary = array(); Index: config-dist.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/config-dist.php3,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** config-dist.php3 11 Mar 2003 18:39:18 -0000 1.41 --- config-dist.php3 25 Mar 2003 17:03:27 -0000 1.42 *************** *** 430,434 **** 'name' => "Add Story", 'link' => $_PSL['rooturl'] . "/submission.php3", ! 'perm' => "nobody", 'module' => "Submission" ); --- 430,434 ---- 'name' => "Add Story", 'link' => $_PSL['rooturl'] . "/submission.php3", ! 'perm' => "submissionNew", 'module' => "Submission" ); |
From: Joe S. <joe...@us...> - 2003-03-25 17:03:35
|
Update of /cvsroot/phpslash/phpslash-ft In directory sc8-pr-cvs1:/tmp/cvs-serv11170/phpslash-ft Modified Files: CHANGES Log Message: navbar permission tweak, submissionNew permission require to submit a story Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.729 retrieving revision 1.730 diff -C2 -d -r1.729 -r1.730 *** CHANGES 25 Mar 2003 15:56:57 -0000 1.729 --- CHANGES 25 Mar 2003 17:03:29 -0000 1.730 *************** *** 13,20 **** 9 - Removal of something (kill -9 :) 2003-March-25 10:00AM CST Joe Stewart <joe...@us...> ! [W] - functions.inc - replaced "section" argument to getHeader with an array argument ! that the contents will be parsed in the template with the array key used as ! a template placeholder. getFooter now has similar capabilities also. 2003-March-20 3:00PM CST Joe Stewart <joe...@us...> --- 13,27 ---- 9 - Removal of something (kill -9 :) + 2003-March-25 11:00AM CST Joe Stewart <joe...@us...> + [B] - NavBar.class - getNavBar now correctly the menu array "perm" entry + for public users as well as logged in users. + submission.php3, config.php3 - require "submissionNew" permission to + make submissions. + 2003-March-25 10:00AM CST Joe Stewart <joe...@us...> ! [W] - functions.inc - replaced "section" argument to getHeader with an array ! argument that the contents will be parsed in the template with the array ! key used as a template placeholder. getFooter now has similar ! capabilities also. 2003-March-20 3:00PM CST Joe Stewart <joe...@us...> |
From: Joe S. <joe...@us...> - 2003-03-25 15:57:03
|
Update of /cvsroot/phpslash/phpslash-ft In directory sc8-pr-cvs1:/tmp/cvs-serv32585/phpslash-ft Modified Files: CHANGES Log Message: getHeader, getFooter extra_ary argument Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.728 retrieving revision 1.729 diff -C2 -d -r1.728 -r1.729 *** CHANGES 20 Mar 2003 21:39:27 -0000 1.728 --- CHANGES 25 Mar 2003 15:56:57 -0000 1.729 *************** *** 13,16 **** --- 13,21 ---- 9 - Removal of something (kill -9 :) + 2003-March-25 10:00AM CST Joe Stewart <joe...@us...> + [W] - functions.inc - replaced "section" argument to getHeader with an array argument + that the contents will be parsed in the template with the array key used as + a template placeholder. getFooter now has similar capabilities also. + 2003-March-20 3:00PM CST Joe Stewart <joe...@us...> [W] - slash-all.sql, 65_to_7.sql - removed storyeditor privileges from story |
From: Joe S. <joe...@us...> - 2003-03-25 15:57:03
|
Update of /cvsroot/phpslash/phpslash-ft/class In directory sc8-pr-cvs1:/tmp/cvs-serv32585/phpslash-ft/class Modified Files: functions.inc Log Message: getHeader, getFooter extra_ary argument Index: functions.inc =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/functions.inc,v retrieving revision 1.138 retrieving revision 1.139 diff -C2 -d -r1.138 -r1.139 *** functions.inc 11 Mar 2003 18:39:16 -0000 1.138 --- functions.inc 25 Mar 2003 15:56:58 -0000 1.139 *************** *** 444,448 **** /** * dump contents of array into HTML ! * * @access private * @deprec debug now calls debug_iterator instead --- 444,448 ---- /** * dump contents of array into HTML ! * * @access private * @deprec debug now calls debug_iterator instead *************** *** 473,483 **** Parameters : $title -> Title of the page being displayed $metaobject -> Extra stuff about the page (Admin, Home, Poll) ! $section -> if supplied, generates blocks for this section *******************************************************************************/ ! function slashhead($title,$metaobject, $section='') { ! echo getHeader($title,$metaobject, $section=''); ! } /****************************************************************************** --- 473,485 ---- Parameters : $title -> Title of the page being displayed $metaobject -> Extra stuff about the page (Admin, Home, Poll) ! $extra_ary -> if supplied, the array keys are used as template ! placeholders with the values substituted. ! $tpl -> optional alternate template *******************************************************************************/ ! function slashhead($title,$metaobject, $extra_ary='', $tpl='') { ! echo getHeader($title, $metaobject, $extra_ary, $tpl); ! } /****************************************************************************** *************** *** 489,500 **** Parameters : $title -> Title of the page being displayed $metaobject -> Extra stuff about the page (Admin, Home, Poll) ! Accepts an array of name/value pairs for metatags. ! Alternative navbar template or menu can be passed in ! navbar_ary[tpl] or navbar_ary[menu_ary]. ! $section -> if supplied, generates blocks for this section ! Accepts an array to pass to getBlocks $tpl -> optional alternate template *******************************************************************************/ ! function getHeader($title,$metaobject, $section='', $tpl='') { --- 491,502 ---- Parameters : $title -> Title of the page being displayed $metaobject -> Extra stuff about the page (Admin, Home, Poll) ! Accepts an array of name/value pairs for metatags. ! Alternative navbar template or menu can be passed in ! navbar_ary[tpl] or navbar_ary[menu_ary]. ! $extra_ary -> if supplied, the array keys are used as template ! placeholders with the values substituted. $tpl -> optional alternate template *******************************************************************************/ ! function getHeader($title, $metaobject, $extra_ary='', $tpl='') { *************** *** 509,526 **** return pslgetText("NO TITLE"); }; - - if (!isset($section)) { - $block = pslNew("Block_i"); - // should be passing array now days - if( is_array($section)) { - $allblocks = $block->getBlocks($section); - } else { - $allblocks = $block->getAllBlocksForIndex($section); - } - } else { - $allblocks = ''; - } - - /* Templates */ --- 511,514 ---- *************** *** 530,549 **** if( $tpl == '') { $templ->set_file( 'header', $default_template); ! } elseif ( $templ->set_file('header' , basename($tpl) . ".tpl" )) { } else { $templ->set_file( 'header', $default_template); ! } $templ->set_block ("header", "each_metatag", "metatag_block"); if ( is_array($metaobject)) { ! $templ->set_var('XSITEOBJECT', $metaobject['object']); unset($metaobject['object']); ! if(!empty($metaobject['navbar_ary'])) { $navbar_ary = $metaobject['navbar_ary']; ! } unset($metaobject['navbar_ary']); ! while( list( $key, $value) = each( $metaobject )) { $templ->set_var (array ( --- 518,537 ---- if( $tpl == '') { $templ->set_file( 'header', $default_template); ! } elseif ( $templ->set_file('header' , basename($tpl) . ".tpl" )) { } else { $templ->set_file( 'header', $default_template); ! } $templ->set_block ("header", "each_metatag", "metatag_block"); if ( is_array($metaobject)) { ! $templ->set_var('XSITEOBJECT', $metaobject['object']); unset($metaobject['object']); ! if(!empty($metaobject['navbar_ary'])) { $navbar_ary = $metaobject['navbar_ary']; ! } unset($metaobject['navbar_ary']); ! while( list( $key, $value) = each( $metaobject )) { $templ->set_var (array ( *************** *** 579,582 **** --- 567,577 ---- } + // parse extra array into template variable placeholder and value + if( is_array($extra_ary)) { + foreach($extra_ary as $key => $value) { + $templ->set_var(array(strtoupper($key) => $value)); + } + } + $templ->set_var(array( 'QUERYSTRING' => $QUERY_STRING, *************** *** 606,613 **** Used to generate the footer on the bottom of each page ! Parameters : None *******************************************************************************/ ! function slashfoot() { ! echo getFooter(); } --- 601,610 ---- Used to generate the footer on the bottom of each page ! Parameters : $tpl -> optional alternate template ! $extra_ary -> if supplied, the array keys are used as template ! placeholders with the values substituted. *******************************************************************************/ ! function slashfoot($tpl="", $extra_ary='') { ! echo getFooter($tpl, $extra_ary); } *************** *** 618,625 **** Used to generate the footer on the bottom of each page ! ! Parameters : optional template (no .tpl) *******************************************************************************/ ! function getFooter($tpl="") { global $_PSL; --- 615,624 ---- Used to generate the footer on the bottom of each page ! ! Parameters : $tpl -> optional alternate template ! $extra_ary -> if supplied, the array keys are used as template ! placeholders with the values substituted. *******************************************************************************/ ! function getFooter($tpl="", $extra_ary='') { global $_PSL; *************** *** 627,638 **** if ($_PSL['module']['NavBar']) { $navbar = pslNew("NavBar"); ! $navbarcontent = $navbar->getNavBar("navbarFooter"); } else { $navbarcontent = ""; } ! /* Templates */ $default_template = "slashFoot.tpl"; ! $templ = pslNew("slashTemplate",$_PSL['templatedir']); $templ->debug = 0; --- 626,637 ---- if ($_PSL['module']['NavBar']) { $navbar = pslNew("NavBar"); ! $navbarcontent = $navbar->getNavBar("navbarFooter"); } else { $navbarcontent = ""; } ! /* Templates */ $default_template = "slashFoot.tpl"; ! $templ = pslNew("slashTemplate",$_PSL['templatedir']); $templ->debug = 0; *************** *** 640,647 **** if( $tpl == '') { $templ->set_file( 'footer', $default_template); ! } elseif ( $templ->set_file('footer' , basename($tpl) . ".tpl" )) { } else { $templ->set_file( 'footer', $default_template); ! } $templ->set_var(array( --- 639,653 ---- if( $tpl == '') { $templ->set_file( 'footer', $default_template); ! } elseif ( $templ->set_file('footer' , basename($tpl) . ".tpl" )) { } else { $templ->set_file( 'footer', $default_template); ! } ! ! // parse extra array into template variable placeholder and value ! if( is_array($extra_ary)) { ! foreach($extra_ary as $key => $value) { ! $templ->set_var(array(strtoupper($key) => $value)); ! } ! } $templ->set_var(array( |
From: Joe S. <joe...@us...> - 2003-03-20 21:39:32
|
Update of /cvsroot/phpslash/phpslash-ft/tables/0.7 In directory sc8-pr-cvs1:/tmp/cvs-serv6246/phpslash-ft/tables/0.7 Modified Files: 65_to_7.sql slash-all.sql Log Message: removed storyeditor privileges from story group Index: 65_to_7.sql =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/tables/0.7/65_to_7.sql,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** 65_to_7.sql 25 Feb 2003 16:01:38 -0000 1.15 --- 65_to_7.sql 20 Mar 2003 21:39:28 -0000 1.16 *************** *** 169,180 **** INSERT INTO psl_group_permission_lut VALUES (65,15,32); INSERT INTO psl_group_permission_lut VALUES (66,15,31); ! INSERT INTO psl_group_permission_lut VALUES (67,16,78); ! INSERT INTO psl_group_permission_lut VALUES (68,16,77); INSERT INTO psl_group_permission_lut VALUES (69,16,71); ! INSERT INTO psl_group_permission_lut VALUES (70,16,79); INSERT INTO psl_group_permission_lut VALUES (71,16,74); ! INSERT INTO psl_group_permission_lut VALUES (72,16,76); INSERT INTO psl_group_permission_lut VALUES (73,16,75); ! INSERT INTO psl_group_permission_lut VALUES (74,16,80); INSERT INTO psl_group_permission_lut VALUES (75,16,73); INSERT INTO psl_group_permission_lut VALUES (76,16,72); --- 169,180 ---- INSERT INTO psl_group_permission_lut VALUES (65,15,32); INSERT INTO psl_group_permission_lut VALUES (66,15,31); ! # INSERT INTO psl_group_permission_lut VALUES (67,16,78); ! # INSERT INTO psl_group_permission_lut VALUES (68,16,77); INSERT INTO psl_group_permission_lut VALUES (69,16,71); ! # INSERT INTO psl_group_permission_lut VALUES (70,16,79); INSERT INTO psl_group_permission_lut VALUES (71,16,74); ! # INSERT INTO psl_group_permission_lut VALUES (72,16,76); INSERT INTO psl_group_permission_lut VALUES (73,16,75); ! # INSERT INTO psl_group_permission_lut VALUES (74,16,80); INSERT INTO psl_group_permission_lut VALUES (75,16,73); INSERT INTO psl_group_permission_lut VALUES (76,16,72); Index: slash-all.sql =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/tables/0.7/slash-all.sql,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** slash-all.sql 7 Mar 2003 20:01:49 -0000 1.26 --- slash-all.sql 20 Mar 2003 21:39:29 -0000 1.27 *************** *** 449,460 **** INSERT INTO psl_group_permission_lut (lut_id, group_id, permission_id) VALUES (65,15,32); INSERT INTO psl_group_permission_lut (lut_id, group_id, permission_id) VALUES (66,15,31); ! INSERT INTO psl_group_permission_lut (lut_id, group_id, permission_id) VALUES (67,16,78); ! INSERT INTO psl_group_permission_lut (lut_id, group_id, permission_id) VALUES (68,16,77); INSERT INTO psl_group_permission_lut (lut_id, group_id, permission_id) VALUES (69,16,71); ! INSERT INTO psl_group_permission_lut (lut_id, group_id, permission_id) VALUES (70,16,79); INSERT INTO psl_group_permission_lut (lut_id, group_id, permission_id) VALUES (71,16,74); ! INSERT INTO psl_group_permission_lut (lut_id, group_id, permission_id) VALUES (72,16,76); INSERT INTO psl_group_permission_lut (lut_id, group_id, permission_id) VALUES (73,16,75); ! INSERT INTO psl_group_permission_lut (lut_id, group_id, permission_id) VALUES (74,16,80); INSERT INTO psl_group_permission_lut (lut_id, group_id, permission_id) VALUES (75,16,73); INSERT INTO psl_group_permission_lut (lut_id, group_id, permission_id) VALUES (76,16,72); --- 449,460 ---- INSERT INTO psl_group_permission_lut (lut_id, group_id, permission_id) VALUES (65,15,32); INSERT INTO psl_group_permission_lut (lut_id, group_id, permission_id) VALUES (66,15,31); ! # INSERT INTO psl_group_permission_lut (lut_id, group_id, permission_id) VALUES (67,16,78); ! # INSERT INTO psl_group_permission_lut (lut_id, group_id, permission_id) VALUES (68,16,77); INSERT INTO psl_group_permission_lut (lut_id, group_id, permission_id) VALUES (69,16,71); ! # INSERT INTO psl_group_permission_lut (lut_id, group_id, permission_id) VALUES (70,16,79); INSERT INTO psl_group_permission_lut (lut_id, group_id, permission_id) VALUES (71,16,74); ! # INSERT INTO psl_group_permission_lut (lut_id, group_id, permission_id) VALUES (72,16,76); INSERT INTO psl_group_permission_lut (lut_id, group_id, permission_id) VALUES (73,16,75); ! # INSERT INTO psl_group_permission_lut (lut_id, group_id, permission_id) VALUES (74,16,80); INSERT INTO psl_group_permission_lut (lut_id, group_id, permission_id) VALUES (75,16,73); INSERT INTO psl_group_permission_lut (lut_id, group_id, permission_id) VALUES (76,16,72); |
From: Joe S. <joe...@us...> - 2003-03-20 21:39:31
|
Update of /cvsroot/phpslash/phpslash-ft In directory sc8-pr-cvs1:/tmp/cvs-serv6246/phpslash-ft Modified Files: CHANGES Log Message: removed storyeditor privileges from story group Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.727 retrieving revision 1.728 diff -C2 -d -r1.727 -r1.728 *** CHANGES 20 Mar 2003 18:29:05 -0000 1.727 --- CHANGES 20 Mar 2003 21:39:27 -0000 1.728 *************** *** 13,16 **** --- 13,20 ---- 9 - Removal of something (kill -9 :) + 2003-March-20 3:00PM CST Joe Stewart <joe...@us...> + [W] - slash-all.sql, 65_to_7.sql - removed storyeditor privileges from story + group. + 2003-March-20 12:00PM CST Joe Stewart <joe...@us...> [W] - Comment.class - When saving a comment, the user_id is always saved. |
From: Joe S. <joe...@us...> - 2003-03-20 18:29:09
|
Update of /cvsroot/phpslash/phpslash-ft In directory sc8-pr-cvs1:/tmp/cvs-serv8199/phpslash-ft Modified Files: CHANGES Log Message: When saving a comment, the user_id is always saved. Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.726 retrieving revision 1.727 diff -C2 -d -r1.726 -r1.727 *** CHANGES 19 Mar 2003 21:32:13 -0000 1.726 --- CHANGES 20 Mar 2003 18:29:05 -0000 1.727 *************** *** 13,16 **** --- 13,19 ---- 9 - Removal of something (kill -9 :) + 2003-March-20 12:00PM CST Joe Stewart <joe...@us...> + [W] - Comment.class - When saving a comment, the user_id is always saved. + 2003-March-19 3:00PM CST Joe Stewart <joe...@us...> [B] - Poll.class - getCurrent() should have been this->getCurrent(). |
From: Joe S. <joe...@us...> - 2003-03-20 18:29:09
|
Update of /cvsroot/phpslash/phpslash-ft/class In directory sc8-pr-cvs1:/tmp/cvs-serv8199/phpslash-ft/class Modified Files: Comment.class Log Message: When saving a comment, the user_id is always saved. Index: Comment.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/Comment.class,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** Comment.class 4 Mar 2003 21:54:31 -0000 1.43 --- Comment.class 20 Mar 2003 18:29:06 -0000 1.44 *************** *** 253,257 **** } ! if($ary['author_realname']) { $ary['name'] = $ary['author_realname']; $ary['email'] = $ary['url']; --- 253,257 ---- } ! if(!$ary['name']) { $ary['name'] = $ary['author_realname']; $ary['email'] = $ary['url']; *************** *** 675,687 **** } ! if (!$this->perm->have_perm("commentChangeName")) { ! if(($this->auth->auth['uid']) AND ($this->auth->auth['uid'] != "nobody")) { ! $ary['user_id'] = $this->auth->auth['uid']; ! } else { ! $ary['user_id'] = Author::getId('nobody'); ! } ! } ! $ary = $this->prepare($ary); /* fork in the road: if comment_id doesn't exist then we add, else we update */ --- 675,689 ---- } ! if(($this->auth->auth['uid']) AND ($this->auth->auth['uid'] != "nobody")) { ! $ary['user_id'] = $this->auth->auth['uid']; ! } else { ! $ary['user_id'] = Author::getId('nobody'); ! } ! $ary = $this->prepare($ary); + + if($ary['name'] == $this->auth->auth['dname']) { + $ary['name'] = ''; + } /* fork in the road: if comment_id doesn't exist then we add, else we update */ |
From: Joe S. <joe...@us...> - 2003-03-19 21:32:33
|
Update of /cvsroot/phpslash/phpslash-ft/class In directory sc8-pr-cvs1:/tmp/cvs-serv3448/phpslash-ft/class Modified Files: Poll.class Log Message: getCurrent() should have been this->getCurrent() Index: Poll.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/Poll.class,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** Poll.class 23 Jan 2003 02:48:02 -0000 1.27 --- Poll.class 19 Mar 2003 21:32:27 -0000 1.28 *************** *** 471,475 **** if (!$question_id) { ! $question_id = getCurrent(); } --- 471,475 ---- if (!$question_id) { ! $question_id = $this->getCurrent(); } *************** *** 546,549 **** --- 546,554 ---- function listPolls($min) { /* Get preferences */ + /* + $this->templ->set_file(array( + 'listpoll' => 'pollList.tpl', + )); + */ $q = "SELECT question_id, |
From: Joe S. <joe...@us...> - 2003-03-19 21:32:31
|
Update of /cvsroot/phpslash/phpslash-ft In directory sc8-pr-cvs1:/tmp/cvs-serv3448/phpslash-ft Modified Files: CHANGES Log Message: getCurrent() should have been this->getCurrent() Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.725 retrieving revision 1.726 diff -C2 -d -r1.725 -r1.726 *** CHANGES 19 Mar 2003 20:06:03 -0000 1.725 --- CHANGES 19 Mar 2003 21:32:13 -0000 1.726 *************** *** 13,16 **** --- 13,19 ---- 9 - Removal of something (kill -9 :) + 2003-March-19 3:00PM CST Joe Stewart <joe...@us...> + [B] - Poll.class - getCurrent() should have been this->getCurrent(). + 2003-March-19 2:00PM CST Joe Stewart <joe...@us...> [B] - mailinglist.php3 - change ary to POST vars. |