[geeklog-cvs] geeklog-1.3/system/classes upload.class.php,1.30,1.31

[dhaun at geeklog.net]

Update of /usr/cvs/geeklog/geeklog-1.3/system/classes
In directory geeklog_prod:/tmp/cvs-serv18847

Modified Files:
	upload.class.php 
Log Message:
Fixed problems when resizing userphotos for user names that have spaces in them (as reported by Per on geeklog-users).


Index: upload.class.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/system/classes/upload.class.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** upload.class.php	7 Sep 2003 17:41:40 -0000	1.30
--- upload.class.php	12 Jan 2004 20:07:41 -0000	1.31
***************
*** 476,480 ****
              if ($this->_imageLib == 'imagemagick') {
                  $newsize = $newwidth . 'x' . $newheight;
!                 $cmd = $this->_pathToMogrify . ' -resize '. $newsize . ' ' . $this->_fileUploadDirectory . '/' . $this->_getDestinationName() . ' 2>&1';
                  $this->_addDebugMsg('Attempting to resize with this command (imagemagick): ' . $cmd);
  
--- 476,480 ----
              if ($this->_imageLib == 'imagemagick') {
                  $newsize = $newwidth . 'x' . $newheight;
!                 $cmd = $this->_pathToMogrify . ' -resize '. $newsize . " '" . $this->_fileUploadDirectory . '/' . $this->_getDestinationName() . "' 2>&1";
                  $this->_addDebugMsg('Attempting to resize with this command (imagemagick): ' . $cmd);
  
***************
*** 498,502 ****
                  $cmd = $this->_pathToNetPBM;
                  $filename = $this->_fileUploadDirectory . '/' . $this->_getDestinationName();
!                 $cmd_end = ' ' . $filename . ' | ' . $this->_pathToNetPBM . 'pnmscale -xsize=' . $newwidth . ' -ysize=' . $newheight . ' | ' . $this->_pathToNetPBM; 
                  // convert to pnm, resize, convert back
                  if (eregi ('\.png', $filename)) {
--- 498,502 ----
                  $cmd = $this->_pathToNetPBM;
                  $filename = $this->_fileUploadDirectory . '/' . $this->_getDestinationName();
!                 $cmd_end = " '" . $filename . "' | " . $this->_pathToNetPBM . 'pnmscale -xsize=' . $newwidth . ' -ysize=' . $newheight . ' | ' . $this->_pathToNetPBM; 
                  // convert to pnm, resize, convert back
                  if (eregi ('\.png', $filename)) {