[geeklog-cvs] geeklog-1.3/public_html users.php,1.83,1.84 usersettings.php,1.100,1.101

[dhaun at iowaoutdoors.org]

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

Modified Files:
	users.php usersettings.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: usersettings.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/usersettings.php,v
retrieving revision 1.100
retrieving revision 1.101
diff -C2 -d -r1.100 -r1.101
*** usersettings.php	8 Aug 2004 18:06:44 -0000	1.100
--- usersettings.php	14 Aug 2004 15:52:17 -0000	1.101
***************
*** 123,127 ****
      if ($_CONF['allow_user_photo'] == 1) {
          $stdLoc = true;
!         if (!strstr($_CONF['path_images'], $_CONF['path_html'])) {
              $stdLoc = false;
          }
--- 123,127 ----
      if ($_CONF['allow_user_photo'] == 1) {
          $stdLoc = true;
!         if (!strstr ($_CONF['path_images'], $_CONF['path_html'])) {
              $stdLoc = false;
          }
***************
*** 134,145 ****
              }
              if ($stdLoc) {
!                 $photo .= '<br><img src="' . $_CONF['site_url']
!                    . '/images/userphotos/' . $A['photo'] . '" alt="' . $alt
!                    . '">' . LB . '<br>' . $LANG04[79]
!                    . ' <input type="checkbox" name="delete_photo">' . LB;
              } else {
                  $photo .= '<br><img src="' . $_CONF['site_url']
!                    . '/getimage.php?mode=userphotos&image=' . $A['photo'] . '" alt="' . $alt
!                    . '">' . LB . '<br>' . $LANG04[79]
                     . ' <input type="checkbox" name="delete_photo">' . LB;
              }
--- 134,147 ----
              }
              if ($stdLoc) {
!                 $imgpath = substr ($_CONF['path_images'],
!                                    strlen ($_CONF['path_html']));
!                 $photo .= '<br><img src="' . $_CONF['site_url'] . '/' . $imgpath
!                     . 'userphotos/' . $A['photo'] . '" alt="' . $alt . '">' . LB
!                     . '<br>' . $LANG04[79]
!                     . ' <input type="checkbox" name="delete_photo">' . LB;
              } else {
                  $photo .= '<br><img src="' . $_CONF['site_url']
!                    . '/getimage.php?mode=userphotos&image=' . $A['photo']
!                    . '" alt="' . $alt . '">' . LB . '<br>' . $LANG04[79]
                     . ' <input type="checkbox" name="delete_photo">' . LB;
              }

Index: users.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/users.php,v
retrieving revision 1.83
retrieving revision 1.84
diff -C2 -d -r1.83 -r1.84
*** users.php	9 Aug 2004 18:36:29 -0000	1.83
--- users.php	14 Aug 2004 15:52:17 -0000	1.84
***************
*** 115,122 ****
      $user_templates->set_var('username', $A['username']);
      if (!empty($A['photo']) AND $_CONF['allow_user_photo'] == 1) {
!         if (strstr($_CONF['path_images'], $_CONF['path_html'])) {
!             $user_templates->set_var('user_photo','<img src="' . $_CONF['site_url'] . '/images/userphotos/' . $A['photo'] . '" alt="">');
          } else {
!             $user_templates->set_var('user_photo','<img src="' . $_CONF['site_url'] . '/getimage.php?mode=userphotos&image=' . $A['photo'] . '" alt="">');
          }
      } else {
--- 115,126 ----
      $user_templates->set_var('username', $A['username']);
      if (!empty($A['photo']) AND $_CONF['allow_user_photo'] == 1) {
!         if (strstr ($_CONF['path_images'], $_CONF['path_html'])) {
!             $imgpath = substr ($_CONF['path_images'],
!                                strlen ($_CONF['path_html']));
!             $user_templates->set_var ('user_photo', '<img src="'
!                 . $_CONF['site_url'] . '/' . $imgpath . 'userphotos/'
!                 . $A['photo'] . '" alt="">');
          } else {
!             $user_templates->set_var ('user_photo', '<img src="' . $_CONF['site_url'] . '/getimage.php?mode=userphotos&image=' . $A['photo'] . '" alt="">');
          }
      } else {