phpwebsite-comm-cvs-commits

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

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

Modified Files:
	AM_EditForms.php AM_ModSettings.php 
Log Message:
If set in the AM settings, all changes to articles are now summarized in /logs/event.log

Index: AM_ModSettings.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/article/class/AM_ModSettings.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** AM_ModSettings.php	21 Aug 2008 20:17:32 -0000	1.12
--- AM_ModSettings.php	19 Nov 2008 06:01:26 -0000	1.13
***************
*** 51,66 ****
  		$settings['default_article_template'] = $_POST['default_article_template'];
  		$settings['default_section_template'] = $_POST['default_section_template'];
! 		$settings['summaries_on_homepage'] = $_POST['summaries_on_homepage'];
! 		$settings['prev_n_articles'] = $_POST['prev_n_articles'];
! 		$settings['popular_articles'] = $_POST['popular_articles'];
! 		$settings['listings_per_page'] = $_POST['listings_per_page'];
! 		$settings['need_approval'] = (@$_POST['need_approval'])?1:0;
! 		$settings['default_allow_comments'] = (@$_POST['default_allow_comments'])?1:0;
! 		$settings['default_allow_anon'] = (@$_POST['default_allow_anon'])?1:0;
! 		$settings['can_expire'] = (@$_POST['can_expire'])?1:0;
! 		$settings['expiration_years'] = $_POST['expiration_years'];
! 		$settings['expiration_months'] = $_POST['expiration_months'];
! 		$settings['expiration_days'] = $_POST['expiration_days'];
! 		$settings['max_image_size'] = (is_numeric($_POST['max_image_size']))
  		    ? (int) $_POST['max_image_size']
  		    : $GLOBALS['Article']['val']['max_image_size'];
--- 51,67 ----
  		$settings['default_article_template'] = $_POST['default_article_template'];
  		$settings['default_section_template'] = $_POST['default_section_template'];
! 		$settings['summaries_on_homepage']    = $_POST['summaries_on_homepage'];
! 		$settings['prev_n_articles']          = $_POST['prev_n_articles'];
! 		$settings['popular_articles']         = $_POST['popular_articles'];
! 		$settings['listings_per_page']        = $_POST['listings_per_page'];
! 		$settings['need_approval']            = (@$_POST['need_approval'])?1:0;
! 		$settings['default_allow_comments']   = (@$_POST['default_allow_comments'])?1:0;
! 		$settings['default_allow_anon']       = (@$_POST['default_allow_anon'])?1:0;
! 		$settings['can_expire']               = (@$_POST['can_expire'])?1:0;
!         $settings['expiration_years']         = $_POST['expiration_years'];
! 		$settings['expiration_months']        = $_POST['expiration_months'];
! 		$settings['expiration_days']          = $_POST['expiration_days'];
! 		$settings['log_events']               = (@$_POST['log_events'])?1:0;
! 		$settings['max_image_size']           = (is_numeric($_POST['max_image_size']))
  		    ? (int) $_POST['max_image_size']
  		    : $GLOBALS['Article']['val']['max_image_size'];
***************
*** 71,82 ****
  		    ? (int) $_POST['max_image_width']
  		    : $GLOBALS['Article']['val']['max_image_width'];
! 		$settings['lock_expiration_time'] = $_POST['lock_expiration_time'];
! 		$settings['use_comments'] = (@$_POST['use_comments'])?1:0;
! 		$settings['long_date_format'] = $_POST['long_date_format'];
! 		$settings['short_date_format'] = $_POST['short_date_format'];
! 		$settings['categorized_display'] = (@$_POST['categorized_display'])?1:0;
! 		$settings['display_columns'] = $_POST['display_columns'];
! 		$settings['summaries_per_category'] = $_POST['summaries_per_category'];
! 		$settings['category_order'] = $_POST['category_order'];
  
  		$content = "<?php\n";
--- 72,83 ----
  		    ? (int) $_POST['max_image_width']
  		    : $GLOBALS['Article']['val']['max_image_width'];
! 		$settings['lock_expiration_time']     = $_POST['lock_expiration_time'];
! 		$settings['use_comments']             = (@$_POST['use_comments'])?1:0;
! 		$settings['long_date_format']         = $_POST['long_date_format'];
! 		$settings['short_date_format']        = $_POST['short_date_format'];
! 		$settings['categorized_display']      = (@$_POST['categorized_display'])?1:0;
! 		$settings['display_columns']          = $_POST['display_columns'];
! 		$settings['summaries_per_category']   = $_POST['summaries_per_category'];
! 		$settings['category_order']           = $_POST['category_order'];
  
  		$content = "<?php\n";

Index: AM_EditForms.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/article/class/AM_EditForms.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** AM_EditForms.php	11 Oct 2008 06:13:49 -0000	1.8
--- AM_EditForms.php	19 Nov 2008 06:01:26 -0000	1.9
***************
*** 483,486 ****
--- 483,490 ----
  		        .$form->get('expiration_days').'</label>'));
  
+         /* log_events */
+         $form->addCheckBox('log_events');
+         $form->setMatch('log_events', $val['log_events']);
+         $form->setLabel('log_events', dgettext('article', 'Log all changes to articles at /logs/event.log'));
  
  		/* max_image_size */