phpslash-commit Mailing List for phpSlash (Page 48)
Brought to you by:
joestewart,
nhruby
Menu
▾
▴
phpslash-commit — A list for automatically mailed SCM Commits
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(11) |
Nov
(59) |
Dec
(60) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(52) |
Feb
(77) |
Mar
(118) |
Apr
(76) |
May
(106) |
Jun
(145) |
Jul
(9) |
Aug
(15) |
Sep
(78) |
Oct
(83) |
Nov
(105) |
Dec
(51) |
| 2003 |
Jan
(105) |
Feb
(100) |
Mar
(111) |
Apr
(149) |
May
(95) |
Jun
(56) |
Jul
(8) |
Aug
(2) |
Sep
|
Oct
(22) |
Nov
(117) |
Dec
(6) |
| 2004 |
Jan
(1) |
Feb
|
Mar
(3) |
Apr
(25) |
May
|
Jun
(11) |
Jul
(26) |
Aug
(85) |
Sep
(119) |
Oct
(312) |
Nov
(271) |
Dec
(5) |
| 2005 |
Jan
(6) |
Feb
|
Mar
|
Apr
(12) |
May
(7) |
Jun
(8) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
(5) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Joe S. <joe...@us...> - 2003-05-15 18:19:58
|
Update of /cvsroot/phpslash/phpslash-dev/include/modules/topic
In directory sc8-pr-cvs1:/tmp/cvs-serv13348/phpslash-dev/include/modules/topic
Modified Files:
admin.php
Log Message:
module sections
Index: admin.php
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/topic/admin.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** admin.php 12 Mar 2003 16:12:56 -0000 1.1.1.1
--- admin.php 15 May 2003 18:19:55 -0000 1.2
***************
*** 3,7 ****
/* $Id$ */
! AddClassRequirement("topic",$_PSL['moduledir'] ."/". $_PSL['module']['module.current'] ."/Topic.class");
$pagetitle = pslgetText("Topic Administration"); // header title
--- 3,12 ----
/* $Id$ */
! global $_PSL, $HTTP_POST_VARS, $HTTP_GET_VARS, $auth, $perm;
!
! $ary = $GLOBALS['ary'];
!
!
! AddClassRequirement("topic",$_PSL['moduledir'] ."/topic/Topic.class");
$pagetitle = pslgetText("Topic Administration"); // header title
|
|
From: Joe S. <joe...@us...> - 2003-05-14 18:24:51
|
Update of /cvsroot/phpslash/phpslash-ft In directory sc8-pr-cvs1:/tmp/cvs-serv4962/phpslash-ft Modified Files: CHANGES VERSION Log Message: Release phpSlash 0.7.2 Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.767 retrieving revision 1.768 diff -C2 -d -r1.767 -r1.768 *** CHANGES 7 May 2003 19:36:20 -0000 1.767 --- CHANGES 14 May 2003 18:24:15 -0000 1.768 *************** *** 13,16 **** --- 13,21 ---- 9 - Removal of something (kill -9 :) + 2003-May 14 1:00PM CDT Joe Stewart <joe...@us...> + [R] - Released phpSlash 0.7.2. + - VERSION, config-dist.php3, about.tpl - bumped version + for release. + 2003-May-7 2:30PM CDT Joe Stewart <joe...@us...> [R] - Released phpSlash 0.7.2RC1. Index: VERSION =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/VERSION,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** VERSION 7 May 2003 19:36:20 -0000 1.19 --- VERSION 14 May 2003 18:24:16 -0000 1.20 *************** *** 1 **** ! 0.7.2RC1 --- 1 ---- ! 0.7.2 |
|
From: Joe S. <joe...@us...> - 2003-05-14 18:24:23
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default
In directory sc8-pr-cvs1:/tmp/cvs-serv4962/phpslash-ft/public_html/templates/en/default
Modified Files:
about.tpl
Log Message:
Release phpSlash 0.7.2
Index: about.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default/about.tpl,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** about.tpl 3 Apr 2003 20:45:13 -0000 1.16
--- about.tpl 14 May 2003 18:24:19 -0000 1.17
***************
*** 16,19 ****
--- 16,24 ----
</TR>
<TR>
+ <TD><A HREF="http://prdownloads.sourceforge.net/phpslash/phpslash-0.7.2.tar.gz">V0.7.2</A></TD>
+ <TD><A HREF="http://www.phpslash.org">PHPSlash Development Team</A></TD>
+ <TD>May 14, 2003</TD>
+ </TR>
+ <TR>
<TD><A HREF="http://prdownloads.sourceforge.net/phpslash/phpslash-0.7.1.tar.gz">V0.7.1</A></TD>
<TD><A HREF="http://www.phpslash.org">PHPSlash Development Team</A></TD>
|
|
From: Joe S. <joe...@us...> - 2003-05-14 18:24:22
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basic
In directory sc8-pr-cvs1:/tmp/cvs-serv4962/phpslash-ft/public_html/templates/en/basic
Modified Files:
about.tpl
Log Message:
Release phpSlash 0.7.2
Index: about.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basic/about.tpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** about.tpl 3 Apr 2003 20:45:12 -0000 1.7
--- about.tpl 14 May 2003 18:24:18 -0000 1.8
***************
*** 10,13 ****
--- 10,18 ----
</tr>
<tr>
+ <td><a href="http://prdownloads.sourceforge.net/phpslash/phpslash-0.7.2.tar.gz?download">V0.7.2</a></td>
+ <td><a href="http://www.phpslash.org">PHPSlash Development Team</a></td>
+ <td>May 14, 2003</td>
+ </tr>
+ <tr>
<td><a href="http://prdownloads.sourceforge.net/phpslash/phpslash-0.7.1.tar.gz?download">V0.7.1</a></td>
<td><a href="http://www.phpslash.org">PHPSlash Development Team</a></td>
|
|
From: Joe S. <joe...@us...> - 2003-05-14 18:24:22
|
Update of /cvsroot/phpslash/phpslash-ft/public_html In directory sc8-pr-cvs1:/tmp/cvs-serv4962/phpslash-ft/public_html Modified Files: config-dist.php3 Log Message: Release phpSlash 0.7.2 Index: config-dist.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/config-dist.php3,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** config-dist.php3 7 May 2003 19:36:21 -0000 1.48 --- config-dist.php3 14 May 2003 18:24:17 -0000 1.49 *************** *** 74,78 **** $_PSL = parse_ini_file($psl_inifile, TRUE); ! $_PSL['version'] = '0.7.2RC1'; /**** START DEBUGGING - Comment or delete this for production! ****/ --- 74,78 ---- $_PSL = parse_ini_file($psl_inifile, TRUE); ! $_PSL['version'] = '0.7.2'; /**** START DEBUGGING - Comment or delete this for production! ****/ |
|
From: Luis M <le...@us...> - 2003-05-08 02:45:24
|
Update of /cvsroot/phpslash/phpslash-ft/contrib In directory sc8-pr-cvs1:/tmp/cvs-serv11510 Modified Files: cronmail.php3 Log Message: no need to report errors here... Index: cronmail.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/contrib/cronmail.php3,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** cronmail.php3 7 May 2003 19:26:09 -0000 1.11 --- cronmail.php3 8 May 2003 02:45:20 -0000 1.12 *************** *** 4,8 **** // Written for phpSlash (v0.7) by: // Luis Mondesi <le...@ho...> ! // Last modified: 2003-Mar-13 // // USAGE: create a cron job that calls this file at whichever time --- 4,8 ---- // Written for phpSlash (v0.7) by: // Luis Mondesi <le...@ho...> ! // Last modified: 2003-May-08 // // USAGE: create a cron job that calls this file at whichever time *************** *** 43,47 **** /* DEBUG */ ! error_reporting(E_ALL & ~E_WARN); /* END DEBUG */ --- 43,47 ---- /* DEBUG */ ! error_reporting(0); /* END DEBUG */ |
|
From: Luis M <le...@us...> - 2003-05-08 02:43:50
|
Update of /cvsroot/phpslash/phpslash-dev/contrib In directory sc8-pr-cvs1:/tmp/cvs-serv11110/contrib Modified Files: cronmail.php Log Message: Index: cronmail.php =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/contrib/cronmail.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** cronmail.php 4 May 2003 16:33:57 -0000 1.3 --- cronmail.php 8 May 2003 02:43:47 -0000 1.4 *************** *** 4,8 **** // Written for phpSlash (v0.7) by: // Luis Mondesi <le...@ho...> ! // Last modified: 2003-May-04 // // USAGE: create a cron job that calls this file at whichever time --- 4,8 ---- // Written for phpSlash (v0.7) by: // Luis Mondesi <le...@ho...> ! // Last modified: 2003-May-08 // // USAGE: create a cron job that calls this file at whichever time *************** *** 45,49 **** /* DEBUG */ ! error_reporting(E_ALL,~E_WARN); /* END DEBUG */ --- 45,49 ---- /* DEBUG */ ! error_reporting(0); /* END DEBUG */ |
|
From: Joe S. <joe...@us...> - 2003-05-07 20:18:15
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory sc8-pr-cvs1:/tmp/cvs-serv29161/phpslash-ft/class
Modified Files:
functions.inc
Log Message:
getHeader allows for extra_ary to be defined in the ini or config file.
Index: functions.inc
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/functions.inc,v
retrieving revision 1.146
retrieving revision 1.147
diff -C2 -d -r1.146 -r1.147
*** functions.inc 7 May 2003 19:27:07 -0000 1.146
--- functions.inc 7 May 2003 20:18:12 -0000 1.147
***************
*** 245,249 ****
// $templ->parse('FANCYBOX', "fancybox" );
// return $templ->get('FANCYBOX');
! return $templ->parse('FANCYBOX', "fancybox" );
}
--- 245,249 ----
// $templ->parse('FANCYBOX', "fancybox" );
// return $templ->get('FANCYBOX');
! return $templ->finish($templ->parse('FANCYBOX', "fancybox" ));
}
***************
*** 568,572 ****
// Are there extra tags/variables to pass to template?
! if(!is_array($extra_ary) && is_array($_PSL['extra_ary'])) {
$extra_ary = $_PSL['extra_ary'];
}
--- 568,572 ----
// Are there extra tags/variables to pass to template?
! if(empty($extra_ary) && array_key_exists('extra_ary',$_PSL)) {
$extra_ary = $_PSL['extra_ary'];
}
|
|
From: Joe S. <joe...@us...> - 2003-05-07 19:36:24
|
Update of /cvsroot/phpslash/phpslash-ft/public_html In directory sc8-pr-cvs1:/tmp/cvs-serv7379/phpslash-ft/public_html Modified Files: config-dist.php3 Log Message: Release phpSlash 0.7.2RC1 Index: config-dist.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/config-dist.php3,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** config-dist.php3 14 Apr 2003 17:42:51 -0000 1.47 --- config-dist.php3 7 May 2003 19:36:21 -0000 1.48 *************** *** 74,78 **** $_PSL = parse_ini_file($psl_inifile, TRUE); ! $_PSL['version'] = '0.7.1'; /**** START DEBUGGING - Comment or delete this for production! ****/ --- 74,78 ---- $_PSL = parse_ini_file($psl_inifile, TRUE); ! $_PSL['version'] = '0.7.2RC1'; /**** START DEBUGGING - Comment or delete this for production! ****/ |
|
From: Joe S. <joe...@us...> - 2003-05-07 19:36:24
|
Update of /cvsroot/phpslash/phpslash-ft In directory sc8-pr-cvs1:/tmp/cvs-serv7379/phpslash-ft Modified Files: CHANGES VERSION Log Message: Release phpSlash 0.7.2RC1 Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.766 retrieving revision 1.767 diff -C2 -d -r1.766 -r1.767 *** CHANGES 7 May 2003 19:26:08 -0000 1.766 --- CHANGES 7 May 2003 19:36:20 -0000 1.767 *************** *** 13,16 **** --- 13,20 ---- 9 - Removal of something (kill -9 :) + 2003-May-7 2:30PM CDT Joe Stewart <joe...@us...> + [R] - Released phpSlash 0.7.2RC1. + - VERSION, config-dist.php3 - bumped version for release. + 2003-May-7 2:00PM CDT Joe Stewart <joe...@us...> [W] - functions.inc - getHeader allows for extra_ary to be defined in Index: VERSION =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/VERSION,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** VERSION 3 Apr 2003 20:23:12 -0000 1.18 --- VERSION 7 May 2003 19:36:20 -0000 1.19 *************** *** 1 **** ! 0.7.1 --- 1 ---- ! 0.7.2RC1 |
|
From: Joe S. <joe...@us...> - 2003-05-07 19:27:53
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory sc8-pr-cvs1:/tmp/cvs-serv3188/phpslash-ft/class
Modified Files:
functions.inc
Log Message:
getHeader allows for extra_ary to be defined in the ini or config file.
Index: functions.inc
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/functions.inc,v
retrieving revision 1.145
retrieving revision 1.146
diff -C2 -d -r1.145 -r1.146
*** functions.inc 6 May 2003 20:28:49 -0000 1.145
--- functions.inc 7 May 2003 19:27:07 -0000 1.146
***************
*** 567,570 ****
--- 567,575 ----
}
+ // Are there extra tags/variables to pass to template?
+ if(!is_array($extra_ary) && is_array($_PSL['extra_ary'])) {
+ $extra_ary = $_PSL['extra_ary'];
+ }
+
// parse extra array into template variable placeholder and value
if( is_array($extra_ary)) {
|
|
From: Joe S. <joe...@us...> - 2003-05-07 19:26:41
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory sc8-pr-cvs1:/tmp/cvs-serv2961/phpslash-ft/class
Modified Files:
Story_admin.class
Log Message:
listStory alternates row color.
Index: Story_admin.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Story_admin.class,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** Story_admin.class 14 Apr 2003 17:42:58 -0000 1.18
--- Story_admin.class 7 May 2003 19:26:38 -0000 1.19
***************
*** 459,463 ****
$this->template->set_var('ACTION_URL', $this->psl['phpself']);
!
while ($this->db->next_record()) {
--- 459,463 ----
$this->template->set_var('ACTION_URL', $this->psl['phpself']);
! $i = 0;
while ($this->db->next_record()) {
***************
*** 472,476 ****
$ok = false;
- $i = 0;
while ($db2->next_record()) {
// permisssion to any of them?
--- 472,475 ----
|
|
From: Joe S. <joe...@us...> - 2003-05-07 19:26:12
|
Update of /cvsroot/phpslash/phpslash-ft/contrib In directory sc8-pr-cvs1:/tmp/cvs-serv2746/phpslash-ft/contrib Modified Files: cronmail.php3 Log Message: correct error reporting line. Index: cronmail.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/contrib/cronmail.php3,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** cronmail.php3 19 Mar 2003 20:06:13 -0000 1.10 --- cronmail.php3 7 May 2003 19:26:09 -0000 1.11 *************** *** 43,47 **** /* DEBUG */ ! error_reporting(E_ALL,~E_WARN); /* END DEBUG */ --- 43,47 ---- /* DEBUG */ ! error_reporting(E_ALL & ~E_WARN); /* END DEBUG */ |
|
From: Joe S. <joe...@us...> - 2003-05-07 19:26:11
|
Update of /cvsroot/phpslash/phpslash-ft In directory sc8-pr-cvs1:/tmp/cvs-serv2746/phpslash-ft Modified Files: CHANGES Log Message: correct error reporting line. Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.765 retrieving revision 1.766 diff -C2 -d -r1.765 -r1.766 *** CHANGES 6 May 2003 20:28:48 -0000 1.765 --- CHANGES 7 May 2003 19:26:08 -0000 1.766 *************** *** 13,16 **** --- 13,22 ---- 9 - Removal of something (kill -9 :) + 2003-May-7 2:00PM CDT Joe Stewart <joe...@us...> + [W] - functions.inc - getHeader allows for extra_ary to be defined in + the ini or config file. + Story_admin.class - listStory alternates row color. + cronmail.php3 - correct error reporting line. + 2003-May-6 3:30PM CDT Joe Stewart <joe...@us...> [W] - functions.inc, Block.class - reduce php warnings. |
|
From: Joe S. <joe...@us...> - 2003-05-06 20:44:03
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory sc8-pr-cvs1:/tmp/cvs-serv21147/phpslash-ft/class
Modified Files:
Block.class
Log Message:
reduce php warnings.
Index: Block.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block.class,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** Block.class 23 Apr 2003 15:14:47 -0000 1.32
--- Block.class 6 May 2003 20:43:59 -0000 1.33
***************
*** 668,671 ****
--- 668,673 ----
function extractBlocks($ary) {
+ $last = 0;
+
// debug("Block.class::extractBlocks::ary", $ary);
// a new db object because the parser uses this->db
|
|
From: Joe S. <joe...@us...> - 2003-05-06 20:28:54
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory sc8-pr-cvs1:/tmp/cvs-serv13114/phpslash-ft/class
Modified Files:
functions.inc
Log Message:
reduce php warnings.
Index: functions.inc
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/functions.inc,v
retrieving revision 1.144
retrieving revision 1.145
diff -C2 -d -r1.144 -r1.145
*** functions.inc 17 Apr 2003 23:56:40 -0000 1.144
--- functions.inc 6 May 2003 20:28:49 -0000 1.145
***************
*** 828,832 ****
}
! if ($ary['topic_id'] != "") {
$template->set_var(array(
--- 828,832 ----
}
! if (!empty($ary['topic_id'])) {
$template->set_var(array(
|
|
From: Joe S. <joe...@us...> - 2003-05-06 20:28:53
|
Update of /cvsroot/phpslash/phpslash-ft In directory sc8-pr-cvs1:/tmp/cvs-serv13114/phpslash-ft Modified Files: CHANGES Log Message: reduce php warnings. Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.764 retrieving revision 1.765 diff -C2 -d -r1.764 -r1.765 *** CHANGES 5 May 2003 20:48:58 -0000 1.764 --- CHANGES 6 May 2003 20:28:48 -0000 1.765 *************** *** 13,16 **** --- 13,19 ---- 9 - Removal of something (kill -9 :) + 2003-May-6 3:30PM CDT Joe Stewart <joe...@us...> + [W] - functions.inc, Block.class - reduce php warnings. + 2003-May-5 3:30PM CDT Joe Stewart <joe...@us...> [W] - Block_render_rss.class - Evan Hughes' patch to reduce php warnings. |
|
From: Luis M <le...@us...> - 2003-05-06 00:57:09
|
Update of /cvsroot/phpslash/phpslash-dev/include/templates/en/basic
In directory sc8-pr-cvs1:/tmp/cvs-serv2898
Modified Files:
storyIndex.tpl
Log Message:
minor bug: closing bracket was outside the link opening < a href >
Index: storyIndex.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/include/templates/en/basic/storyIndex.tpl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** storyIndex.tpl 12 Mar 2003 16:12:52 -0000 1.1.1.1
--- storyIndex.tpl 6 May 2003 00:57:06 -0000 1.2
***************
*** 1,11 ****
! <!-- start storyIndex.tpl -->
! <!-- BEGIN each_story -->
! {THESTORY}
!
! <div id="storyFooter">
! <a href="{ROOTDIR}/article.php?story_id={STORY_ID}">{MORE}</a>
! [<a href="{ROOTDIR}/article.php?story_id={STORY_ID}">{COMMENT}]</a>
! </div>
! <!-- END each_story -->
!
! <!-- end storyIndex.tpl -->
--- 1,11 ----
! <!-- start storyIndex.tpl -->
! <!-- BEGIN each_story -->
! {THESTORY}
!
! <div id="storyFooter">
! <a href="{ROOTDIR}/article.php?story_id={STORY_ID}">{MORE}</a>
! <a href="{ROOTDIR}/article.php?story_id={STORY_ID}">[{COMMENT}]</a>
! </div>
! <!-- END each_story -->
!
! <!-- end storyIndex.tpl -->
|
|
From: Luis M <le...@us...> - 2003-05-06 00:56:21
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basic
In directory sc8-pr-cvs1:/tmp/cvs-serv2496
Modified Files:
storyIndex.tpl
Log Message:
minor bug: closing bracket was outside the link opening < a href >
Index: storyIndex.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basic/storyIndex.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** storyIndex.tpl 9 Apr 2002 16:57:06 -0000 1.2
--- storyIndex.tpl 6 May 2003 00:56:18 -0000 1.3
***************
*** 1,11 ****
! <!-- start storyIndex.tpl -->
! <!-- BEGIN each_story -->
! {THESTORY}
!
! <div id="storyFooter">
! <a href="{ROOTDIR}/article.php3?story_id={STORY_ID}">{MORE}</a>
! [<a href="{ROOTDIR}/article.php3?story_id={STORY_ID}">{COMMENT}]</a>
! </div>
! <!-- END each_story -->
!
! <!-- end storyIndex.tpl -->
--- 1,11 ----
! <!-- start storyIndex.tpl -->
! <!-- BEGIN each_story -->
! {THESTORY}
!
! <div id="storyFooter">
! <a href="{ROOTDIR}/article.php3?story_id={STORY_ID}">{MORE}</a>
! <a href="{ROOTDIR}/article.php3?story_id={STORY_ID}">[{COMMENT}]</a>
! </div>
! <!-- END each_story -->
!
! <!-- end storyIndex.tpl -->
|
|
From: Joe S. <joe...@us...> - 2003-05-05 20:49:06
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory sc8-pr-cvs1:/tmp/cvs-serv18460/phpslash-ft/class
Modified Files:
Block_render_rss.class
Log Message:
reduce php warnings.
Index: Block_render_rss.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_rss.class,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Block_render_rss.class 5 Feb 2003 21:58:42 -0000 1.15
--- Block_render_rss.class 5 May 2003 20:49:01 -0000 1.16
***************
*** 160,163 ****
--- 160,171 ----
case $this->tags["item"]:
+ if (empty($this->items[$this->count])) {
+ /* Setup the item */
+ $this->items[$this->count] = array(
+ 'title' => '',
+ 'link' => '',
+ 'description' => '',
+ );
+ }
switch ($this->current) {
case $this->tags["title"]:
***************
*** 186,189 ****
--- 194,200 ----
break;
case $this->tags["url"]:
+ if (empty($this->image['url'])) {
+ $this->image['url'] = '';
+ }
$this->image["url"] .= $data;
break;
***************
*** 333,337 ****
$target = "_self";
$max_items = 10;
- $tpl = $default_tpl;
$errors = "debug";
--- 344,347 ----
***************
*** 348,353 ****
}
! $scheme = $urlParts[scheme];
! $HostName = $urlParts[host];
if(empty($scheme)) {
--- 358,363 ----
}
! $scheme = $urlParts['scheme'];
! $HostName = $urlParts['host'];
if(empty($scheme)) {
***************
*** 370,382 ****
if (is_array($block_info["block_options"])) {
! if (is_string($block_info["block_options"]["max_items"])) {
$max_items = $block_info["block_options"]["max_items"];
! unset($block_info["block_options"]["max_items"]);
}
! if (is_string($block_info["block_options"]["target"])) {
$target = $block_info["block_options"]["target"];
! unset($block_info["block_options"]["target"]);
}
! if (is_string($block_info["block_options"]["title"])) {
$titletype = $block_info["block_options"]["title"];
unset($block_info["block_options"]["title"]);
--- 380,395 ----
if (is_array($block_info["block_options"])) {
! if (isset($block_info["block_options"]["max_items"]) &&
! is_string($block_info["block_options"]["max_items"])) {
$max_items = $block_info["block_options"]["max_items"];
! unset($block_info["block_options"]["max_items"]);
}
! if (isset($block_info['block_options']['target']) &&
! is_string($block_info["block_options"]["target"])) {
$target = $block_info["block_options"]["target"];
! unset($block_info["block_options"]["target"]);
}
! if (isset($block_info['block_options']['title']) &&
! is_string($block_info["block_options"]["title"])) {
$titletype = $block_info["block_options"]["title"];
unset($block_info["block_options"]["title"]);
***************
*** 396,400 ****
$template = pslNew("slashTemplate");
! if (!is_string($block_info["block_options"]["tpl"])) {
$template->set_file( 'block', $default_template);
} elseif ( $template->set_file('block' , basename($block_info["block_options"]["tpl"]) . ".tpl" )) {
--- 409,414 ----
$template = pslNew("slashTemplate");
! if (empty($block_info["block_options"]["tpl"]) ||
! !is_string($block_info["block_options"]["tpl"])) {
$template->set_file( 'block', $default_template);
} elseif ( $template->set_file('block' , basename($block_info["block_options"]["tpl"]) . ".tpl" )) {
***************
*** 500,504 ****
"IMAGEDIR" => $this->psl["imageurl"]
));
! $this->output = $template->parse(OUT,"block");
$this->title = $this->rdf->channel["title"];
--- 514,518 ----
"IMAGEDIR" => $this->psl["imageurl"]
));
! $this->output = $template->parse('OUT',"block");
$this->title = $this->rdf->channel["title"];
***************
*** 507,511 ****
} else {
! $errors = $block_info["block_options"]["errors"];
$this->output = "Error in source file:".$this->rdf->error_str;
--- 521,525 ----
} else {
! // $errors = $block_info["block_options"]["errors"];
$this->output = "Error in source file:".$this->rdf->error_str;
***************
*** 515,533 ****
switch ($errors) {
! case "on":
! // display the error message ( already in this->output).
break;
! case "off":
! // don't display the error text
$this->output = $block_info["cache_data"];
! break;
! case "debug":
! default:
! // only display the error text if debug mode is on
! if(!$this->psl['debug']) {
$this->output = $block_info["cache_data"];
! }
! break;
! }
return false;
}
--- 529,547 ----
switch ($errors) {
! case "on":
! // display the error message ( already in this->output).
break;
! case "off":
! // don't display the error text
$this->output = $block_info["cache_data"];
! break;
! case "debug":
! default:
! // only display the error text if debug mode is on
! if(!$this->psl['debug']) {
$this->output = $block_info["cache_data"];
! }
! break;
! }
return false;
}
|
|
From: Joe S. <joe...@us...> - 2003-05-05 20:49:05
|
Update of /cvsroot/phpslash/phpslash-ft In directory sc8-pr-cvs1:/tmp/cvs-serv18460/phpslash-ft Modified Files: CHANGES Log Message: reduce php warnings. Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.763 retrieving revision 1.764 diff -C2 -d -r1.763 -r1.764 *** CHANGES 2 May 2003 19:03:31 -0000 1.763 --- CHANGES 5 May 2003 20:48:58 -0000 1.764 *************** *** 13,16 **** --- 13,19 ---- 9 - Removal of something (kill -9 :) + 2003-May-5 3:30PM CDT Joe Stewart <joe...@us...> + [W] - Block_render_rss.class - Evan Hughes' patch to reduce php warnings. + 2003-May-2 1:30PM CDT Joe Stewart <joe...@us...> [B] - article.php3 - show and process email form correctly. |
|
From: Luis M <le...@us...> - 2003-05-04 16:34:00
|
Update of /cvsroot/phpslash/phpslash-dev/contrib
In directory sc8-pr-cvs1:/tmp/cvs-serv26782
Modified Files:
cronmail.php
Log Message:
minor fixes. works flawlessly
Index: cronmail.php
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/contrib/cronmail.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** cronmail.php 23 Apr 2003 15:42:04 -0000 1.2
--- cronmail.php 4 May 2003 16:33:57 -0000 1.3
***************
*** 4,8 ****
// Written for phpSlash (v0.7) by:
// Luis Mondesi <le...@ho...>
! // Last modified: 2003-Apr-20
//
// USAGE: create a cron job that calls this file at whichever time
--- 4,8 ----
// Written for phpSlash (v0.7) by:
// Luis Mondesi <le...@ho...>
! // Last modified: 2003-May-04
//
// USAGE: create a cron job that calls this file at whichever time
***************
*** 40,44 ****
// prepending might not be needed now... just the config.php:
! require("/home/luigi/cvs/phpslash-dev/public_html/config.php");
AddClassRequirement("mailinglist",$_PSL['moduledir'] . "/mailinglist/MailingList.class");
--- 40,44 ----
// prepending might not be needed now... just the config.php:
! require("/full/path/to/config.php");
AddClassRequirement("mailinglist",$_PSL['moduledir'] . "/mailinglist/MailingList.class");
|
|
From: Luis M <le...@us...> - 2003-05-04 16:29:19
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory sc8-pr-cvs1:/tmp/cvs-serv25221
Modified Files:
MailingList.class
Log Message:
ported back from -dev. it includes bug fixes and cleanups. among the bug fixes are: now the cronmail script is able to send emails and differentiate when users want WEEKLY emails from the DAILY ones
Index: MailingList.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/MailingList.class,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** MailingList.class 25 Mar 2003 21:27:13 -0000 1.19
--- MailingList.class 4 May 2003 16:29:16 -0000 1.20
***************
*** 25,29 ****
/* Templates */
! $this->templ = pslNew("slashTemplate",$this->psl['templatedir']);
$this->templ->debug = 0;
$this->templ->set_file(array(
--- 25,29 ----
/* Templates */
! $this->templ = pslNew("slashTemplate",$this->psl["templatedir"]);
$this->templ->debug = 0;
$this->templ->set_file(array(
***************
*** 48,53 ****
$this->templ->set_var(array(
'TITLEBAR' => getTitlebar("100%",pslgetText("Email Headline Updates")),
! 'ACTION_URL' => $this->psl['phpself'],
! 'SITEOWNER' => $this->psl['site_owner']
));
--- 48,53 ----
$this->templ->set_var(array(
'TITLEBAR' => getTitlebar("100%",pslgetText("Email Headline Updates")),
! 'ACTION_URL' => $this->psl["phpself"],
! 'SITEOWNER' => $this->psl["site_owner"]
));
***************
*** 122,128 ****
$this->templ->set_var(array(
! 'SITENAME' => $this->psl['site_name'],
! 'SITEOWNER' => $this->psl['site_owner'],
! 'MAILINGLIST_URL' => $this->psl['rooturl'] . "/mailinglist.php3",
'ADDRESS' => $to_address
));
--- 122,128 ----
$this->templ->set_var(array(
! 'SITENAME' => $this->psl["site_name"],
! 'SITEOWNER' => $this->psl["site_owner"],
! 'MAILINGLIST_URL' => $this->psl["rooturl"] . "/mailinglist.php3",
'ADDRESS' => $to_address
));
***************
*** 138,142 ****
};
! if(@mail($to_address, $this->psl['mailinglist_subject'], $body, "From: ".$this->psl['site_owner']."")){
return true;
} else {
--- 138,142 ----
};
! if(@mail($to_address, $this->psl["mailinglist_subject"], $body, "From: ".$this->psl["site_owner"]."")){
return true;
} else {
***************
*** 150,157 ****
$ary = clean($ary);
! if (!$ary['name']) {
! $ary['name'] = "Subscriber";
}
! if (!$ary['subscribe_address']) {
$this->message = pslgetText("You need to enter an email address");
return;
--- 150,157 ----
$ary = clean($ary);
! if (!$ary["name"]) {
! $ary["name"] = "Subscriber";
}
! if (!$ary["subscribe_address"]) {
$this->message = pslgetText("You need to enter an email address");
return;
***************
*** 246,259 ****
function AdminMenu() {
!
! $q = "SELECT id,
! name,
! email,
! date_created
! FROM psl_mailinglist";
$this->db->query($q);
$this->templ->set_var(array(
! 'ACTION_URL' => $this->psl['phpself']
));
--- 246,260 ----
function AdminMenu() {
! // to avoid ambiguity, since we need all fields,
! // I changed this from plain "id" or "psl_mailinglist.id"
! // to "*". luis
! $q = "SELECT *
! FROM psl_mailinglist,
! psl_mailinglist_frequency
! WHERE psl_mailinglist.id = psl_mailinglist_frequency.id";
$this->db->query($q);
$this->templ->set_var(array(
! 'ACTION_URL' => $this->psl["phpself"]
));
***************
*** 264,267 ****
--- 265,269 ----
'ID' => $this->db->f("id"),
'EMAIL' => $this->db->f("email"),
+ 'FREQ' => $this->db->f("frequency"),
'TIME' => psl_dateTimeShort($this->db->f("date_created"))
));
***************
*** 287,293 ****
$this->templ->set_var(array(
'NEWSLETTER_BODY' => $body,
! 'ACTION_URL' => $this->psl['phpself'],
! 'FROM' => $this->psl['site_owner'],
! 'SUBJECT' => $this->psl['mailinglist_subject'],
'FROM_MONTH' => "$from_month",
'FROM_DATE' => "$from_day",
--- 289,295 ----
$this->templ->set_var(array(
'NEWSLETTER_BODY' => $body,
! 'ACTION_URL' => $this->psl["phpself"],
! 'FROM' => $this->psl["site_owner"],
! 'SUBJECT' => $this->psl["mailinglist_subject"],
'FROM_MONTH' => "$from_month",
'FROM_DATE' => "$from_day",
***************
*** 304,327 ****
function build_body($ary, $offset) { //BEGIN FUNCTION
! if ($ary['dateoverride']) {
! $ary['bday'] = date("d");
! $ary['bday'] = $bday - $offset;
!
! $ary['bmonth'] = date("m");
! $ary['bmonth'] = $ary[bmonth] - 1;
!
! $ary['byear'] = date("Y");
! $ary['eday'] = date("d");
! $ary['emonth'] = date("m");
! $ary['eyear'] = date("Y");
}
! $begtimestamp = mktime(0,0,0,$ary['bmonth'],$ary['bday'],$ary['byear']);
! $endtimestamp = mktime(0,0,0,$ary['emonth'],$ary['eday'] + 1,$ary['eyear']);
$begdate = date("Y-m-d H:i:s", $begtimestamp);
$enddate = date("Y-m-d H:i:s", $endtimestamp);
!
$q = "SELECT story.story_id,
story.title,
--- 306,335 ----
function build_body($ary, $offset) { //BEGIN FUNCTION
+
+ $db = pslNew("slashDB");
+
+ if ( $offset > 1 ) {
+ $ary["bday"] = $ary["eday"] - $offset;
+ $ary["bday"] = ($ary["bday"]>0) ? $ary["bday"] : (30 + $ary["bday"]);
+ }
! if ($ary["dateoverride"]) {
! // end-date
! $ary["eday"] = date("d");
! $ary["emonth"] = date("m");
! $ary["eyear"] = date("Y");
! // begin-date
! $ary["byear"] = date("Y");
! $ary["bday"] = $ary["eday"] - $offset;
! $ary["bmonth"] = $ary["emonth"] - 1;
}
! $begtimestamp = mktime(0,0,0,$ary["bmonth"],$ary["bday"],$ary["byear"]);
! // $endtimestamp = mktime(0,0,0,$ary["emonth"],$ary["eday"] + 1,$ary["eyear"]);
! $endtimestamp = time();
$begdate = date("Y-m-d H:i:s", $begtimestamp);
$enddate = date("Y-m-d H:i:s", $endtimestamp);
!
$q = "SELECT story.story_id,
story.title,
***************
*** 338,365 ****
ORDER BY date_available";
! $this->db->query($q);
$this->templ->set_block("messagebodymail", "row", "rows");
$success = false;
! while($this->db->next_record()) {
!
! $url = $this->psl['rooturl'] . "/article.php3?story_id=" . $this->db->Record["story_id"];
$this->templ->set_var(array(
! 'AUTHOR_NAME' => $this->db->Record["name"],
! 'TITLE' => $this->db->Record["title"],
! 'DEPT' => $this->db->Record["dept"],
! 'DATE' => psl_DateTimeLong($this->db->Record["date_available"]),
! 'STORY' => format_mail($this->db->Record["intro_text"],76,true),
'URL' => $url
));
$this->templ->parse("rows","row",true);
$success = true;
! } //End While next_record
if ($success == true) {
! return $this->templ->parse('OUT',array("messagebodymail"));
! } else {
! return false;
}
// return $this->templ->get('OUT');
} //END FUNCTION
--- 346,378 ----
ORDER BY date_available";
! $db->query($q);
$this->templ->set_block("messagebodymail", "row", "rows");
$success = false;
!
! while($db->next_record()) {
! $url = $this->psl["rooturl"] . "/article.php3?story_id=" . $db->Record["story_id"];
$this->templ->set_var(array(
! 'AUTHOR_NAME' => $db->Record["name"],
! 'TITLE' => $db->Record["title"],
! 'DEPT' => $db->Record["dept"],
! 'DATE' => psl_DateTimeLong($db->Record["date_available"]),
! 'STORY' => format_mail($db->Record["intro_text"],76,true),
'URL' => $url
));
$this->templ->parse("rows","row",true);
+
$success = true;
! } //End While next_record
!
if ($success == true) {
! $success = $this->templ->parse('OUT',array("messagebodymail"));
}
+ // reset previous values
+ unset($this->templ->varvals["messagebodymail"]);
+ unset($this->templ->varkeys["messagebodymail"]);
+ $this->templ->set_var('rows', '');
+ return $success;
// return $this->templ->get('OUT');
} //END FUNCTION
***************
*** 368,384 ****
function newsletterSend($ary) {
! if ( $ary['subject'] ) {
// Allow extra news submitted in form
! $extra_message = $ary['body'];
! $ary['body'] = '';
! if ( $ary['freqoverride'] ) {
debug("MailingList", "Frequency Override in effect!");
$sql = "SELECT email,
name
FROM psl_mailinglist";
! if ( !$ary['override']) {
! $ary['body'] = $this->build_body($ary,0);
}
} else {
--- 381,397 ----
function newsletterSend($ary) {
! if ( $ary["subject"] ) {
// Allow extra news submitted in form
! $extra_message = $ary["body"];
! $ary["body"] = '';
! if ( $ary["freqoverride"] ) {
debug("MailingList", "Frequency Override in effect!");
$sql = "SELECT email,
name
FROM psl_mailinglist";
! if ( !$ary["override"]) {
! $ary["body"] = $this->build_body($ary,0);
}
} else {
***************
*** 418,422 ****
$email = $this->db->Record["email"];
$dayback = $this->db->Record["dayback"];
! if ( $ary['freqoverride'] ) {
$frequency = '';
} else {
--- 431,435 ----
$email = $this->db->Record["email"];
$dayback = $this->db->Record["dayback"];
! if ( $ary["freqoverride"] ) {
$frequency = '';
} else {
***************
*** 426,459 ****
$this->message .= "To: $email <$name>";
! if ( ($dayback != $tmpDay) && ( !($ary['override']) ) ) {
! $ary['body'] = $this->build_body($ary,$dayback);
}
$today = date("m/d/Y");
switch ($frequency) {
case "DAY":
! $mail_subject = $ary['subject']." for today ($today)";
break;
case "[0-9]":
! $mail_subject = $ary['subject']." for the past $dayback ($today)";
break;
case "MONTH":
! $mail_subject = $ary['subject']." for the past month ($today)";
break;
default:
! $mail_subject = $ary['subject'];
}
! $this->message .= " Subject: $mail_subject ->";
$this->templ->set_var(array(
! 'MESSAGE_BODY' => $ary['body'],
'EXTRA_MESSAGE' => $extra_message
));
$this->templ->parse('OUT',array("messagemail"));
$final_body = $this->templ->get('OUT');
!
! if(empty($ary['body']) && empty($extra_message)){
! $this->message .= pslgetText("Nothing to send");
! } elseif ( mail($email, $mail_subject, $final_body, "From: ".$ary['sender']) ) {
$this->message .= pslgetText("Mail Sent Successfully!")."<br>\n";
} else {
--- 439,485 ----
$this->message .= "To: $email <$name>";
! if (($dayback != $tmpDay) && ( !($ary["override"]) ) ) {
! $ary["body"] = $this->build_body($ary,$dayback);
}
$today = date("m/d/Y");
+
+ //$this->message .= " Frequency: $frequency";
+
switch ($frequency) {
case "DAY":
! $mail_subject = $ary["subject"]." for today ($today)";
break;
case "[0-9]":
! $mail_subject = $ary["subject"]." for the past $dayback ($today)";
break;
case "MONTH":
! $mail_subject = $ary["subject"]." for the past month ($today)";
! break;
! case "SUNDAY":
! case "MONDAY":
! case "TUESDAY":
! case "WEDNESDAY":
! case "THURSDAY":
! case "FRIDAY":
! case "SATURDAY":
!
! $mail_subject = $ary["subject"]." since last ".$frequency;
break;
default:
! $mail_subject = $ary["subject"];
}
! $this->message .= " Subject: $mail_subject -> ";
$this->templ->set_var(array(
! 'MESSAGE_BODY' => $ary["body"],
'EXTRA_MESSAGE' => $extra_message
));
$this->templ->parse('OUT',array("messagemail"));
$final_body = $this->templ->get('OUT');
!
! if(empty($ary["body"]) && empty($extra_message)){
! $this->message .= pslgetText("Nothing to send")."<br />\n";
! } elseif ( mail($email, $mail_subject, $final_body, "From: ".$ary["sender"]) ) {
$this->message .= pslgetText("Mail Sent Successfully!")."<br>\n";
} else {
***************
*** 469,473 ****
$this->message ="</td>".pslgetText("You didn't give a email subject! Halting.")."<br>\n";
return false;
! } // End: if ( $ary['subject'] && $ary['body'] )
} // End of function
--- 495,499 ----
$this->message ="</td>".pslgetText("You didn't give a email subject! Halting.")."<br>\n";
return false;
! } // End: if ( $ary["subject"] && $ary["body"] )
} // End of function
|
|
From: Joe S. <joe...@us...> - 2003-05-02 19:03:38
|
Update of /cvsroot/phpslash/phpslash-ft In directory sc8-pr-cvs1:/tmp/cvs-serv31202/phpslash-ft Modified Files: CHANGES Log Message: show and process email form correctly. Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.762 retrieving revision 1.763 diff -C2 -d -r1.762 -r1.763 *** CHANGES 28 Apr 2003 15:21:32 -0000 1.762 --- CHANGES 2 May 2003 19:03:31 -0000 1.763 *************** *** 13,16 **** --- 13,19 ---- 9 - Removal of something (kill -9 :) + 2003-May-2 1:30PM CDT Joe Stewart <joe...@us...> + [B] - article.php3 - show and process email form correctly. + 2003-April-28 10:00AM CDT Joe Stewart <joe...@us...> [BT] - Story.class, Story_base.class - "also text" fix, reduce warnings. |
|
From: Joe S. <joe...@us...> - 2003-05-02 19:03:38
|
Update of /cvsroot/phpslash/phpslash-ft/public_html
In directory sc8-pr-cvs1:/tmp/cvs-serv31202/phpslash-ft/public_html
Modified Files:
article.php3
Log Message:
show and process email form correctly.
Index: article.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/article.php3,v
retrieving revision 1.75
retrieving revision 1.76
diff -C2 -d -r1.75 -r1.76
*** article.php3 3 Apr 2003 20:08:39 -0000 1.75
--- article.php3 2 May 2003 19:03:32 -0000 1.76
***************
*** 19,24 ****
// correction for register_globals OFF
! $story_id = $ary['story_id'];
! $submit = $ary['submit'];
$story_html = $story->getStory($story_id, "full", $ary);
--- 19,32 ----
// correction for register_globals OFF
! if(array_key_exists('story_id', $ary)) {
! $story_id = $ary['story_id'];
! } elseif( array_key_exists('story_id', $HTTP_POST_VARS)) {
! $story_id = $HTTP_POST_VARS['story_id'];
! }
! $submit = '';
! $emailform = '';
! if(array_key_exists('submit', $ary)) {
! $submit = $ary['submit'];
! }
$story_html = $story->getStory($story_id, "full", $ary);
***************
*** 125,131 ****
case "email":
! $emailform = "";
! $emailform = $story->emailStory($story_id, $action);
!
default:
--- 133,139 ----
case "email":
! $emailform = $story->emailStory($story_id, $ary['action']);
! // continue down to default and show story.
!
default:
***************
*** 134,138 ****
}
! $t->set_file(article, "article.tpl");
$breadcrumb = breadcrumb($ary);
--- 142,146 ----
}
! $t->set_file('article', "article.tpl");
$breadcrumb = breadcrumb($ary);
***************
*** 160,194 ****
if (empty($leftblocks)) {
if (empty($rightblocks)) {
! // $centerblocks = $block->getBlocks($ary);
! // $centerblocks .= $related;
// $tplfile = "index1col.tpl";
! // default to 2 column for transparent upgrade
! $rightblocks = $block->getBlocks($ary);
! $rightblocks .= $related;
$tplfile = "index2colright.tpl";
} else {
$tplfile = "index2colright.tpl";
! $rightblocks = $related . $rightblocks;
}
} elseif (empty($rightblocks)) {
$tplfile = "index2colleft.tpl";
! $leftblocks .= $related;
} else {
$tplfile = "index3col.tpl";
! $rightblocks = $related . $rightblocks;
}
! $t->set_file(article, $tplfile); //"article.tpl");
! /* Now the comments */
if ($_PSL['module']['Comment']) {
! $cmtary['mode'] = $ary['mode'];
! $cmtary['order'] = $ary['order'];
! $cmtary['story_id'] = $ary['story_id'];
! $cmtary['parent_id'] = $ary['parent_id'];
! $cmt = pslNew("Comment",$cmtary);
! $comments = $cmt->getAllComments($cmtary);
} else {
$comments = '';
--- 168,198 ----
if (empty($leftblocks)) {
if (empty($rightblocks)) {
! // $centerblocks = $block->getBlocks($ary);
! // $centerblocks .= $related;
// $tplfile = "index1col.tpl";
! // default to 2 column for transparent upgrade
! $rightblocks = $block->getBlocks($ary);
! $rightblocks .= $related;
$tplfile = "index2colright.tpl";
} else {
$tplfile = "index2colright.tpl";
! $rightblocks = $related . $rightblocks;
}
} elseif (empty($rightblocks)) {
$tplfile = "index2colleft.tpl";
! $leftblocks .= $related;
} else {
$tplfile = "index3col.tpl";
! $rightblocks = $related . $rightblocks;
}
! $t->set_file('article', $tplfile); //"article.tpl");
! /* Now the comments */
if ($_PSL['module']['Comment']) {
! $cmt = pslNew("Comment",$ary);
! $comments = $cmt->getAllComments($ary);
} else {
$comments = '';
***************
*** 208,212 ****
'STORY_COLUMN' => $emailform."\n".$story_html."\n".$comments,
'LEFT_BLOCK_COLUMN' => $leftblocks,
! 'CENTER_TOP_BLOCK_COLUMN' => $centertopblocks,
'RIGHT_BLOCK_COLUMN' => $rightblocks,
// 'HEADER' => $header,
--- 212,216 ----
'STORY_COLUMN' => $emailform."\n".$story_html."\n".$comments,
'LEFT_BLOCK_COLUMN' => $leftblocks,
! 'CENTER_BLOCK_COLUMN' => $centerblocks,
'RIGHT_BLOCK_COLUMN' => $rightblocks,
// 'HEADER' => $header,
***************
*** 229,234 ****
slashhead($ttitle,$_PSL['metatags']);
-
- debug('HTTP_COOKIE_VARS',$HTTP_COOKIE_VARS);
$t->parse('PAGE', 'article');
--- 233,236 ----
|
2 messages has been excluded from this view by a project administrator.
