phpslash-commit Mailing List for phpSlash (Page 100)
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: nathan h. <nh...@us...> - 2002-02-08 22:17:31
|
Update of /cvsroot/phpslash/phpslash-ft/public_html
In directory usw-pr-cvs1:/tmp/cvs-serv28663/public_html
Modified Files:
config.php3 index.php3
Log Message:
Index: config.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/config.php3,v
retrieving revision 1.127
retrieving revision 1.128
diff -C2 -d -r1.127 -r1.128
*** config.php3 8 Feb 2002 21:50:10 -0000 1.127
--- config.php3 8 Feb 2002 22:17:28 -0000 1.128
***************
*** 18,22 ****
/**** START DEBUGING - Comment or delete this for production! ****/
! ini_set('error_reporting', 'E_ALL');
//ini_set('error_reporting', 'E_ALL~E_NOTICE');
/**** END DEBUGING ****/
--- 18,22 ----
/**** START DEBUGING - Comment or delete this for production! ****/
! //ini_set('error_reporting', 'E_ALL');
//ini_set('error_reporting', 'E_ALL~E_NOTICE');
/**** END DEBUGING ****/
Index: index.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/index.php3,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** index.php3 3 Feb 2002 02:49:40 -0000 1.53
--- index.php3 8 Feb 2002 22:17:28 -0000 1.54
***************
*** 1,9 ****
<?php
// $Id$
! $pagetitle="Home"; # The name to be displayed in the header
! $xsiteobject = "Home Page"; #This Defines The META Tag Object Type
require("config.php3");
page_open(array("sess"=>"slashSess","auth"=>"slashAuth","perm"=>"slashPerm"));
! $auth->login_if($login);
// Objects
--- 1,14 ----
<?php
// $Id$
! $pagetitle = "Home"; // The name to be displayed in the header
! $xsiteobject = "Home Page"; // This Defines The META Tag Object Type
!
require("config.php3");
+
page_open(array("sess"=>"slashSess","auth"=>"slashAuth","perm"=>"slashPerm"));
!
! if(!empty($HTTP_GET_VARS['login'])) {
! $auth->login_if($HTTP_GET_VARS['login']);
! }
// Objects
|
|
From: nathan h. <nh...@us...> - 2002-02-08 22:17:30
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv28663/class
Modified Files:
slashAuthCR.class
Log Message:
Index: slashAuthCR.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/slashAuthCR.class,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** slashAuthCR.class 8 Feb 2002 21:50:10 -0000 1.4
--- slashAuthCR.class 8 Feb 2002 22:17:27 -0000 1.5
***************
*** 60,64 ****
global $HTTP_POST_VARS;
!
$username = $HTTP_POST_VARS['username'];
$password = $HTTP_POST_VARS['password'];
--- 60,64 ----
global $HTTP_POST_VARS;
! // TODO: Change there so they aren't undefined indexes :)
$username = $HTTP_POST_VARS['username'];
$password = $HTTP_POST_VARS['password'];
|
|
From: nathan h. <nh...@us...> - 2002-02-08 22:17:30
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv28663 Modified Files: CHANGES Log Message: Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.396 retrieving revision 1.397 diff -C2 -d -r1.396 -r1.397 *** CHANGES 8 Feb 2002 21:50:10 -0000 1.396 --- CHANGES 8 Feb 2002 22:17:27 -0000 1.397 *************** *** 13,16 **** --- 13,21 ---- 9 - Removal of something (kill -9 :) + 2002-Feb-08 5:07PM EST nathan hruby <na...@ds...> + [B] - Wrapped $login in index + [B] - debug ini_set()'s in config are comented + [?] - Added addtional warings in slashAuthCR.class, added a TODO about it and will fix soon + 2002-Feb-08 4:36PM EST nathan hruby <na...@ds...> [B] - Added use of $HTTP_POST_VARS to slashAuthCR.class and slshAuth.class, now works with |
|
From: nathan h. <nh...@us...> - 2002-02-08 21:50:15
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv24941/class
Modified Files:
slashAuth.class slashAuthCR.class
Log Message:
make slashAuth*.class safe with register_globals
Index: slashAuth.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/slashAuth.class,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** slashAuth.class 3 Feb 2002 02:49:40 -0000 1.4
--- slashAuth.class 8 Feb 2002 21:50:10 -0000 1.5
***************
*** 68,72 ****
function auth_validatelogin() {
! global $username,$password;
# the login form will save the username
--- 68,75 ----
function auth_validatelogin() {
! global $HTTP_POST_VARS;
!
! $username = $HTTP_POST_VARS['username'];
! $password = $HTTP_POST_VARS['password'];
# the login form will save the username
Index: slashAuthCR.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/slashAuthCR.class,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** slashAuthCR.class 3 Feb 2002 02:49:40 -0000 1.3
--- slashAuthCR.class 8 Feb 2002 21:50:10 -0000 1.4
***************
*** 59,75 ****
function auth_validatelogin() {
! global $username,$password, $challenge, $response;
# the login form will save the username
if(isset($username)) {
$this->auth["uname"] = $username;
! } else if ($this->nobody){ ## provides for "default login cancel"
! $uid = $this->auth["uid"] = "nobody";
! return $uid;
}
! if ($username == "" ||
! strstr($username,"'")){ // spit out empty login form
! $this->auth["error"] = "Your username is invalid.<br>Please try again.";
return false;
}
--- 59,80 ----
function auth_validatelogin() {
! global $HTTP_POST_VARS;
!
! $username = $HTTP_POST_VARS['username'];
! $password = $HTTP_POST_VARS['password'];
! $challenge = $HTTP_POST_VARS['challenge'];
! $response = $HTTP_POST_VARS['response'];
# the login form will save the username
if(isset($username)) {
$this->auth["uname"] = $username;
! } else if ($this->nobody) { ## provides for "default login cancel"
! $uid = $this->auth["uid"] = "nobody";
! return $uid;
}
! if ($username == "" || strstr($username,"'")) {
! // spit out empty login form
! $this->auth["error"] = "Either your username or password are invalid.<br>Please try again.";
return false;
}
***************
*** 92,99 ****
$this->auth["uid"] = $this->db->Record["author_id"];
$this->auth["uname"] = $this->db->Record["author_name"];
! $md5_pw = $this->db->Record[password]; // this is the raw MD5ed user/pass combo
$expected_response = md5("$md5_pw:$challenge");
!
! ## True when JS is disabled
if ($response == "") {
$md5_pw_net = md5("$username:$password");
--- 97,105 ----
$this->auth["uid"] = $this->db->Record["author_id"];
$this->auth["uname"] = $this->db->Record["author_name"];
!
! $md5_pw = $this->db->Record['password']; // this is the raw MD5ed user/pass combo
$expected_response = md5("$md5_pw:$challenge");
!
! // True when JS is disabled
if ($response == "") {
$md5_pw_net = md5("$username:$password");
***************
*** 101,108 ****
}
! ## drop password for safety
$password='';
! ## Response is set, JS might be enabled...
if ($expected_response != $response) {
$this->auth["error"] = "Either your username or password are invalid.<br>Please try again.";
--- 107,115 ----
}
! // Drop password for safety
$password='';
+ $HTTP_POST_VARS['password'] = '';
! // Response is set, JS might be enabled...
if ($expected_response != $response) {
$this->auth["error"] = "Either your username or password are invalid.<br>Please try again.";
***************
*** 116,120 ****
}
$this->auth["error"] = "Either your username or password are invalid.<br>Please try again.";
! return $uid;
}
--- 123,128 ----
}
$this->auth["error"] = "Either your username or password are invalid.<br>Please try again.";
! return $uid;
! // TODO: If we're returning an error, shouldn't we also return 'false'?
}
|
|
From: nathan h. <nh...@us...> - 2002-02-08 21:50:15
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv24941 Modified Files: CHANGES Log Message: make slashAuth*.class safe with register_globals Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.395 retrieving revision 1.396 diff -C2 -d -r1.395 -r1.396 *** CHANGES 8 Feb 2002 18:54:04 -0000 1.395 --- CHANGES 8 Feb 2002 21:50:10 -0000 1.396 *************** *** 13,16 **** --- 13,21 ---- 9 - Removal of something (kill -9 :) + 2002-Feb-08 4:36PM EST nathan hruby <na...@ds...> + [B] - Added use of $HTTP_POST_VARS to slashAuthCR.class and slshAuth.class, now works with + register_globals=off + [E] - added debug lines in config.php3 to enable / disable error_reporting + 2002-Feb-08 1:43PM EST nathan hruby <na...@ds...> [B] - Fixed use of undeifned variables that were preventing cookies from |
|
From: nathan h. <nh...@us...> - 2002-02-08 21:50:15
|
Update of /cvsroot/phpslash/phpslash-ft/public_html
In directory usw-pr-cvs1:/tmp/cvs-serv24941/public_html
Modified Files:
config.php3
Log Message:
make slashAuth*.class safe with register_globals
Index: config.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/config.php3,v
retrieving revision 1.126
retrieving revision 1.127
diff -C2 -d -r1.126 -r1.127
*** config.php3 8 Feb 2002 18:54:04 -0000 1.126
--- config.php3 8 Feb 2002 21:50:10 -0000 1.127
***************
*** 2,6 ****
/*
! * Configuration File for PHPSlash
*
* $Id$
--- 2,6 ----
/*
! * config.php3 - Configuration File for PHPSlash
*
* $Id$
***************
*** 8,12 ****
*/
! $psl_version = "0.65-beta1";
//////////////////////////////////////////////////////////////////////////
--- 8,24 ----
*/
! // This is a comment, it spans one line
!
! # This is a comment also, it spans one line but we do not like these
!
! /* This is a comment as well, it can span multiple line
! like this, but you need to be sure to close it like so: */
!
! $psl_version = "0.6.5-pre1";
!
! /**** START DEBUGING - Comment or delete this for production! ****/
! ini_set('error_reporting', 'E_ALL');
! //ini_set('error_reporting', 'E_ALL~E_NOTICE');
! /**** END DEBUGING ****/
//////////////////////////////////////////////////////////////////////////
|
|
From: nathan h. <nh...@us...> - 2002-02-08 18:54:09
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv7244/class
Modified Files:
functions.inc slashSess.class
Log Message:
fixes to make headers work with E_ALL
Modified Files:
CHANGES class/functions.inc class/slashSess.class
public_html/config.php3
Index: functions.inc
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/functions.inc,v
retrieving revision 1.90
retrieving revision 1.91
diff -C2 -d -r1.90 -r1.91
*** functions.inc 6 Feb 2002 20:07:24 -0000 1.90
--- functions.inc 8 Feb 2002 18:54:04 -0000 1.91
***************
*** 988,993 ****
! function setSkinTpl( $new_skin="", $method="") {
!
global $_PSL, $HTTP_GET_VARS, $HTTP_COOKIE_VARS;
--- 988,992 ----
! function setSkinTpl( $new_skin="", $method="") {
global $_PSL, $HTTP_GET_VARS, $HTTP_COOKIE_VARS;
***************
*** 1011,1015 ****
}
! } elseif ($HTTP_COOKIE_VARS['skin']) {
if(@is_dir($templatedir . "/" . $HTTP_COOKIE_VARS['skin'])) {
$new_skin=$HTTP_COOKIE_VARS['skin'];
--- 1010,1014 ----
}
! } elseif (!empty($HTTP_COOKIE_VARS['skin'])) {
if(@is_dir($templatedir . "/" . $HTTP_COOKIE_VARS['skin'])) {
$new_skin=$HTTP_COOKIE_VARS['skin'];
Index: slashSess.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/slashSess.class,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** slashSess.class 1 Oct 2001 15:13:12 -0000 1.1
--- slashSess.class 8 Feb 2002 18:54:04 -0000 1.2
***************
*** 12,15 ****
--- 12,16 ----
class slashSess extends Session {
var $classname = "slashSess"; // For object health
+ var $cookiename = "slashSess"; // Set the same as classname
var $magic = "fkIsNotEqualToIK"; // A string to randomize the session
var $mode = "cookie"; // Use cookie before GET
|
|
From: nathan h. <nh...@us...> - 2002-02-08 18:54:09
|
Update of /cvsroot/phpslash/phpslash-ft/public_html
In directory usw-pr-cvs1:/tmp/cvs-serv7244/public_html
Modified Files:
config.php3
Log Message:
fixes to make headers work with E_ALL
Modified Files:
CHANGES class/functions.inc class/slashSess.class
public_html/config.php3
Index: config.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/config.php3,v
retrieving revision 1.125
retrieving revision 1.126
diff -C2 -d -r1.125 -r1.126
*** config.php3 6 Feb 2002 20:47:14 -0000 1.125
--- config.php3 8 Feb 2002 18:54:04 -0000 1.126
***************
*** 173,182 ****
// should be prepended to all phpSlash pages
! $lang = false; // comment to enable setting lang in url
$_PSL['languagefile'] = $_PSL['localedir'] . "/" . $_PSL['language'] . ".php3";
! $_PSL['languagefile'] = setLang($lang); // comment to disable auto lang detection
! $_PSL['templatedir'] = setLangTpl($lang); // comment to disable auto tpl lang detection
$_PSL['defaultskin'] = "default";
! $_PSL['templatedir'] = setSkinTpl($HTTP_GET_VARS['skin'], "cookie"); // comment to disable setting theme in url
// NavBar Menu Definitions
--- 173,196 ----
// should be prepended to all phpSlash pages
! // comment to enable setting lang in url
! $lang = false;
!
$_PSL['languagefile'] = $_PSL['localedir'] . "/" . $_PSL['language'] . ".php3";
!
! // comment to disable auto lang detection
! $_PSL['languagefile'] = setLang($lang);
!
! // comment to disable auto tpl lang detection
! $_PSL['templatedir'] = setLangTpl($lang);
!
! // Sets the default dkin for a site
$_PSL['defaultskin'] = "default";
!
! // comment out this block to disable setting theme in url
! if (!empty($HTTP_GET_VARS['skin'])) {
! $_PSL['templatedir'] = setSkinTpl($HTTP_GET_VARS['skin'], "cookie");
! } else {
! $_PSL['templatedir'] = setSkinTpl("", "cookie");
! }
// NavBar Menu Definitions
|
|
From: nathan h. <nh...@us...> - 2002-02-08 18:54:08
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv7244 Modified Files: CHANGES Log Message: fixes to make headers work with E_ALL Modified Files: CHANGES class/functions.inc class/slashSess.class public_html/config.php3 Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.394 retrieving revision 1.395 diff -C2 -d -r1.394 -r1.395 *** CHANGES 7 Feb 2002 21:19:53 -0000 1.394 --- CHANGES 8 Feb 2002 18:54:04 -0000 1.395 *************** *** 13,16 **** --- 13,21 ---- 9 - Removal of something (kill -9 :) + 2002-Feb-08 1:43PM EST nathan hruby <na...@ds...> + [B] - Fixed use of undeifned variables that were preventing cookies from + being set when error_reporting is E_ALL. Still more work, but at + least headers aren't crushed anymore (I think) + 2002-Feb-07 3:00PM CST Joe Stewart <jo...@be...> [B] - Block_render_skin.class - skin name and template path fix. |
|
From: Joe S. <joe...@us...> - 2002-02-07 21:19:59
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv18613/phpslash-ft/class
Modified Files:
Block_render_skin.class
Log Message:
skin name and template path fix
Index: Block_render_skin.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_skin.class,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Block_render_skin.class 6 Feb 2002 18:47:43 -0000 1.3
--- Block_render_skin.class 7 Feb 2002 21:19:54 -0000 1.4
***************
*** 61,66 ****
// remove "skin" from templatedir
! $templatedir = str_replace( $skin, "" , $this->psl['templatedir']);
!
// $tpl = ""; // disable template option
if( empty($tpl) ) {
--- 61,66 ----
// remove "skin" from templatedir
! $templatedir = substr( $this->psl['templatedir'], 0, strrpos($this->psl['templatedir'], "/") );
!
// $tpl = ""; // disable template option
if( empty($tpl) ) {
|
|
From: Joe S. <joe...@us...> - 2002-02-07 21:19:58
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv18613/phpslash-ft Modified Files: CHANGES Log Message: skin name and template path fix Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.393 retrieving revision 1.394 diff -C2 -d -r1.393 -r1.394 *** CHANGES 7 Feb 2002 17:54:22 -0000 1.393 --- CHANGES 7 Feb 2002 21:19:53 -0000 1.394 *************** *** 13,16 **** --- 13,19 ---- 9 - Removal of something (kill -9 :) + 2002-Feb-07 3:00PM CST Joe Stewart <jo...@be...> + [B] - Block_render_skin.class - skin name and template path fix. + 2002-Feb-07 12:00PM CST Joe Stewart <jo...@be...> [B] - Block_render_section.class - removed "\" typo. |
|
From: Joe S. <joe...@us...> - 2002-02-07 17:54:27
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv25103/phpslash-ft Modified Files: CHANGES Log Message: removed \ typo Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.392 retrieving revision 1.393 diff -C2 -d -r1.392 -r1.393 *** CHANGES 6 Feb 2002 20:46:52 -0000 1.392 --- CHANGES 7 Feb 2002 17:54:22 -0000 1.393 *************** *** 13,16 **** --- 13,19 ---- 9 - Removal of something (kill -9 :) + 2002-Feb-07 12:00PM CST Joe Stewart <jo...@be...> + [B] - Block_render_section.class - removed "\" typo. + 2002-Feb-06 2:30PM CST Joe Stewart <jo...@be...> [B] - backend.php3 - now exports rss with "&" in title and description ok. |
|
From: Joe S. <joe...@us...> - 2002-02-07 17:54:26
|
Update of /cvsroot/phpslash/phpslash-ft/class In directory usw-pr-cvs1:/tmp/cvs-serv25103/phpslash-ft/class Modified Files: Block_render_section.class Log Message: removed \ typo Index: Block_render_section.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_section.class,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Block_render_section.class 3 Feb 2002 02:49:39 -0000 1.6 --- Block_render_section.class 7 Feb 2002 17:54:22 -0000 1.7 *************** *** 1,3 **** ! \<?php /* Block_render_section.class -> Methods for phpslash specfic blocks */ --- 1,3 ---- ! <?php /* Block_render_section.class -> Methods for phpslash specfic blocks */ |
|
From: Joe S. <joe...@us...> - 2002-02-06 20:47:18
|
Update of /cvsroot/phpslash/phpslash-ft/public_html In directory usw-pr-cvs1:/tmp/cvs-serv21387/phpslash-ft/public_html Modified Files: config.php3 Log Message: removed deprecated variables Index: config.php3 =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/public_html/config.php3,v retrieving revision 1.124 retrieving revision 1.125 diff -C2 -d -r1.124 -r1.125 *** config.php3 2002/02/06 19:55:46 1.124 --- config.php3 2002/02/06 20:47:14 1.125 *************** *** 443,447 **** // ---------------------------------------------------------- // Ref'ed in Block_i ! $templatedir = $_PSL['templatedir']; // ---------------------------------------------------------- --- 443,447 ---- // ---------------------------------------------------------- // Ref'ed in Block_i ! // $templatedir = $_PSL['templatedir']; // ---------------------------------------------------------- |
|
From: Joe S. <joe...@us...> - 2002-02-06 20:46:55
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv21234/phpslash-ft Modified Files: CHANGES Log Message: removed deprecated variables Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.391 retrieving revision 1.392 diff -C2 -d -r1.391 -r1.392 *** CHANGES 2002/02/06 19:55:44 1.391 --- CHANGES 2002/02/06 20:46:52 1.392 *************** *** 13,16 **** --- 13,21 ---- 9 - Removal of something (kill -9 :) + 2002-Feb-06 2:30PM CST Joe Stewart <jo...@be...> + [B] - backend.php3 - now exports rss with "&" in title and description ok. + Block_render_cal.class, config.php3 - finished removing deprecated + variables. + 2002-Feb-06 2:00PM CST Joe Stewart <jo...@be...> [B] - removed all references to deprecated variables. |
|
From: Joe S. <joe...@us...> - 2002-02-06 20:46:55
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv21234/phpslash-ft/class
Modified Files:
Block_render_cal.class
Log Message:
removed deprecated variables
Index: Block_render_cal.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_cal.class,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Block_render_cal.class 2002/02/03 02:49:39 1.3
--- Block_render_cal.class 2002/02/06 20:46:52 1.4
***************
*** 8,16 ****
--- 8,20 ----
var $type;
var $output;
+ var $psl;
/* constructor */
function Block_render_cal() {
+ global $_PSL;
+
$this->type = "cal"; /* set the 'type' */
$this->output = ""; /* clear the output */
+ $this->psl = $_PSL;
}
***************
*** 22,28 ****
function parse($block_info) {
// TODO: Make this class use $_PSL
- global $templatedir;
! $templ = new Template($templatedir);
$templ->set_file(array(
'calendar' => "calendar.tpl"
--- 26,31 ----
function parse($block_info) {
// TODO: Make this class use $_PSL
! $templ = new Template($this->psl['templatedir']);
$templ->set_file(array(
'calendar' => "calendar.tpl"
|
|
From: Joe S. <joe...@us...> - 2002-02-06 20:46:55
|
Update of /cvsroot/phpslash/phpslash-ft/public_html
In directory usw-pr-cvs1:/tmp/cvs-serv21234/phpslash-ft/public_html
Modified Files:
backend.php3
Log Message:
removed deprecated variables
Index: backend.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/backend.php3,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** backend.php3 2002/02/06 18:47:43 1.19
--- backend.php3 2002/02/06 20:46:52 1.20
***************
*** 166,170 ****
case "l":
$description = $site_name . " - ";
! $description .= strip_tags($stories[$i]["intro_text"]);
// $description .= format_mail(eregi_replace("<([font][^>]*)>", "",$stories[$i]["intro_text"]),"80", "scrub");
break;
--- 166,170 ----
case "l":
$description = $site_name . " - ";
! $description .= htmlspecialchars(strip_tags($stories[$i]["intro_text"]));
// $description .= format_mail(eregi_replace("<([font][^>]*)>", "",$stories[$i]["intro_text"]),"80", "scrub");
break;
***************
*** 172,176 ****
case "1":
default:
! $description = strip_tags($stories[$i]["intro_text"]);
// $description = format_mail(eregi_replace("<([font][^>]*)>", "",$stories[$i]["intro_text"]),"80", "scrub");
break;
--- 172,176 ----
case "1":
default:
! $description = htmlspecialchars(strip_tags($stories[$i]["intro_text"]));
// $description = format_mail(eregi_replace("<([font][^>]*)>", "",$stories[$i]["intro_text"]),"80", "scrub");
break;
***************
*** 179,183 ****
$template->set_var(array(
'STORY_ID' => $stories[$i]["story_id"],
! 'TITLE' => $stories[$i]["title"],
'INTRO_TEXT' => $description,
'TARGET' => $target,
--- 179,183 ----
$template->set_var(array(
'STORY_ID' => $stories[$i]["story_id"],
! 'TITLE' => htmlspecialchars($stories[$i]["title"]),
'INTRO_TEXT' => $description,
'TARGET' => $target,
|
|
From: Joe S. <joe...@us...> - 2002-02-06 20:07:27
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv8735/phpslash-ft/class
Modified Files:
functions.inc
Log Message:
removed deprecated variables
Index: functions.inc
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/functions.inc,v
retrieving revision 1.89
retrieving revision 1.90
diff -C2 -d -r1.89 -r1.90
*** functions.inc 2002/02/03 02:49:40 1.89
--- functions.inc 2002/02/06 20:07:24 1.90
***************
*** 271,275 ****
// log it
$sl_q->query("INSERT INTO psl_infolog VALUES('$id','$fdate','$description','$data')");
! } elseif ($debug) {
echo "Infolog: Log requested but logging has disabled by config.";
}
--- 271,275 ----
// log it
$sl_q->query("INSERT INTO psl_infolog VALUES('$id','$fdate','$description','$data')");
! } elseif ($_PSL['debug']) {
echo "Infolog: Log requested but logging has disabled by config.";
}
***************
*** 278,282 ****
/***************************************************************************
function : debug
! Parameters : $name => The name of the variable or function you're debuging
$msg => The debug message
$type => Type of message
--- 278,282 ----
/***************************************************************************
function : debug
! Parameters : $name => The name of the variable or function you're debugging
$msg => The debug message
$type => Type of message
***************
*** 286,294 ****
function debug($name, $msg, $type='default') {
! global $debug, $debug_type;
! if ($debug) {
// the $debug_type is set in config.php3
if ($type == 'default') {
! $type = $debug_type;
}
--- 286,295 ----
function debug($name, $msg, $type='default') {
! global $_PSL;
!
! if ($_PSL['debug']) {
// the $debug_type is set in config.php3
if ($type == 'default') {
! $type = $_PSL['debug_type'];
}
***************
*** 315,321 ****
function debug_array($name, $ary) {
! global $debug;
! if ($debug && is_array($ary) && (sizeof($ary) > 0) ) {
echo "<small><b>Debug: $name:</b><br>\n";
while( list( $key, $val) = @each( $ary )) {
--- 316,322 ----
function debug_array($name, $ary) {
! global $_PSL;
! if ($_PSL['debug'] && is_array($ary) && (sizeof($ary) > 0) ) {
echo "<small><b>Debug: $name:</b><br>\n";
while( list( $key, $val) = @each( $ary )) {
|
|
From: Joe S. <joe...@us...> - 2002-02-06 19:55:49
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/admin
In directory usw-pr-cvs1:/tmp/cvs-serv4830/phpslash-ft/public_html/admin
Modified Files:
pollAdmin.php3
Log Message:
removed deprecated variables
Index: pollAdmin.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/admin/pollAdmin.php3,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** pollAdmin.php3 2002/02/01 04:23:52 1.3
--- pollAdmin.php3 2002/02/06 19:55:46 1.4
***************
*** 38,42 ****
if ($poll->savePoll($HTTP_POST_VARS)) {
echo "<center>";
! fancybox(210, "$sitename Poll", $poll->getPollBooth("$HTTP_POST_VARS[question_id]"), "r");
echo "</center>";
} else {
--- 38,42 ----
if ($poll->savePoll($HTTP_POST_VARS)) {
echo "<center>";
! fancybox(210, "$_PSL['site_name'] Poll", $poll->getPollBooth("$HTTP_POST_VARS[question_id]"), "r");
echo "</center>";
} else {
|
|
From: Joe S. <joe...@us...> - 2002-02-06 19:55:49
|
Update of /cvsroot/phpslash/phpslash-ft/public_html
In directory usw-pr-cvs1:/tmp/cvs-serv4830/phpslash-ft/public_html
Modified Files:
poll.php3 comment.php3 config.php3
Log Message:
removed deprecated variables
Index: poll.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/poll.php3,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** poll.php3 2002/02/03 22:09:12 1.8
--- poll.php3 2002/02/06 19:55:46 1.9
***************
*** 50,54 ****
titlebar ("100%", pslgetText("View Pollbooth"));
echo "<center>\n";
! fancybox (210, sprintf(pslgetText("%s Poll"), $sitename), $poll->getPollBooth($question_id), "nc");
echo "</center>\n";
break;
--- 50,54 ----
titlebar ("100%", pslgetText("View Pollbooth"));
echo "<center>\n";
! fancybox (210, sprintf(pslgetText("%s Poll"), $_PSL['site_name']), $poll->getPollBooth($question_id), "nc");
echo "</center>\n";
break;
Index: comment.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/comment.php3,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** comment.php3 2001/11/09 16:58:54 1.9
--- comment.php3 2002/02/06 19:55:46 1.10
***************
*** 82,86 ****
email => $email,
content => $content,
! siteowner => $siteowner,
comment_text => $comment_text
);
--- 82,86 ----
email => $email,
content => $content,
! siteowner => $_PSL['site_owner'],
comment_text => $comment_text
);
Index: config.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/config.php3,v
retrieving revision 1.123
retrieving revision 1.124
diff -C2 -d -r1.123 -r1.124
*** config.php3 2002/02/03 22:09:12 1.123
--- config.php3 2002/02/06 19:55:46 1.124
***************
*** 359,364 ****
// TODO: nh: Re-write this in a for loop
- # require($_PSL['classdir'] . "/Variable.class");
-
if ($_PSL['module']['Comment']) {
require($_PSL['classdir'] . "/Comment.class");
--- 359,362 ----
***************
*** 403,406 ****
--- 401,407 ----
require($_PSL['classdir'] . "/MailingList.class");
}
+ if ($_PSL['module']['Variable']) {
+ require($_PSL['classdir'] . "/Variable.class");
+ }
***************
*** 441,467 ****
// ----------------------------------------------------------
- // Ref'ed in poll.php3 and admin/pollAdmin.php3
- if ($sitename=="") $sitename = $_PSL['site_name'];
-
- // ----------------------------------------------------------
- // Ref'ed in comment.php3
- if ($siteowner=="") $siteowner = $_PSL['site_owner'];
-
- // ----------------------------------------------------------
// Ref'ed in Block_i
$templatedir = $_PSL['templatedir'];
// ----------------------------------------------------------
- // Ref'ed in Variable.class but isn't that toast?
- $rootdir = $_PSL['rooturl'];
-
- // ----------------------------------------------------------
- // both ref'ed in functions.inc
- $debug = $_PSL['debug'];
- $debug_type = $_PSL['debug_type'];
-
- // ----------------------------------------------------------
// The following can be deleted
// ----------------------------------------------------------
// $infolog_enable = $_PSL['use_infolog'];
// $default_pending = $_PSL['default_pending'];
--- 442,456 ----
// ----------------------------------------------------------
// Ref'ed in Block_i
$templatedir = $_PSL['templatedir'];
// ----------------------------------------------------------
// The following can be deleted
// ----------------------------------------------------------
+ // if ($sitename=="") $sitename = $_PSL['site_name'];
+ // if ($siteowner=="") $siteowner = $_PSL['site_owner'];
+ // $rootdir = $_PSL['rooturl'];
+ // $debug = $_PSL['debug'];
+ // $debug_type = $_PSL['debug_type'];
// $infolog_enable = $_PSL['use_infolog'];
// $default_pending = $_PSL['default_pending'];
|
|
From: Joe S. <joe...@us...> - 2002-02-06 19:55:49
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv4830/phpslash-ft/class
Modified Files:
Variable.class
Log Message:
removed deprecated variables
Index: Variable.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Variable.class,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Variable.class 2001/12/12 11:38:49 1.2
--- Variable.class 2002/02/06 19:55:46 1.3
***************
*** 19,26 ****
*/
function Variable () {
! global $basedir,$rootdir, $templatedir;
! $this->var_array[rootdir] = $rootdir;
! $this->var_array[basedir] = $basedir;
$this->db = new slashDB;
--- 19,26 ----
*/
function Variable () {
! global $_PSL, $templatedir;
! $this->var_array['rootdir'] = $_PSL['rooturl'];
! $this->var_array['basedir'] = $_PSL['basedir'];
$this->db = new slashDB;
***************
*** 89,93 ****
/* Get preferences */
! $basedir = getvar("basedir");
$q = "SELECT *
--- 89,93 ----
/* Get preferences */
! $basedir = $this->getvar("basedir");
$q = "SELECT *
***************
*** 231,233 ****
} /* end of Variable.class */
! ?>
\ No newline at end of file
--- 231,233 ----
} /* end of Variable.class */
! ?>
|
|
From: Joe S. <joe...@us...> - 2002-02-06 19:55:49
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv4830/phpslash-ft Modified Files: CHANGES Log Message: removed deprecated variables Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.390 retrieving revision 1.391 diff -C2 -d -r1.390 -r1.391 *** CHANGES 2002/02/06 18:47:43 1.390 --- CHANGES 2002/02/06 19:55:44 1.391 *************** *** 13,16 **** --- 13,21 ---- 9 - Removal of something (kill -9 :) + 2002-Feb-06 2:00PM CST Joe Stewart <jo...@be...> + [B] - removed all references to deprecated variables. + Files changed - config.php3, poll.php3, pollAdmin.php3, comment.php3, + functions.inc, Variable.class. + 2002-Feb-06 12:30PM CST Joe Stewart <jo...@be...> [B] - backend.php3 wasn't stripping all tags from description. |
|
From: Joe S. <joe...@us...> - 2002-02-06 18:47:46
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv3535/phpslash-ft/class
Modified Files:
Block.class Block_render_skin.class Block_render_rss.class
NavBar.class
Log Message:
submitted patches
Index: Block.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block.class,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Block.class 2002/02/03 02:49:39 1.10
--- Block.class 2002/02/06 18:47:43 1.11
***************
*** 1,3 ****
! '<?php
/* @version $Id$ */
--- 1,3 ----
! <?php
/* @version $Id$ */
***************
*** 583,585 ****
} /* End class Block */
! ?>
--- 583,585 ----
} /* End class Block */
! ?>
\ No newline at end of file
Index: Block_render_skin.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_skin.class,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Block_render_skin.class 2002/02/03 02:49:39 1.2
--- Block_render_skin.class 2002/02/06 18:47:43 1.3
***************
*** 82,86 ****
'SKIN' => "",
'ROOTDIR' => $this->psl['rooturl'],
! 'IMAGEDIR' => $this->psl['imagedir'],
'PHP_SELF' => $this->psl['phpself']
));
--- 82,86 ----
'SKIN' => "",
'ROOTDIR' => $this->psl['rooturl'],
! 'IMAGEDIR' => $this->psl['imageurl'],
'PHP_SELF' => $this->psl['phpself']
));
Index: Block_render_rss.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_rss.class,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Block_render_rss.class 2002/02/03 02:49:39 1.4
--- Block_render_rss.class 2002/02/06 18:47:43 1.5
***************
*** 1,4 ****
<?php
-
/* Block_render_rss.class -> Methods for parsing RSS 0.91 data */
/* CHANGES: 4Jan02 - RSS title stored */
--- 1,3 ----
***************
*** 9,12 ****
--- 8,16 ----
* max = 10
* tpl = alternate template ( no .tpl extension) [rssblock.tpl]
+ * title = none - dont display title or image, even if they are available
+ * image - force display of image (if tag present - else show no title)
+ * text - force display of title text (if tag present - else show no title)
+ * both - display both image and text if available
+ * best (default) - display image if tags present, else display title if possible
*
* NOTES
***************
*** 216,220 ****
$default_tpl = "rssblock.tpl";
!
$target = "_self";
$max_items = 10;
--- 220,226 ----
$default_tpl = "rssblock.tpl";
!
!
! $titletype = "best";
$target = "_self";
$max_items = 10;
***************
*** 224,237 ****
if (is_string($block_info["block_options"]["max_items"])) {
$max_items = $block_info["block_options"]["max_items"];
! }
if (is_string($block_info["block_options"]["target"])) {
$target = $block_info["block_options"]["target"];
! }
! if (is_string($block_info["block_options"]["tpl"])) {
if (@file_exists($this->psl['templatedir'] . "/" . basename($block_info['block_options']['tpl']) . ".tpl") ) {
! // should be secure as path directives are discarded and extension added
$tpl = basename($block_info["block_options"]["tpl"]) . ".tpl";
}
! }
}
--- 230,246 ----
if (is_string($block_info["block_options"]["max_items"])) {
$max_items = $block_info["block_options"]["max_items"];
! }
if (is_string($block_info["block_options"]["target"])) {
$target = $block_info["block_options"]["target"];
! }
! if (is_string($block_info["block_options"]["title"])) {
! $titletype = $block_info["block_options"]["title"];
! }
! if (is_string($block_info["block_options"]["tpl"])) {
if (@file_exists($this->psl['templatedir'] . "/" . basename($block_info['block_options']['tpl']) . ".tpl") ) {
! // should be secure as path directives are discarded and extension added
$tpl = basename($block_info["block_options"]["tpl"]) . ".tpl";
}
! }
}
***************
*** 255,273 ****
$template->set_block ("block", "each_description", "description_block");
! // <title> and <image> tags seem to hold identical description and link info in most sites
! // ... so use an image if possible, else show title
! if (empty($this->rdf->image["url"])) {
if ( !empty( $this->rdf->channel["title"]) ) {
! $template->set_var("CHANNEL_TITLE", $this->rdf->channel["title"]);
! $template->set_var("CHANNEL_LINK", empty($this->rdf->channel["link"])?"#":$this->rdf->channel["link"]);
$template->parse("title_block","channel_title");
}
! } else {
! $template->set_var(array(
! "IMAGE_URL" => $this->rdf->image["url"],
! "IMAGE_TITLE" => $this->rdf->image["title"],
! "IMAGE_LINK" => $this->rdf->image["link"],
! ));
! $template->parse("image_block","channel_image");
}
--- 264,330 ----
$template->set_block ("block", "each_description", "description_block");
! switch ($titletype) {
! case "none":
! break;
!
! case "text":
if ( !empty( $this->rdf->channel["title"]) ) {
! $template->set_var(array(
! "CHANNEL_TITLE" => $this->rdf->channel["title"],
! "CHANNEL_LINK" => empty($this->rdf->channel["link"])?"#":$this->rdf->channel["link"]
! ));
$template->parse("title_block","channel_title");
}
! break;
!
! case "image":
! if ( !empty( $this->rdf->channel["image"]) ) {
! $template->set_var(array(
! "IMAGE_URL" => $this->rdf->image["url"],
! "IMAGE_TITLE" => $this->rdf->image["title"],
! "IMAGE_LINK" => $this->rdf->image["link"],
! ));
! $template->parse("image_block","channel_image");
! }
! break;
!
! case "both":
! if ( !empty( $this->rdf->channel["title"]) ) {
! $template->set_var(array(
! "CHANNEL_TITLE" => $this->rdf->channel["title"],
! "CHANNEL_LINK" => empty($this->rdf->channel["link"])?"#":$this->rdf->channel["link"]
! ));
! $template->parse("title_block","channel_title");
! }
! if ( !empty( $this->rdf->channel["image"]) ) {
! $template->set_var(array(
! "IMAGE_URL" => $this->rdf->image["url"],
! "IMAGE_TITLE" => $this->rdf->image["title"],
! "IMAGE_LINK" => $this->rdf->image["link"],
! ));
! $template->parse("image_block","channel_image");
! }
! break;
!
! case "best":
! default:
! // <title> and <image> tags seem to hold identical description and link info in most sites
! // ... so use an image if possible, else show title
! if (empty($this->rdf->image["url"])) {
! if ( !empty( $this->rdf->channel["title"]) ) { // No image, but there is a title
! $template->set_var(array(
! "CHANNEL_TITLE" => $this->rdf->channel["title"],
! "CHANNEL_LINK" => empty($this->rdf->channel["link"])?"#":$this->rdf->channel["link"]
! ));
! $template->parse("title_block","channel_title");
! }
! } else { // ...we can show the image
! $template->set_var(array(
! "IMAGE_URL" => $this->rdf->image["url"],
! "IMAGE_TITLE" => $this->rdf->image["title"],
! "IMAGE_LINK" => $this->rdf->image["link"],
! ));
! $template->parse("image_block","channel_image");
! }
}
***************
*** 299,303 ****
$this->output = $template->parse(OUT,"block");
$this->title = $this->rdf->channel["title"];
- // debug("rss::parse::title", $this->title);
return true;
--- 356,359 ----
***************
*** 306,311 ****
debug("Block_render_rss::parse error", $this->rdf->error_str);
! $this->output = "Error in source file:".$this->rdf->error_str;
! // $this->output = "";
return false;
--- 362,366 ----
debug("Block_render_rss::parse error", $this->rdf->error_str);
! $this->output = error("Error in source file:".$this->rdf->error_str);
return false;
***************
*** 319,327 ****
function getTitle() {
! // $this->title = "RSS Channel";
// debug("rss::parse::getTitle", $this->title);
return $this->title;
}
}
-
?>
--- 374,381 ----
function getTitle() {
! // Note: This wont work until object values are saved between the two stages of rendering a block
// debug("rss::parse::getTitle", $this->title);
return $this->title;
}
}
?>
Index: NavBar.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/NavBar.class,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** NavBar.class 2002/02/03 02:49:40 1.8
--- NavBar.class 2002/02/06 18:47:43 1.9
***************
*** 44,49 ****
function parse ($text,$link) {
! $this->templ->set_var( array( 'LINK_NAVBAR' => "$link",
! 'LINK_NAVBAR_TEXT' => pslgetText($text)) );
$this->templ->parse("block", "each_destination" ,true);
--- 44,52 ----
function parse ($text,$link) {
! $this->templ->set_var( array(
! 'IMAGEDIR' => $this->psl['imageurl'],
! 'LINK_NAVBAR' => "$link",
! 'LINK_NAVBAR_TEXT' => pslgetText($text)
! ));
$this->templ->parse("block", "each_destination" ,true);
|
|
From: Joe S. <joe...@us...> - 2002-02-06 18:47:46
|
Update of /cvsroot/phpslash/phpslash-ft/tables/0.65 In directory usw-pr-cvs1:/tmp/cvs-serv3535/phpslash-ft/tables/0.65 Modified Files: slash-all.sql Log Message: submitted patches Index: slash-all.sql =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/tables/0.65/slash-all.sql,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** slash-all.sql 2002/02/04 14:37:08 1.9 --- slash-all.sql 2002/02/06 18:47:43 1.10 *************** *** 132,136 **** INSERT INTO db_sequence (seq_name, nextid) VALUES ( 'psl_variable_seq', '63'); INSERT INTO db_sequence (seq_name, nextid) VALUES ( 'psl_section_seq', '8'); ! INSERT INTO db_sequence (seq_name, nextid) VALUES ( 'psl_block_seq', '147'); INSERT INTO db_sequence (seq_name, nextid) VALUES ( 'psl_author_seq', '19'); INSERT INTO db_sequence (seq_name, nextid) VALUES ( 'psl_infolog', '88'); --- 132,136 ---- INSERT INTO db_sequence (seq_name, nextid) VALUES ( 'psl_variable_seq', '63'); INSERT INTO db_sequence (seq_name, nextid) VALUES ( 'psl_section_seq', '8'); ! INSERT INTO db_sequence (seq_name, nextid) VALUES ( 'psl_block_seq', '148'); INSERT INTO db_sequence (seq_name, nextid) VALUES ( 'psl_author_seq', '19'); INSERT INTO db_sequence (seq_name, nextid) VALUES ( 'psl_infolog', '88'); |
|
From: Joe S. <joe...@us...> - 2002-02-06 18:47:46
|
Update of /cvsroot/phpslash/phpslash-ft/public_html
In directory usw-pr-cvs1:/tmp/cvs-serv3535/phpslash-ft/public_html
Modified Files:
backend.php3
Log Message:
submitted patches
Index: backend.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/backend.php3,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** backend.php3 2002/02/03 22:09:12 1.18
--- backend.php3 2002/02/06 18:47:43 1.19
***************
*** 166,175 ****
case "l":
$description = $site_name . " - ";
! $description .= format_mail(eregi_replace("<([font][^>]*)>", "",$stories[$i]["intro_text"]),"80", "scrub");
break;
case "d":
case "1":
default:
! $description = format_mail(eregi_replace("<([font][^>]*)>", "",$stories[$i]["intro_text"]),"80", "scrub");
break;
}
--- 166,177 ----
case "l":
$description = $site_name . " - ";
! $description .= strip_tags($stories[$i]["intro_text"]);
! // $description .= format_mail(eregi_replace("<([font][^>]*)>", "",$stories[$i]["intro_text"]),"80", "scrub");
break;
case "d":
case "1":
default:
! $description = strip_tags($stories[$i]["intro_text"]);
! // $description = format_mail(eregi_replace("<([font][^>]*)>", "",$stories[$i]["intro_text"]),"80", "scrub");
break;
}
|
2 messages has been excluded from this view by a project administrator.
