[phpws-comm-commits] modules/article/inc AM_list_articles.php,1.4,1.5 A_delete.php,1.2,1.3 A_edit.php,1.5,1.6 importANN.php,1.4,1.5 importPM.php,1.5,1.6 runtime.php,1.2,1.3

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

Update of /cvsroot/phpwebsite-comm/modules/article/inc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8062/inc

Modified Files:
	AM_list_articles.php A_delete.php A_edit.php importANN.php 
	importPM.php runtime.php 
Log Message:
2.6 Release Files

Index: AM_list_articles.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/article/inc/AM_list_articles.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** AM_list_articles.php	21 Aug 2004 17:02:12 -0000	1.4
--- AM_list_articles.php	21 Aug 2004 17:38:20 -0000	1.5
***************
*** 49,56 ****
    else
    {
-     $where = ' WHERE approved';
  		if (!$_SESSION['OBJ_user']->allow_access('article', 'change_dates')
  		    && !($_SESSION['SES_ART_master']->val['users_change_dates'] && $_SESSION['OBJ_user']->isUser()))
!       $where .= ' AND '.$this->get_published_sql();
    }
    $result = $GLOBALS['core']->getCol('SELECT id FROM ' . $this->sql_article_table
--- 49,55 ----
    else
    {
  		if (!$_SESSION['OBJ_user']->allow_access('article', 'change_dates')
  		    && !($_SESSION['SES_ART_master']->val['users_change_dates'] && $_SESSION['OBJ_user']->isUser()))
!       $where = ' WHERE '.$this->get_published_sql();
    }
    $result = $GLOBALS['core']->getCol('SELECT id FROM ' . $this->sql_article_table
***************
*** 70,75 ****
  
  /* Retrieve all article listings for this page */
! $sql = 'SELECT id,title,created_username,approved,mainarticle,editlock,edituser,publication_date,expiration_date,created_date,updated_date'
!         . ' FROM ' . $this->sql_article_table
          . ' WHERE id IN (' . $data . ') ORDER BY '
          . $this->list_sort . ' ' . $this->list_order;
--- 69,73 ----
  
  /* Retrieve all article listings for this page */
! $sql = 'SELECT * FROM ' . $this->sql_article_table
          . ' WHERE id IN (' . $data . ') ORDER BY '
          . $this->list_sort . ' ' . $this->list_order;

Index: importPM.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/article/inc/importPM.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** importPM.php	19 Feb 2004 21:46:46 -0000	1.5
--- importPM.php	21 Aug 2004 17:38:20 -0000	1.6
***************
*** 9,15 ****
  require_once(PHPWS_SOURCE_DIR . 'mod/pagemaster/class/Page.php');
  require_once(PHPWS_SOURCE_DIR . 'mod/pagemaster/class/Section.php');
! $ArticleM_path = PHPWS_HOME_DIR . 'images/article/PM/';
  include(PHPWS_SOURCE_DIR . 'mod/pagemaster/conf/config.php');
! $PageM_path = PHPWS_HOME_DIR . $image_directory;
  
  /* Get all the pages from old database */
--- 9,15 ----
  require_once(PHPWS_SOURCE_DIR . 'mod/pagemaster/class/Page.php');
  require_once(PHPWS_SOURCE_DIR . 'mod/pagemaster/class/Section.php');
! $ArticleM_path = $GLOBALS['core']->home_dir . 'images/article/PM/';
  include(PHPWS_SOURCE_DIR . 'mod/pagemaster/conf/config.php');
! $PageM_path = $GLOBALS['core']->home_dir . $image_directory;
  
  /* Get all the pages from old database */
***************
*** 139,143 ****
  
  /* Write routing map to disk (taken from function writeReroute in convert/db.php */
! $directory = PHPWS_HOME_DIR . 'convert/reroute/';
  if (!is_dir($directory) || !is_writable($directory))
  {
--- 139,143 ----
  
  /* Write routing map to disk (taken from function writeReroute in convert/db.php */
! $directory = $GLOBALS['core']->home_dir . 'convert/reroute/';
  if (!is_dir($directory) || !is_writable($directory))
  {

Index: A_edit.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/article/inc/A_edit.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** A_edit.php	21 Aug 2004 17:02:13 -0000	1.5
--- A_edit.php	21 Aug 2004 17:38:20 -0000	1.6
***************
*** 19,23 ****
  	if ($timeleft = $this->isLocked($this->editlock, $this->edituser))
  	{
!     /* Display an error messase & exit*/
  		$_SESSION['SES_ART_master']->error['Locked'][] = 
  		    $_SESSION['translate']->it('This article is currently being edited by ')
--- 19,23 ----
  	if ($timeleft = $this->isLocked($this->editlock, $this->edituser))
  	{
!     /* Display an error message & exit*/
  		$_SESSION['SES_ART_master']->error['Locked'][] = 
  		    $_SESSION['translate']->it('This article is currently being edited by ')
***************
*** 41,44 ****
--- 41,45 ----
  $article_tags['TITLE'] = PHPWS_Form::formTextField('ARTICLE_title', $this->title, 55, 70) 
  	. CLS_help::show_link('article', 'article_title');
+ $GLOBALS['Layout_title'] = $_SESSION['translate']->it('Editing').' '.$this->title . ' - ' . strip_tags($_SESSION['OBJ_layout']->page_title);
  
  // Set up link back to main menu

Index: importANN.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/article/inc/importANN.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** importANN.php	19 Feb 2004 21:46:46 -0000	1.4
--- importANN.php	21 Aug 2004 17:38:20 -0000	1.5
***************
*** 8,13 ****
  /* Include announce classes */
  require_once(PHPWS_SOURCE_DIR . 'mod/announce/class/Announcement.php');
! $ArticleM_path = PHPWS_HOME_DIR . 'images/article/ANN/';
! $ANNOUNCE_path = PHPWS_HOME_DIR . 'images/announce/';
  
  /* If you require your announcements to look different than your articles,
--- 8,13 ----
  /* Include announce classes */
  require_once(PHPWS_SOURCE_DIR . 'mod/announce/class/Announcement.php');
! $ArticleM_path = $GLOBALS['core']->home_dir . 'images/article/ANN/';
! $ANNOUNCE_path = $GLOBALS['core']->home_dir . 'images/announce/';
  
  /* If you require your announcements to look different than your articles,
***************
*** 122,126 ****
  
  /* Write routing map to disk (taken from function writeReroute in convert/db.php */
! $directory = PHPWS_HOME_DIR . 'convert/reroute/';
  if (!is_dir($directory) || !is_writable($directory))
  {
--- 122,126 ----
  
  /* Write routing map to disk (taken from function writeReroute in convert/db.php */
! $directory = $GLOBALS['core']->home_dir . 'convert/reroute/';
  if (!is_dir($directory) || !is_writable($directory))
  {

Index: runtime.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/article/inc/runtime.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** runtime.php	18 Jun 2004 23:31:10 -0000	1.2
--- runtime.php	21 Aug 2004 17:38:20 -0000	1.3
***************
*** 17,25 ****
  }
  /* Script to reroute pagemaster pages... */
! elseif ($GLOBALS['module']=='pagemaster' && !isset($GLOBALS['core']->modules['pagemaster']) && file_exists(PHPWS_HOME_DIR . 'convert/reroute/pagemaster.AM')) 
  {
    require_once(PHPWS_SOURCE_DIR.'mod/article/class/ArticleManager.php');
    $_SESSION['SES_ART_master'] = new PHPWS_ArticleManager;
!   include (PHPWS_HOME_DIR . 'convert/reroute/pagemaster.AM');
    $temp = new PHPWS_Article($convert[$_REQUEST['PAGE_id']]);
  	$temp->view();
--- 17,25 ----
  }
  /* Script to reroute pagemaster pages... */
! elseif ($GLOBALS['module']=='pagemaster' && !isset($GLOBALS['core']->modules['pagemaster']) && file_exists($GLOBALS['core']->home_dir . 'convert/reroute/pagemaster.AM')) 
  {
    require_once(PHPWS_SOURCE_DIR.'mod/article/class/ArticleManager.php');
    $_SESSION['SES_ART_master'] = new PHPWS_ArticleManager;
!   include ($GLOBALS['core']->home_dir . 'convert/reroute/pagemaster.AM');
    $temp = new PHPWS_Article($convert[$_REQUEST['PAGE_id']]);
  	$temp->view();
***************
*** 29,37 ****
  }
  /* Script to reroute announcements... */
! elseif (($GLOBALS['module']=='announce') && !isset($GLOBALS['core']->modules['announce']) && file_exists(PHPWS_HOME_DIR . 'convert/reroute/announce.AM'))
  {
    require_once(PHPWS_SOURCE_DIR.'mod/article/class/ArticleManager.php');
    $_SESSION['SES_ART_master'] = new PHPWS_ArticleManager;
!   include (PHPWS_HOME_DIR . 'convert/reroute/announce.AM');
    $temp = new PHPWS_Article($convert[$_REQUEST['ANN_id']]);
  	$temp->view();
--- 29,37 ----
  }
  /* Script to reroute announcements... */
! elseif (($GLOBALS['module']=='announce') && !isset($GLOBALS['core']->modules['announce']) && file_exists($GLOBALS['core']->home_dir . 'convert/reroute/announce.AM'))
  {
    require_once(PHPWS_SOURCE_DIR.'mod/article/class/ArticleManager.php');
    $_SESSION['SES_ART_master'] = new PHPWS_ArticleManager;
!   include ($GLOBALS['core']->home_dir . 'convert/reroute/announce.AM');
    $temp = new PHPWS_Article($convert[$_REQUEST['ANN_id']]);
  	$temp->view();

Index: A_delete.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/article/inc/A_delete.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** A_delete.php	18 Jun 2004 23:31:09 -0000	1.2
--- A_delete.php	21 Aug 2004 17:38:20 -0000	1.3
***************
*** 12,15 ****
--- 12,61 ----
  * @return none
  */
+ if (!function_exists('article_eraser')) {
+   function article_eraser ($id) {
+   	$GLOBALS['core']->sqlDelete('mod_article_sections', 'article_id', $id);
+   	$GLOBALS['core']->sqlDelete('mod_article', 'id', $id);
+   
+     /* Delete references to this article in Comments */
+     if (class_exists('PHPWS_Comment'))
+     {
+     	$where['module'] = 'article';
+     	$where['itemId'] = $id;
+     	$GLOBALS['core']->sqlDelete('mod_comments_data', $where);
+     }
+   
+     /* Delete references to this article in Approval */
+     PHPWS_Approval::remove($id, 'article');
+   
+     /* Delete references to this article in FatCat */
+   	if(isset($_SESSION['OBJ_fatcat']))
+             PHPWS_Fatcat::deleteModuleElements('article', $id);
+     /* Delete references to this article in the menu */
+     if($GLOBALS['core']->moduleExists('menuman'))
+     {
+       $result = $GLOBALS['core']->getAll('SELECT menu_item_id,menu_item_url FROM mod_menuman_items WHERE menu_item_url = "./index.php?module=article&view='.$id.'" OR menu_item_url = "./article'.$id.'.html"', true);
+       if(is_array($result)) 
+       {
+         foreach($result as $value) 
+         {
+           $children = $GLOBALS['core']->getAll('SELECT menu_item_id FROM mod_menuman_items WHERE menu_item_pid='
+               .$value['menu_item_id'].' and menu_item_id !='.$value['menu_item_id'], true);
+           /* If this menu item has children, just point it to nowhere */
+           if(is_array($children))
+           {
+             $isParent = TRUE;
+             $GLOBALS['core']->query('UPDATE mod_menuman_items SET menu_item_url="./index.php?module=article" WHERE menu_item_id='.$value['menu_item_id'], true);
+           }
+           /* otherwise, delete it */
+           else
+             $GLOBALS['core']->sqlDelete('mod_menuman_items', 'menu_item_id', $item['menu_item_id']);
+         }
+         unset($_SESSION['OBJ_menuman']);
+       }
+     }
+   }
+ }
+ 
+ 
  if (!$this->id) {
  	$GLOBALS['CNT_article']['title'] = $_SESSION['translate']->it('Article Manager')
***************
*** 21,67 ****
  if(isset($_POST['yes']))
  {
! 	$GLOBALS['core']->sqlDelete('mod_article_sections', 'article_id', $this->id);
! 	$GLOBALS['core']->sqlDelete('mod_article', 'id', $this->id);
! 
!   /* Delete references to this article in Comments */
!   if (class_exists("PHPWS_Comment"))
!   {
!   	$where['module'] = 'article';
!   	$where['itemId'] = $this->_id;
!   	$GLOBALS['core']->sqlDelete('mod_comments_data', $where);
!   }
! 
!   /* Delete references to this article in Approval */
!   PHPWS_Approval::remove($this->id, 'article');
! 
!   /* Delete references to this article in FatCat */
! 	if(isset($_SESSION['OBJ_fatcat']))
!           PHPWS_Fatcat::deleteModuleElements('article', $this->id);
!   /* Delete references to this article in the menu */
!   if($GLOBALS['core']->moduleExists('menuman'))
!   {
!     $result = $GLOBALS['core']->getAll('SELECT menu_item_id,menu_item_url FROM mod_menuman_items WHERE menu_item_url = "./index.php?module=article&view='.$this->id.'"', true);
!     if(!is_array($result)) 
!       echo "NO MENU RECORDS FOUND!";
!     else 
!     {
!       foreach($result as $value) 
!       {
!         $children = $GLOBALS['core']->getAll('SELECT menu_item_id FROM mod_menuman_items WHERE menu_item_pid='
!             .$value['menu_item_id'].' and menu_item_id !='.$value['menu_item_id'], true);
!         /* If this menu item has children, just point it to nowhere */
!         if(is_array($children))
!         {
!           $isParent = TRUE;
!           $GLOBALS['core']->query('UPDATE mod_menuman_items SET menu_item_url="./index.php?module=article" WHERE menu_item_id='.$value['menu_item_id'], true);
!         }
!         /* otherwise, delete it */
!         else
!           $GLOBALS['core']->sqlDelete('mod_menuman_items', 'menu_item_id', $item['menu_item_id']);
!       }
!       unset($_SESSION['OBJ_menuman']);
!     }
!   }
! 
  	$content = $_SESSION['translate']->it('The [var1] <b>[var2]</b> has successfully been [var3]'
  	            , $_SESSION['translate']->it('article')
--- 67,71 ----
  if(isset($_POST['yes']))
  {
!   article_eraser($this->id);
  	$content = $_SESSION['translate']->it('The [var1] <b>[var2]</b> has successfully been [var3]'
  	            , $_SESSION['translate']->it('article')