[phpws-comm-commits] modules/article/class Image.php,1.8,1.9

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

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

Modified Files:
	Image.php 
Log Message:
RFE ["trf000"] - Image fields now handle multimedia filecabinet content (more than just pictures!)

Index: Image.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/article/class/Image.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Image.php	21 Aug 2008 20:17:32 -0000	1.8
--- Image.php	21 Nov 2008 06:15:30 -0000	1.9
***************
*** 31,36 ****
          if (!empty($link)) 
              $file->_source->url = 'http://'.$link;
- //        else
- //            $file->allowImageLink(false);
          return $file->getTag();
  	}
--- 31,34 ----
***************
*** 38,45 ****
  
  	/**
! 	* Adds to an editing interface for a section/summary image.
  	*
  	* @author Eloi George <el...@NO...>
- 	* @module Article Manager
  	* @param object $object : Data object.
  	* @param object $form : Form object to add to 
--- 36,42 ----
  
  	/**
! 	* Adds an editing interface for a section/summary image to a supplied form object.
  	*
  	* @author Eloi George <el...@NO...>
  	* @param object $object : Data object.
  	* @param object $form : Form object to add to 
***************
*** 60,68 ****
          PHPWS_Core::initModClass('filecabinet', 'Cabinet.php');
          $manager = Cabinet::fileManager('SECTION_'.$form_id.'_image_id', $object->image_id);
!         $manager->setMaxWidth($GLOBALS['Article']['val']['max_image_width']);
!         $manager->setMaxHeight($GLOBALS['Article']['val']['max_image_height']);
!         $manager->setMaxSize($GLOBALS['Article']['val']['max_image_size'] * 1024);
          $manager->forceResize();
-         $manager->imageOnly(false, false);
          if (method_exists('FC_File_Manager', 'setPlaceholderMaxHeight')) {
              $manager->setPlaceholderMaxWidth(100);
--- 57,64 ----
          PHPWS_Core::initModClass('filecabinet', 'Cabinet.php');
          $manager = Cabinet::fileManager('SECTION_'.$form_id.'_image_id', $object->image_id);
!         $manager->setMaxWidth(PHPWS_Settings::get('article', 'max_image_width'));
!         $manager->setMaxHeight(PHPWS_Settings::get('article', 'max_image_height'));
!         $manager->setMaxSize(PHPWS_Settings::get('article', 'max_image_size') * 1024);
          $manager->forceResize();
          if (method_exists('FC_File_Manager', 'setPlaceholderMaxHeight')) {
              $manager->setPlaceholderMaxWidth(100);
***************
*** 93,97 ****
  	*
  	* @author Eloi George <el...@NO...>
- 	* @module Article Manager
  	* @param object $object : Data object.
  	* @param array $data : .
--- 89,92 ----