[geeklog-cvs] geeklog-1.3/public_html usersettings.php,1.53,1.54

[dhaun at geeklog.net]

Update of /usr/cvs/geeklog/geeklog-1.3/public_html
In directory internal.geeklog.net:/tmp/cvs-serv28637/public_html

Modified Files:
	usersettings.php 
Log Message:
Allow users to change their username if $_CONF['allow_username_change'] == 1


Index: usersettings.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/usersettings.php,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** usersettings.php	18 Jan 2003 22:43:11 -0000	1.53
--- usersettings.php	19 Jan 2003 10:39:34 -0000	1.54
***************
*** 59,63 ****
      $preferences = new Template ($_CONF['path_layout'] . 'preferences');
      $preferences->set_file (array ('profile' => 'profile.thtml',
!                                    'photo' => 'userphoto.thtml'));
      $preferences->set_var ('site_url', $_CONF['site_url']);
      $preferences->set_var ('layout_url', $_CONF['layout_url']);
--- 59,64 ----
      $preferences = new Template ($_CONF['path_layout'] . 'preferences');
      $preferences->set_file (array ('profile' => 'profile.thtml',
!                                    'photo' => 'userphoto.thtml',
!                                    'username' => 'username.thtml'));
      $preferences->set_var ('site_url', $_CONF['site_url']);
      $preferences->set_var ('layout_url', $_CONF['layout_url']);
***************
*** 65,68 ****
--- 66,71 ----
      $preferences->set_var ('lang_fullname', $LANG04[3]);
      $preferences->set_var ('lang_fullname_text', $LANG04[34]);
+     $preferences->set_var ('lang_username', $LANG04[2]);
+     $preferences->set_var ('lang_username_text', $LANG04[87]);
      $preferences->set_var ('lang_password', $LANG04[4]);
      $preferences->set_var ('lang_password_text', $LANG04[35]);
***************
*** 96,100 ****
--- 99,109 ----
      }
      $preferences->set_var ('fullname_value', $A['fullname']);
+     $preferences->set_var ('new_username_value', $_USER['username']);
      $preferences->set_var ('password_value', $A['passwd']);
+     if ($_CONF['allow_username_change'] == 1) {
+         $preferences->parse ('username_option', 'username', true);
+     } else {
+         $preferences->set_var ('username_option', '');
+     }
  
      $selection = '<select name="cooktime">' . LB;
***************
*** 452,455 ****
--- 461,479 ----
      } 
  
+     if ($_CONF['allow_username_change'] == 1) {
+         $A['new_username'] = strip_tags (COM_stripslashes ($A['new_username']));
+         if (!empty ($A['new_username']) &&
+                 ($A['new_username'] != $_USER['username'])) {
+             $A['new_username'] = addslashes ($A['new_username']);
+             if (DB_count ($_TABLES['users'], 'username', $A['new_username']) == 0) {
+                 DB_change ($_TABLES['users'], 'username', $A['new_username'],
+                            "uid", $_USER['uid']);
+             } else {
+                 return COM_refresh ($_CONF['site_url']
+                         . '/usersettings.php?mode=edit&msg=51');
+             }
+         }
+     }
+ 
      if (!empty($A["passwd"])) {
          $passwd = md5($A["passwd"]);
***************
*** 464,468 ****
      $A['pgpkey'] = strip_tags (COM_stripslashes ($A['pgpkey']));
  
!     if (COM_isEmail($A['email'])) {
          if ($_US_VERBOSE) {
              COM_errorLog('cooktime = ' . $A['cooktime'],1);
--- 488,492 ----
      $A['pgpkey'] = strip_tags (COM_stripslashes ($A['pgpkey']));
  
!     if (COM_isEmail ($A['email'])) {
          if ($_US_VERBOSE) {
              COM_errorLog('cooktime = ' . $A['cooktime'],1);
***************
*** 568,572 ****
          }
  
!         return COM_refresh("{$_CONF['site_url']}/usersettings.php?mode=edit&msg=5");
      }
  }
--- 592,600 ----
          }
  
!         return COM_refresh ($_CONF['site_url']
!                 . '/usersettings.php?mode=edit&msg=5');
!     } else {
!         return COM_refresh ($_CONF['site_url']
!                 . '/usersettings.php?mode=edit&msg=52');
      }
  }