phpslash-commit Mailing List for phpSlash (Page 52)
Brought to you by:
joestewart,
nhruby
Menu
▾
▴
phpslash-commit — A list for automatically mailed SCM Commits
This list is closed, nobody may subscribe to it.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(11) |
Nov
(59) |
Dec
(60) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(52) |
Feb
(77) |
Mar
(118) |
Apr
(76) |
May
(106) |
Jun
(145) |
Jul
(9) |
Aug
(15) |
Sep
(78) |
Oct
(83) |
Nov
(105) |
Dec
(51) |
| 2003 |
Jan
(105) |
Feb
(100) |
Mar
(111) |
Apr
(149) |
May
(95) |
Jun
(56) |
Jul
(8) |
Aug
(2) |
Sep
|
Oct
(22) |
Nov
(117) |
Dec
(6) |
| 2004 |
Jan
(1) |
Feb
|
Mar
(3) |
Apr
(25) |
May
|
Jun
(11) |
Jul
(26) |
Aug
(85) |
Sep
(119) |
Oct
(312) |
Nov
(271) |
Dec
(5) |
| 2005 |
Jan
(6) |
Feb
|
Mar
|
Apr
(12) |
May
(7) |
Jun
(8) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
(5) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Joe S. <joe...@us...> - 2003-04-17 23:31:04
|
Update of /cvsroot/phpslash/phpslash-dev/include/modules/search
In directory sc8-pr-cvs1:/tmp/cvs-serv15895/phpslash-dev/include/modules/search
Modified Files:
index.php
Log Message:
Initial testing of new block types and page display.
Index: index.php
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/search/index.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** index.php 12 Mar 2003 16:12:55 -0000 1.1.1.1
--- index.php 17 Apr 2003 23:31:00 -0000 1.2
***************
*** 5,8 ****
--- 5,12 ----
// TODO: search.php needs to have it's logic ripped out and put into an object
+ global $_PSL;
+
+ $ary = $GLOBALS['ary'];
+
$pagetitle = pslgetText("Search");
$xsiteobject = pslgetText("Search Page"); #Defines The META TAG Page Type
|
|
From: Joe S. <joe...@us...> - 2003-04-17 23:31:04
|
Update of /cvsroot/phpslash/phpslash-dev/include/modules/glossary
In directory sc8-pr-cvs1:/tmp/cvs-serv15895/phpslash-dev/include/modules/glossary
Modified Files:
index.php
Log Message:
Initial testing of new block types and page display.
Index: index.php
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/glossary/index.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** index.php 12 Mar 2003 16:12:55 -0000 1.1.1.1
--- index.php 17 Apr 2003 23:31:00 -0000 1.2
***************
*** 3,7 ****
/* $Id$ */
! AddClassRequirement("glossary",$_PSL['moduledir'] . "/". $_PSL['module']['module.current'] ."/Glossary.class");
$pagetitle = "Glossary"; // header title
--- 3,11 ----
/* $Id$ */
! global $_PSL;
!
! $ary = $GLOBALS['ary'];
!
! AddClassRequirement("glossary",$_PSL['moduledir'] . "/glossary/Glossary.class");
$pagetitle = "Glossary"; // header title
|
|
From: Joe S. <joe...@us...> - 2003-04-17 23:31:04
|
Update of /cvsroot/phpslash/phpslash-dev/include/modules/block
In directory sc8-pr-cvs1:/tmp/cvs-serv15895/phpslash-dev/include/modules/block
Modified Files:
index.php
Log Message:
Initial testing of new block types and page display.
Index: index.php
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/block/index.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** index.php 12 Mar 2003 16:12:55 -0000 1.1.1.1
--- index.php 17 Apr 2003 23:31:00 -0000 1.2
***************
*** 1,4 ****
--- 1,6 ----
<?php
+ global $_PSL;
+
AddClassRequirement("block",$_PSL['moduledir'] ."/". $_PSL['module']['module.current'] ."/Block.class");
AddClassRequirement("block_i","block");
|
|
From: Joe S. <joe...@us...> - 2003-04-17 23:31:03
|
Update of /cvsroot/phpslash/phpslash-dev In directory sc8-pr-cvs1:/tmp/cvs-serv15895/phpslash-dev Modified Files: CHANGES Log Message: Initial testing of new block types and page display. Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/CHANGES,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CHANGES 12 Mar 2003 16:42:49 -0000 1.3 --- CHANGES 17 Apr 2003 23:30:59 -0000 1.4 *************** *** 13,16 **** --- 13,21 ---- 9 - Removal of something (kill -9 :) + + 2003-April-17 6:00PM CST Joe Stewart <joe...@us...> + [ET] - Initial testing of new block types and page display. New block + types - header, footer, topicbar, module, and page. + 2003-March-12 10:30PM CST Joe Stewart <joe...@us...> [B] - slashAuthCR.class - AddClassRequirement for Author. |
|
From: Joe S. <joe...@us...> - 2003-04-17 23:31:03
|
Update of /cvsroot/phpslash/phpslash-dev/include/modules/mailinglist
In directory sc8-pr-cvs1:/tmp/cvs-serv15895/phpslash-dev/include/modules/mailinglist
Modified Files:
index.php
Log Message:
Initial testing of new block types and page display.
Index: index.php
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/mailinglist/index.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** index.php 12 Mar 2003 16:12:54 -0000 1.1.1.1
--- index.php 17 Apr 2003 23:31:00 -0000 1.2
***************
*** 3,6 ****
--- 3,10 ----
/* $Id$ */
+ global $_PSL, $HTTP_POST_VARS;
+
+ $ary = $GLOBALS['ary'];
+
AddClassRequirement("mailinglist",$_PSL['moduledir'] . "/mailinglist/MailingList.class");
|
|
From: Luis M <le...@us...> - 2003-04-16 19:48:56
|
Update of /cvsroot/phpslash/phpslash-dev/public_html In directory sc8-pr-cvs1:/tmp/cvs-serv31286 Added Files: .cvsignore Log Message: files that should never be commited --- NEW FILE: .cvsignore --- config.php config.ini.php |
|
From: Joe S. <joe...@us...> - 2003-04-16 16:35:53
|
Update of /cvsroot/phpslash/phpslash-ft In directory sc8-pr-cvs1:/tmp/cvs-serv8396/phpslash-ft Modified Files: CHANGES Log Message: added IMAGEURL, ROOTURL, and SKIN placeholders. Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.755 retrieving revision 1.756 diff -C2 -d -r1.755 -r1.756 *** CHANGES 14 Apr 2003 17:42:49 -0000 1.755 --- CHANGES 16 Apr 2003 16:35:46 -0000 1.756 *************** *** 13,16 **** --- 13,19 ---- 9 - Removal of something (kill -9 :) + 2003-April 14 3:30PM CDT Joe Stewart <joe...@us...> + [B] - Added ROOTURL, IMAGEURL and SKIN placeholders to topicBar.tpl. + 2003-April 14 12:00PM CDT Joe Stewart <joe...@us...> [FT] - functions.inc, Block_admin.class, Story_admin.class, Author.class, |
|
From: Joe S. <joe...@us...> - 2003-04-15 14:16:11
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory sc8-pr-cvs1:/tmp/cvs-serv499/phpslash-ft/class
Modified Files:
TopicBar.class
Log Message:
added IMAGEURL, ROOTURL, and SKIN placeholders.
Index: TopicBar.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/TopicBar.class,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** TopicBar.class 14 Apr 2003 20:36:41 -0000 1.6
--- TopicBar.class 15 Apr 2003 14:16:02 -0000 1.7
***************
*** 49,55 ****
// TODO: Use $_PSL[amp] in the following code
$this->templ->set_var( array(
! 'SKIN' => $_PSL['skin'],
! 'ROOTURL' => $_PSL['rooturl'],
! 'IMAGEURL' => $_PSL['imageurl'],
'SEARCH_TOPIC' => $this->psl['rooturl'] . "/search.php3?topic_id=$topic_id",
'IMAGE_SRC' => $this->psl['topicimageurl'] . "/$image",
--- 49,55 ----
// TODO: Use $_PSL[amp] in the following code
$this->templ->set_var( array(
! 'SKIN' => $this->psl['skin'],
! 'ROOTURL' => $this->psl['rooturl'],
! 'IMAGEURL' => $this->psl['imageurl'],
'SEARCH_TOPIC' => $this->psl['rooturl'] . "/search.php3?topic_id=$topic_id",
'IMAGE_SRC' => $this->psl['topicimageurl'] . "/$image",
|
|
From: Joe S. <joe...@us...> - 2003-04-14 20:36:47
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory sc8-pr-cvs1:/tmp/cvs-serv23227/phpslash-ft/class
Modified Files:
TopicBar.class
Log Message:
added IMAGEURL, ROOTURL, and SKIN placeholders.
Index: TopicBar.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/TopicBar.class,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TopicBar.class 20 Dec 2002 22:17:30 -0000 1.5
--- TopicBar.class 14 Apr 2003 20:36:41 -0000 1.6
***************
*** 49,52 ****
--- 49,55 ----
// TODO: Use $_PSL[amp] in the following code
$this->templ->set_var( array(
+ 'SKIN' => $_PSL['skin'],
+ 'ROOTURL' => $_PSL['rooturl'],
+ 'IMAGEURL' => $_PSL['imageurl'],
'SEARCH_TOPIC' => $this->psl['rooturl'] . "/search.php3?topic_id=$topic_id",
'IMAGE_SRC' => $this->psl['topicimageurl'] . "/$image",
|
|
From: Joe S. <joe...@us...> - 2003-04-14 18:07:19
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory sc8-pr-cvs1:/tmp/cvs-serv17276/phpslash-ft/class
Modified Files:
functions.inc
Log Message:
displayOptions rewritten to be able to display different option types.
Index: functions.inc
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/functions.inc,v
retrieving revision 1.142
retrieving revision 1.143
diff -C2 -d -r1.142 -r1.143
*** functions.inc 14 Apr 2003 17:42:58 -0000 1.142
--- functions.inc 14 Apr 2003 18:07:15 -0000 1.143
***************
*** 1580,1584 ****
global $_PSL;
- $_PSL['debug'] = true;
if(!is_object($tpl_object)) {
--- 1580,1583 ----
|
|
From: Joe S. <joe...@us...> - 2003-04-14 17:45:23
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default
In directory sc8-pr-cvs1:/tmp/cvs-serv7863/phpslash-ft/public_html/templates/en/default
Added Files:
optionTypes.tpl
Log Message:
displayOptions rewritten to be able to display different option types.
--- NEW FILE: optionTypes.tpl ---
<!-- optionTypes.tpl -->
<!-- BEGIN type_text -->
<!-- text field begin -->
<!-- BEGIN each_default_option -->
<tr>
<td><input type="hidden" name="{DOPTION_NAME}" value="{DOPTION_NAME_VAL}" size="15" />{DOPTION_NAME_VAL}</td>
<td><input type="text" name="{DOPTION_VALUE}" value="{DOPTION_VALUE_VAL}" size="20" /></td>
</tr>
<!-- END each_default_option -->
<!-- BEGIN each_option -->
<tr>
<td><input type="text" name="{OPTION_NAME}" value="{OPTION_NAME_VAL}" size="15" /></td>
<td><input type="text" name="{OPTION_VALUE}" value="{OPTION_VALUE_VAL}" size="20" /></td>
</tr>
<!-- END each_option -->
<!-- text field end -->
<!-- END type_text -->
<!-- BEGIN type_radio -->
<!-- radio begin -->
<!-- BEGIN each_default_option -->
<tr>
<td><b>{DOPTION_NAME_VAL}</b><i>{DOPTION_DESCRIPTION}</i></td>
<td>
<input type="hidden" name="{DOPTION_NAME}" value="{DOPTION_NAME_VAL}" />
<!-- BEGIN each_default_choice -->
<!-- BEGIN each_default_selected -->
<input type="radio" checked=CHECKED name="{DOPTION_VALUE}" value="{DOPTION_VALUE_VAL}" />{DOPTION_VALUE_LABEL}<br />
<!-- END each_default_selected -->
<!-- BEGIN each_default_notselected -->
<input type="radio" name="{DOPTION_VALUE}" value="{DOPTION_VALUE_VAL}" />{DOPTION_VALUE_LABEL}<br />
<!-- END each_default_notselected -->
<!-- END each_default_choice -->
</td>
</tr>
<tr>
<td colspan="2">
<br />
</td>
</tr>
<!-- END each_default_option -->
<!-- BEGIN each_option -->
<tr>
<td><input type="text" name="{OPTION_NAME}" value="{OPTION_NAME_VAL}" size="15" /></td>
<td><input type="text" name="{OPTION_VALUE}" value="{OPTION_VALUE_VAL}" size="20" /></td>
</tr>
<!-- END each_option -->
<!-- radio end -->
<!-- END type_radio -->
<!-- BEGIN type_select -->
<!-- select begin -->
<!-- BEGIN each_default_option -->
<tr>
<td><b>{DOPTION_NAME_VAL}</b> <i>{DOPTION_DESCRIPTION}</i></td>
<td>
<input type="hidden" name="{DOPTION_NAME}" value="{DOPTION_NAME_VAL}" />
<select name="{DOPTION_VALUE}">
<!-- BEGIN each_default_choice -->
<!-- BEGIN each_default_selected -->
<option value="{DOPTION_VALUE_VAL}" selected=SELECTED>{DOPTION_VALUE_LABEL}</option>
<!-- END each_default_selected -->
<!-- BEGIN each_default_notselected -->
<option value="{DOPTION_VALUE_VAL}">{DOPTION_VALUE_LABEL}</option>
<!-- END each_default_notselected -->
<!-- END each_default_choice -->
</select>
</td>
</tr>
<tr>
<td colspan="2">
<br />
</td>
</tr>
<!-- END each_default_option -->
<!-- BEGIN each_option -->
<tr>
<td><input type="text" name="{OPTION_NAME}" value="{OPTION_NAME_VAL}" size="15" /></td>
<td><input type="text" name="{OPTION_VALUE}" value="{OPTION_VALUE_VAL}" size="20" /></td>
</tr>
<!-- END each_option -->
<!-- select end -->
<!-- END type_select -->
<!-- optionTypes.tpl -->
|
|
From: Joe S. <joe...@us...> - 2003-04-14 17:45:23
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basic
In directory sc8-pr-cvs1:/tmp/cvs-serv7863/phpslash-ft/public_html/templates/en/basic
Added Files:
optionTypes.tpl
Log Message:
displayOptions rewritten to be able to display different option types.
--- NEW FILE: optionTypes.tpl ---
<!-- optionTypes.tpl -->
<!-- BEGIN type_text -->
<!-- text field begin -->
<!-- BEGIN each_default_option -->
<tr>
<td class="descr"><input type="hidden" name="{DOPTION_NAME}" value="{DOPTION_NAME_VAL}" size="15" />{DOPTION_NAME_VAL}</td>
<td class="descr"><input type="text" name="{DOPTION_VALUE}" value="{DOPTION_VALUE_VAL}" size="20" /></td>
</tr>
<!-- END each_default_option -->
<!-- BEGIN each_option -->
<tr>
<td class="descr"><input type="text" name="{OPTION_NAME}" value="{OPTION_NAME_VAL}" size="15" /></td>
<td class="descr"><input type="text" name="{OPTION_VALUE}" value="{OPTION_VALUE_VAL}" size="20" /></td>
</tr>
<!-- END each_option -->
<!-- text field end -->
<!-- END type_text -->
<!-- BEGIN type_radio -->
<!-- radio begin -->
<!-- BEGIN each_default_option -->
<tr>
<td class="descr"><b>{DOPTION_NAME_VAL}</b> <i>{DOPTION_DESCRIPTION}</i></td>
<td>
<input type="hidden" name="{DOPTION_NAME}" value="{DOPTION_NAME_VAL}" />
<!-- BEGIN each_default_choice -->
<!-- BEGIN each_default_selected -->
<input type="radio" checked=CHECKED name="{DOPTION_VALUE}" value="{DOPTION_VALUE_VAL}" />{DOPTION_VALUE_LABEL}<br />
<!-- END each_default_selected -->
<!-- BEGIN each_default_notselected -->
<input type="radio" name="{DOPTION_VALUE}" value="{DOPTION_VALUE_VAL}" />{DOPTION_VALUE_LABEL}<br />
<!-- END each_default_notselected -->
<!-- END each_default_choice -->
</td>
</tr>
<tr>
<td colspan="2">
<br />
</td>
</tr>
<!-- END each_default_option -->
<!-- BEGIN each_option -->
<tr>
<td class="descr"><input type="text" name="{OPTION_NAME}" value="{OPTION_NAME_VAL}" size="15" /></td>
<td class="descr"><input type="text" name="{OPTION_VALUE}" value="{OPTION_VALUE_VAL}" size="20" /></td>
</tr>
<!-- END each_option -->
<!-- radio end -->
<!-- END type_radio -->
<!-- BEGIN type_select -->
<!-- select begin -->
<!-- BEGIN each_default_option -->
<tr>
<td class="descr"><b>{DOPTION_NAME_VAL}</b> <i>{DOPTION_DESCRIPTION}</i></td>
<td>
<input type="hidden" name="{DOPTION_NAME}" value="{DOPTION_NAME_VAL}" />
<select name="{DOPTION_VALUE}">
<!-- BEGIN each_default_choice -->
<!-- BEGIN each_default_selected -->
<option value="{DOPTION_VALUE_VAL}" selected=SELECTED>{DOPTION_VALUE_LABEL}</option>
<!-- END each_default_selected -->
<!-- BEGIN each_default_notselected -->
<option value="{DOPTION_VALUE_VAL}">{DOPTION_VALUE_LABEL}</option>
<!-- END each_default_notselected -->
<!-- END each_default_choice -->
</select>
</td>
</tr>
<tr>
<td colspan="2">
<br />
</td>
</tr>
<!-- END each_default_option -->
<!-- BEGIN each_option -->
<tr>
<td class="descr"><input type="text" name="{OPTION_NAME}" value="{OPTION_NAME_VAL}" size="15" /></td>
<td class="descr"><input type="text" name="{OPTION_VALUE}" value="{OPTION_VALUE_VAL}" size="20" /></td>
</tr>
<!-- END each_option -->
<!-- select end -->
<!-- END type_select -->
<!-- optionTypes.tpl -->
|
|
From: Joe S. <joe...@us...> - 2003-04-14 17:43:34
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basic
In directory sc8-pr-cvs1:/tmp/cvs-serv6703/phpslash-ft/public_html/templates/en/basic
Modified Files:
authorNew.tpl authorProfile.tpl blockEdit.tpl sectionNew.tpl
storyNew.tpl
Log Message:
displayOptions rewritten to be able to display different option types.
Index: authorNew.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basic/authorNew.tpl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** authorNew.tpl 12 Nov 2002 17:08:16 -0000 1.9
--- authorNew.tpl 14 Apr 2003 17:42:58 -0000 1.10
***************
*** 32,47 ****
<td><input type="password" name="password" value="{PASSWORD}" size="10" /></td>
</tr>
! <!-- BEGIN each_default_option -->
! <tr>
! <td class="descr"><input type="hidden" name="{DOPTION_NAME}" value="{DOPTION_NAME_VAL}" size="15" />{DOPTION_NAME_VAL}</td>
! <td class="text"><input type="text" name="{DOPTION_VALUE}" value="{DOPTION_VALUE_VAL}" size="20" /></td>
! </tr>
! <!-- END each_default_option -->
! <!-- BEGIN each_option -->
! <tr>
! <td class="descr"><input type="text" name="{OPTION_NAME}" value="{OPTION_NAME_VAL}" size="15" /></td>
! <td class="descr"><input type="text" name="{OPTION_VALUE}" value="{OPTION_VALUE_VAL}" size="20" /></td>
! </tr>
! <!-- END each_option -->
<tr>
<td class="descr">Security <span class="must">*</span></td>
--- 32,36 ----
<td><input type="password" name="password" value="{PASSWORD}" size="10" /></td>
</tr>
! {OPTIONS}
<tr>
<td class="descr">Security <span class="must">*</span></td>
Index: authorProfile.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basic/authorProfile.tpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** authorProfile.tpl 4 Dec 2002 19:51:25 -0000 1.7
--- authorProfile.tpl 14 Apr 2003 17:42:59 -0000 1.8
***************
*** 32,43 ****
<td><input type="password" name="password" value="{PASSWORD}" size="10" /></td>
</tr>
! <!-- BEGIN each_default_option -->
! <tr>
! <td class="descr"><input type="hidden" name="{DOPTION_NAME}" value="{DOPTION_NAME_VAL}" size="15" />{DOPTION_NAME_VAL}</td>
! <td class="descr"><input type="text" name="{DOPTION_VALUE}" value="{DOPTION_VALUE_VAL}" size="20" /></td>
! <!-- END each_default_option -->
! <!-- BEGIN each_option -->
! <!-- END each_option -->
! </tr>
<tr>
<td colspan="2">
--- 32,36 ----
<td><input type="password" name="password" value="{PASSWORD}" size="10" /></td>
</tr>
! {OPTIONS}
<tr>
<td colspan="2">
Index: blockEdit.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basic/blockEdit.tpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** blockEdit.tpl 13 Jun 2002 20:18:04 -0000 1.5
--- blockEdit.tpl 14 Apr 2003 17:42:59 -0000 1.6
***************
*** 73,92 ****
<td class="descr">Variable Value</td>
</tr>
! <!-- BEGIN each_default_option -->
! <tr>
! <td class="descr"><input type="hidden" name="{DOPTION_NAME}" value="{DOPTION_NAME_VAL}" size="15" />{DOPTION_NAME_VAL}</td>
! <td class="text"><input type="text" name="{DOPTION_VALUE}" value="{DOPTION_VALUE_VAL}" size="20" /></td>
! </tr>
! <!-- END each_default_option -->
! <!-- BEGIN each_option -->
! <tr>
! <td>
! <input type="text" name="{OPTION_NAME}" value="{OPTION_NAME_VAL}" size="20" />
! </td>
! <td>
! <input type="text" name="{OPTION_VALUE}" value="{OPTION_VALUE_VAL}" size="20" />
! </td>
! </tr>
! <!-- END each_option -->
<tr>
<td> </td>
--- 73,77 ----
<td class="descr">Variable Value</td>
</tr>
! {OPTIONS}
<tr>
<td> </td>
Index: sectionNew.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basic/sectionNew.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** sectionNew.tpl 7 Aug 2002 19:30:18 -0000 1.4
--- sectionNew.tpl 14 Apr 2003 17:42:59 -0000 1.5
***************
*** 15,30 ****
</td>
</tr>
! <!-- BEGIN each_default_option -->
! <tr>
! <td class="descr"><input type="hidden" name="{DOPTION_NAME}" value="{DOPTION_NAME_VAL}" size="15" />{DOPTION_NAME_VAL}</td>
! <td class="text"><input type="text" name="{DOPTION_VALUE}" value="{DOPTION_VALUE_VAL}" size="20" /></td>
! </tr>
! <!-- END each_default_option -->
! <!-- BEGIN each_option -->
! <tr>
! <td class="descr"><input type="text" name="{OPTION_NAME}" value="{OPTION_NAME_VAL}" size="15" /></td>
! <td class="descr"><input type="text" name="{OPTION_VALUE}" value="{OPTION_VALUE_VAL}" size="20" /></td>
! <!-- END each_option -->
!
<tr>
<td> </td>
--- 15,19 ----
</td>
</tr>
! {OPTIONS}
<tr>
<td> </td>
Index: storyNew.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basic/storyNew.tpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** storyNew.tpl 11 Oct 2002 19:32:02 -0000 1.7
--- storyNew.tpl 14 Apr 2003 17:42:59 -0000 1.8
***************
*** 112,127 ****
</td>
</tr>
! <!-- BEGIN each_default_option -->
! <tr>
! <td class="descr"><input type="hidden" name="{DOPTION_NAME}" value="{DOPTION_NAME_VAL}" size="15" />{DOPTION_NAME_VAL}</td>
! <td class="descr"><input type="text" name="{DOPTION_VALUE}" value="{DOPTION_VALUE_VAL}" size="20" /></td>
! </tr>
! <!-- END each_default_option -->
! <!-- BEGIN each_option -->
! <tr>
! <td class="descr"><input type="text" name="{OPTION_NAME}" value="{OPTION_NAME_VAL}" size="15" /></td>
! <td class="descr"><input type="text" name="{OPTION_VALUE}" value="{OPTION_VALUE_VAL}" size="20" /></td>
! <!-- END each_option -->
!
<tr>
<td> </td>
--- 112,116 ----
</td>
</tr>
! {OPTIONS}
<tr>
<td> </td>
|
|
From: Joe S. <joe...@us...> - 2003-04-14 17:43:33
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory sc8-pr-cvs1:/tmp/cvs-serv6703/phpslash-ft/class
Modified Files:
Author.class Block_admin.class Section.class Story_admin.class
functions.inc
Log Message:
displayOptions rewritten to be able to display different option types.
Index: Author.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Author.class,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** Author.class 26 Mar 2003 18:14:37 -0000 1.46
--- Author.class 14 Apr 2003 17:42:55 -0000 1.47
***************
*** 574,578 ****
}
! $this->author_templ = displayoptions('author', $this->author_templ, "newauthor", '');
return $this->author_templ->parse('OUT',array("newauthor"));
--- 574,579 ----
}
! $options = displayOptions('author', $this->author_templ, "newauthor", '');
! $this->author_templ->set_var('OPTIONS', $options);
return $this->author_templ->parse('OUT',array("newauthor"));
***************
*** 748,752 ****
}
}
! $this->author_templ = displayoptions('author', $this->author_templ, 'template', $temparray);
return $this->author_templ->parse('OUT','template');
--- 749,755 ----
}
}
! $options = displayOptions('author', $this->author_templ, 'template', $temparray);
! $this->author_templ->set_var('OPTIONS', $options);
!
return $this->author_templ->parse('OUT','template');
***************
*** 836,840 ****
$q = "SELECT DISTINCT author_id, author_name
FROM psl_author ";
! if ( !$ary['mode'] == "all") {
$q .= ", psl_story
WHERE psl_story.user_id = psl_author.author_id ";
--- 839,845 ----
$q = "SELECT DISTINCT author_id, author_name
FROM psl_author ";
! if ( !is_array($ary) ||
! !array_key_exists('mode', $ary) ||
! (!$ary['mode'] == "all")) {
$q .= ", psl_story
WHERE psl_story.user_id = psl_author.author_id ";
Index: Block_admin.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_admin.class,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Block_admin.class 27 Mar 2003 15:03:23 -0000 1.10
--- Block_admin.class 14 Apr 2003 17:42:56 -0000 1.11
***************
*** 82,85 ****
--- 82,88 ----
}
+ // get default options
+ $options = displayOptions('block', $this->templ, "newblock", '');
+
/* display a blank form */
$this->templ->set_var(array(
***************
*** 92,99 ****
'CACHE_DATA' => "",
'BLOCK_ID' => "",
! 'ORDERNUM' => ""
));
- $this->templ = displayoptions('block', $this->templ, "newblock", '');
return $this->templ->parse('OUT',array("newblock"));
--- 95,102 ----
'CACHE_DATA' => "",
'BLOCK_ID' => "",
! 'ORDERNUM' => "",
! 'OPTIONS' => $options
));
return $this->templ->parse('OUT',array("newblock"));
***************
*** 111,114 ****
--- 114,119 ----
function editBlock($id) {
+ $section_ary = array();
+
$this->getBlock($id);
***************
*** 173,177 ****
reset($temparray);
}
!
$this->templ->set_var(array(
'TITLEBAR' => getTitlebar("100%", "Update a Block"),
--- 178,185 ----
reset($temparray);
}
!
! // get default and saved options
! $options = displayOptions('block', $this->templ, "editblock", $temparray);
!
$this->templ->set_var(array(
'TITLEBAR' => getTitlebar("100%", "Update a Block"),
***************
*** 183,190 ****
'CACHE_DATA' => $this->block_info["cache_data"],
'ORDERNUM' => $this->block_info["ordernum"],
! 'BLOCK_ID' => $id
));
-
- $this->templ = displayoptions('block', $this->templ, "editblock", $temparray);
$output = $this->templ->parse('OUT',array("editblock"));
--- 191,197 ----
'CACHE_DATA' => $this->block_info["cache_data"],
'ORDERNUM' => $this->block_info["ordernum"],
! 'BLOCK_ID' => $id,
! 'OPTIONS' => $options
));
$output = $this->templ->parse('OUT',array("editblock"));
Index: Section.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Section.class,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Section.class 23 Jan 2003 02:48:03 -0000 1.14
--- Section.class 14 Apr 2003 17:42:57 -0000 1.15
***************
*** 225,229 ****
$this->sec_templ->set_var(array(
! 'TITLEBAR' => getTitlebar("100%","New Section"),
'ACTION_URL' => $this->psl['phpself'],
'SECTION_NAME' => "",
--- 225,229 ----
$this->sec_templ->set_var(array(
! 'TITLEBAR' => getTitlebar("100%","New Section"),
'ACTION_URL' => $this->psl['phpself'],
'SECTION_NAME' => "",
***************
*** 231,241 ****
));
! $this->sec_templ = displayoptions('section', $this->sec_templ, "newsection", '');
} else {
! $q = "SELECT *
FROM psl_section
! WHERE section_id = '$ary[section_id]'";
$this->db->query($q);
$this->db->next_record();
--- 231,242 ----
));
! $options = displayOptions('section', $this->sec_templ, "newsection", '');
+
} else {
! $q = "SELECT *
FROM psl_section
! WHERE section_id = '$ary[section_id]'";
$this->db->query($q);
$this->db->next_record();
***************
*** 243,248 ****
$this->sec_templ->set_block("newsection","each_option", "options");
! $this->sec_templ->set_var(array(
! 'TITLEBAR' => getTitlebar("100%","Edit Section"),
'SECTION_ID' => $this->db->Record['section_id'],
'SECTION_NAME' => $this->db->Record['section_name'],
--- 244,249 ----
$this->sec_templ->set_block("newsection","each_option", "options");
! $this->sec_templ->set_var(array(
! 'TITLEBAR' => getTitlebar("100%","Edit Section"),
'SECTION_ID' => $this->db->Record['section_id'],
'SECTION_NAME' => $this->db->Record['section_name'],
***************
*** 250,260 ****
));
! // options
! $temparray = unserialize($this->db->Record['section_options']);
if (is_array($temparray)) {
reset($temparray);
}
! $this->sec_templ = displayoptions('section', $this->sec_templ, "newsection", $temparray);
}
--- 251,262 ----
));
! // options
! $temparray = unserialize($this->db->Record['section_options']);
if (is_array($temparray)) {
reset($temparray);
}
! $options = displayOptions('section', $this->sec_templ, "newsection", $temparray);
! $this->sec_templ->set_var('OPTIONS', $options);
}
Index: Story_admin.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Story_admin.class,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Story_admin.class 11 Apr 2003 16:06:10 -0000 1.17
--- Story_admin.class 14 Apr 2003 17:42:58 -0000 1.18
***************
*** 694,698 ****
}
! $this->template = displayOptions('story', $this->template, "newstory", '');
if ($ary['content'] == "plain") {
--- 694,699 ----
}
! $options = displayOptions('story', $this->template, "newstory", '');
! $this->template->set_var('OPTIONS', $options);
if ($ary['content'] == "plain") {
***************
*** 965,969 ****
}
}
! $this->template = displayOptions('story', $this->template, "newstory", $temparray);
$description = sprintf( "%s (%s) added new story %s as userid %s", $this->auth->auth['uname'], $this->auth->auth['uid'], $story_id, $user_id);
logwrite("Story Admin", $description);
--- 966,972 ----
}
}
! $options = displayOptions('story', $this->template, "newstory", '');
! $this->template->set_var('OPTIONS', $options);
!
$description = sprintf( "%s (%s) added new story %s as userid %s", $this->auth->auth['uname'], $this->auth->auth['uid'], $story_id, $user_id);
logwrite("Story Admin", $description);
Index: functions.inc
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/functions.inc,v
retrieving revision 1.141
retrieving revision 1.142
diff -C2 -d -r1.141 -r1.142
*** functions.inc 9 Apr 2003 15:52:00 -0000 1.141
--- functions.inc 14 Apr 2003 17:42:58 -0000 1.142
***************
*** 844,849 ****
$template->set_var(array(
'DELIMETER' => $delimeter,
! 'LINK' => "?author_id=" . $ary[author_id] . $section_link . $topic_link,
! 'NAME' => $ary[author]
));
$template->parse ("crumb_block", "each_crumb", true);
--- 844,849 ----
$template->set_var(array(
'DELIMETER' => $delimeter,
! 'LINK' => "?author_id=" . $ary['author_id'] . $section_link . $topic_link,
! 'NAME' => $ary['author']
));
$template->parse ("crumb_block", "each_crumb", true);
***************
*** 1125,1129 ****
$_PSL['lang'] = basename($new_lang);
}
! } elseif( $_SERVER['HTTP_ACCEPT_LANGUAGE']) { // else try to get from browser
$lang_ary = split( "[,;]", $_SERVER['HTTP_ACCEPT_LANGUAGE']);
$i = 0;
--- 1125,1129 ----
$_PSL['lang'] = basename($new_lang);
}
! } elseif( array_key_exists('HTTP_ACCEPT_LANGUAGE', $_SERVER)) { // else try to get from browser
$lang_ary = split( "[,;]", $_SERVER['HTTP_ACCEPT_LANGUAGE']);
$i = 0;
***************
*** 1185,1189 ****
$templatedir = $templatedir . "/" . basename($new_lang);
}
! } elseif( $_SERVER['HTTP_ACCEPT_LANGUAGE']) { // else attempt to get from browser
$lang_ary = explode( ",", $_SERVER['HTTP_ACCEPT_LANGUAGE']);
$i = 0;
--- 1185,1189 ----
$templatedir = $templatedir . "/" . basename($new_lang);
}
! } elseif( array_key_exists('HTTP_ACCEPT_LANGUAGE',$_SERVER)) { // else attempt to get from browser
$lang_ary = explode( ",", $_SERVER['HTTP_ACCEPT_LANGUAGE']);
$i = 0;
***************
*** 1576,1622 ****
* @return tpl_object
*/
! function displayOptions($module, $tpl_object, $template, $options_ary) {
global $_PSL;
$default_options = "default_".$module."_options";
$optioncount = $module."_optioncount";
$optioncnt = 0;
if(count($options_ary) == 0) {
$options_ary = '';
}
!
if(!empty($_PSL[$default_options])) {
$optioncnt = count($_PSL[$default_options]);
}
! $tpl_object->set_block($template,"each_default_option", "doptions");
for ($i =0; $i < $optioncnt; $i++) {
if(is_array($options_ary)) {
reset($options_ary);
}
$dname = $_PSL[$default_options][$i]['name'];
$dvalue = $_PSL[$default_options][$i]['value'];
if(is_array($options_ary) && array_key_exists($dname, $options_ary)) {
$dvalue = $options_ary[$dname];
- $tpl_object->set_var(array(
- 'DOPTION_NAME' => "optionname[]",
- 'DOPTION_NAME_VAL' => $dname,
- 'DOPTION_VALUE' => "optionval[]",
- 'DOPTION_VALUE_VAL' => $dvalue
- ));
- unset($options_ary[$dname]);
- } else {
- $tpl_object->set_var(array(
- 'DOPTION_NAME' => "optionname[]",
- 'DOPTION_NAME_VAL' => $dname,
- 'DOPTION_VALUE' => "optionval[]",
- 'DOPTION_VALUE_VAL' => $dvalue
- ));
}
$tpl_object->parse("doptions", "each_default_option", true);
- }
! $tpl_object->set_block($template,"each_option", "options");
if (is_array($options_ary)) {
reset($options_ary);
--- 1576,1707 ----
* @return tpl_object
*/
!
! function displayOptions($module, $tpl_object='', $template='', $options_ary) {
global $_PSL;
+ $_PSL['debug'] = true;
+
+ if(!is_object($tpl_object)) {
+ $tpl_object = pslNew('slashTemplate');
+ }
+ // $tpl_object->debug = 7;
+ // set options template
+ $tpl_object->set_file('optionfile', 'optionTypes.tpl');
+
+ // which module's options?
$default_options = "default_".$module."_options";
$optioncount = $module."_optioncount";
$optioncnt = 0;
+ // available default option types
+ $dtype_ary = array( 'text',
+ 'radio',
+ 'select');
+
+ // initialize array and count
if(count($options_ary) == 0) {
$options_ary = '';
}
!
if(!empty($_PSL[$default_options])) {
$optioncnt = count($_PSL[$default_options]);
+ // debug("optioncnt", $optioncnt);
}
!
! // set default option type blocks
! foreach($dtype_ary as $key) {
! $tpl_object->set_block('optionfile',"type_".$key, "option".$key);
! // debug("set_block", "type_".$key);
! // debug("set_block", "option".$key);
!
! }
!
! // process default options
for ($i =0; $i < $optioncnt; $i++) {
+
+
if(is_array($options_ary)) {
reset($options_ary);
}
+
+ // get data from default option array
$dname = $_PSL[$default_options][$i]['name'];
+ $ddescription = $_PSL[$default_options][$i]['description'];
$dvalue = $_PSL[$default_options][$i]['value'];
+ $dtype = $_PSL[$default_options][$i]['type'];
+ $dchoices = '';
+ // debug("default_option", $_PSL[$default_options][$i]);
+ if(array_key_exists('choices', $_PSL[$default_options][$i])) {
+ $dchoices = $_PSL[$default_options][$i]['choices'];
+ }
+ // debug("varvals", $tpl_object->varvals);
+ // debug("varkeys", $tpl_object->varkeys);
+
+ // debug("get_var", "option".$dtype);
+ $thistype = $tpl_object->get_var("type_".$dtype);
+ // debug("thistype", $thistype);
+ $tpl_object->set_var("optiontype", $thistype);
+ // $tpl_object->varvals['optiontype'] = $thistype;
+ // debug('optiontype',$tpl_object->varvals['optiontype'] );
+ // set html form blocks
+ $tpl_object->set_block('optiontype',"each_default_selected", "dselected");
+ $tpl_object->set_block('optiontype',"each_default_notselected", "dnotselected");
+ $tpl_object->set_block('optiontype',"each_default_choice", "dchoices");
+ $tpl_object->set_block('optiontype',"each_default_option", "doptions");
+
+ // is there a saved value for this option?
if(is_array($options_ary) && array_key_exists($dname, $options_ary)) {
+ // yes - load the saved value
$dvalue = $options_ary[$dname];
}
+ // debug("dvalue", $dvalue);
+ $tpl_object->set_var(array(
+ 'DOPTION_NAME' => "optionname[]",
+ 'DOPTION_NAME_VAL' => $dname,
+ 'DOPTION_DESCRIPTION' => pslgetText($ddescription)
+ ));
+
+ // option choices
+ if(is_array($dchoices)) {
+ // choices available
+ reset($dchoices);
+ foreach($dchoices as $key => $value) {
+ $tpl_object->set_var(array(
+ 'DOPTION_VALUE' => "optionval[]",
+ 'DOPTION_VALUE_VAL' => $key,
+ 'DOPTION_VALUE_LABEL' => $value
+ ));
+ // selected or not
+ if($dvalue == $key ) {
+ $tpl_object->parse("dchoices", "each_default_selected", true);
+ } else {
+ $tpl_object->parse("dchoices", "each_default_notselected", true);
+ }
+ $tpl_object->parse("dchoices", "each_default_choice", true);
+ }
+ } else {
+ // no choices
+ $tpl_object->set_var(array(
+ 'DOPTION_VALUE' => "optionval[]",
+ 'DOPTION_VALUE_VAL' => $dvalue
+ ));
+ }
+ if(is_array($options_ary) && array_key_exists($dname, $options_ary)) {
+ // option processed - remove it from queue.
+ // debug("unset", $dname);
+ unset($options_ary[$dname]);
+ }
+ // debug("parse", $dname);
$tpl_object->parse("doptions", "each_default_option", true);
! $tpl_object->set_var(array(
! 'selected' => '',
! 'notselected' => '',
! 'dchoices' => ''
! ));
! }
!
! $tpl_object->set_block('optiontype',"each_option", "options");
if (is_array($options_ary)) {
reset($options_ary);
***************
*** 1657,1662 ****
$i++;
}
! return $tpl_object;
} // end of function displayOptions
--- 1742,1749 ----
$i++;
}
+
+ $options = $tpl_object->parse('OUT', "optiontype");
! return $options;
} // end of function displayOptions
|
|
From: Joe S. <joe...@us...> - 2003-04-14 17:43:30
|
Update of /cvsroot/phpslash/phpslash-ft/doc/html
In directory sc8-pr-cvs1:/tmp/cvs-serv6703/phpslash-ft/doc/html
Modified Files:
phpslash.sgml
Log Message:
displayOptions rewritten to be able to display different option types.
Index: phpslash.sgml
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/doc/html/phpslash.sgml,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -d -r1.73 -r1.74
*** phpslash.sgml 11 Apr 2003 16:06:12 -0000 1.73
--- phpslash.sgml 14 Apr 2003 17:42:54 -0000 1.74
***************
*** 966,974 ****
--- 966,979 ----
<tscreen><code>
+ authorNew.tpl
+ authorProfile.tpl
+ blockEdit.tpl
fmblock.tpl
loginblock.tpl
loginformCR.tpl
searchPage.tpl
+ sectionNew.tpl
storyList.tpl
+ storyNew.tpl
</code></tscreen>
|
|
From: Joe S. <joe...@us...> - 2003-04-14 17:43:27
|
Update of /cvsroot/phpslash/phpslash-ft/public_html
In directory sc8-pr-cvs1:/tmp/cvs-serv6703/phpslash-ft/public_html
Modified Files:
config-dist.php3
Log Message:
displayOptions rewritten to be able to display different option types.
Index: config-dist.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/config-dist.php3,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** config-dist.php3 9 Apr 2003 14:48:08 -0000 1.46
--- config-dist.php3 14 Apr 2003 17:42:51 -0000 1.47
***************
*** 668,681 ****
* default options legend:
*
! * name - option name. This option will always be available to the admin.
* value - option value. This value will be displayed for the option. The
* admin can assign a new value.
! *
* To add default option items, add a complete entry below.
*/
$default_block_options[] = array(
'name' => "column",
! 'value' => ""
);
$_PSL['default_block_options'] = $default_block_options;
--- 668,710 ----
* default options legend:
*
! * name - option name. This option will always be available to the admin.
! * description - optional text explanation.
* value - option value. This value will be displayed for the option. The
* admin can assign a new value.
! * type - type of form input - text, radio, or select.
! * choices - for radio or select form entry, defines
* To add default option items, add a complete entry below.
*/
$default_block_options[] = array(
'name' => "column",
! 'description' => " - main content column is named center",
! 'value' => "right",
! 'type' => "radio",
! 'choices' => array('left' => 'left',
! 'right' => 'right',
! 'center' => 'center'));
!
! $default_block_options[] = array(
! 'name' => "width",
! 'description' => "",
! 'value' => "",
! 'type' => "select",
! 'choices' => array('' => 'Default(100%)',
! '160' => '160',
! '210' => '210',
! '100%' => '100%')
);
+ /*
+ $default_block_options[] = array(
+ 'name' => "box_type",
+ 'description' => "",
+ 'value' => "",
+ 'type' => "select",
+ 'choices' => array('' => 'Default(fancy)',
+ 'open' => 'Open',
+ 'framed' => 'Framed',
+ 'bordered' => 'Bordered')
+ );
+ */
$_PSL['default_block_options'] = $default_block_options;
|
|
From: Joe S. <joe...@us...> - 2003-04-14 17:43:26
|
Update of /cvsroot/phpslash/phpslash-ft In directory sc8-pr-cvs1:/tmp/cvs-serv6703/phpslash-ft Modified Files: CHANGES Log Message: displayOptions rewritten to be able to display different option types. Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.754 retrieving revision 1.755 diff -C2 -d -r1.754 -r1.755 *** CHANGES 11 Apr 2003 17:16:06 -0000 1.754 --- CHANGES 14 Apr 2003 17:42:49 -0000 1.755 *************** *** 13,16 **** --- 13,24 ---- 9 - Removal of something (kill -9 :) + 2003-April 14 12:00PM CDT Joe Stewart <joe...@us...> + [FT] - functions.inc, Block_admin.class, Story_admin.class, Author.class, + Section.class, optionTypes.tpl, authorNew.tpl, authorProfile.tpl, + blockEdit.tpl, sectionNew.tpl, storyNew.tpl, phpslash.sgml, and + config-dist.php3 - displayOptions rewritten to be able to display + different option types. Option type supported are: text, radio, + and select. + 2003-April 11 10:30AM CDT Joe Stewart <joe...@us...> [BT] - Story_base.class - extractStories accepts order argument correctly. |
|
From: Joe S. <joe...@us...> - 2003-04-14 17:43:06
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default
In directory sc8-pr-cvs1:/tmp/cvs-serv6703/phpslash-ft/public_html/templates/en/default
Modified Files:
authorNew.tpl authorProfile.tpl blockEdit.tpl sectionNew.tpl
storyNew.tpl
Log Message:
displayOptions rewritten to be able to display different option types.
Index: authorNew.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default/authorNew.tpl,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** authorNew.tpl 12 Nov 2002 17:08:16 -0000 1.14
--- authorNew.tpl 14 Apr 2003 17:42:59 -0000 1.15
***************
*** 1,95 ****
! <!-- authorNew.tpl -->
{TITLEBAR}
! <FORM ACTION="{ACTION_URL}" METHOD=POST>
! <TABLE BORDER=0>
! <TR ALIGN=MIDDLE>
! <TD WIDTH=30> </TD>
! <TD> </TD>
! </TR>
! <TR>
! <TD><B>Name</B><FONT COLOR=RED>*</FONT></TD>
! <TD><INPUT type="input" name="author_name" value="{NAME}" SIZE="20"></TD>
! </TR>
! <TR>
! <TD><B>Real Name</B></TD>
! <TD><INPUT type="input" name="author_realname" value="{REALNAME}" SIZE="20"></TD>
! </TR>
! <TR>
! <TD><B>URL</B></TD>
! <TD><INPUT type="input" name="url" value="{URL}" SIZE="15"></TD>
! </TR>
! <TR>
! <TD><B>Email</B></TD>
! <TD><INPUT type="input" name="email" value="{EMAIL}" SIZE="15"></TD>
! </TR>
! <TR>
! <TD><B>Quote</B></TD>
! <TD><INPUT type="input" name="quote" value="{QUOTE}" SIZE="20"></TD>
! </TR>
! <TR>
! <TD><B>Password</B><FONT COLOR=RED>*</FONT></TD>
! <TD><INPUT type="password" name="password" value="{PASSWORD}" SIZE="10"></TD>
! </TR>
! <!-- BEGIN each_default_option -->
! <TR>
! <TD>
! <INPUT TYPE=hidden name={DOPTION_NAME} value="{DOPTION_NAME_VAL}"><B>{DOPTION_NAME_VAL}</B></TD>
! <TD>
! <INPUT TYPE=text name={DOPTION_VALUE} value="{DOPTION_VALUE_VAL}" size=20> </TD>
! </TR>
! <!-- END each_default_option -->
! <!-- BEGIN each_option -->
! <TR>
! <TD>
! <INPUT TYPE=text name={OPTION_NAME} value="{OPTION_NAME_VAL}" size=20>
! </TD>
! <TD>
! <INPUT TYPE=text name={OPTION_VALUE} value="{OPTION_VALUE_VAL}" size=20>
! </TD>
! </TR>
! <!-- END each_option -->
! <TR>
! <TD valign=top><B>Security</B><FONT COLOR=RED>*</FONT></TD>
! <TD valign=top>
<!-- BEGIN perm_row -->
! <input name="permission[{PERM}]" value="{PERM_VALUE}" type=checkbox>{PERM}{GROUP}<br />
<!-- END perm_row -->
<!-- BEGIN permhave_row -->
! <input name="permission[{PERM}]" value="{PERM_VALUE}" type=checkbox checked="checked">{PERM}{GROUP}<br />
<!-- END permhave_row -->
! </TD>
! </TR>
! <TR>
! <TD colspan="2">
<hr>
! </TD>
! </TR>
! <TR>
! <TD></TD>
! <TD><b>- Preferences -</b></TD>
! </TR>
! <TR>
! <TD><b>Language</br></TD>
! <TD>
! <SELECT name="lang">
<!-- BEGIN each_lang -->
! <OPTION value="{LANG}" {LANG_SELECTED}>{LANG}</OPTION>
<!-- END each_lang -->
! </SELECT>
! </TD>
! </TR>
! <TR>
! <TD><b>Skin</br></TD>
! <TD>
! <SELECT name="skin">
<!-- BEGIN each_skin -->
! <OPTION value="{SKIN}" {SKIN_SELECTED}>{SKIN}</OPTION>
<!-- END each_skin -->
! </SELECT>
! </TD>
! </TR>
! </TABLE>
! <INPUT type="hidden" name="author_id" value="{AUTHOR_ID}">
! <INPUT type="submit" name="submit" value="update"><HR>
! </FORM>
! <!-- authorNew.tpl -->
--- 1,86 ----
! <!-- start authorNew.tpl -->
! <div id="authorNew">
{TITLEBAR}
! <form action="{ACTION_URL}" method="post">
! <table border="0">
! <tr>
! <td> </td>
! <td> </td>
! </tr>
! <tr>
! <td class="descr">Name <span class="must">*</span></td>
! <td><input type="text" name="author_name" value="{NAME}" size="20" /></td>
! </tr>
! <tr>
! <td class="descr">Real Name</td>
! <td><input type="text" name="author_realname" value="{REALNAME}" size="20" /></td>
! </tr>
! <tr>
! <td class="descr">URL</td>
! <td><input type="text" name="url" value="{URL}" size="15" /></td>
! </tr>
! <tr>
! <td class="descr">Email</td>
! <td><input type="text" name="email" value="{EMAIL}" size="15" /></td>
! </tr>
! <tr>
! <td class="descr">Quote</td>
! <td><input type="text" name="quote" value="{QUOTE}" size="20" /></td>
! </tr>
! <tr>
! <td class="descr">Password <span class="must">*</span></td>
! <td><input type="password" name="password" value="{PASSWORD}" size="10" /></td>
! </tr>
! {OPTIONS}
! <tr>
! <td class="descr">Security <span class="must">*</span></td>
! <td>
<!-- BEGIN perm_row -->
! <input name="permission[{PERM}]" value="{PERM_VALUE}" type="checkbox" />{PERM}{GROUP}<br />
<!-- END perm_row -->
<!-- BEGIN permhave_row -->
! <input name="permission[{PERM}]" value="{PERM_VALUE}" type="checkbox" checked="checked" />{PERM}{GROUP}<br />
<!-- END permhave_row -->
! </td>
! </tr>
! <tr>
! <td colspan="2">
<hr>
! </td>
! </tr>
! <tr>
! <td></td>
! <td class="descr">- Preferences -</td>
! </tr>
! <tr>
! <td class="descr">Language</td>
! <td>
! <select name="lang">
<!-- BEGIN each_lang -->
! <option value="{LANG}" {LANG_SELECTED}>{LANG}</option>
<!-- END each_lang -->
! </select>
! </td>
! </tr>
! <tr>
! <td class="descr">Skin</td>
! <td>
! <select name="skin">
<!-- BEGIN each_skin -->
! <option value="{SKIN}" {SKIN_SELECTED}>{SKIN}</option>
<!-- END each_skin -->
! </select>
! </td>
! </tr>
! <tr>
! <td colspan="2">
! <hr>
! </td>
! </tr>
! </table>
! <input type="hidden" name="author_id" value="{AUTHOR_ID}" />
! <input type="submit" name="submit" value="update" />
! </form>
! <hr />
! </div> <!-- id="authorNew" -->
! <!-- end authorNew.tpl -->
Index: authorProfile.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default/authorProfile.tpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** authorProfile.tpl 11 Nov 2002 15:35:40 -0000 1.6
--- authorProfile.tpl 14 Apr 2003 17:43:00 -0000 1.7
***************
*** 1,81 ****
! <!-- authorProfile.tpl -->
{TITLEBAR}
! <FORM ACTION="{ACTION_URL}" METHOD=POST>
! <TABLE BORDER=0>
! <TR ALIGN=MIDDLE>
! <TD WIDTH=30> </TD>
! <TD> </TD>
! </TR>
! <TR>
! <TD><B>Name</B><FONT COLOR=RED></FONT></TD>
! <TD><INPUT type="hidden" name="author_name" value="{NAME}" SIZE="20"><b>{NAME}</b></TD>
! </TR>
! <TR>
! <TD><B>Real Name</B></TD>
! <TD><INPUT type="input" name="author_realname" value="{REALNAME}" SIZE="30"></TD>
! </TR>
! <TR>
! <TD><B>URL</B></TD>
! <TD><INPUT type="input" name="url" value="{URL}" SIZE="50"></TD>
! </TR>
! <TR>
! <TD><B>Email</B></TD>
! <TD><INPUT type="input" name="email" value="{EMAIL}" SIZE="50"></TD>
! </TR>
! <TR>
! <TD><B>Quote</B></TD>
! <TD><INPUT type="input" name="quote" value="{QUOTE}" SIZE="50"></TD>
! </TR>
! <TR>
! <TD><B>Password</B><FONT COLOR=RED></FONT></TD>
! <TD><INPUT type="password" name="password" value="{PASSWORD}" SIZE="10"></TD>
! </TR>
! <!-- BEGIN each_default_option -->
! <TR>
! <TD>
! <INPUT TYPE=hidden name={DOPTION_NAME} value="{DOPTION_NAME_VAL}"><B>{DOPTION_NAME_VAL}</B></TD>
! <TD>
! <INPUT TYPE=text name={DOPTION_VALUE} value="{DOPTION_VALUE_VAL}" size=20> </TD>
! </TR>
! <!-- END each_default_option -->
! <!-- BEGIN each_option -->
! <!-- END each_option -->
! </TR>
! <TR>
! <TD colspan="2">
<hr>
! </TD>
! </TR>
! <TR>
! <TD></TD>
! <TD><b>- Preferences -</b></TD>
! </TR>
! <TR>
! <TD><b>Language</br></TD>
! <TD>
! <SELECT name="lang">
<!-- BEGIN each_lang -->
! <OPTION value="{LANG}" {LANG_SELECTED}>{LANG}</OPTION>
<!-- END each_lang -->
! </SELECT>
! </TD>
! </TR>
! <TR>
! <TD><b>Skin</br></TD>
! <TD>
! <SELECT name="skin">
<!-- BEGIN each_skin -->
! <OPTION value="{SKIN}" {SKIN_SELECTED}>{SKIN}</OPTION>
<!-- END each_skin -->
! </SELECT>
! </TD>
! </TR>
! <TR>
! <TD><INPUT type=checkbox name=loggedoutprefs></TD>
! <TD>Use these settings when logged out as well.</TD>
! </TR>
! </TABLE>
! <INPUT type="hidden" name="author_id" value="{AUTHOR_ID}">
! <INPUT type="submit" name="submit" value="update"><HR>
! </FORM>
! <!-- authorProfile.tpl -->
--- 1,79 ----
! <!-- start authorProfile.tpl -->
{TITLEBAR}
! <div id="authorProfile">
! <form action="{ACTION_URL}" method="post">
! <table border="0">
! <tr>
! <td> </td>
! <td> </td>
! </tr>
! <tr>
! <td class="descr">Name <span class="must">*</span></td>
! <td class="descr"><input type="hidden" name="author_name" value="{NAME}" size="20" />{NAME}</td>
! </tr>
! <tr>
! <td class="descr">Real Name</td>
! <td><input type="text" name="author_realname" value="{REALNAME}" size="20" /></td>
! </tr>
! <tr>
! <td class="descr">URL</td>
! <td><input type="text" name="url" value="{URL}" size="15" /></td>
! </tr>
! <tr>
! <td class="descr">Email</td>
! <td><input type="text" name="email" value="{EMAIL}" size="15" /></td>
! </tr>
! <tr>
! <td class="descr">Quote</td>
! <td><input type="text" name="quote" value="{QUOTE}" size="20" /></td>
! </tr>
! <tr>
! <td class="descr">Password <span class="must">*</span></td>
! <td><input type="password" name="password" value="{PASSWORD}" size="10" /></td>
! </tr>
! {OPTIONS}
! <tr>
! <td colspan="2">
<hr>
! </td>
! </tr>
! <tr>
! <td></td>
! <td class="descr">- Preferences -</td>
! </tr>
! <tr>
! <td class="descr">Language</td>
! <td>
! <select name="lang">
<!-- BEGIN each_lang -->
! <option value="{LANG}" {LANG_SELECTED}>{LANG}</option>
<!-- END each_lang -->
! </select>
! </td>
! </tr>
! <tr>
! <td class="descr">Skin</td>
! <td>
! <select name="skin">
<!-- BEGIN each_skin -->
! <option value="{SKIN}" {SKIN_SELECTED}>{SKIN}</option>
<!-- END each_skin -->
! </select>
! </td>
! </tr>
! <tr>
! <td class="descr"><input type=checkbox name=loggedoutprefs></td>
! <td>Use these settings when logged out as well.</td>
! </tr>
! <tr>
! <td colspan="2">
! <hr>
! </td>
! </tr>
! </table>
! <input type="hidden" name="author_id" value="{AUTHOR_ID}" />
! <input type="submit" name="submit" value="update" />
! </form>
! <hr />
! </div> <!-- id="authorProfile" -->
! <!-- end authorProfile.tpl -->
Index: blockEdit.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default/blockEdit.tpl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** blockEdit.tpl 7 Jun 2002 16:25:59 -0000 1.8
--- blockEdit.tpl 14 Apr 2003 17:43:00 -0000 1.9
***************
*** 1,95 ****
! <!-- blockEdit.tpl -->
! {TITLEBAR}
! <FORM ACTION="{ACTION_URL}" METHOD=POST>
! <INPUT TYPE=HIDDEN NAME="block_id" VALUE="{BLOCK_ID}">
! <TABLE BORDER=0>
! <TR>
! <TD>Title:<BR>
! <FONT SIZE=-1>(put a %% or leave blank for the dynamic title.<BR>
! it's only available in <I>special</I> blocks)</FONT></TD>
! <TD><INPUT TYPE=TEXT NAME="block_title" VALUE="{BLOCK_TITLE}"></TD>
! </TR>
!
! <TR>
! <TD>Type:</TD>
! <TD>
! <SELECT NAME=block_type>
! <!-- BEGIN block_type_row -->
! <OPTION VALUE="{BLOCK_TYPE_ID}" {SELECTED}>{BLOCK_TYPE_NAME}</OPTION>
! <!-- END block_type_row -->
! </SELECT>
! </TD>
! </TR>
!
! <TR>
! <TD>Site Location<BR><FONT SIZE=-1>(the 'title' will be linked with this url)</FONT></TD>
! <TD><INPUT TYPE=TEXT NAME="location" VALUE="{LOCATION}"></TD>
! </TR>
!
! <TR>
! <TD>Source URL: <BR><FONT SIZE=-1>(source of data if type is <B>rdf</B> or <B>url</B>)</FONT></TD>
! <TD><INPUT TYPE=TEXT NAME="source_url" VALUE="{SOURCE_URL}"></TD>
! </TR>
!
! <TR>
! <TD>Expire Length:</TD>
! <TD><INPUT TYPE=TEXT NAME="expire_length" VALUE="{EXPIRE_LENGTH}"></TD>
! </TR>
!
! <TR>
! <TD>Owned by Section:</TD>
! <TD>
! <SELECT SIZE=4 MULTIPLE NAME=section_id_ary[]>
! <!-- BEGIN section_row -->
! <OPTION VALUE="{SECTION_ID}" {SELECTED}>{SECTION_NAME}</OPTION>
! <!-- END section_row -->
! </SELECT>
! </TD>
! </TR>
!
! <TR>
! <TD>Data<BR><FONT SIZE=-1>(if type is <B>HTML</B>)</FONT></TD>
! <TD>
! <TEXTAREA NAME="cache_data" cols=60 rows=4>{CACHE_DATA}</TEXTAREA>
! </TD>
! </TR>
!
! <TR>
! <TD>Order Number<BR><FONT SIZE=-1>(the higher number,<BR> the higher position on the page)</FONT></TD>
! <TD>
! <INPUT TYPE=TEXT SIZE=2 NAME="ordernum" VALUE="{ORDERNUM}">
! </TD>
! </TR>
!
! <TR>
! <TD>Options<BR>(Block Specific)</TD>
! </TR>
! <TR>
! <TD> <b>Variable Name</b> </TD>
! <TD> <b>Variable Value</b> </TD>
! </TR>
! <!-- BEGIN each_default_option -->
! <TR>
! <TD>
! <INPUT TYPE=hidden name={DOPTION_NAME} value="{DOPTION_NAME_VAL}"><B>{DOPTION_NAME_VAL}</B></TD>
! <TD>
! <INPUT TYPE=text name={DOPTION_VALUE} value="{DOPTION_VALUE_VAL}" size=20> </TD>
! </TR>
! <!-- END each_default_option -->
! <!-- BEGIN each_option -->
! <TR>
! <TD>
! <INPUT TYPE=text name={OPTION_NAME} value="{OPTION_NAME_VAL}" size=20>
! </TD>
! <TD>
! <INPUT TYPE=text name={OPTION_VALUE} value="{OPTION_VALUE_VAL}" size=20>
! </TD>
! </TR>
! <!-- END each_option -->
! <TR>
! <TD> </TD>
! <TD><INPUT TYPE=SUBMIT NAME="submit" VALUE="update"></TD>
! </TR>
! </TABLE>
! </FORM>
! <!-- blockEdit.tpl -->
--- 1,83 ----
! <!-- start blockEdit.tpl -->
! {TITLEBAR}
! <div id="blockEdit">
! <form action="{ACTION_URL}" method="post">
! <input type="hidden" name="block_id" value="{BLOCK_ID}" />
! <table border="0">
! <tr>
! <td class="descr">
! Title:<br />
! <span class="hint">(put a %% or leave blank for the dynamic title.<br />
! it's only available in <i>special</i> blocks)</span>
! </td>
! <td><input type="text" name="block_title" value="{BLOCK_TITLE}" /></td>
! </tr>
! <tr>
! <td class="descr">Type:</td>
! <td>
! <select name="block_type">
! <!-- BEGIN block_type_row -->
! <option value="{BLOCK_TYPE_ID}" {SELECTED}>{BLOCK_TYPE_NAME}</option>
! <!-- END block_type_row -->
! </select>
! </td>
! </tr>
! <tr>
! <td class="descr">
! Site Location<br />
! <span class="hint">(the 'title' will be linked with this url)</span>
! </td>
! <td><input type="text" name="location" value="{LOCATION}" /></td>
! </tr>
! <tr>
! <td class="descr">
! Source URL: <br />
! <span class="hint">(source of data if type is <b>rdf</b> or <b>url</b>)</span>
! </td>
! <td><input type="text" name="source_url" value="{SOURCE_URL}" /></td>
! </tr>
! <tr>
! <td class="descr">Expire Length:</td>
! <td><input type="text" name="expire_length" value="{EXPIRE_LENGTH}" /></td>
! </tr>
! <tr>
! <td class="descr">Owned by Section:</td>
! <td>
! <select size="4" multiple="multiple" name="section_id_ary[]">
! <!-- BEGIN section_row -->
! <option value="{SECTION_ID}" {SELECTED}>{SECTION_NAME}</option>
! <!-- END section_row -->
! </select>
! </td>
! </tr>
! <tr>
! <td class="descr">Data<br /><span class="hint">(if type is <b>HTML</b>)</span></td>
! <td>
! <textarea name="cache_data" cols="60" rows="4">{CACHE_DATA}</textarea>
! </td>
! </tr>
! <tr>
! <td class="descr">
! Order Number<br />
! <span class="hint">(the higher number, the higher position on the page)</span>
! </td>
! <td>
! <input type="text" size="2" name="ordernum" value="{ORDERNUM}" />
! </td>
! </tr>
! <tr>
! <td colspan="2" class="descr">Options<br /><span class="hint">(Block Specific)</span></td>
! </tr>
! <tr>
! <td class="descr">Variable Name</td>
! <td class="descr">Variable Value</td>
! </tr>
! {OPTIONS}
! <tr>
! <td> </td>
! <td><input type="submit" name="submit" value="update" /></td>
! </tr>
! </table>
! </form>
! </div> <!-- id="blockEdit" -->
! <!-- End blockEdit.tpl -->
Index: sectionNew.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default/sectionNew.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** sectionNew.tpl 14 Jun 2002 20:27:01 -0000 1.4
--- sectionNew.tpl 14 Apr 2003 17:43:00 -0000 1.5
***************
*** 1,41 ****
! <!-- sectionNew.tpl -->
! {TITLEBAR}
! <FORM ACTION="{ACTION_URL}" METHOD=POST>
! <INPUT TYPE=HIDDEN NAME="section_id" VALUE="{SECTION_ID}">
!
! <TABLE BORDER=0>
! <TR>
! <TD>Name</TD>
! <TD><INPUT TYPE=TEXT NAME=section_name VALUE={SECTION_NAME}></TD>
! </TR>
! <TR>
! <TD>Description</TD>
! <TD>
! <TEXTAREA NAME="description" WRAP=PHYSICAL cols=30 rows=4>{SECTION_DESC}</TEXTAREA>
! </TD>
! </TR>
! <!-- BEGIN each_default_option -->
! <TR>
! <TD>
! <INPUT TYPE=hidden name={DOPTION_NAME} value="{DOPTION_NAME_VAL}"><B>{DOPTION_NAME_VAL}</B></TD>
! <TD>
! <INPUT TYPE=text name={DOPTION_VALUE} value="{DOPTION_VALUE_VAL}" size=20> </TD>
! </TR>
! <!-- END each_default_option -->
! <!-- BEGIN each_option -->
! <TR>
! <TD>
! <INPUT TYPE=text name={OPTION_NAME} value="{OPTION_NAME_VAL}" size=20>
! </TD>
! <TD>
! <INPUT TYPE=text name={OPTION_VALUE} value="{OPTION_VALUE_VAL}" size=20>
! </TD>
! </TR>
! <!-- END each_option -->
! <TR>
! <TD> </TD>
! <TD><INPUT TYPE=SUBMIT NAME="submit" VALUE="update"></TD>
! </TR>
! </TABLE>
! </FORM>
! <!-- sectionNew.tpl -->
--- 1,25 ----
! <!-- start sectionNew.tpl -->
! {TITLEBAR}
! <div id="sectionNew">
! <form action="{ACTION_URL}" method="post">
! <input type=hidden name="section_id" value="{SECTION_ID}">
! <table border="0">
! <tr>
! <td class="descr">Name</td>
! <td><input type="text" name="section_name" value="{SECTION_NAME}" /></td>
! </tr>
! <tr>
! <td class="descr">Description</td>
! <td>
! <textarea name="description" wrap="physical" cols="30" rows="4">{SECTION_DESC}</textarea>
! </td>
! </tr>
! {OPTIONS}
! <tr>
! <td> </td>
! <td><input type="submit" name="submit" value="update" /></td>
! </tr>
! </table>
! </form>
! </div> <!-- id="sectionNew" -->
! <!-- end sectionNew.tpl -->
Index: storyNew.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default/storyNew.tpl,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** storyNew.tpl 11 Oct 2002 19:32:02 -0000 1.16
--- storyNew.tpl 14 Apr 2003 17:43:00 -0000 1.17
***************
*** 1,145 ****
! <!-- storyNew.tpl -->
! <FORM ACTION="{ACTION_URL}" METHOD=POST>
! <INPUT TYPE=HIDDEN NAME="story_id" VALUE="{STORY_ID}">
!
! <TABLE CELLPADDING=5 CELLSPACING=0 BORDER=0>
! <TR>
! <TD align="right">Title</TD>
! <TD COLSPAN=3><INPUT type=text name=title value="{TITLE}" size=50></TD>
! </TR>
! <TR>
! <TD align="right">Dept.</TD>
! <TD COLSPAN=3><INPUT type=text name=dept value="{DEPT}" size=50></TD>
! </TR>
! <TR>
! <TD align="right">Topic</TD>
! <TD>
! <SELECT SIZE=4 MULTIPLE NAME=topic_id_ary[]>
! <!-- BEGIN topic_row -->
! <OPTION VALUE="{TOPIC_ID}" {SELECTED}>{TOPIC_NAME}</OPTION>
! <!-- END topic_row -->
! </SELECT>
! </TD>
! <TD align="right">Section</TD>
! <TD>
! <SELECT SIZE=4 MULTIPLE NAME=section_id_ary[]>
! <!-- BEGIN section_row -->
! <OPTION VALUE="{SECTION_ID}" {SELECTED}>{SECTION_NAME}</OPTION>
! <!-- END section_row -->
! </SELECT>
! </TD>
! </TR>
!
! <TR>
! <TD align="right" valign="top">Author</TD>
! <TD valign="top">
! <select name=author_id>
! <!-- BEGIN author_row -->
! <option value="{AUTHOR_ID}" {AUTHOR_SELECTED}>{AUTHOR_NAME}</option>
! <!-- END author_row -->
! </select>
! </TD>
! <TD> </TD>
! <TD> </TD>
! </TR>
!
! <TR>
! <TD align="right">Date</TD>
! <TD>
! <!-- BEGIN datetime_row -->
! <INPUT type=hidden name=datetime value="{TIME}" size=20>{TIME_VALUE}
! <!-- END datetime_row -->
! <!-- BEGIN datetimeset_row -->
! <select name=story_date[]>
! <!-- BEGIN year_row -->
! <option {SELECTED} value="{STORYYEAR}">{STORYYEAR}</option>
! <!-- END year_row -->
! </select>
! -
! <select name=story_date[]>
! <!-- BEGIN month_row -->
! <option {SELECTED}>{STORYMONTH}</option>
! <!-- END month_row -->
! </select>
! -
! <select name=story_date[]>
! <!-- BEGIN day_row -->
! <option {SELECTED}>{STORYDAY}</option>
! <!-- END day_row -->
! </select>
! </TD>
! <TD align="right">Time</TD>
! <TD>
! <select name=story_time[]>
! <!-- BEGIN hour_row -->
! <option {SELECTED}>{STORYHOUR}</option>
! <!-- END hour_row -->
! </select>
! :
! <select name=story_time[]>
! <!-- BEGIN minute_row -->
! <option {SELECTED}>{STORYMINUTE}</option>
! <!-- END minute_row -->
! </select>
! :
! <select name=story_time[]>
! <!-- BEGIN second_row -->
! <option {SELECTED}>{STORYSECOND}</option>
! <!-- END second_row -->
! </select>
! <!-- END datetimeset_row -->
! </TD>
! </TR>
! <TR>
! <TD align="top">Order</TD>
! <TD colspan=3>
! <INPUT type=text name=order_no value="{ORDER_NO}" size=4>
! </TD>
! </TR>
! <TR>
! <TD align="top">Intro Text</TD>
! <TD colspan=3>
! <TEXTAREA NAME="intro_text" WRAP="PHYSICAL" COLS="75" ROWS="10">{INTROTEXT}</TEXTAREA></TD>
! </TR>
! <TR>
! <TD align="top">Body Text</TD>
! <TD colspan=3>
! <TEXTAREA NAME="body_text" WRAP="PHYSICAL" COLS="75" ROWS="10">{BODYTEXT}</TEXTAREA></TD>
! <TR>
! <TD> </TD>
! <TD COLSPAN=3>
! New Story Options: </B>
! <input type=radio {PLAIN_CHKBOX} name=content value="plain"> Plain Text
! <input type=radio {HTML_CHKBOX} name=content value="html"> HTML
! <input type=radio {EXTTRANS_CHKBOX} name=content value="exttrans"> Extended Translation</TD>
! </TR>
!
! <!-- BEGIN each_default_option -->
! <TR>
! <TD>
! <INPUT TYPE=hidden name={DOPTION_NAME} value="{DOPTION_NAME_VAL}">{DOPTION_NAME_VAL}</TD>
! <TD>
! <INPUT TYPE=text name={DOPTION_VALUE} value="{DOPTION_VALUE_VAL}" size=20> </TD>
! </TR>
! <!-- END each_default_option -->
!
! <!-- BEGIN each_option -->
! <TR>
! <TD>
! <INPUT TYPE=text name={OPTION_NAME} value="{OPTION_NAME_VAL}" size=20>
! </TD>
! <TD>
! <INPUT TYPE=text name={OPTION_VALUE} value="{OPTION_VALUE_VAL}" size=20>
! </TD>
! </TR>
! <!-- END each_option -->
!
! <TR>
! <TD> </TD>
! <TD colspan=3>
! <input type="submit" name="submit" value="save">
! <input type="submit" name="submit" value="preview"></TD>
! </TR>
!
! </TABLE>
! <!-- storyNew.tpl -->
--- 1,125 ----
! <!-- storyNew.tpl -->
! <div id="storyNew">
!
! <form action="{ACTION_URL}" method="post">
! <input type="hidden" name="story_id" value="{STORY_ID}" />
! <table cellpadding="5" cellspacing="0" border="0">
! <tr>
! <td class="descr">Title</td>
! <td colspan="3"><input type="text" name="title" value="{TITLE}" size="50" /></td>
! </tr>
! <tr>
! <td class="descr">Dept.</td>
! <td colspan="3"><input type="text" name="dept" value="{DEPT}" size="50" /></td>
! </tr>
! <tr>
! <td class="descr">Topic</td>
! <td>
! <select size="4" multiple="multiple" name="topic_id_ary[]">
! <!-- BEGIN topic_row -->
! <option value="{TOPIC_ID}" {SELECTED}>{TOPIC_NAME}</option>
! <!-- END topic_row -->
! </select>
! </td>
! <td class="descr">Section</td>
! <td>
! <select size="4" multiple="multiple" name="section_id_ary[]">
! <!-- BEGIN section_row -->
! <option value="{SECTION_ID}" {SELECTED}>{SECTION_NAME}</option>
! <!-- END section_row -->
! </select>
! </td>
! </tr>
! <tr>
! <td class="descr">Author</td>
! <td colspan="3">
! <select name="author_id">
! <!-- BEGIN author_row -->
! <option value="{AUTHOR_ID}" {AUTHOR_SELECTED}>{AUTHOR_NAME}</option>
! <!-- END author_row -->
! </select>
! </td>
! </tr>
! <tr>
! <td class="descr">Date</td>
! <td>
! <!-- BEGIN datetime_row -->
! <INPUT type=hidden name=datetime value="{TIME}" size=20>{TIME_VALUE}
! </td>
! <td colspan="2"> </td>
! <!-- END datetime_row -->
! <!-- BEGIN datetimeset_row -->
! <select name=story_date[]>
! <!-- BEGIN year_row -->
! <option {SELECTED} value="{STORYYEAR}">{STORYYEAR}</option>
! <!-- END year_row -->
! </select>
! -
! <select name=story_date[]>
! <!-- BEGIN month_row -->
! <option {SELECTED}>{STORYMONTH}</option>
! <!-- END month_row -->
! </select>
! -
! <select name=story_date[]>
! <!-- BEGIN day_row -->
! <option {SELECTED}>{STORYDAY}</option>
! <!-- END day_row -->
! </select></td>
! <td class="descr">Time</td>
! <td>
! <select name=story_time[]>
! <!-- BEGIN hour_row -->
! <option {SELECTED}>{STORYHOUR}</option>
! <!-- END hour_row -->
! </select>
! :
! <select name=story_time[]>
! <!-- BEGIN minute_row -->
! <option {SELECTED}>{STORYMINUTE}</option>
! <!-- END minute_row -->
! </select>
! :
! <select name=story_time[]>
! <!-- BEGIN second_row -->
! <option {SELECTED}>{STORYSECOND}</option>
! <!-- END second_row -->
! </select>
! <!-- END datetimeset_row -->
! </td>
! </tr>
! <tr>
! <td class="descr">Order</td>
! <td colspan="3">
! <input type="text" name="order_no" value="{ORDER_NO}" size="4">
! </td>
! </tr>
! <tr>
! <td class="descr">Intro Text</td>
! <td colspan="3"><textarea name="intro_text" wrap="physical" cols="75" rows="10">{INTROTEXT}</textarea></td>
! </tr>
! <tr>
! <td class="descr">Body Text</td>
! <td colspan="3"><textarea name="body_text" wrap="physical" cols="75" rows="10">{BODYTEXT}</textarea></td>
! </tr>
! <tr>
! <td> </td>
! <td colspan="3">
! <span class="descr">New Story Options: </span>
! <input type="radio" {PLAIN_CHKBOX} name="content" value="plain" /> Plain Text
! <input type="radio" {HTML_CHKBOX} name="content" value="html" /> HTML
! <input type="radio" {EXTTRANS_CHKBOX} name="content" value="exttrans" /> Extended Translation</p>
! </td>
! </tr>
! {OPTIONS}
! <tr>
! <td> </td>
! <td colspan="3">
! <input type="submit" name="submit" value="save" />
! <input type="submit" name="submit" value="preview" />
! </td>
! </tr>
! </table>
! </form>
! </div> <!-- id="storyNew" -->
! <!-- storyNew.tpl -->
|
|
From: Luis M <le...@us...> - 2003-04-13 00:41:18
|
Update of /cvsroot/phpslash/phpslash-dev/include/locale
In directory sc8-pr-cvs1:/tmp/cvs-serv7620
Modified Files:
es.php
Log Message:
added new strings for 0.7.1RC1
Index: es.php
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/include/locale/es.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** es.php 12 Mar 2003 16:12:51 -0000 1.1.1.1
--- es.php 13 Apr 2003 00:41:14 -0000 1.2
***************
*** 310,314 ****
"Username not found" =>
"Usuario no fue encontrado",
!
"Sorry the user's email address is not valid" =>
"Lo siento, la dirección electrónica no es válida",
--- 310,314 ----
"Username not found" =>
"Usuario no fue encontrado",
!
"Sorry the user's email address is not valid" =>
"Lo siento, la dirección electrónica no es válida",
***************
*** 320,324 ****
"Mensaje electrónico de Confirmación falló",
!
// Block.class
"Block Type: %s added with an id of: %s" =>
--- 320,325 ----
"Mensaje electrónico de Confirmación falló",
! "This username is already taken. Please choose a different one." =>
! "Este usuario ya ha sido usado. Por favor escoge un apodo diferente"
// Block.class
"Block Type: %s added with an id of: %s" =>
***************
*** 686,689 ****
--- 687,693 ----
"¡No pusiste un sujeto al mensaje! Terminando.",
+ "Nothing to send, Halting." =>
+ "Nada para ser enviado, Abortando.",
+
// Navbar.class
"Login" =>
***************
*** 856,860 ****
"Topic bar could not be reorganized" =>
"Barra de Temas no pudo ser reorganizada",
!
// Submission.class
"Anonymous Coward" =>
--- 860,866 ----
"Topic bar could not be reorganized" =>
"Barra de Temas no pudo ser reorganizada",
!
! "story(%s) saved: %s" =>
! "story(%s) grabada: %s",
// Submission.class
"Anonymous Coward" =>
|
|
From: Luis M <le...@us...> - 2003-04-13 00:38:25
|
Update of /cvsroot/phpslash/phpslash-ft/class/locale
In directory sc8-pr-cvs1:/tmp/cvs-serv6771
Modified Files:
es.php3
Log Message:
added new strings for 0.7.1RC1
Index: es.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/locale/es.php3,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** es.php3 4 Feb 2003 16:09:57 -0000 1.2
--- es.php3 13 Apr 2003 00:38:22 -0000 1.3
***************
*** 17,24 ****
$pslstrings = array(
! // about.php
! // article.php
! // backend.php
! // comment.php
"No Subject Given" =>
"Ningún sujeto dado",
--- 17,24 ----
$pslstrings = array(
! // about.php3
! // article.php3
! // backend.php3
! // comment.php3
"No Subject Given" =>
"Ningún sujeto dado",
***************
*** 48,52 ****
"¡Error de comentario!",
! // config.php
"Login" =>
--- 48,52 ----
"¡Error de comentario!",
! // config.php3
"Login" =>
***************
*** 234,238 ****
// sectionAdmin.php3
! // storyAdmin.php
// submissionAdmin.php3
" record deleted" =>
--- 234,238 ----
// sectionAdmin.php3
! // storyAdmin.php3
// submissionAdmin.php3
" record deleted" =>
***************
*** 310,314 ****
"Username not found" =>
"Usuario no fue encontrado",
!
"Sorry the user's email address is not valid" =>
"Lo siento, la dirección electrónica no es válida",
--- 310,314 ----
"Username not found" =>
"Usuario no fue encontrado",
!
"Sorry the user's email address is not valid" =>
"Lo siento, la dirección electrónica no es válida",
***************
*** 320,324 ****
"Mensaje electrónico de Confirmación falló",
!
// Block.class
"Block Type: %s added with an id of: %s" =>
--- 320,325 ----
"Mensaje electrónico de Confirmación falló",
! "This username is already taken. Please choose a different one." =>
! "Este usuario ya ha sido usado. Por favor escoge un apodo diferente"
// Block.class
"Block Type: %s added with an id of: %s" =>
***************
*** 686,689 ****
--- 687,693 ----
"¡No pusiste un sujeto al mensaje! Terminando.",
+ "Nothing to send, Halting." =>
+ "Nada para ser enviado, Abortando.",
+
// Navbar.class
"Login" =>
***************
*** 856,860 ****
"Topic bar could not be reorganized" =>
"Barra de Temas no pudo ser reorganizada",
!
// Submission.class
"Anonymous Coward" =>
--- 860,866 ----
"Topic bar could not be reorganized" =>
"Barra de Temas no pudo ser reorganizada",
!
! "story(%s) saved: %s" =>
! "story(%s) grabada: %s",
// Submission.class
"Anonymous Coward" =>
|
|
From: Joe S. <joe...@us...> - 2003-04-11 17:24:15
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/admin
In directory sc8-pr-cvs1:/tmp/cvs-serv23069/phpslash-ft/public_html/admin
Modified Files:
storyAdmin.php3
Log Message:
extractStories accepts order argument correctly.
Index: storyAdmin.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/admin/storyAdmin.php3,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** storyAdmin.php3 3 Apr 2003 20:08:47 -0000 1.21
--- storyAdmin.php3 11 Apr 2003 17:24:09 -0000 1.22
***************
*** 17,20 ****
--- 17,21 ----
*****************************/
+ $next = '';
if(!empty($HTTP_POST_VARS['submit'])) {
***************
*** 24,28 ****
$submit = clean($HTTP_GET_VARS['submit']);
$story_id = clean($HTTP_GET_VARS['story_id']);
! $next = clean($HTTP_GET_VARS['next']);
$ary = clean($HTTP_GET_VARS);
} else {
--- 25,31 ----
$submit = clean($HTTP_GET_VARS['submit']);
$story_id = clean($HTTP_GET_VARS['story_id']);
! if(array_key_exists('next',$HTTP_GET_VARS)) {
! $next = clean($HTTP_GET_VARS['next']);
! }
$ary = clean($HTTP_GET_VARS);
} else {
***************
*** 171,175 ****
'ROOTDIR' => $_PSL['rooturl'],
'IMAGEDIR' => $_PSL['imageurl'],
! 'BREADCRUMB' => $breadcrumb,
'STORY_COLUMN' => $content,
'LEFT_BLOCK_COLUMN' => $leftblocks,
--- 174,178 ----
'ROOTDIR' => $_PSL['rooturl'],
'IMAGEDIR' => $_PSL['imageurl'],
! // 'BREADCRUMB' => $breadcrumb,
'STORY_COLUMN' => $content,
'LEFT_BLOCK_COLUMN' => $leftblocks,
|
|
From: Joe S. <joe...@us...> - 2003-04-11 17:16:13
|
Update of /cvsroot/phpslash/phpslash-ft In directory sc8-pr-cvs1:/tmp/cvs-serv19828/phpslash-ft Modified Files: CHANGES Log Message: extractStories accepts order argument correctly. Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.753 retrieving revision 1.754 diff -C2 -d -r1.753 -r1.754 *** CHANGES 10 Apr 2003 18:33:24 -0000 1.753 --- CHANGES 11 Apr 2003 17:16:06 -0000 1.754 *************** *** 13,16 **** --- 13,21 ---- 9 - Removal of something (kill -9 :) + 2003-April 11 10:30AM CDT Joe Stewart <joe...@us...> + [BT] - Story_base.class - extractStories accepts order argument correctly. + Story_admin.class, storyList.tpl - story_id in list story. + storyAdmin.php3 - reduce php warnings. + 2003-April 10 1:30PM CDT Joe Stewart <joe...@us...> [F] - slashTemplate.class - new method is_available. Check a template |
|
From: Joe S. <joe...@us...> - 2003-04-11 16:06:45
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory sc8-pr-cvs1:/tmp/cvs-serv17315/phpslash-ft/class
Modified Files:
Story_base.class Story_admin.class Story.class
Log Message:
extractStories accepts order argument correctly.
Index: Story_base.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Story_base.class,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** Story_base.class 26 Mar 2003 18:21:08 -0000 1.25
--- Story_base.class 11 Apr 2003 16:06:09 -0000 1.26
***************
*** 53,56 ****
--- 53,59 ----
function extractStory($story_id, $mode) {
+ $topic_id_ary = array();
+ $topic_name_ary = array();
+
/* Sorry for the big long list, but it's so much easier to read! --ajay */
/* S'all right.. We like ex 2 read :) -n */
***************
*** 131,138 ****
$count = 0;
while ($this->db->next_record()) {
- // $id = $this->db->Record["topic_id"];
- // $ancy = $this->db->Record["topic_name"];
- // echo "I'm in the loop ($count - $id - $ancy)<BR>\n";
-
$topic_id_ary[$count] = $this->db->Record["topic_id"];
$topic_name_ary[$count] = $this->db->Record["topic_name"];
--- 134,137 ----
***************
*** 163,167 ****
* start = "starting" point [0]
* max = maximum returned [10]
! * order = [time], hits, title, etc.
* asc = ASC, [DESC] ( Ascending or Descending)
* query = urlencoded text string
--- 162,166 ----
* start = "starting" point [0]
* max = maximum returned [10]
! * order = [date_available], hits, title, etc.
* asc = ASC, [DESC] ( Ascending or Descending)
* query = urlencoded text string
***************
*** 271,275 ****
break;
! case "author_id":
if( $argv_ary["author"] == "" ) {
$q .= " AND psl_author.author_id = '$argv_ary[author_id]' ";
--- 270,274 ----
break;
! case "author_id":
if( $argv_ary["author"] == "" ) {
$q .= " AND psl_author.author_id = '$argv_ary[author_id]' ";
***************
*** 339,343 ****
if (empty($argv_ary['order']) ) {
! $argv_ary['order'] = "date_available";
}
if (empty($argv_ary['asc']) ) {
--- 338,342 ----
if (empty($argv_ary['order']) ) {
! $argv_ary['order'] = "psl_story.order_no DESC, date_available";
}
if (empty($argv_ary['asc']) ) {
***************
*** 354,358 ****
$q1 = $q;
! $q1 .= "ORDER BY psl_story.order_no DESC, $argv_ary[order] $argv_ary[asc] LIMIT $start, $argv_ary[chunk]";
// debug("Story::extractStories.argv_ary", $argv_ary);
--- 353,357 ----
$q1 = $q;
! $q1 .= "ORDER BY $argv_ary[order] $argv_ary[asc] LIMIT $start, $argv_ary[chunk]";
// debug("Story::extractStories.argv_ary", $argv_ary);
***************
*** 390,413 ****
$count = 0;
/* Put everything into an array and return array */
! $stories_ary[$i]['story_id'] = stripslashes($this->db->Record["story_id"]);
! $stories_ary[$i]['title'] = stripslashes($this->db->Record["title"]);
! $stories_ary[$i]['intro_text'] = stripslashes($this->db->Record["intro_text"]);
! $stories_ary[$i]['body_text'] = stripslashes($this->db->Record["body_text"]);
! $stories_ary[$i]['order_no'] = stripslashes($this->db->Record["order_no"]);
! $stories_ary[$i]['dept'] = stripslashes($this->db->Record["dept"]);
! $stories_ary[$i]['url'] = $this->db->Record["url"];
! // $stories_ary[$i]['name'] = $this->db->Record["author_name"];
! $stories_ary[$i]['name'] = $this->db->Record["author_realname"];
! // $stories_ary[$i]['datef'] = $this->db->Record["dateformat"];
! $stories_ary[$i]['datef'] = psl_dateTimeLong($this->db->Record['timestamp']);
! $stories_ary[$i]['hits'] = $this->db->Record["hits"];
! $stories_ary[$i]['topic_id'] = $this->db->Record["topic_id"];
! $stories_ary[$i]['topic_name'] = $this->db->Record["topic_name"];
! $stories_ary[$i]['image'] = $this->db->Record["image"];
! $stories_ary[$i]['width'] = $this->db->Record["width"];
! $stories_ary[$i]['height'] = $this->db->Record["height"];
! $stories_ary[$i]['alt_text'] = $this->db->Record["alt_text"];
! $stories_ary[$i]['cmtcount'] = $this->db->Record["cmtcount"];
! $stories_ary[$i]['story_options'] = unserialize($this->db->Record["story_options"]);
// debug("Story::extractStories.stories_ary", $stories_ary[$i]);
}
--- 389,416 ----
$count = 0;
/* Put everything into an array and return array */
! foreach($this->db->Record as $key => $value) {
! switch ($key) {
!
! case 'timestamp':
! $stories_ary[$i]['datef'] = psl_dateTimeLong($value);
! break;
! case 'story_options':
! $stories_ary[$i]['story_options'] = unserialize($value);
! break;
! case 'author_realname':
! $stories_ary[$i]['name'] = $value;
! break;
! case 'story_id':
! case 'title':
! case 'intro_text':
! case 'body_text':
! case 'order_no':
! case 'dept':
! $value = stripslashes($value);
! default:
! $stories_ary[$i][$key] = $value;
! break;
! }
! }
// debug("Story::extractStories.stories_ary", $stories_ary[$i]);
}
***************
*** 520,527 ****
// echo "<BR><BR>STORYID: $ary['story_id']<BR><BR>SID: $story_id<BR><BR>\n";
! $optionname_ary = $ary[optionname];
! $optionval_ary = $ary[optionval];
! for( $i=0 ; $i < count($ary[optionname]) ; $i++) {
if( $optionname_ary[$i] != "") {
--- 523,531 ----
// echo "<BR><BR>STORYID: $ary['story_id']<BR><BR>SID: $story_id<BR><BR>\n";
! $optionname_ary = $ary['optionname'];
! $optionval_ary = $ary['optionval'];
! $count = count($ary['optionname']);
! for( $i=0 ; $i < $count ; $i++) {
if( $optionname_ary[$i] != "") {
***************
*** 643,647 ****
$sections_available = array();
$section_q = "SELECT section_id
! FROM psl_section ";
$this->db->query($section_q);
while ($this->db->next_record() ) {
--- 647,651 ----
$sections_available = array();
$section_q = "SELECT section_id
! FROM psl_section ";
$this->db->query($section_q);
while ($this->db->next_record() ) {
***************
*** 698,701 ****
--- 702,711 ----
function cacheStory( $ary, $field="", $story_id="") {
+ $cache = '';
+ $expired = '';
+
+ if(!array_key_exists('update', $ary[$field])) {
+ $ary[$field]['update'] = 0;
+ }
// debug( "Story.class::cacheStory::ary", $ary);
// debug( "Story.class::cacheStory::field", $field);
***************
*** 718,722 ****
while ($each_field = each($ary) ) {
! $field_name = $each_field[key];
/* if there are no "expire" fields greater than zero,
then, we're not using the cache and so don't write to db
--- 728,732 ----
while ($each_field = each($ary) ) {
! $field_name = $each_field['key'];
/* if there are no "expire" fields greater than zero,
then, we're not using the cache and so don't write to db
Index: Story_admin.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Story_admin.class,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Story_admin.class 27 Mar 2003 15:42:23 -0000 1.16
--- Story_admin.class 11 Apr 2003 16:06:10 -0000 1.17
***************
*** 322,328 ****
function listStory($ary, $first) {
! $author_id = $ary['author_id'];
! $topic_id = $ary['topic_id'];
! $section_id = $ary['section_id'];
$cmt_list = 10; /* num of stories to display before the "more" link */
--- 322,338 ----
function listStory($ary, $first) {
! $author_id = '';
! $topic_id = '';
! $section_id = '';
!
! if(array_key_exists('author_id',$ary)) {
! $author_id = $ary['author_id'];
! }
! if(array_key_exists('topic_id',$ary)) {
! $topic_id = $ary['topic_id'];
! }
! if(array_key_exists('section_id',$ary)) {
! $section_id = $ary['section_id'];
! }
$cmt_list = 10; /* num of stories to display before the "more" link */
***************
*** 347,351 ****
AND author.author_id = story.user_id ";
! $user_id = $this->auth->auth[uid];
// if you're not a storyeditor, then you can only view your own stories.
if (!$this->perm->have_perm("storylistothers")) {
--- 357,361 ----
AND author.author_id = story.user_id ";
! $user_id = $this->auth->auth['uid'];
// if you're not a storyeditor, then you can only view your own stories.
if (!$this->perm->have_perm("storylistothers")) {
***************
*** 381,386 ****
$section_array = $section->getSections();
-
-
$this->template->set_block("liststory", "each_author", "authors");
$this->template->set_var(array(
--- 391,394 ----
***************
*** 413,421 ****
while (list(, $cur_Topic) = each($topic_array)) {
$this->template->set_var(array(
! "TOPIC_NAME" => $cur_Topic[name],
! "TOPIC_ID" => $cur_Topic[id],
"SELECTED" => ""
));
! if ($cur_Topic[id] == $topic_id) {
$this->template->set_var(array(
"SELECTED" => "selected=\"selected\""
--- 421,429 ----
while (list(, $cur_Topic) = each($topic_array)) {
$this->template->set_var(array(
! "TOPIC_NAME" => $cur_Topic['name'],
! "TOPIC_ID" => $cur_Topic['id'],
"SELECTED" => ""
));
! if ($cur_Topic['id'] == $topic_id) {
$this->template->set_var(array(
"SELECTED" => "selected=\"selected\""
***************
*** 450,459 ****
}
! $this->template->set_var(array(
! 'ACTION_URL' => $this->psl['phpself'],
! 'TOPIC_SELECT' => $topic_select_html,
! 'SECTION_SELECT' => $section_select_html,
! 'AUTHOR_SELECT' => $author_select_html
! ));
while ($this->db->next_record()) {
--- 458,462 ----
}
! $this->template->set_var('ACTION_URL', $this->psl['phpself']);
while ($this->db->next_record()) {
***************
*** 469,472 ****
--- 472,476 ----
$ok = false;
+ $i = 0;
while ($db2->next_record()) {
// permisssion to any of them?
***************
*** 487,490 ****
--- 491,495 ----
$this->template->set_var(array(
'ORDER_NO' => $this->db->Record["order_no"],
+ 'STORY_ID' => $story_id,
'COUNT' => $count,
'VIEWURL' => $view_url,
***************
*** 539,542 ****
--- 544,564 ----
// echo "<B>Data_Source: $data_source</B><BR><BR>\n";
+ // new story - array is empty
+ if(array_key_exists('submit', $ary) &&
+ $ary['submit'] == 'new') {
+ $ary['story_id'] = '';
+ $ary['order_no'] = '';
+ $ary['dept'] = '';
+ $ary['intro_text'] = '';
+ $ary['body_text'] = '';
+ $ary['title'] = '';
+ $ary['story_date'] = '';
+ $ary['content'] = '';
+ /*$ary['topic_id_ary'] = '';
+ $ary['section_id_ary'] = '';
+ */
+ // $ary['story_options'] = '';
+ }
+
$this->template->set_block("newstory","topic_row","topic_rows");
$this->template->set_block("newstory","section_row","section_rows");
***************
*** 569,577 ****
$ary['body_text'] = clean($ary['body_text']);
$ary['title'] = clean($ary['title']);
! if( $ary['story_date'] ) {
$ary['datetime'] = implode( '-', $ary['story_date']) ." ". implode( ':',$ary['story_time']);
! } else {
$ary['datetime'] = date("Y-m-d H:i:s");
! }
$this->template->set_var(array(
'ORDER_NO' => $ary['order_no'],
--- 591,599 ----
$ary['body_text'] = clean($ary['body_text']);
$ary['title'] = clean($ary['title']);
! if( $ary['story_date'] ) {
$ary['datetime'] = implode( '-', $ary['story_date']) ." ". implode( ':',$ary['story_time']);
! } else {
$ary['datetime'] = date("Y-m-d H:i:s");
! }
$this->template->set_var(array(
'ORDER_NO' => $ary['order_no'],
***************
*** 687,694 ****
$this->template->set_var('EXTTRANS_CHKBOX',"");
}
!
! $topic_ary = $ary['topic_id_ary'];
! $section_ary = $ary['section_id_ary'];
!
$user_id = $this->auth->auth['uid'];
if ( $ary['author_id'] != "") {
--- 709,721 ----
$this->template->set_var('EXTTRANS_CHKBOX',"");
}
!
! $topic_ary = array();
! if(array_key_exists('topic_id_ary', $ary)) {
! $topic_ary = $ary['topic_id_ary'];
! }
! $section_ary = array();
! if(array_key_exists('section_id_ary', $ary)) {
! $section_ary = $ary['section_id_ary'];
! }
$user_id = $this->auth->auth['uid'];
if ( $ary['author_id'] != "") {
***************
*** 849,854 ****
}
!
! $temparray = unserialize($this->db->Record['story_options']);
$this->template->set_var(array(
--- 876,884 ----
}
!
! $temparray = '';
! if(array_key_exists('story_options', $this->db->Record)) {
! $temparray = unserialize($this->db->Record['story_options']);
! }
$this->template->set_var(array(
***************
*** 924,929 ****
while ($this->db->next_record()) {
$this->template->set_var(array(
! AUTHOR_ID => $this->db->Record['author_id'],
! AUTHOR_NAME => $this->db->Record['author_name']
));
$this->template->set_var('AUTHOR_SELECTED',"");
--- 954,959 ----
while ($this->db->next_record()) {
$this->template->set_var(array(
! 'AUTHOR_ID' => $this->db->Record['author_id'],
! 'AUTHOR_NAME' => $this->db->Record['author_name']
));
$this->template->set_var('AUTHOR_SELECTED',"");
Index: Story.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Story.class,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** Story.class 9 Apr 2003 14:48:08 -0000 1.54
--- Story.class 11 Apr 2003 16:06:11 -0000 1.55
***************
*** 176,183 ****
for( $i=0 ; $i < $stories ; $i++) {
if($story_id_ary[$i]["story_id"] == $story_id) {
! $nextsid = $story_id_ary[$i + 1]["story_id"];
! $nexttitle = $story_id_ary[$i + 1]["title"];
! $prevsid = $story_id_ary[$i - 1]["story_id"];
! $prevtitle = $story_id_ary[$i - 1]["title"];
$stories = 0;
}
--- 176,187 ----
for( $i=0 ; $i < $stories ; $i++) {
if($story_id_ary[$i]["story_id"] == $story_id) {
! if(array_key_exists($i + 1, $story_id_ary)) {
! $nextsid = $story_id_ary[$i + 1]["story_id"];
! $nexttitle = $story_id_ary[$i + 1]["title"];
! }
! if(array_key_exists($i - 1, $story_id_ary)) {
! $prevsid = $story_id_ary[$i - 1]["story_id"];
! $prevtitle = $story_id_ary[$i - 1]["title"];
! }
$stories = 0;
}
***************
*** 191,221 ****
$arrows = "";
$link_argv= "";
! if ( $ary['mode'] != "") {
$link_argv .= "&mode=" . $ary['mode'];
}
! if ( $ary[section_id] != "") {
$link_argv .= "&section_id=" . $ary['section_id'];
} elseif ( $ary['section'] != $site_homesection) {
$link_argv .= "&section=" . $ary['section'];
}
! if ( $ary['topic_id'] != "") {
$link_argv .= "&topic_id=" . urlencode($ary['topic_id']);
! } elseif ( $ary['topic'] != "") {
$link_argv .= "&topic=" . urlencode($ary['topic']);
}
! if ( $ary['author_id'] != "") {
$link_argv .= "&author_id=" . $ary['author_id'];
! } elseif ( $ary['author'] != "") {
$link_argv .= "&author=" . $ary['author'];
}
- $turl = $this->psl['phpself'] . "?story_id=$prevsid" . "$link_argv";
if (isset($prevtitle)) {
$arrows = "<<\n";
$arrows .= "<a href=\"$turl\">$prevtitle</a> | ";
}
$arrows .= "<a href=\"" . $this->psl['rooturl'] . "/comment.php3?submit=post" . $this->psl['amp'] . "story_id=$story_id" . $this->psl['amp'] . "parent_id=0\"><b>" . pslgetText("Reply") . "</b></a> ";
- $turl = $this->psl['phpself'] . "?story_id=$nextsid" . $link_argv;
if (isset($nexttitle)) {
$arrows .= " | <a href=\"$turl\">$nexttitle</a> ";
$arrows .= " >>\n";
--- 195,225 ----
$arrows = "";
$link_argv= "";
! if ( array_key_exists('mode', $ary) ) {
$link_argv .= "&mode=" . $ary['mode'];
}
! if ( array_key_exists('section_id', $ary) ) {
$link_argv .= "&section_id=" . $ary['section_id'];
} elseif ( $ary['section'] != $site_homesection) {
$link_argv .= "&section=" . $ary['section'];
}
! if (array_key_exists('topic_id', $ary) ) {
$link_argv .= "&topic_id=" . urlencode($ary['topic_id']);
! } elseif ( array_key_exists('topic', $ary)) {
$link_argv .= "&topic=" . urlencode($ary['topic']);
}
! if ( array_key_exists('author_id', $ary)) {
$link_argv .= "&author_id=" . $ary['author_id'];
! } elseif ( array_key_exists('author', $ary)) {
$link_argv .= "&author=" . $ary['author'];
}
if (isset($prevtitle)) {
+ $turl = $this->psl['phpself'] . "?story_id=$prevsid" . "$link_argv";
$arrows = "<<\n";
$arrows .= "<a href=\"$turl\">$prevtitle</a> | ";
}
$arrows .= "<a href=\"" . $this->psl['rooturl'] . "/comment.php3?submit=post" . $this->psl['amp'] . "story_id=$story_id" . $this->psl['amp'] . "parent_id=0\"><b>" . pslgetText("Reply") . "</b></a> ";
if (isset($nexttitle)) {
+ $turl = $this->psl['phpself'] . "?story_id=$nextsid" . $link_argv;
$arrows .= " | <a href=\"$turl\">$nexttitle</a> ";
$arrows .= " >>\n";
***************
*** 287,291 ****
$cache_ary = unserialize($ary["topic_cache"]);
! $cache_ary[$story_name]['expire'] = 0; // default to no story cache
$cache_ary[$related_name]['expire'] = 0; // default to no related cache
--- 291,295 ----
$cache_ary = unserialize($ary["topic_cache"]);
! $cache_ary['story']['expire'] = 0; // default to no story cache
$cache_ary[$related_name]['expire'] = 0; // default to no related cache
***************
*** 298,305 ****
}
! $name_mod = $argv_ary["section"] . $argv_ary["topic"] . $argv_ary["author"] . $argv_ary["mode"];
$story_name = basename($this->psl['languagefile']) . $this->psl['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") ) {
--- 302,308 ----
}
! $name_mod = implode('', $argv_ary);
$story_name = basename($this->psl['languagefile']) . $this->psl['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") ) {
***************
*** 314,318 ****
$related = "";
$arrows = "";
! if( $mode == full) {
/* set Related Links here */
$related = $this->cacheStory($cache_ary, $related_name);
--- 317,321 ----
$related = "";
$arrows = "";
! if( $mode == 'full') {
/* set Related Links here */
$related = $this->cacheStory($cache_ary, $related_name);
***************
*** 334,338 ****
// }
! $titlebar = getTitleBar("100%", $ary[title]);
$this->template->set_var(array(
--- 337,341 ----
// }
! $titlebar = getTitleBar("100%", $ary['title']);
$this->template->set_var(array(
***************
*** 421,425 ****
* min = "starting" point [0]
* max = maximum returned [10]
! * order = [time], hits, title, etc.
* asc = ASC, [DESC] ( Ascending or Descending)
* mode = headline, full, [hp] - (maybe only hp needed now)
--- 424,428 ----
* min = "starting" point [0]
* max = maximum returned [10]
! * order = [date_available], hits, title, etc.
* asc = ASC, [DESC] ( Ascending or Descending)
* mode = headline, full, [hp] - (maybe only hp needed now)
***************
*** 456,465 ****
/* We only need to set the block the first time we use it, beacuse
all the variables stay there -nh */
! if ($this->template->get_var("row") == "") {
! $this->template->set_block("template","row","rows");
! $this->template->set_block("template","alsotext","alsoblock");
$this->template->set_block("printStory","row","rows");
$this->template->set_block("printStory","alsotext","alsoblock");
! }
$this->template->set_block('template', 'each_story', 'stories');
--- 459,472 ----
/* We only need to set the block the first time we use it, beacuse
all the variables stay there -nh */
! // if ($this->template->get_var("row") == "") {
! if($this->template->is_available('template', 'row')) {
! $this->template->set_block("template","row","rows");
! }
! if($this->template->is_available('template', 'alsotext')) {
! $this->template->set_block("template","alsotext","alsoblock");
! }
$this->template->set_block("printStory","row","rows");
$this->template->set_block("printStory","alsotext","alsoblock");
! // }
$this->template->set_block('template', 'each_story', 'stories');
***************
*** 517,521 ****
$topic_id_ary = $stories_ary[$i]['topic_id_ary'];
}
! $topic_name_ary = $stories_ary[$i]['topic_name_ary'];
if (!empty($topic_id_ary)) {
--- 524,531 ----
$topic_id_ary = $stories_ary[$i]['topic_id_ary'];
}
! $topic_name_ary = '';
! if(array_key_exists('topic_name_ary', $stories_ary[$i])) {
! $topic_name_ary = $stories_ary[$i]['topic_name_ary'];
! }
if (!empty($topic_id_ary)) {
|
|
From: Joe S. <joe...@us...> - 2003-04-11 16:06:19
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default
In directory sc8-pr-cvs1:/tmp/cvs-serv17315/phpslash-ft/public_html/templates/en/default
Modified Files:
storyList.tpl
Log Message:
extractStories accepts order argument correctly.
Index: storyList.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default/storyList.tpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** storyList.tpl 11 Oct 2002 19:32:02 -0000 1.7
--- storyList.tpl 11 Apr 2003 16:06:14 -0000 1.8
***************
*** 29,32 ****
--- 29,33 ----
<TR>
<TH>CNT</TH>
+ <TH>Id</TH>
<TH>Order</TH>
<TH>Title</TH>
***************
*** 45,48 ****
--- 46,52 ----
{ORDER_NO}
</TD>
+ <TD>
+ {STORY_ID}
+ </TD>
<TD>
{TITLE}
***************
*** 70,73 ****
--- 74,80 ----
{ORDER_NO}
</TD>
+ <TD>
+ {STORY_ID}
+ </TD>
<TD>
{TITLE}
|
|
From: Joe S. <joe...@us...> - 2003-04-11 16:06:18
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basic
In directory sc8-pr-cvs1:/tmp/cvs-serv17315/phpslash-ft/public_html/templates/en/basic
Modified Files:
storyList.tpl
Log Message:
extractStories accepts order argument correctly.
Index: storyList.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basic/storyList.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** storyList.tpl 11 Oct 2002 19:32:02 -0000 1.3
--- storyList.tpl 11 Apr 2003 16:06:14 -0000 1.4
***************
*** 26,29 ****
--- 26,30 ----
<tr>
<th>CNT</th>
+ <th>Id</th>
<th>Order</th>
<th>Title</th>
***************
*** 37,40 ****
--- 38,42 ----
<tr class="firstRow">
<td class="descr">{COUNT}</td>
+ <td class="descr">{STORY_ID}</td>
<td class="descr">{ORDER_NO}</td>
<td>{TITLE}</td>
***************
*** 48,51 ****
--- 50,54 ----
<tr class="secondRow">
<td class="descr">{COUNT}</td>
+ <td class="descr">{STORY_ID}</td>
<td class="descr">{ORDER_NO}</td>
<td>{TITLE}</td>
|
2 messages has been excluded from this view by a project administrator.
