Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv339/phpslash-ft/class
Modified Files:
Story.class
Log Message:
removed globals in Story.class
Index: Story.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Story.class,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** Story.class 2001/11/14 18:06:31 1.21
--- Story.class 2001/12/07 17:52:16 1.22
***************
*** 157,162 ****
function getNextPrev($story_id, $ary=""){
- global $rootdir, $PHP_SELF;
-
$arrows = $this->template->get(ARROWS);
if ($arrows == "") {
--- 157,160 ----
***************
*** 231,236 ****
function getStory($story_id, $mode, $argv_ary="", $tpl="") {
- global $templatedir;
-
$default_tpl = "printStory";
/*
--- 229,232 ----
***************
*** 265,269 ****
if( empty($tpl) ) {
$template = $default_tpl;
! } elseif ( file_exists($templatedir . "/" . basename($tpl) . ".tpl") ) {
$tpl_file = basename($tpl) . ".tpl";
$this->template->set_file(array(
--- 261,265 ----
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(
***************
*** 389,394 ****
# debug("Story::getStories.ary", $ary);
- global $templatedir;
-
$default_tpl = "indexstory";
--- 385,388 ----
***************
*** 400,404 ****
if( empty($tpl) ) {
$template = $default_tpl;
! } elseif ( file_exists($templatedir . "/" . basename($tpl) . ".tpl") ) {
$tpl_file = basename($tpl) . ".tpl";
$this->template->set_file(array(
--- 394,398 ----
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(
***************
*** 713,725 ****
function emailStory($story_id, $action) {
! global $imagedir, $templatedir, $HTTP_POST_VARS;
! global $REMOTE_ADDR, $PHP_SELF, $HTTP_HOST, $argv;
$emailform = "";
$valid_form = false;
! $action_url = $PHP_SELF . "?" . $argv[0] . "&action=send";
$this->template->set_var(array(
! IMAGEDIR => $imagedir,
ACTION_URL => $action_url,
STORY_ID => $story_id,
--- 707,718 ----
function emailStory($story_id, $action) {
! global $HTTP_POST_VARS, $REMOTE_ADDR, $HTTP_HOST, $argv;
$emailform = "";
$valid_form = false;
! $action_url = $this->psl['phpself'] . "?" . $argv[0] . "&action=send";
$this->template->set_var(array(
! IMAGEDIR => $this->psl['imageurl'],
ACTION_URL => $action_url,
STORY_ID => $story_id,
***************
*** 751,756 ****
$this->template->set_var(array(
SITE_HOST => $HTTP_HOST,
! PHP_SELF => $PHP_SELF,
! ACTION_URL => $PHP_SELF,
REMOTE_ADDR => $REMOTE_ADDR,
STORY_ID => $story_id,
--- 744,749 ----
$this->template->set_var(array(
SITE_HOST => $HTTP_HOST,
! PHP_SELF => $this->psl['phpself'],
! ACTION_URL => $this->psl['phpself'],
REMOTE_ADDR => $REMOTE_ADDR,
STORY_ID => $story_id,
***************
*** 916,920 ****
function newStory($ary,$data_source) {
! global $author_id,$author_name,$PHP_SELF;
# global $debug;
--- 909,913 ----
function newStory($ary,$data_source) {
! global $author_id,$author_name;
# global $debug;
|
