phpslash-commit Mailing List for phpSlash (Page 98)
Brought to you by:
joestewart,
nhruby
Menu
▾
▴
phpslash-commit — A list for automatically mailed SCM Commits
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...> - 2002-03-11 16:19:13
|
Update of /cvsroot/phpslash/phpslash-ft/tables/0.65 In directory usw-pr-cvs1:/tmp/cvs-serv6624/phpslash-ft/tables/0.65 Modified Files: slash-all.sql Log Message: login.php3 error Index: slash-all.sql =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/tables/0.65/slash-all.sql,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** slash-all.sql 11 Mar 2002 04:20:18 -0000 1.12 --- slash-all.sql 11 Mar 2002 16:19:09 -0000 1.13 *************** *** 164,168 **** # ! INSERT INTO psl_author (author_id, author_name, author_realname, url, email, quote, password, seclev, perms) VALUES ( '1', 'god', '', 'http://www.god.com', 'go...@he...', 'God doesn't need a 'quote'!', MD5('god:password'), '1000000', 'root,nobody,user,topic,story,section,submission,block,poll,author,variable,glossary,mailinglist,logging'); # -------------------------------------------------------- --- 164,168 ---- # ! INSERT INTO psl_author (author_id, author_name, author_realname, url, email, quote, password, seclev, perms) VALUES ( '1', 'god', '', 'http://www.god.com', 'go...@he...', 'God doesn't need a 'quote'!', MD5('god:password'), '1000000', 'root,nobody,user,topic,comment,story,section,submission,block,poll,author,variable,glossary,mailinglist,logging'); # -------------------------------------------------------- *************** *** 202,206 **** </form> <!-- END: pollDisplay.tpl --> ! ', 'a:3:{s:5:\"width\";s:3:\"160\";s:6:\"column\";s:5:\"right\";s:0:\"\";s:0:\"\";}', '0'); INSERT INTO psl_block (id, type, title, expire_length, last_update, location, source_url, cache_data, block_options, ordernum) VALUES ( '139', '7', 'Sections', '3600', '20010516092026', '', '', '<!-- sectionsblock.tpl begin--> <ul> --- 202,206 ---- </form> <!-- END: pollDisplay.tpl --> ! ', 'a:2:{s:5:\"width\";s:3:\"160\";s:6:\"column\";s:5:\"right\";}', '0'); INSERT INTO psl_block (id, type, title, expire_length, last_update, location, source_url, cache_data, block_options, ordernum) VALUES ( '139', '7', 'Sections', '3600', '20010516092026', '', '', '<!-- sectionsblock.tpl begin--> <ul> *************** *** 210,214 **** <!-- sectionsblock.tpl end--> ! ', 'a:3:{s:6:\"column\";s:5:\"right\";s:5:\"width\";s:3:\"160\";s:0:\"\";s:0:\"\";}', '99'); INSERT INTO psl_block (id, type, title, expire_length, last_update, location, source_url, cache_data, block_options, ordernum) VALUES ( '130', '4', '%%', '3600', '20010516092026', '', '', '<table cellpadding=2 border=0 BGCOLOR=#000066> <tr BGCOLOR=#FFFFFF> --- 210,214 ---- <!-- sectionsblock.tpl end--> ! ', 'a:2:{s:6:\"column\";s:5:\"right\";s:5:\"width\";s:3:\"160\";}', '99'); INSERT INTO psl_block (id, type, title, expire_length, last_update, location, source_url, cache_data, block_options, ordernum) VALUES ( '130', '4', '%%', '3600', '20010516092026', '', '', '<table cellpadding=2 border=0 BGCOLOR=#000066> <tr BGCOLOR=#FFFFFF> *************** *** 345,349 **** <!-- topicsblock.tpl end--> ! ', 'a:3:{s:6:\"column\";s:5:\"right\";s:5:\"width\";s:3:\"160\";s:0:\"\";s:0:\"\";}', '90'); INSERT INTO psl_block (id, type, title, expire_length, last_update, location, source_url, cache_data, block_options, ordernum) VALUES ( '143', '6', 'Got Foo?', '3600', '20010516092026', '', 'query=foo', '<!-- queryblock.tpl begin--> {query_block} --- 345,349 ---- <!-- topicsblock.tpl end--> ! ', 'a:2:{s:6:\"column\";s:5:\"right\";s:5:\"width\";s:3:\"160\";}', '90'); INSERT INTO psl_block (id, type, title, expire_length, last_update, location, source_url, cache_data, block_options, ordernum) VALUES ( '143', '6', 'Got Foo?', '3600', '20010516092026', '', 'query=foo', '<!-- queryblock.tpl begin--> {query_block} |
|
From: Joe S. <joe...@us...> - 2002-03-11 16:19:13
|
Update of /cvsroot/phpslash/phpslash-ft/public_html In directory usw-pr-cvs1:/tmp/cvs-serv6624/phpslash-ft/public_html Modified Files: login.php3 Log Message: login.php3 error Index: login.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/login.php3,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** login.php3 6 Mar 2002 04:29:54 -0000 1.16 --- login.php3 11 Mar 2002 16:19:08 -0000 1.17 *************** *** 53,57 **** slashhead($pagetitle,$_PSL['metatags']); ! $allstories = $story->getStories($ary); $leftblocks = $block->getBlocks($ary, "left"); $centerblocks = $block->getBlocks($ary, "center"); --- 53,58 ---- slashhead($pagetitle,$_PSL['metatags']); ! // $allstories = $story->getStories($ary); ! $allstories = ''; $leftblocks = $block->getBlocks($ary, "left"); $centerblocks = $block->getBlocks($ary, "center"); |
|
From: Joe S. <joe...@us...> - 2002-03-11 16:19:13
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv6624/phpslash-ft/class
Modified Files:
Block.class
Log Message:
login.php3 error
Index: Block.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block.class,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Block.class 7 Mar 2002 21:07:20 -0000 1.12
--- Block.class 11 Mar 2002 16:19:09 -0000 1.13
***************
*** 212,219 ****
for( $i=1 ; $i <= count($block_array[optionname]) ; $i++) {
!
! $optname = $optionname_ary[$i];
! $optval = $optionval_ary[$i];
! $block_options_ary[$optname] = $optval;
}
--- 212,220 ----
for( $i=1 ; $i <= count($block_array[optionname]) ; $i++) {
! if( $optionname_ary[$i] != "") {
! $optname = $optionname_ary[$i];
! $optval = $optionval_ary[$i];
! $block_options_ary[$optname] = $optval;
! }
}
|
|
From: Joe S. <joe...@us...> - 2002-03-11 16:19:13
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv6624/phpslash-ft Modified Files: CHANGES Log Message: login.php3 error Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.412 retrieving revision 1.413 diff -C2 -d -r1.412 -r1.413 *** CHANGES 11 Mar 2002 04:20:18 -0000 1.412 --- CHANGES 11 Mar 2002 16:19:07 -0000 1.413 *************** *** 13,16 **** --- 13,21 ---- 9 - Removal of something (kill -9 :) + 2002-Mar-11 10:00AM CST Joe Stewart <jo...@be...> + [B] - login.php3 - shouldn't try to get stories. + Block.class - putBlock won't save blank options now. + slash-all.sql - god user should have comment perms. + 2002-Mar-10 10:00PM CST Joe Stewart <jo...@be...> [B] - functions.inc - setLang falls back to base lang |
|
From: Joe S. <joe...@us...> - 2002-03-11 04:20:22
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv26063/phpslash-ft/class
Modified Files:
functions.inc Block_render_rss.class
Log Message:
[ 528296 ] and [ 528290 ]
Index: functions.inc
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/functions.inc,v
retrieving revision 1.95
retrieving revision 1.96
diff -C2 -d -r1.95 -r1.96
*** functions.inc 8 Mar 2002 20:08:03 -0000 1.95
--- functions.inc 11 Mar 2002 04:20:18 -0000 1.96
***************
*** 166,170 ****
}
! function getFancyBox($width, $title, $contents, $link = "", $box_type="") {
global $_PSL;
--- 166,170 ----
}
! function getFancyBox($width, $title, $contents, $link = "", $box_type="", $var_ary="") {
global $_PSL;
***************
*** 208,215 ****
'WIDTH' => $width,
'ALIGN' => $align,
! 'TITLE' => pslgetText($title),
'CONTENTS' => $contents
));
$templ->parse('FANCYBOX', "fancybox" );
return $templ->get('FANCYBOX');
--- 208,219 ----
'WIDTH' => $width,
'ALIGN' => $align,
! 'TITLE' => pslgetText($title),
'CONTENTS' => $contents
));
+ if( is_array($var_ary)) {
+ $templ->set_var($var_ary);
+ }
+ // debug("templ_var", $templ->varvals);
$templ->parse('FANCYBOX', "fancybox" );
return $templ->get('FANCYBOX');
***************
*** 879,885 ****
--- 883,894 ----
$done = false;
while( ( $i < count($lang_ary)) AND ( !$done) ) {
+ $base_lang = split( "[_-]", trim($lang_ary[$i]));
if (file_exists( $_PSL['localedir'] . "/" . trim($lang_ary[$i]) . ".php3")) {
$lang = $_PSL['localedir'] . "/" . trim($lang_ary[$i]) . ".php3";
$done = true;
+ } elseif (file_exists( $_PSL['localedir'] . "/" . $base_lang[0]. ".php3")) {
+ // no dialect match - so try base language ( "en" for "en-US")
+ $lang = $_PSL['localedir'] . "/" . $base_lang[0] . ".php3";
+ $done = true;
}
$i++;
***************
*** 926,945 ****
while( ( $i < count($lang_ary)) AND ( !$done) ) {
if( strlen($lang_ary[$i]) > 0) {
if (@is_dir( $_PSL['templatedir'] . "/" . trim($lang_ary[$i]))) {
$templatedir = $_PSL['templatedir'] . "/" . trim($lang_ary[$i]);
$done = true;
! }
! }
! $i++;
! }
! // no exact match - so try base language ( "en" for "en-US")
! $i = 0;
! while( ( $i < count($lang_ary)) AND ( !$done) ) {
! $lang = split( "[_-]", $lang_ary[$i]);
! if( strlen($lang_ary[$i]) > 0) {
! if (@is_dir( $_PSL['templatedir'] . "/" . trim($lang[0]))) {
! $templatedir = $_PSL['templatedir'] . "/" . trim($lang[0]);
$done = true;
! }
}
$i++;
--- 935,946 ----
while( ( $i < count($lang_ary)) AND ( !$done) ) {
if( strlen($lang_ary[$i]) > 0) {
+ $base_lang = split( "[_-]", trim($lang_ary[$i]));
if (@is_dir( $_PSL['templatedir'] . "/" . trim($lang_ary[$i]))) {
$templatedir = $_PSL['templatedir'] . "/" . trim($lang_ary[$i]);
$done = true;
! } elseif (@is_dir( $_PSL['templatedir'] . "/" . $base_lang[0])) {
! $templatedir = $_PSL['templatedir'] . "/" . $base_lang[0];
$done = true;
! }
}
$i++;
Index: Block_render_rss.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_rss.class,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Block_render_rss.class 6 Feb 2002 18:47:43 -0000 1.5
--- Block_render_rss.class 11 Mar 2002 04:20:18 -0000 1.6
***************
*** 1,381 ****
! <?php
! /* Block_render_rss.class -> Methods for parsing RSS 0.91 data */
! /* CHANGES: 4Jan02 - RSS title stored */
! /* $Id$ */
! /*
! * VARAIBLES USED
! * target = [_blank],_self etc
! * max = 10
! * tpl = alternate template ( no .tpl extension) [rssblock.tpl]
! * title = none - dont display title or image, even if they are available
! * image - force display of image (if tag present - else show no title)
! * text - force display of title text (if tag present - else show no title)
! * both - display both image and text if available
! * best (default) - display image if tags present, else display title if possible
! *
! * NOTES
! * - image width and height are not used since most sites seem not to give this info anyway
! * - rdfparser ignores max_items - it pulls everything it can from the RDF file
! */
! class rdfparser {
!
! // Settings
! var $max_items;
! var $tags; // tags to process (all others are ignored)
!
! // Output information
! var $channel;
! var $image;
! var $items;
!
! var $error_str = ""; /* if you got an error reading a file this will store an error */
!
! // Private
! var $xml;
! var $node;
! var $current;
! var $count;
!
! /***************************************
! ** Constructor function. See parse_setup
! ***************************************/
! function rdfparser() {
! }
!
! /***************************************
! ** Start element function.
! ***************************************/
! function start_element($xml, $element, $attributes) {
!
! $this->current = $element;
!
! switch ($element) {
! case $this->tags["item"]:
! case $this->tags["image"]:
! case $this->tags["channel"]:
! $this->node = $element; // Should be a stack really, but nesting is only one deep
! // debug("rdf:start element+node","$element+".$this->node);
! break;
!
! default:
! }
!
! }
!
! /***************************************
! ** End element function.
! ***************************************/
! function end_element($xml, $element) {
! $this->current = "";
!
! switch ($element) {
! case $this->tags["item"]:
! $this->node = "";
! $this->count++;
! break;
! case $this->tags["channel"]:
! case $this->tags["image"]:
! $this->node = "";
! break;
! }
! }
!
! function character_data($xml, $data) {
!
! switch ($this->node) {
!
! case $this->tags["item"]:
! switch ($this->current) {
! case $this->tags["title"]:
! $this->items[$this->count]["title"] .= $data;
! break;
! case $this->tags["link"]:
! $this->items[$this->count]["link"] .= $data;
! break;
! case $this->tags["description"]:
! $this->items[$this->count]["description"] .= $data;
! break;
! default:
! }
! break;
!
! case $this->tags["image"]:
! switch ($this->current) {
! case $this->tags["title"]:
! $this->image["title"] .= $data;
! break;
! case $this->tags["link"]:
! $this->image["link"] .= $data;
! break;
! case $this->tags["url"]:
! $this->image["url"] .= $data;
! break;
! default:
! }
! break;
!
! case $this->tags["channel"]:
! switch ($this->current) {
! case $this->tags["title"]:
! $this->channel["title"] .= $data;
! break;
! case $this->tags["link"]:
! $this->channel["link"] .= $data;
! break;
! case $this->tags["description"]:
! $this->channel["description"] .= $data;
! break;
! default:
! }
! break;
!
! default:
! }
! }
!
! function parse_setup($tags="",$max_items="") {
!
! if (is_array($tags)) {
! $this->tags = $tags;
! } else {
! // standard rdf setup - must be upper case (assuming case-folding is on which is PHP's default)
! $this->tags = array("channel" => "CHANNEL",
! "image" => "IMAGE",
! "item" => "ITEM",
! "title" => "TITLE",
! "link" => "LINK",
! "url" => "URL",
! "description" => "DESCRIPTION" );
! }
!
! // Internal initialisation
! $this->count = 0;
! $this->node = ""; // can be "" (ie channel), "item" or "image"
! $this->current = array(); // element stack
!
! $this->error_str = "";
!
! $this->channel = array("title"=>"", "link"=>"", "description" => "");
! $this->image = array("title"=>"", "link"=>"");
! $this->items = array();
!
! $this->xml = xml_parser_create();
! xml_set_object($this->xml, &$this);
! }
!
! function parse_file($url) {
! // debug("rdfparser::parse_file", "Now parsing $url");
!
! xml_parser_set_option($this->xml, XML_OPTION_CASE_FOLDING, true);
! xml_set_element_handler($this->xml, "start_element", "end_element");
! xml_set_character_data_handler($this->xml, "character_data");
!
! $fpread = @fopen($url, "r");
! 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))) {
! if (!xml_parse($this->xml, $data, feof($fpread))) {
! // 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!");
! }
! }
! }
! }
!
! class Block_render_rss {
! var $type;
! var $output;
! var $rdf;
!
! /* constructor */
! function Block_render_rss() {
! global $_PSL;
!
! $this->type = "rss"; /* set the 'type' */
! $this->output = ""; /* clear the output */
! $this->rdf = new rdfparser;
! $this->psl = $_PSL;
! }
!
! /* returns the TYPE of this class */
! function getType() {
! return $this->type;
! }
!
! function parse($block_info) {
! global $_PSL;
! // debug("Block_render_rss::parse", "Starting RDF Block parsing");
!
! $default_tpl = "rssblock.tpl";
!
!
! $titletype = "best";
! $target = "_self";
! $max_items = 10;
! $tpl = $default_tpl;
!
! if (is_array($block_info["block_options"])) {
! if (is_string($block_info["block_options"]["max_items"])) {
! $max_items = $block_info["block_options"]["max_items"];
! }
! if (is_string($block_info["block_options"]["target"])) {
! $target = $block_info["block_options"]["target"];
! }
! if (is_string($block_info["block_options"]["title"])) {
! $titletype = $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";
! }
! }
! }
!
! // debug("Block_render_rss::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_rss::parse", "xml has no errors, making block");
! // debug("rss::parse::channel",$this->rdf->channel);
! // debug("rss::parse::image",$this->rdf->image);
! // debug("rss::parse::items", $this->rdf->items);
!
! $template = new Template($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");
!
! switch ($titletype) {
! case "none":
! break;
!
! case "text":
! if ( !empty( $this->rdf->channel["title"]) ) {
! $template->set_var(array(
! "CHANNEL_TITLE" => $this->rdf->channel["title"],
! "CHANNEL_LINK" => empty($this->rdf->channel["link"])?"#":$this->rdf->channel["link"]
! ));
! $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["title"],
! "IMAGE_LINK" => $this->rdf->image["link"],
! ));
! $template->parse("image_block","channel_image");
! }
! break;
!
! case "both":
! if ( !empty( $this->rdf->channel["title"]) ) {
! $template->set_var(array(
! "CHANNEL_TITLE" => $this->rdf->channel["title"],
! "CHANNEL_LINK" => empty($this->rdf->channel["link"])?"#":$this->rdf->channel["link"]
! ));
! $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["title"],
! "IMAGE_LINK" => $this->rdf->image["link"],
! ));
! $template->parse("image_block","channel_image");
! }
! break;
!
! case "best":
! default:
! // <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["title"]) ) { // No image, but there is a title
! $template->set_var(array(
! "CHANNEL_TITLE" => $this->rdf->channel["title"],
! "CHANNEL_LINK" => empty($this->rdf->channel["link"])?"#":$this->rdf->channel["link"]
! ));
! $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["title"],
! "IMAGE_LINK" => $this->rdf->image["link"],
! ));
! $template->parse("image_block","channel_image");
! }
! }
!
! if ( !empty( $this->rdf->channel["description"]) ) {
! $template->set_var("CHANNEL_DESCRIPTION", $this->rdf->channel["description"]);
! $template->parse("channeldescription_block","channel_description",true);
! }
!
! $numitems = min($max_items, $this->rdf->count);
! // debug("rss::numitems",$numitems);
! for ($items = 0; $items < $numitems; $items++ ) {
! $template->set_var(array(
! "TITLE" => $this->rdf->items[$items]["title"],
! "LINK" => $this->rdf->items[$items]["link"]
! ));
! $template->parse ("query_block", "each_query", true);
!
! if (!empty($this->rdf->items[$items]["description"] )) {
! $template->set_var("DESCRIPTION",$this->rdf->items[$items]["description"] );
! $template->parse ("query_block", "each_description", true);
! }
! }
!
! $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["title"];
!
! return true;
!
! } else {
!
! debug("Block_render_rss::parse error", $this->rdf->error_str);
! $this->output = error("Error in source file:".$this->rdf->error_str);
!
! return false;
! }
!
! }
!
! function getFinal() {
! return $this->output;
! }
!
! function getTitle() {
! // Note: This wont work until object values are saved between the two stages of rendering a block
! // debug("rss::parse::getTitle", $this->title);
! return $this->title;
! }
! }
! ?>
--- 1,512 ----
! <?php
! /* Block_render_rss.class -> Methods for parsing RSS 0.91 data */
! /* $Id$ */
!
! /*
! * BLOCK OPTIONS USED
! * target = [_blank],_self etc
! * max_items = 10
! * tpl = alternate template ( no .tpl extension) [rssblock]
! * title = none - dont display title or image, even if they are available
! * image - force display of image (if tag present - else show no title)
! * text - force display of title text (if tag present - else show no title)
! * both - display both image and text if available
! * best (default) - display image if tags present, else display title if possible
! */
!
! /**
! * Class to interpret and render a newsfeed (eg RSS 0.91).
! *
! * Works with RSS 0.91 to 1.0. Extendable to be able to interpret similar files
! * - eg as used by moreover.com
! * NB Ignores max_items - it pulls everything it can from the RDF file
! *
! * @access private
! * @author ??. Code amended by Peter Cruickshank, Feb 2002
! * @version 0.65
! * @since version 0.65
! * @package phpslash
! */
! class rdfparser {
!
! // Settings
!
! /**
! * Maximum number of items to read in from source (not used)
! * @access public
! */
! var $max_items;
! /**
! * Array listing tags to process (channel, image, item). All others are ignored
! * @access public
! */
! var $tags;
!
! // Output information
!
! /**
! * Output array of channel information (title, link, description)
! * @access public
! */
! var $channel;
! /**
! * Output array of information on image (title, link, url)
! * Image width and height are not used since most sites seem not to give this info anyway
! * @access public
! */
! var $image;
! /**
! * Output array of items (title, link, description)
! * @access public
! */
! var $items;
!
! /**
! * Output errir message - if you got an error reading a file this will store an error
! * @access public
! */
! var $error_str = "";
!
! // Private
!
! /**
! * XML processor object
! * @access private
! */
! var $xml;
! /**
! * Current container-element can be "" (ie channel), "item" or "image" (Should be a stack really, but nesting is only one deep)
! * @access private
! */
! var $node;
! /**
! * Element stack(array)
! * @access private
! */
! var $current;
! /**
! * Number of items
! * @access private
! */
! var $count;
!
! /**
! * Empty constructor function.
! * @See parse_setup()
! */
! function rdfparser() {
! }
!
! /**
! * Notes start of container-element
! *
! * @param xml_parser $xml xml object (not used)
! * @param string $element element encountered by the xml parser
! * @param string $attributes (not used)
! * @access private
! */
! function start_element($xml, $element, $attributes) {
!
! $this->current = $element;
!
! switch ($element) {
! case $this->tags["item"]:
! case $this->tags["image"]:
! case $this->tags["channel"]:
! $this->node = $element;
! // debug("rdf:start element+node","$element+".$this->node);
! break;
!
! default:
! }
!
! }
!
! /**
! * End element function - clear node if necessary
! *
! * @param xml_parser $xml xml object (not used)
! * @param string $element element encountered by the xml parser
! * @access private
! */
! function end_element($xml, $element) {
! $this->current = "";
!
! switch ($element) {
! case $this->tags["item"]:
! $this->node = "";
! $this->count++;
! break;
! case $this->tags["channel"]:
! case $this->tags["image"]:
! $this->node = "";
! break;
! }
! }
!
! /**
! * Store xml character data in appropriate place (items, image, channel)
! *
! * @param xml_parser $xml xml object (not used)
! * @param string $data xml content
! * @access private
! */
! function character_data($xml, $data) {
!
! switch ($this->node) {
!
! case $this->tags["item"]:
! switch ($this->current) {
! case $this->tags["title"]:
! $this->items[$this->count]["title"] .= $data;
! break;
! case $this->tags["link"]:
! $this->items[$this->count]["link"] .= $data;
! break;
! case $this->tags["description"]:
! $this->items[$this->count]["description"] .= $data;
! break;
! default:
! }
! break;
!
! case $this->tags["image"]:
! switch ($this->current) {
! case $this->tags["title"]:
! $this->image["title"] .= $data;
! if (empty($this->channel["title"])) {
! $this->channel["title"] .= $data;
! }
! break;
! case $this->tags["link"]:
! $this->image["link"] .= $data;
! break;
! case $this->tags["url"]:
! $this->image["url"] .= $data;
! break;
! default:
! }
! break;
!
! case $this->tags["channel"]:
! switch ($this->current) {
! case $this->tags["title"]:
! $this->channel["title"] .= $data;
! break;
! case $this->tags["link"]:
! $this->channel["link"] .= $data;
! break;
! case $this->tags["description"]:
! $this->channel["description"] .= $data;
! break;
! default:
! }
! break;
!
! default:
! }
! }
!
! /**
! * 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
! */
! function parse_setup($tags="",$max_items="") {
!
! if (is_array($tags)) {
! $this->tags = $tags;
! } else {
! // standard rdf setup - must be upper case (assuming case-folding is on which is PHP's default)
! $this->tags = array("channel" => "CHANNEL",
! "image" => "IMAGE",
! "item" => "ITEM",
! "title" => "TITLE",
! "link" => "LINK",
! "url" => "URL",
! "description" => "DESCRIPTION" );
! }
!
! // Internal initialisation
! $this->count = 0;
! $this->node = ""; // can be "" (ie channel), "item" or "image"
! $this->current = array(); // element stack
!
! $this->error_str = "";
!
! $this->channel = array("title"=>"", "link"=>"", "description" => "");
! $this->image = array("title"=>"", "link"=>"");
! $this->items = array();
!
! $this->xml = xml_parser_create();
! xml_set_object($this->xml, &$this);
! }
!
! /**
! * 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");
!
! xml_parser_set_option($this->xml, XML_OPTION_CASE_FOLDING, true);
! xml_set_element_handler($this->xml, "start_element", "end_element");
! xml_set_character_data_handler($this->xml, "character_data");
!
! $fpread = @fopen($url, "r");
! 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))) {
! if (!xml_parse($this->xml, $data, feof($fpread))) {
! // 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!");
! }
! }
! }
! }
!
! /**
! * Class to display a newsfeed
! *
! * @access public
! * @author ?? - code amended by Peter Cruickshank, Feb 2002
! * @version 0.65
! * @since version 0.65
! * @package phpslash
! */
!
! class Block_render_rss {
! /**
! * Blcok type = "rss"
! * @access public
! */
! var $type;
! /**
! * Output
! * @access public
! */
! var $output;
! /**
! * rdfparser object
! * @access private
! */
! var $rdf;
!
! /**
! * constructor
! */
! function Block_render_rss() {
! global $_PSL;
!
! $this->type = "rss"; /* set the 'type' */
! $this->output = ""; /* clear the output */
! $this->rdf = new rdfparser;
! $this->psl = $_PSL;
! }
!
! /**
! * returns the TYPE of this class
! * @return string
! */
! function getType() {
! return $this->type;
! }
!
!
! /**
! * Generates and stores html code
! * @param array $block_info block options and other info supplied by caller
! */
! function parse($block_info) {
! global $_PSL;
! // debug("Block_render_rss::parse", "Starting RDF Block parsing");
!
! $default_tpl = "rssblock.tpl";
!
!
! $titletype = "best";
! $target = "_self";
! $max_items = 10;
! $tpl = $default_tpl;
!
! if (is_array($block_info["block_options"])) {
! if (is_string($block_info["block_options"]["max_items"])) {
! $max_items = $block_info["block_options"]["max_items"];
! }
! if (is_string($block_info["block_options"]["target"])) {
! $target = $block_info["block_options"]["target"];
! }
! if (is_string($block_info["block_options"]["title"])) {
! $titletype = $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";
! }
! }
! }
!
! // debug("Block_render_rss::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_rss::parse", "xml has no errors, making block");
! // debug("rss::parse::channel",$this->rdf->channel);
! // debug("rss::parse::image",$this->rdf->image);
! // debug("rss::parse::items", $this->rdf->items);
!
! $template = new Template($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");
!
! switch ($titletype) {
! case "none":
! break;
!
! case "text":
! if ( !empty( $this->rdf->channel["title"]) ) {
! $template->set_var(array(
! "CHANNEL_TITLE" => $this->rdf->channel["title"],
! "CHANNEL_LINK" => empty($this->rdf->channel["link"])?"#":$this->rdf->channel["link"]
! ));
! $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["title"],
! "IMAGE_LINK" => $this->rdf->image["link"],
! ));
! $template->parse("image_block","channel_image");
! }
! break;
!
! case "both":
! if ( !empty( $this->rdf->channel["title"]) ) {
! $template->set_var(array(
! "CHANNEL_TITLE" => $this->rdf->channel["title"],
! "CHANNEL_LINK" => empty($this->rdf->channel["link"])?"#":$this->rdf->channel["link"]
! ));
! $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["title"],
! "IMAGE_LINK" => $this->rdf->image["link"],
! ));
! $template->parse("image_block","channel_image");
! }
! break;
!
! case "best":
! default:
! // <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["title"]) ) { // No image, but there is a title
! $template->set_var(array(
! "CHANNEL_TITLE" => $this->rdf->channel["title"],
! "CHANNEL_LINK" => empty($this->rdf->channel["link"])?"#":$this->rdf->channel["link"]
! ));
! $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["title"],
! "IMAGE_LINK" => $this->rdf->image["link"],
! ));
! $template->parse("image_block","channel_image");
! }
! }
!
! if ( !empty( $this->rdf->channel["description"]) ) {
! $template->set_var("CHANNEL_DESCRIPTION", $this->rdf->channel["description"]);
! $template->parse("channeldescription_block","channel_description",true);
! }
!
! $numitems = min($max_items, $this->rdf->count);
! // debug("rss::numitems",$numitems);
! for ($items = 0; $items < $numitems; $items++ ) {
! $template->set_var(array(
! "TITLE" => $this->rdf->items[$items]["title"],
! "LINK" => $this->rdf->items[$items]["link"]
! ));
! $template->parse ("query_block", "each_query", true);
!
! if (!empty($this->rdf->items[$items]["description"] )) {
! $template->set_var("DESCRIPTION",$this->rdf->items[$items]["description"] );
! $template->parse ("query_block", "each_description", true);
! }
! }
!
! $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["title"];
!
! return true;
!
! } else {
!
! debug("Block_render_rss::parse error", $this->rdf->error_str);
! $this->output = error("Error in source file:".$this->rdf->error_str);
!
! return false;
! }
!
! }
!
! /**
! * Returns output
! * @return htmlstring
! */
! function getFinal() {
! return $this->output;
! }
!
! /**
! * Returns block title (for use with dynamic blcok titles)
! *
! * This wont work until object values are saved between the two stages of rendering a block.
! * - it currently returns an empty string
! *
! * @return htmlstring
! */
! function getTitle() {
! // debug("rss::parse::getTitle", $this->title);
! return $this->title;
! }
! }
! ?>
|
|
From: Joe S. <joe...@us...> - 2002-03-11 04:20:22
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv26063/phpslash-ft Modified Files: CHANGES Log Message: [ 528296 ] and [ 528290 ] Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.411 retrieving revision 1.412 diff -C2 -d -r1.411 -r1.412 *** CHANGES 9 Mar 2002 16:25:27 -0000 1.411 --- CHANGES 11 Mar 2002 04:20:18 -0000 1.412 *************** *** 13,16 **** --- 13,25 ---- 9 - Removal of something (kill -9 :) + 2002-Mar-10 10:00PM CST Joe Stewart <jo...@be...> + [B] - functions.inc - setLang falls back to base lang + if dialect not found. + slash-all.sql - db_sequence needed an entry for + psl_section_block_lut_seq. Closes [ 528290 ] + Creating first new block. + Block_render_rss.class - Peter's [ 528296 ] + block_render_rss.class a la phpDocs. + 2002-Mar-9 9:00AM CST Joe Stewart <jo...@be...> [T] - mailinglistSubscribe.tpl - corrected [ 526753 ] |
|
From: Joe S. <joe...@us...> - 2002-03-11 04:20:22
|
Update of /cvsroot/phpslash/phpslash-ft/tables/0.65 In directory usw-pr-cvs1:/tmp/cvs-serv26063/phpslash-ft/tables/0.65 Modified Files: slash-all.sql Log Message: [ 528296 ] and [ 528290 ] Index: slash-all.sql =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/tables/0.65/slash-all.sql,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** slash-all.sql 7 Mar 2002 21:10:01 -0000 1.11 --- slash-all.sql 11 Mar 2002 04:20:18 -0000 1.12 *************** *** 137,141 **** INSERT INTO db_sequence (seq_name, nextid) VALUES ( 'psl_mailinglist_seq', '2'); INSERT INTO db_sequence (seq_name, nextid) VALUES ( 'psl_glossary_seq', '1'); ! INSERT INTO db_sequence (seq_name, nextid) VALUES ( 'psl_blocktype_seq ', '10'); --- 137,142 ---- INSERT INTO db_sequence (seq_name, nextid) VALUES ( 'psl_mailinglist_seq', '2'); INSERT INTO db_sequence (seq_name, nextid) VALUES ( 'psl_glossary_seq', '1'); ! INSERT INTO db_sequence (seq_name, nextid) VALUES ( 'psl_blocktype_seq ', '10'); INSERT INTO db_sequence (seq_name, nextid) VALUES ( 'psl_section_block_lut_seq', '270'); ! |
|
From: Joe S. <joe...@us...> - 2002-03-09 16:25:34
|
Update of /cvsroot/phpslash/phpslash-ft/doc/html
In directory usw-pr-cvs1:/tmp/cvs-serv19270/phpslash-ft/doc/html
Modified Files:
phpslash.sgml
Log Message:
[ 526753 ] mispellings in mailinglistSubscribe.tpl
Index: phpslash.sgml
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/doc/html/phpslash.sgml,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** phpslash.sgml 20 Feb 2002 23:15:59 -0000 1.17
--- phpslash.sgml 9 Mar 2002 16:25:27 -0000 1.18
***************
*** 644,647 ****
--- 644,648 ----
mailinglistForm.tpl
mailinglistMessageForm.tpl
+ mailinglistSubscribe.tpl
messageStrike.tpl
notfound.tpl
|
|
From: Joe S. <joe...@us...> - 2002-03-09 16:25:34
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv19270/phpslash-ft Modified Files: CHANGES Log Message: [ 526753 ] mispellings in mailinglistSubscribe.tpl Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.410 retrieving revision 1.411 diff -C2 -d -r1.410 -r1.411 *** CHANGES 8 Mar 2002 20:08:03 -0000 1.410 --- CHANGES 9 Mar 2002 16:25:27 -0000 1.411 *************** *** 13,16 **** --- 13,22 ---- 9 - Removal of something (kill -9 :) + 2002-Mar-9 9:00AM CST Joe Stewart <jo...@be...> + [T] - mailinglistSubscribe.tpl - corrected [ 526753 ] + mispellings in mailinglistSubscribe.tpl + [D] - phpslash.sgml - added mailinglistSubscribe.tpl to + changed templates. + 2002-Mar-8 2:00PM CST Joe Stewart <jo...@be...> [F] - functions.inc - Block titles can be translated automatically. |
|
From: Joe S. <joe...@us...> - 2002-03-09 16:25:33
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default
In directory usw-pr-cvs1:/tmp/cvs-serv19270/phpslash-ft/public_html/templates/en/default
Modified Files:
mailinglistSubscribe.tpl
Log Message:
[ 526753 ] mispellings in mailinglistSubscribe.tpl
Index: mailinglistSubscribe.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default/mailinglistSubscribe.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mailinglistSubscribe.tpl 2 Dec 2000 17:39:15 -0000 1.2
--- mailinglistSubscribe.tpl 9 Mar 2002 16:25:27 -0000 1.3
***************
*** 1,12 ****
! This is just a confirmation message from {SITENAME}
! You have been added to our mailing list for perodic email updates of new
! news on our site. If you would like to contribute, suggest a story, or
! join or team of newshounds you may reply to this message or visit the
! site. (We recommend visting the site :)
! To remove yourself go to {MAILINGLIST_URL},
! type in your email address, {ADDRESS}, in the
! unsubscribe portion of the page (don't worry, it's clearly marked) and hit
! the "unsubscribe" button.
--- 1,6 ----
! This is just a confirmation message from {SITENAME}.
! You have been added to our mailing list for periodic email updates of new news on our site. If you would like to contribute, suggest a story, or join our team of newshounds you may reply to this message or visit the site. (We recommend visiting the site :)
! To remove yourself go to {MAILINGLIST_URL}, type in your email address, {ADDRESS}, in the unsubscribe portion of the page (don't worry, it's clearly marked) and hit the "unsubscribe" button.
|
|
From: Joe S. <joe...@us...> - 2002-03-08 20:08:06
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv17940/phpslash-ft/class
Modified Files:
functions.inc
Log Message:
translate block titles
Index: functions.inc
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/functions.inc,v
retrieving revision 1.94
retrieving revision 1.95
diff -C2 -d -r1.94 -r1.95
*** functions.inc 5 Mar 2002 16:48:28 -0000 1.94
--- functions.inc 8 Mar 2002 20:08:03 -0000 1.95
***************
*** 208,212 ****
'WIDTH' => $width,
'ALIGN' => $align,
! 'TITLE' => $title,
'CONTENTS' => $contents
));
--- 208,212 ----
'WIDTH' => $width,
'ALIGN' => $align,
! 'TITLE' => pslgetText($title),
'CONTENTS' => $contents
));
|
|
From: Joe S. <joe...@us...> - 2002-03-08 20:08:06
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv17940/phpslash-ft Modified Files: CHANGES Log Message: translate block titles Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.409 retrieving revision 1.410 diff -C2 -d -r1.409 -r1.410 *** CHANGES 7 Mar 2002 21:45:36 -0000 1.409 --- CHANGES 8 Mar 2002 20:08:03 -0000 1.410 *************** *** 13,16 **** --- 13,19 ---- 9 - Removal of something (kill -9 :) + 2002-Mar-8 2:00PM CST Joe Stewart <jo...@be...> + [F] - functions.inc - Block titles can be translated automatically. + 2002-Mar-7 3:30PM CST Joe Stewart <jo...@be...> [B] - slashAuthCR.class, slashAuth.class - should have explicitly returned |
|
From: Joe S. <joe...@us...> - 2002-03-07 21:45:39
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv9481/phpslash-ft Modified Files: CHANGES Log Message: return false on error Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.408 retrieving revision 1.409 diff -C2 -d -r1.408 -r1.409 *** CHANGES 7 Mar 2002 21:07:20 -0000 1.408 --- CHANGES 7 Mar 2002 21:45:36 -0000 1.409 *************** *** 13,16 **** --- 13,20 ---- 9 - Removal of something (kill -9 :) + 2002-Mar-7 3:30PM CST Joe Stewart <jo...@be...> + [B] - slashAuthCR.class, slashAuth.class - should have explicitly returned + false on error. + 2002-Mar-7 3:00PM CST Joe Stewart <jo...@be...> [B] - Block_i.class - The block option "perm" can assign a required |
|
From: Joe S. <joe...@us...> - 2002-03-07 21:45:39
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv9481/phpslash-ft/class
Modified Files:
slashAuth.class slashAuthCR.class
Log Message:
return false on error
Index: slashAuth.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/slashAuth.class,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** slashAuth.class 8 Feb 2002 21:50:10 -0000 1.5
--- slashAuth.class 7 Mar 2002 21:45:36 -0000 1.6
***************
*** 106,110 ****
}
$this->auth["error"] = "Either your username or password are invalid.<br>Please try again.";
! return $uid;
}
--- 106,110 ----
}
$this->auth["error"] = "Either your username or password are invalid.<br>Please try again.";
! return false;
}
Index: slashAuthCR.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/slashAuthCR.class,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** slashAuthCR.class 8 Feb 2002 22:17:27 -0000 1.5
--- slashAuthCR.class 7 Mar 2002 21:45:36 -0000 1.6
***************
*** 123,128 ****
}
$this->auth["error"] = "Either your username or password are invalid.<br>Please try again.";
! return $uid;
! // TODO: If we're returning an error, shouldn't we also return 'false'?
}
--- 123,127 ----
}
$this->auth["error"] = "Either your username or password are invalid.<br>Please try again.";
! return false;
}
|
|
From: Joe S. <joe...@us...> - 2002-03-07 21:10:03
|
Update of /cvsroot/phpslash/phpslash-ft/tables/0.65
In directory usw-pr-cvs1:/tmp/cvs-serv28737/phpslash-ft/tables/0.65
Modified Files:
slash-all.sql
Log Message:
individual block permissions
Index: slash-all.sql
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/tables/0.65/slash-all.sql,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** slash-all.sql 6 Feb 2002 18:47:43 -0000 1.10
--- slash-all.sql 7 Mar 2002 21:10:01 -0000 1.11
***************
*** 188,192 ****
#
! INSERT INTO psl_block (id, type, title, expire_length, last_update, location, source_url, cache_data, block_options, ordernum) VALUES ( '131', '5', 'PHPSlash Poll', '0', '20010516100206', '', '', '<!-- START: pollDisplay.tpl -->
<form action=\"/pollAdmin.php3\">
<input type=hidden name=question_id value=\"\">
--- 188,192 ----
#
! INSERT INTO psl_block (id, type, title, expire_length, last_update, location, source_url, cache_data, block_options, ordernum) VALUES ( '131', '5', 'PHPSlash Poll', '1200', '20010516100206', '', '', '<!-- START: pollDisplay.tpl -->
<form action=\"/pollAdmin.php3\">
<input type=hidden name=question_id value=\"\">
***************
*** 361,366 ****
', 'a:2:{s:6:\"column\";s:5:\"right\";s:5:\"width\";s:3:\"160\";}', '30');
! INSERT INTO psl_block (id, type, title, expire_length, last_update, location, source_url, cache_data, block_options, ordernum) VALUES( '147', '10', 'Skins', '0', '20011002152749', '', '', '', 'a:2:{s:6:\"column\";s:4:\"left\";s:0:\"\";s:0:\"\";}', '50');
! INSERT INTO psl_block VALUES( '148', '1', 'Administration', '0', '20020109103042', '', '', '<BR><BR>A bunch of cool things like latest site activity and stats should go here. <BR> But until they do, just pick something from the NavBar and go about your duties...<BR><BR>', 'a:2:{s:6:\"column\";s:6:\"center\";s:0:\"\";s:0:\"\";}', '90');
# --------------------------------------------------------
--- 361,366 ----
', 'a:2:{s:6:\"column\";s:5:\"right\";s:5:\"width\";s:3:\"160\";}', '30');
! INSERT INTO psl_block (id, type, title, expire_length, last_update, location, source_url, cache_data, block_options, ordernum) VALUES( '147', '10', 'Skins', '14400', '20011002152749', '', '', '', 'a:3:{s:6:"column";s:4:"left";s:5:"perms";s:4:"user";s:0:"";s:0:"";}', '50');
! INSERT INTO psl_block VALUES( '148', '1', 'Administration', '0', '20020109103042', '', '', '<BR><BR>A bunch of cool things like latest site activity and stats should go here. <BR> But until they do, just pick something from the NavBar and go about your duties...<BR><BR>', 'a:3:{s:6:"column";s:6:"center";s:5:"perms";s:4:"user";s:0:"";s:0:"";}', '90');
# --------------------------------------------------------
|
|
From: Joe S. <joe...@us...> - 2002-03-07 21:07:26
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv27781/phpslash-ft Modified Files: CHANGES Log Message: individual block permissions Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.407 retrieving revision 1.408 diff -C2 -d -r1.407 -r1.408 *** CHANGES 6 Mar 2002 04:29:54 -0000 1.407 --- CHANGES 7 Mar 2002 21:07:20 -0000 1.408 *************** *** 13,16 **** --- 13,23 ---- 9 - Removal of something (kill -9 :) + 2002-Mar-7 3:00PM CST Joe Stewart <jo...@be...> + [B] - Block_i.class - The block option "perm" can assign a required + permission for a user to see a block. + Block.class - bring in the perm object. + slash-all.sql - change the skin and Administration blocks to require + "user" permissions. Poll block also changed to 15minute cache. + 2002-Mar-5 10:00PM CST Joe Stewart <jo...@be...> [B] - comment.php3, login.php3, mailinglist.php3, |
|
From: Joe S. <joe...@us...> - 2002-03-07 21:07:26
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv27781/phpslash-ft/class
Modified Files:
Block.class Block_i.class
Log Message:
individual block permissions
Index: Block.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block.class,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Block.class 6 Feb 2002 18:47:43 -0000 1.11
--- Block.class 7 Mar 2002 21:07:20 -0000 1.12
***************
*** 12,16 ****
/* Var's to be constructed in constructor */
! var $db, $block_info, $parser, $parsedData, $parser_arr, $block_ary, $_PSL;
/**
--- 12,16 ----
/* Var's to be constructed in constructor */
! var $db, $block_info, $parser, $parsedData, $parser_arr, $block_ary, $_PSL, $perm;
/**
***************
*** 25,29 ****
function Block() {
/* Constructor: Create sub-objects here, etc... */
! global $_PSL;
$this->db = new slashDB;
--- 25,29 ----
function Block() {
/* Constructor: Create sub-objects here, etc... */
! global $_PSL, $perm;
$this->db = new slashDB;
***************
*** 31,35 ****
$this->psl = $_PSL;
!
/* Array to store block info in */
$this->block_info = array();
--- 31,36 ----
$this->psl = $_PSL;
! $this->perm = $perm;
!
/* Array to store block info in */
$this->block_info = array();
***************
*** 394,400 ****
}
}
!
! return getFancyBox($width, $temptitle, $this->block_info["cache_data"],$link, $box_type);
!
}
--- 395,403 ----
}
}
! if( !is_string($this->block_info['block_options']['perms'])) {
! return getFancyBox($width, $temptitle, $this->block_info["cache_data"],$link, $box_type);
! } elseif ($this->perm->have_perm($this->block_info['block_options']['perms'])) {
! return getFancyBox($width, $temptitle, $this->block_info["cache_data"],$link, $box_type);
! }
}
***************
*** 583,585 ****
} /* End class Block */
! ?>
\ No newline at end of file
--- 586,588 ----
} /* End class Block */
! ?>
Index: Block_i.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_i.class,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Block_i.class 21 Feb 2002 18:08:36 -0000 1.15
--- Block_i.class 7 Mar 2002 21:07:20 -0000 1.16
***************
*** 323,327 ****
function getBlocks($ary, $column="") {
!
// debug("Block_i.class::getBlocks::ary", $ary);
--- 323,327 ----
function getBlocks($ary, $column="") {
!
// debug("Block_i.class::getBlocks::ary", $ary);
***************
*** 333,339 ****
$output = "";
for ($i=0; $i < count($this->block_ary); $i++) {
!
! $output .= $this->parseBlock($this->block_ary[$i], $column);
!
}
--- 333,342 ----
$output = "";
for ($i=0; $i < count($this->block_ary); $i++) {
!
! if( !isset($this->block_ary[$i]['block_options']['perms'])) {
! $output .= $this->parseBlock($this->block_ary[$i], $column);
! } elseif ($this->perm->have_perm($this->block_ary[$i]['block_options']['perms'])) {
! $output .= $this->parseBlock($this->block_ary[$i], $column);
! }
}
|
Update of /cvsroot/phpslash/phpslash-ft/public_html
In directory usw-pr-cvs1:/tmp/cvs-serv5475/phpslash-ft/public_html
Modified Files:
comment.php3 login.php3 mailinglist.php3 poll.php3
glossary.php3 search.php3 submission.php3
Log Message:
slashhead call the same as index.php3
Index: comment.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/comment.php3,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** comment.php3 6 Feb 2002 19:55:46 -0000 1.10
--- comment.php3 6 Mar 2002 04:29:54 -0000 1.11
***************
*** 41,45 ****
$cmt = new Comment($cmtary);
! slashhead($pagetitle,$xsiteobject);
switch($submit) {
--- 41,47 ----
$cmt = new Comment($cmtary);
! $_PSL['metatags']['object'] = $xsiteobject;
!
! slashhead($pagetitle,$_PSL['metatags']);
switch($submit) {
Index: login.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/login.php3,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** login.php3 18 Feb 2002 21:04:25 -0000 1.15
--- login.php3 6 Mar 2002 04:29:54 -0000 1.16
***************
*** 22,28 ****
// Objects
! $story = new Story;
$block = new Block_i;
! $db = new slashDB;
// Start of Page
--- 22,28 ----
// Objects
! // $story = new Story;
$block = new Block_i;
! // $db = new slashDB;
// Start of Page
***************
*** 52,55 ****
--- 52,56 ----
slashhead($pagetitle,$_PSL['metatags']);
+
$allstories = $story->getStories($ary);
$leftblocks = $block->getBlocks($ary, "left");
Index: mailinglist.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/mailinglist.php3,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mailinglist.php3 16 Dec 2001 20:54:51 -0000 1.2
--- mailinglist.php3 6 Mar 2002 04:29:54 -0000 1.3
***************
*** 14,18 ****
*****************************/
! slashhead($pagetitle,$xsiteobject);
/* DEBUG */
--- 14,20 ----
*****************************/
! $_PSL['metatags']['object'] = $xsiteobject;
!
! slashhead($pagetitle,$_PSL['metatags']);
/* DEBUG */
Index: poll.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/poll.php3,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** poll.php3 11 Feb 2002 18:25:58 -0000 1.10
--- poll.php3 6 Mar 2002 04:29:54 -0000 1.11
***************
*** 14,18 ****
}
! slashhead($pagetitle,$xsiteobject);
// TODO: Make this work with $HTTP_*_VARS
--- 14,20 ----
}
! $_PSL['metatags']['object'] = $xsiteobject;
!
! slashhead($pagetitle,$_PSL['metatags']);
// TODO: Make this work with $HTTP_*_VARS
Index: glossary.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/glossary.php3,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** glossary.php3 3 Feb 2002 22:09:12 -0000 1.10
--- glossary.php3 6 Mar 2002 04:29:54 -0000 1.11
***************
*** 14,18 ****
*****************************/
! slashhead($pagetitle,$xsiteobject);
/* DEBUG */
--- 14,20 ----
*****************************/
! $_PSL['metatags']['object'] = $xsiteobject;
!
! slashhead($pagetitle,$_PSL['metatags']);
/* DEBUG */
Index: search.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/search.php3,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** search.php3 3 Feb 2002 22:09:12 -0000 1.43
--- search.php3 6 Mar 2002 04:29:54 -0000 1.44
***************
*** 141,145 ****
/*************PAGE START*******************/
! slashhead($pagetitle,$xsiteobject);
/* Templates */
--- 141,147 ----
/*************PAGE START*******************/
! $_PSL['metatags']['object'] = $xsiteobject;
!
! slashhead($pagetitle,$_PSL['metatags']);
/* Templates */
Index: submission.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/submission.php3,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** submission.php3 3 Feb 2002 22:09:12 -0000 1.5
--- submission.php3 6 Mar 2002 04:29:54 -0000 1.6
***************
*** 19,23 ****
*****************************/
! slashhead($pagetitle,$xsiteobject);
debug("HTTP_POST_VARS" , $HTTP_POST_VARS);
--- 19,25 ----
*****************************/
! $_PSL['metatags']['object'] = $xsiteobject;
!
! slashhead($pagetitle,$_PSL['metatags']);
debug("HTTP_POST_VARS" , $HTTP_POST_VARS);
|
|
From: Joe S. <joe...@us...> - 2002-03-06 04:29:57
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv5475/phpslash-ft Modified Files: CHANGES Log Message: slashhead call the same as index.php3 Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.406 retrieving revision 1.407 diff -C2 -d -r1.406 -r1.407 *** CHANGES 5 Mar 2002 16:48:27 -0000 1.406 --- CHANGES 6 Mar 2002 04:29:54 -0000 1.407 *************** *** 13,16 **** --- 13,22 ---- 9 - Removal of something (kill -9 :) + 2002-Mar-5 10:00PM CST Joe Stewart <jo...@be...> + [B] - comment.php3, login.php3, mailinglist.php3, + errordocument.php3, poll.php3, glossary.php3, + search.php3, submission.php3, slashAuthCR.class - + Calls to slashhead are now the same as index.php3. + 2002-Mar-5 10:30AM CST Joe Stewart <jo...@be...> [B] - index.php3 - commented out unuses db instance. |
|
From: Joe S. <joe...@us...> - 2002-03-05 16:51:00
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv10348/phpslash-ft/class
Modified Files:
Block_render_skin.class Block_render_html.class
Block_render_topic.class Block_render_section.class
Block_render_quote.class Block_render_poll.class
Block_render_cal.class
Log Message:
object cleanup
Index: Block_render_skin.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_skin.class,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Block_render_skin.class 7 Feb 2002 21:19:54 -0000 1.4
--- Block_render_skin.class 5 Mar 2002 16:50:57 -0000 1.5
***************
*** 18,112 ****
class Block_render_skin {
! var $type;
! var $output;
! /* constructor */
! function Block_render_skin() {
! global $_PSL;
! $this->type = "skin"; /* set the 'type' */
! $this->output = ""; /* clear the output */
! $this->psl = $_PSL;
! }
! /* returns the TYPE of this class */
! function getType() {
! return $this->type;
! }
! function parse( $block_info) {
! $this->output = $this->skin( $block_info);
! // $this->output = "";
! return 1;
! }
! function skin( $block_info) {
! $db = new SlashDB;
! $default_tpl = "skinsblock.tpl";
! $options = $block_info["source_url"];
! parse_str( $options);
! if ($this->psl['skin']) {
! $skin = $this->psl['skin'];
! } else {
! $skin = $this->psl['defaultskin'];
! $this->psl['templatedir]'] .= $skin;
! }
! // remove "skin" from templatedir
! $templatedir = substr( $this->psl['templatedir'], 0, strrpos($this->psl['templatedir'], "/") );
! // $tpl = ""; // disable template option
! if( empty($tpl) ) {
! $tpl = $default_tpl;
! } elseif ( file_exists($templatedir . "/" . basename($tpl) . ".tpl") ) {
! $tpl = basename($tpl) . ".tpl";
! } else {
! debug ( "Block_render_skin:Template file doesn't exist, using default instead", $tpl);
! $tpl = $default_tpl;
! }
! $template = new Template($templatedir . "/" . $skin);
! $template->debug = 0;
! $template->set_file(array(
! 'block' => $tpl
! ));
! $template->set_block ("block", "each_skin", "skin_block");
! $template->set_var (array (
! 'SKIN' => "",
! 'ROOTDIR' => $this->psl['rooturl'],
! 'IMAGEDIR' => $this->psl['imageurl'],
! 'PHP_SELF' => $this->psl['phpself']
! ));
! $fulldirlist = dir($templatedir . "/");
! while( $eachfile = $fulldirlist->read()) {
! if( (@is_dir($templatedir . "/" . $eachfile)) AND
( $eachfile != ".") AND
( $eachfile != "..") AND
( $eachfile != "CVS") ) {
! $template->set_var(array(
! SKIN => $eachfile
! ));
! $template->parse("skin_block","each_skin",true);
}
}
! $output = $template->parse('OUT',"block");
!
! return $output;
! }
! function getFinal() {
! return $this->output;
! }
}
--- 18,113 ----
class Block_render_skin {
! var $type;
! var $output;
! /* constructor */
! function Block_render_skin() {
! global $_PSL;
! $this->type = "skin"; /* set the 'type' */
! $this->output = ""; /* clear the output */
! $this->psl = $_PSL;
! }
! /* returns the TYPE of this class */
! function getType() {
! return $this->type;
! }
! function parse( $block_info) {
! $this->output = $this->skin( $block_info);
! // $this->output = "";
! return 1;
! }
! function skin( $block_info) {
! $db = new SlashDB;
! $default_tpl = "skinsblock.tpl";
! $options = $block_info["source_url"];
! parse_str( $options);
! if ($this->psl['skin']) {
! $skin = $this->psl['skin'];
! } else {
! $skin = $this->psl['defaultskin'];
! $this->psl['templatedir]'] .= $skin;
! }
! // remove "skin" from templatedir
! $templatedir = substr( $this->psl['templatedir'], 0, strrpos($this->psl['templatedir'], "/") );
! // $tpl = ""; // disable template option
! if( empty($tpl) ) {
! $tpl = $default_tpl;
! } elseif ( file_exists($templatedir . "/" . basename($tpl) . ".tpl") ) {
! $tpl = basename($tpl) . ".tpl";
! } else {
! debug ( "Block_render_skin:Template file doesn't exist, using default instead", $tpl);
! $tpl = $default_tpl;
! }
! $template = new Template($templatedir . "/" . $skin);
! $template->debug = 0;
! $template->set_file(array(
! 'block' => $tpl
! ));
! $template->set_block ("block", "each_skin", "skin_block");
! $template->set_var (array (
! 'SKIN' => "",
! 'ROOTDIR' => $this->psl['rooturl'],
! 'IMAGEDIR' => $this->psl['imageurl'],
! 'PHP_SELF' => $this->psl['phpself']
! ));
! $fulldirlist = dir($templatedir . "/");
! while( $eachfile = $fulldirlist->read()) {
! if( (@is_dir($templatedir . "/" . $eachfile)) AND
( $eachfile != ".") AND
( $eachfile != "..") AND
( $eachfile != "CVS") ) {
!
! $template->set_var(array(
! SKIN => $eachfile
! ));
! $template->parse("skin_block","each_skin",true);
}
}
! $output = $template->parse('OUT',"block");
! unset($db);
! return $output;
! }
! function getFinal() {
! return $this->output;
! }
}
Index: Block_render_html.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_html.class,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Block_render_html.class 15 May 2001 22:36:15 -0000 1.1
--- Block_render_html.class 5 Mar 2002 16:50:57 -0000 1.2
***************
*** 6,43 ****
class Block_render_html {
! var $type;
! var $output;
! /* constructor */
! function Block_render_html() {
! $this->type = "html"; /* set the 'type' */
! $this->output = ""; /* clear the output */
! }
! /* returns the TYPE of this class */
! function getType() {
! return $this->type;
! }
! function parse($block_info) {
! $sl_q = new slashDB;
! $query = "SELECT cache_data
FROM psl_block
! WHERE id = " . $block_info["id"];
! $sl_q->query($query);
! if ($sl_q->next_record()) {
! $this->output = $sl_q->f("cache_data");
! return 1;
! } else {
! return 0;
! }
! }
! function getFinal() {
! return $this->output;
! }
}
--- 6,50 ----
class Block_render_html {
! var $type;
! var $output;
! /* constructor */
! function Block_render_html() {
! $this->type = "html"; /* set the 'type' */
! $this->output = ""; /* clear the output */
! }
! /* returns the TYPE of this class */
! function getType() {
! return $this->type;
! }
! function parse($block_info) {
! $this->output = $block_info["cache_data"];
! return 1;
!
! /*
! $sl_q = new slashDB;
! $query = "SELECT cache_data
FROM psl_block
! WHERE id = " . $block_info["id"];
! $sl_q->query($query);
! if ($sl_q->next_record()) {
! $this->output = $sl_q->f("cache_data");
! return 1;
! } else {
! return 0;
! }
! unset($db);
! */
!
! }
! function getFinal() {
! return $this->output;
! }
}
Index: Block_render_topic.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_topic.class,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Block_render_topic.class 3 Feb 2002 02:49:39 -0000 1.6
--- Block_render_topic.class 5 Mar 2002 16:50:57 -0000 1.7
***************
*** 145,149 ****
$output = $template->parse('OUT',"block");
!
return $output;
--- 145,149 ----
$output = $template->parse('OUT',"block");
! unset($db);
return $output;
Index: Block_render_section.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_section.class,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Block_render_section.class 7 Feb 2002 17:54:22 -0000 1.7
--- Block_render_section.class 5 Mar 2002 16:50:57 -0000 1.8
***************
*** 123,126 ****
--- 123,127 ----
));
+ unset($db);
return $template->parse('OUT',"block");
Index: Block_render_quote.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_quote.class,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Block_render_quote.class 3 Feb 2002 02:49:39 -0000 1.3
--- Block_render_quote.class 5 Mar 2002 16:50:57 -0000 1.4
***************
*** 79,82 ****
--- 79,83 ----
));
+ unset($db);
return $template->parse('OUT',"block");
Index: Block_render_poll.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_poll.class,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Block_render_poll.class 3 Feb 2002 02:49:39 -0000 1.2
--- Block_render_poll.class 5 Mar 2002 16:50:57 -0000 1.3
***************
*** 34,37 ****
--- 34,38 ----
}
$this->output = $this->poll->getPollBooth($question_id);
+ unset($this->poll);
}
Index: Block_render_cal.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_cal.class,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Block_render_cal.class 6 Feb 2002 20:46:52 -0000 1.4
--- Block_render_cal.class 5 Mar 2002 16:50:57 -0000 1.5
***************
*** 117,120 ****
--- 117,121 ----
$templ->parse('OUT',array("calendar"));
$this->output = $templ->get('OUT');
+ unset($cal_q);
}
|
|
From: Joe S. <joe...@us...> - 2002-03-05 16:48:31
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv9405/phpslash-ft/class
Modified Files:
functions.inc Block_render_query.class
Log Message:
object cleanup
Index: functions.inc
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/functions.inc,v
retrieving revision 1.93
retrieving revision 1.94
diff -C2 -d -r1.93 -r1.94
*** functions.inc 3 Mar 2002 16:07:53 -0000 1.93
--- functions.inc 5 Mar 2002 16:48:28 -0000 1.94
***************
*** 73,78 ****
}
- $as = arg_separator("1");
-
/***************************************************************************
function : stripBadHTML -> rids a string of unwanted HTML. Wanted HTML
--- 73,76 ----
***************
*** 626,630 ****
global $_PSL;
! $as = arg_separator("1");
if ($ary['section_id']) {
$sec = new Section;
--- 624,628 ----
global $_PSL;
! $as = $_PSL['amp'];
if ($ary['section_id']) {
$sec = new Section;
Index: Block_render_query.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_query.class,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Block_render_query.class 3 Feb 2002 02:49:39 -0000 1.5
--- Block_render_query.class 5 Mar 2002 16:48:28 -0000 1.6
***************
*** 132,136 ****
'IMAGEDIR' => $this->psl['imageurl']
));
!
return $template->parse('OUT',"block");
--- 132,136 ----
'IMAGEDIR' => $this->psl['imageurl']
));
! unset($stories);
return $template->parse('OUT',"block");
|
|
From: Joe S. <joe...@us...> - 2002-03-05 16:48:31
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv9405/phpslash-ft Modified Files: CHANGES Log Message: object cleanup Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.405 retrieving revision 1.406 diff -C2 -d -r1.405 -r1.406 *** CHANGES 3 Mar 2002 16:07:52 -0000 1.405 --- CHANGES 5 Mar 2002 16:48:27 -0000 1.406 *************** *** 13,16 **** --- 13,26 ---- 9 - Removal of something (kill -9 :) + 2002-Mar-5 10:30AM CST Joe Stewart <jo...@be...> + [B] - index.php3 - commented out unuses db instance. + errordocument.php3 - spit out htmlentities of REDIRECT_URL. + Block_render_html.class - removed unneeded db query. + Block_render_query.class - destroy Story_base object after use. + Block_render_poll.class - destroy Poll object after use. + Block_render_cal.class, Block_render_quote.class, + Block_render_section.class, Block_render_topic.class, + and Block_render_skin.class - destroy db object after use. + 2002-Mar-2 10:57AM EST nathan hruby <na...@ds...> [B] - generateID now kills its db object when its done with it. |
|
From: Joe S. <joe...@us...> - 2002-03-05 16:48:31
|
Update of /cvsroot/phpslash/phpslash-ft/public_html
In directory usw-pr-cvs1:/tmp/cvs-serv9405/phpslash-ft/public_html
Modified Files:
index.php3 errordocument.php3
Log Message:
object cleanup
Index: index.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/index.php3,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** index.php3 8 Feb 2002 22:17:28 -0000 1.54
--- index.php3 5 Mar 2002 16:48:27 -0000 1.55
***************
*** 17,21 ****
$story = new Story;
$block = new Block_i;
! $db = new slashDB;
// Start of Page
--- 17,21 ----
$story = new Story;
$block = new Block_i;
! // $db = new slashDB;
// Start of Page
Index: errordocument.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/errordocument.php3,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** errordocument.php3 20 Feb 2002 23:15:59 -0000 1.1
--- errordocument.php3 5 Mar 2002 16:48:28 -0000 1.2
***************
*** 41,44 ****
--- 41,47 ----
slashhead($pagetitle,$_PSL['metatags']);
+ // log 404's if you don't have access server logs in the infolog
+ // logwrite("404", "File Not Found " . $REDIRECT_URL);
+
$template = new Template($_PSL['templatedir']);
$template->debug = 0;
***************
*** 50,54 ****
ROOTDIR => $_PSL['rooturl'],
IMAGEDIR => $_PSL['imagedir'],
! ERRORURL => $REDIRECT_URL
));
--- 53,57 ----
ROOTDIR => $_PSL['rooturl'],
IMAGEDIR => $_PSL['imagedir'],
! ERRORURL => htmlentities($REDIRECT_URL)
));
|
|
From: nathan h. <nh...@us...> - 2002-03-03 16:07:57
|
Update of /cvsroot/phpslash/phpslash-ft/public_html
In directory usw-pr-cvs1:/tmp/cvs-serv20873/public_html
Modified Files:
config.php3
Log Message:
opefully fix Luis' bug
Index: config.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/config.php3,v
retrieving revision 1.128
retrieving revision 1.129
diff -C2 -d -r1.128 -r1.129
*** config.php3 8 Feb 2002 22:17:28 -0000 1.128
--- config.php3 3 Mar 2002 16:07:53 -0000 1.129
***************
*** 28,32 ****
// 1.1 Uncomment this only if you can't use a local php.ini or .htaccess
! require('/home/nathan/webDevel/php-lib-stable/php/prepend.php3');
// 1.11) Global Variables. (Don't add trailing slashes)
--- 28,32 ----
// 1.1 Uncomment this only if you can't use a local php.ini or .htaccess
! //require('/home/nathan/webDevel/php-lib-stable/php/prepend.php3');
// 1.11) Global Variables. (Don't add trailing slashes)
***************
*** 48,52 ****
// $basedir -> Complete filesystem path to the pages
! $_PSL['basedir'] = '/home/nathan/webDevel/phpslash-ft/public_html';
// $templatedir -> Path to the templates directory
--- 48,52 ----
// $basedir -> Complete filesystem path to the pages
! $_PSL['basedir'] = '';
// $templatedir -> Path to the templates directory
***************
*** 54,58 ****
// $classdir -> Path to the class directory
! $_PSL['classdir'] = '/home/nathan/webDevel/phpslash-ft/class';
// $rooturl -> The base URL for the phpslash site
--- 54,58 ----
// $classdir -> Path to the class directory
! $_PSL['classdir'] = '';
// $rooturl -> The base URL for the phpslash site
***************
*** 82,88 ****
$_PSL['DB_Host'] = "localhost";
! $_PSL['DB_Database'] = "pslft";
! $_PSL['DB_User'] = "pslft";
! $_PSL['DB_Password'] = "bar";
$_PSL['module']['Glossary'] = true;
--- 82,88 ----
$_PSL['DB_Host'] = "localhost";
! $_PSL['DB_Database'] = "";
! $_PSL['DB_User'] = "";
! $_PSL['DB_Password'] = "";
$_PSL['module']['Glossary'] = true;
|
|
From: nathan h. <nh...@us...> - 2002-03-03 16:07:57
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv20873 Modified Files: CHANGES VERSION Log Message: opefully fix Luis' bug Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.404 retrieving revision 1.405 diff -C2 -d -r1.404 -r1.405 *** CHANGES 25 Feb 2002 23:58:22 -0000 1.404 --- CHANGES 3 Mar 2002 16:07:52 -0000 1.405 *************** *** 13,16 **** --- 13,19 ---- 9 - Removal of something (kill -9 :) + 2002-Mar-2 10:57AM EST nathan hruby <na...@ds...> + [B] - generateID now kills its db object when its done with it. + 2002-Feb-25 6:00PM CST Joe Stewart <jo...@be...> [B] - functions.inc - breadcrumb needed to call the Index: VERSION =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/VERSION,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** VERSION 27 Mar 2001 12:34:56 -0000 1.9 --- VERSION 3 Mar 2002 16:07:52 -0000 1.10 *************** *** 1 **** ! 0.61 --- 1 ---- ! 0.65-pre1 |
2 messages has been excluded from this view by a project administrator.
