[phpws-comm-commits] modules/article/class Article.php,1.7,1.8

[<ada...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/article/class
In directory sc8-pr-cvs1:/tmp/cvs-serv8699/class

Modified Files:
	Article.php 
Log Message:
Stuff done while away.

Index: Article.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/article/class/Article.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Article.php	19 Jul 2003 18:08:04 -0000	1.7
--- Article.php	31 Jul 2003 21:12:44 -0000	1.8
***************
*** 243,247 ****
      if ($Fullpage)   /* Full article display */
      {
!       $printAll = $_REQUEST['page_num']=='all' || isset($_REQUEST['lay_quiet']);
        /* Keep track of any sub-page titles for the NavBar */
        $page_list[] = $this->title;
--- 243,247 ----
      if ($Fullpage)   /* Full article display */
      {
!       $printAll = (isset($_REQUEST['page_num']) && $_REQUEST['page_num']=='all') || isset($_REQUEST['lay_quiet']);
        /* Keep track of any sub-page titles for the NavBar */
        $page_list[] = $this->title;
***************
*** 249,253 ****
    		/* Construct article sections */
    		$first_section = TRUE;
!   		$page_wanted = ($_REQUEST['page_num'])
    			?$_REQUEST['page_num']
    			:1;
--- 249,254 ----
    		/* Construct article sections */
    		$first_section = TRUE;
!   		$article_tags['BODYTEXT'] = '';
!   		$page_wanted = (isset($_REQUEST['page_num']))
    			?$_REQUEST['page_num']
    			:1;
***************
*** 784,789 ****
  			      .' - '. $_SESSION['translate']->it('Article Saved').'!';
  		$GLOBALS['CNT_article']['content'] = $content .'<br /><br />'. $this->menuLink;
- //		$title = $_SESSION['translate']->it('Article Saved').'!';
- //		$_SESSION['OBJ_layout']->popbox($title, $content, NULL, 'CNT_article');
  	}
  
--- 785,788 ----
***************
*** 857,862 ****
  			      .' - '. $_SESSION['translate']->it('Article Deleted').'!';
    		$GLOBALS['CNT_article']['content'] = $content .'<br /><br />'. $this->menuLink;
- //			$title = '<div class="errortext">'.$_SESSION['translate']->it('Article Deleted').'!</div>';
- //			$_SESSION['OBJ_layout']->popbox($title, $content, NULL, 'CNT_article');
  		}
  		else if(isset($_POST['no']))
--- 856,859 ----
***************
*** 867,874 ****
  			    , $_SESSION['translate']->it('article'), $this->title, '<b>'.$_SESSION['translate']->it('kept').'</b>!')
  			  . '<br /><br />' . $this->menuLink;
- //			$title = '<div class="errortext">'.$_SESSION['translate']->it('Article Kept').'!</div>';
- //			$content = $_SESSION['translate']->it('The [var1] <b>[var2]</b> has successfully been [var3]'
- //			    , $_SESSION['translate']->it('article'), $this->title, '<b>'.$_SESSION['translate']->it('kept').'</b>!');
- //			$_SESSION['OBJ_layout']->popbox($title, $content, NULL, 'CNT_article');
  		}
  		else
--- 864,867 ----
***************
*** 886,890 ****
  			    , $_SESSION['translate']->it('delete'), $this->title) 
  			  . $GLOBALS['core']->makeForm("ARTICLE_confirm_delete", "index.php", $myform, "post", 0, 0);
- //			$_SESSION['OBJ_layout']->popbox($title, $content, NULL, 'CNT_article');
  		}
  	}
--- 879,882 ----
***************
*** 976,980 ****
  			    , '<b><u>' .$SECT_id. $this->sections[$SECT_id]->title . '</u></b><br /><br />')
  	      . $GLOBALS['core']->makeForm('SECT_confirm_delete', 'index.php', $myform, 'post', 0, 0);
- //			$_SESSION['OBJ_layout']->popbox($title, $content, NULL, 'CNT_article');
  		}
  	}
--- 968,971 ----