phpwebsite-comm-cvs-commits

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

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

Modified Files:
	A_save.php xmlrpc.php runtime.php A_update.php 
Added Files:
	settings.php 
Log Message:
Moved installation auto-import of demonstration article and manual to install.php
Also took out @module comments


Index: xmlrpc.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/article/inc/xmlrpc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** xmlrpc.php	10 Oct 2008 04:27:40 -0000	1.10
--- xmlrpc.php	21 Nov 2008 06:13:14 -0000	1.11
***************
*** 198,202 ****
      	if(!empty($mt_allow_comments) 
  	            && (Current_User::allow('article', 'allow_comments')
! 	              || ($GLOBALS['Article']['val']['users_allow_comments'] 
  	                  && Current_User::getId())))
        		$article->allow_comments = $mt_allow_comments;
--- 198,202 ----
      	if(!empty($mt_allow_comments) 
  	            && (Current_User::allow('article', 'allow_comments')
! 	              || (PHPWS_Settings::get('article', 'users_allow_comments') 
  	                  && Current_User::getId())))
        		$article->allow_comments = $mt_allow_comments;

Index: A_save.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/article/inc/A_save.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** A_save.php	21 Aug 2008 20:17:19 -0000	1.19
--- A_save.php	21 Nov 2008 06:13:14 -0000	1.20
***************
*** 134,138 ****
  	if ($this->announce) {
  		PHPWS_Core::initModClass('article', 'AM_ModSettings.php');
! 		PHPWS_AM_ModSettings::reset_cache();
  	}
  }
--- 134,138 ----
  	if ($this->announce) {
  		PHPWS_Core::initModClass('article', 'AM_ModSettings.php');
! 		PHPWS_AM_Data::reset_cache();
  	}
  }

Index: A_update.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/article/inc/A_update.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** A_update.php	21 Aug 2008 20:17:19 -0000	1.10
--- A_update.php	21 Nov 2008 06:13:14 -0000	1.11
***************
*** 53,57 ****
  
  if (Current_User::allow('article', "allow_comments")
! 	    || ($GLOBALS['Article']['val']['users_allow_comments'] && Current_User::getId()))
  {
  	$this->allow_comments = (int) !empty($_POST['ARTICLE_allow_comments']);
--- 53,57 ----
  
  if (Current_User::allow('article', "allow_comments")
! 	    || (PHPWS_Settings::get('article', 'users_allow_comments') && Current_User::getId()))
  {
  	$this->allow_comments = (int) !empty($_POST['ARTICLE_allow_comments']);
***************
*** 73,77 ****
  if (isset($_POST['ARTICLE_expiration_date']))
  	$this->expiration_date = strtotime($_POST['ARTICLE_expiration_date']);
! if (isset($_POST['ARTICLE_expiration_flag']) || !$GLOBALS['Article']['val']['can_expire'])
  	$this->expiration_date = 0;
  if (isset($_POST['ARTICLE_template']))
--- 73,77 ----
  if (isset($_POST['ARTICLE_expiration_date']))
  	$this->expiration_date = strtotime($_POST['ARTICLE_expiration_date']);
! if (isset($_POST['ARTICLE_expiration_flag']) || !PHPWS_Settings::get('article', 'can_expire'))
  	$this->expiration_date = 0;
  if (isset($_POST['ARTICLE_template']))

--- NEW FILE: settings.php ---
<?php
$settings['default_article_template'] = 'Blank.tpl';
$settings['default_section_template'] = 'Centered_Image.tpl';
$settings['summaries_on_homepage'] = 5;
$settings['prev_n_articles'] = 5;
$settings['popular_articles'] = 5;
$settings['listings_per_page'] = 20;
$settings['need_approval'] = 1;
$settings['default_allow_comments'] = 1;
$settings['default_allow_anon'] = 0;
$settings['can_expire'] = 0;
$settings['expiration_years'] = 3;
$settings['expiration_months'] = 0;
$settings['expiration_days'] = 0;
$settings['log_events'] = 0;
$settings['max_image_size'] = 26;
$settings['max_image_height'] = 400;
$settings['max_image_width'] = 400;
$settings['lock_expiration_time'] = 3600;
$settings['use_comments'] = 1;
$settings['long_date_format'] = '%I:%M:%S%p, %A, %B %d %Y';
$settings['short_date_format'] = '%b/%d/%y';
$settings['categorized_display'] = 0;
$settings['display_columns'] = 1;
$settings['summaries_per_category'] = 1;
$settings['category_order'] = '';
?>
Index: runtime.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/article/inc/runtime.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** runtime.php	21 Aug 2008 20:17:19 -0000	1.16
--- runtime.php	21 Nov 2008 06:13:14 -0000	1.17
***************
*** 10,17 ****
  if(!isset($_REQUEST['module'])) 
  {
! 	PHPWS_Core::initModClass('article', 'AM_ModSettings.php');
! 	PHPWS_AM_ModSettings::init();
  
! 	$config = $GLOBALS['Article']['val'];
  
  	/* Display the homepage articles */
--- 10,19 ----
  if(!isset($_REQUEST['module'])) 
  {
!     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');
  
! 	$config = PHPWS_Settings::get('article');
  
  	/* Display the homepage articles */