[phpws-comm-commits] modules/article/class Article.php,1.5,1.6

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	Article.php 
Log Message:
popboxes removed - now compatible with ver0.93
Interface Adjusted - Deleting without javascript enabled now takes you to a separate confirmation screen.


Index: Article.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/article/class/Article.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Article.php	16 Jul 2003 19:44:33 -0000	1.5
--- Article.php	17 Jul 2003 22:16:07 -0000	1.6
***************
*** 39,42 ****
--- 39,43 ----
  * @param int editmode : Temporary Flag showing what mode we're in
  * @param int announce : Whether or not this article will show up in the homepage summary list
+ * @param int linkBack : Link back to where Article Manager was called from
  //* @param array categories : Temporary holding array of selected categories
  *
***************
*** 71,74 ****
--- 72,76 ----
  	var $editmode;
  	var $announce;
+ 	var $menuLink;
  
  	/**
***************
*** 84,87 ****
--- 86,90 ----
  	function PHPWS_Article ($id = NULL, $data = NULL)
  	{
+     $this->menuLink = '<center><a href="index.php?module=article&disp=main_menu">'.$_SESSION['translate']->it('Main Menu').'</a></center>';
      $this->sectionID = 'a';
      $this->editmode = FALSE;
***************
*** 205,209 ****
      $rights = array( 'http://www.vibride.com','http://www.realvidreams.com','http://www.bygeorgeware.com','http://www.bygeorgeadvertising.com');
  		$copyright = '<a href="'.$rights[rand(0,2)].'"><img src="http://'.PHPWS_SOURCE_HTTP 
!   			. 'mod/article/img/mark.gif" border="0" title="Article Manager by by George! Software"></a>';
  		$article_tags = array();
  
--- 208,212 ----
      $rights = array( 'http://www.vibride.com','http://www.realvidreams.com','http://www.bygeorgeware.com','http://www.bygeorgeadvertising.com');
  		$copyright = '<a href="'.$rights[rand(0,2)].'"><img src="http://'.PHPWS_SOURCE_HTTP 
!   			. 'mod/article/img/mark.gif" border="0" title="Article Manager module by by George! Software." alt="Article Manager module by by George! Software."></a>';
  		$article_tags = array();
  
***************
*** 763,772 ****
  
  		$this->setEditLock(false);
- 		$title = $_SESSION['translate']->it('Article Saved').'!';
  		$content = $_SESSION['translate']->it('Your work has successfully been saved to the database!');
      if(!$this->approved) 
  		$content .= '<br />'.$_SESSION['translate']->it('It will be published after approval by an administrator.');
  
! 		$_SESSION['OBJ_layout']->popbox($title, $content, NULL, 'CNT_article');
  	}
  
--- 766,778 ----
  
  		$this->setEditLock(false);
  		$content = $_SESSION['translate']->it('Your work has successfully been saved to the database!');
      if(!$this->approved) 
  		$content .= '<br />'.$_SESSION['translate']->it('It will be published after approval by an administrator.');
  
! 		$GLOBALS['CNT_article']['title'] = $_SESSION['translate']->it('Article Manager')
! 			      .' - '. $_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');
  	}
  
***************
*** 828,832 ****
        }
  
- 			$title = '<div class="errortext">'.$_SESSION['translate']->it('Article Deleted').'!</div>';
  			$content = $_SESSION['translate']->it('The [var1] <b>[var2]</b> has successfully been [var3]'
  			            , $_SESSION['translate']->it('article')
--- 834,837 ----
***************
*** 838,864 ****
        else
          $content .= $_SESSION['translate']->it('All menu links removed') . '.';
! 			$_SESSION['OBJ_layout']->popbox($title, $content, NULL, 'CNT_article');
  		}
  		else if(isset($_POST['no']))
  		{
! 			$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
  		{
! 			$title = '<div class="errortext">'.$_SESSION['translate']->it('Confirm Action').'!</div>';
! 			$content = $_SESSION['translate']->it('Are you sure you want to <b>[var1] "[var2]"</b>?'
! 			    , $_SESSION['translate']->it('delete'), $this->title);
! 
! 			$myform[0] = $GLOBALS['core']->formHidden('module', 'article');
! 			$myform[0] .= $GLOBALS['core']->formHidden('ARTICLE_id', $this->id);
! 			$myform[0] .= $GLOBALS['core']->formHidden('edit', 'delete');
! 			$myform[0] .= $GLOBALS['core']->formSubmit($_SESSION['translate']->it('Yes'), 'yes') . '&nbsp;&nbsp;';
! 			$myform[0] .= $GLOBALS['core']->formSubmit($_SESSION['translate']->it('No'), 'no');
  
! 			$content .= $GLOBALS['core']->makeForm("ARTICLE_confirm_delete", "index.php", $myform, "post", 0, 0);
! 			$_SESSION['OBJ_layout']->popbox($title, $content, NULL, 'CNT_article');
  		}
  	}
--- 843,879 ----
        else
          $content .= $_SESSION['translate']->it('All menu links removed') . '.';
!   		$GLOBALS['CNT_article']['title'] = $_SESSION['translate']->it('Article Manager')
! 			      .' - '. $_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']))
  		{
! 			$GLOBALS['CNT_article']['title'] = $_SESSION['translate']->it('Article Manager')
! 			      .' - '. $_SESSION['translate']->it('Article Deletion Cancelled').'!';
! 			$GLOBALS['CNT_article']['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>!')
! 			  . '<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
  		{
! 			$myform[0] = $GLOBALS['core']->formHidden('module', 'article')
! 			    . $GLOBALS['core']->formHidden('ARTICLE_id', $this->id)
! 			    . $GLOBALS['core']->formHidden('edit', 'delete')
! 			    . $GLOBALS['core']->formSubmit($_SESSION['translate']->it('Yes'), 'yes') 
! 			    . '&nbsp;&nbsp;'
! 			    . $GLOBALS['core']->formSubmit($_SESSION['translate']->it('No'), 'no');
  
! 			$GLOBALS['CNT_article']['title'] = $_SESSION['translate']->it('Article Manager')
! 			      .' - '. $_SESSION['translate']->it('Confirm Action').'!';
! 			$GLOBALS['CNT_article']['content'] = $_SESSION['translate']->it('Are you sure you want to <b>[var1] "[var2]"</b>?'
! 			    , $_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');
  		}
  	}
***************
*** 936,953 ****
  		else
  		{
! 			$GLOBALS['CNT_article']['title'] = 'Article Manager';
! 
! 			$title = "<div class=\"errortext\">".$_SESSION['translate']->it('Confirm Action').'!</div>';
! 			$content = $_SESSION['translate']->it('Are you sure you want to [var1] [var2]?'
! 			    , "<b>".$_SESSION['translate']->it('delete').'</b>'
! 			    , "<b><u>" .$SECT_id. $this->sections[$SECT_id]->title . '</u></b><br /><br />');
! 
! 			$myform[0] = $GLOBALS['core']->formHidden('module', 'article');
! 			$myform[0] .= $GLOBALS['core']->formHidden('section=remove:'.$SECT_id, '1');
! 			$myform[0] .= $GLOBALS['core']->formSubmit($_SESSION['translate']->it('Yes'), 'yes') . '&nbsp;&nbsp;';
! 			$myform[0] .= $GLOBALS['core']->formSubmit($_SESSION['translate']->it('No'), 'no');
  
! 			$content .= $GLOBALS['core']->makeForm('SECT_confirm_delete', 'index.php', $myform, 'post', 0, 0);
! 			$_SESSION['OBJ_layout']->popbox($title, $content, NULL, 'CNT_article');
  		}
  	}
--- 951,969 ----
  		else
  		{
! 			$myform[0] = $GLOBALS['core']->formHidden('module', 'article') 
! 			      . $GLOBALS['core']->formHidden('section', 'remove')
! 			      . $GLOBALS['core']->formHidden('SECT_id', $SECT_id)
! 			      . $GLOBALS['core']->formSubmit($_SESSION['translate']->it('Yes'), 'yes') 
! 			      . '&nbsp;&nbsp;'
! 			      . $GLOBALS['core']->formSubmit($_SESSION['translate']->it('No'), 'no');
  
! 			$GLOBALS['CNT_article']['title'] = $_SESSION['translate']->it('Article Manager')
! 			      .' - '. $_SESSION['translate']->it('Confirm Action').'!';
! 			$GLOBALS['CNT_article']['content'] 
! 			  = $_SESSION['translate']->it('Are you sure you want to [var1] [var2]?'
! 			    , '<b>'.$_SESSION['translate']->it('delete').'</b>'
! 			    , '<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');
  		}
  	}
***************
*** 987,993 ****
                ,date('d')+$_SESSION['SES_ART_master']->val['expiration_days']
                ,date('Y')+$_SESSION['SES_ART_master']->val['expiration_years']));
- 	    
- 		$query_data['publication_date'] = date("Y-m-d H:i:s");
  
      PHPWS_Fatcat::activate($this->id, 'article');
  		$this->publication_date = $query_data['expiration_date'];
--- 1003,1009 ----
                ,date('d')+$_SESSION['SES_ART_master']->val['expiration_days']
                ,date('Y')+$_SESSION['SES_ART_master']->val['expiration_years']));
  
+ 		$query_data['publication_date'] = date("Y-m-d H:i:s");
+ 		$GLOBALS['core']->sqlUpdate($query_data, 'mod_article', 'id', $this->id);
      PHPWS_Fatcat::activate($this->id, 'article');
  		$this->publication_date = $query_data['expiration_date'];
***************
*** 1097,1101 ****
      return $this->view(false, true);
    }
- 
  }  
  ?>
--- 1113,1116 ----