phpwebsite-comm-cvs-commits — Read-Only CVS commits log list

[phpws-comm-commits] modules/article/class ArticleManager.php,1.6,1.7

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

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

Modified Files:
	ArticleManager.php 
Log Message:
Stuff done while away - Fixed news links & stuff

Index: ArticleManager.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/article/class/ArticleManager.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ArticleManager.php	19 Jul 2003 18:08:04 -0000	1.6
--- ArticleManager.php	31 Jul 2003 21:11:43 -0000	1.7
***************
*** 328,331 ****
--- 328,332 ----
        if(!$result = $GLOBALS['core']->query($sql)) 
          return;
+  			$GLOBALS['CNT_article_summaries']['content'] = '';
        while($summary=$result->fetchrow(DB_FETCHMODE_ASSOC)) 
    		{
***************
*** 344,351 ****
      /* Create NewsPage HTML */
      $alphabet = PHPWS_User::alphabet();
!     $tags['ALPHABET'] = $GLOBALS['core']->moduleLink($_SESSION['translate']->it('ALL'), 'article', array('disp'=>'news', 'newsFilter'=>'') ) . "&nbsp\n";
      foreach ($alphabet as $alphachar)
        if ($alphachar!=$this->filter)
!     	  $tags['ALPHABET'] .= $GLOBALS['core']->moduleLink($alphachar, 'article', array('disp'=>'news', 'newsFilter'=>$alphachar) ) . "&nbsp\n";
      	else
      	  $tags['ALPHABET'] .= $alphachar . "&nbsp\n";
--- 345,352 ----
      /* Create NewsPage HTML */
      $alphabet = PHPWS_User::alphabet();
!     $tags['ALPHABET'] = $GLOBALS['core']->moduleLink($_SESSION['translate']->it('ALL'), 'article', array('view'=>'news', 'newsFilter'=>'') ) . "&nbsp\n";
      foreach ($alphabet as $alphachar)
        if ($alphachar!=$this->filter)
!     	  $tags['ALPHABET'] .= $GLOBALS['core']->moduleLink($alphachar, 'article', array('view'=>'news', 'newsFilter'=>$alphachar) ) . "&nbsp\n";
      	else
      	  $tags['ALPHABET'] .= $alphachar . "&nbsp\n";
***************
*** 450,456 ****
        return;
  
- 		$GLOBALS['CNT_article_summaries']['title'] .= '<center><b>' 
- 	        . $_SESSION['translate']->it('Also on this Site') . '...</b></center>';
- 
      /* Load records to display */
      $sql = 'SELECT * FROM '  . $this->sql_article_table 
--- 451,454 ----
***************
*** 461,464 ****
--- 459,466 ----
  		/* If there are summaries to display, display 'em */
      if ($this->val['summaries_on_homepage']>0)
+     {
+ 			$GLOBALS['CNT_article_summaries']['title'] = '<center><b>' 
+ 		        . $_SESSION['translate']->it('Also on this Site') . '...</b></center>';
+  			$GLOBALS['CNT_article_summaries']['content'] = '';
        for($i=0; $i < $this->val['summaries_on_homepage'] && $summary=$result->fetchrow(DB_FETCHMODE_ASSOC); $i++) 
    		{
***************
*** 466,469 ****
--- 468,472 ----
        	$temp->view(false);
        }
+     }
  		/* If there are x articles before these, display the "Prev Articles" Block */
      if ($this->val['prev_n_articles']>0)

[phpws-comm-commits] modules/staffman/lang staffman.en.lng,1.3,1.4

[<gbr...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/staffman/lang
In directory sc8-pr-cvs1:/tmp/cvs-serv6795/lang

Modified Files:
	staffman.en.lng 
Log Message:
updated README, improved multiple item handling

Index: staffman.en.lng
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/staffman/lang/staffman.en.lng,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** staffman.en.lng	30 Jul 2003 22:44:53 -0000	1.3
--- staffman.en.lng	31 Jul 2003 00:45:47 -0000	1.4
***************
*** 38,40 ****
  a:|:Remove Photo:|:Remove Photo
  a:|:Unable to remove photo file.:|:Unable to remove photo file.
! a:|:You may only delete one staffmenber at a time.:|:You may only delete one staffmenber at a time.
--- 38,41 ----
  a:|:Remove Photo:|:Remove Photo
  a:|:Unable to remove photo file.:|:Unable to remove photo file.
! a:|:You may only delete one staffmember listing at a time.:|:You may only delete one staffmember listing at a time.
! a:|:You may only edit one staffmember listing at a time.:|:You may only edit one staffmember listing at a time.

[phpws-comm-commits] modules/staffman/docs README.txt,1.1.1.1,1.2

[<gbr...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/staffman/docs
In directory sc8-pr-cvs1:/tmp/cvs-serv6795/docs

Modified Files:
	README.txt 
Log Message:
updated README, improved multiple item handling

Index: README.txt
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/staffman/docs/README.txt,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** README.txt	2 Jul 2003 23:45:10 -0000	1.1.1.1
--- README.txt	31 Jul 2003 00:45:46 -0000	1.2
***************
*** 46,50 ****
  To uninstall this module, log in to your site as Deity, select Control Panel/Administration 
  and then Boost Module Upgrader.  Locate 'Staff Listing' in the list of modules, and click
! Uninstall.
  
  ------------------------------
--- 46,51 ----
  To uninstall this module, log in to your site as Deity, select Control Panel/Administration 
  and then Boost Module Upgrader.  Locate 'Staff Listing' in the list of modules, and click
! Uninstall.  NOTE THAT UN-INSTALLATION DESTROYS DATA in the form of information stored in 
! the database and photo image files stored in images/staffman/.
  
  ------------------------------

[phpws-comm-commits] modules/staffman/class staffmanager.php,1.2,1.3

[<gbr...@us...>]

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

Modified Files:
	staffmanager.php 
Log Message:
updated README, improved multiple item handling

Index: staffmanager.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/staffman/class/staffmanager.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** staffmanager.php	30 Jul 2003 22:44:50 -0000	1.2
--- staffmanager.php	31 Jul 2003 00:45:45 -0000	1.3
***************
*** 83,89 ****
  	 */
  	function _edit() {
  
  		$this->staffmember = new staffmember($_REQUEST["PHPWS_MAN_ITEMS"][0]);		/* PHPWS_MAN_ITEMS[0] contains the staffmemberid */
! 		$content = $this->staffmember->edit();
  	
  		/* set display variables */
--- 83,95 ----
  	 */
  	function _edit() {
+ 		// warn only one edit at a time
+ 		if (sizeof($_REQUEST["PHPWS_MAN_ITEMS"]) > 1) {
+ 			$content = "<span class=\"errortext\">" . $_SESSION['translate']->it("You may only edit one staffmember listing at a time.") . "</span><br />";
+ 		} else {
+ 			$content = "";
+ 		}
  
  		$this->staffmember = new staffmember($_REQUEST["PHPWS_MAN_ITEMS"][0]);		/* PHPWS_MAN_ITEMS[0] contains the staffmemberid */
! 		$content .= $this->staffmember->edit();
  	
  		/* set display variables */
***************
*** 103,107 ****
  		// warn only one deletion at a time
  		if (sizeof($_REQUEST["PHPWS_MAN_ITEMS"]) > 1) {
! 			$content = "<span class=\"errortext\">" . $_SESSION['translate']->it("You may only delete one staffmenber at a time.") . "</span><br />";
  		} else {
  			$content = "";
--- 109,113 ----
  		// warn only one deletion at a time
  		if (sizeof($_REQUEST["PHPWS_MAN_ITEMS"]) > 1) {
! 			$content = "<span class=\"errortext\">" . $_SESSION['translate']->it("You may only delete one staffmember listing at a time.") . "</span><br />";
  		} else {
  			$content = "";

[phpws-comm-commits] modules/staffman/boost uninstall.php,1.1.1.1,1.2

[<gbr...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/staffman/boost
In directory sc8-pr-cvs1:/tmp/cvs-serv6795/boost

Modified Files:
	uninstall.php 
Log Message:
updated README, improved multiple item handling

Index: uninstall.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/staffman/boost/uninstall.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** uninstall.php	2 Jul 2003 23:45:06 -0000	1.1.1.1
--- uninstall.php	31 Jul 2003 00:45:43 -0000	1.2
***************
*** 30,34 ****
  	$GLOBALS['core']->sqlDelete("mod_search_register", "module", "staffman");
  	$content .= "Staff Listing removed from Search system.<br />";
! 
  
  } else
--- 30,40 ----
  	$GLOBALS['core']->sqlDelete("mod_search_register", "module", "staffman");
  	$content .= "Staff Listing removed from Search system.<br />";
! 	
! 	$ok = PHPWS_File::rmdir(PHPWS_HOME_DIR . "images/staffman/");
! 	if ($ok) {
! 		$content .= "The staffmember images directory was successfully removed.<br />";
! 	} else {
! 		$content .= "The staffmember images directory could not be removed.<br />";
! 	}
  
  } else

[phpws-comm-commits] modules/staffman/class staff.php,1.1.1.1,1.2 staffmanager.php,1.1.1.1,1.2

[<gbr...@us...>]

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

Modified Files:
	staff.php staffmanager.php 
Log Message:
handled multiple list selections for delete, view

Index: staff.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/staffman/class/staff.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** staff.php	2 Jul 2003 23:45:07 -0000	1.1.1.1
--- staff.php	30 Jul 2003 22:44:50 -0000	1.2
***************
*** 252,266 ****
  	 * Displays current position listing
  	 *
  	 * @author George Brackett <gbr...@NO...>
  	 */
! 	function view() {
  		
- 		$form = new EZform("STAFF_VIEW");
- 		$form->add("CONTINUE_BUTTON", "submit", $_SESSION["translate"]->it("Continue"));
- 		$form->add("module", "hidden", "staffman");
- 		$form->add("STAFF_MAN_op", "hidden", "list");
  		$tags = array();
! 		$tags = $form->getTemplate();
! 		
  		$tags["LASTNAME"] = $this->getLabel();
  		$tags["FIRSTNAME"] = $this->_firstname;
--- 252,268 ----
  	 * Displays current position listing
  	 *
+ 	 * @param Boolean $continuebtn = TRUE if continue button is to be shown
  	 * @author George Brackett <gbr...@NO...>
  	 */
! 	function view($continuebtn) {
  		
  		$tags = array();
! 		if ($continuebtn) {
! 			$form = new EZform("STAFF_VIEW");
! 			$form->add("CONTINUE_BUTTON", "submit", $_SESSION["translate"]->it("Continue"));
! 			$form->add("module", "hidden", "staffman");
! 			$form->add("STAFF_MAN_op", "hidden", "list");
! 			$tags = $form->getTemplate();
! 		}
  		$tags["LASTNAME"] = $this->getLabel();
  		$tags["FIRSTNAME"] = $this->_firstname;

Index: staffmanager.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/staffman/class/staffmanager.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** staffmanager.php	2 Jul 2003 23:45:08 -0000	1.1.1.1
--- staffmanager.php	30 Jul 2003 22:44:50 -0000	1.2
***************
*** 101,113 ****
  	 */
  	function _delete() {
! 
  		$this->staffmember = new staffmember($_REQUEST["PHPWS_MAN_ITEMS"][0]); 		/* PHPWS_MAN_ITEMS[0] contains the staffmemberid */
! 		$content = $this->staffmember->delete();
! 
  		/* set display variables */
! 		$GLOBALS["CNT_staffman"]["content"] = $this->staffmember->delete();
  		$GLOBALS["CNT_staffman"]["title"] = $_SESSION['translate']->it("Staff Listing");
  
! 	} //END function _delete
  	
  	/**
--- 101,118 ----
  	 */
  	function _delete() {
! 		// warn only one deletion at a time
! 		if (sizeof($_REQUEST["PHPWS_MAN_ITEMS"]) > 1) {
! 			$content = "<span class=\"errortext\">" . $_SESSION['translate']->it("You may only delete one staffmenber at a time.") . "</span><br />";
! 		} else {
! 			$content = "";
! 		}
  		$this->staffmember = new staffmember($_REQUEST["PHPWS_MAN_ITEMS"][0]); 		/* PHPWS_MAN_ITEMS[0] contains the staffmemberid */
! 		$content .= $this->staffmember->delete();
! 		
  		/* set display variables */
! 		$GLOBALS["CNT_staffman"]["content"] = $content;
  		$GLOBALS["CNT_staffman"]["title"] = $_SESSION['translate']->it("Staff Listing");
  
! 	} // END function _delete
  	
  	/**
***************
*** 120,128 ****
  	function _view() {
  
! 		$this->staffmember = new staffmember($_REQUEST["PHPWS_MAN_ITEMS"][0]); 		/* PHPWS_MAN_ITEMS[0] contains the staffmemberid */
! 		$content = $this->staffmember->view();
! 		
! 		/* set display variables */
! 		$GLOBALS["CNT_staffman"]["content"] = $content;
  		$GLOBALS["CNT_staffman"]["title"] = $_SESSION['translate']->it("Staff Listing");
  
--- 125,138 ----
  	function _view() {
  
! 		/* PHPWS_MAN_ITEMS[0] contains the an array of staffmember ids */
! 		$GLOBALS["CNT_staffman"]["content"] = "";
! 		// ask for a continue button only for the last id
! 		$i = 0;
! 		foreach($_REQUEST["PHPWS_MAN_ITEMS"] as $staffid) {
! 			$this->staffmember = new staffmember($staffid); 		
! 			$content = $this->staffmember->view($i == (sizeof($_REQUEST["PHPWS_MAN_ITEMS"]) - 1));
! 			$GLOBALS["CNT_staffman"]["content"] .= $content;
! 			$i++;
! 		}
  		$GLOBALS["CNT_staffman"]["title"] = $_SESSION['translate']->it("Staff Listing");
  
***************
*** 146,150 ****
  			case "sView":		/* view an item chosen from search results */
  				$this->staffmember = new staffmember($_REQUEST["STAFF_id"]);
! 				$content = $this->staffmember->view();
  				
  				/* set display variables */
--- 156,160 ----
  			case "sView":		/* view an item chosen from search results */
  				$this->staffmember = new staffmember($_REQUEST["STAFF_id"]);
! 				$content = $this->staffmember->view(TRUE);		// show continue button
  				
  				/* set display variables */

[phpws-comm-commits] modules/staffman/lang staffman.en.lng,1.2,1.3

[<gbr...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/staffman/lang
In directory sc8-pr-cvs1:/tmp/cvs-serv17138/lang

Modified Files:
	staffman.en.lng 
Log Message:
handled multiple list selections for delete, view

Index: staffman.en.lng
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/staffman/lang/staffman.en.lng,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** staffman.en.lng	3 Jul 2003 00:14:54 -0000	1.2
--- staffman.en.lng	30 Jul 2003 22:44:53 -0000	1.3
***************
*** 38,39 ****
--- 38,40 ----
  a:|:Remove Photo:|:Remove Photo
  a:|:Unable to remove photo file.:|:Unable to remove photo file.
+ a:|:You may only delete one staffmenber at a time.:|:You may only delete one staffmenber at a time.

[phpws-comm-commits] modules/jobman/conf controlpanel.php,1.2,1.3

[<gbr...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/jobman/conf
In directory sc8-pr-cvs1:/tmp/cvs-serv3663/conf

Modified Files:
	controlpanel.php 
Log Message:
updated icon

Index: controlpanel.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/jobman/conf/controlpanel.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** controlpanel.php	25 Jun 2003 22:13:10 -0000	1.2
--- controlpanel.php	28 Jul 2003 21:25:05 -0000	1.3
***************
*** 10,17 ****
  // Defines the access to and appearance of module listings.
  
! $image['name'] = "hatdrill.png";
  $image['alt'] = "Positions Available by George Brackett";
  
! $image2['name'] = "hatdrill.png";
  $image2['alt'] = "Job List";
  
--- 10,17 ----
  // Defines the access to and appearance of module listings.
  
! $image['name'] = "jobman.gif";
  $image['alt'] = "Positions Available by George Brackett";
  
! $image2['name'] = "jobman.gif";
  $image2['alt'] = "Job List";
  

[phpws-comm-commits] modules/staffman/conf controlpanel.php,1.1.1.1,1.2

[<gbr...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/staffman/conf
In directory sc8-pr-cvs1:/tmp/cvs-serv30871/conf

Modified Files:
	controlpanel.php 
Log Message:
included reference to controlpanel icon

Index: controlpanel.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/staffman/conf/controlpanel.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** controlpanel.php	2 Jul 2003 23:45:08 -0000	1.1.1.1
--- controlpanel.php	28 Jul 2003 21:03:10 -0000	1.2
***************
*** 10,17 ****
  // Defines the access to and appearance of module listings.
  
! $image['name'] = "hatdrill.png";
  $image['alt'] = "Staff Listing by George Brackett";
  
! $image2['name'] = "hatdrill.png";
  $image2['alt'] = "Staff Listing";
  
--- 10,17 ----
  // Defines the access to and appearance of module listings.
  
! $image['name'] = "staffman.gif";
  $image['alt'] = "Staff Listing by George Brackett";
  
! $image2['name'] = "staffman.gif";
  $image2['alt'] = "Staff Listing";
  

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

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

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

Modified Files:
	Article.php ArticleManager.php 
Log Message:
popboxes removed - now compatible with ver0.93
More bugs caught & fixed
Interface Adjusted - Deleting articles & sections (without javascript enabled) now takes you to a separate confirmation screen.
Printable version can now show site header & footer if set in the Configuration menu

Index: Article.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/article/class/Article.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Article.php	17 Jul 2003 22:16:07 -0000	1.6
--- Article.php	19 Jul 2003 18:08:04 -0000	1.7
***************
*** 209,212 ****
--- 209,213 ----
  		$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_link = 'index.php?module=article&amp;view='.$this->id; 
  		$article_tags = array();
  
***************
*** 242,245 ****
--- 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;
***************
*** 260,264 ****
    	 		/* If this section is in the requested page range, print it */
    			if (is_object($this->sections[$value]) 
!   			      && ($page_count==$page_wanted || $_REQUEST['page_num']=='all'))
    	 			$article_tags['BODYTEXT'] .= $this->sections[$value]->view_section(0,$this->id
    	 			    ,$this->created_username,$this->created_date,$this->updated_username
--- 262,266 ----
    	 		/* If this section is in the requested page range, print it */
    			if (is_object($this->sections[$value]) 
!   			      && ($page_count==$page_wanted || $printAll))
    	 			$article_tags['BODYTEXT'] .= $this->sections[$value]->view_section(0,$this->id
    	 			    ,$this->created_username,$this->created_date,$this->updated_username
***************
*** 267,271 ****
     		}
    		/* Show multi-article navigation list & bar */
!   		if ($this->pages > 1)
    		{
    			for ($page_count = 1; ($page_count <= $this->pages); $page_count++)
--- 269,273 ----
     		}
    		/* Show multi-article navigation list & bar */
!   		if ($this->pages>1 && !$printAll)
    		{
    			for ($page_count = 1; ($page_count <= $this->pages); $page_count++)
***************
*** 309,313 ****
      else  /* Summary Display */
      {
-       $article_link = 'index.php?module=article&amp;view='.$this->id; 
        $article_tags['READMORE'] = '['.'<a href="'. $article_link. '">'. $_SESSION['translate']->it('Read More'). ' </a>]';
        $article_tags['LINK'] = 'http://'.$GLOBALS['core']->home_http.$article_link;
--- 311,314 ----
***************
*** 343,347 ****
   		if ($_SESSION['SES_ART_master']->can('edit',$this->created_username))
    	    /* If someone else is editing this page... */
!   		if ($this->isLocked(&$this->editlock, &$this->edituser))
    			$article_tags['EDIT'] = '['. $_SESSION['translate']->it('Locked') . ']'; 
    		else
--- 344,348 ----
   		if ($_SESSION['SES_ART_master']->can('edit',$this->created_username))
    	    /* If someone else is editing this page... */
!   		if ($this->isLocked($this->editlock, $this->edituser))
    			$article_tags['EDIT'] = '['. $_SESSION['translate']->it('Locked') . ']'; 
    		else
***************
*** 382,385 ****
--- 383,396 ----
   			if ($GLOBALS['module'] != "home")	$GLOBALS['CNT_article']['content'] .= $copyright;
  
+   	 	/* If we need a printable version... */
+       if (isset($_REQUEST['lay_quiet']))
+       {
+         if ($_SESSION['SES_ART_master']->val['brand_printable'])
+           $_SESSION['SES_ART_master']->displayPrintTheme('CNT_article');
+   	 	  else
+   	 	    echo '<h2>'.$GLOBALS['CNT_article']['title'].'</h2>'.$GLOBALS['CNT_article']['content'];
+   	 	  return;
+   	 	}
+ 
    	 	/* Article Comments */
    		if(isset($_SESSION['PHPWS_CommentManager']) && $this->allow_comments && !$this->mainarticle) 
***************
*** 408,412 ****
      {
  	    /* Make sure someone else isn't editing this page */
!   		if ($timeleft = $this->isLocked(&$this->editlock, &$this->edituser))
    		{
          /* Display an error messase & exit*/
--- 419,423 ----
      {
  	    /* Make sure someone else isn't editing this page */
!   		if ($timeleft = $this->isLocked($this->editlock, $this->edituser))
    		{
          /* Display an error messase & exit*/

Index: ArticleManager.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/article/class/ArticleManager.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ArticleManager.php	17 Jul 2003 22:13:13 -0000	1.5
--- ArticleManager.php	19 Jul 2003 18:08:04 -0000	1.6
***************
*** 250,254 ****
  			if ($this->can("edit",$value['created_username']))
    	    /* If someone else is not editing this page... */
!     		if (!PHPWS_Article::isLocked(&$value['editlock'], &$value['edituser']))
    				$row['EDIT'] = '<input type="submit" name="ARTICLE_vars[edit:'
                  .$value['id'].']" value="'.$Fedit.'" />';
--- 250,254 ----
  			if ($this->can("edit",$value['created_username']))
    	    /* If someone else is not editing this page... */
!     		if (!PHPWS_Article::isLocked($value['editlock'], $value['edituser']))
    				$row['EDIT'] = '<input type="submit" name="ARTICLE_vars[edit:'
                  .$value['id'].']" value="'.$Fedit.'" />';
***************
*** 787,790 ****
--- 787,860 ----
  		$GLOBALS['CNT_article']['content'] .= '<h3>' . $title . '</h3>' . $content;
  	}
+ 
+ 	/**
+   * Prints the theme and a specified block
+   *
+   * This is a modification of Matthew McNaney's Layout.php->displayTheme()
+   * that displays a printable version of a web page with a page header &
+   * footer for proper site branding.
+   *
+ 	* @author Eloi George <el...@NO...>
+ 	* @module Article Manager
+ 	* @param string contentVar : The content variable that will be displayed 
+ 	* @return none
+ 	*/
+   function displayPrintTheme($contentVar)
+   {
+     include_once(PHPWS_SOURCE_DIR . "mod/layout/conf/config.php");
+     if ($_SESSION["OBJ_user"]->isUser())
+     {
+       $newTheme = $_SESSION["OBJ_user"]->getUserVar("theme");
+       if($newTheme != $_SESSION['OBJ_layout']->current_theme)
+       	$_SESSION['OBJ_layout']->initializeLayout($newTheme);
+     }
+ 
+     $THEME["THEME_DIRECTORY"] = $_SESSION['OBJ_layout']->theme_address;
+ 
+     $extraInfoFile = PHPWS_HOME_DIR . "themes/" . $_SESSION['OBJ_layout']->current_theme . "/theme.php";
+     if ((defined("ALLOW_THEME_PHP_INSERTION") && ALLOW_THEME_PHP_INSERTION == TRUE) &&  is_file($extraInfoFile))
+       include($extraInfoFile);
+ 
+     if (!is_array($_SESSION['OBJ_layout']->ordered_list))
+       $_SESSION['OBJ_layout']->loadBoxInfo();
+ 
+   	$templateDir = $_SESSION['OBJ_layout']->box_dir . $_SESSION['OBJ_layout']->content_array[$contentVar]["box_file"];
+ 
+   	foreach ($GLOBALS[$contentVar] as $tag=>$tagLabel)
+   	  if (!empty($tagLabel))
+   	    $boxTemplate[strtoupper($tag)] = $tagLabel;
+ 
+ 	  $boxTemplate["HOME_ADDRESS"] = $GLOBALS["core"]->home_http;
+ 	  $boxTemplate["THEME_DIRECTORY"] = $_SESSION['OBJ_layout']->theme_address;
+ 	  $boxTemplate["BOX_DIRECTORY"] = $_SESSION['OBJ_layout']->box_address;
+ 
+   	$themeData = $GLOBALS["core"]->processTemplate($boxTemplate, "layout", $templateDir, FALSE);
+   	$THEME['BODY'] = (isset($THEME['BODY'])) ? $THEME['BODY'] . $themeData : $themeData;
+ 
+     if (isset($GLOBALS["Layout_title"]))
+       $THEME["TITLE"] = $GLOBALS["Layout_title"];
+     else
+       $THEME["TITLE"] = $_SESSION['OBJ_layout']->page_title;
+ 
+     $THEME["METATAGS"] = $_SESSION['OBJ_layout']->getMetaTags();
+     $THEME["JAVASCRIPT"] = $GLOBALS["core"]->load_js_funcs();
+ 
+     if($_SESSION['OBJ_layout']->_js !== NULL)
+       $THEME["DYN_JAVASCRIPT"] = $_SESSION['OBJ_layout']->_js;
+ 
+     $THEME["STYLE"] = $_SESSION['OBJ_layout']->pickCSS();
+ 
+     if($_SESSION['OBJ_layout']->_style !== NULL)
+       $THEME["DYN_STYLE"] = $_SESSION['OBJ_layout']->_style;
+ 
+     if (is_file($_SESSION['OBJ_layout']->theme_dir . "theme.tpl"))
+       echo  $GLOBALS["core"]->processTemplate($THEME, "layout", $_SESSION['OBJ_layout']->theme_dir . "theme.tpl", FALSE);
+     else 
+     {
+       $_SESSION['OBJ_layout']->_changeDefault("Default");
+       header("location:.");
+       exit();
+     }
+   }
  }
  ?>

[phpws-comm-commits] modules/article/lang article.en.lng,1.2,1.3

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

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

Modified Files:
	article.en.lng 
Log Message:
Printable version can now show site header & footer if set in the Configuration menu

Index: article.en.lng
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/article/lang/article.en.lng,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** article.en.lng	17 Jul 2003 22:18:59 -0000	1.2
--- article.en.lng	19 Jul 2003 18:05:20 -0000	1.3
***************
*** 116,119 ****
--- 116,120 ----
  a:|:Set Publication Dates:|:Set Publication Dates
  a:|:Short Image Description:|:Short Image Description
+ a:|:Show page headers and footers on printable versions of articles:|:Show page headers and footers on printable versions of articles
  a:|:Show me [var1] stuff ordered by [var2][var3]:|:Show me [var1] stuff ordered by [var2][var3]
  a:|:Some menu links could not be removed:|:Some menu links could not be removed

[phpws-comm-commits] modules/article/inc editconfig.php,1.2,1.3 saveconfig.php,1.1,1.2

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

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

Modified Files:
	editconfig.php saveconfig.php 
Log Message:
Printable version can now show site header & footer if set in the Configuration menu

Index: editconfig.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/article/inc/editconfig.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** editconfig.php	14 Jul 2003 20:46:25 -0000	1.2
--- editconfig.php	19 Jul 2003 18:05:19 -0000	1.3
***************
*** 188,191 ****
--- 188,196 ----
    . $_SESSION['OBJ_help']->show_link('configmanager', 'make_metatags');
  
+ /* make_metatags */
+ $tags['BRAND_PRINTABLE'] = $GLOBALS['core']->formCheckBox('CONFIG_brand_printable',1
+       ,$this->val['brand_printable'],NULL
+       ,$_SESSION['translate']->it('Show page headers and footers on printable versions of articles'));
+ 
  $tags['SAVE'] =  $GLOBALS['core']->formSubmit($_SESSION['translate']->it('Save Settings'), 'ARTICLE_vars[config:save]');
  $tags['RESET'] =  $GLOBALS['core']->formSubmit($_SESSION['translate']->it('Reset Settings'), 'ARTICLE_vars[config:reset]');

Index: saveconfig.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/article/inc/saveconfig.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** saveconfig.php	9 Jul 2003 20:24:26 -0000	1.1
--- saveconfig.php	19 Jul 2003 18:05:19 -0000	1.2
***************
*** 43,46 ****
--- 43,47 ----
  $query_data['lock_expiration_time'] = $_POST['CONFIG_lock_expiration_time'];
  $query_data['make_metatags'] = ($_POST['CONFIG_make_metatags'])?1:0;
+ $query_data['brand_printable'] = ($_POST['CONFIG_brand_printable'])?1:0;
  
  $GLOBALS['core']->sqlUpdate($query_data, "mod_article_config");

[phpws-comm-commits] modules/article/conf boost.php,1.2,1.3

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

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

Modified Files:
	boost.php 
Log Message:
Printable version can now show site header & footer if set in the Configuration menu

Index: boost.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/article/conf/boost.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** boost.php	16 Jul 2003 19:47:45 -0000	1.2
--- boost.php	19 Jul 2003 18:05:18 -0000	1.3
***************
*** 18,22 ****
  $admin_mod = 1;
  $active = "on";
! $version = 1.2;
  
  $mod_class_files = array("ArticleManager.php",
--- 18,22 ----
  $admin_mod = 1;
  $active = "on";
! $version = 1.3;
  
  $mod_class_files = array("ArticleManager.php",

[phpws-comm-commits] modules/article/boost update.php,NONE,1.1 install.sql,1.2,1.3

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

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

Modified Files:
	install.sql 
Added Files:
	update.php 
Log Message:
Printable version can now show site header & footer if set in the Configuration menu

--- NEW FILE: update.php ---
<?php
if (!$_SESSION["OBJ_user"]->isDeity())
{
  header("location:index.php");
  exit();
}

$status = 1;

if($currentVersion < 1.3) 
{
  $content .= 'Updating Article Manager to version 1.3<br />';
  $content .= 'Adding column "brand_printable" to "mod_article_config".<br />';
  $sql = 'ALTER TABLE ' . $GLOBALS['core']->tbl_prefix 
    . 'mod_article_config ADD `brand_printable` smallint NOT NULL DEFAULT "0" AFTER `make_metatags`';
  $result = $GLOBALS['core']->query($sql);
  if(DB::isError($result)) 
  {
    $content .= 'There was an error when attempting to alter the mod_article_config table:<br />'
      . $result->getMessage() . '<br />';
    $status = 0;
  } 
  else 
  {
    $content .= 'Column added successfully!';
  }
}
?>
Index: install.sql
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/article/boost/install.sql,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** install.sql	14 Jul 2003 20:46:21 -0000	1.2
--- install.sql	19 Jul 2003 18:05:11 -0000	1.3
***************
*** 95,102 ****
  lock_expiration_time int NOT NULL DEFAULT '3600',
  make_metatags smallint NOT NULL DEFAULT '0',
  print_header text NOT NULL
  );
  
! INSERT INTO mod_article_config VALUES ('Blank', 'Centered Image', 5, 5, 5, 20, 1, 1, 0, 0, 3, 0, 0, 10, 26, 400, 400, 0, 0, 0, 0, 0, 0, 0, 0, 3600, 0, '\r\n\r\n');
  
  
--- 95,103 ----
  lock_expiration_time int NOT NULL DEFAULT '3600',
  make_metatags smallint NOT NULL DEFAULT '0',
+ brand_printable smallint NOT NULL DEFAULT '0',
  print_header text NOT NULL
  );
  
! INSERT INTO mod_article_config VALUES ('Blank', 'Centered Image', 5, 5, 5, 20, 1, 1, 0, 0, 3, 0, 0, 10, 26, 400, 400, 0, 0, 0, 0, 0, 0, 0, 0, 3600, 0, 0, '\r\n\r\n');
  
  

[phpws-comm-commits] modules/article/docs INTRODUCTION.txt,1.1,1.2

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

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

Modified Files:
	INTRODUCTION.txt 
Log Message:
Added a "Most-Used URL Extensions" section

Index: INTRODUCTION.txt
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/article/docs/INTRODUCTION.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** INTRODUCTION.txt	9 Jul 2003 20:24:25 -0000	1.1
--- INTRODUCTION.txt	17 Jul 2003 22:33:27 -0000	1.2
***************
*** 211,212 ****
--- 211,237 ----
  COOL TIP!
  If you want to see the entire article on one webpage, change the url to &page_num=all
+ 
+ 
+ MOST-USED URL EXTENSIONS
+ ========================
+ 
+ Listing of all articles:
+   index.php?module=article&view=news
+ 
+ Create (Submit) a new article:
+   index.php?module=article&edit=create
+ 
+ Access Image Library:
+   index.php?module=article&config=image_library
+ 
+ Main Menu:
+   index.php?module=article&disp=main_menu
+   
+ To control the type and order of articles that show up, use:
+   index.php?module=article&LIST_group=All&LIST_sort=created_date&LIST_order=DESC
+ 
+   where LIST_group may be "All" or "MY"
+   
+   LIST_sort may be "title", "publication_date", "expiration_date", "created_date", or "updated_date"
+   
+   and LIST_order may be "ASC" or "DESC"

[phpws-comm-commits] modules/article/lang article.en.lng,1.1,1.2

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

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

Modified Files:
	article.en.lng 
Log Message:
Changed stuff

Index: article.en.lng
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/article/lang/article.en.lng,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** article.en.lng	16 Jul 2003 19:46:17 -0000	1.1
--- article.en.lng	17 Jul 2003 22:18:59 -0000	1.2
***************
*** 18,23 ****
--- 18,25 ----
  a:|:Article:|:Article
  a:|:Article Deleted:|:Article Deleted
+ a:|:Article Deletion Cancelled:|:Article Deletion Cancelled
  a:|:Article Information:|:Article Information
  a:|:Article Kept:|:Article Kept
+ a:|:Article Manager:|:Article Manager
  a:|:Article Manager Configuration:|:Article Manager Configuration
  a:|:Article Saved:|:Article Saved

[phpws-comm-commits] modules/article index.php,1.3,1.4

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

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

Modified Files:
	index.php 
Log Message:
Changed stuff

Index: index.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/article/index.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** index.php	16 Jul 2003 19:44:36 -0000	1.3
--- index.php	17 Jul 2003 22:18:57 -0000	1.4
***************
*** 99,103 ****
    
    	case 'save':
-   		$_SESSION['SES_ART_master']->main_menu();
        if ($user->can('create') 
                || $user->can('edit',$_SESSION['SES_ART_article']->author))
--- 99,102 ----
***************
*** 108,112 ****
    		  $_SESSION['SES_ART_section']=null;
    		}
!   		$_SESSION['SES_ART_master']->list_articles();
    	break;
  
--- 107,111 ----
    		  $_SESSION['SES_ART_section']=null;
    		}
! //  		$_SESSION['SES_ART_master']->list_articles();
    	break;
  
***************
*** 116,126 ****
      		$temp = new PHPWS_Article($_REQUEST['ARTICLE_id']);
  		    $temp->delete_article();
- 		    if (isset($_POST['yes']))
- 		    {
-       		$_SESSION['SES_ART_master']->main_menu();
-          	$_SESSION['SES_ART_master']->list_articles();
-         }
- 		    elseif (isset($_POST['no']))
-         	$temp->view();
        }
    	break;
--- 115,118 ----
***************
*** 181,184 ****
--- 173,177 ----
    	case 'remove':
  	    $_SESSION['SES_ART_article']->remove_section($_REQUEST['SECT_id']);
+       return;
    	break;
    
***************
*** 250,255 ****
    return;
  }
- else
-  	$_SESSION['SES_ART_master']->main_menu();
- 
  ?>  
--- 243,245 ----

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

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

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 ----

[phpws-comm-commits] modules/article/class ArticleManager.php,1.4,1.5

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

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

Modified Files:
	ArticleManager.php 
Log Message:
Added ability to control article listings via URL

Index: ArticleManager.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/article/class/ArticleManager.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ArticleManager.php	17 Jul 2003 18:06:41 -0000	1.4
--- ArticleManager.php	17 Jul 2003 22:13:13 -0000	1.5
***************
*** 104,107 ****
--- 104,113 ----
  	    $this->list_order = $_POST['LIST_order'];
  		}
+     if ($_REQUEST['LIST_group'] && array_key_exists($_REQUEST['LIST_group'], $this->group_array))
+ 	    $this->list_group = $_REQUEST['LIST_group']; 
+     if ($_REQUEST['LIST_sort'] && array_key_exists($_REQUEST['LIST_sort'], $this->sort_array))
+ 	    $this->list_sort = $_REQUEST['LIST_sort'];
+     if ($_REQUEST['LIST_order'] && array_key_exists($_REQUEST['LIST_order'], $this->order_array))
+ 	    $this->list_order = $_REQUEST['LIST_order'];
  
      $tags['SEARCHQUERY'] = $_SESSION['translate']->it('Show me [var1] stuff ordered by [var2][var3]'
***************
*** 235,240 ****
        $row['DATE'] = substr($value[$temp_date],0,10);
  
! 			/* Set var to expire/publish the article */
! 			if (isset($Fexpire))
  		    $row['PUB_EXP'] = ($is_viewable) 
            ?'<input type="submit" name="ARTICLE_vars[edit:expire]" value="'.$Fexpire.'" />'
--- 241,246 ----
        $row['DATE'] = substr($value[$temp_date],0,10);
  
! 			/* Set var to expire/publish the article if it's not the home page */
! 			if (isset($Fexpire) && !$value['mainarticle'])
  		    $row['PUB_EXP'] = ($is_viewable) 
            ?'<input type="submit" name="ARTICLE_vars[edit:expire]" value="'.$Fexpire.'" />'

[phpws-comm-commits] modules/article/class Section.php,1.3,1.4

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

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

Modified Files:
	Section.php 
Log Message:
Got rid of some double-quotes.

Index: Section.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/article/class/Section.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Section.php	16 Jul 2003 19:45:33 -0000	1.3
--- Section.php	17 Jul 2003 18:07:24 -0000	1.4
***************
*** 57,61 ****
  			if ($data==null)
  			{
! 				$result = $GLOBALS['core']->sqlSelect("mod_article_sections", 'id', $SECT_id);
  				$data = &$result[0];
  			}
--- 57,61 ----
  			if ($data==null)
  			{
! 				$result = $GLOBALS['core']->sqlSelect('mod_article_sections', 'id', $SECT_id);
  				$data = &$result[0];
  			}
***************
*** 155,165 ****
  				$template_array['UPDATED_USER'] = $updated_username;
  
! 			$section_content = $GLOBALS['core']->processTemplate($template_array, 'article', "section/".$this->template . ".tpl");
  		}
  
   		if ($edit_mode)
  		{
!       $myform[0] = $GLOBALS["core"]->formHidden("module", "article")
!           . $GLOBALS["core"]->formHidden("SECT_id", $this->id);
  	    $remove = $_SESSION['translate']->it('Remove');
  			if($_SESSION['OBJ_user']->js_on)
--- 155,165 ----
  				$template_array['UPDATED_USER'] = $updated_username;
  
! 			$section_content = $GLOBALS['core']->processTemplate($template_array, 'article', 'section/'.$this->template . '.tpl');
  		}
  
   		if ($edit_mode)
  		{
!       $myform[0] = $GLOBALS['core']->formHidden('module', 'article')
!           . $GLOBALS['core']->formHidden('SECT_id', $this->id);
  	    $remove = $_SESSION['translate']->it('Remove');
  			if($_SESSION['OBJ_user']->js_on)
***************
*** 170,174 ****
  				$js_vars['value'] = 'section=remove:'.$this->id;
  				$js_vars['location'] = 'index.php?module=article&section=remove&SECT_id='.$this->id;
! 				$myform[0] .= $GLOBALS['core']->js_insert("confirm", 'SECT_options', $this->id, 0, $js_vars);
  			}
  			else $myform[0] .= $GLOBALS['core']->formSubmit($remove, 'ARTICLE_vars[section:remove]');
--- 170,174 ----
  				$js_vars['value'] = 'section=remove:'.$this->id;
  				$js_vars['location'] = 'index.php?module=article&section=remove&SECT_id='.$this->id;
! 				$myform[0] .= $GLOBALS['core']->js_insert('confirm', 'SECT_options', $this->id, 0, $js_vars);
  			}
  			else $myform[0] .= $GLOBALS['core']->formSubmit($remove, 'ARTICLE_vars[section:remove]');
***************
*** 183,189 ****
  		        .$_SESSION['OBJ_help']->show_link('article', 'section_move');
        }
! 			$section_content .= "<div class=\"smalltext\" style=\"clear : both;\" align=\"right\">\n"
! 	        . $GLOBALS["core"]->makeForm("SECT_options" . $this->id, 'index.php#'
! 	        . $this->id, $myform, "post", 0, 0) . '</div><hr />';
  		}
  		return $section_content;
--- 183,189 ----
  		        .$_SESSION['OBJ_help']->show_link('article', 'section_move');
        }
! 			$section_content .= '<div class="smalltext" style="clear : both;" align="right">'
! 	        . $GLOBALS['core']->makeForm('SECT_options' . $this->id, 'index.php#'
! 	        . $this->id, $myform, 'post', 0, 0) . '</div><hr />';
  		}
  		return $section_content;
***************
*** 210,214 ****
  	        . $_SESSION['translate']->it('New Section') . '</div>';
  
! 		$myelements[0] = $GLOBALS['core']->formCheckBox('SECT_new_page',1,$this->new_page,NULL, $_SESSION['translate']->it("Start on new page?")) 
  		        . $_SESSION['OBJ_help']->show_link('article', 'section_new_page') . '<br />';
  
--- 210,214 ----
  	        . $_SESSION['translate']->it('New Section') . '</div>';
  
! 		$myelements[0] = $GLOBALS['core']->formCheckBox('SECT_new_page',1,$this->new_page,NULL, $_SESSION['translate']->it('Start on new page?')) 
  		        . $_SESSION['OBJ_help']->show_link('article', 'section_new_page') . '<br />';
  
***************
*** 222,226 ****
  		        . $_SESSION['OBJ_help']->show_link('article', 'section_text') .'<br />' 
  		        . $GLOBALS['core']->js_insert('wysiwyg', 'SECT_edit', 'SECT_text');
! 		$myelements[0] .= $GLOBALS['core']->formTextArea("SECT_text", stripslashes($this->text), 20, 79) 
  		        . '<br />';
  		/* If there is a current image, show it */
--- 222,226 ----
  		        . $_SESSION['OBJ_help']->show_link('article', 'section_text') .'<br />' 
  		        . $GLOBALS['core']->js_insert('wysiwyg', 'SECT_edit', 'SECT_text');
! 		$myelements[0] .= $GLOBALS['core']->formTextArea('SECT_text', stripslashes($this->text), 20, 79) 
  		        . '<br />';
  		/* If there is a current image, show it */
***************
*** 228,234 ****
  	    /* If this is a temporary image, look in the main directory */
  	    if ($this->temp_image)
! 		    $myelements[0] .= "<img src=\"" .$_SESSION['SES_ART_master']->image_directory . $this->image['name'] . "\" /><br />";
          else
! 		    $myelements[0] .= "<img src=\"" .$_SESSION['SES_ART_master']->image_directory . $this->image['directory'] . $this->image['name'] . "\" /><br />";
  		/* If user is allowed to play around with the images... */
  		if ($_SESSION['OBJ_user']->allow_access('article', 'images_in_articles')
--- 228,234 ----
  	    /* If this is a temporary image, look in the main directory */
  	    if ($this->temp_image)
! 		    $myelements[0] .= '<img src="' .$_SESSION['SES_ART_master']->image_directory . $this->image['name'] . '" /><br />';
          else
! 		    $myelements[0] .= '<img src="' .$_SESSION['SES_ART_master']->image_directory . $this->image['directory'] . $this->image['name'] . '" /><br />';
  		/* If user is allowed to play around with the images... */
  		if ($_SESSION['OBJ_user']->allow_access('article', 'images_in_articles')
***************
*** 238,242 ****
  			if($this->image['name']) 
  				$myelements[0] .= $_SESSION['translate']->it('Remove Image').'? ' 
! 		        . $GLOBALS['core']->formCheckBox('removeImage', 1, NULL, NULL) . "<br />";
  
  			/* If allowed, upload your image here */
--- 238,242 ----
  			if($this->image['name']) 
  				$myelements[0] .= $_SESSION['translate']->it('Remove Image').'? ' 
! 		        . $GLOBALS['core']->formCheckBox('removeImage', 1, NULL, NULL) . '<br />';
  
  			/* If allowed, upload your image here */
***************
*** 246,250 ****
    			$myelements[0] .= $GLOBALS['core']->formHidden('MAX_FILE_SIZE', '26000');
    			$myelements[0] .= $_SESSION['SES_ART_master']->get_error('SECT_loaded_image')
! 		        . $_SESSION['translate']->it("Upload a new image").': '
  		        . $GLOBALS['core']->formFile('SECT_loaded_image', 33, 255) 
  		        . $_SESSION['OBJ_help']->show_link('article', 'section_image') . '<br />';
--- 246,250 ----
    			$myelements[0] .= $GLOBALS['core']->formHidden('MAX_FILE_SIZE', '26000');
    			$myelements[0] .= $_SESSION['SES_ART_master']->get_error('SECT_loaded_image')
! 		        . $_SESSION['translate']->it('Upload a new image').': '
  		        . $GLOBALS['core']->formFile('SECT_loaded_image', 33, 255) 
  		        . $_SESSION['OBJ_help']->show_link('article', 'section_image') . '<br />';
***************
*** 255,259 ****
  			while($value = readdir($dir_handle))
  			{
! 				if ($value != "." && $value != ".." && $value != "CVS") 
  			    $lib_array[$value] = $value;
  				if ($value == $this->image['name']) $lib_selected = $value;
--- 255,259 ----
  			while($value = readdir($dir_handle))
  			{
! 				if ($value != '.' && $value != '..' && $value != 'CVS') 
  			    $lib_array[$value] = $value;
  				if ($value == $this->image['name']) $lib_selected = $value;
***************
*** 269,273 ****
  			$myelements[0] .= $_SESSION['translate']->it('Or select one from the library').': '
  			    . $GLOBALS['core']->formSelect('SECT_lib_image', $lib_array, $this->image['name'], NULL, NULL, NULL) 
! 			    . $_SESSION['OBJ_help']->show_link('article', "section_lib_image") . "<br /><br />";
  
  			/* Enter alt text, link, & image_caption */
--- 269,273 ----
  			$myelements[0] .= $_SESSION['translate']->it('Or select one from the library').': '
  			    . $GLOBALS['core']->formSelect('SECT_lib_image', $lib_array, $this->image['name'], NULL, NULL, NULL) 
! 			    . $_SESSION['OBJ_help']->show_link('article', 'section_lib_image') . '<br /><br />';
  
  			/* Enter alt text, link, & image_caption */
***************
*** 308,322 ****
    		asort($sect_tpl_array);
    		$myelements[0] .= $_SESSION['translate']->it('Section Template').': '
! 			    . $GLOBALS['core']->formSelect("SECT_template", $sect_tpl_array, $this->template, true, NULL, NULL) 
    		    . $_SESSION['OBJ_help']->show_link('article', 'section_template') 
!   		    . "<br /><br />";
    	}
  
! 		$myelements[0] .= $GLOBALS["core"]->formHidden("module", "article")
            . $GLOBALS['core']->formSubmit($_SESSION['translate']->it('Save Section'), 'ARTICLE_vars[section:save]') 
            . $_SESSION['OBJ_help']->show_link('article', 'section_save');
  
  		return $section_title 
! 			. $GLOBALS["core"]->makeForm('SECT_edit', 'index.php#'.$this->id, $myelements, 'post', 0, 1)
  			. '<br />';
  	}
--- 308,322 ----
    		asort($sect_tpl_array);
    		$myelements[0] .= $_SESSION['translate']->it('Section Template').': '
! 			    . $GLOBALS['core']->formSelect('SECT_template', $sect_tpl_array, $this->template, true, NULL, NULL) 
    		    . $_SESSION['OBJ_help']->show_link('article', 'section_template') 
!   		    . '<br /><br />';
    	}
  
! 		$myelements[0] .= $GLOBALS['core']->formHidden('module', 'article')
            . $GLOBALS['core']->formSubmit($_SESSION['translate']->it('Save Section'), 'ARTICLE_vars[section:save]') 
            . $_SESSION['OBJ_help']->show_link('article', 'section_save');
  
  		return $section_title 
! 			. $GLOBALS['core']->makeForm('SECT_edit', 'index.php#'.$this->id, $myelements, 'post', 0, 1)
  			. '<br />';
  	}
***************
*** 338,347 ****
  		{
  			$_SESSION['SES_ART_master']->error['SECT_title'][] 
! 			    = $_SESSION['translate']->it("You tried to save an empty section");
  			return;
  		}
  
  		/* Image Removal */
! 		if(isset($_POST['removeImage']) && $this->image['name'] && $this->image['directory']!="library/") 
  		{
  	    /* If this is the original image, place its name into "old_image" */
--- 338,347 ----
  		{
  			$_SESSION['SES_ART_master']->error['SECT_title'][] 
! 			    = $_SESSION['translate']->it('You tried to save an empty section');
  			return;
  		}
  
  		/* Image Removal */
! 		if(isset($_POST['removeImage']) && $this->image['name'] && $this->image['directory']!='library/') 
  		{
  	    /* If this is the original image, place its name into "old_image" */
***************
*** 380,387 ****
      {
        /* Give it a unique name */
!       $ext = strrchr($_FILES['SECT_loaded_image']['name'], ".");
!       $_FILES['SECT_loaded_image']['name'] = time() . "-" . $_SESSION['OBJ_user']->user_id . $ext;
        /* Place it into the temporary directory */
!       $image = EZform::saveImage("SECT_loaded_image"
              , $_SESSION['SES_ART_master']->image_path
              , $_SESSION['SES_ART_master']->val['max_image_width']
--- 380,387 ----
      {
        /* Give it a unique name */
!       $ext = strrchr($_FILES['SECT_loaded_image']['name'], '.');
!       $_FILES['SECT_loaded_image']['name'] = time() . '-' . $_SESSION['OBJ_user']->user_id . $ext;
        /* Place it into the temporary directory */
!       $image = EZform::saveImage('SECT_loaded_image'
              , $_SESSION['SES_ART_master']->image_path
              , $_SESSION['SES_ART_master']->val['max_image_width']
***************
*** 400,404 ****
          $this->image = array_merge($this->image, $image);
          $this->temp_image = $this->image['name'];
!         if (!$this->image['directory'] || $this->image['directory']=="library/")
              $this->image['directory'] = $this->AssignDir();
        }
--- 400,404 ----
          $this->image = array_merge($this->image, $image);
          $this->temp_image = $this->image['name'];
!         if (!$this->image['directory'] || $this->image['directory']=='library/')
              $this->image['directory'] = $this->AssignDir();
        }
***************
*** 407,419 ****
      }
  		/* otherwise, if a file was selected from the library... */
! 		elseif ($_POST['SECT_lib_image'] != "None")
  		{
  			/* Assign the file to the temp variables */
  			$this->image['name'] = $_POST['SECT_lib_image'];
! 			$this->image['directory'] = "library/";
        /* If this is replacing a new(uncommitted) image, delete the obsolete one */
        if ($this->temp_image)
  		    @unlink($_SESSION['SES_ART_master']->image_path.$this->temp_image);
! 			$this->temp_image = $this->image['height'] = $this->image['width'] = "";
  		}
  
--- 407,419 ----
      }
  		/* otherwise, if a file was selected from the library... */
! 		elseif ($_POST['SECT_lib_image'] != 'None')
  		{
  			/* Assign the file to the temp variables */
  			$this->image['name'] = $_POST['SECT_lib_image'];
! 			$this->image['directory'] = 'library/';
        /* If this is replacing a new(uncommitted) image, delete the obsolete one */
        if ($this->temp_image)
  		    @unlink($_SESSION['SES_ART_master']->image_path.$this->temp_image);
! 			$this->temp_image = $this->image['height'] = $this->image['width'] = '';
  		}
  
***************
*** 421,425 ****
  		if($this->image['name'])
  			if (!$this->image['alt']) 
! 		    $_SESSION['SES_ART_master']->error['SECT_alt'][] = $_SESSION['translate']->it("You must provide a short description for your image");
  
      /* If this is a new section, add it to the article */
--- 421,425 ----
  		if($this->image['name'])
  			if (!$this->image['alt']) 
! 		    $_SESSION['SES_ART_master']->error['SECT_alt'][] = $_SESSION['translate']->it('You must provide a short description for your image');
  
      /* If this is a new section, add it to the article */
***************
*** 455,459 ****
  	    if (isset($_SESSION['OBJ_WIKI']))
          PHPWS_File::fileCopy($_SESSION['SES_ART_master']->image_path.$this->image['directory'].$this->old_image
!             , $_SESSION['SES_ART_master']->image_path."old/"
              , $this->old_image, TRUE, FALSE);
        /* Get rid of it */
--- 455,459 ----
  	    if (isset($_SESSION['OBJ_WIKI']))
          PHPWS_File::fileCopy($_SESSION['SES_ART_master']->image_path.$this->image['directory'].$this->old_image
!             , $_SESSION['SES_ART_master']->image_path.'old/'
              , $this->old_image, TRUE, FALSE);
        /* Get rid of it */
***************
*** 463,467 ****
  		/* If none exists, Pre-allocate an ID for this section */
  		if(!is_numeric($this->id))
! 	    $newid = $GLOBALS['core']->db->nextId($GLOBALS['core']->tbl_prefix . "mod_article_sections");
  		else
  	    $newid = $this->id;
--- 463,467 ----
  		/* If none exists, Pre-allocate an ID for this section */
  		if(!is_numeric($this->id))
! 	    $newid = $GLOBALS['core']->db->nextId($GLOBALS['core']->tbl_prefix . 'mod_article_sections');
  		else
  	    $newid = $this->id;
***************
*** 482,494 ****
            && PHPWS_File::fileCopy($_SESSION['SES_ART_master']->image_path.$this->temp_image
                , $_SESSION['SES_ART_master']->image_path.$this->image['directory']
!               , $newid.strrchr($this->image['name'], "."), TRUE, FALSE))
  	    {
  		    @unlink($_SESSION['SES_ART_master']->image_path.$this->image['name']);
!         $query_data['image_name'] = $this->image['name'] = $newid.strrchr($this->image['name'], ".");
  	    }
    	}
    	else 
  	    $query_data['image_height'] = $query_data['image_width'] = $query_data['image_alt'] = 
! 	    $query_data['image_link'] = $query_data['image_caption'] = "";
  
      /* If this is a new section, save it to get an ID assigned */
--- 482,494 ----
            && PHPWS_File::fileCopy($_SESSION['SES_ART_master']->image_path.$this->temp_image
                , $_SESSION['SES_ART_master']->image_path.$this->image['directory']
!               , $newid.strrchr($this->image['name'], '.'), TRUE, FALSE))
  	    {
  		    @unlink($_SESSION['SES_ART_master']->image_path.$this->image['name']);
!         $query_data['image_name'] = $this->image['name'] = $newid.strrchr($this->image['name'], '.');
  	    }
    	}
    	else 
  	    $query_data['image_height'] = $query_data['image_width'] = $query_data['image_alt'] = 
! 	    $query_data['image_link'] = $query_data['image_caption'] = '';
  
      /* If this is a new section, save it to get an ID assigned */
***************
*** 501,505 ****
  		else
  	    /* otherwise, save the data */
! 	    $GLOBALS['core']->sqlUpdate($query_data, "mod_article_sections", 'id', $this->id);
  
      /* Erase section flags */
--- 501,505 ----
  		else
  	    /* otherwise, save the data */
! 	    $GLOBALS['core']->sqlUpdate($query_data, 'mod_article_sections', 'id', $this->id);
  
      /* Erase section flags */
***************
*** 517,522 ****
  	function delete_section ()
  	{
! 		$GLOBALS['core']->sqlDelete("mod_article_sections", 'id', $this->id);
!     if ($this->image['name'] && $this->image['directory'] != "library/")
    		@unlink($_SESSION['SES_ART_master']->image_path.$this->image['directory'].$this->image['name']);
  	}
--- 517,522 ----
  	function delete_section ()
  	{
! 		$GLOBALS['core']->sqlDelete('mod_article_sections', 'id', $this->id);
!     if ($this->image['name'] && $this->image['directory'] != 'library/')
    		@unlink($_SESSION['SES_ART_master']->image_path.$this->image['directory'].$this->image['name']);
  	}
***************
*** 553,557 ****
      /* Count how many files are in the last directory. Allow for "." & ".."*/
  		$count = -2;
!  		if ($dir_handle = opendir($_SESSION['SES_ART_master']->image_path . $last_dir . "/"))
    		while($value = readdir($dir_handle))
    			$count++;
--- 553,557 ----
      /* Count how many files are in the last directory. Allow for "." & ".."*/
  		$count = -2;
!  		if ($dir_handle = opendir($_SESSION['SES_ART_master']->image_path . $last_dir . '/'))
    		while($value = readdir($dir_handle))
    			$count++;
***************
*** 565,569 ****
  			umask($oldumask);
  		}
! 		return $last_dir . "/";
  	}
  }
--- 565,569 ----
  			umask($oldumask);
  		}
! 		return $last_dir . '/';
  	}
  }

[phpws-comm-commits] modules/article/class ArticleManager.php,1.3,1.4

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

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

Modified Files:
	ArticleManager.php 
Log Message:
0.93 Compliancy - Got rid of popboxes

Index: ArticleManager.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/article/class/ArticleManager.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ArticleManager.php	16 Jul 2003 19:44:33 -0000	1.3
--- ArticleManager.php	17 Jul 2003 18:06:41 -0000	1.4
***************
*** 125,129 ****
      $title = $_SESSION['translate']->it('Main Menu');
      $content = $GLOBALS['core']->makeForm('ARTICLE_main_menu', 'index.php', $content, 'post', 0, 0);
! 		$_SESSION['OBJ_layout']->popbox($title, $content, NULL, 'CNT_article');
  	}
  
--- 125,129 ----
      $title = $_SESSION['translate']->it('Main Menu');
      $content = $GLOBALS['core']->makeForm('ARTICLE_main_menu', 'index.php', $content, 'post', 0, 0);
! 		$this->popbox($title, $content);
  	}
  
***************
*** 190,196 ****
      if (!$data = implode(',', $this->pager->getData())) 
  		{
! 	    $_SESSION['OBJ_layout']->popbox($_SESSION['translate']->it('No Articles Found!')
! 	        , $_SESSION['translate']->it('No matching articles were found in the database!')
! 	        , NULL, 'CNT_article');
  			return;
  		}
--- 190,195 ----
      if (!$data = implode(',', $this->pager->getData())) 
  		{
! 	    $this->popbox($_SESSION['translate']->it('No Articles Found!')
! 	        , $_SESSION['translate']->it('No matching articles were found in the database!'));
  			return;
  		}
***************
*** 277,282 ****
  		$content = $GLOBALS['core']->processTemplate($tags,'article','listing.tpl');
  
! 		$_SESSION['OBJ_layout']->popbox($_SESSION['translate']->it('Current Articles')
! 		    , $content, NULL, 'CNT_article');
  	}
  
--- 276,280 ----
  		$content = $GLOBALS['core']->processTemplate($tags,'article','listing.tpl');
  
! 		$this->popbox($_SESSION['translate']->it('Current Articles'), $content);
  	}
  
***************
*** 664,668 ****
  
  		$content .= "\n</table>\n";
! 		$_SESSION['OBJ_layout']->popbox($title, $content, NULL, 'CNT_article');
  	}
  
--- 662,666 ----
  
  		$content .= "\n</table>\n";
! 		$this->popbox($title, $content);
  	}
  
***************
*** 768,771 ****
--- 766,783 ----
  		$now = date("Y-m-d H:i:s");
      return "approved AND publication_date<='$now' AND (expiration_date IS NULL OR expiration_date>'$now')";
+ 	}
+ 
+ 	/**
+ 	* popbox replacement.
+ 	*
+ 	* @author Eloi George <el...@NO...>
+ 	* @module Article Manager
+ 	* @param string title 
+ 	* @param string content 
+ 	* @return none
+ 	*/
+ 	function popbox ($title, $content)
+ 	{
+ 		$GLOBALS['CNT_article']['content'] .= '<h3>' . $title . '</h3>' . $content;
  	}
  }

[phpws-comm-commits] modules/article/docs LICENSE.txt,1.2,1.3

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

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

Modified Files:
	LICENSE.txt 
Log Message:
New version release and minor license adjustment

Index: LICENSE.txt
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/article/docs/LICENSE.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** LICENSE.txt	14 Jul 2003 20:43:02 -0000	1.2
--- LICENSE.txt	16 Jul 2003 19:47:47 -0000	1.3
***************
*** 7,13 ****
  Now that I've told you where to look, you can't stop staring at it, can you?
  
! This copyright must always display so that it can perform its function.  Since this module is released under the LGPL, you can change the code if you want, but this copyright must still display in the same manner.  If you want to change or remove the copyright string, contact me and I will sell you a copy of this module under a different license.
  
! These terms are covered in the license, but I understand that some folks choose to interpret the passage differently.  For those people, let me make this clearer.  Everything I just said is part of and supercedes the rest of the license terms specifed below.  I'm not a lawyer, so if you feel that this invalidates the GNU license, then consider the above terms as superceding the entire license.
  
  
--- 7,13 ----
  Now that I've told you where to look, you can't stop staring at it, can you?
  
! This mark must always display so that it can perform its function.  Since this module is released under the LGPL, you can change the code if you want, but this mark must still display in the same manner.  If you want to change or remove the identification string, contact me and I will sell you a copy of this module under a different license.
  
! These terms are covered in the license, but I understand that some folks choose to interpret the passage differently.  For those people, let me make this clearer.  Everything I just said is part of and supercedes the rest of the license terms specifed below.  I'm not a lawyer, so if you feel that this invalidates the GNU license, then consider the above terms as constituting the entire license.
  
  

[phpws-comm-commits] modules/article/conf boost.php,1.1,1.2

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

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

Modified Files:
	boost.php 
Log Message:
New version release and minor license adjustment

Index: boost.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/article/conf/boost.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** boost.php	9 Jul 2003 20:24:25 -0000	1.1
--- boost.php	16 Jul 2003 19:47:45 -0000	1.2
***************
*** 18,22 ****
  $admin_mod = 1;
  $active = "on";
! $version = 1;
  
  $mod_class_files = array("ArticleManager.php",
--- 18,22 ----
  $admin_mod = 1;
  $active = "on";
! $version = 1.2;
  
  $mod_class_files = array("ArticleManager.php",

[phpws-comm-commits] modules/article/lang article.en.lng,NONE,1.1

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

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

Added Files:
	article.en.lng 
Log Message:
Initial  commit to CVS

--- NEW FILE: article.en.lng ---
en:|:article
a:|: Starting With `[var1]`:|: Starting With `[var1]`
a:|:[var1] could not be deleted.:|:[var1] could not be deleted.
a:|:Action:|:Action
a:|:Add:|:Add
a:|:ALL:|:ALL
a:|:All Articles:|:All Articles
a:|:All menu links removed:|:All menu links removed
a:|:Allow Comments:|:Allow Comments
a:|:Allow Comments by unregistered users:|:Allow Comments by unregistered users
a:|:Allow/Disallow comments:|:Allow/Disallow comments
a:|:Also on this Site:|:Also on this Site
a:|:Announce changes to this article on the homepage:|:Announce changes to this article on the homepage
a:|:Anonymous:|:Anonymous
a:|:Are you sure you want to <b>[var1] "[var2]"</b>?:|:Are you sure you want to <b>[var1] "[var2]"</b>?
a:|:Are you sure you want to [var1] [var2]?:|:Are you sure you want to [var1] [var2]?
a:|:article:|:article
a:|:Article:|:Article
a:|:Article Deleted:|:Article Deleted
a:|:Article Information:|:Article Information
a:|:Article Kept:|:Article Kept
a:|:Article Manager Configuration:|:Article Manager Configuration
a:|:Article Saved:|:Article Saved
a:|:Article Settings:|:Article Settings
a:|:Article Title:|:Article Title
a:|:Articles:|:Articles
a:|:Articles can expire on a predefined date:|:Articles can expire on a predefined date
a:|:Articles need approval before publication:|:Articles need approval before publication
a:|:ATTENTION!:|:ATTENTION!
a:|:Cancel Editing:|:Cancel Editing
a:|:Comment:|:Comment
a:|:Comments:|:Comments
a:|:Comments are allowed by default:|:Comments are allowed by default
a:|:Comments by unregistered users are allowed by default:|:Comments by unregistered users are allowed by default
a:|:Confirm Action:|:Confirm Action
a:|:Create New Article:|:Create New Article
a:|:Created By [var1] on [var2]:|:Created By [var1] on [var2]
a:|:CURRENT:|:CURRENT
a:|:Current Articles:|:Current Articles
a:|:Date Created:|:Date Created
a:|:Default page template:|:Default page template
a:|:Default section template:|:Default section template
a:|:Delete:|:Delete
a:|:delete:|:delete
a:|:deleted:|:deleted
a:|:Edit:|:Edit
a:|:Edit Configuration:|:Edit Configuration
a:|:Edit Section:|:Edit Section
a:|:Expiration Date:|:Expiration Date
a:|:Expire:|:Expire
a:|:Expires on:|:Expires on
a:|:File to Upload:|:File to Upload
a:|:General Settings:|:General Settings
a:|:Homepage:|:Homepage
a:|:Image Directory "[var1]" could not be created.  Image was not saved.:|:Image Directory "[var1]" could not be created.  Image was not saved.
a:|:Image Library:|:Image Library
a:|:Image Library Management:|:Image Library Management
a:|:Image Settings:|:Image Settings
a:|:It will be published after approval by an administrator.:|:It will be published after approval by an administrator.
a:|:kept:|:kept
a:|:Last Update:|:Last Update
a:|:Last Updated By [var1] on [var2]:|:Last Updated By [var1] on [var2]
a:|:Let Article Manager automatically generate meta descriptions:|:Let Article Manager automatically generate meta descriptions
a:|:Link caption:|:Link caption
a:|:List Articles:|:List Articles
a:|:Locked:|:Locked
a:|:Main Menu:|:Main Menu
a:|:more words:|:more words
a:|:Move Down:|:Move Down
a:|:Move Up:|:Move Up
a:|:Never Expires:|:Never Expires
a:|:New Section:|:New Section
a:|:Next Page:|:Next Page
a:|:No:|:No
a:|:No Articles Found!:|:No Articles Found!
a:|:No Images in Library:|:No Images in Library
a:|:No matching articles were found in the database!:|:No matching articles were found in the database!
a:|:Number of links in the "Popular Articles" Block:|:Number of links in the "Popular Articles" Block
a:|:Number of links in the "Previous Articles" Block:|:Number of links in the "Previous Articles" Block
a:|:Number of listings to show per page under the Main Menu:|:Number of listings to show per page under the Main Menu
a:|:Number of summaries to show on the Home Page:|:Number of summaries to show on the Home Page
a:|:Or select one from the library:|:Or select one from the library
a:|:page:|:page
a:|:Page Format:|:Page Format
a:|:pages:|:pages
a:|:Place images in articles:|:Place images in articles
a:|:Please make sure the article is setup the way you like and <b>all sections are saved</b> before selecting "Save Article"!:|:Please make sure the article is setup the way you like and <b>all sections are saved</b> before selecting "Save Article"!
a:|:Popular Articles:|:Popular Articles
a:|:Previous:|:Previous
a:|:Previous Page:|:Previous Page
a:|:Printable Version:|:Printable Version
a:|:Publication Date:|:Publication Date
a:|:Publication dates can be set up to [var1] year(s) from article creation.:|:Publication dates can be set up to [var1] year(s) from article creation.
a:|:Publish:|:Publish
a:|:Publish on:|:Publish on
a:|:Read More:|:Read More
a:|:Registered users can:|:Registered users can
a:|:Related Topics:|:Related Topics
a:|:Remove:|:Remove
a:|:Remove Image:|:Remove Image
a:|:Reset Settings:|:Reset Settings
a:|:Rows to show per page: :|:Rows to show per page: 
a:|:Save:|:Save
a:|:Save Article:|:Save Article
a:|:Save Section:|:Save Section
a:|:Save Settings:|:Save Settings
a:|:Save Title and Summary:|:Save Title and Summary
a:|:Section Template:|:Section Template
a:|:Section Text:|:Section Text
a:|:Section Title:|:Section Title
a:|:Select article templates:|:Select article templates
a:|:Select section templates:|:Select section templates
a:|:Set as Main:|:Set as Main
a:|:Set Publication Dates:|:Set Publication Dates
a:|:Short Image Description:|:Short Image Description
a:|:Show me [var1] stuff ordered by [var2][var3]:|:Show me [var1] stuff ordered by [var2][var3]
a:|:Some menu links could not be removed:|:Some menu links could not be removed
a:|:Start of Page:|:Start of Page
a:|:Start on new page?:|:Start on new page?
a:|:Submit articles:|:Submit articles
a:|:Summary:|:Summary
a:|:The [var1] <b>[var2]</b> has successfully been [var3]:|:The [var1] <b>[var2]</b> has successfully been [var3]
a:|:The article you requested either does not exist or is not available to your group.:|:The article you requested either does not exist or is not available to your group.
a:|:The article you requested has expired.:|:The article you requested has expired.
a:|:The default expiration date is [var1] years, [var2] months, and [var3] days from article creation.:|:The default expiration date is [var1] years, [var2] months, and [var3] days from article creation.
a:|:The maximum time someone can spend editing an article is [var1] seconds:|:The maximum time someone can spend editing an article is [var1] seconds
a:|:The maximum uploaded image [var1] allowed is [var2] Kb:|:The maximum uploaded image [var1] allowed is [var2] Kb
a:|:The maximum uploaded image [var1] allowed is [var2] pixels:|:The maximum uploaded image [var1] allowed is [var2] pixels
a:|:There was an error when inserting [var1] into the database [var2]:|:There was an error when inserting [var1] into the database [var2]
a:|:This article is currently being edited by someone else:|:This article is currently being edited by someone else
a:|:This Image Links To:|:This Image Links To
a:|:Title:|:Title
a:|:Try again in about [var1] minutes:|:Try again in about [var1] minutes
a:|:Upload a new image:|:Upload a new image
a:|:Upload images to the site:|:Upload images to the site
a:|:User Settings:|:User Settings
a:|:Users can only see articles that belong to a group that they are members of:|:Users can only see articles that belong to a group that they are members of
a:|:Yes:|:Yes
a:|:You can return and edit this article after you have saved it:|:You can return and edit this article after you have saved it
a:|:You must provide a short description for your image:|:You must provide a short description for your image
a:|:You tried to save an empty section:|:You tried to save an empty section
a:|:Your work has successfully been saved to the database!:|:Your work has successfully been saved to the database!

[phpws-comm-commits] modules/article/class Section.php,1.2,1.3

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

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

Modified Files:
	Section.php 
Log Message:
Got rid of some double-quotes.

Index: Section.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/article/class/Section.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Section.php	14 Jul 2003 20:46:24 -0000	1.2
--- Section.php	16 Jul 2003 19:45:33 -0000	1.3
***************
*** 562,566 ****
  	    $oldumask = umask(0);
  	    if (!mkdir($_SESSION['SES_ART_master']->image_path . ++$last_dir, 0775))
! 		    $_SESSION['SES_ART_master']->error['SECT_loaded_image'][] = $_SESSION['translate']->it("Image Directory \"$last_dir\" could not be created.  Image was not saved.");
  			umask($oldumask);
  		}
--- 562,566 ----
  	    $oldumask = umask(0);
  	    if (!mkdir($_SESSION['SES_ART_master']->image_path . ++$last_dir, 0775))
! 		    $_SESSION['SES_ART_master']->error['SECT_loaded_image'][] = $_SESSION['translate']->it('Image Directory "[var1]" could not be created.  Image was not saved.', $last_dir);
  			umask($oldumask);
  		}