[geeklog-cvs] Geeklog-1.x/public_html lib-common.php, 1.719, 1.720 usersettings.php, 1.174, 1.175

[Dirk Haun]

Update of /cvsroot/geeklog/Geeklog-1.x/public_html
In directory qs1489.pair.com:/tmp/cvs-serv81914/public_html

Modified Files:
	lib-common.php usersettings.php 
Log Message:
"mode=edit" is the default for usersettings.php anyway


Index: usersettings.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/usersettings.php,v
retrieving revision 1.174
retrieving revision 1.175
diff -C2 -d -r1.174 -r1.175
*** usersettings.php	3 Aug 2008 08:05:50 -0000	1.174
--- usersettings.php	12 Aug 2008 09:34:29 -0000	1.175
***************
*** 35,40 ****
  // $Id$
  
! require_once ('lib-common.php');
! require_once ($_CONF['path_system'] . 'lib-user.php');
  
  // Set this to true to have this script generate various debug messages in
--- 35,40 ----
  // $Id$
  
! require_once 'lib-common.php';
! require_once $_CONF['path_system'] . 'lib-user.php';
  
  // Set this to true to have this script generate various debug messages in
***************
*** 262,266 ****
              (SEC_encryptPassword($_POST['old_passwd']) != $_USER['passwd'])) {
           return COM_refresh($_CONF['site_url']
!                             . '/usersettings.php?mode=edit&msg=84');
      }
  
--- 262,266 ----
              (SEC_encryptPassword($_POST['old_passwd']) != $_USER['passwd'])) {
           return COM_refresh($_CONF['site_url']
!                             . '/usersettings.php?msg=84');
      }
  
***************
*** 876,886 ****
  
              return COM_refresh ($_CONF['site_url']
!                                 . '/usersettings.php?mode=edit&msg=83');
          } elseif ($_CONF['custom_registration'] &&
                      function_exists ('CUSTOM_userCheck')) {
              $ret = CUSTOM_userCheck ($A['username'], $A['email']);
!             // Need a numeric return for the default message hander - if not numeric use default message
!             if (!is_numeric($ret)) $ret = 97;
!             return COM_refresh ("{$_CONF['site_url']}/usersettings.php?mode=edit&msg={$ret}");
          }
      }
--- 876,889 ----
  
              return COM_refresh ($_CONF['site_url']
!                                 . '/usersettings.php?msg=83');
          } elseif ($_CONF['custom_registration'] &&
                      function_exists ('CUSTOM_userCheck')) {
              $ret = CUSTOM_userCheck ($A['username'], $A['email']);
!             // Need a numeric return for the default message hander
!             // - if not numeric use default message
!             if (!is_numeric($ret)) {
!                 $ret = 97;
!             }
!             return COM_refresh("{$_CONF['site_url']}/usersettings.php?msg={$ret}");
          }
      }
***************
*** 917,921 ****
              } else {
                  return COM_refresh ($_CONF['site_url']
!                         . '/usersettings.php?mode=edit&msg=51');
              }
          }
--- 920,924 ----
              } else {
                  return COM_refresh ($_CONF['site_url']
!                         . '/usersettings.php?msg=51');
              }
          }
***************
*** 938,945 ****
          } elseif (SEC_encryptPassword($A['old_passwd']) != $_USER['passwd']) {
              return COM_refresh ($_CONF['site_url']
!                                 . '/usersettings.php?mode=edit&msg=68');
          } elseif ($A['passwd'] != $A['passwd_conf']) {
              return COM_refresh ($_CONF['site_url']
!                                 . '/usersettings.php?mode=edit&msg=67');
          }
      }
--- 941,948 ----
          } elseif (SEC_encryptPassword($A['old_passwd']) != $_USER['passwd']) {
              return COM_refresh ($_CONF['site_url']
!                                 . '/usersettings.php?msg=68');
          } elseif ($A['passwd'] != $A['passwd_conf']) {
              return COM_refresh ($_CONF['site_url']
!                                 . '/usersettings.php?msg=67');
          }
      }
***************
*** 968,978 ****
      if (!COM_isEmail ($A['email'])) {
          return COM_refresh ($_CONF['site_url']
!                 . '/usersettings.php?mode=edit&msg=52');
      } else if ($A['email'] !== $A['email_conf']) {
          return COM_refresh ($_CONF['site_url']
!                 . '/usersettings.php?mode=edit&msg=78');
      } else if (emailAddressExists ($A['email'], $_USER['uid'])) {
          return COM_refresh ($_CONF['site_url']
!                 . '/usersettings.php?mode=edit&msg=56');
      } else {
          if ($_US_VERBOSE) {
--- 971,981 ----
      if (!COM_isEmail ($A['email'])) {
          return COM_refresh ($_CONF['site_url']
!                 . '/usersettings.php?msg=52');
      } else if ($A['email'] !== $A['email_conf']) {
          return COM_refresh ($_CONF['site_url']
!                 . '/usersettings.php?msg=78');
      } else if (emailAddressExists ($A['email'], $_USER['uid'])) {
          return COM_refresh ($_CONF['site_url']
!                 . '/usersettings.php?msg=56');
      } else {
          if ($_US_VERBOSE) {
***************
*** 1497,1501 ****
          PLG_profileExtrasSave ($_POST['plugin']);
          $display = COM_refresh ($_CONF['site_url']
!                                 . '/usersettings.php?mode=edit&msg=5');
          break;
  
--- 1500,1504 ----
          PLG_profileExtrasSave ($_POST['plugin']);
          $display = COM_refresh ($_CONF['site_url']
!                                 . '/usersettings.php?msg=5');
          break;
  

Index: lib-common.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/lib-common.php,v
retrieving revision 1.719
retrieving revision 1.720
diff -C2 -d -r1.719 -r1.720
*** lib-common.php	11 Aug 2008 07:50:23 -0000	1.719
--- lib-common.php	12 Aug 2008 09:34:29 -0000	1.720
***************
*** 709,713 ****
  
              case 'prefs':
!                 $url = $_CONF['site_url'] . '/usersettings.php?mode=edit';
                  $label = $LANG01[48];
                  break;
--- 709,713 ----
  
              case 'prefs':
!                 $url = $_CONF['site_url'] . '/usersettings.php';
                  $label = $LANG01[48];
                  break;
***************
*** 2316,2320 ****
          }
  
!         $url = $_CONF['site_url'] . '/usersettings.php?mode=edit';
          $usermenu->set_var( 'option_label', $LANG01[48] );
          $usermenu->set_var( 'option_count', '' );
--- 2316,2320 ----
          }
  
!         $url = $_CONF['site_url'] . '/usersettings.php';
          $usermenu->set_var( 'option_label', $LANG01[48] );
          $usermenu->set_var( 'option_count', '' );