[geeklog-cvs] geeklog-1.3/public_html/admin story.php,1.123,1.124

[dhaun at iowaoutdoors.org]

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

Modified Files:
	story.php 
Log Message:
Fixed URLs to userphotos and story images when $_CONF['path_images'] had been changed but was still inside of $_CONF['path_html'].


Index: story.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/admin/story.php,v
retrieving revision 1.123
retrieving revision 1.124
diff -C2 -d -r1.123 -r1.124
*** story.php	1 Aug 2004 21:37:50 -0000	1.123
--- story.php	14 Aug 2004 15:52:18 -0000	1.124
***************
*** 703,711 ****
                                        . $lFilename_large;
              if ($stdImageLoc) {
!                 $lFilename_large_URL = $_CONF['site_url'] . '/images/articles/'
!                                  . $lFilename_large;
              } else {
!                 $lFilename_large_URL = $_CONF['site_url'] . '/getimage.php?mode=show&image='
!                                  . $lFilename_large;
              }
              if (file_exists ($lFilename_large_complete)) {
--- 703,713 ----
                                        . $lFilename_large;
              if ($stdImageLoc) {
!                 $imgpath = substr ($_CONF['path_images'],
!                                    strlen ($_CONF['path_html']));
!                 $lFilename_large_URL = $_CONF['site_url'] . '/' . $imgpath
!                                      . 'articles/' . $lFilename_large;
              } else {
!                 $lFilename_large_URL = $_CONF['site_url']
!                     . '/getimage.php?mode=show&image=' . $lFilename_large;
              }
              if (file_exists ($lFilename_large_complete)) {
***************
*** 717,723 ****
  
          if ($stdImageLoc) {
!             $imgSrc = $_CONF['site_url'] . '/images/articles/' . $A['ai_filename'];
          } else {
!             $imgSrc = $_CONF['site_url'] . '/getimage.php?mode=articles&image=' . $A['ai_filename'];
          }
          $norm = $lLinkPrefix . '<img ' . $sizeattributes . 'src="' . $imgSrc . '" alt="">' . $lLinkSuffix;
--- 719,729 ----
  
          if ($stdImageLoc) {
!             $imgpath = substr ($_CONF['path_images'],
!                                strlen ($_CONF['path_html']));
!             $imgSrc = $_CONF['site_url'] . '/' . $imgpath . 'articles/'
!                     . $A['ai_filename'];
          } else {
!             $imgSrc = $_CONF['site_url']
!                 . '/getimage.php?mode=articles&image=' . $A['ai_filename'];
          }
          $norm = $lLinkPrefix . '<img ' . $sizeattributes . 'src="' . $imgSrc . '" alt="">' . $lLinkSuffix;
***************
*** 775,783 ****
                                        . $lFilename_large;
              if ($stdImageLoc) {
!                 $lFilename_large_URL = $_CONF['site_url'] . '/images/articles/'
!                                  . $lFilename_large;
              } else {
!                 $lFilename_large_URL = $_CONF['site_url'] . '/getimage.php?mode=show&image='
!                                  . $lFilename_large;
              }
              if (file_exists ($lFilename_large_complete)) {
--- 781,791 ----
                                        . $lFilename_large;
              if ($stdImageLoc) {
!                 $imgpath = substr ($_CONF['path_images'],
!                                    strlen ($_CONF['path_html']));
!                 $lFilename_large_URL = $_CONF['site_url'] . '/' . $imgpath
!                                      . 'articles/' . $lFilename_large;
              } else {
!                 $lFilename_large_URL = $_CONF['site_url']
!                     . '/getimage.php?mode=show&image=' . $lFilename_large;
              }
              if (file_exists ($lFilename_large_complete)) {
***************
*** 801,805 ****
              if (count($errors) == 0) {
                  if ($stdImageLoc) {
!                     $imgSrc = $_CONF['site_url'] . '/images/articles/' . $A['ai_filename'];
                  } else {
                      $imgSrc = $_CONF['site_url'] . '/getimage.php?mode=articles&image=' . $A['ai_filename'];
--- 809,816 ----
              if (count($errors) == 0) {
                  if ($stdImageLoc) {
!                     $imgpath = substr ($_CONF['path_images'],
!                                        strlen ($_CONF['path_html']));
!                     $imgSrc = $_CONF['site_url'] . '/' . $imgpath . 'articles/'
!                             . $A['ai_filename'];
                  } else {
                      $imgSrc = $_CONF['site_url'] . '/getimage.php?mode=articles&image=' . $A['ai_filename'];