phpslash-commit Mailing List for phpSlash (Page 63)
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-02-04 20:36:39
|
Update of /cvsroot/phpslash/phpslash-ft In directory sc8-pr-cvs1:/tmp/cvs-serv30962/phpslash-ft Modified Files: CHANGES Log Message: url structure check Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.678 retrieving revision 1.679 diff -C2 -d -r1.678 -r1.679 *** CHANGES 4 Feb 2003 16:09:56 -0000 1.678 --- CHANGES 4 Feb 2003 20:36:32 -0000 1.679 *************** *** 13,16 **** --- 13,21 ---- 9 - Removal of something (kill -9 :) + 2003-February-04 2:30PM CST Joe Stewart <joe...@us...> + [B] - Block_render_url.class, Block_render_rss.class, en.php3 - url and rss + blocks should now check for url structure before opening - thanks + tobozo. + 2003-February-04 10:00AM CST Joe Stewart <joe...@us...> [W] - es.php3 - Luis updated the Spanish translation. |
|
From: Joe S. <joe...@us...> - 2003-02-04 16:09:59
|
Update of /cvsroot/phpslash/phpslash-ft/class/locale
In directory sc8-pr-cvs1:/tmp/cvs-serv27580/phpslash-ft/class/locale
Modified Files:
es.php3
Log Message:
updated Spanish translation
Index: es.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/locale/es.php3,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** es.php3 4 Feb 2002 14:50:42 -0000 1.1
--- es.php3 4 Feb 2003 16:09:57 -0000 1.2
***************
*** 17,24 ****
$pslstrings = array(
! // about.php3
! // article.php3
! // backend.php3
! // comment.php3
"No Subject Given" =>
"Ningún sujeto dado",
--- 17,24 ----
$pslstrings = array(
[...982 lines suppressed...]
!
! "Block Administration" =>
! "Administración de cuadros",
!
! "Comment Administration" =>
! "Administración de comentarios",
!
! "Poll Administration" =>
! "Administración de encuestas",
!
! "Story Administration" =>
! "Administración de artículos",
!
! "Submission Administration" =>
! "Administración de envios",
!
! "Topic Administration" =>
! "Administración de Temas"
);
?>
|
|
From: Joe S. <joe...@us...> - 2003-02-04 16:09:59
|
Update of /cvsroot/phpslash/phpslash-ft In directory sc8-pr-cvs1:/tmp/cvs-serv27580/phpslash-ft Modified Files: CHANGES Log Message: updated Spanish translation Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.677 retrieving revision 1.678 diff -C2 -d -r1.677 -r1.678 *** CHANGES 3 Feb 2003 21:52:41 -0000 1.677 --- CHANGES 4 Feb 2003 16:09:56 -0000 1.678 *************** *** 13,16 **** --- 13,19 ---- 9 - Removal of something (kill -9 :) + 2003-February-04 10:00AM CST Joe Stewart <joe...@us...> + [W] - es.php3 - Luis updated the Spanish translation. + 2003-February-03 3:30PM CST Joe Stewart <joe...@us...> [W] - contrib/locallib_udf.php3 - example block and story option user |
|
From: Joe S. <joe...@us...> - 2003-02-03 21:52:48
|
Update of /cvsroot/phpslash/phpslash-ft/contrib
In directory sc8-pr-cvs1:/tmp/cvs-serv32241/phpslash-ft/contrib
Added Files:
locallib_udf.php3
Log Message:
initial commit of contrib/locallib_udf.php3
--- NEW FILE: locallib_udf.php3 ---
<?php
/**
* blockudf - block option user defined function
*
* optional external function called during block iteration.
* defined by setting $_PSL['block_options_udf'] to the function name.
*
* new options can be processed here without modifying the distributed class.
*
* @access public
* @param string key - option name
* @param string value - option value
* @param array ary - block array
*
* @return block array
*/
function blockudf( $key, $value, $ary) {
// debug("block_options_udf:key", $key);
// debug("block_options_udf:value", $value);
// debug("block_options_udf:title", $ary['title']);
switch($key) {
// add your routine here:
case "custom":
// customroutine;
// optionally remove value from array so the option doesn't
// get parsed to the template
$ary['block_options'][$key] = '';
break;
default:
// remove value from array so the option doesn't get parsed to the template
// $ary['block_options'][$key] = '';
break;
}
$output = $ary;
return $output;
}
/**
* storyudf - story option user defined function
*
* optional external function called during story display.
* defined by setting $_PSL['story_options_udf'] to the function name.
*
* new options can be processed here without modifying the distributed class.
*
* @access public
* @param string key - option name
* @param string value - option value
* @param array ary - story array
*
* @return story array
*/
function storyudf( $key, $value, $ary) {
// debug("story_options_udf:key", $key);
// debug("story_options_udf:value", $value);
// debug("story_options_udf:title", $ary['title']);
switch($key) {
// add your routine here:
case "custom":
// customroutine;
// optionally remove value from array so the option doesn't
// get parsed to the template
// unset($ary['story_options'][$key]);
break;
default:
// remove value from array so the option doesn't get parsed to the template
// unset($ary['story_options'][$key]);
break;
}
return $ary;
}
?>
|
|
From: Joe S. <joe...@us...> - 2003-02-03 21:52:48
|
Update of /cvsroot/phpslash/phpslash-ft In directory sc8-pr-cvs1:/tmp/cvs-serv32241/phpslash-ft Modified Files: CHANGES Log Message: initial commit of contrib/locallib_udf.php3 Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.676 retrieving revision 1.677 diff -C2 -d -r1.676 -r1.677 *** CHANGES 3 Feb 2003 19:07:45 -0000 1.676 --- CHANGES 3 Feb 2003 21:52:41 -0000 1.677 *************** *** 13,16 **** --- 13,20 ---- 9 - Removal of something (kill -9 :) + 2003-February-03 3:30PM CST Joe Stewart <joe...@us...> + [W] - contrib/locallib_udf.php3 - example block and story option user + defined functions. + 2003-February-03 1:00PM CST Joe Stewart <joe...@us...> [B] - jpcache-main.php - sync with jpcache cvs. Fixed bug with IIS |
|
From: Joe S. <joe...@us...> - 2003-02-03 19:07:52
|
Update of /cvsroot/phpslash/phpslash-ft/class/jpcache
In directory sc8-pr-cvs1:/tmp/cvs-serv17303/phpslash-ft/class/jpcache
Modified Files:
jpcache-main.php
Log Message:
Fixed bug with IIS w/ HTTP_IF_NONE_MATCH header
Index: jpcache-main.php
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/jpcache/jpcache-main.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** jpcache-main.php 22 Nov 2002 17:22:08 -0000 1.2
--- jpcache-main.php 3 Feb 2003 19:07:48 -0000 1.3
***************
*** 283,287 ****
$myETag = "\"jpd-$datacrc.$datasize\"";
header("ETag: $myETag");
! $foundETag = stripslashes($_SERVER["HTTP_IF_NONE_MATCH"]);
$ret = NULL;
--- 283,287 ----
$myETag = "\"jpd-$datacrc.$datasize\"";
header("ETag: $myETag");
! $foundETag = isset($_SERVER["HTTP_IF_NONE_MATCH"]) ? stripslashes($_SERVER["HTTP_IF_NONE_MATCH"]) : "";
$ret = NULL;
|
|
From: Joe S. <joe...@us...> - 2003-02-03 19:07:51
|
Update of /cvsroot/phpslash/phpslash-ft In directory sc8-pr-cvs1:/tmp/cvs-serv17303/phpslash-ft Modified Files: CHANGES Log Message: Fixed bug with IIS w/ HTTP_IF_NONE_MATCH header Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.675 retrieving revision 1.676 diff -C2 -d -r1.675 -r1.676 *** CHANGES 3 Feb 2003 17:59:17 -0000 1.675 --- CHANGES 3 Feb 2003 19:07:45 -0000 1.676 *************** *** 13,16 **** --- 13,20 ---- 9 - Removal of something (kill -9 :) + 2003-February-03 1:00PM CST Joe Stewart <joe...@us...> + [B] - jpcache-main.php - sync with jpcache cvs. Fixed bug with IIS + w/ HTTP_IF_NONE_MATCH header ( Rev 1.12 Fri Jan 24 06:16:53 2003 UTC). + 2003-February-03 12:00PM CST Joe Stewart <joe...@us...> [B] - blockAdmin.php3 - warning corrected when saving a block with no sections |
|
From: Joe S. <joe...@us...> - 2003-02-03 18:03:01
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/admin
In directory sc8-pr-cvs1:/tmp/cvs-serv19171/phpslash-ft/public_html/admin
Modified Files:
blockAdmin.php3
Log Message:
comment preview bug and blockAdmin array warning
Index: blockAdmin.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/admin/blockAdmin.php3,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** blockAdmin.php3 22 Jan 2003 17:28:42 -0000 1.15
--- blockAdmin.php3 3 Feb 2003 18:02:57 -0000 1.16
***************
*** 75,80 ****
// expire cache for these section_id's
$section_id_ary = $HTTP_POST_VARS['section_id_ary'];
! foreach($section_id_ary as $key => $value) {
! jpcache_gc('string', "-section_id-" . $value, "100");
}
--- 75,82 ----
// expire cache for these section_id's
$section_id_ary = $HTTP_POST_VARS['section_id_ary'];
! if(is_array($section_id_ary)) {
! foreach($section_id_ary as $key => $value) {
! jpcache_gc('string', "-section_id-" . $value, "100");
! }
}
|
|
From: Joe S. <joe...@us...> - 2003-02-03 17:59:27
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory sc8-pr-cvs1:/tmp/cvs-serv17320/phpslash-ft/class
Modified Files:
Comment.class
Log Message:
comment preview bug and blockAdmin array warning
Index: Comment.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Comment.class,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** Comment.class 22 Jan 2003 18:23:53 -0000 1.41
--- Comment.class 3 Feb 2003 17:59:21 -0000 1.42
***************
*** 38,42 ****
global $_PSL, $perm, $auth;
! $this->psl = $_PSL;
$this->perm = $perm;
$this->db = pslNew("slashDB");
--- 38,42 ----
global $_PSL, $perm, $auth;
! $this->psl = &$_PSL;
$this->perm = $perm;
$this->db = pslNew("slashDB");
***************
*** 242,258 ****
$this->ctempl->set_var("admin_perm","");
! if($this->auth->auth['dname']) {
$ary['name'] = $this->auth->auth['dname'];
! $ary['email'] = $this->auth->auth['url'];
! }
/* we only prepare for the preview because if this was a real
comment then it's already clean */
$ary = $this->prepare($ary);
}
if($ary['author_realname']) {
$ary['name'] = $ary['author_realname'];
! $ary['email'] = $ary['url'];
}
--- 242,259 ----
$this->ctempl->set_var("admin_perm","");
! if(!$this->perm->have_perm('commentChangeName') && $this->auth->auth['dname']) {
$ary['name'] = $this->auth->auth['dname'];
! $ary['email'] = $this->auth->auth['url'];
! }
/* we only prepare for the preview because if this was a real
comment then it's already clean */
$ary = $this->prepare($ary);
+ $ary['date_created'] = time();
}
if($ary['author_realname']) {
$ary['name'] = $ary['author_realname'];
! $ary['email'] = $ary['url'];
}
***************
*** 293,297 ****
'ORDER' => $this->order,
'IP' => $ary['ip'],
! 'TIME' => psl_dateTimeLong($ary['date_created'])
));
if ($this->perm->have_perm("comment")) {
--- 294,298 ----
'ORDER' => $this->order,
'IP' => $ary['ip'],
! 'TIME' => psl_dateTimeLong($ary['date_created'])
));
if ($this->perm->have_perm("comment")) {
***************
*** 540,544 ****
*/
function getForm($ary) {
!
if ($ary['content'] == "html") {
$html = "checked";
--- 541,545 ----
*/
function getForm($ary) {
!
if ($ary['content'] == "html") {
$html = "checked";
***************
*** 551,558 ****
/* if the block isn't set, set it */
if (!$this->ctempl->get("changename_perm")) {
! $this->ctempl->set_block("displayform","changename_perm");
}
if (!$this->ctempl->get("regular_perm")) {
! $this->ctempl->set_block("displayform","regular_perm");
}
--- 552,559 ----
/* if the block isn't set, set it */
if (!$this->ctempl->get("changename_perm")) {
! $this->ctempl->set_block("displayform","changename_perm", "changename_perms");
}
if (!$this->ctempl->get("regular_perm")) {
! $this->ctempl->set_block("displayform","regular_perm", "regular_perms");
}
***************
*** 566,570 ****
if(!$ary['name']) {
$ary['name'] = $this->auth->auth['dname'];
! $ary['email'] = $this->auth->auth['url'];
}
--- 567,571 ----
if(!$ary['name']) {
$ary['name'] = $this->auth->auth['dname'];
! $ary['email'] = $this->auth->auth['url'];
}
***************
*** 586,593 ****
if ($this->perm->have_perm("commentChangeName")) {
$this->ctempl->set_var("regular_perm","");
} else {
$this->ctempl->set_var("changename_perm","");
}
!
$this->ctempl->parse('FORM', "displayform");
return $this->ctempl->get('FORM');
--- 587,597 ----
if ($this->perm->have_perm("commentChangeName")) {
$this->ctempl->set_var("regular_perm","");
+ $this->ctempl->parse("changename_perms", "changename_perm", true);
+
} else {
$this->ctempl->set_var("changename_perm","");
+ $this->ctempl->parse("regular_perms", "regular_perm", true);
}
!
$this->ctempl->parse('FORM', "displayform");
return $this->ctempl->get('FORM');
***************
*** 731,735 ****
isset($ary['subject']) && isset($ary['comment_text'])) {
! $timestamp = time();
$q = "UPDATE psl_comment
SET name = '$ary[name]',
--- 735,739 ----
isset($ary['subject']) && isset($ary['comment_text'])) {
! $timestamp = time();
$q = "UPDATE psl_comment
SET name = '$ary[name]',
|
|
From: Joe S. <joe...@us...> - 2003-02-03 17:59:25
|
Update of /cvsroot/phpslash/phpslash-ft
In directory sc8-pr-cvs1:/tmp/cvs-serv17320/phpslash-ft
Modified Files:
CHANGES
Log Message:
comment preview bug and blockAdmin array warning
Index: CHANGES
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v
retrieving revision 1.674
retrieving revision 1.675
diff -C2 -d -r1.674 -r1.675
*** CHANGES 31 Jan 2003 19:36:32 -0000 1.674
--- CHANGES 3 Feb 2003 17:59:17 -0000 1.675
***************
*** 13,16 ****
--- 13,21 ----
9 - Removal of something (kill -9 :)
+ 2003-February-03 12:00PM CST Joe Stewart <joe...@us...>
+ [B] - blockAdmin.php3 - warning corrected when saving a block with no sections
+ chosen.
+ Comment.class - preview lost name and email.
+
2003-January-31 1:30PM CST Joe Stewart <joe...@us...>
[D] - phpslash.sgml - Quick Install documentation.
***************
*** 23,27 ****
2003-January-24 7:30PM CST Joe Stewart <joe...@us...>
! [R] - Released phpSlash 0.7RC1.
- VERSION, config-dist.php3, config.php3 - bumped version for release.
--- 28,32 ----
2003-January-24 7:30PM CST Joe Stewart <joe...@us...>
! [R] - Released phpSlash 0.7RC2.
- VERSION, config-dist.php3, config.php3 - bumped version for release.
|
|
From: Joe S. <joe...@us...> - 2003-01-31 19:36:38
|
Update of /cvsroot/phpslash/phpslash-ft/doc/html
In directory sc8-pr-cvs1:/tmp/cvs-serv31273/phpslash-ft/doc/html
Modified Files:
phpslash.sgml
Log Message:
quick install
Index: phpslash.sgml
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/doc/html/phpslash.sgml,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -d -r1.66 -r1.67
*** phpslash.sgml 22 Jan 2003 19:12:34 -0000 1.66
--- phpslash.sgml 31 Jan 2003 19:36:32 -0000 1.67
***************
*** 16,20 ****
<author>
<url url="http://phpslash.sourceforge.net/" name="The phpSlash Group">
! <date>v0.4, March 19, 2002
<abstract>
--- 16,20 ----
<author>
<url url="http://phpslash.sourceforge.net/" name="The phpSlash Group">
! <date>v0.5, January 31, 2003
<abstract>
***************
*** 210,218 ****
<item><url url="http://phplib.sourceforge.net/" name="PHPLIB">
<itemize>
! <item>Suggested version 7.4-pre1 and higher.
<item>If you have PHP4, you *must* run at least 7.2c because of a bug in the template library.
</itemize>
</itemize>
<sect1> Installation when you have administrative access to the server
<p>
--- 210,318 ----
<item><url url="http://phplib.sourceforge.net/" name="PHPLIB">
<itemize>
! <item>Suggested version 7.4-pre2 and higher.
<item>If you have PHP4, you *must* run at least 7.2c because of a bug in the template library.
</itemize>
</itemize>
+ <sect1> Quick Install
+ <p>This section details a quick installation method. It does not contain exhaustive direction or details. It is geared for those that are already familiar with configuration of php scripts.
+
+ <sect2> Unpack the distribution outside the webserver's DocumentRoot.
+ <p>
+ <tscreen><verb>
+ tar xzvf phplash-0.7.tar.gz
+ cd phpslash-0.7
+ </verb></tscreen>
+
+
+ <sect2> Install the database schema and data. This is contained in the file tables/0.7/slash-all.sql. Example command lines:
+ <p>
+ <tscreen><verb>
+ mysqladmin -u username -p create database_name
+ mysql -u username -p database_name < tables/0.7/slash-all.sql
+ </verb></tscreen>
+
+ <sect2> Copy the files in the public_html directory to a directory that the webserver can access. Example:
+ <p>
+ <tscreen><verb>
+ mkdir ~/public_html
+ cp -R public_html/* ~/public_html/
+ </verb></tscreen>
+
+ <sect2> Copy the distributed config-dist.ini.php3 to a local version.
+ <p>
+ <tscreen><verb>
+ cd ~/public_html/
+ cp config-dist.ini.php3 config.ini.php3
+ </verb></tscreen>
+
+ <sect2> Change the configuration variables by editing the ini file (config.ini.php3).
+ <p>
+ <itemize>
+ <item> Enter the filesystem path to the web documents
+ <tscreen><verb>
+ ;; The complete filesystem path to the pages
+ basedir = "/home/username/public_html"
+ </verb></tscreen>
+ <item> Enter the filesystem path to the class files
+ <tscreen><verb>
+ ;; The complete filesystem path to the class directory
+ classdir = "/home/username/phpslash-0.7/class"
+ </verb></tscreen>
+ <item> The webserver address of the web documents.
+ <tscreen><verb>
+ ;; The base URL for the phpslash site
+ rooturl = "http://localhost/~username"
+ </verb></tscreen>
+ <item> The database variables.
+ <tscreen><verb>
+ DB_Host = "localhost"
+ DB_Database = "phpslash"
+ DB_User = "phpslash"
+ DB_Password = "phpslash"
+ </verb></tscreen>
+ <item> Site name and owner.
+ <tscreen><verb>
+ ;; Name of the site. This appears for example on the titlebar of
+ ;; browser windows.
+ site_name = "PHPSlash"
+ ;;
+ ;; Email address to reach a human.
+ site_owner = "in...@ph..."
+ ;;
+ ;; A catch phrase for your site.
+ site_slogan = "Slash for you, Slash for me"
+ ;;
+ ;; A Longer version of the title.
+ site_title = "PHPSlash: The Web Stops Here"
+ </verb></tscreen>
+ <item> Unique local identifier. Change to a unique string for this installation.
+ <tscreen><verb>
+ magic = "ChangeThisToSomethingUnique"
+ </verb></tscreen>
+ </itemize>
+
+ <sect2> Visit the test page for possible errors.
+ <p>
+ <tscreen><verb>
+ http://localhost/~username/test.php3
+ </verb></tscreen>
+
+ <sect2> Installation should be complete.
+ <p>
+ <tscreen><verb>
+ http://localhost/~username/index.php3
+ </verb></tscreen>
+
+ <sect2> Troubleshooting
+ <p>
+ <itemize>
+ <item> Timezone Options may need to be adjusted.
+ <item> Windows installations probably have to apply the Timezone Option name. These strings are documented online at http://www.gnu.org/manual/glibc-2.2.3/html_node/libc_431.html. Example for Eastern Daylight Time:
+ <tscreen><verb>
+ name = "EST+5EDT,M4.1.0/2,M10.5.0/2";
+ </verb></tscreen>
+ </itemize>
+
<sect1> Installation when you have administrative access to the server
<p>
***************
*** 1066,1072 ****
<item> section_id = show only the comments in this section
<item> section = show only the comments in this section
! <item> number = [10] show this number of comments
! <item> length = [30] cut off the text after this number of characters
! <item> tpl = [commentblock] alternate template ( no .tpl).
</itemize>
<tag/HTML/ Just put some HTML in the "DATA" field and that's pretty
--- 1166,1172 ----
<item> section_id = show only the comments in this section
<item> section = show only the comments in this section
! <item> number = show this number of comments. (default: 10)
! <item> length = cut off the text after this number of characters. (default 30)
! <item> tpl = alternate template ( no .tpl). (default: commentblock)
</itemize>
<tag/HTML/ Just put some HTML in the "DATA" field and that's pretty
|
|
From: Joe S. <joe...@us...> - 2003-01-31 19:36:35
|
Update of /cvsroot/phpslash/phpslash-ft In directory sc8-pr-cvs1:/tmp/cvs-serv31273/phpslash-ft Modified Files: CHANGES Log Message: quick install Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.673 retrieving revision 1.674 diff -C2 -d -r1.673 -r1.674 *** CHANGES 30 Jan 2003 16:22:34 -0000 1.673 --- CHANGES 31 Jan 2003 19:36:32 -0000 1.674 *************** *** 13,16 **** --- 13,19 ---- 9 - Removal of something (kill -9 :) + 2003-January-31 1:30PM CST Joe Stewart <joe...@us...> + [D] - phpslash.sgml - Quick Install documentation. + 2003-January-30 9:30AM CST Joe Stewart <joe...@us...> [B] - config-dist.php3, config.php3 - rss block class was not being loaded. |
|
From: Joe S. <joe...@us...> - 2003-01-30 16:22:42
|
Update of /cvsroot/phpslash/phpslash-ft/public_html
In directory sc8-pr-cvs1:/tmp/cvs-serv27315/phpslash-ft/public_html
Modified Files:
config-dist.php3 config.php3
Log Message:
rss block fix
Index: config-dist.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/config-dist.php3,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** config-dist.php3 25 Jan 2003 01:48:07 -0000 1.31
--- config-dist.php3 30 Jan 2003 16:22:36 -0000 1.32
***************
*** 589,594 ****
AddClassRequirement("block_render_query","block_render_i");
AddClassRequirement("block_render_query",$_PSL['classdir'] . "/Block_render_query.class");
! AddClassRequirement("block_render_query","block_render_i");
AddClassRequirement("block_render_quote",$_PSL['classdir'] . "/Block_render_quote.class");
AddClassRequirement("block_render_section","block_render_i");
AddClassRequirement("block_render_section",$_PSL['classdir'] . "/Block_render_section.class");
--- 589,597 ----
AddClassRequirement("block_render_query","block_render_i");
AddClassRequirement("block_render_query",$_PSL['classdir'] . "/Block_render_query.class");
! AddClassRequirement("block_render_quote","block_render_i");
AddClassRequirement("block_render_quote",$_PSL['classdir'] . "/Block_render_quote.class");
+ AddClassRequirement("block_render_rss","block_render_i");
+ AddClassRequirement("block_render_rss",$_PSL['classdir'] . "/Block_render_rss.class");
+ AddClassRequirement("rdfparser",$_PSL['classdir'] . "/Block_render_rss.class");
AddClassRequirement("block_render_section","block_render_i");
AddClassRequirement("block_render_section",$_PSL['classdir'] . "/Block_render_section.class");
Index: config.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/config.php3,v
retrieving revision 1.178
retrieving revision 1.179
diff -C2 -d -r1.178 -r1.179
*** config.php3 25 Jan 2003 01:48:07 -0000 1.178
--- config.php3 30 Jan 2003 16:22:36 -0000 1.179
***************
*** 418,423 ****
AddClassRequirement("block_render_query","block_render_i");
AddClassRequirement("block_render_query",$_PSL['classdir'] . "/Block_render_query.class");
! AddClassRequirement("block_render_query","block_render_i");
AddClassRequirement("block_render_quote",$_PSL['classdir'] . "/Block_render_quote.class");
AddClassRequirement("block_render_section","block_render_i");
AddClassRequirement("block_render_section",$_PSL['classdir'] . "/Block_render_section.class");
--- 418,426 ----
AddClassRequirement("block_render_query","block_render_i");
AddClassRequirement("block_render_query",$_PSL['classdir'] . "/Block_render_query.class");
! AddClassRequirement("block_render_quote","block_render_i");
AddClassRequirement("block_render_quote",$_PSL['classdir'] . "/Block_render_quote.class");
+ AddClassRequirement("block_render_rss","block_render_i");
+ AddClassRequirement("block_render_rss",$_PSL['classdir'] . "/Block_render_rss.class");
+ AddClassRequirement("rdfparser",$_PSL['classdir'] . "/Block_render_rss.class");
AddClassRequirement("block_render_section","block_render_i");
AddClassRequirement("block_render_section",$_PSL['classdir'] . "/Block_render_section.class");
|
|
From: Joe S. <joe...@us...> - 2003-01-30 16:22:39
|
Update of /cvsroot/phpslash/phpslash-ft In directory sc8-pr-cvs1:/tmp/cvs-serv27315/phpslash-ft Modified Files: CHANGES Log Message: rss block fix Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.672 retrieving revision 1.673 diff -C2 -d -r1.672 -r1.673 *** CHANGES 28 Jan 2003 18:32:33 -0000 1.672 --- CHANGES 30 Jan 2003 16:22:34 -0000 1.673 *************** *** 13,16 **** --- 13,19 ---- 9 - Removal of something (kill -9 :) + 2003-January-30 9:30AM CST Joe Stewart <joe...@us...> + [B] - config-dist.php3, config.php3 - rss block class was not being loaded. + 2003-January-28 12:30PM CST Joe Stewart <joe...@us...> [W] - fr.php3 - tobozo updated the French translation. |
|
From: Joe S. <joe...@us...> - 2003-01-28 18:34:34
|
Update of /cvsroot/phpslash/phpslash-ft/class/locale
In directory sc8-pr-cvs1:/tmp/cvs-serv21021/phpslash-ft/class/locale
Modified Files:
fr.php3
Log Message:
updated French translation
Index: fr.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/locale/fr.php3,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** fr.php3 11 Jan 2003 13:21:09 -0000 1.5
--- fr.php3 28 Jan 2003 18:34:29 -0000 1.6
***************
*** 27,33 ****
"Une des valeurs envoyées est erronée",
! // commentShow.php3
! // commentSubmit.php3
// config.php3
"Home" =>
"Accueil",
--- 27,50 ----
"Une des valeurs envoyées est erronée",
! "View Parent Comment" =>
! "Remonter d`un niveau",
!
! "Submitted Comment" =>
! "Contribution",
!
! "Login required to post comments" =>
! "Il faut etre authentifié pour pouvoir poster des commentaires",
!
! "Comment Error!" =>
! "Erreur de comemntaire!",
!
// config.php3
+
+ "Login" =>
+ "Se Logguer",
+
+ "Logout" =>
+ "Se Délogguer",
+
"Home" =>
"Accueil",
***************
*** 78,87 ****
"Carnet de bord",
! "User" =>
! "Utilisateur",
// functions.inc
"NO TITLE" =>
! "AUCUN TITRE",
"@!#$" =>
--- 95,110 ----
"Carnet de bord",
! "User Profile" =>
! "User Profile",
!
! "Admin" =>
! "Admin",
!
! "Group" =>
! "Group",
// functions.inc
"NO TITLE" =>
! "SANS TITRE",
"@!#$" =>
***************
*** 125,136 ****
"Something broke, I'm not sure what though??" =>
! "Uh-oh mais qu'est ce que c'est que ce beans ??",
"New Submission" =>
"Nouveau postage",
- // submissionAdmin.php3
// /admin files
! // authorAdmin
"Error! Invalid Privileges" =>
"Erreur! Il y a un probleme de privileges",
--- 148,160 ----
"Something broke, I'm not sure what though??" =>
! "Le serveur vient de lacher un bouse difficile a identifier, je suis confus ??",
"New Submission" =>
"Nouveau postage",
// /admin files
! "Administration" =>
! "Administration",
!
"Error! Invalid Privileges" =>
"Erreur! Il y a un probleme de privileges",
***************
*** 139,151 ****
"Désolé, il faut avoir plus de privileges pour pouvoir acceder a cette page.",
! // blockadmin.php3
// commentAdmin.php3
// glossaryAdmin.php3
// infologAdmin.php3
// mailinglistAdmin.php3
// pollAdmin.php3
// sectionAdmin.php3
! // storyAdmin.php3
// submissionAdmin.php3
// topicAdmin.php3
// variableAdmin.php3
--- 163,254 ----
"Désolé, il faut avoir plus de privileges pour pouvoir acceder a cette page.",
! // authorAdmin
! "Author Administration" =>
! "Administration des Auteurs",
!
! // blockAdmin.php3
! "The Block has been Deleted" =>
! "Le Bloc a été supprimé",
!
// commentAdmin.php3
+ "The comment was deleted" =>
+ "Le commentaire e été supprimé",
+
+ "You didn't select any items to delete!" =>
+ "Il n`y a rien a effacer !",
+
+ "Comment # %s has been deleted." =>
+ "Le Commentaire # %s a été effacé.",
+
+ "There was an ERROR deleting comment #" =>
+ "Il s`est produit une ERREUR lors de la suppression du commentaire #",
+
+ "Mark Comment Pending" =>
+ "Masquer le commentaire",
+
+ "Marked comment # %s as pending" =>
+ "Marsquer le commentaire # %s",
+
+ "There was an ERROR marking comment # %s as pending." =>
+ "Il s`est produit une ERREUR lors du masquage du commentaire # %s.",
+
+ "Unmark Pending Comment" =>
+ "Démasquer le Commentaire",
+
+ "Unmarked pending comment %s" =>
+ "Commentaire %s démasqué",
+
+ "There was an ERROR unmarking the comment as pending." =>
+ "Il s`est produit une ERREUR lors du démasquage du commentaire.",
+
+ "The comment was moved up one level." =>
+ "Le commentaire a été monté d`un niveau.",
+
+ "The comment was moved to the top." =>
+ "Le commentaire a été déplacé au sommet.",
+
+ "Edit Comment" =>
+ "Editer le Commentaire",
+
+ "Error! No Action" =>
+ "Erreur! Rien a faire",
+
// glossaryAdmin.php3
+ "has been updated" =>
+ "a été mis a jour",
+
+ "has not been updated" =>
+ "n`a pas été mis a jour",
+
// infologAdmin.php3
// mailinglistAdmin.php3
// pollAdmin.php3
+ "Deleting poll" =>
+ "Suppression du vote",
+
// sectionAdmin.php3
! // storyAdmin.php
// submissionAdmin.php3
+ " record deleted" =>
+ " entrée supprimée",
+
+ "This would work SO much better if you actually selected something to delete!" =>
+ "Supprimer, je veux bien.. mais supprimer quoi au juste ?",
+
+ "Submission Saved" =>
+ "Contribution enregistrée",
+
+ "Submission Preview" =>
+ "Prévisualisation",
+
+ "Edit Submission" =>
+ "Editer la contribution",
+
+ "Current Submissions" =>
+ "Contribution actuelle",
+
+ "When you don't see the submission, it means there aren't any." =>
+ "Si aucune contribution n`est listée c'est qu`il n`y en a pas..",
+
// topicAdmin.php3
// variableAdmin.php3
***************
*** 154,158 ****
--- 257,368 ----
// Author.class
+ "Existing Authors" =>
+ "Auteurs Enregistrés",
+
+ "There is no author_name in Author.class::saveProfile" =>
+ "Variable author_name inexistante pour Author.class::saveProfile",
+
+ "There is no author_name in Author.class::saveAuthor" =>
+ "Variable author_name inexistante pour Author.class::saveAuthor",
+
+ "You need to select some permissions in Author.class::saveAuthor" =>
+ "Il faut sélectionner une ou plusieurs permissions dans Author.class::saveAuthor",
+
+ "When changing the username, the password field must also be completed." =>
+ "Lors d`un changement d`utilisateur, le champ du mot de passe doit aussi etre completé.",
+
+ "Author Updated" =>
+ "Auteur mis a jour",
+
+ "Author deleted" =>
+ "Auteur supprimé",
+
+ "Add a new Author" =>
+ "Insérer un Auteur",
+
+ "Update Author (%s)" =>
+ "Mettre a jour l`Auteur (%s)",
+
+ "There is no password in Author.class::saveAuthor" =>
+ "Aucune Variable password dans Author.class::saveAuthor",
+
+ "Author Created" =>
+ "Auteur inséré",
+
+ "No permissions chosen." =>
+ "Aucune permission n`a été choisie.",
+
+ "Profile Updated" =>
+ "Profil mis a jour",
+
+ "You can't delete yourself! Create another user, log in as he/she and then delete this account." =>
+ "Vous ne pouvez pas vous effacer vous meme, cela reviendrait a du suicide virtuel ! Créez plutot un autre utilisateur et servez vous en pour effacer celui ci.",
+
+ "Missing Username or ID" =>
+ "Nom d`utilisateur ou ID manquant",
+
+ "Username not found" =>
+ "Nom d`utilisateur introuvable",
+
+ "Sorry the user's email address is not valid" =>
+ "Désolé, l`adresse de l`utilisateur n`est pas valide",
+
+ "Email Confirmation sent" =>
+ "Courrier de confirmation envoyé",
+
+ "Email Confirmation failure" =>
+ "Problemes lors de la confirmation de l`email",
+
+
// Block.class
+ "Block Type: %s added with an id of: %s" =>
+ "Bloc de Type %s ajouté avec l`id : %s",
+
+ "Error entering %s!" =>
+ "Erreur lors du traitement de %s!",
+
+ "Sorry, this block_type(%s) is assigned to this block: %s" =>
+ "Désolé, le block_type(%s est déja assigné a ce bloc: %s",
+
+ "Block Type %s deleted" =>
+ "Le Bloc de Type %s a été effacé",
+
+ "Multiple blocks exist with id: %s. Stopping." =>
+ "Entrées multiples trouvées pour l`id %s. Arret imminent.",
+
+ "Block: %s does not exist. Stopping." =>
+ "Le bloc %s n`existe pas. Arret imminent.",
+
+ "Updating Block %s. " =>
+ "Mise a jour du bloc %s. ",
+
+ "Creating new block from submitted info." =>
+ "Création d`un nouveau bloc a partir des infos envoyées.",
+
+ "Adding the block to the db..." =>
+ "Ajout du bloc a la base...",
+
+ "No section chosen. Block will not be displayed on site till a section is chosen for block: %s" =>
+ "Aucune section n`a été choisie. Le bloc n`apparaitra nulle part tant qu`une section n`aura pas été choisie pour l`id %s",
+
+ "Checking db..." =>
+ "Consultation de la db...",
+
+ "Error adding block. Query returned multiple results." =>
+ "Erreur lors de l`ajout du bloc. La requete a retourné des résultats multiples.",
+
+ "Block::putBlock() received data not in an array." =>
+ "Block::putBlock() le format des données est incorrect.",
+
+ // Block_admin.class
+ "Update the Current Blocks" =>
+ "Mettre a jour les blocs",
+
+ "Manage Block Types" =>
+ "Ajouter/Supprimer/Éditer les types des blocs",
+
+ "[Add or Remove Block Types]" =>
+ "[Ajouter ou supprimer un type]",
+
// Block_i.class
// Block_render_cal.class
***************
*** 220,228 ****
--- 430,625 ----
"Afficher les commentaires en attente de validation",
+ "Comment::getAllComments: I'm confused with the mode variable: '%s'" =>
+ "Comment::getAllComments: la variable mode est tres confusante: '%s'",
+
+ "Anonymous Poster" =>
+ "Un troll qui tient a son anonymat",
+
+ "Comment::update - comment_text is blank" =>
+ "Comment::update - le champ comment_text est vide",
+
+ "Comment saved" =>
+ "Commentaire mis a jour",
+
+ "Comment::update --ERROR-- " =>
+ "Comment::update --ERREUR-- ",
+
+ "Comment::update - Adding the comment failed" =>
+ "Comment::update - L`ajout du commentaire a échoué",
+
+ "Comment::update - You don't have any permissions to update a comment" =>
+ "Comment::update - Vous n`avez pas les privileges nécéssaires pour mettre a jour les commentaires",
+
+ "Comment::update - the update was good, but nothing changed" =>
+ "Comment::update - la mise a jour a été effectuée, mais rien n`a changé ?!?",
+
+ "Comment::update - the update query failed" =>
+ "Comment::update - la requete de mise a jour a lamentablement foiré",
+
+ "Comment::update - can't update comment because I'm missing some data" =>
+ "Comment::update - impossible de mettre a jour le commentaire par faute de données",
+
+ "Comment updated" =>
+ "Commentaire mis a jour",
+
+ "Comment::deleteOne --ERROR-- " =>
+ "Comment::deleteOne --ERREUR-- ",
+
+ "Comment::deleteOne - the query for all the children of the comment you're about to delete failed" =>
+ "Comment::deleteOne - la requete sur la ramification des commentaires a effacer a échoué",
+
+ "Comment::deleteOne --ERROR-- " =>
+ "Comment::deleteOne --ERREUR-- ",
+
+ "Comment::deleteOne - the delete was good, but nothing changed" =>
+ "Comment::deleteOne - la suppression a réussi mais rien n`a changé",
+
+ "Comment::deleteOne - The delete comment query failed" =>
+ "Comment::deleteOne - la requete de suppression du commentaire a échoué",
+
+ "Comment::delete - there is no comment_id" =>
+ "Comment::delete - le champ comment_id est vide",
+
+ "Comment::delete - there is no story_id" =>
+ "Comment::delete - le champ story_id est vide",
+
+ "Comment::reparentUp - invalid comment_id or story_id" =>
+ "Comment::reparentUp - donnée invalide pour le champ comment_id ou story_id",
+
+ "Comment::reparentUp - the query to get the parent_id failed" =>
+ "Comment::reparentUp - la requete pour récupérer le parent_id a échoué",
+
+ "Comment::reparentUp - the query to get the parent_id returned zero results" =>
+ "Comment::reparentUp - la requete pour récupérer le parent_id n`a retourné aucun résultat",
+
+ "Comment::reparentUp - the comment is already at the root" =>
+ "Comment::reparentUp - le commentaire est déja a la racine",
+
+ "Comment::reparentUp - the query to get the NEW parent_id failed" =>
+ "Comment::reparentUp - la requete pour obtenir un NEW parent_id a échoué",
+
+ "Comment::reparentUp - the query to get the NEW parent_id returned zero results" =>
+ "Comment::reparentUp - la requete pour obtenir un NEW parent_id n`a retourné aucun résultat",
+
+ "Comment::reparentUp - the update was good, but nothing changed" =>
+ "Comment::reparentUp - la mise a jour a réussi, mais rien n`a changé",
+
+ "Comment::reparentUp - the update failed" =>
+ "Comment::reparentUp - la mise a jour a échoué",
+
+ "Comment::reparentTop - either no comment_id, or no story_id" =>
+ "Comment::reparentTop - données invalides pour le champ comment_id ou story_id",
+
+ "Comment::reparentTop - the query was good, there was just nothing updated" =>
+ "Comment::reparentTop - la requete a réussi mais rien n`a changé",
+
+ "Comment::reparentTop - the query was good, there was just nothing updated" =>
+ "Comment::reparentTop - la requete a réussi mais rien n`a été mis a jour",
+
+ "Comment::reparentTop - the query failed" =>
+ "Comment::reparentTop - la requete a échoué",
+
+ "Listing Pending Comments" =>
+ "Lister les commentaires masqués",
+
+ "Sorry. No Pending Comments" =>
+ "Désolé, aucun commentaire masqué",
+
+ "Comment::decrementCommentCount - The Query Failed" =>
+ "Comment::decrementCommentCount - La requete a échoué",
+
+ "Comment::decrementCommentCount - No story_id" =>
+ "Comment::decrementCommentCount - Pas de story_id",
+
+ "Comment::incrementCommentCount - The Query Failed" =>
+ "Comment::incrementCommentCount - La requete a échoué",
+
+ "(commentEdit Function): you're trying to update a comment but I couldn't find it?" =>
+ "(commentEdit Function): impossible de trouver le commentaire a mettre a jour ?!?",
+
// Glossary.class
"Add a new Term" =>
"Ajouter un Terme",
+ "Glossary Edit" =>
+ "Éditer un terme",
+
+ "There is no term in Glossary.class::saveGlossary" =>
+ "Aucun terme a sauver pour Glossary.class::saveGlossary",
+
+ "There is no def in Glossary.class::saveGlossary" =>
+ "Aucune def a sauver dans Glossary.class::saveGlossary",
+
+ "Add a new Term" =>
+ "Ajouter un Terme",
+
+ // Group.class
+ "There is no group_name in Group.class::saveGroup" =>
+ "Pas de données pour le champ group_name dans Group.class::saveGroup",
+
+ "There is no description in Group.class::saveGroup" =>
+ "Pas de données pour le champ description dans Group.class::saveGroup",
+
+ "Group information updated" =>
+ "Informations du groupe mises a jour",
+
+ "Group information saved" =>
+ "Informations du groupe enregistrées",
+
+ "No section chosen." =>
+ "Aucune section n`a été choisie.",
+
+ "Sorry, this group is assigned to author " =>
+ "Désolé, ce groupe est assigné a l`auteur ",
+
+ "Sorry, this group is assigned to group" =>
+ "Désolé, ce groupe est assigné au groupe",
+
+ " Group not deleted" =>
+ " Le groupe n`a pas été effacé",
+
+ "Group deleted" =>
+ "Le groupe a été effacé",
+
+ "There is no permission_name in Permission.class::savePermission" =>
+ "Pas de données pour le champ permission_name dans Permission.class::savePermission",
+
+ "There is no description in Permission.class::savePermission" =>
+ "Pas de données pour le champ description dans Permission.class::savePermission",
+
+ "Permission information updated" =>
+ "Permissions mises a jour",
+
+ "Permission information saved" =>
+ "Permissions enregistrées",
+
+ "Sorry, this permission is assigned to group " =>
+ "Désolé, cette permission est assignée au groupe ",
+
+ " Permission not deleted" =>
+ " La permission n`a pas été supprimée",
+
+ "Permission deleted" =>
+ "La permission a été supprimée",
+
+ "All Sections" =>
+ "Toutes les sections",
+
+ "[Edit]" =>
+ "[Editer]",
+
+ "[Delete]" =>
+ "[Supprimer]",
+
// Infolog.class
+ "Deleting all log entries...." =>
+ "Suppression de toutes les entrées du log....",
+
+ "Done!" =>
+ "Terminé!",
+
+ "Deleting log entry " =>
+ "Passage au lance flammes de l`entrée ",
+
// Mailinglist.class
"Email Headline Updates" =>
***************
*** 286,289 ****
--- 683,749 ----
// Poll.class
+ "Create A New Poll" =>
+ "Créer un nouveau sufrage",
+
+ "No Question ID" =>
+ "Pas d`ID de question ?",
+
+ "There was a weird number of affected rows when setting the 'current' field to 1: " =>
+ "Il y a eu un nombre anormal de resultats lors de la mise a jour du champ 'actuel' sur 1: ",
+
+ "Either there were no current polls, or more then one? Affected Rows is: " =>
+ "Il n`y a aucun vote par défaut, ou alors il y en a plusieurs ? Colonnes affectées : ",
+
+ "No ID to edit" =>
+ "Pas d`ID a éditer",
+
+ "Couldn't find your question (%s) in the DB" =>
+ "Impossible de trouver la question (%s) dans la base",
+
+ "Edit An Existing Poll" =>
+ "Éditer un sufrage existant",
+
+ "Silly admin! You need to have a question before you can have a poll." =>
+ "Andouille! Il faut avoir des questions a poser quand on veut faire voter...",
+
+ "You need to have at least 2 possible answers, otherwise it wouldn't be a very effective poll, would it?" =>
+ "Il faut au moins 2 réponses possibles au vote sans quoi c`est de la dictature !",
+
+ "Choice %s, %s (%s), was updated" =>
+ "La choix %s, %s (%s), a été mis a jour",
+
+ "Choice %s, %s (%s), was inserted" =>
+ "La choix %s, %s (%s), a été inséré",
+
+ "You can't delete the current poll. Please make another poll current, then delete this one" =>
+ "Impossible d`effacer le sufrage par défaut, il faut en créer un autre avant",
+
+ "No question_id in Poll::deletePoll" =>
+ "Pas de données pour le champ question_id dans Poll::deletePoll",
+
+ "Choice %s was ignored." =>
+ "La choix %s a été ignoré.",
+
+ "There was an error in setting %s as the current poll:" =>
+ "Il s`est produit une erreur en essayant de faire de %s le vote par défaut:",
+
+ "I couldn't find your Poll, " =>
+ "Impossible de trouver le vote, ",
+
+ "Sorry, I couldn't find your poll when trying to update." =>
+ "Désolé, impossible de trouver le vote lors de la mise a jour.",
+
+ "There was an error deleting your poll answers" =>
+ "Erreur lors de la suppression des réponses",
+
+ "There was an error deleting your poll question" =>
+ "Erreur lors de la suppression des questions",
+
+ "There was an error removing the votes" =>
+ "Erreur lors de la suppression des votes",
+
+ "Poll %s was deleted" =>
+ "Le vote %s a été supprimé",
+
"Your vote has been registered" =>
"Le vote a été enregistré",
***************
*** 291,300 ****
"Your vote hasn't been registered because there was no remote address: %s" =>
"Le vote n'a pas été enregistré par manque d'adresse distante: %s",
-
"Your vote hasn't been registered because you (or someone from your computer) has already voted." =>
"Le vote n'a pas été enregistré car ca ressemble trop a de la triche.",
// Section.class
// Story.class
"More" =>
--- 751,779 ----
"Your vote hasn't been registered because there was no remote address: %s" =>
"Le vote n'a pas été enregistré par manque d'adresse distante: %s",
"Your vote hasn't been registered because you (or someone from your computer) has already voted." =>
"Le vote n'a pas été enregistré car ca ressemble trop a de la triche.",
+ "No Poll Found: " =>
+ "Aucun vote n`a été trouvé: ",
// Section.class
+ "Section %s(%s) deleted" =>
+ "Section %s(%s) supprimée",
+
+ "Change Existing Sections" =>
+ "Editer les sections",
+
+ "There is no section_name in Section.class::saveSection" =>
+ "Aucune donnée pour le champ section_name dans Section.class::saveSection",
+
+ "There is no description in Section.class::saveSection" =>
+ "Aucune donnée pour le champ description dans Section.class::saveSection",
+
+ "New Section" =>
+ "Créer une Section",
+
+ "Edit Section" =>
+ "Editer une Section",
+
// Story.class
"More" =>
***************
*** 319,329 ****
--- 798,916 ----
"Réagir?",
+ // Story_admin.class
+ "The storyid is: " =>
+ "La valeur du storyid est: ",
+
+ "You deleted %s comments" =>
+ "%s commentaires supprimés",
+
+ "removed %s section pointer(s)" =>
+ "%s pointeurs de section supprimé(s)",
+
+ "removed %s topic pointer(s)" =>
+ "%s pointeurs de catégories supprimé(s)",
+
+ "removed the story" =>
+ "article supprimé",
+
+ "All Authors" =>
+ "Tous les Auteurs",
+
+ "All Topics" =>
+ "Toutes les catégories",
+
+ "All Sections" =>
+ "Toutes les Sections",
+
+ // Story_base.class
+ "There is no story_id in Story.class::saveStory" =>
+ "Aucune donnée pour le champ story_id dans Story.class::saveStory",
+
+ "You need to select at least one topic in Story.class::saveStory" =>
+ "Il faut sélectionner au moins une catégorie dans Story.class::saveStory",
+
+ "You need to select at least one section in Story.class::saveStory" =>
+ "Il faut sélectionner au moins une section dans Story.class::saveStory",
+
+ "There is no title in Story.class::saveStory" =>
+ "Aucune donnée pour le champ title Story.class::saveStory",
+
+ "There is no intro_text in Story.class::saveStory" =>
+ "Aucune donnée pour le champ intro_text dans Story.class::saveStory",
+
+ "There is no author_id in Story.class::saveStory" =>
+ "Aucune donnée pour le champ author_id dans Story.class::saveStory",
+
+ "Topic bar could not be reorganized" =>
+ "La barre des catégories n`a pas pu etre réorganisée",
+
// Submission.class
"Anonymous Coward" =>
"Un pauv`lache",
+ "No Submission Found: %s" =>
+ "Pas de contribution: %s",
+
+ "You need to select at least one topic in Submission.class::saveSubmission" =>
+ "Il faut sélectionner au moins une catégorie dans Submission.class::saveSubmission",
+
+ "You need to select at least one section in Submission.class::saveSubmission" =>
+ "Il faut sélectionner au moins une section dans Submission.class::saveSubmission",
+
+ "There is no subject in Submission.class::saveSubmission" =>
+ "Aucune donnée pour le champ subject dans Submission.class::saveSubmission",
+
+ "There is no story in Submission.class::saveSubmission" =>
+ "Aucune donnée pour le champ story dans Submission.class::saveSubmission",
+
+ "Can't find Submission_id ('%s') in psl_submission!" =>
+ "Submission_id ('%s') introuvable dans psl_submission!",
+
+ "Submission by " =>
+ "Contribution de ",
+
// Topic.class
+ "Change existing Topics" =>
+ "Modifier les catégories",
+
+ "There is no topic_name in Topic.class::saveTopic" =>
+ "Pas de données pour le champ topic_name dans Topic.class::saveTopic",
+
+ "There is no image in Topic.class::saveTopic" =>
+ "Pas de données pour le champ image dans Topic.class::saveTopic",
+
+ "There is no alt_text in Topic.class::saveTopic" =>
+ "Pas de données pour le champ alt_text dans Topic.class::saveTopic",
+
+ "Sorry, ths story is assigned to this topic:" =>
+ "Désolé, cet article est associé a cette catégorie:",
+
+ "Sorry, this submission is assigned to this topic:" =>
+ "Désolé, cette contribution est associée a cette catégorié:",
+
+ "Topic deleted" =>
+ "Catégorie effacée",
+
+ "Add a new Topic" =>
+ "Créer une catégorie",
+
+ "Edit Topic" =>
+ "Éditer une catégorie",
+
+ "Display Topic Images" =>
+ "Afficher les images des catégories",
+
+ "[Display all possible topic images]" =>
+ "[Afficher toutes les images du répertoire]",
+
+ "Display Topic Images" =>
+ "Afficher les images des catégories",
+
// TopicBar.class
// Variable.class
+ // cronmail.php3
+ // "Story" =>
+ // "Article",
+
"Written" =>
"a écrit",
***************
*** 400,402 ****
);
! ?>
--- 987,989 ----
);
! ?>
\ No newline at end of file
|
|
From: Joe S. <joe...@us...> - 2003-01-28 18:32:40
|
Update of /cvsroot/phpslash/phpslash-ft In directory sc8-pr-cvs1:/tmp/cvs-serv19988/phpslash-ft Modified Files: CHANGES Log Message: updated French translation Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.671 retrieving revision 1.672 diff -C2 -d -r1.671 -r1.672 *** CHANGES 25 Jan 2003 01:48:07 -0000 1.671 --- CHANGES 28 Jan 2003 18:32:33 -0000 1.672 *************** *** 13,17 **** 9 - Removal of something (kill -9 :) ! [R] - Released phpSlash 0.7RC1. 2003-January-24 7:30PM CST Joe Stewart <joe...@us...> --- 13,18 ---- 9 - Removal of something (kill -9 :) ! 2003-January-28 12:30PM CST Joe Stewart <joe...@us...> ! [W] - fr.php3 - tobozo updated the French translation. 2003-January-24 7:30PM CST Joe Stewart <joe...@us...> |
|
From: Joe S. <joe...@us...> - 2003-01-25 01:48:10
|
Update of /cvsroot/phpslash/phpslash-ft/public_html In directory sc8-pr-cvs1:/tmp/cvs-serv7424/phpslash-ft/public_html Modified Files: config-dist.php3 config.php3 Log Message: Release 0.7RC2 Index: config-dist.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/config-dist.php3,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** config-dist.php3 22 Jan 2003 16:15:19 -0000 1.30 --- config-dist.php3 25 Jan 2003 01:48:07 -0000 1.31 *************** *** 74,78 **** $_PSL = parse_ini_file($psl_inifile, TRUE); ! $_PSL['version'] = '0.7RC1'; /**** START DEBUGGING - Comment or delete this for production! ****/ --- 74,78 ---- $_PSL = parse_ini_file($psl_inifile, TRUE); ! $_PSL['version'] = '0.7RC2'; /**** START DEBUGGING - Comment or delete this for production! ****/ Index: config.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/config.php3,v retrieving revision 1.177 retrieving revision 1.178 diff -C2 -d -r1.177 -r1.178 *** config.php3 22 Jan 2003 16:15:19 -0000 1.177 --- config.php3 25 Jan 2003 01:48:07 -0000 1.178 *************** *** 60,64 **** } ! $_PSL['version'] = '0.7RC1'; /**** START DEBUGGING - Comment or delete this for production! ****/ --- 60,64 ---- } ! $_PSL['version'] = '0.7RC2'; /**** START DEBUGGING - Comment or delete this for production! ****/ |
|
From: Joe S. <joe...@us...> - 2003-01-25 01:48:10
|
Update of /cvsroot/phpslash/phpslash-ft In directory sc8-pr-cvs1:/tmp/cvs-serv7424/phpslash-ft Modified Files: CHANGES VERSION Log Message: Release 0.7RC2 Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.670 retrieving revision 1.671 diff -C2 -d -r1.670 -r1.671 *** CHANGES 23 Jan 2003 13:38:39 -0000 1.670 --- CHANGES 25 Jan 2003 01:48:07 -0000 1.671 *************** *** 13,16 **** --- 13,22 ---- 9 - Removal of something (kill -9 :) + [R] - Released phpSlash 0.7RC1. + + 2003-January-24 7:30PM CST Joe Stewart <joe...@us...> + [R] - Released phpSlash 0.7RC1. + - VERSION, config-dist.php3, config.php3 - bumped version for release. + 2003-January-23 7:30AM CST Joe Stewart <joe...@us...> [B] - Story.class - fixed getStories alsotext bug. Index: VERSION =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/VERSION,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** VERSION 10 Jan 2003 19:50:24 -0000 1.12 --- VERSION 25 Jan 2003 01:48:07 -0000 1.13 *************** *** 1 **** ! 0.7RC1 --- 1 ---- ! 0.7RC2 |
|
From: Matthew L. <sym...@us...> - 2003-01-23 19:31:22
|
Update of /cvsroot/phpslash/phpslash-ft/public_html
In directory sc8-pr-cvs1:/tmp/cvs-serv23877/public_html
Modified Files:
config-dist.ini.php3 comment.php3 submission.php3
Log Message:
Added directives 'commentnotify' and 'submitnotify' to
config-dist.ini.php3.
Single-quoted the naked strings in submission.php3 and comment.php3
Index: config-dist.ini.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/config-dist.ini.php3,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** config-dist.ini.php3 10 Jan 2003 16:13:43 -0000 1.12
--- config-dist.ini.php3 23 Jan 2003 19:30:54 -0000 1.13
***************
*** 291,294 ****
--- 291,304 ----
;;;
+ ;; Notification Options
+ ;;
+ ;; Notify the site owner when a submission is made (default is false)
+ ; submitnotify = true
+ ;;
+ ;; Notify the site owner when a comment is submitted (default is false)
+ ; commentnotify = true
+ ;;;
+
+ ;;;
;; Story Cache options
;;
Index: comment.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/comment.php3,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** comment.php3 22 Jan 2003 18:23:54 -0000 1.28
--- comment.php3 23 Jan 2003 19:30:56 -0000 1.29
***************
*** 42,46 ****
// when you are previewing a comment before submitting
! $ary[replying_to] = $cmt->formatComment($ary);
$content .= $cmt->getForm($ary);
break;
--- 42,46 ----
// when you are previewing a comment before submitting
! $ary['replying_to'] = $cmt->formatComment($ary);
$content .= $cmt->getForm($ary);
break;
***************
*** 51,55 ****
$content .= "<BR>Click <A HREF=\"" . $return_link . "\">here</A> to go back<BR>\n";
if ($ary['parent_id']) {
! $content .= "<A HREF=\"" . $_PSL[rooturl] . "/comment.php3?submit=view&story_id=$ary[story_id]&comment_id=$ary[parent_id]&mode=flat\">".pslgetText("View Parent Comment")."</A>\n";
}
--- 51,55 ----
$content .= "<BR>Click <A HREF=\"" . $return_link . "\">here</A> to go back<BR>\n";
if ($ary['parent_id']) {
! $content .= "<A HREF=\"" . $_PSL['rooturl'] . "/comment.php3?submit=view&story_id=$ary[story_id]&comment_id=$ary[parent_id]&mode=flat\">".pslgetText("View Parent Comment")."</A>\n";
}
***************
*** 67,71 ****
$content .= $cmt->formatComment($comment_ary);
// send email for new submission.
! if ($_PSL[commentnotify]) {
$mail_ary['tpl'] = "emailNotifyComment";
$mail_ary['vars'] = $ary;
--- 67,71 ----
$content .= $cmt->formatComment($comment_ary);
// send email for new submission.
! if ($_PSL['commentnotify']) {
$mail_ary['tpl'] = "emailNotifyComment";
$mail_ary['vars'] = $ary;
***************
*** 100,117 ****
$auth->login_if(true);
}
! if ($ary[parent_id] != 0) {
! $parent_ary = $cmt->getCommentArray($ary[parent_id]);
$ary['replying_to'] = $cmt->formatComment($parent_ary);
} else {
$story = pslNew("Story");
! $ary['replying_to'] = $story->getStory($ary[story_id],"full");
}
! if ($parent_ary[subject] == "") {
//$ary[subject] = pslgetText("No Subject Given");
} elseif( preg_match ("/Re\:/i",$parent_ary['subject'])) {
! $ary[subject] = $parent_ary[subject];
} else {
! $ary[subject] = pslgetText("Re: ") . $parent_ary[subject];
}
--- 100,117 ----
$auth->login_if(true);
}
! if ($ary['parent_id'] != 0) {
! $parent_ary = $cmt->getCommentArray($ary['parent_id']);
$ary['replying_to'] = $cmt->formatComment($parent_ary);
} else {
$story = pslNew("Story");
! $ary['replying_to'] = $story->getStory($ary['story_id'],"full");
}
! if ($parent_ary['subject'] == "") {
//$ary[subject] = pslgetText("No Subject Given");
} elseif( preg_match ("/Re\:/i",$parent_ary['subject'])) {
! $ary['subject'] = $parent_ary['subject'];
} else {
! $ary['subject'] = pslgetText("Re: ") . $parent_ary['subject'];
}
Index: submission.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/submission.php3,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** submission.php3 23 Jan 2003 02:48:02 -0000 1.19
--- submission.php3 23 Jan 2003 19:30:56 -0000 1.20
***************
*** 54,58 ****
$content .= pslgetText('Thanks for this submission. We have it and will set our fearless editorial staff upon it right this second.') . "<br>\n";
// send email for new submission.
! if ($_PSL[submitnotify]) {
$ary['tpl'] = "emailNotifySubmission";
$ary['vars'] = $HTTP_POST_VARS;
--- 54,58 ----
$content .= pslgetText('Thanks for this submission. We have it and will set our fearless editorial staff upon it right this second.') . "<br>\n";
// send email for new submission.
! if ($_PSL['submitnotify']) {
$ary['tpl'] = "emailNotifySubmission";
$ary['vars'] = $HTTP_POST_VARS;
|
|
From: Joe S. <joe...@us...> - 2003-01-23 13:38:48
|
Update of /cvsroot/phpslash/phpslash-ft In directory sc8-pr-cvs1:/tmp/cvs-serv5125/phpslash-ft Modified Files: CHANGES Log Message: getStories alsotext fixed Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.669 retrieving revision 1.670 diff -C2 -d -r1.669 -r1.670 *** CHANGES 23 Jan 2003 12:03:15 -0000 1.669 --- CHANGES 23 Jan 2003 13:38:39 -0000 1.670 *************** *** 13,16 **** --- 13,20 ---- 9 - Removal of something (kill -9 :) + 2003-January-23 7:30AM CST Joe Stewart <joe...@us...> + [B] - Story.class - fixed getStories alsotext bug. + Mailinglist.class - [ 654473 ] MailingList.class : top domain limit + 2003-January-23 6:00AM CST Joe Stewart <joe...@us...> [W] - Story.class - getStory and getStories alternate template tweaks. |
|
From: Joe S. <joe...@us...> - 2003-01-23 13:38:48
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory sc8-pr-cvs1:/tmp/cvs-serv5125/phpslash-ft/class
Modified Files:
Story.class MailingList.class
Log Message:
getStories alsotext fixed
Index: Story.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Story.class,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** Story.class 23 Jan 2003 12:03:16 -0000 1.50
--- Story.class 23 Jan 2003 13:38:44 -0000 1.51
***************
*** 459,462 ****
--- 459,464 ----
$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");
}
Index: MailingList.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/MailingList.class,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** MailingList.class 23 Jan 2003 02:48:02 -0000 1.15
--- MailingList.class 23 Jan 2003 13:38:44 -0000 1.16
***************
*** 63,67 ****
return false;
}
! if(eregi("([_\.0-9a-z-]+@)([0-9a-z][0-9a-z-]+\.)+([a-z]{2,3})", $address)) {
$ary_address = ($address);
if ($ary_address[0]) {
--- 63,67 ----
return false;
}
! if(eregi("([_\.0-9a-z-]+@)([0-9a-z][0-9a-z-]+\.)+([a-z]{2,7})", $address)) {
$ary_address = ($address);
if ($ary_address[0]) {
|
|
From: Joe S. <joe...@us...> - 2003-01-23 12:03:19
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory sc8-pr-cvs1:/tmp/cvs-serv30540/phpslash-ft/class
Modified Files:
Story.class
Log Message:
getStory and getStories alternate template tweaks
Index: Story.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Story.class,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** Story.class 23 Jan 2003 02:48:03 -0000 1.49
--- Story.class 23 Jan 2003 12:03:16 -0000 1.50
***************
*** 232,236 ****
function getStory($story_id, $mode, $argv_ary="", $tpl="") {
! $default_tpl = "printStory";
/*
* Call to _base layer for getting the Story stuff out the DB
--- 232,236 ----
function getStory($story_id, $mode, $argv_ary="", $tpl="") {
! $default_tpl = "story.tpl";
/*
* Call to _base layer for getting the Story stuff out the DB
***************
*** 305,327 ****
if( ($thestory == "") AND ($mode == "full") ) {
! if( empty($tpl) ) {
! $template = $default_tpl;
! } elseif ( file_exists($this->psl['templatedir'] . "/" . basename($tpl) . ".tpl") ) {
! $tpl_file = basename($tpl) . ".tpl";
! $this->template->set_file(array(
! "template" => "$tpl_file"
! ));
! $template = "template";
} else {
! debug ( "Story.class::getStory:Template file doesn't exist, using default instead", $tpl);
! $template = $default_tpl;
! }
!
/* 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,"alsotext","alsoblock");
! $this->template->set_block($template,"row","rows");
}
--- 305,320 ----
if( ($thestory == "") AND ($mode == "full") ) {
! if( $tpl == '') {
! $this->template->set_file( 'template', $default_tpl);
! } elseif ( $this->template->set_file('template' , basename($tpl) . ".tpl" )) {
} else {
! $this->template->set_file( 'template', $default_tpl);
! }
/* 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',"alsotext","alsoblock");
! $this->template->set_block('template',"row","rows");
}
***************
*** 392,396 ****
}
! $this->template->parse('STORY', $template);
$thestory = $this->template->get('STORY');
if( $cache_ary[$story_name]['expire'] > 0) {
--- 385,389 ----
}
! $this->template->parse('STORY', 'template');
$thestory = $this->template->get('STORY');
if( $cache_ary[$story_name]['expire'] > 0) {
***************
*** 437,441 ****
# debug("Story::getStories.ary", $ary);
! $default_tpl = "indexstory";
$topic_id_ary = array();
--- 430,434 ----
# debug("Story::getStories.ary", $ary);
! $default_tpl = "storyIndex.tpl";
$topic_id_ary = array();
***************
*** 445,463 ****
}
! if( empty($tpl) ) {
! $template = $default_tpl;
! } elseif ( file_exists($this->psl['templatedir'] . "/" . basename($tpl) . ".tpl") ) {
! $tpl_file = basename($tpl) . ".tpl";
! $this->template->set_file(array(
! "template" => "$tpl_file"
! ));
// reset previous values
unset($this->template->varvals['template']);
! unset($this->template->varkeys['template']);
! $template = "template";
} else {
! debug ( "Story.class::getStories:Template file doesn't exist, using default instead", $tpl);
! $template = $default_tpl;
! }
/*
--- 438,450 ----
}
! if( $tpl == '') {
! $this->template->set_file( 'template', $default_tpl);
! } elseif ( $this->template->set_file('template' , basename($tpl) . ".tpl" )) {
// reset previous values
unset($this->template->varvals['template']);
! unset($this->template->varkeys['template']);
} else {
! $this->template->set_file( 'template', $default_tpl);
! }
/*
***************
*** 470,482 ****
all the variables stay there -nh */
if ($this->template->get_var("row") == "") {
! $this->template->set_block("printStory","row","rows");
! $this->template->set_block("printStory","alsotext","alsoblock");
! // $this->template->set_block($template,"row","rows");
! // $this->template->set_block($template,"alsotext","alsoblock");
!
}
-
! $this->template->set_block($template, 'each_story', 'stories');
if (is_array($stories_ary)) {
--- 457,465 ----
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('template', 'each_story', 'stories');
if (is_array($stories_ary)) {
***************
*** 551,555 ****
$this->template->parse('STORY', "printStory");
$thestory = $this->template->get('STORY');
-
$link_argv = $stories_ary[$i]['story_id'];
--- 534,537 ----
***************
*** 595,599 ****
}
}
! $this->template->parse('STORY', $template);
$stories = $this->template->get('STORY');
--- 577,581 ----
}
}
! $this->template->parse('STORY', 'template');
$stories = $this->template->get('STORY');
***************
*** 605,609 ****
# debug("Story::getStories.stories", $stories);
-
return $stories;
--- 587,590 ----
|
|
From: Joe S. <joe...@us...> - 2003-01-23 12:03:18
|
Update of /cvsroot/phpslash/phpslash-ft In directory sc8-pr-cvs1:/tmp/cvs-serv30540/phpslash-ft Modified Files: CHANGES Log Message: getStory and getStories alternate template tweaks Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.668 retrieving revision 1.669 diff -C2 -d -r1.668 -r1.669 *** CHANGES 23 Jan 2003 02:48:02 -0000 1.668 --- CHANGES 23 Jan 2003 12:03:15 -0000 1.669 *************** *** 13,16 **** --- 13,19 ---- 9 - Removal of something (kill -9 :) + 2003-January-23 6:00AM CST Joe Stewart <joe...@us...> + [W] - Story.class - getStory and getStories alternate template tweaks. + 2003-January-22 8:30PM CST Joe Stewart <joe...@us...> [W] - en.php3, Topic.class, Submission.class, Story_admin.class, |
Update of /cvsroot/phpslash/phpslash-ft/class
In directory sc8-pr-cvs1:/tmp/cvs-serv30216/phpslash-ft/class
Modified Files:
MailingList.class Poll.class Section.class Story.class
Story_admin.class Story_base.class Submission.class
Topic.class
Log Message:
Admin messages should be available for translation now.
Index: MailingList.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/MailingList.class,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** MailingList.class 20 Dec 2002 22:17:29 -0000 1.14
--- MailingList.class 23 Jan 2003 02:48:02 -0000 1.15
***************
*** 83,90 ****
WHERE id = '$id'");
switch ($ary[freq]) {
- case "daily":
- $q = "INSERT INTO psl_mailinglist_frequency
- VALUES ('$id','DAY','1')";
- break;
case "weekly":
$q = "INSERT INTO psl_mailinglist_frequency
--- 83,86 ----
***************
*** 95,101 ****
VALUES ('$id','MONTH','30')";
break;
default:
! $this->message = "ERROR! ERROR! We're inside of the insertFrequency switch and hit the default. Now exiting!<BR><BR>\n";
! exit;
}
$this->db->query($q);
--- 91,100 ----
VALUES ('$id','MONTH','30')";
break;
+
+ case "daily":
default:
! $q = "INSERT INTO psl_mailinglist_frequency
! VALUES ('$id','DAY','1')";
! break;
}
$this->db->query($q);
Index: Poll.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Poll.class,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** Poll.class 13 Jan 2003 18:21:01 -0000 1.26
--- Poll.class 23 Jan 2003 02:48:02 -0000 1.27
***************
*** 104,108 ****
$aff = $this->db->affected_rows();
if ($aff > 1) {
! $this->message = "There was a weird number of affected rows when setting the 'current' field to 1: '$aff'";
return false;
};
--- 104,108 ----
$aff = $this->db->affected_rows();
if ($aff > 1) {
! $this->message = pslgetText("There was a weird number of affected rows when setting the 'current' field to 1: ").$aff;
return false;
};
***************
*** 125,129 ****
return $this->db->f('question_id');
} else {
! $this->message = "Either there were no current polls, or more then one? Affected Rows is: '$aff'";
return false;
}
--- 125,129 ----
return $this->db->f('question_id');
} else {
! $this->message = pslgetText("Either there were no current polls, or more then one? Affected Rows is: ").$aff;
return false;
}
***************
*** 151,155 ****
if (!$this->db->next_record()) {
! $this->message = "Couldn't find your question ($question_id) in the DB";
return false;
} else {
--- 151,155 ----
if (!$this->db->next_record()) {
! $this->message = sprintf(pslgetText("Couldn't find your question (%s) in the DB"), $question_id);
return false;
} else {
***************
*** 219,223 ****
return false;
} elseif (empty($ary['choice_ary'][0]) || empty($ary['choice_ary'][1])) {
! $this->message = 'You need to have at least 2 possible answers, otherwise it wouldn\'t be a very effective poll, would it?';
return false;
}
--- 219,223 ----
return false;
} elseif (empty($ary['choice_ary'][0]) || empty($ary['choice_ary'][1])) {
! $this->message = "You need to have at least 2 possible answers, otherwise it wouldn't be a very effective poll, would it?";
return false;
}
***************
*** 248,252 ****
$this->db->query($q);
} else {
! $this->message = "Sorry, I couldn't find your poll when trying to update.\n";
return false;
}
--- 248,252 ----
$this->db->query($q);
} else {
! $this->message = "Sorry, I couldn't find your poll when trying to update.";
return false;
}
***************
*** 259,263 ****
$ary['question_id'] = generateID("psl_comment_dep_seq");
! $timestamp = time();
$query = "INSERT INTO psl_poll_question
(question_id,
--- 259,263 ----
$ary['question_id'] = generateID("psl_comment_dep_seq");
! $timestamp = time();
$query = "INSERT INTO psl_poll_question
(question_id,
***************
*** 282,286 ****
if ($ary['currentqid'] != '') {
if (!$this->makeCurrent($ary['question_id'])) {
! $this->message = "There was an error in setting "$question" as the current poll: $this->message\n";
return false;
}
--- 282,286 ----
if ($ary['currentqid'] != '') {
if (!$this->makeCurrent($ary['question_id'])) {
! $this->message = sprintf(pslgetText("There was an error in setting %s as the current poll:"), $question). $this->message."\n";
return false;
}
***************
*** 293,297 ****
if ($answer == '') {
! $msg .= "Choice $x was ignored<BR>\n";
} else {
if ($vote == '') {
--- 293,297 ----
if ($answer == '') {
! $msg .= sprintf(pslgetText("Choice %s was ignored."), $x)."<BR>\n";
} else {
if ($vote == '') {
***************
*** 313,317 ****
$this->db->query($q);
$answer = stripslashes($answer);
! $msg .= "Choice $x, "$answer" ($vote), was <em>updated</em><br>\n";
} else {
--- 313,317 ----
$this->db->query($q);
$answer = stripslashes($answer);
! $msg .= sprintf(pslgetText("Choice %s, %s (%s), was updated"), $x, $answer, $vote) ."<br>\n";
} else {
***************
*** 327,331 ****
$vote)";
$this->db->query($q);
! $msg .= "Choice $x, "$answer", was <em>inserted</em><br>\n";
}
}
--- 327,331 ----
$vote)";
$this->db->query($q);
! $msg .= sprintf(pslgetText("Choice %s, %s (%s), was inserted"), $x, $answer, $vote) ."<br>\n";
}
}
***************
*** 365,369 ****
$question_text = $this->db->f('question_text');
} else {
! $this->message = "I couldn't find your Poll, $question_id??";
return false;
}
--- 365,369 ----
$question_text = $this->db->f('question_text');
} else {
! $this->message = pslgetText("I couldn't find your Poll, ").$question_id;
return false;
}
***************
*** 391,395 ****
WHERE question_id = '$question_id'";
if (!$this->db->query($q)) {
! $this->message = 'THere was an error removing the votes';
return false;
}
--- 391,395 ----
WHERE question_id = '$question_id'";
if (!$this->db->query($q)) {
! $this->message = 'There was an error removing the votes';
return false;
}
***************
*** 398,402 ****
$del = $cmt->delete('0',$question_id);
}
! $this->message = "Poll "$question_text" was <em>deleted</em><br>\n";
return true;
}
--- 398,402 ----
$del = $cmt->delete('0',$question_id);
}
! $this->message = sprintf(pslgetText("Poll %s was deleted"), $question_test)."<br>\n";
return true;
}
***************
*** 483,487 ****
$this->db->query($query);
if (!$this->db->next_record()) {
! $this->message = "No Poll Found: '$question_id'";
return false;
} else {
--- 483,487 ----
$this->db->query($query);
if (!$this->db->next_record()) {
! $this->message = pslgetText("No Poll Found: ").$question_id;
return false;
} else {
***************
*** 555,559 ****
$this->db->query($q);
! $this->templ->set_var('TITLEBAR', getTitlebar('100%', $this->psl['site_name'] . ' Polls'));
$this->templ->set_block('listpoll', 'newpollbutton');
--- 555,559 ----
$this->db->query($q);
! $this->templ->set_var('TITLEBAR', getTitlebar('100%', $this->psl['site_name'] . pslgetText(' Polls')));
$this->templ->set_block('listpoll', 'newpollbutton');
Index: Section.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Section.class,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Section.class 20 Dec 2002 22:17:29 -0000 1.13
--- Section.class 23 Jan 2003 02:48:03 -0000 1.14
***************
*** 53,66 ****
$section_id = $this->db->Record['section_id'];
! $admin = "<A HREF=\"" . $this->psl['phpself'] ."?submit=edit". $this->psl['amp'] ."section_id=$section_id\">[Edit]</A>";
! $admin .= " <A HREF=\"" . $this->psl['phpself'] ."?submit=delete". $this->psl['amp'] ."section_id=$section_id\">[Delete]</A>";
$this->sec_templ->set_var(array(
! 'TITLEBAR' => getTitlebar("100%","Change Existing Sections"),
'ACTION_URL' => $this->psl['phpself'],
'SECTION_ID' => $this->db->Record['section_id'],
'SECTION_NAME' => $this->db->Record['section_name'],
'SECTION_DESC' => $this->db->Record['description'],
! 'ADMIN' => $admin
));
if ($count%2 == 0) {
--- 53,66 ----
$section_id = $this->db->Record['section_id'];
! $admin = "<A HREF=\"" . $this->psl['phpself'] ."?submit=edit". $this->psl['amp'] ."section_id=$section_id\">".pslgetText("[Edit]")."</A>";
! $admin .= " <A HREF=\"" . $this->psl['phpself'] ."?submit=delete". $this->psl['amp'] ."section_id=$section_id\">".pslgetText("[Delete]")."</A>";
$this->sec_templ->set_var(array(
! 'TITLEBAR' => getTitlebar("100%","Change Existing Sections"),
'ACTION_URL' => $this->psl['phpself'],
'SECTION_ID' => $this->db->Record['section_id'],
'SECTION_NAME' => $this->db->Record['section_name'],
'SECTION_DESC' => $this->db->Record['description'],
! 'ADMIN' => $admin
));
if ($count%2 == 0) {
***************
*** 326,332 ****
while ($this->db->next_record()) {
$section_array[] = array(
! "id" => $this->db->f("section_id"),
! "name" => $this->db->f("section_name")
! );
}
--- 326,332 ----
while ($this->db->next_record()) {
$section_array[] = array(
! "id" => $this->db->f("section_id"),
! "name" => $this->db->f("section_name")
! );
}
Index: Story.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Story.class,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** Story.class 20 Dec 2002 22:17:29 -0000 1.48
--- Story.class 23 Jan 2003 02:48:03 -0000 1.49
***************
*** 133,137 ****
'AUTHOR_ID' => $ary['user_id'],
'AUTHOR_NAME' => $ary['name'],
! 'AUTHOR_REALNAME' => $ary['realname'],
'rows' => ""
));
--- 133,137 ----
'AUTHOR_ID' => $ary['user_id'],
'AUTHOR_NAME' => $ary['name'],
! 'AUTHOR_REALNAME' => $ary['realname'],
'rows' => ""
));
***************
*** 247,266 ****
switch($key) {
! case "tpl":
! // debug("Story::getStory::story_option[$key]", $val);
! $tpl = $ary['story_options'][$key];
$ary['story_options'][$key] = '';
! break;
/* Stub for future needs.
case "example":
! debug("Story::getStory::story_option[$key]", $val);
$ary['story_options'][$key] = '';
! break;
*/
default:
! // pluggable user defined function
if ($this->psl['story_options_udf'] != '') {
$ary = $this->psl['story_options_udf']($key,$ary['story_options'][$key] , $ary);
--- 247,266 ----
switch($key) {
! case "tpl":
! // debug("Story::getStory::story_option[$key]", $val);
! $tpl = $ary['story_options'][$key];
$ary['story_options'][$key] = '';
! break;
/* Stub for future needs.
case "example":
! debug("Story::getStory::story_option[$key]", $val);
$ary['story_options'][$key] = '';
! break;
*/
default:
! // pluggable user defined function
if ($this->psl['story_options_udf'] != '') {
$ary = $this->psl['story_options_udf']($key,$ary['story_options'][$key] , $ary);
***************
*** 273,278 ****
break;
! }
! }
}
--- 273,278 ----
break;
! }
! }
}
***************
*** 322,326 ****
all the variables stay there -nh */
if ($this->template->get_var("row") == "") {
! $this->template->set_block($template,"alsotext","alsoblock");
$this->template->set_block($template,"row","rows");
}
--- 322,326 ----
all the variables stay there -nh */
if ($this->template->get_var("row") == "") {
! $this->template->set_block($template,"alsotext","alsoblock");
$this->template->set_block($template,"row","rows");
}
***************
*** 379,383 ****
if (is_array($topic_id_ary)) {
! $this->template->parse("alsoblock", "alsotext", true);
for ($i = 0 ; $i < count($topic_id_ary) ; $i++) {
$this->template->set_var(array(
--- 379,383 ----
if (is_array($topic_id_ary)) {
! $this->template->parse("alsoblock", "alsotext", true);
for ($i = 0 ; $i < count($topic_id_ary) ; $i++) {
$this->template->set_var(array(
***************
*** 632,637 ****
$vars['body_text'] = format_mail($body_text, "76", "");
! $vars['site_host'] = $HTTP_HOST;
! $vars['php_self'] = $this->psl['phpself'];
$vars['story_id'] = $story_id;
$vars['title'] = ereg_replace("<([^>]*)>", "",$this->story_ary['title']);
--- 632,637 ----
$vars['body_text'] = format_mail($body_text, "76", "");
! $vars['site_host'] = $HTTP_HOST;
! $vars['php_self'] = $this->psl['phpself'];
$vars['story_id'] = $story_id;
$vars['title'] = ereg_replace("<([^>]*)>", "",$this->story_ary['title']);
Index: Story_admin.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Story_admin.class,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Story_admin.class 20 Dec 2002 22:17:30 -0000 1.10
--- Story_admin.class 23 Jan 2003 02:48:03 -0000 1.11
***************
*** 87,95 ****
}
! echo "The storyid is: $story_id<BR>\n";
if ($_PSL['module']['Comment']) {
$comment = pslNew("Comment");
$deleted_comments = $comment->delete("0",$story_id);
! echo "You deleted $deleted_comments comments<BR>\n";
}
--- 87,95 ----
}
! $this->message = pslgetText("The storyid is: ").$story_id."<BR>\n";
if ($_PSL['module']['Comment']) {
$comment = pslNew("Comment");
$deleted_comments = $comment->delete("0",$story_id);
! $this->message .= sprintf(pslgetText("You deleted %s comments"), $deleted_comments)."<BR>\n";
}
***************
*** 108,120 ****
if ($this->db->query($section_del)) {
$section_count = $this->db->affected_rows();
! echo "removed $section_count section pointer(s)<BR>\n";
}
if ($this->db->query($topic_del)) {
$topic_count = $this->db->affected_rows();
! echo "removed $topic_count topic pointer(s)<BR>\n";
}
if ($this->db->query($story_del)) {
$story_count = $this->db->affected_rows();
! echo "removed the story<BR>\n";
}
return true;
--- 108,120 ----
if ($this->db->query($section_del)) {
$section_count = $this->db->affected_rows();
! $this->message .= sprintf(pslgetText("removed %s section pointer(s)"), $section_count)."<BR>\n";
}
if ($this->db->query($topic_del)) {
$topic_count = $this->db->affected_rows();
! $this->message .= sprintf(pslgetText("removed %s topic pointer(s)"), $topic_count)."<BR>\n";
}
if ($this->db->query($story_del)) {
$story_count = $this->db->affected_rows();
! $this->message .= pslgetText("removed the story")."<BR>\n";
}
return true;
***************
*** 420,429 ****
if ($i%2 == 0) {
! $this->template->parse("rows","row","true");
! } else {
$this->template->parse("rows","row2","true");
! }
! $i++;
! }
}
--- 420,429 ----
if ($i%2 == 0) {
! $this->template->parse("rows","row","true");
! } else {
$this->template->parse("rows","row2","true");
! }
! $i++;
! }
}
***************
*** 511,600 ****
'TYPE' => "hidden",
'TIME_VALUE' => $ary['datetime']
! ));
! $this->template->parse("datetime_rows","datetime_row",true);
} else {
! $datetime = split( ' ', $ary['datetime']);
! $story_date = split( '-', $datetime[0]);
! $story_time = split( ':', $datetime[1]);
// setup year select box
! for( $i=1998; $i<2009; $i++) {
$this->template->set_var(array(
! 'SELECTED' => '',
! 'STORYYEAR' => $i
));
if( $i == $story_date[0]) {
$this->template->set_var('SELECTED', "selected=\"selected\"");
! }
! $this->template->parse("year_rows","year_row",true);
! }
// setup month select box
! for( $i=1; $i<=12; $i++) {
$this->template->set_var(array(
! 'SELECTED' => '',
! 'STORYMONTH' => sprintf( "%02d", $i)
));
if( $i == $story_date[1]) {
$this->template->set_var('SELECTED', "selected=\"selected\"");
! }
! $this->template->parse("month_rows","month_row",true);
! }
! // setup day select box
! for( $i=1; $i<=31; $i++) {
$this->template->set_var(array(
! 'SELECTED' => '',
! 'STORYDAY' => sprintf( "%02d", $i)
));
if( $i == $story_date[2]) {
$this->template->set_var('SELECTED', "selected=\"selected\"");
! }
! $this->template->parse("day_rows","day_row",true);
! }
// setup hour select box
! for( $i=1; $i<=24; $i++) {
$this->template->set_var(array(
'TYPE' => 'select',
! 'SELECTED' => '',
'STORYHOUR' => $i
));
if( $i == $story_time[0]) {
$this->template->set_var('SELECTED', "selected=\"selected\"");
! }
! $this->template->parse("hour_rows","hour_row",true);
! }
// setup minute select box
! for( $i=1; $i<=60; $i++) {
$this->template->set_var(array(
'TYPE' => 'select',
! 'SELECTED' => '',
! 'STORYMINUTE' => sprintf( "%02d", $i)
));
if( $i == $story_time[1]) {
$this->template->set_var('SELECTED', "selected=\"selected\"");
! }
! $this->template->parse("minute_rows","minute_row",true);
! }
// setup seconds select box
! for( $i=1; $i<=60; $i++) {
$this->template->set_var(array(
'TYPE' => 'select',
! 'SELECTED' => '',
! 'STORYSECOND' => sprintf( "%02d", $i)
));
if( $i == $story_time[2]) {
$this->template->set_var('SELECTED', "selected=\"selected\"");
! }
! $this->template->parse("second_rows","second_row",true);
! }
! $this->template->parse("datetimeset_rows","datetimeset_row",true);
}
$this->template = displayOptions('story', $this->template, "newstory", '');
! if ($ary['content'] == "plain") {
$this->template->set_var('PLAIN_CHKBOX',"CHECKED");
$this->template->set_var('HTML_CHKBOX',"");
--- 511,600 ----
'TYPE' => "hidden",
'TIME_VALUE' => $ary['datetime']
! ));
! $this->template->parse("datetime_rows","datetime_row",true);
} else {
! $datetime = split( ' ', $ary['datetime']);
! $story_date = split( '-', $datetime[0]);
! $story_time = split( ':', $datetime[1]);
// setup year select box
! for( $i=1998; $i<2009; $i++) {
$this->template->set_var(array(
! 'SELECTED' => '',
! 'STORYYEAR' => $i
));
if( $i == $story_date[0]) {
$this->template->set_var('SELECTED', "selected=\"selected\"");
! }
! $this->template->parse("year_rows","year_row",true);
! }
// setup month select box
! for( $i=1; $i<=12; $i++) {
$this->template->set_var(array(
! 'SELECTED' => '',
! 'STORYMONTH' => sprintf( "%02d", $i)
));
if( $i == $story_date[1]) {
$this->template->set_var('SELECTED', "selected=\"selected\"");
! }
! $this->template->parse("month_rows","month_row",true);
! }
! // setup day select box
! for( $i=1; $i<=31; $i++) {
$this->template->set_var(array(
! 'SELECTED' => '',
! 'STORYDAY' => sprintf( "%02d", $i)
));
if( $i == $story_date[2]) {
$this->template->set_var('SELECTED', "selected=\"selected\"");
! }
! $this->template->parse("day_rows","day_row",true);
! }
// setup hour select box
! for( $i=1; $i<=24; $i++) {
$this->template->set_var(array(
'TYPE' => 'select',
! 'SELECTED' => '',
'STORYHOUR' => $i
));
if( $i == $story_time[0]) {
$this->template->set_var('SELECTED', "selected=\"selected\"");
! }
! $this->template->parse("hour_rows","hour_row",true);
! }
// setup minute select box
! for( $i=1; $i<=60; $i++) {
$this->template->set_var(array(
'TYPE' => 'select',
! 'SELECTED' => '',
! 'STORYMINUTE' => sprintf( "%02d", $i)
));
if( $i == $story_time[1]) {
$this->template->set_var('SELECTED', "selected=\"selected\"");
! }
! $this->template->parse("minute_rows","minute_row",true);
! }
// setup seconds select box
! for( $i=1; $i<=60; $i++) {
$this->template->set_var(array(
'TYPE' => 'select',
! 'SELECTED' => '',
! 'STORYSECOND' => sprintf( "%02d", $i)
));
if( $i == $story_time[2]) {
$this->template->set_var('SELECTED', "selected=\"selected\"");
! }
! $this->template->parse("second_rows","second_row",true);
! }
! $this->template->parse("datetimeset_rows","datetimeset_row",true);
}
$this->template = displayOptions('story', $this->template, "newstory", '');
! if ($ary['content'] == "plain") {
$this->template->set_var('PLAIN_CHKBOX',"CHECKED");
$this->template->set_var('HTML_CHKBOX',"");
***************
*** 657,661 ****
(MPL - 11/18/2002) */
$this->db->Record['time'] = date("Y-m-d H:i:s",$this->db->Record['date_available']);
! echo "time: " . $this->db->Record['time'] . "\n<br>";
$this->template->set_var(array(
--- 657,661 ----
(MPL - 11/18/2002) */
$this->db->Record['time'] = date("Y-m-d H:i:s",$this->db->Record['date_available']);
! // echo "time: " . $this->db->Record['time'] . "\n<br>";
$this->template->set_var(array(
***************
*** 676,680 ****
( $user_id != $this->auth->auth['uid'])) {
return false;
! }
/* if storyeditor, enable setting of date, otherwise display date */
--- 676,680 ----
( $user_id != $this->auth->auth['uid'])) {
return false;
! }
/* if storyeditor, enable setting of date, otherwise display date */
***************
*** 683,771 ****
'TYPE' => "hidden",
'TIME_VALUE' => $this->db->Record['time']
! ));
! $this->template->parse("datetime_rows","datetime_row",true);
} else {
! $datetime = split( ' ', $this->db->Record['time']);
! $story_date = split( '-', $datetime[0]);
! $story_time = split( ':', $datetime[1]);
// setup year select box
! for( $i=1998; $i<2009; $i++) {
$this->template->set_var(array(
! 'SELECTED' => '',
! 'STORYYEAR' => $i
));
if( $i == $story_date[0]) {
$this->template->set_var('SELECTED', "selected=\"selected\"");
! }
! $this->template->parse("year_rows","year_row",true);
! }
// setup month select box
! for( $i=1; $i<=12; $i++) {
$this->template->set_var(array(
! 'TYPE' => 'select',
! 'SELECTED' => '',
! 'STORYMONTH' => sprintf( "%02d", $i)
));
if( $i == $story_date[1]) {
$this->template->set_var('SELECTED', "selected=\"selected\"");
! }
! $this->template->parse("month_rows","month_row",true);
! }
! // setup day select box
! for( $i=1; $i<=31; $i++) {
$this->template->set_var(array(
! 'TYPE' => 'select',
! 'SELECTED' => '',
! 'STORYDAY' => sprintf( "%02d", $i)
));
if( $i == $story_date[2]) {
$this->template->set_var('SELECTED', "selected=\"selected\"");
! }
! $this->template->parse("day_rows","day_row",true);
! }
// setup hour select box
! for( $i=1; $i<=24; $i++) {
$this->template->set_var(array(
! 'TYPE' => 'select',
! 'SELECTED' => '',
! 'STORYHOUR' => $i
));
if( $i == $story_time[0]) {
$this->template->set_var('SELECTED', "selected=\"selected\"");
! }
! $this->template->parse("hour_rows","hour_row",true);
! }
// setup minute select box
! for( $i=1; $i<=60; $i++) {
$this->template->set_var(array(
'TYPE' => 'select',
! 'SELECTED' => '',
! 'STORYMINUTE' => sprintf( "%02d", $i)
));
if( $i == $story_time[1]) {
$this->template->set_var('SELECTED', "selected=\"selected\"");
! }
! $this->template->parse("minute_rows","minute_row",true);
! }
// setup seconds select box
! for( $i=1; $i<=60; $i++) {
$this->template->set_var(array(
'TYPE' => 'select',
! 'SELECTED' => '',
! 'STORYSECOND' => sprintf( "%02d", $i)
));
if( $i == $story_time[2]) {
$this->template->set_var('SELECTED', "selected=\"selected\"");
! }
! $this->template->parse("second_rows","second_row",true);
! }
! $this->template->parse("datetimeset_rows","datetimeset_row",true);
}
--- 683,771 ----
'TYPE' => "hidden",
'TIME_VALUE' => $this->db->Record['time']
! ));
! $this->template->parse("datetime_rows","datetime_row",true);
} else {
! $datetime = split( ' ', $this->db->Record['time']);
! $story_date = split( '-', $datetime[0]);
! $story_time = split( ':', $datetime[1]);
// setup year select box
! for( $i=1998; $i<2009; $i++) {
$this->template->set_var(array(
! 'SELECTED' => '',
! 'STORYYEAR' => $i
));
if( $i == $story_date[0]) {
$this->template->set_var('SELECTED', "selected=\"selected\"");
! }
! $this->template->parse("year_rows","year_row",true);
! }
// setup month select box
! for( $i=1; $i<=12; $i++) {
$this->template->set_var(array(
! 'TYPE' => 'select',
! 'SELECTED' => '',
! 'STORYMONTH' => sprintf( "%02d", $i)
));
if( $i == $story_date[1]) {
$this->template->set_var('SELECTED', "selected=\"selected\"");
! }
! $this->template->parse("month_rows","month_row",true);
! }
! // setup day select box
! for( $i=1; $i<=31; $i++) {
$this->template->set_var(array(
! 'TYPE' => 'select',
! 'SELECTED' => '',
! 'STORYDAY' => sprintf( "%02d", $i)
));
if( $i == $story_date[2]) {
$this->template->set_var('SELECTED', "selected=\"selected\"");
! }
! $this->template->parse("day_rows","day_row",true);
! }
// setup hour select box
! for( $i=1; $i<=24; $i++) {
$this->template->set_var(array(
! 'TYPE' => 'select',
! 'SELECTED' => '',
! 'STORYHOUR' => $i
));
if( $i == $story_time[0]) {
$this->template->set_var('SELECTED', "selected=\"selected\"");
! }
! $this->template->parse("hour_rows","hour_row",true);
! }
// setup minute select box
! for( $i=1; $i<=60; $i++) {
$this->template->set_var(array(
'TYPE' => 'select',
! 'SELECTED' => '',
! 'STORYMINUTE' => sprintf( "%02d", $i)
));
if( $i == $story_time[1]) {
$this->template->set_var('SELECTED', "selected=\"selected\"");
! }
! $this->template->parse("minute_rows","minute_row",true);
! }
// setup seconds select box
! for( $i=1; $i<=60; $i++) {
$this->template->set_var(array(
'TYPE' => 'select',
! 'SELECTED' => '',
! 'STORYSECOND' => sprintf( "%02d", $i)
));
if( $i == $story_time[2]) {
$this->template->set_var('SELECTED', "selected=\"selected\"");
! }
! $this->template->parse("second_rows","second_row",true);
! }
! $this->template->parse("datetimeset_rows","datetimeset_row",true);
}
***************
*** 775,782 ****
$this->template->set_var(array(
! 'ACTION_URL' => "storyAdmin.php3",
# 'AUTHOR_ID' => $author_id,
# 'AUTHOR_NAME' => $author_name,
! 'STORY_ID' => $story_id
));
--- 775,782 ----
$this->template->set_var(array(
! 'ACTION_URL' => "storyAdmin.php3",
# 'AUTHOR_ID' => $author_id,
# 'AUTHOR_NAME' => $author_name,
! 'STORY_ID' => $story_id
));
Index: Story_base.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Story_base.class,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** Story_base.class 11 Dec 2002 19:39:55 -0000 1.21
--- Story_base.class 23 Jan 2003 02:48:03 -0000 1.22
***************
*** 63,69 ****
story.intro_text,
story.body_text,
! story.hits,
story.topic_cache,
! story.story_options,
psl_author.author_name AS name,
psl_author.author_realname AS realname,
--- 63,69 ----
story.intro_text,
story.body_text,
! story.hits,
story.topic_cache,
! story.story_options,
psl_author.author_name AS name,
psl_author.author_realname AS realname,
***************
*** 193,197 ****
psl_story.hits,
psl_story.story_options,
! psl_author.author_name,
psl_author.author_realname,
psl_author.url,
--- 193,197 ----
psl_story.hits,
psl_story.story_options,
! psl_author.author_name,
psl_author.author_realname,
psl_author.url,
***************
*** 226,230 ****
if( empty($argv_ary['date'])) {
$argv_ary['date'] = date("Y-m-d H:i:s");
! $argv_ary['date_available'] = time();
} else {
// kludge to keep the cal block working - jvs - 04/05/2001
--- 226,230 ----
if( empty($argv_ary['date'])) {
$argv_ary['date'] = date("Y-m-d H:i:s");
! $argv_ary['date_available'] = time();
} else {
// kludge to keep the cal block working - jvs - 04/05/2001
***************
*** 234,239 ****
* 11/15/2002) */
$argv_ary['date'] = intval($argv_ary['date'])+1;
! $argv_ary['date_available'] = strtotime($argv_ary['date']);
! }
while( $each_argv = each($argv_ary) ) {
--- 234,239 ----
* 11/15/2002) */
$argv_ary['date'] = intval($argv_ary['date'])+1;
! $argv_ary['date_available'] = strtotime($argv_ary['date']);
! }
while( $each_argv = each($argv_ary) ) {
***************
*** 285,289 ****
// $q .= "AND to_days('$argv_ary[date]') >= to_days(time) ";
//$q .= "AND ('$argv_ary[date]') >= time ";
! $q .= "AND $argv_ary[date_available] >= psl_story.date_available ";
break;
--- 285,289 ----
// $q .= "AND to_days('$argv_ary[date]') >= to_days(time) ";
//$q .= "AND ('$argv_ary[date]') >= time ";
! $q .= "AND $argv_ary[date_available] >= psl_story.date_available ";
break;
***************
*** 410,414 ****
$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]);
}
$unique_stories++;
--- 410,414 ----
$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]);
}
$unique_stories++;
***************
*** 473,486 ****
/* removed because if there's no ID then we insert, else we update...
if ($ary['story_id'] == "") {
! error ("There is no story_id in Story.class::saveStory");
return false;
}
*/
if ($topic_id_ary[0] == "") {
! $this->message = "You need to select at least one <B>topic</B> in Story.class::saveStory";
return false;
}
if ($section_id_ary[0] == "") {
! $this->message = "You need to select at least one <B>section</B> in Story.class::saveStory";
return false;
}
--- 473,486 ----
/* removed because if there's no ID then we insert, else we update...
if ($ary['story_id'] == "") {
! $this->message = pslgetText("There is no story_id in Story.class::saveStory");
return false;
}
*/
if ($topic_id_ary[0] == "") {
! $this->message = "You need to select at least one topic in Story.class::saveStory";
return false;
}
if ($section_id_ary[0] == "") {
! $this->message = "You need to select at least one section in Story.class::saveStory";
return false;
}
***************
*** 521,528 ****
if( $optionname_ary[$i] != "") {
! $optname = $optionname_ary[$i];
! $optval = $optionval_ary[$i];
! $story_options_ary[$optname] = $optval;
! }
}
--- 521,528 ----
if( $optionname_ary[$i] != "") {
! $optname = $optionname_ary[$i];
! $optval = $optionval_ary[$i];
! $story_options_ary[$optname] = $optval;
! }
}
***************
*** 536,546 ****
SET user_id = '$ary[author_id]',
title = '$ary[title]',
! date_available = $ary[timestamp],
! order_no = '$ary[order_no]',
dept = '$ary[dept]',
intro_text = '$ary[intro_text]',
body_text = '$ary[body_text]',
topic_cache = '',
! story_options = '$serial_opts'
WHERE story_id = '$ary[story_id]'";
--- 536,546 ----
SET user_id = '$ary[author_id]',
title = '$ary[title]',
! date_available = $ary[timestamp],
! order_no = '$ary[order_no]',
dept = '$ary[dept]',
intro_text = '$ary[intro_text]',
body_text = '$ary[body_text]',
topic_cache = '',
! story_options = '$serial_opts'
WHERE story_id = '$ary[story_id]'";
***************
*** 566,581 ****
// echo "<B>STORY ID: $ary[story_id]</B><BR><BR>\n";
! # set the formatting options for new submissions only
! if ($ary['content'] == "exttrans") {
! $ary['intro_text'] = htmlentities($ary['intro_text']);
! $ary['body_text'] = htmlentities($ary['body_text']);
! }
! if ($ary['content'] == "plain" or $ary['content'] == "exttrans") {
! $ary['intro_text'] = nl2br($ary['intro_text']);
! $ary['intro_text'] = ereg_replace("<br><br>","<br>",$ary['intro_text']);
! $ary['body_text'] = nl2br($ary[body_text]);
! $ary['body_text'] = ereg_replace("<br><br>","<br>",$ary['body_text']);
! }
--- 566,581 ----
// echo "<B>STORY ID: $ary[story_id]</B><BR><BR>\n";
! # set the formatting options for new submissions only
! if ($ary['content'] == "exttrans") {
! $ary['intro_text'] = htmlentities($ary['intro_text']);
! $ary['body_text'] = htmlentities($ary['body_text']);
! }
! if ($ary['content'] == "plain" or $ary['content'] == "exttrans") {
! $ary['intro_text'] = nl2br($ary['intro_text']);
! $ary['intro_text'] = ereg_replace("<br><br>","<br>",$ary['intro_text']);
! $ary['body_text'] = nl2br($ary[body_text]);
! $ary['body_text'] = ereg_replace("<br><br>","<br>",$ary['body_text']);
! }
***************
*** 590,595 ****
date_available,
hits,
! topic_cache,
! story_options)
VALUES ('$ary[story_id]',
'$ary[author_id]',
--- 590,595 ----
date_available,
hits,
! topic_cache,
! story_options)
VALUES ('$ary[story_id]',
'$ary[author_id]',
***************
*** 601,607 ****
$ary[timestamp],
'0',
! '',
! '$serial_opts')";
! debug("Story_base::saveStory: insert query",$q);
$this->db->query($q);
--- 601,607 ----
$ary[timestamp],
'0',
! '',
! '$serial_opts')";
! // debug("Story_base::saveStory: insert query",$q);
$this->db->query($q);
***************
*** 662,667 ****
function cacheStory( $ary, $field="", $story_id="") {
! debug( "Story.class::cacheStory::ary", $ary);
! debug( "Story.class::cacheStory::field", $field);
$now = time();
--- 662,667 ----
function cacheStory( $ary, $field="", $story_id="") {
! // debug( "Story.class::cacheStory::ary", $ary);
! // debug( "Story.class::cacheStory::field", $field);
$now = time();
***************
*** 669,679 ****
if( !$story_id){
$elapsed = $now - $ary[$field]['update'];
! debug( "Story.class::cacheStory::elapsed", $elapsed);
if ( ($now - $ary[$field]['update']) < $ary[$field]['expire'] ) {
! debug("Story.class::cacheStory::using $field cache", "");
$cache = $ary[$field]['cache'];
} else {
! debug("Story.class::cacheStory::not using $field cache", "");
$cache = "";
}
--- 669,679 ----
if( !$story_id){
$elapsed = $now - $ary[$field]['update'];
! // debug( "Story.class::cacheStory::elapsed", $elapsed);
if ( ($now - $ary[$field]['update']) < $ary[$field]['expire'] ) {
! // debug("Story.class::cacheStory::using $field cache", "");
$cache = $ary[$field]['cache'];
} else {
! // debug("Story.class::cacheStory::not using $field cache", "");
$cache = "";
}
***************
*** 685,701 ****
/* if there are no "expire" fields greater than zero,
then, we're not using the cache and so don't write to db
! */
! if ( ($ary[$field_name]['expire'] > 0) AND
($now - $ary[$field]['update']) > $ary[$field]['expire'] ) {
! $expired = true;
}
}
if( $expired == true) {
! $serial_cache = addslashes(serialize($ary));
$qc = "UPDATE psl_story
SET topic_cache = '$serial_cache'
WHERE story_id = '$story_id'";
! debug("Story.class::cacheStory::updating cache", $qc);
$query_result = $this->db->query($qc);
}
--- 685,701 ----
/* if there are no "expire" fields greater than zero,
then, we're not using the cache and so don't write to db
! */
! if ( ($ary[$field_name]['expire'] > 0) AND
($now - $ary[$field]['update']) > $ary[$field]['expire'] ) {
! $expired = true;
}
}
if( $expired == true) {
! $serial_cache = addslashes(serialize($ary));
$qc = "UPDATE psl_story
SET topic_cache = '$serial_cache'
WHERE story_id = '$story_id'";
! // debug("Story.class::cacheStory::updating cache", $qc);
$query_result = $this->db->query($qc);
}
Index: Submission.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Submission.class,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Submission.class 20 Dec 2002 22:17:30 -0000 1.15
--- Submission.class 23 Jan 2003 02:48:03 -0000 1.16
***************
*** 50,61 ****
$ary['name'] = $this->db->f("name");
$ary['email'] = $this->db->f("email");
! $ary['datef'] = psl_dateTimeLong($this->db->f('date_created'));
$this->message = $this->showSubmission($ary);
! $success = true;
} else {
$this->message = sprintf(pslgetText("No Submission Found: %s"), $submission_id);
! $success = false;
}
--- 50,61 ----
$ary['name'] = $this->db->f("name");
$ary['email'] = $this->db->f("email");
! $ary['datef'] = psl_dateTimeLong($this->db->f('date_created'));
$this->message = $this->showSubmission($ary);
! $success = true;
} else {
$this->message = sprintf(pslgetText("No Submission Found: %s"), $submission_id);
! $success = false;
}
***************
*** 120,124 ****
'EMAIL' => $this->db->Record["email"],
'NAME' => $this->db->Record["name"],
! 'TIME' => psl_time12($this->db->Record["date_created"]),
'DATE' => psl_dateShort($this->db->Record["date_created"])
));
--- 120,124 ----
'EMAIL' => $this->db->Record["email"],
'NAME' => $this->db->Record["name"],
! 'TIME' => psl_time12($this->db->Record["date_created"]),
'DATE' => psl_dateShort($this->db->Record["date_created"])
));
***************
*** 139,143 ****
if ($count > $first) {
$this->templ->set_var(array(
! 'MORE_LINK' => "<a href=\"" . $this->psl['phpself'] . "?next=$first\">$left More</a>"
));
}
--- 139,143 ----
if ($count > $first) {
$this->templ->set_var(array(
! 'MORE_LINK' => "<a href=\"" . $this->psl['phpself'] . "?next=$first\">".$left .pslgetText("More")."</a>"
));
}
***************
*** 299,307 ****
if ($topic_id_ary[0] == "") {
! $this->message = pslgetText("You need to select at least one <B>topic</B> in Submission.class::saveSubmission");
return false;
}
if ($section_id_ary[0] == "") {
! $this->message = pslgetText("You need to select at least one <B>section</B> in Submission.class::saveSubmission");
return false;
}
--- 299,307 ----
if ($topic_id_ary[0] == "") {
! $this->message = pslgetText("You need to select at least one topic in Submission.class::saveSubmission");
return false;
}
if ($section_id_ary[0] == "") {
! $this->message = pslgetText("You need to select at least one section in Submission.class::saveSubmission");
return false;
}
***************
*** 321,325 ****
$ary['email'] = clean($ary['email']);
$ary['subject'] = clean($ary['subject']);
! // $ary['story'] = clean($ary['story']);
$ary['story'] = str_replace("'","'", $ary['story']);
--- 321,325 ----
$ary['email'] = clean($ary['email']);
$ary['subject'] = clean($ary['subject']);
! // $ary['story'] = clean($ary['story']);
$ary['story'] = str_replace("'","'", $ary['story']);
***************
*** 357,369 ****
$ary['story'] = nl2br($ary['story']);
$ary['story'] = ereg_replace("<br><br>","<br>",$ary['story']);
! }
if ($ary['content'] == "exttrans") {
$ary['story'] = htmlentities($ary['story']);
}
!
!
$ary['submission_id'] = generateID("psl_submission_seq");
! $timestamp = time();
$q = "INSERT INTO psl_submission
(story_id,
--- 357,368 ----
$ary['story'] = nl2br($ary['story']);
$ary['story'] = ereg_replace("<br><br>","<br>",$ary['story']);
! }
if ($ary['content'] == "exttrans") {
$ary['story'] = htmlentities($ary['story']);
}
!
$ary['submission_id'] = generateID("psl_submission_seq");
! $timestamp = time();
$q = "INSERT INTO psl_submission
(story_id,
***************
*** 440,444 ****
$affected = $this->db->affected_rows();
# echo "The Query: <BR><BR>$submission<BR><BR>affected $affected row(s)<BR><BR>\n";
! return true;
} else {
--- 439,443 ----
$affected = $this->db->affected_rows();
# echo "The Query: <BR><BR>$submission<BR><BR>affected $affected row(s)<BR><BR>\n";
! return true;
} else {
***************
*** 468,472 ****
$ary = $this->db->Record;
! $ary['intro_text'] = "Submission by <A HREF=\"" . htmlspecialchars($this->db->f("email")) . "\">" . $this->db->f("name") . "</A>\n<P>\n" . dirty($this->db->f("intro_text"));
/* get the topic_id's for this story into an array */
--- 467,471 ----
$ary = $this->db->Record;
! $ary['intro_text'] = pslgetText("Submission by ") ."<a href=\"" . htmlspecialchars($this->db->f("email")) . "\">" . $this->db->f("name") . "</a>\n<p>\n" . dirty($this->db->f("intro_text"));
/* get the topic_id's for this story into an array */
Index: Topic.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Topic.class,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Topic.class 20 Dec 2002 22:17:30 -0000 1.15
--- Topic.class 23 Jan 2003 02:48:03 -0000 1.16
***************
*** 68,76 ****
$topic_id = $this->db->Record[topic_id];
if ($this->perm->have_perm("topicEdit")) {
! $admin = "<A HREF=\"" . $this->psl['phpself'] . "?submit=edit" . $this->psl['amp'] . "topic_id=$topic_id\">[Edit]</A>";
! $admin .= " <A HREF=\"" . $this->psl['phpself'] . "?submit=delete" . $this->psl['amp'] . "topic_id=$topic_id\">[Delete]</A>";
} else {
! $admin = " <A HREF=\"" . $this->psl['phpself'] . "?submit=delete" . $this->psl['amp'] . "topic_id=$topic_id\">[Delete]</A>";
}
$this->topic_templ->set_var(array(
--- 68,76 ----
$topic_id = $this->db->Record[topic_id];
if ($this->perm->have_perm("topicEdit")) {
! $admin = "<A HREF=\"" . $this->psl['phpself'] . "?submit=edit" . $this->psl['amp'] . "topic_id=$topic_id\">".pslgetText("[Edit]")."</A>";
! $admin .= " <A HREF=\"" . $this->psl['phpself'] . "?submit=delete" . $this->psl['amp'] . "topic_id=$topic_id\">".pslgetText("[Delete]")."</A>";
} else {
! $admin = " <A HREF=\"" . $this->psl['phpself'] . "?submit=delete" . $this->psl['amp'] . "topic_id=$topic_id\">".pslgetText("[Delete]")."</A>";
}
$this->topic_templ->set_var(array(
***************
*** 87,97 ****
'ADMIN' => $admin
));
! if ($i%2 == 0) {
$this->topic_templ->parse("rows","row",true);
! } else {
$this->topic_templ->parse("rows","row2",true);
! }
! $i++;
! };
return $this->topic_templ->parse('OUT',array("listtopic"));
// $this->topic_templ->p('OUT');
--- 87,97 ----
'ADMIN' => $admin
));
! if ($i%2 == 0) {
$this->topic_templ->parse("rows","row",true);
! } else {
$this->topic_templ->parse("rows","row2",true);
! }
! $i++;
! }
return $this->topic_templ->parse('OUT',array("listtopic"));
// $this->topic_templ->p('OUT');
***************
*** 229,233 ****
$story_id = $this->db->Record["story_id"];
$topic_name = $this->db->Record["topic_name"];
! $this->message .= "Sorry, ths story is assigned to this topic:";
$this->message .= "<font color=\"red\">'$title'</font><br />\n";
}
--- 229,233 ----
$story_id = $this->db->Record["story_id"];
$topic_name = $this->db->Record["topic_name"];
! $this->message .= pslgetText("Sorry, ths story is assigned to this topic:");
$this->message .= "<font color=\"red\">'$title'</font><br />\n";
}
***************
*** 247,251 ****
$story_id = $this->db->Record["story_id"];
$topic_name = $this->db->Record["topic_name"];
! $this->message .= "Sorry, this submission is assigned to this topic:";
$this->message .= "<font color=\"red\">'$title'</font><br />\n";
}
--- 247,251 ----
$story_id = $this->db->Record["story_id"];
$topic_name = $this->db->Record["topic_name"];
! $this->message .= pslgetText("Sorry, this submission is assigned to this topic:");
$this->message .= "<font color=\"red\">'$title'</font><br />\n";
}
***************
*** 258,262 ****
WHERE topic_id = '$topic_id'";
$this->db->query($q);
! $this->message .= "<i>Topic deleted</i>";
return true;
--- 258,262 ----
WHERE topic_id = '$topic_id'";
$this->db->query($q);
! $this->message .= pslgetText("Topic deleted");
return true;
***************
*** 277,281 ****
if($ary["topic_id"] == "") {
$this->topic_templ->set_var(array(
! 'TITLEBAR' => getTitlebar("100%","Add a new Topic"),
'TOPICIMAGESDIR' => $this->psl['topicimagedir'],
'TOPIC_ID' => "",
--- 277,281 ----
if($ary["topic_id"] == "") {
$this->topic_templ->set_var(array(
! 'TITLEBAR' => getTitlebar("100%","Add a new Topic"),
'TOPICIMAGESDIR' => $this->psl['topicimagedir'],
'TOPIC_ID' => "",
***************
*** 297,301 ****
$this->db->next_record();
$this->topic_templ->set_var(array(
! 'TITLEBAR' => getTitlebar("100%","Edit Topic"),
'IMAGE_SRC' => $image,
'TOPICIMAGESDIR' => $this->psl['topicimagedir'],
--- 297,301 ----
$this->db->next_record();
$this->topic_templ->set_var(array(
! 'TITLEBAR' => getTitlebar("100%","Edit Topic"),
'IMAGE_SRC' => $image,
'TOPICIMAGESDIR' => $this->psl['topicimagedir'],
***************
*** 353,357 ****
if( $option != "all") {
$result = getTitlebar("100%","Display Topic Images");
! $result .= "<A HREF=" . $this->psl['phpself'] . "?submit=display" . $this->psl['amp'] . "option=all>[Display all possible topic images]</A>";
} else {
$this->topic_templ->set_var("TITLEBAR", getTitlebar("100%","Display Topic Images"));
--- 353,357 ----
if( $option != "all") {
$result = getTitlebar("100%","Display Topic Images");
! $result .= "<A HREF=" . $this->psl['phpself'] . "?submit=display" . $this->psl['amp'] . "option=all>".pslgetText("[Display all possible topic images]")."</A>";
} else {
$this->topic_templ->set_var("TITLEBAR", getTitlebar("100%","Display Topic Images"));
***************
*** 453,459 ****
while ($this->db->next_record()) {
$topic_array[] = array(
! "id" => $this->db->f("topic_id"),
! "name" => $this->db->f("topic_name")
! );
}
--- 453,459 ----
while ($this->db->next_record()) {
$topic_array[] = array(
! "id" => $this->db->f("topic_id"),
! "name" => $this->db->f("topic_name")
! );
}
***************
*** 523,601 ****
if ($is_onlinkbar > 0) {
! // this means that the topic id is already
! // on the link bar...
! if ($is_onlinkbar > 1) {
! // when the link is one, we do nothing
! // but when it's greater, we take the ones
! // before, update them, and then
! // put the is_onlinkbar ID in the first
! // slot
! //
! // 1) begin work:
! $q = "BEGIN WORK";
! $this->db->query($q);
! // 2) update values of onlinkbar
! $q = "UPDATE psl_topic
! SET onlinkbar=onlinkbar+1
! WHERE onlinkbar > 0 && onlinkbar < '$is_onlinkbar'";
! $this->db->query($q);
// 3) put this topic_id as first item in bar
! $q = "UPDATE psl_topic
! SET onlinkbar=1
! WHERE topic_id = '$topic_id'";
! $this->db->query($q);
! // 4) commit and release table
! $q = "COMMIT";
! $this->db->query($q);
! // this might not be necessary,
! // but hey, you never know! -luis m
! if ($this->db->affected_rows() > 0) {
! return true;
! }else{
! return false;
! }
! } else {
// is_onlinkbar is ONE, return true.
return true;
! }// end is_onlinkbar > 1
} else {
! // 1) begin work:
! $q = "BEGIN WORK";
! $this->db->query($q);
! // 2) update values of onlinkbar
! $q = "UPDATE psl_topic
! SET onlinkbar=onlinkbar+1
! WHERE onlinkbar != 0";
! $this->db->query($q);
! // 3) purge values higher than LIMIT
! $q = "UPDATE psl_topic
! SET onlinkbar=0
! WHERE onlinkbar > '$limit'";
! $this->db->query($q);
! // 4) put this topic_id as first item in bar
! $q = "UPDATE psl_topic
! SET onlinkbar=1
! WHERE topic_id = '$topic_id'";
! $this->db->query($q);
! // 5) commit and release table
! $q = "COMMIT";
! $this->db->query($q);
! if ($this->db->affected_rows() > 0) {
! return true;
! }else{
! return false;
! }
} // end is_onlinkbar
} // end renormTopi...
[truncated message content] |
|
From: Joe S. <joe...@us...> - 2003-01-23 02:48:05
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/admin
In directory sc8-pr-cvs1:/tmp/cvs-serv30216/phpslash-ft/public_html/admin
Modified Files:
sectionAdmin.php3 submissionAdmin.php3
Log Message:
Admin messages should be available for translation now.
Index: sectionAdmin.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/admin/sectionAdmin.php3,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** sectionAdmin.php3 20 Dec 2002 22:17:32 -0000 1.10
--- sectionAdmin.php3 23 Jan 2003 02:48:02 -0000 1.11
***************
*** 47,55 ****
if ($perm->have_perm("sectionDelete")) {
$success = $section->deleteSection($section_id);
! if($success) {
$content .= getMessage($section->getMessage());
! } else {
$content .= getError($section->getMessage());
! }
}
break;
--- 47,55 ----
if ($perm->have_perm("sectionDelete")) {
$success = $section->deleteSection($section_id);
! if($success) {
$content .= getMessage($section->getMessage());
! } else {
$content .= getError($section->getMessage());
! }
}
break;
Index: submissionAdmin.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/admin/submissionAdmin.php3,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** submissionAdmin.php3 20 Dec 2002 22:17:32 -0000 1.12
--- submissionAdmin.php3 23 Jan 2003 02:48:02 -0000 1.13
***************
*** 55,63 ****
$submission->deleteSubmission($submission_id_ary[$i]);
}
! $content .= "$count record deleted<BR>\n";
} else {
! $content .= "<BR><BR>This would work <B>SO</B> much better if you actually selected something to delete!<BR>\n";
}
! }
break;
--- 55,63 ----
$submission->deleteSubmission($submission_id_ary[$i]);
}
! $content .= $count.pslgetText(" record deleted")."<BR>\n";
} else {
! $content .= "<BR><BR>".pslgetText("This would work SO much better if you actually selected something to delete!")."<BR>\n";
}
! }
break;
|
2 messages has been excluded from this view by a project administrator.
