[Phpslash-commit] SF.net SVN: phpslash:[573] trunk/include/modules
Brought to you by:
joestewart,
nhruby
Menu
▾
▴
[Phpslash-commit] SF.net SVN: phpslash:[573] trunk/include/modules
|
From: <le...@us...> - 2009-01-04 07:09:55
|
Revision: 573
http://phpslash.svn.sourceforge.net/phpslash/?rev=573&view=rev
Author: lems1
Date: 2009-01-04 07:09:49 +0000 (Sun, 04 Jan 2009)
Log Message:
-----------
fixes skin bugs. fixes major bug with hardcoded year (2009). now year is chosen so: current_year - 10 <= N <= current_year + 20
Modified Paths:
--------------
trunk/include/modules/about/about.php
trunk/include/modules/about/index.php
trunk/include/modules/auth/authtypes/slashAuth.class
trunk/include/modules/auth/authtypes/slashAuthCR.class
trunk/include/modules/auth/authtypes/slashAuthEGW.class
trunk/include/modules/auth/authtypes/slashAuthHTTP.class
trunk/include/modules/auth/authtypes/slashAuthLDAP.class
trunk/include/modules/auth/authtypes/slashAuthPAM.class
trunk/include/modules/auth/authtypes/slashAuthSkel.class
trunk/include/modules/auth/index.php
trunk/include/modules/auth/slashAuth.class
trunk/include/modules/author/Author.class
trunk/include/modules/author/admin.php
trunk/include/modules/author/index.php
trunk/include/modules/block/Block.class
trunk/include/modules/block/Block_admin.class
trunk/include/modules/block/Block_i.class
trunk/include/modules/block/Block_plugin_i.class
trunk/include/modules/block/Block_render_i.class
trunk/include/modules/block/admin.php
trunk/include/modules/block/blocktypes/Block_render_cal.class
trunk/include/modules/block/blocktypes/Block_render_comments.class
trunk/include/modules/block/blocktypes/Block_render_fmsearch.class
trunk/include/modules/block/blocktypes/Block_render_footer.class
trunk/include/modules/block/blocktypes/Block_render_header.class
trunk/include/modules/block/blocktypes/Block_render_html.class
trunk/include/modules/block/blocktypes/Block_render_login.class
trunk/include/modules/block/blocktypes/Block_render_module.class
trunk/include/modules/block/blocktypes/Block_render_navbar.class
trunk/include/modules/block/blocktypes/Block_render_page.class
trunk/include/modules/block/blocktypes/Block_render_poll.class
trunk/include/modules/block/blocktypes/Block_render_query.class
trunk/include/modules/block/blocktypes/Block_render_quote.class
trunk/include/modules/block/blocktypes/Block_render_rss.class
trunk/include/modules/block/blocktypes/Block_render_section.class
trunk/include/modules/block/blocktypes/Block_render_skin.class
trunk/include/modules/block/blocktypes/Block_render_submission.class
trunk/include/modules/block/blocktypes/Block_render_template.class
trunk/include/modules/block/blocktypes/Block_render_topic.class
trunk/include/modules/block/blocktypes/Block_render_topicbar.class
trunk/include/modules/block/blocktypes/Block_render_url.class
trunk/include/modules/block/index.php
trunk/include/modules/block/plugins/Block_plugin_bbcode.class
trunk/include/modules/block/plugins/Block_plugin_exttrans.class
trunk/include/modules/block/plugins/Block_plugin_html.class
trunk/include/modules/block/plugins/Block_plugin_mssmartquotes.class
trunk/include/modules/block/plugins/Block_plugin_plaintext.class
trunk/include/modules/block/plugins/Block_plugin_wiki.class
trunk/include/modules/comment/Comment.class
trunk/include/modules/comment/admin.php
trunk/include/modules/comment/article.php
trunk/include/modules/comment/index.php
trunk/include/modules/comment/poll.php
trunk/include/modules/error/index.php
trunk/include/modules/glossary/Glossary.class
trunk/include/modules/glossary/admin.php
trunk/include/modules/glossary/index.php
trunk/include/modules/group/Group.class
trunk/include/modules/group/admin.php
trunk/include/modules/infolog/admin.php
trunk/include/modules/mailinglist/MailingList.class
trunk/include/modules/mailinglist/admin.php
trunk/include/modules/mailinglist/index.php
trunk/include/modules/navbar/NavBar.class
trunk/include/modules/navbar/index.php
trunk/include/modules/poll/Poll.class
trunk/include/modules/poll/admin.php
trunk/include/modules/poll/index.php
trunk/include/modules/poll/poll.php
trunk/include/modules/search/index.php
trunk/include/modules/section/Section.class
trunk/include/modules/section/admin.php
trunk/include/modules/story/Story.class
trunk/include/modules/story/Story_admin.class
trunk/include/modules/story/Story_base.class
trunk/include/modules/story/Story_plugin_i.class
trunk/include/modules/story/admin.php
trunk/include/modules/story/article.php
trunk/include/modules/story/backend.php
trunk/include/modules/story/index.php
trunk/include/modules/story/plugins/Story_plugin_bbcode.class
trunk/include/modules/story/plugins/Story_plugin_exttrans.class
trunk/include/modules/story/plugins/Story_plugin_html.class
trunk/include/modules/story/plugins/Story_plugin_mssmartquotes.class
trunk/include/modules/story/plugins/Story_plugin_plaintext.class
trunk/include/modules/story/plugins/Story_plugin_wiki.class
trunk/include/modules/story/relatedlinks.php
trunk/include/modules/submission/Submission.class
trunk/include/modules/submission/admin.php
trunk/include/modules/submission/index.php
trunk/include/modules/topic/Topic.class
trunk/include/modules/topic/admin.php
trunk/include/modules/topicbar/TopicBar.class
trunk/include/modules/topicbar/index.php
trunk/include/modules/variable/admin.php
Modified: trunk/include/modules/about/about.php
===================================================================
--- trunk/include/modules/about/about.php 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/about/about.php 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,5 +1,5 @@
<?php
-/* $Id: about.php,v 1.1.1.1 2003-03-12 16:12:54 joestewart Exp $ */
+/* $Id: about.php,v 1.1.1.1 2003/03/12 16:12:54 joestewart Exp $ */
$pagetitle = pslgetText("About"); // The name to be displayed in the header
$xsiteobject = pslgetText("About Page"); // This Defines The META Tag Object Type
Modified: trunk/include/modules/about/index.php
===================================================================
--- trunk/include/modules/about/index.php 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/about/index.php 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,5 +1,5 @@
<?php
-/* $Id: index.php,v 1.2 2003-05-15 18:19:53 joestewart Exp $ */
+/* $Id: index.php,v 1.2 2003/05/15 18:19:53 joestewart Exp $ */
$pagetitle = pslgetText("About"); // The name to be displayed in the header
$xsiteobject = pslgetText("About Page"); // This Defines The META Tag Object Type
Modified: trunk/include/modules/auth/authtypes/slashAuth.class
===================================================================
--- trunk/include/modules/auth/authtypes/slashAuth.class 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/auth/authtypes/slashAuth.class 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,6 +1,6 @@
<?php
-/* $Id: slashAuth.class,v 1.1 2004-09-16 21:05:07 joestewart Exp $
+/* $Id: slashAuth.class,v 1.1 2004/09/16 21:05:07 joestewart Exp $
*
*/
class slashAuth extends slashAuth_base {
Modified: trunk/include/modules/auth/authtypes/slashAuthCR.class
===================================================================
--- trunk/include/modules/auth/authtypes/slashAuthCR.class 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/auth/authtypes/slashAuthCR.class 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,6 +1,6 @@
<?php
-/* $Id: slashAuthCR.class,v 1.2 2004-09-16 21:05:07 joestewart Exp $
+/* $Id: slashAuthCR.class,v 1.2 2004/09/16 21:05:07 joestewart Exp $
*
* Quoting the phplib local.inc
*
Modified: trunk/include/modules/auth/authtypes/slashAuthEGW.class
===================================================================
--- trunk/include/modules/auth/authtypes/slashAuthEGW.class 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/auth/authtypes/slashAuthEGW.class 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,6 +1,6 @@
<?php
-/* $Id: slashAuthEGW.class,v 1.1 2004-09-22 21:01:31 joestewart Exp $
+/* $Id: slashAuthEGW.class,v 1.1 2004/09/22 21:01:31 joestewart Exp $
*
* eGroupware authentication
*/
Modified: trunk/include/modules/auth/authtypes/slashAuthHTTP.class
===================================================================
--- trunk/include/modules/auth/authtypes/slashAuthHTTP.class 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/auth/authtypes/slashAuthHTTP.class 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,6 +1,6 @@
<?php
-/* $Id: slashAuthHTTP.class,v 1.1 2004-09-21 11:18:17 joestewart Exp $
+/* $Id: slashAuthHTTP.class,v 1.1 2004/09/21 11:18:17 joestewart Exp $
*
* Authentication somewhat based on HTTP auth in phpgroupware
* Copyright (C) 2000, 2001 Dan Kuykendall
Modified: trunk/include/modules/auth/authtypes/slashAuthLDAP.class
===================================================================
--- trunk/include/modules/auth/authtypes/slashAuthLDAP.class 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/auth/authtypes/slashAuthLDAP.class 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,6 +1,6 @@
<?php
// vim: ft=php:ts=4:sts=4 :
-/** $Id: slashAuthLDAP.class,v 1.13 2004-11-09 22:48:53 lems1 Exp $
+/** $Id: slashAuthLDAP.class,v 1.13 2004/11/09 22:48:53 lems1 Exp $
*
* 2004-10-26 00:49 EDT
* Written by Luis Mondesi < lems1 at users | sf | net> for PSL 0.8
Modified: trunk/include/modules/auth/authtypes/slashAuthPAM.class
===================================================================
--- trunk/include/modules/auth/authtypes/slashAuthPAM.class 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/auth/authtypes/slashAuthPAM.class 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,6 +1,6 @@
<?php
-/* $Id: slashAuthPAM.class,v 1.1 2004-09-21 11:18:17 joestewart Exp $
+/* $Id: slashAuthPAM.class,v 1.1 2004/09/21 11:18:17 joestewart Exp $
*
* pam_auth module - http://www.math.ohio-state.edu/~ccunning/pam_auth/
*/
Modified: trunk/include/modules/auth/authtypes/slashAuthSkel.class
===================================================================
--- trunk/include/modules/auth/authtypes/slashAuthSkel.class 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/auth/authtypes/slashAuthSkel.class 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,6 +1,6 @@
<?php
-/* $Id: slashAuthSkel.class,v 1.2 2004-10-26 19:43:46 joestewart Exp $
+/* $Id: slashAuthSkel.class,v 1.2 2004/10/26 19:43:46 joestewart Exp $
*
* Skeleton example for providing external authentication to phpSlash
*/
Modified: trunk/include/modules/auth/index.php
===================================================================
--- trunk/include/modules/auth/index.php 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/auth/index.php 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,5 +1,5 @@
<?php
-// $Id: index.php,v 1.1 2004-09-16 19:21:22 joestewart Exp $
+// $Id: index.php,v 1.1 2004/09/16 19:21:22 joestewart Exp $
global $sess, $auth, $perm, $HTTP_POST_VARS, $HTTP_GET_VARS, $HTTP_COOKIE_VARS;
Modified: trunk/include/modules/auth/slashAuth.class
===================================================================
--- trunk/include/modules/auth/slashAuth.class 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/auth/slashAuth.class 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,6 +1,6 @@
<?php
-/* $Id: slashAuth.class,v 1.12 2004-11-11 16:22:48 joestewart Exp $
+/* $Id: slashAuth.class,v 1.12 2004/11/11 16:22:48 joestewart Exp $
*
* Provides the authorization functions of PHPSlash
*
Modified: trunk/include/modules/author/Author.class
===================================================================
--- trunk/include/modules/author/Author.class 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/author/Author.class 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,6 +1,6 @@
<?php
-/* $Id: Author.class,v 1.5 2005-05-11 19:07:23 joestewart Exp $ */
+/* $Id: Author.class,v 1.5 2005/05/11 19:07:23 joestewart Exp $ */
/**
* Provides an API to the PHPSlash Author Management.
Modified: trunk/include/modules/author/admin.php
===================================================================
--- trunk/include/modules/author/admin.php 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/author/admin.php 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,6 +1,6 @@
<?php
-/* $Id: admin.php,v 1.4 2003-06-24 19:32:34 joestewart Exp $ */
+/* $Id: admin.php,v 1.4 2003/06/24 19:32:34 joestewart Exp $ */
global $_PSL, $HTTP_POST_VARS, $HTTP_GET_VARS, $sess, $auth, $perm;
Modified: trunk/include/modules/author/index.php
===================================================================
--- trunk/include/modules/author/index.php 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/author/index.php 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,6 +1,6 @@
<?php
-/* $Id: index.php,v 1.6 2005-05-11 19:07:24 joestewart Exp $ */
+/* $Id: index.php,v 1.6 2005/05/11 19:07:24 joestewart Exp $ */
global $_PSL, $auth, $perm, $HTTP_GET_VARS, $HTTP_POST_VARS;
Modified: trunk/include/modules/block/Block.class
===================================================================
--- trunk/include/modules/block/Block.class 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/block/Block.class 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,5 +1,5 @@
<?php
-/* @version $Id: Block.class,v 1.12 2004-11-05 16:32:40 joestewart Exp $ */
+/* @version $Id: Block.class,v 1.12 2004/11/05 16:32:40 joestewart Exp $ */
/**
* Database Level access to the PHPSlash Block Engine.
Modified: trunk/include/modules/block/Block_admin.class
===================================================================
--- trunk/include/modules/block/Block_admin.class 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/block/Block_admin.class 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,7 +1,7 @@
<?php
/* Block_admin.class -> Admin Interface to class Block */
-/* $Id: Block_admin.class,v 1.9 2004-11-09 19:13:15 joestewart Exp $ */
+/* $Id: Block_admin.class,v 1.9 2004/11/09 19:13:15 joestewart Exp $ */
/* First let's bring in my parent class */
// require($_PSL['classdir'] . '/Block.class');
Modified: trunk/include/modules/block/Block_i.class
===================================================================
--- trunk/include/modules/block/Block_i.class 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/block/Block_i.class 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,7 +1,7 @@
<?php
/* Block_i.class -> Interface to class Block that provides fluffy HTML */
-/* $Id: Block_i.class,v 1.7 2005-08-27 08:09:38 lems1 Exp $ */
+/* $Id: Block_i.class,v 1.7 2005/08/27 08:09:38 lems1 Exp $ */
/* First let's bring in my parent class */
// require($_PSL['classdir'] . '/Block.class');
@@ -66,12 +66,12 @@
function getBlocks($ary, $column="") {
// debug("Block_i.class::getBlocks::ary", $ary);
-
+
if ( $this->argv_ary != $ary) {
$this->argv_ary = $ary;
$this->block_ary = $this->extractBlocks( $ary);
}
-
+
$output = "";
$count = count($this->block_ary);
for ($i=0; $i < $count; $i++) {
@@ -82,7 +82,7 @@
$output .= $this->parseBlock($this->block_ary[$i], $column);
}
}
-
+
return $output;
}
@@ -101,11 +101,11 @@
* @return string output
*/
function parseBlock($ary, $column="") {
-
+#print_r($ary);
$width = "100%";
$box_type = '';
-
- if ( ($ary['block_options']['column'] == $column) OR
+
+ if ( is_array ($ary) and is_array($ary['block_options']) and array_key_exists('column',$ary['block_options']) and ($ary['block_options']['column'] == $column) OR
($column == "")) {
$temptitle = $ary["title"];
@@ -128,9 +128,11 @@
$var_ary = "";
if (is_array($ary['block_options'])) {
- // remove column from array
- unset($ary["block_options"]["column"]);
- unset($ary["block_options"]["tpl"]);
+ // remove column from array
+ if (array_key_exists('column',$ary['block_options']))
+ unset($ary["block_options"]["column"]);
+ if (array_key_exists('tpl',$ary['block_options']))
+ unset($ary["block_options"]["tpl"]);
foreach( $ary["block_options"] as $key => $val) {
// while( list( $key, $val) = @each( $ary["block_options"] )) {
Modified: trunk/include/modules/block/Block_plugin_i.class
===================================================================
--- trunk/include/modules/block/Block_plugin_i.class 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/block/Block_plugin_i.class 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,6 +1,6 @@
<?php
/* Block_plugin_skel.class -> Base class for story plugins */
-/* $Id: Block_plugin_i.class,v 1.1 2003-11-13 19:51:45 joestewart Exp $ */
+/* $Id: Block_plugin_i.class,v 1.1 2003/11/13 19:51:45 joestewart Exp $ */
/**
* Class that defines the interface to story plugins and implements
Modified: trunk/include/modules/block/Block_render_i.class
===================================================================
--- trunk/include/modules/block/Block_render_i.class 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/block/Block_render_i.class 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,6 +1,6 @@
<?php
/* Block_render_skel.class -> Base class for block renderers */
-/* $Id: Block_render_i.class,v 1.1.1.1 2003-03-12 16:12:55 joestewart Exp $ */
+/* $Id: Block_render_i.class,v 1.1.1.1 2003/03/12 16:12:55 joestewart Exp $ */
/**
* Class that defines the interface to block renderers and implements
Modified: trunk/include/modules/block/admin.php
===================================================================
--- trunk/include/modules/block/admin.php 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/block/admin.php 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,6 +1,6 @@
<?php
/* block admin.php -> Page for ye old block administration */
-/* $Id: admin.php,v 1.6 2004-10-21 15:43:52 joestewart Exp $ */
+/* $Id: admin.php,v 1.6 2004/10/21 15:43:52 joestewart Exp $ */
global $_PSL, $HTTP_POST_VARS, $HTTP_GET_VARS, $auth, $perm;
Modified: trunk/include/modules/block/blocktypes/Block_render_cal.class
===================================================================
--- trunk/include/modules/block/blocktypes/Block_render_cal.class 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/block/blocktypes/Block_render_cal.class 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,7 +1,7 @@
<?php
/* Block_render_cal.class -> Methods for phpslash specfic blocks */
-/* $Id: Block_render_cal.class,v 1.1.1.1 2003-03-12 16:12:55 joestewart Exp $ */
+/* $Id: Block_render_cal.class,v 1.1.1.1 2003/03/12 16:12:55 joestewart Exp $ */
class Block_render_cal extends Block_render_i {
Modified: trunk/include/modules/block/blocktypes/Block_render_comments.class
===================================================================
--- trunk/include/modules/block/blocktypes/Block_render_comments.class 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/block/blocktypes/Block_render_comments.class 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,7 +1,7 @@
<?php
/* Block_render_comments.class -> Methods for phpslash comment blocks */
-/* $Id: Block_render_comments.class,v 1.1.1.1 2003-03-12 16:12:55 joestewart Exp $ */
+/* $Id: Block_render_comments.class,v 1.1.1.1 2003/03/12 16:12:55 joestewart Exp $ */
/**
* pass the query in the "Source Url" form field in the format of:
Modified: trunk/include/modules/block/blocktypes/Block_render_fmsearch.class
===================================================================
--- trunk/include/modules/block/blocktypes/Block_render_fmsearch.class 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/block/blocktypes/Block_render_fmsearch.class 2009-01-04 07:09:49 UTC (rev 573)
@@ -2,7 +2,7 @@
/* Block_render_fmsearch.class -> Methods for parsing Freshmeat xml-search data *
* ie : http://freshmeat.net/search-xml/?q=doc§ion=projects&filter=164,847
*
-/* $Id: Block_render_fmsearch.class,v 1.1.1.1 2003-03-12 16:12:55 joestewart Exp $ */
+/* $Id: Block_render_fmsearch.class,v 1.1.1.1 2003/03/12 16:12:55 joestewart Exp $ */
/*
* BLOCK OPTIONS USED
Modified: trunk/include/modules/block/blocktypes/Block_render_footer.class
===================================================================
--- trunk/include/modules/block/blocktypes/Block_render_footer.class 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/block/blocktypes/Block_render_footer.class 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,7 +1,7 @@
<?php
/* Block_render_footer.class -> Methods for phpslash specfic blocks */
-/* $Id: Block_render_footer.class,v 1.1 2003-04-17 23:33:47 joestewart Exp $ */
+/* $Id: Block_render_footer.class,v 1.1 2003/04/17 23:33:47 joestewart Exp $ */
class Block_render_footer extends Block_render_i {
Modified: trunk/include/modules/block/blocktypes/Block_render_header.class
===================================================================
--- trunk/include/modules/block/blocktypes/Block_render_header.class 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/block/blocktypes/Block_render_header.class 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,7 +1,7 @@
<?php
/* Block_render_header.class -> Methods for phpslash specfic blocks */
-/* $Id: Block_render_header.class,v 1.4 2004-10-14 17:55:31 joestewart Exp $ */
+/* $Id: Block_render_header.class,v 1.4 2004/10/14 17:55:31 joestewart Exp $ */
class Block_render_header extends Block_render_i {
Modified: trunk/include/modules/block/blocktypes/Block_render_html.class
===================================================================
--- trunk/include/modules/block/blocktypes/Block_render_html.class 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/block/blocktypes/Block_render_html.class 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,7 +1,7 @@
<?php
/* Block_render_html.class -> Methods for phpslash specfic blocks */
-/* $Id: Block_render_html.class,v 1.3 2004-11-04 20:17:04 joestewart Exp $ */
+/* $Id: Block_render_html.class,v 1.3 2004/11/04 20:17:04 joestewart Exp $ */
class Block_render_html extends Block_render_i {
Modified: trunk/include/modules/block/blocktypes/Block_render_login.class
===================================================================
--- trunk/include/modules/block/blocktypes/Block_render_login.class 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/block/blocktypes/Block_render_login.class 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,7 +1,7 @@
<?php
/* Block_render_login.class -> Methods for phpslash specfic blocks */
-/* $Id: Block_render_login.class,v 1.1.1.1 2003-03-12 16:12:55 joestewart Exp $ */
+/* $Id: Block_render_login.class,v 1.1.1.1 2003/03/12 16:12:55 joestewart Exp $ */
class Block_render_login extends Block_render_i {
Modified: trunk/include/modules/block/blocktypes/Block_render_module.class
===================================================================
--- trunk/include/modules/block/blocktypes/Block_render_module.class 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/block/blocktypes/Block_render_module.class 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,7 +1,7 @@
<?php
/* Block_render_module.class -> Methods for phpslash specfic blocks */
-/* $Id: Block_render_module.class,v 1.2 2003-06-24 19:32:34 joestewart Exp $ */
+/* $Id: Block_render_module.class,v 1.2 2003/06/24 19:32:34 joestewart Exp $ */
class Block_render_module extends Block_render_i {
Modified: trunk/include/modules/block/blocktypes/Block_render_navbar.class
===================================================================
--- trunk/include/modules/block/blocktypes/Block_render_navbar.class 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/block/blocktypes/Block_render_navbar.class 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,7 +1,7 @@
<?php
/* Block_render_navbar.class -> Methods for phpslash specfic blocks for LatinoMixed.com */
-/* $Id: Block_render_navbar.class,v 1.3 2003-06-24 19:32:34 joestewart Exp $ */
+/* $Id: Block_render_navbar.class,v 1.3 2003/06/24 19:32:34 joestewart Exp $ */
class Block_render_navbar extends Block_render_i {
Modified: trunk/include/modules/block/blocktypes/Block_render_page.class
===================================================================
--- trunk/include/modules/block/blocktypes/Block_render_page.class 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/block/blocktypes/Block_render_page.class 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,7 +1,7 @@
<?php
/* Block_render_page.class -> Methods for phpslash specfic blocks */
-/* $Id: Block_render_page.class,v 1.9 2004-11-06 21:16:44 joestewart Exp $ */
+/* $Id: Block_render_page.class,v 1.9 2004/11/06 21:16:44 joestewart Exp $ */
class Block_render_page extends Block_render_i {
@@ -118,7 +118,7 @@
'CENTER_BLOCK_COLUMN' => $centerblocks,
'RIGHT_BLOCK_COLUMN' => $rightblocks,
'BOTTOM' => $bottomblocks,
- 'SKIN' => $this->psl['skin'],
+ 'SKIN' => $this->psl['defaultskin'],
'QUERY_STRING' => $QUERY_STRING,
'QUERY_STRING2' => $QUERY_STRING2,
'QUERY_STRING3' => $QUERY_STRING3,
Modified: trunk/include/modules/block/blocktypes/Block_render_poll.class
===================================================================
--- trunk/include/modules/block/blocktypes/Block_render_poll.class 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/block/blocktypes/Block_render_poll.class 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,7 +1,7 @@
<?php
/* Block_render_poll.class -> Methods for phpslash specfic blocks */
-/* $Id: Block_render_poll.class,v 1.5 2003-11-28 19:13:32 lems1 Exp $ */
+/* $Id: Block_render_poll.class,v 1.5 2003/11/28 19:13:32 lems1 Exp $ */
class Block_render_poll extends Block_render_i {
Modified: trunk/include/modules/block/blocktypes/Block_render_query.class
===================================================================
--- trunk/include/modules/block/blocktypes/Block_render_query.class 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/block/blocktypes/Block_render_query.class 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,7 +1,7 @@
<?php
/* Block_render_query.class -> Methods for phpslash specfic blocks */
-/* $Id: Block_render_query.class,v 1.4 2004-07-07 17:31:40 krabu Exp $ */
+/* $Id: Block_render_query.class,v 1.4 2004/07/07 17:31:40 krabu Exp $ */
/* pass the query in the "Source Url" form field in the format of:
*
Modified: trunk/include/modules/block/blocktypes/Block_render_quote.class
===================================================================
--- trunk/include/modules/block/blocktypes/Block_render_quote.class 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/block/blocktypes/Block_render_quote.class 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,7 +1,7 @@
<?php
/* Block_render_quote.class -> Random quote generator */
-/* $Id: Block_render_quote.class,v 1.1.1.1 2003-03-12 16:12:55 joestewart Exp $ */
+/* $Id: Block_render_quote.class,v 1.1.1.1 2003/03/12 16:12:55 joestewart Exp $ */
class Block_render_quote extends Block_render_i {
Modified: trunk/include/modules/block/blocktypes/Block_render_rss.class
===================================================================
--- trunk/include/modules/block/blocktypes/Block_render_rss.class 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/block/blocktypes/Block_render_rss.class 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,6 +1,6 @@
<?php
/* Block_render_rss.class -> Methods for parsing RSS 0.91 data */
-/* $Id: Block_render_rss.class,v 1.5 2003-08-21 19:17:28 joestewart Exp $ */
+/* $Id: Block_render_rss.class,v 1.5 2003/08/21 19:17:28 joestewart Exp $ */
/*
* BLOCK OPTIONS USED
@@ -259,7 +259,7 @@
$this->items = array();
$this->xml = xml_parser_create();
- xml_set_object($this->xml, &$this);
+ xml_set_object($this->xml, $this);
}
/**
Modified: trunk/include/modules/block/blocktypes/Block_render_section.class
===================================================================
--- trunk/include/modules/block/blocktypes/Block_render_section.class 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/block/blocktypes/Block_render_section.class 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,7 +1,7 @@
<?php
/* Block_render_section.class -> Methods for phpslash specfic blocks */
-/* $Id: Block_render_section.class,v 1.2 2004-06-22 21:09:04 krabu Exp $ */
+/* $Id: Block_render_section.class,v 1.2 2004/06/22 21:09:04 krabu Exp $ */
/**
* Creates a block that lists all sections (with stories)
Modified: trunk/include/modules/block/blocktypes/Block_render_skin.class
===================================================================
--- trunk/include/modules/block/blocktypes/Block_render_skin.class 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/block/blocktypes/Block_render_skin.class 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,7 +1,7 @@
<?php
/* Block_render_skin.class -> Methods for phpslash skin blocks */
-/* $Id: Block_render_skin.class,v 1.2 2004-06-22 21:09:05 krabu Exp $ */
+/* $Id: Block_render_skin.class,v 1.2 2004/06/22 21:09:05 krabu Exp $ */
/**
* pass the query in the "Source Url" form field in the format of:
Modified: trunk/include/modules/block/blocktypes/Block_render_submission.class
===================================================================
--- trunk/include/modules/block/blocktypes/Block_render_submission.class 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/block/blocktypes/Block_render_submission.class 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,7 +1,7 @@
<?php
/* Block_render_submission.class -> Methods for phpslash submission blocks */
-/* $Id: Block_render_submission.class,v 1.1.1.1 2003-03-12 16:12:55 joestewart Exp $ */
+/* $Id: Block_render_submission.class,v 1.1.1.1 2003/03/12 16:12:55 joestewart Exp $ */
/* These should only be displayed to logged in admin's with Submission perms.
*/
Modified: trunk/include/modules/block/blocktypes/Block_render_template.class
===================================================================
--- trunk/include/modules/block/blocktypes/Block_render_template.class 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/block/blocktypes/Block_render_template.class 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,7 +1,7 @@
<?php
/* Block_render_template.class -> Methods for phpslash specfic blocks */
-/* $Id: Block_render_template.class,v 1.3 2004-11-04 20:17:04 joestewart Exp $ */
+/* $Id: Block_render_template.class,v 1.3 2004/11/04 20:17:04 joestewart Exp $ */
class Block_render_template extends Block_render_i {
Modified: trunk/include/modules/block/blocktypes/Block_render_topic.class
===================================================================
--- trunk/include/modules/block/blocktypes/Block_render_topic.class 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/block/blocktypes/Block_render_topic.class 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,7 +1,7 @@
<?php
/* Block_render_topic.class -> Methods for phpslash specfic blocks */
-/* $Id: Block_render_topic.class,v 1.2 2004-07-07 17:33:21 krabu Exp $ */
+/* $Id: Block_render_topic.class,v 1.2 2004/07/07 17:33:21 krabu Exp $ */
/* pass the query in the "Source Url" form field in the format of:
*
Modified: trunk/include/modules/block/blocktypes/Block_render_topicbar.class
===================================================================
--- trunk/include/modules/block/blocktypes/Block_render_topicbar.class 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/block/blocktypes/Block_render_topicbar.class 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,7 +1,7 @@
<?php
/* Block_render_topicbar.class -> Methods for phpslash specfic blocks */
-/* $Id: Block_render_topicbar.class,v 1.2 2003-06-24 19:32:34 joestewart Exp $ */
+/* $Id: Block_render_topicbar.class,v 1.2 2003/06/24 19:32:34 joestewart Exp $ */
class Block_render_topicbar extends Block_render_i {
Modified: trunk/include/modules/block/blocktypes/Block_render_url.class
===================================================================
--- trunk/include/modules/block/blocktypes/Block_render_url.class 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/block/blocktypes/Block_render_url.class 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,7 +1,7 @@
<?php
/* Block_render_url.class -> Methods for phpslash specfic blocks */
-/* $Id: Block_render_url.class,v 1.1.1.1 2003-03-12 16:12:55 joestewart Exp $ */
+/* $Id: Block_render_url.class,v 1.1.1.1 2003/03/12 16:12:55 joestewart Exp $ */
class Block_render_url extends Block_render_i {
Modified: trunk/include/modules/block/index.php
===================================================================
--- trunk/include/modules/block/index.php 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/block/index.php 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,5 +1,5 @@
<?php
-// $Id: index.php,v 1.5 2003-11-13 12:16:50 joestewart Exp $
+// $Id: index.php,v 1.5 2003/11/13 12:16:50 joestewart Exp $
global $_PSL, $ary;
@@ -16,7 +16,6 @@
// get page content
$content = $block->getBlocks($ary, "page");
-
return $content;
?>
Modified: trunk/include/modules/block/plugins/Block_plugin_bbcode.class
===================================================================
--- trunk/include/modules/block/plugins/Block_plugin_bbcode.class 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/block/plugins/Block_plugin_bbcode.class 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,7 +1,7 @@
<?php
/* Block_plugin_bbcode.class -> Methods for phpslash specfic story plugins */
-/* $Id: Block_plugin_bbcode.class,v 1.3 2004-11-05 16:32:47 joestewart Exp $ */
+/* $Id: Block_plugin_bbcode.class,v 1.3 2004/11/05 16:32:47 joestewart Exp $ */
class Block_plugin_bbcode extends Block_plugin_i {
Modified: trunk/include/modules/block/plugins/Block_plugin_exttrans.class
===================================================================
--- trunk/include/modules/block/plugins/Block_plugin_exttrans.class 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/block/plugins/Block_plugin_exttrans.class 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,7 +1,7 @@
<?php
/* Block_plugin_plaintext.class -> Methods for phpslash specfic block plugins */
-/* $Id: Block_plugin_exttrans.class,v 1.1 2004-11-05 16:32:48 joestewart Exp $ */
+/* $Id: Block_plugin_exttrans.class,v 1.1 2004/11/05 16:32:48 joestewart Exp $ */
class Block_plugin_exttrans extends Block_plugin_i {
Modified: trunk/include/modules/block/plugins/Block_plugin_html.class
===================================================================
--- trunk/include/modules/block/plugins/Block_plugin_html.class 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/block/plugins/Block_plugin_html.class 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,7 +1,7 @@
<?php
/* Block_plugin_html.class -> Methods for phpslash specfic block plugins */
-/* $Id: Block_plugin_html.class,v 1.1 2004-11-05 16:32:48 joestewart Exp $ */
+/* $Id: Block_plugin_html.class,v 1.1 2004/11/05 16:32:48 joestewart Exp $ */
class Block_plugin_html extends Block_plugin_i {
Modified: trunk/include/modules/block/plugins/Block_plugin_mssmartquotes.class
===================================================================
--- trunk/include/modules/block/plugins/Block_plugin_mssmartquotes.class 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/block/plugins/Block_plugin_mssmartquotes.class 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,7 +1,7 @@
<?php
/* Block_plugin_mssmartquotes.class -> Methods for phpslash specfic block plugins */
-/* $Id: Block_plugin_mssmartquotes.class,v 1.1 2004-11-05 16:32:48 joestewart Exp $ */
+/* $Id: Block_plugin_mssmartquotes.class,v 1.1 2004/11/05 16:32:48 joestewart Exp $ */
class Block_plugin_mssmartquotes extends Block_plugin_i {
Modified: trunk/include/modules/block/plugins/Block_plugin_plaintext.class
===================================================================
--- trunk/include/modules/block/plugins/Block_plugin_plaintext.class 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/block/plugins/Block_plugin_plaintext.class 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,7 +1,7 @@
<?php
/* Block_plugin_plaintext.class -> Methods for phpslash specfic block plugins */
-/* $Id: Block_plugin_plaintext.class,v 1.1 2004-11-05 16:32:48 joestewart Exp $ */
+/* $Id: Block_plugin_plaintext.class,v 1.1 2004/11/05 16:32:48 joestewart Exp $ */
class Block_plugin_plaintext extends Block_plugin_i {
Modified: trunk/include/modules/block/plugins/Block_plugin_wiki.class
===================================================================
--- trunk/include/modules/block/plugins/Block_plugin_wiki.class 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/block/plugins/Block_plugin_wiki.class 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,7 +1,7 @@
<?php
/* Block_plugin_wiki.class -> Methods for phpslash specfic block plugins */
-/* $Id: Block_plugin_wiki.class,v 1.1 2004-11-05 16:32:48 joestewart Exp $ */
+/* $Id: Block_plugin_wiki.class,v 1.1 2004/11/05 16:32:48 joestewart Exp $ */
class Block_plugin_wiki extends Block_plugin_i {
Modified: trunk/include/modules/comment/Comment.class
===================================================================
--- trunk/include/modules/comment/Comment.class 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/comment/Comment.class 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,6 +1,6 @@
<?php
-/* $Id: Comment.class,v 1.2 2004-10-26 19:43:47 joestewart Exp $ */
+/* $Id: Comment.class,v 1.2 2004/10/26 19:43:47 joestewart Exp $ */
/**
* Provides an API to the PHPSlash Comment Engine.
@@ -568,10 +568,11 @@
$ary['email'] = $this->auth->auth['url'];
}
+ $_skin = (!empty($this->psl['skin'])) ? $this->psl['skin']: $this->psl['defaultskin'];
$this->ctempl->set_var(array(
'IMAGEDIR' => $this->psl['imageurl'],
'ROOTURL' => $this->psl['rooturl'],
- 'SKIN' => $this->psl['skin'],
+ 'SKIN' => $_skin,
'COMMENT_ID' => $ary['comment_id'],
'PARENT' => $ary['replying_to'],
'ACTION_URL' => $ary['action_url'],
Modified: trunk/include/modules/comment/admin.php
===================================================================
--- trunk/include/modules/comment/admin.php 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/comment/admin.php 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,6 +1,6 @@
<?php
-/* $Id: admin.php,v 1.1 2003-06-24 19:38:36 joestewart Exp $ */
+/* $Id: admin.php,v 1.1 2003/06/24 19:38:36 joestewart Exp $ */
/* TODO: */
Modified: trunk/include/modules/comment/article.php
===================================================================
--- trunk/include/modules/comment/article.php 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/comment/article.php 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,6 +1,6 @@
<?php
-/* $Id: article.php,v 1.1 2003-06-24 19:38:37 joestewart Exp $ */
+/* $Id: article.php,v 1.1 2003/06/24 19:38:37 joestewart Exp $ */
global $_PSL, $ary, $sess, $auth, $perm, $HTTP_GET_VARS, $HTTP_POST_VARS;
Modified: trunk/include/modules/comment/index.php
===================================================================
--- trunk/include/modules/comment/index.php 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/comment/index.php 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,6 +1,6 @@
<?php
-/* $Id: index.php,v 1.4 2004-10-26 19:43:57 joestewart Exp $ */
+/* $Id: index.php,v 1.4 2004/10/26 19:43:57 joestewart Exp $ */
global $_PSL, $sess, $auth, $perm, $HTTP_GET_VARS, $HTTP_POST_VARS;
Modified: trunk/include/modules/comment/poll.php
===================================================================
--- trunk/include/modules/comment/poll.php 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/comment/poll.php 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,6 +1,6 @@
<?php
-/* $Id: poll.php,v 1.1 2003-06-24 19:38:37 joestewart Exp $ */
+/* $Id: poll.php,v 1.1 2003/06/24 19:38:37 joestewart Exp $ */
global $_PSL, $ary, $sess, $auth, $perm, $HTTP_GET_VARS, $HTTP_POST_VARS;
Modified: trunk/include/modules/error/index.php
===================================================================
--- trunk/include/modules/error/index.php 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/error/index.php 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,5 +1,5 @@
<?php
-// $Id: index.php,v 1.1 2003-06-24 19:38:37 joestewart Exp $
+// $Id: index.php,v 1.1 2003/06/24 19:38:37 joestewart Exp $
global $_PSL, $REDIRECT_URL;
Modified: trunk/include/modules/glossary/Glossary.class
===================================================================
--- trunk/include/modules/glossary/Glossary.class 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/glossary/Glossary.class 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,6 +1,6 @@
<?php
-/* $Id: Glossary.class,v 1.1.1.1 2003-03-12 16:12:55 joestewart Exp $ */
+/* $Id: Glossary.class,v 1.1.1.1 2003/03/12 16:12:55 joestewart Exp $ */
/*
* Class: Glossary
Modified: trunk/include/modules/glossary/admin.php
===================================================================
--- trunk/include/modules/glossary/admin.php 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/glossary/admin.php 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,6 +1,6 @@
<?php
-/* $Id: admin.php,v 1.2 2003-05-20 17:07:10 joestewart Exp $ */
+/* $Id: admin.php,v 1.2 2003/05/20 17:07:10 joestewart Exp $ */
global $_PSL, $HTTP_POST_VARS, $HTTP_GET_VARS, $auth, $perm;
AddClassRequirement("glossary",$_PSL['moduledir'] ."/glossary/Glossary.class");
Modified: trunk/include/modules/glossary/index.php
===================================================================
--- trunk/include/modules/glossary/index.php 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/glossary/index.php 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,6 +1,6 @@
<?php
-/* $Id: index.php,v 1.2 2003-04-17 23:31:00 joestewart Exp $ */
+/* $Id: index.php,v 1.2 2003/04/17 23:31:00 joestewart Exp $ */
global $_PSL;
Modified: trunk/include/modules/group/Group.class
===================================================================
--- trunk/include/modules/group/Group.class 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/group/Group.class 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,6 +1,6 @@
<?php
-/* $Id: Group.class,v 1.3 2006-02-13 07:18:30 lems1 Exp $ */
+/* $Id: Group.class,v 1.3 2006/02/13 07:18:30 lems1 Exp $ */
/**
* Provides an API to the PHPSlash Group Management.
Modified: trunk/include/modules/group/admin.php
===================================================================
--- trunk/include/modules/group/admin.php 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/group/admin.php 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,6 +1,6 @@
<?php
-/* $Id: admin.php,v 1.3 2004-07-02 15:17:16 krabu Exp $ */
+/* $Id: admin.php,v 1.3 2004/07/02 15:17:16 krabu Exp $ */
global $_PSL, $auth, $perm;
Modified: trunk/include/modules/infolog/admin.php
===================================================================
--- trunk/include/modules/infolog/admin.php 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/infolog/admin.php 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,5 +1,5 @@
<?php
-// $Id: admin.php,v 1.2 2004-09-18 14:41:10 joestewart Exp $
+// $Id: admin.php,v 1.2 2004/09/18 14:41:10 joestewart Exp $
global $_PSL, $sess, $auth, $perm, $HTTP_POST_VARS;
Modified: trunk/include/modules/mailinglist/MailingList.class
===================================================================
--- trunk/include/modules/mailinglist/MailingList.class 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/mailinglist/MailingList.class 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,6 +1,6 @@
<?php
-/* $Id: MailingList.class,v 1.9 2004-11-15 18:43:58 joestewart Exp $ */
+/* $Id: MailingList.class,v 1.9 2004/11/15 18:43:58 joestewart Exp $ */
/**
* Class: MailingList
Modified: trunk/include/modules/mailinglist/admin.php
===================================================================
--- trunk/include/modules/mailinglist/admin.php 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/mailinglist/admin.php 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,6 +1,6 @@
<?php
-/* $Id: admin.php,v 1.6 2004-10-18 17:18:15 krabu Exp $ */
+/* $Id: admin.php,v 1.6 2004/10/18 17:18:15 krabu Exp $ */
global $_PSL, $auth, $perm, $ary;
Modified: trunk/include/modules/mailinglist/index.php
===================================================================
--- trunk/include/modules/mailinglist/index.php 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/mailinglist/index.php 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,6 +1,6 @@
<?php
-/* $Id: index.php,v 1.4 2004-09-02 17:26:20 krabu Exp $ */
+/* $Id: index.php,v 1.4 2004/09/02 17:26:20 krabu Exp $ */
global $_PSL, $ary;
Modified: trunk/include/modules/navbar/NavBar.class
===================================================================
--- trunk/include/modules/navbar/NavBar.class 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/navbar/NavBar.class 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,6 +1,6 @@
<?php
-/* $Id: NavBar.class,v 1.1 2003-06-24 19:38:37 joestewart Exp $ */
+/* $Id: NavBar.class,v 1.1 2003/06/24 19:38:37 joestewart Exp $ */
/*
* Class: NavBar
@@ -73,8 +73,10 @@
}
$this->templ->set_block( 'template', "each_destination", "block" );
+
+ $_skin = (!empty($this->psl['skin'])) ? $this->psl['skin']: $this->psl['defaultskin'];
$this->templ->set_var( array(
- 'SKIN' => $this->psl['skin'],
+ 'SKIN' => $_skin,
'IMAGEDIR' => $this->psl['imageurl'],
'LINK_NAVBAR' => "",
'LINK_NAVBAR_TEXT' => "")
Modified: trunk/include/modules/navbar/index.php
===================================================================
--- trunk/include/modules/navbar/index.php 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/navbar/index.php 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,6 +1,6 @@
<?php
-/* $Id: index.php,v 1.1 2003-06-24 19:38:37 joestewart Exp $ */
+/* $Id: index.php,v 1.1 2003/06/24 19:38:37 joestewart Exp $ */
global $_PSL;
Modified: trunk/include/modules/poll/Poll.class
===================================================================
--- trunk/include/modules/poll/Poll.class 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/poll/Poll.class 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,6 +1,6 @@
<?php
-/* $Id: Poll.class,v 1.3 2006-01-29 15:07:58 lems1 Exp $ */
+/* $Id: Poll.class,v 1.3 2006/01/29 15:07:58 lems1 Exp $ */
/*
* Class: Poll
@@ -42,13 +42,15 @@
'showpoll' => 'pollShow.tpl',
'resultpage' => 'pollResultPage.tpl',
'displaypoll' => 'pollDisplay.tpl'
- ));
+ ));
+
+ $_skin = (!empty($this->psl['skin'])) ? $this->psl['skin']: $this->psl['defaultskin'];
$this->templ->set_var(array(
'TITLE' => 'Poll Module',
'ACTION_URL' => $_PSL['adminurl'] . '/pollAdmin.php',
'ROOTURL' => $_PSL['rooturl'],
'IMAGEURL' => $_PSL['imageurl'],
- 'SKIN' => $_PSL['skin']
+ 'SKIN' => $_skin
));
}
@@ -60,14 +62,15 @@
* This function is used to create a new Poll.
*/
function newPoll() {
-
+
+ $_skin = (!empty($this->psl['skin'])) ? $this->psl['skin']: $this->psl['defaultskin'];
$this->templ->set_var(array(
'TITLEBAR' => getTitlebar('100%', 'Create A New Poll'),
'QUESTION_ID' => '',
'QUESTION' => '',
'NUM_VOTERS' => '0',
'CURRENT' => 'checked',
- 'SKIN' => $this->psl['skin']
+ 'SKIN' => $_skin
));
$this->templ->set_block(editpoll, each_choice, choices);
for ($i = 1; $i <= $this->psl['poll_min_answers']; $i++) {
@@ -161,13 +164,14 @@
} else {
$current = '';
};
-
+
+ $_skin = (!empty($this->psl['skin'])) ? $this->psl['skin']: $this->psl['defaultskin'];
$this->templ->set_var(array(
'TITLEBAR' => getTitlebar('100%', 'Edit An Existing Poll'),
'QUESTION_ID' => $question_id,
'QUESTION' => $this->db->f('question_text'),
'CURRENT' => $current,
- 'SKIN' => $this->psl['skin']
+ 'SKIN' => $_skin
));
$this->templ->parse('FORM', 'editpoll', true);
@@ -516,9 +520,10 @@
} else {
$percent = 0;
}
-
+
+ $_skin = (!empty($this->psl['skin'])) ? $this->psl['skin']: $this->psl['defaultskin'];
$this->templ->set_var(array(
- 'SKIN' => $this->psl['skin'],
+ 'SKIN' => $_skin,
'TITLEBAR' => getTitlebar('100%',$question),
'ANSWER' => $this->db->f('answer_text'),
'ROOTDIR' => $this->psl['rooturl'],
@@ -556,10 +561,11 @@
ORDER BY polltimestamp DESC";
$this->db->query($q);
-
+
+ $_skin = (!empty($this->psl['skin'])) ? $this->psl['skin']: $this->psl['defaultskin'];
$this->templ->set_var(array(
'TITLEBAR' => getTitlebar('100%', $this->psl['site_name'] . pslgetText(' Polls')),
- 'SKIN' => $this->psl['skin'],
+ 'SKIN' => $_skin,
'ADMIN_URL' => $this->psl['adminurl'] . '/pollAdmin.php'
));
@@ -617,9 +623,10 @@
if ($question_id == '') {
$question_id = $this->getCurrent();
}
-
+
+ $_skin = (!empty($this->psl['skin'])) ? $this->psl['skin']: $this->psl['defaultskin'];
$this->templ->set_var(array(
- 'SKIN' => $this->psl['skin'],
+ 'SKIN' => $_skin,
'ADMIN_URL' => $this->psl['adminurl'] . '/pollAdmin.php'
));
@@ -671,12 +678,13 @@
# print "$results\n";
# print "Comments<BR><BR>$comments<BR><BR>\n";
-
+
+ $_skin = (!empty($this->psl['skin'])) ? $this->psl['skin']: $this->psl['defaultskin'];
$this->templ->set_var(array(
'QUESTION_ID' => $ary['question_id'],
'RESULT' => $this->getResults($ary['question_id']),
'COMMENT' => $comments,
- 'SKIN' => $this->psl['skin']
+ 'SKIN' => $_skin
));
return $this->templ->parse('OUT', 'resultpage');
Modified: trunk/include/modules/poll/admin.php
===================================================================
--- trunk/include/modules/poll/admin.php 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/poll/admin.php 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,6 +1,6 @@
<?php
-/* $Id: admin.php,v 1.4 2003-12-01 19:23:15 joestewart Exp $ */
+/* $Id: admin.php,v 1.4 2003/12/01 19:23:15 joestewart Exp $ */
global $_PSL, $HTTP_POST_VARS, $HTTP_GET_VARS, $auth, $perm;
Modified: trunk/include/modules/poll/index.php
===================================================================
--- trunk/include/modules/poll/index.php 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/poll/index.php 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,6 +1,6 @@
<?php
-/* $Id: index.php,v 1.6 2003-07-01 03:52:29 lems1 Exp $ */
+/* $Id: index.php,v 1.6 2003/07/01 03:52:29 lems1 Exp $ */
global $_PSL, $HTTP_GET_VARS, $HTTP_POST_VARS, $HTTP_SERVER_VARS;
Modified: trunk/include/modules/poll/poll.php
===================================================================
--- trunk/include/modules/poll/poll.php 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/poll/poll.php 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,6 +1,6 @@
<?php
-/* $Id: poll.php,v 1.1.1.1 2003-03-12 16:12:54 joestewart Exp $ */
+/* $Id: poll.php,v 1.1.1.1 2003/03/12 16:12:54 joestewart Exp $ */
require("config.php");
Modified: trunk/include/modules/search/index.php
===================================================================
--- trunk/include/modules/search/index.php 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/search/index.php 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,6 +1,6 @@
<?php
-/* $Id: index.php,v 1.5 2004-07-07 17:37:53 krabu Exp $ */
+/* $Id: index.php,v 1.5 2004/07/07 17:37:53 krabu Exp $ */
// TODO: search.php needs to have it's logic ripped out and put into an object
@@ -389,9 +389,9 @@
while ($db->next_record ()) {
$story_url = $_PSL['rooturl'] . "/article.php?story_id=" . $db->f('story_id');
- if(!empty($_SERVER['QUERY_STRING'])) {
+/* if(!empty($_SERVER['QUERY_STRING'])) {
$story_url .= $_PSL['amp'] . $_SERVER['QUERY_STRING'];
- }
+} FIXME*/
$templ->set_var (array (
'STORY_URL' => $story_url,
Modified: trunk/include/modules/section/Section.class
===================================================================
--- trunk/include/modules/section/Section.class 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/section/Section.class 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,6 +1,6 @@
<?php
-/* $Id: Section.class,v 1.4 2004-07-07 17:40:40 krabu Exp $ */
+/* $Id: Section.class,v 1.4 2004/07/07 17:40:40 krabu Exp $ */
/**
Modified: trunk/include/modules/section/admin.php
===================================================================
--- trunk/include/modules/section/admin.php 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/section/admin.php 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,5 +1,5 @@
<?php
-// $Id: admin.php,v 1.3 2004-07-07 18:18:32 krabu Exp $
+// $Id: admin.php,v 1.3 2004/07/07 18:18:32 krabu Exp $
global $_PSL, $HTTP_POST_VARS, $HTTP_GET_VARS, $auth, $perm;
Modified: trunk/include/modules/story/Story.class
===================================================================
--- trunk/include/modules/story/Story.class 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/story/Story.class 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,6 +1,6 @@
<?php
-/* $Id: Story.class,v 1.18 2005-12-24 21:40:30 lems1 Exp $ */
+/* $Id: Story.class,v 1.18 2005/12/24 21:40:30 lems1 Exp $ */
/*
* Class: Story
@@ -123,7 +123,8 @@
$fulltext = $ary['title'] . $ary['intro_text'] . $ary['body_text'];
if ( $fulltext != "") {
-
+
+ $_skin = (!empty($this->psl['skin'])) ? $this->psl['skin']: $this->psl['defaultskin'];
$this->template->set_var(array(
'ROOTDIR' => $this->psl['rooturl'],
'PHP_SELF' => $this->psl['phpself'],
@@ -133,7 +134,7 @@
'AUTHOR_ID' => $ary['user_id'],
'AUTHOR_NAME' => $ary['name'],
'AUTHOR_REALNAME' => $ary['realname'],
- 'SKIN' => $this->psl['skin'],
+ 'SKIN' => $_skin,
'rows' => ""
));
$this->template->set_block("relatedlinks","row","rows");
@@ -304,9 +305,10 @@
This may save a db call or a template parse.
saveStory clears the cache.
*/
+
+ $_skin = (!empty($this->psl['skin'])) ? $this->psl['skin']: $this->psl['defaultskin'];
+ $related_name = basename($this->psl['languagefile']) . $_skin ."related";
- $related_name = basename($this->psl['languagefile']) . $this->psl['skin'] ."related";
-
$cache_ary = unserialize($ary["topic_cache"]);
$cache_ary['story']['expire'] = 0; // default to no story cache
@@ -325,7 +327,8 @@
$name_mod = implode('', $argv_ary);
}
- $story_name = basename($this->psl['languagefile']) . $this->psl['skin'] ."story" . $name_mod;
+ $_skin = (!empty($this->psl['skin'])) ? $this->psl['skin']: $this->psl['defaultskin'];
+ $story_name = basename($this->psl['languagefile']) . $_skin ."story" . $name_mod;
$cache_ary[$story_name]['expire'] = $cache_ary['story']['expire'];
$thestory = $this->cacheStory($cache_ary, $story_name);
if( ($thestory == "") AND ($mode == "full") ) {
@@ -362,9 +365,9 @@
// }
$titlebar = getTitleBar("100%", $ary['title']);
-
+ $_skin = (!empty($this->psl['skin'])) ? $this->psl['skin']: $this->psl['defaultskin'];
$this->template->set_var(array(
- 'SKIN' => $this->psl['skin'],
+ 'SKIN' => $_skin,
'IMAGEURL' => $this->psl['imageurl'],
'IMAGEDIR' => $this->psl['imageurl'],
'ROOTDIR' => $this->psl['rooturl'],
@@ -576,9 +579,10 @@
));
$titlebar = getTitleBar("100%", $stories_ary[$i]['title']);
-
+
+ $_skin = (!empty($this->psl['skin'])) ? $this->psl['skin']: $this->psl['defaultskin'];
$this->template->set_var(array(
- 'SKIN' => $this->psl['skin'],
+ 'SKIN' => $_skin,
'TITLEBAR' => $titlebar,
'TITLE' => $stories_ary[$i]['title'],
'INTRO_TEXT' => $stories_ary[$i]['intro_text'],
@@ -649,11 +653,12 @@
} elseif ( !empty($ary['author'])) {
$link_argv .= "&author=" . $ary['author'];
}
-
+
+ $_skin = (!empty($this->psl['skin'])) ? $this->psl['skin']: $this->psl['defaultskin'];
$this->template->set_var(array(
'STORY_ID' => $link_argv,
'ROOTDIR2' => $this->psl['rooturl'], // This is a hack: ROOTDIR disappears in comment_block
- 'SKIN' => $this->psl['skin'],
+ 'SKIN' => $_skin,
'IMAGEURL' => $this->psl['imageurl'],
'IMAGEDIR' => $this->psl['imageurl'],
'ROOTDIR' => $this->psl['rooturl'],
Modified: trunk/include/modules/story/Story_admin.class
===================================================================
--- trunk/include/modules/story/Story_admin.class 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/include/modules/story/Story_admin.class 2009-01-04 07:09:49 UTC (rev 573)
@@ -1,6 +1,6 @@
<?php
-/* $Id: Story_admin.class,v 1.9 2006-02-13 07:16:33 lems1 Exp $ */
+/* $Id: Story_admin.class,v 1.9 2006/02/13 07:16:33 lems1 Exp $ */
/*
* Class: Story_admin
@@ -434,8 +434,10 @@
$q .= "AND '$section_id' = psl_section_lut.section_id ";
}
- $q .= "ORDER BY order_no DESC, timestamp DESC";
+ $q .= "ORDER BY story_id DESC, order_no DESC, timestamp DESC";
+ //debug('listStory query',$q);
+
$this->db->query($q);
$count = 0;
@@ -681,8 +683,9 @@
$story_date = split( '-', $datetime[0]);
$story_time = split( ':', $datetime[1]);
- // setup year select box
- for( $i=1998; $i<2009; $i++) {
+ // setup year select box
+ // allows for input of: year - 10 <= N <= year + 20
+ for( $i=( date('Y') - 10 > 0 ) ? ( date('Y') - 10 ) : 1998; $i <= (date('Y') + 20); $i++) {
$this->template->set_var(array(
'SELECTED' => '',
'STORYYEAR' => $i
@@ -842,8 +845,9 @@
$story_date = split( '-', $datetime[0]);
$story_time = split( ':', $datetime[1]);
- // setup year select box
- for( $i=1998; $i<2009; $i++) {
+ // setup year select box
+ // allows for input of: year - 10 <= N <= year + 20
+ for( $i=( date('Y') - 10 > 0 ) ? ( date('Y') - 10 ) : 1998; $i <= (date('Y') + 20); $i++) {
$this->template->set_var(array(
'SELECTED' => '',
'STORYYEAR' => $i
Modified: trunk/include/modules/story/Story_base.class
===================================================================
--- trunk/include/modules/story/Story_base.class 2009-01-04 06:59:14 UTC (rev 572)
+++ trunk/in...
[truncated message content] |
