[phpwsbb-commits] phpwsbb index.php,1.14,1.15

[Wendall C. <wen...@us...>]

Update of /cvsroot/phpwsbb/phpwsbb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28487

Modified Files:
	index.php 
Log Message:
fixed save settings

Index: index.php
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/index.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** index.php	20 Oct 2004 01:33:53 -0000	1.14
--- index.php	23 Mar 2005 20:36:00 -0000	1.15
***************
*** 51,62 ****
  
      if (isset($_REQUEST['IMGLib_op']) && $_SESSION['OBJ_user']->user_id) {
-         /* If this just got called from the profile editing screen, save all data entered so far */
-         if (isset($_REQUEST['PHPWSBB_MAN_OP']))
-             $_SESSION['PHPWSBB_Manager']->_saveUserSettings();
          /* If an image was selected from the library... */
          if ($_REQUEST['IMGLib_op']=='select_image') {
!             if (isset($_POST['IMGLib_selected_image']))
                  $_POST['IMGLib_selected_image'] = pos($_POST['IMGLib_selected_image']);
!             $_SESSION['PHPWSBB_Manager']->_getUserSettings();
              return;
          }
--- 51,63 ----
  
      if (isset($_REQUEST['IMGLib_op']) && $_SESSION['OBJ_user']->user_id) {
          /* If an image was selected from the library... */
          if ($_REQUEST['IMGLib_op']=='select_image') {
!             if (isset($_POST['IMGLib_selected_image'])) {
                  $_POST['IMGLib_selected_image'] = pos($_POST['IMGLib_selected_image']);
!                 $_POST['avatar_dir'] = $_POST['IMGLib_selected_gallery'];
!                 $_POST['avatar_file'] = $_POST['IMGLib_selected_image'];
!             }
!             $_SESSION['PHPWSBB_Manager']->_saveUserSettings();
!             $_SESSION['PHPWSBB_Manager']->_getUserSettings($_POST['user']);
              return;
          }
***************
*** 64,68 ****
          if ($_REQUEST['IMGLib_op']=='exit') {
              if ($_REQUEST['IMGLib_return_data']=='edit')
!                 $_SESSION['PHPWSBB_Manager']->_getUserSettings();
              return;
          }
--- 65,69 ----
          if ($_REQUEST['IMGLib_op']=='exit') {
              if ($_REQUEST['IMGLib_return_data']=='edit')
!                 $_SESSION['PHPWSBB_Manager']->_getUserSettings($_REQUEST['user']);
              return;
          }
***************
*** 70,74 ****
           * are already set as POSTs from the calling form.
           */
!         require_once PHPWS_SOURCE_DIR . 'core/ImgLibrary.php';
          $library = new PHPWS_IMGLib($_SESSION['OBJ_user']->allow_access('phpwsbb', 'edit_avatars')
                , $_SESSION['OBJ_user']->allow_access('phpwsbb', 'edit_avatar_galleries')
--- 71,75 ----
           * are already set as POSTs from the calling form.
           */
!         require_once PHPWS_SOURCE_DIR . 'mod/phpwsbb/class/ImgLibrary.php';
          $library = new PHPWS_IMGLib($_SESSION['OBJ_user']->allow_access('phpwsbb', 'edit_avatars')
                , $_SESSION['OBJ_user']->allow_access('phpwsbb', 'edit_avatar_galleries')