phpwebsite-comm-cvs-commits

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

Update of /cvsroot/phpwebsite-comm/modules/article
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11519

Modified Files:
	index_admin.php index.php 
Log Message:
Moved installation auto-import of demonstration article and manual to install.php
Also took out @module comments


Index: index_admin.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/article/index_admin.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** index_admin.php	19 Nov 2008 06:01:26 -0000	1.24
--- index_admin.php	21 Nov 2008 06:13:15 -0000	1.25
***************
*** 265,269 ****
  		return;
  	/* Make sure that user can approve the article */
! 	if(!$GLOBALS['Article']['val']['need_approval'] || Current_User::allow('article', 'approval')) {
  		/* This removes the [Draft] flag & approves the article. */
  		$article->approved = 1;
--- 265,269 ----
  		return;
  	/* Make sure that user can approve the article */
! 	if(!PHPWS_Settings::get('article', 'need_approval') || Current_User::allow('article', 'approval')) {
  		/* This removes the [Draft] flag & approves the article. */
  		$article->approved = 1;
***************
*** 412,416 ****
      if (!empty($perm_dialog->message)) {
          $message = implode("<br />\n", $perm_dialog->message);
!         PHPWS_AM_ModSettings::reset_cache();
      }
      if (empty($content)) {
--- 412,416 ----
      if (!empty($perm_dialog->message)) {
          $message = implode("<br />\n", $perm_dialog->message);
!         PHPWS_AM_Data::reset_cache();
      }
      if (empty($content)) {
***************
*** 589,604 ****
  	if (!Current_User::isUnrestricted('article'))
  		break;
  	switch(@$_REQUEST['action'])
  	{
  		case 'save':
! 		  	PHPWS_AM_ModSettings::save_configuration();
  		break;
  
  		case 'reset':
! 		  	PHPWS_AM_ModSettings::reset_configuration();
  		break;
  	}
  	$title = dgettext('article', 'Article Manager Configuration');
!     $content = PHPWS_AM_ModSettings::edit_configuration();
  break;
  
--- 589,605 ----
  	if (!Current_User::isUnrestricted('article'))
  		break;
+ 	PHPWS_Core::initModClass('article', 'AM_EditForms.php');
  	switch(@$_REQUEST['action'])
  	{
  		case 'save':
! 		  	PHPWS_AM_EditForms::save_configuration();
  		break;
  
  		case 'reset':
! 		  	PHPWS_Settings::reset('article');
  		break;
  	}
  	$title = dgettext('article', 'Article Manager Configuration');
!     $content = PHPWS_AM_EditForms::edit_configuration();
  break;
  
***************
*** 744,748 ****
  
  function log_event($message, $type = 'Notice') {
!     if (!$GLOBALS['Article']['val']['log_events'])
          return;
      if (Current_User::isLogged()) 
--- 745,749 ----
  
  function log_event($message, $type = 'Notice') {
!     if (!PHPWS_Settings::get('article', 'log_events'))
          return;
      if (Current_User::isLogged()) 

Index: index.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/article/index.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** index.php	18 Nov 2008 05:00:16 -0000	1.24
--- index.php	21 Nov 2008 06:13:15 -0000	1.25
***************
*** 13,18 ****
  }
  
! PHPWS_Core::initModClass('article', 'AM_ModSettings.php');
! PHPWS_AM_ModSettings::init();
  
  /* Process any mod-rewrite submissions */
--- 13,20 ----
  }
  
! PHPWS_Core::initModClass('article', 'AM_Data.php');
! PHPWS_Core::initModClass('article', 'Section.php');
! PHPWS_Core::initModClass('article', 'Article.php');
! PHPWS_Core::initModClass('article', 'Image.php');
  
  /* Process any mod-rewrite submissions */