[geeklog-cvs] geeklog-1.3/public_html/admin story.php,1.117,1.118

[dhaun at iowaoutdoors.org]

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

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


Index: story.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/admin/story.php,v
retrieving revision 1.117
retrieving revision 1.118
diff -C2 -d -r1.117 -r1.118
*** story.php	2 Jul 2004 18:30:16 -0000	1.117
--- story.php	13 Jul 2004 19:09:26 -0000	1.118
***************
*** 791,795 ****
  function submitstory($type='',$sid,$uid,$tid,$title,$introtext,$bodytext,$hits,$unixdate,$comments,$featured,$commentcode,$statuscode,$postmode,$frontpage,$draft_flag,$numemails,$owner_id,$group_id,$perm_owner,$perm_group,$perm_members,$perm_anon,$delete,$show_topic_icon) 
  {
!     global $_TABLES, $_CONF, $_USER, $LANG24, $MESSAGE, $HTTP_POST_FILES;
  
      // Convert array values to numeric permission values
--- 791,795 ----
  function submitstory($type='',$sid,$uid,$tid,$title,$introtext,$bodytext,$hits,$unixdate,$comments,$featured,$commentcode,$statuscode,$postmode,$frontpage,$draft_flag,$numemails,$owner_id,$group_id,$perm_owner,$perm_group,$perm_members,$perm_anon,$delete,$show_topic_icon) 
  {
!     global $_CONF, $_TABLES, $_USER, $LANG24, $MESSAGE, $HTTP_POST_FILES;
  
      // Convert array values to numeric permission values
***************
*** 938,942 ****
              $upload->setAllowedMimeTypes(array('image/gif'=>'.gif','image/jpeg'=>'.jpg,.jpeg','image/pjpeg'=>'.jpg,.jpeg','image/x-png'=>'.png','image/png'=>'.png'));
              if (!$upload->setPath($_CONF['path_images'] . 'articles')) {
!                 print 'File Upload Errors:<br>' . $upload->printErrors();
                  exit;
              }
--- 938,947 ----
              $upload->setAllowedMimeTypes(array('image/gif'=>'.gif','image/jpeg'=>'.jpg,.jpeg','image/pjpeg'=>'.jpg,.jpeg','image/x-png'=>'.png','image/png'=>'.png'));
              if (!$upload->setPath($_CONF['path_images'] . 'articles')) {
!                 $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;
              }
***************
*** 973,977 ****
                  $retval .= $upload->printErrors(false);
                  $retval .= COM_endBlock(COM_getBlockTemplate ('_msg_block', 'footer'));
!                 $retval .= COM_siteFooter('true');
                  echo $retval;
                  exit; 
--- 978,982 ----
                  $retval .= $upload->printErrors(false);
                  $retval .= COM_endBlock(COM_getBlockTemplate ('_msg_block', 'footer'));
!                 $retval .= COM_siteFooter();
                  echo $retval;
                  exit;