[phpws-comm-commits] modules/featuredphoto/class manager.php, 1.40, 1.41 photo.php, 1.15, 1.16

[Greg M. <bli...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/featuredphoto/class
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24414/class

Modified Files:
	manager.php photo.php 
Log Message:
Now works with File Cabinet 2.0

Index: manager.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/featuredphoto/class/manager.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** manager.php	20 Feb 2008 04:28:00 -0000	1.40
--- manager.php	30 Mar 2008 14:18:16 -0000	1.41
***************
*** 429,438 ****
          if (!PHPWS_Error::logIfError($photos) && ($photos != NULL))
          {
!             PHPWS_Core::initModClass('filecabinet', 'Image.php');
  
              foreach ($photos as $photo)
              {
!                 $image = new PHPWS_Image($photo['image_id']);
!                 $current_photos[$photo['id']] = $image->title;
              }
          }
--- 429,438 ----
          if (!PHPWS_Error::logIfError($photos) && ($photos != NULL))
          {
!             PHPWS_Core::initModClass('filecabinet', 'Cabinet.php');
  
              foreach ($photos as $photo)
              {
!                 $image = Cabinet::getFile($photo['image_id']);
!                 $current_photos[$photo['id']] = $image->_source->title;
              }
          }
***************
*** 632,652 ****
          $form->addHidden('block_id', $photo->getBlockId());
  
!         $form->addTplTag('IMAGE_LABEL', dgettext('featuredphoto', 'Click photo to start Image Manager'));
!         $manager = Cabinet::imageManager($photo->getImageId(), 'image_id',
!                                          $block->getTnWidth(), $block->getTnHeight(),
!                                          FEATUREDPHOTO_MOD_FOLDERS_ONLY);
!         if ($manager)
!         {
!             $form->addTplTag('IMAGE_MANAGER', $manager->get());
  
!             if (empty($photo->id))
!             {
!                 $form->addSubmit('submit', dgettext('featuredphoto', 'Save New Photo'));
!             }
!             else
!             {
!                 $form->addHidden('photo_id', $photo->getId());
!                 $form->addSubmit('submit', dgettext('featuredphoto', 'Update Photo'));
!             }
          }
  
--- 632,649 ----
          $form->addHidden('block_id', $photo->getBlockId());
  
!         $manager = Cabinet::fileManager('image_id', $photo->getImageId());
!         $manager->maxImageWidth($block->getTnWidth());
!         $manager->maxImageHeight($block->getTnHeight());
!         $manager->imageOnly(false, false);
!         $form->addTplTag('IMAGE_MANAGER', $manager->get());
  
!         if (empty($photo->id))
!         {
!             $form->addSubmit('submit', dgettext('featuredphoto', 'Save New Photo'));
!         }
!         else
!         {
!             $form->addHidden('photo_id', $photo->getId());
!             $form->addSubmit('submit', dgettext('featuredphoto', 'Update Photo'));
          }
  

Index: photo.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/featuredphoto/class/photo.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** photo.php	30 Sep 2007 22:48:46 -0000	1.15
--- photo.php	30 Mar 2008 14:18:16 -0000	1.16
***************
*** 131,148 ****
      function view()
      {
!         PHPWS_Core::initModClass('filecabinet', 'Image.php');
! 
!         $image = new PHPWS_Image($this->getImageId());
! 
!         /* Need to check if image is still valid. */
!         if (!$image->id)
!         {
!             $image->logErrors();
!             return null;
!         }
  
!         $tags['NAME'] = $image->title;
!         $tags['CAPTION'] = $image->getDescription();
!         $tags['IMAGE'] = $image->getTag();
  
          return PHPWS_Template::process($tags, 'featuredphoto', 'photo/view.tpl');
--- 131,141 ----
      function view()
      {
!         PHPWS_Core::initModClass('filecabinet', 'Cabinet.php');
!         $image = Cabinet::getFile($this->getImageId());
!         $image->allowCaption(false);
  
!         $tags['NAME'] = $image->_source->title;
!         $tags['CAPTION'] = PHPWS_Text::parseOutput($image->_source->description);
!         $tags['IMAGE'] = $image->parentLinked();
  
          return PHPWS_Template::process($tags, 'featuredphoto', 'photo/view.tpl');
***************
*** 151,157 ****
      function getListTags()
      {
!         PHPWS_Core::initModClass('filecabinet', 'Image.php');
  
!         $image = new PHPWS_Image($this->getImageId());
          $vars['photo_id'] = $this->getId();
  
--- 144,150 ----
      function getListTags()
      {
!         PHPWS_Core::initModClass('filecabinet', 'Cabinet.php');
  
!         $image = Cabinet::getFile($this->getImageId());
          $vars['photo_id'] = $this->getId();
  
***************
*** 175,180 ****
  
          $template['ACTION'] = implode(' | ', $links);
!         $template['NAME'] = $image->title;
!         $template['SIZE'] = $image->getSize(true);
          $template['ACTIVE'] = $this->getActive();
  
--- 168,173 ----
  
          $template['ACTION'] = implode(' | ', $links);
!         $template['NAME'] = $image->_source->title;
!         $template['SIZE'] = $image->_source->getSize(true);
          $template['ACTIVE'] = $this->getActive();