[geeklog-cvs] geeklog-1.3/public_html usersettings.php,1.95,1.96

[dhaun at iowaoutdoors.org]

Update of /var/cvs/geeklog-1.3/public_html
In directory www:/tmp/cvs-serv12845/public_html

Modified Files:
	usersettings.php 
Log Message:
Make sure upload errors for userphotos and story images are displayed in a Geeklog block, not on a blank page ...


Index: usersettings.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/usersettings.php,v
retrieving revision 1.95
retrieving revision 1.96
diff -C2 -d -r1.95 -r1.96
*** usersettings.php	28 Mar 2004 18:34:17 -0000	1.95
--- usersettings.php	13 Jul 2004 19:09:25 -0000	1.96
***************
*** 635,639 ****
  function saveuser($A) 
  {
!     global $_TABLES, $_CONF, $_USER, $_US_VERBOSE, $HTTP_POST_FILES;
  
      if ($_US_VERBOSE) {
--- 635,639 ----
  function saveuser($A) 
  {
!     global $_CONF, $_TABLES, $_USER, $LANG24, $_US_VERBOSE, $HTTP_POST_FILES;
  
      if ($_US_VERBOSE) {
***************
*** 742,748 ****
                                                   'image/png'   => '.png'
                                           )      );
!             if (!$upload->setPath($_CONF['path_images'] . 'userphotos')) {
!                 print 'File Upload Errors:<BR>' . $upload->printErrors();
!                 exit;
              }
              if ($upload->numFiles() == 1) {
--- 742,755 ----
                                                   'image/png'   => '.png'
                                           )      );
!             if (!$upload->setPath ($_CONF['path_images'] . 'userphotos')) {
!                 $display = COM_siteHeader ('menu');
!                 $display .= COM_startBlock ($LANG24[30], '',
!                         COM_getBlockTemplate ('_msg_block', 'header'));
!                 $display .= $upload->printErrors (false);
!                 $display .= COM_endBlock (COM_getBlockTemplate ('_msg_block',
!                                                                 'footer'));
!                 $display .= COM_siteFooter ();
!                 echo $display;
!                 exit; // don't return
              }
              if ($upload->numFiles() == 1) {
***************
*** 770,776 ****
                      $upload->uploadFiles();
                      if ($upload->areErrors()) {
!                        print "ERRORS<br>";
!                        $upload->printErrors();
!                        exit; 
                      }
                  } else {
--- 777,788 ----
                      $upload->uploadFiles();
                      if ($upload->areErrors()) {
!                         $display = COM_siteHeader ('menu');
!                         $display .= COM_startBlock ($LANG24[30], '',
!                                 COM_getBlockTemplate ('_msg_block', 'header'));
!                         $display .= $upload->printErrors (false);
!                         $display .= COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
!                         $display .= COM_siteFooter ();
!                         echo $display;
!                         exit; // don't return
                      }
                  } else {