phpslash-commit Mailing List for phpSlash (Page 96)
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: Joe S. <joe...@us...> - 2002-03-18 16:11:27
|
Update of /cvsroot/phpslash/phpslash-ft/public_html In directory usw-pr-cvs1:/tmp/cvs-serv22147/phpslash-ft/public_html Modified Files: search.php3 Log Message: removed unuses search templates Index: search.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/search.php3,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** search.php3 17 Mar 2002 01:00:08 -0000 1.45 --- search.php3 18 Mar 2002 16:11:22 -0000 1.46 *************** *** 139,144 **** --- 139,162 ---- $db->debug = false; + $block = new Block_i; + /*************PAGE START*******************/ + /* parse cmd line variables into array */ + while ( list($key, $val) = each($HTTP_GET_VARS )) { + $ary[$key] = $val; + } + + /* defaults for main "index" page */ + if ((!$section) AND (!$section_id)){ + $section = $_PSL['site_homesection']; + if(!$section) { + $section = "Home"; + } + $ary['section'] = $section; + } + + $breadcrumb = breadcrumb( $ary); + $_PSL['metatags']['object'] = $xsiteobject; *************** *** 426,432 **** $templ->set_var('match_block',''); } ! $templ->pparse ("OUT", "searchpage"); slashfoot(); page_close(); ?> --- 444,490 ---- $templ->set_var('match_block',''); } ! ! $allstories = $templ->parse ("OUT", "searchpage"); ! $leftblocks = $block->getBlocks($ary, "left"); ! $centerblocks = $block->getBlocks($ary, "center"); ! $rightblocks = $block->getBlocks($ary, "right"); ! ! if (empty($leftblocks)) { ! if (empty($rightblocks)) { ! // $centerblocks = $block->getBlocks($ary); ! // $tplfile = "index1col.tpl"; ! // default to 2 column for transparent upgrade ! $rightblocks = $block->getBlocks($ary); ! $tplfile = "index2colright.tpl"; ! } else { ! $tplfile = "index2colright.tpl"; ! } ! } elseif (empty($rightblocks)) { ! $tplfile = "index2colleft.tpl"; ! } else { ! $tplfile = "index3col.tpl"; ! } ! ! $template = new Template($_PSL['templatedir']); ! $template->debug = 0; ! $template->set_file(array( ! 'index' => $tplfile //"index3col.tpl" ! )); ! ! $template->set_var(array( ! 'ROOTDIR' => $_PSL['rooturl'], ! 'IMAGEDIR' => $_PSL['imageurl'], ! 'BREADCRUMB' => $breadcrumb, ! 'STORY_COLUMN' => $allstories, ! 'LEFT_BLOCK_COLUMN' => $leftblocks, ! 'CENTER_BLOCK_COLUMN' => $centerblocks, ! 'RIGHT_BLOCK_COLUMN' => $rightblocks ! )); ! ! $template->parse('OUT',"index"); ! $template->p('OUT'); slashfoot(); page_close(); + ?> |
From: Joe S. <joe...@us...> - 2002-03-18 16:11:27
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv22147/phpslash-ft Modified Files: CHANGES Log Message: removed unuses search templates Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.427 retrieving revision 1.428 diff -C2 -d -r1.427 -r1.428 *** CHANGES 17 Mar 2002 01:00:08 -0000 1.427 --- CHANGES 18 Mar 2002 16:11:22 -0000 1.428 *************** *** 13,16 **** --- 13,23 ---- 9 - Removal of something (kill -9 :) + 2002-Mar-18 10:00AM CST Joe Stewart <joe...@us...> + [T] - removed unused searchMatch.tpl, searchMoreMatches.tpl, + searchNoMatch.tpl, and searchPrevMatches. + [D] - phpslash.sgml - removed unused search templates from doc. + [B] - search page display is conformant to index page and uses the same + templates. + 2002-Mar-16 4:50PM PST Ajay Sharma <ss...@od...> [B] - Fixed next/previous links on the search page |
From: Joe S. <joe...@us...> - 2002-03-18 16:11:26
|
Update of /cvsroot/phpslash/phpslash-ft/doc/html In directory usw-pr-cvs1:/tmp/cvs-serv22147/phpslash-ft/doc/html Modified Files: phpslash.sgml Log Message: removed unuses search templates Index: phpslash.sgml =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/doc/html/phpslash.sgml,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** phpslash.sgml 12 Mar 2002 19:00:23 -0000 1.19 --- phpslash.sgml 18 Mar 2002 16:11:22 -0000 1.20 *************** *** 1192,1200 **** queryblock.tpl - format of query block contents quoteblock.tpl - format of quote block contents - searchMatch.tpl - each search result - searchMoreMatches.tpl - link to more search results - searchNoMatch.tpl - text for no search results searchPage.tpl - search page layout - searchPrevMatches.tpl - link to previous search results sectionList.tpl - list of sections in sectionAdmin sectionNew.tpl - new section form --- 1192,1196 ---- |
From: Ajay S. <aja...@us...> - 2002-03-17 01:00:12
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default In directory usw-pr-cvs1:/tmp/cvs-serv27567/public_html/templates/en/default Modified Files: searchPage.tpl Log Message: fixed bugs in search.php3 and it only uses ONE template file instead of five now Index: searchPage.tpl =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default/searchPage.tpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** searchPage.tpl 24 Jan 2002 13:27:09 -0000 1.4 --- searchPage.tpl 17 Mar 2002 01:00:08 -0000 1.5 *************** *** 1,3 **** - <!-- searchPage.tpl begin--> --- 1,2 ---- *************** *** 39,44 **** </tr> </table><p> - {MATCHES} - <!-- searchPage.tpl end--> --- 38,60 ---- </tr> </table><p> + <!-- BEGIN previous_match --> + <a href="{PREV_MATCHES_URL}"><p> + <b>{PREV_COUNT} previous matches...</b></a><p> + <!-- END previous_match --> + + <!-- BEGIN each_match --> + <font face="arial,helvetica"><a href="{STORY_URL}"><b>{STORY_TITLE}</b></a> <font size=1> by <a href="{AUTHOR_URL}">{AUTHOR_NAME}</a> on {DATE} <b>{COMMENTCOUNT}</b> comment.</font></font><br> + <!-- END each_match --> + + <!-- BEGIN next_match --> + <a href="{MORE_MATCHES_URL}"><p><b> remaining matches...</b></font></a> + <p> + <!-- END next_match --> + + <!-- BEGIN no_match --> + <font face="arial,helvetica">No Matches found to your query</font> + <!-- END no_match --> + + <!-- searchPage.tpl end--> |
From: Ajay S. <aja...@us...> - 2002-03-17 01:00:11
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv27567 Modified Files: CHANGES Log Message: fixed bugs in search.php3 and it only uses ONE template file instead of five now Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.426 retrieving revision 1.427 diff -C2 -d -r1.426 -r1.427 *** CHANGES 16 Mar 2002 23:03:23 -0000 1.426 --- CHANGES 17 Mar 2002 01:00:08 -0000 1.427 *************** *** 13,16 **** --- 13,24 ---- 9 - Removal of something (kill -9 :) + 2002-Mar-16 4:50PM PST Ajay Sharma <ss...@od...> + [B] - Fixed next/previous links on the search page + - changed database object name from $sl_q (??) to the sensable $db + - changed the object calls from $db->Record[] to $db->f() + [T] - combined all search stuff into searchPage.tpl and separated + everything into blocks. searchMatch.tpl, searchMoreMatches.tpl, + searchNoMatch.tpl, and searchPrevMatches are all outdated + 2002-Mar-16 3:00PM PST Ajay Sharma <ss...@od...> [B] - article.php3 now defines ROOTDIR so we can use it in the templates |
From: Ajay S. <aja...@us...> - 2002-03-17 01:00:11
|
Update of /cvsroot/phpslash/phpslash-ft/public_html In directory usw-pr-cvs1:/tmp/cvs-serv27567/public_html Modified Files: search.php3 Log Message: fixed bugs in search.php3 and it only uses ONE template file instead of five now Index: search.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/search.php3,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** search.php3 6 Mar 2002 04:29:54 -0000 1.44 --- search.php3 17 Mar 2002 01:00:08 -0000 1.45 *************** *** 49,55 **** $db->query($q); $db->next_record(); ! $topic_image_name = $db->Record["image"]; ! $topic_image_width = $db->Record["width"]; ! $topic_image_height = $db->Record["height"]; return ""; --- 49,55 ---- $db->query($q); $db->next_record(); ! $topic_image_name = $db->f('image'); ! $topic_image_width = $db->f('width'); ! $topic_image_height = $db->f('height'); return ""; *************** *** 67,74 **** $db->query($q); $db->next_record(); ! $topic_image_name = $db->Record["image"]; ! $topic_image_width = $db->Record["width"]; ! $topic_image_height = $db->Record["height"]; ! return $db->Record["topic_id"]; } --- 67,74 ---- $db->query($q); $db->next_record(); ! $topic_image_name = $db->f('image'); ! $topic_image_width = $db->f('width'); ! $topic_image_height = $db->f('height'); ! return $db->f('topic_id'); } *************** *** 84,91 **** $db->query($q); $db->next_record(); ! $topic_image_name = $db->Record["image"]; ! $topic_image_width = $db->Record["width"]; ! $topic_image_height = $db->Record["height"]; ! return $db->Record["topic_id"]; } } --- 84,91 ---- $db->query($q); $db->next_record(); ! $topic_image_name = $db->f('image'); ! $topic_image_width = $db->f('width'); ! $topic_image_height = $db->f('height'); ! return $db->f('topic_id'); } } *************** *** 101,105 **** $db->query($q); $db->next_record(); ! return $db->Record["section_id"]; } } else { --- 101,105 ---- $db->query($q); $db->next_record(); ! return $db->f('section_id'); } } else { *************** *** 118,122 **** $db->query($q); $db->next_record(); ! return $db->Record["author_id"]; } } else { --- 118,122 ---- $db->query($q); $db->next_record(); ! return $db->f('author_id'); } } else { *************** *** 136,141 **** /*************/ ! $sl_q = new slashDB; ! $sl_q->debug = false; /*************PAGE START*******************/ --- 136,141 ---- /*************/ ! $db = new slashDB; ! $db->debug = false; /*************PAGE START*******************/ *************** *** 182,186 **** $templ->parse ("topic_block", "each_topic", true); ! $sl_q->query ("SELECT DISTINCT psl_topic.topic_id, topic_name FROM psl_topic, psl_topic_lut --- 182,186 ---- $templ->parse ("topic_block", "each_topic", true); ! $db->query ("SELECT DISTINCT psl_topic.topic_id, topic_name FROM psl_topic, psl_topic_lut *************** *** 188,198 **** ORDER BY topic_name"); ! while ($sl_q->next_record()) { $templ->set_var (array ( ! 'TOPIC_VALUE' => $sl_q->Record['topic_id'], ! 'TOPIC_TEXT' => $sl_q->Record['topic_name'] )); ! if ($search_topic_id == $sl_q->Record['topic_id']) { $templ->set_var ('TOPIC_SELECTED', "selected=\"selected\""); } else { --- 188,198 ---- ORDER BY topic_name"); ! while ($db->next_record()) { $templ->set_var (array ( ! 'TOPIC_VALUE' => $db->f('topic_id'), ! 'TOPIC_TEXT' => $db->f('topic_name') )); ! if ($search_topic_id == $db->f('topic_id')) { $templ->set_var ('TOPIC_SELECTED', "selected=\"selected\""); } else { *************** *** 216,220 **** $templ->parse ("section_block", "each_section", true); ! $sl_q->query ("SELECT DISTINCT psl_section.section_id, section_name FROM psl_section,psl_section_lut --- 216,220 ---- $templ->parse ("section_block", "each_section", true); ! $db->query ("SELECT DISTINCT psl_section.section_id, section_name FROM psl_section,psl_section_lut *************** *** 222,232 **** ORDER BY section_name"); ! while ($sl_q->next_record()) { $templ->set_var (array ( ! 'SECTION_VALUE' => $sl_q->Record['section_id'], ! 'SECTION_TEXT' => $sl_q->Record['section_name'] )); ! if ($search_section_id == $sl_q->Record['section_id']) { $templ->set_var ('SECTION_SELECTED', "selected=\"selected\""); } else { --- 222,232 ---- ORDER BY section_name"); ! while ($db->next_record()) { $templ->set_var (array ( ! 'SECTION_VALUE' => $db->f('section_id'), ! 'SECTION_TEXT' => $db->f('section_name') )); ! if ($search_section_id == $db->f('section_id')) { $templ->set_var ('SECTION_SELECTED', "selected=\"selected\""); } else { *************** *** 250,254 **** $templ->parse ("author_block", "each_author", true); ! $sl_q->query ("SELECT DISTINCT psl_author.author_id, author_name FROM psl_author, psl_story --- 250,254 ---- $templ->parse ("author_block", "each_author", true); ! $db->query ("SELECT DISTINCT psl_author.author_id, author_name FROM psl_author, psl_story *************** *** 256,266 **** ORDER BY author_id"); ! while ($sl_q->next_record()) { $templ->set_var (array ( ! 'AUTHOR_VALUE' => $sl_q->Record['author_id'], ! 'AUTHOR_TEXT' => $sl_q->Record['author_name'] )); ! if ($search_author_id == $sl_q->Record['author_id']) { $templ->set_var ('AUTHOR_SELECTED', "selected=\"selected\""); } else { --- 256,266 ---- ORDER BY author_id"); ! while ($db->next_record()) { $templ->set_var (array ( ! 'AUTHOR_VALUE' => $db->f('author_id'), ! 'AUTHOR_TEXT' => $db->f('author_name') )); ! if ($search_author_id == $db->f('author_id')) { $templ->set_var ('AUTHOR_SELECTED', "selected=\"selected\""); } else { *************** *** 278,296 **** $prev = $min - $maxsearchresults; if ($prev >= 0) { ! $templ->set_file (previous_matches_file, "searchPrevMatches.tpl"); ! $templ->parse (previous_matches, previous_matches_file); ! // TODO make use $_PSL['phpself'] ! $prev_matches_url = "$PHP_SELF?min=" . ($min - $maxsearchresults); /* Only put the necessary stuff on the query URL */ if ($query != "") $prev_matches_url .= "&query=$query"; ! if ($topic != "") ! $prev_matches_url .= "&topic_id=$topic"; ! if ($section != "") ! $prev_matches_url .= "&section_id=$section"; ! if ($author != "") ! $prev_matches_url .= "&author_id=$author"; $templ->set_var (array ( --- 278,298 ---- $prev = $min - $maxsearchresults; + $templ->set_block('searchpage','previous_match'); + $templ->set_block('searchpage','next_match'); + $templ->set_block('searchpage','no_match'); + if ($prev >= 0) { ! ! $prev_matches_url = $_PSL['phpself'] . "?min=" . ($min - $maxsearchresults); /* Only put the necessary stuff on the query URL */ if ($query != "") $prev_matches_url .= "&query=$query"; ! if ($search_topic_id != "") ! $prev_matches_url .= "&topic_id=$search_topic_id"; ! if ($search_section_id != "") ! $prev_matches_url .= "&section_id=$search_section_id"; ! if ($search_author_id != "") ! $prev_matches_url .= "&author_id=$search_author_id"; $templ->set_var (array ( *************** *** 298,303 **** 'PREV_COUNT' => $min )); ! $templ->parse ('MATCHES', 'previous_matches', true); ! } $q = "SELECT DISTINCT story.story_id, --- 300,308 ---- 'PREV_COUNT' => $min )); ! # $templ->parse ('searchpage', 'previous_match',true); ! ! } else { ! $templ->set_var('previous_match',''); ! } $q = "SELECT DISTINCT story.story_id, *************** *** 365,387 **** $q .= "\n ORDER BY story.time DESC LIMIT $min,$maxsearchresults"; ! # echo "<FONT SIZE=2><PRE>$q</PRE></FONT><BR>\n"; ! $sl_q->query ($q); ! /* Should we use num_rows() or sql COUNT? --Daniel Serodio */ ! if ($sl_q->num_rows() != 0) { ! $templ->set_file ('listed_matches', "searchMatch.tpl"); ! $templ->set_block ("listed_matches", "each_match", "match_block"); $shown_matches = 0; ! while ($sl_q->next_record ()) { $templ->set_var (array ( ! 'STORY_URL' => $_PSL['rooturl'] . "/article.php3?story_id=".$sl_q->Record['story_id'], ! 'STORY_TITLE' => $sl_q->Record['title'], ! 'AUTHOR_URL' => str_html($sl_q->Record['url']), ! 'AUTHOR_NAME' => $sl_q->Record['author_name'], ! 'DATE' => $sl_q->Record['dateformat'], ! 'COMMENTCOUNT' => $sl_q->Record['commentcount'] )); $templ->parse ("match_block", "each_match", true); --- 370,392 ---- $q .= "\n ORDER BY story.time DESC LIMIT $min,$maxsearchresults"; ! // echo "<FONT SIZE=2><PRE>$q</PRE></FONT><BR>\n"; ! $db->query ($q); ! $templ->set_block ("searchpage", "each_match", "match_block"); ! ! if ($db->num_rows() != 0) { $shown_matches = 0; + $templ->set_var('no_match',''); ! while ($db->next_record ()) { $templ->set_var (array ( ! 'STORY_URL' => $_PSL['rooturl'] . "/article.php3?story_id=" . $db->f('story_id'), ! 'STORY_TITLE' => $db->f('title'), ! 'AUTHOR_URL' => str_html($db->f('url')), ! 'AUTHOR_NAME' => $db->f('author_name'), ! 'DATE' => $db->f('dateformat'), ! 'COMMENTCOUNT' => $db->f('commentcount') )); $templ->parse ("match_block", "each_match", true); *************** *** 393,398 **** $min += $maxsearchresults; - $templ->set_file ('more_matches_file', "searchMoreMatches.tpl"); - $templ->parse ('more_matches', 'more_matches_file'); $more_matches_url = $_PSL['phpself']."?min=$min"; --- 398,401 ---- *************** *** 400,422 **** if ($query != "") $more_matches_url .= "&query=$query"; ! if ($topic != "") $more_matches_url .= "&topic_id=$topic_id"; ! if ($section != "") $more_matches_url .= "&section_id=$section_id"; ! if ($author != "") $more_matches_url .= "&author_id=$author_id"; $templ->set_var ('MORE_MATCHES_URL', $more_matches_url); ! $templ->parse ('MATCHES', 'listed_matches', true); ! $templ->parse ('MATCHES', 'more_matches', true); } else { ! $templ->parse ('MATCHES', 'listed_matches', true); } } else { // num_rows == 0 ! $templ->set_file ('no_matches', "searchNoMatch.tpl"); ! $templ->parse ('MATCHES', 'no_matches'); ! } $templ->pparse ("OUT", "searchpage"); --- 403,428 ---- if ($query != "") $more_matches_url .= "&query=$query"; ! if ($search_topic_id != "") $more_matches_url .= "&topic_id=$topic_id"; ! if ($search_section_id != "") $more_matches_url .= "&section_id=$section_id"; ! if ($search_author_id != "") $more_matches_url .= "&author_id=$author_id"; $templ->set_var ('MORE_MATCHES_URL', $more_matches_url); ! $templ->parse ('MATCHES', 'searchpage', true); ! $templ->parse ('MATCHES', 'next_match', true); ! } else { ! ! $templ->set_var('next_match',''); ! $templ->parse ('MATCHES', 'searchpage', true); ! } } else { // num_rows == 0 ! $templ->set_var('next_match',''); ! $templ->set_var('match_block',''); } $templ->pparse ("OUT", "searchpage"); |
From: Ajay S. <aja...@us...> - 2002-03-16 23:03:26
|
Update of /cvsroot/phpslash/phpslash-ft/public_html In directory usw-pr-cvs1:/tmp/cvs-serv4180/public_html Modified Files: article.php3 Log Message: article.php3 defines ROOTDIR for use in article.tpl Index: article.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/article.php3,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -d -r1.60 -r1.61 *** article.php3 13 Mar 2002 19:14:20 -0000 1.60 --- article.php3 16 Mar 2002 23:03:23 -0000 1.61 *************** *** 153,156 **** --- 153,157 ---- 'BREADCRUMB' => $breadcrumb, 'STORY_ID' => $story_id, + 'ROOTDIR' => $_PSL['rooturl'], 'IMAGEDIR' => $_PSL['imageurl'], 'STORY_COLUMN' => $emailform."\n".$story_html."\n".$comments, |
From: Ajay S. <aja...@us...> - 2002-03-16 23:03:26
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv4180 Modified Files: CHANGES Log Message: article.php3 defines ROOTDIR for use in article.tpl Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.425 retrieving revision 1.426 diff -C2 -d -r1.425 -r1.426 *** CHANGES 16 Mar 2002 17:15:12 -0000 1.425 --- CHANGES 16 Mar 2002 23:03:23 -0000 1.426 *************** *** 13,16 **** --- 13,19 ---- 9 - Removal of something (kill -9 :) + 2002-Mar-16 3:00PM PST Ajay Sharma <ss...@od...> + [B] - article.php3 now defines ROOTDIR so we can use it in the templates + 2002-Mar-16 11:00AM CST Joe Stewart <joe...@us...> [B] - MailingList.class, mailinglist.php3 - should display success |
From: Joe S. <joe...@us...> - 2002-03-16 17:15:15
|
Update of /cvsroot/phpslash/phpslash-ft/class In directory usw-pr-cvs1:/tmp/cvs-serv12489/phpslash-ft/class Modified Files: MailingList.class Log Message: [ 530173 ] mailinglist reply on success Index: MailingList.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/MailingList.class,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** MailingList.class 3 Feb 2002 02:49:39 -0000 1.8 --- MailingList.class 16 Mar 2002 17:15:12 -0000 1.9 *************** *** 179,182 **** --- 179,183 ---- $errors = true; $this->message = pslgetText("There was an error inserting your subscription information into the database."); + return false; } else { *************** *** 190,193 **** --- 191,195 ---- $this->message = pslgetText("You have been successfully subscribed, but there was a problem sending your confirmation email. You should, however receive your newsletter soon."); } + return true; } } *************** *** 229,232 **** --- 231,236 ---- } // end confirmation if } // end 'ok' if + + return $ok; } // end unsubscribe function |
From: Joe S. <joe...@us...> - 2002-03-16 17:15:15
|
Update of /cvsroot/phpslash/phpslash-ft/public_html In directory usw-pr-cvs1:/tmp/cvs-serv12489/phpslash-ft/public_html Modified Files: mailinglist.php3 Log Message: [ 530173 ] mailinglist reply on success Index: mailinglist.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/mailinglist.php3,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** mailinglist.php3 12 Mar 2002 19:00:23 -0000 1.4 --- mailinglist.php3 16 Mar 2002 17:15:12 -0000 1.5 *************** *** 30,34 **** case "subscribe": if($list->subscribe($HTTP_POST_VARS)) { ! message($list->message); } else { error($list->message); --- 30,34 ---- case "subscribe": if($list->subscribe($HTTP_POST_VARS)) { ! echo message($list->message); } else { error($list->message); *************** *** 37,41 **** case "unsubscribe": if($list->unsubscribe($unsubscribe_address)) { ! message($list->message); } else { error($list->message); --- 37,41 ---- case "unsubscribe": if($list->unsubscribe($unsubscribe_address)) { ! echo message($list->message); } else { error($list->message); |
From: Joe S. <joe...@us...> - 2002-03-16 17:15:15
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv12489/phpslash-ft Modified Files: CHANGES Log Message: [ 530173 ] mailinglist reply on success Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.424 retrieving revision 1.425 diff -C2 -d -r1.424 -r1.425 *** CHANGES 15 Mar 2002 21:34:09 -0000 1.424 --- CHANGES 16 Mar 2002 17:15:12 -0000 1.425 *************** *** 13,16 **** --- 13,21 ---- 9 - Removal of something (kill -9 :) + 2002-Mar-16 11:00AM CST Joe Stewart <joe...@us...> + [B] - MailingList.class, mailinglist.php3 - should display success + messages without ERROR: text. Closes + [ 530173 ] mailinglist reply on success. + 2002-Mar-15 3:00PM CST Joe Stewart <jo...@be...> [T] - slashHead.tpl - border=0 in img src. |
From: Joe S. <joe...@us...> - 2002-03-15 21:34:12
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/images/topics In directory usw-pr-cvs1:/tmp/cvs-serv23387/phpslash-ft/public_html/images/topics Modified Files: topicphpslash.gif Log Message: Peter's tweaks to the logos Index: topicphpslash.gif =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/images/topics/topicphpslash.gif,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvsYcZUrM and /tmp/cvsoRhKCo differ |
From: Joe S. <joe...@us...> - 2002-03-15 21:34:12
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv23387/phpslash-ft Modified Files: CHANGES Log Message: Peter's tweaks to the logos Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.423 retrieving revision 1.424 diff -C2 -d -r1.423 -r1.424 *** CHANGES 15 Mar 2002 19:16:28 -0000 1.423 --- CHANGES 15 Mar 2002 21:34:09 -0000 1.424 *************** *** 13,16 **** --- 13,23 ---- 9 - Removal of something (kill -9 :) + 2002-Mar-15 3:00PM CST Joe Stewart <jo...@be...> + [T] - slashHead.tpl - border=0 in img src. + topicslash.gif - uses the new logo. + new-logo.gif - has a transparent background. + These changes are from the efforts of + Peter Cruickshank. + 2002-Mar-15 1:00PM CST Joe Stewart <jo...@be...> [F] - Story_base.class, Topic.class, config.php3 - |
From: Joe S. <joe...@us...> - 2002-03-15 21:34:12
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default In directory usw-pr-cvs1:/tmp/cvs-serv23387/phpslash-ft/public_html/templates/en/default Modified Files: slashHead.tpl Log Message: Peter's tweaks to the logos Index: slashHead.tpl =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default/slashHead.tpl,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** slashHead.tpl 6 Dec 2001 20:16:44 -0000 1.12 --- slashHead.tpl 15 Mar 2002 21:34:09 -0000 1.13 *************** *** 24,28 **** <TABLE cellpadding="5"cellspacing="0" border="0" width="100%" bgcolor="#3F4469"> <TR VALIGN=MIDDLE> ! <TD><A BORDER="0" HREF="{ROOTDIR}"><IMG SRC="{IMAGEDIR}/new-logo.gif"></A></TD> <TD ALIGN=RIGHT> <FORM method=GET action="{SEARCH_ACTION_URL}"> --- 24,28 ---- <TABLE cellpadding="5"cellspacing="0" border="0" width="100%" bgcolor="#3F4469"> <TR VALIGN=MIDDLE> ! <TD><A BORDER="0" HREF="{ROOTDIR}"><IMG BORDER="0" SRC="{IMAGEDIR}/new-logo.gif"></A></TD> <TD ALIGN=RIGHT> <FORM method=GET action="{SEARCH_ACTION_URL}"> |
From: Joe S. <joe...@us...> - 2002-03-15 21:34:12
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/images In directory usw-pr-cvs1:/tmp/cvs-serv23387/phpslash-ft/public_html/images Modified Files: new-logo.gif Log Message: Peter's tweaks to the logos Index: new-logo.gif =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/images/new-logo.gif,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsacme0H and /tmp/cvseOjULf differ |
From: Joe S. <joe...@us...> - 2002-03-15 19:16:32
|
Update of /cvsroot/phpslash/phpslash-ft/public_html In directory usw-pr-cvs1:/tmp/cvs-serv20627/phpslash-ft/public_html Modified Files: config.php3 Log Message: [ 530216 ] Story_base.class+Topic.class++ Index: config.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/config.php3,v retrieving revision 1.129 retrieving revision 1.130 diff -C2 -d -r1.129 -r1.130 *** config.php3 3 Mar 2002 16:07:53 -0000 1.129 --- config.php3 15 Mar 2002 19:16:28 -0000 1.130 *************** *** 127,130 **** --- 127,136 ---- $_PSL['mailinglist_subject'] = "PHPSlash Times"; + // These following two variables control + // how the topic icons get organized after submitting a story: + $_PSL['auto_renorm'] = false; // automatically reorganizes the topic icons + // after publishing a new article + $_PSL['bar_limit'] = 5; // default number of icons in bar + // metatags that may need to be overwritten later ( article description). // other metatags should probably just reside in slashHead.tpl |
From: Joe S. <joe...@us...> - 2002-03-15 19:16:32
|
Update of /cvsroot/phpslash/phpslash-ft/class In directory usw-pr-cvs1:/tmp/cvs-serv20627/phpslash-ft/class Modified Files: Topic.class Story_base.class Log Message: [ 530216 ] Story_base.class+Topic.class++ Index: Topic.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/Topic.class,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Topic.class 3 Feb 2002 02:49:40 -0000 1.10 --- Topic.class 15 Mar 2002 19:16:28 -0000 1.11 *************** *** 17,21 **** /** ! * The Section Constructor * * sets up the local version of the global _PSL array, the templates --- 17,21 ---- /** ! * The Topic Constructor * * sets up the local version of the global _PSL array, the templates *************** *** 452,455 **** --- 452,530 ---- return $topic_array; } + + /** + * renormTopic - renormalizes the topic info in the DB + * Param: $topic_id + * + * Updates the topic onlinkbar value on the DB + * Obligatory fields: topic_id + * Returns true if sucessful updated, false on error + * Used only by admin + * + * TODO: a) make this function deal with the whole array + * complete arrays... b) Take care of deleting stories + * c) clean up ... later ;-) + * + * @param array $topic_id_val + * + * @access private + */ + function renormTopic($topic_id_val) { + + if (!empty($topic_id_val)) { + // this is required! + $topic_id = $topic_id_val[0]; + }else{ + // bye bye + return false; + } + + $limit = $this->psl['bar_limit']; // variables are easier to deal with + // less typing :-) + + // updates the topic's onlinkbar values first, + // + // then set the values of onlinkbar higher + // than $limit to zero (so that they + // don't display) + + // This is done by parts in case something or somebody + // is working on the same database at the same + // time ... + // And it has to be done this way + // until MySQL 4 comes with nested transactions :-) + + // 1) begin work: + $q = "BEGIN WORK"; + $this->db->query($q); + + // 2) update values of onlinkbar + $q = "UPDATE psl_topic + SET onlinkbar=onlinkbar+1 + WHERE onlinkbar != 0"; + $this->db->query($q); + + // 3) purge values higher than LIMIT + $q = "UPDATE psl_topic + SET onlinkbar=0 + WHERE onlinkbar > '$limit'"; + $this->db->query($q); + + // 4) put this topic_id as first item in bar + $q = "UPDATE psl_topic + SET onlinkbar=1 + WHERE topic_id = '$topic_id'"; + $this->db->query($q); + + // 5) commit and release table + $q = "COMMIT"; + $this->db->query($q); + + if ($this->db->affected_rows() > 0) { + return true; + }else{ + return false; + } + } // end renormTopic() } /* end of Topic.class */ Index: Story_base.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/Story_base.class,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Story_base.class 14 Mar 2002 20:42:08 -0000 1.6 --- Story_base.class 15 Mar 2002 19:16:28 -0000 1.7 *************** *** 569,573 **** $this->db->query($lut_insert); } ! return true; } --- 569,589 ---- $this->db->query($lut_insert); } ! ! // Change value of $_PSL["auto_norm"] to true ! // in your config.php3 file if you want to automatically ! // update your topic bar e/a time a story gets submitted ! // ! if ($this->psl["auto_renorm"]) { ! // create topic object ! $topic = new Topic; ! ! // use only the first topic in this array ! // most people choose one topic per story ! if ( !$topic->renormTopic($topic_id_ary) ) { ! $this->message="Topic bar could not be reorganized"; ! } ! } // end if auto_renorm ! ! return true; } |
From: Joe S. <joe...@us...> - 2002-03-15 19:16:31
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv20627/phpslash-ft Modified Files: CHANGES Log Message: [ 530216 ] Story_base.class+Topic.class++ Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.422 retrieving revision 1.423 diff -C2 -d -r1.422 -r1.423 *** CHANGES 14 Mar 2002 20:38:18 -0000 1.422 --- CHANGES 15 Mar 2002 19:16:28 -0000 1.423 *************** *** 13,16 **** --- 13,22 ---- 9 - Removal of something (kill -9 :) + 2002-Mar-15 1:00PM CST Joe Stewart <jo...@be...> + [F] - Story_base.class, Topic.class, config.php3 - + [ 530216 ] Story_base.class+Topic.class++ + "Luis M" <le...@ho...> submitted a patch + to tie the topic icons to the latest stories published. + 2002-Mar-14 2:30PM CST Joe Stewart <jo...@be...> [B] - Story_base.class, storyAdmin.php3 - saveStory uses $this->message |
From: Joe S. <joe...@us...> - 2002-03-14 20:42:12
|
Update of /cvsroot/phpslash/phpslash-ft/class In directory usw-pr-cvs1:/tmp/cvs-serv14671/phpslash-ft/class Modified Files: Story_base.class Log Message: no echoes in Story_base.class Index: Story_base.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/Story_base.class,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Story_base.class 14 Mar 2002 20:38:18 -0000 1.5 --- Story_base.class 14 Mar 2002 20:42:08 -0000 1.6 *************** *** 434,454 **** */ if ($topic_id_ary[0] == "") { ! error ("You need to select at least one <B>topic</B> in Story.class::saveStory"); return false; } if ($section_id_ary[0] == "") { ! error ("You need to select at least one <B>section</B> in Story.class::saveStory"); return false; } if ($ary['title'] == "") { ! error ("There is no title in Story.class::saveStory"); return false; } if ($ary['intro_text'] == "") { ! error ("There is no intro_text in Story.class::saveStory"); return false; } if ($ary['author_id'] == "") { ! error ("There is no author_id in Story.class::saveStory"); return false; } --- 434,454 ---- */ if ($topic_id_ary[0] == "") { ! $this->message = "You need to select at least one <B>topic</B> in Story.class::saveStory"; return false; } if ($section_id_ary[0] == "") { ! $this->message = "You need to select at least one <B>section</B> in Story.class::saveStory"; return false; } if ($ary['title'] == "") { ! $this->message = "There is no title in Story.class::saveStory"; return false; } if ($ary['intro_text'] == "") { ! $this->message = "There is no intro_text in Story.class::saveStory"; return false; } if ($ary['author_id'] == "") { ! $this->message = "There is no author_id in Story.class::saveStory"; return false; } |
From: Joe S. <joe...@us...> - 2002-03-14 20:38:26
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/admin In directory usw-pr-cvs1:/tmp/cvs-serv13876/phpslash-ft/public_html/admin Modified Files: storyAdmin.php3 Log Message: no echoes in Story_base.class Index: storyAdmin.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/admin/storyAdmin.php3,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** storyAdmin.php3 13 Mar 2002 20:05:18 -0000 1.8 --- storyAdmin.php3 14 Mar 2002 20:38:18 -0000 1.9 *************** *** 34,37 **** --- 34,38 ---- $success = $story->saveStory($HTTP_POST_VARS); if( $success == false) { + error($story->message); $story->newStory($HTTP_POST_VARS, "array"); } *************** *** 69,73 **** } else { titlebar("100%", "Error! Invalid Privileges"); ! echo "Sorry. You do not have the necessary privilege to view this page."; } --- 70,74 ---- } else { titlebar("100%", "Error! Invalid Privileges"); ! error(pslgetText("Sorry. You do not have the necessary privilege to view this page.")); } |
From: Joe S. <joe...@us...> - 2002-03-14 20:38:23
|
Update of /cvsroot/phpslash/phpslash-ft/class In directory usw-pr-cvs1:/tmp/cvs-serv13876/phpslash-ft/class Modified Files: Story_base.class Log Message: no echoes in Story_base.class Index: Story_base.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/Story_base.class,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Story_base.class 3 Feb 2002 02:49:40 -0000 1.4 --- Story_base.class 14 Mar 2002 20:38:18 -0000 1.5 *************** *** 23,26 **** --- 23,27 ---- var $perm; var $auth; + var $message; var $article_dateformat = "\"%W %M %d, %Y \@ %h:%i%p\""; // date for the article page *************** *** 33,36 **** --- 34,40 ---- function Story_base () { $this->db = new slashDB; + $this->auth = $auth; + $this->perm = $perm; + $this->message = ''; } /* *************** *** 409,412 **** --- 413,423 ---- */ function saveStory($ary) { + + // Normal users can't edit another user's stories + if((!$this->perm->have_perm('story,root')) AND + ( $ary['author_id'] != $this->auth->auth['uid'])) { + $this->message = pslgetText("Sorry. You do not have the necessary privilege to view this page."); + return false; + } $topic_id_ary = $ary['topic_id_ary']; |
From: Joe S. <joe...@us...> - 2002-03-14 20:38:23
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv13876/phpslash-ft Modified Files: CHANGES Log Message: no echoes in Story_base.class Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.421 retrieving revision 1.422 diff -C2 -d -r1.421 -r1.422 *** CHANGES 14 Mar 2002 17:55:09 -0000 1.421 --- CHANGES 14 Mar 2002 20:38:18 -0000 1.422 *************** *** 13,16 **** --- 13,20 ---- 9 - Removal of something (kill -9 :) + 2002-Mar-14 2:30PM CST Joe Stewart <jo...@be...> + [B] - Story_base.class, storyAdmin.php3 - saveStory uses $this->message + for alerts. + 2002-Mar-14 11:30AM CST Joe Stewart <jo...@be...> [B] - login.php3 - cancel url typo. |
From: Joe S. <joe...@us...> - 2002-03-14 18:04:43
|
Update of /cvsroot/phpslash/phpslash-ft/public_html In directory usw-pr-cvs1:/tmp/cvs-serv4259/phpslash-ft/public_html Modified Files: backend.php3 Log Message: login cancel url typo Index: backend.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/backend.php3,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** backend.php3 11 Feb 2002 20:20:18 -0000 1.21 --- backend.php3 14 Mar 2002 18:04:41 -0000 1.22 *************** *** 131,134 **** --- 131,135 ---- 'SITE_TITLE' => $_PSL['site_title'], 'SITE_SLOGAN' => $_PSL['site_slogan'], + 'SITE_OWNER' => $_PSL['site_owner'], 'SITE_HOST' => $HTTP_HOST, // TODO: nh asks: Will this be around with register_globals=Off? 'PHP_SELF' => $_PSL['phpself'], |
From: Joe S. <joe...@us...> - 2002-03-14 18:04:43
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default In directory usw-pr-cvs1:/tmp/cvs-serv4259/phpslash-ft/public_html/templates/en/default Modified Files: backendRSS1.tpl Log Message: login cancel url typo Index: backendRSS1.tpl =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default/backendRSS1.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** backendRSS1.tpl 14 Mar 2002 17:55:09 -0000 1.2 --- backendRSS1.tpl 14 Mar 2002 18:04:40 -0000 1.3 *************** *** 11,24 **** <link>{ROOTDIR}</link> <description>{SITE_NAME}</description> - <image> - <title>{SITE_TITLE}</title> - <url>{IMAGEDIR}/topics/topicphpslash.gif</url> - <width>100</width> - <height>40</height> - <description>{SITE_NAME}</description> <sy:updatePeriod>hourly</sy:updatePeriod> <sy:updateFrequency>1</sy:updateFrequency> <sy:updateBase>2002-01-01T12:00+00:00</sy:updateBase> ! </image> </channel> --- 11,24 ---- <link>{ROOTDIR}</link> <description>{SITE_NAME}</description> <sy:updatePeriod>hourly</sy:updatePeriod> <sy:updateFrequency>1</sy:updateFrequency> <sy:updateBase>2002-01-01T12:00+00:00</sy:updateBase> ! <image> ! <title>{SITE_TITLE}</title> ! <url>{IMAGEDIR}/topics/topicphpslash.gif</url> ! <width>100</width> ! <height>40</height> ! <description>{SITE_NAME}</description> ! </image> </channel> |
From: Joe S. <joe...@us...> - 2002-03-14 17:55:24
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default In directory usw-pr-cvs1:/tmp/cvs-serv545/phpslash-ft/public_html/templates/en/default Modified Files: backendRSS91.tpl backendRSS1.tpl Log Message: login cancel url typo Index: backendRSS91.tpl =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default/backendRSS91.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** backendRSS91.tpl 2 May 2001 21:28:12 -0000 1.2 --- backendRSS91.tpl 14 Mar 2002 17:55:09 -0000 1.3 *************** *** 7,10 **** --- 7,12 ---- <description>{SITE_NAME}</description> + <managingEditor>{SITE_OWNER}</managingEditor> + <webMaster>{SITE_OWNER}</webMaster> <language>en-us</language> *************** *** 16,20 **** <width>100</width> <height>40</height> ! <description>ALT_TEXT</description> </image> --- 18,22 ---- <width>100</width> <height>40</height> ! <description>{SITE_NAME}</description> </image> Index: backendRSS1.tpl =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default/backendRSS1.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** backendRSS1.tpl 2 May 2001 21:28:12 -0000 1.1 --- backendRSS1.tpl 14 Mar 2002 17:55:09 -0000 1.2 *************** *** 4,8 **** xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:rss091="http://purl.org/rss/1.0/modules/rss091#" ! xmlns:ag="http://purl.org/rss/1.0/modules/aggregation#" xmlns="http://purl.org/rss/1.0/"> --- 4,8 ---- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:rss091="http://purl.org/rss/1.0/modules/rss091#" ! xmlns:sy="http://purl.org/rss/1.0/modules/syndication/" xmlns="http://purl.org/rss/1.0/"> *************** *** 16,20 **** <width>100</width> <height>40</height> ! <description>ALT_TEXT</description> </image> </channel> --- 16,23 ---- <width>100</width> <height>40</height> ! <description>{SITE_NAME}</description> ! <sy:updatePeriod>hourly</sy:updatePeriod> ! <sy:updateFrequency>1</sy:updateFrequency> ! <sy:updateBase>2002-01-01T12:00+00:00</sy:updateBase> </image> </channel> |