[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gforge-commits] gforge/www/account change_email-complete.php, 1.4, 1.5
|
From: |
tperdue |
|
Subject: |
[Gforge-commits] gforge/www/account change_email-complete.php, 1.4, 1.5 change_email.php, 1.9, 1.10 change_pw.php, 1.5, 1.6 editsshkeys.php, 1.6, 1.7 first.php, 1.5, 1.6 index.php, 1.20, 1.21 login.php, 1.13, 1.14 logout.php, 1.2, 1.3 lostlogin.php, 1.5, 1.6 pending-resend.php, 1.5, 1.6 register.php, 1.20, 1.21 setlang.php, 1.3, 1.4 unsubscribe.php, 1.6, 1.7 verify.php, 1.8, 1.9 |
|
Date: |
Fri, 27 Aug 2004 12:28:14 -0500 |
Update of /cvsroot/gforge/gforge/www/account
In directory db.perdue.net:/home/tperdue/share/dev.gforge.org/www/account
Modified Files:
change_email-complete.php change_email.php change_pw.php
editsshkeys.php first.php index.php login.php logout.php
lostlogin.php pending-resend.php register.php setlang.php
unsubscribe.php verify.php
Log Message:
cleaning up titles, licensing, and exit_assert calls
Index: change_email-complete.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/account/change_email-complete.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- change_email-complete.php 18 Feb 2004 09:18:25 -0000 1.4
+++ change_email-complete.php 27 Aug 2004 17:28:11 -0000 1.5
@@ -1,17 +1,29 @@
<?php
/**
- *
- * Commit user's email change
- *
- * This page should be accessed with confirmation URL sent to user in email
- *
- * SourceForge: Breaking Down the Barriers to Open Source Development
- * Copyright 1999-2001 (c) VA Linux Systems
- * http://sourceforge.net
- *
- * @version $Id$
- *
- */
+ * Commit user's email change
+ *
+ * This page should be accessed with confirmation URL sent to user in email
+ *
+ * Copyright 1999-2001 (c) VA Linux Systems
+ *
+ * @version $Id$
+ *
+ * This file is part of GForge.
+ *
+ * GForge is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * GForge is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GForge; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
require_once('pre.php');
require_once('common/include/account.php');
@@ -19,6 +31,9 @@
if (!$confirm_hash) {
$confirm_hash = $ch;
}
+if (!$confirm_hash) {
+ exit_missing_param();
+}
$confirm_hash = html_clean_hash_string($confirm_hash);
$res_user = db_query("SELECT * FROM users WHERE confirm_hash='$confirm_hash'");
@@ -29,7 +44,11 @@
exit_error("Error","Invalid confirmation hash.");
}
$u =& user_get_object(db_result($res_user, 0, 'user_id'), $res_user);
-exit_assert_object($u, 'User');
+if (!$u || !is_object($u)) {
+ exit_error('Error','Could Not Get User');
+} elseif ($u->isError()) {
+ exit_error('Error',$u->getErrorMessage());
+}
if (!$u->setEmail($u->getNewEmail())) {
exit_error(
@@ -38,7 +57,7 @@
);
}
-site_user_header(array('title'=>$Language->getText('account_change_email-complete','title'),'pagename'=>'account_change_email'));
+site_user_header(array('title'=>$Language->getText('account_change_email-complete','title')));
?>
<p>
Index: change_email.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/account/change_email.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- change_email.php 18 Feb 2004 09:18:25 -0000 1.9
+++ change_email.php 27 Aug 2004 17:28:11 -0000 1.10
@@ -1,15 +1,27 @@
<?php
/**
- *
- * Change user's email page
- *
- * SourceForge: Breaking Down the Barriers to Open Source Development
- * Copyright 1999-2001 (c) VA Linux Systems
- * http://sourceforge.net
- *
- * @version $Id$
- *
- */
+ * Change user's email page
+ *
+ * Copyright 1999-2001 (c) VA Linux Systems
+ *
+ * @version $Id$
+ *
+ * This file is part of GForge.
+ *
+ * GForge is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * GForge is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GForge; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
require_once('pre.php');
@@ -25,7 +37,11 @@
$confirm_hash = substr(md5($session_hash . time()),0,16);
$u =& user_get_object(user_getid());
- exit_assert_object($u, 'User');
+ if (!$u || !is_object($u)) {
+ exit_error('Error','Could Not Get User');
+ } elseif ($u->isError()) {
+ exit_error('Error',$u->getErrorMessage());
+ }
if (!$u->setNewEmailAndHash($newemail, $confirm_hash)) {
exit_error(
@@ -38,7 +54,7 @@
util_send_message($newemail,$Language->getText('account_change_email',
'subject', $GLOBALS[sys_name]),$message);
-
site_user_header(array('title'=>$Language->getText('account_change_email_confirm','title'),'pagename'=>'account_change_email'));
+
site_user_header(array('title'=>$Language->getText('account_change_email_confirm','title')));
echo $Language->getText('account_change_email', 'mailsent');
@@ -47,7 +63,7 @@
}
-site_user_header(array('title'=>$Language->getText('account_change_email','title'),'pagename'=>'account_change_email'));
+site_user_header(array('title'=>$Language->getText('account_change_email','title')));
echo $Language->getText('account_change_email', 'desc');
?>
@@ -58,7 +74,7 @@
<input type="submit" name="submit" value="<?php echo
$Language->getText('account_change_email','send_confirmation') ?>" />
</form>
-<p><a href="/"><?php echo $Language->getText('general', 'return',
$GLOBALS[sys_name]); ?></a></p>
+<p><a href="/"><?php echo $Language->getText('general', 'return', $sys_name);
?></a></p>
<?php
site_user_footer(array());
Index: change_pw.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/account/change_pw.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- change_pw.php 18 Feb 2004 09:18:25 -0000 1.5
+++ change_pw.php 27 Aug 2004 17:28:11 -0000 1.6
@@ -1,22 +1,39 @@
<?php
/**
- *
- * Change user's password
- *
- * SourceForge: Breaking Down the Barriers to Open Source Development
- * Copyright 1999-2001 (c) VA Linux Systems
- * http://sourceforge.net
- *
- * @version $Id$
- *
- */
+ * Change user's password
+ *
+ * Copyright 1999-2001 (c) VA Linux Systems
+ *
+ * @version $Id$
+ *
+ * This file is part of GForge.
+ *
+ * GForge is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * GForge is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GForge; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
require_once('pre.php');
require_once('common/include/account.php');
session_require(array('isloggedin'=>1));
+
$u =& user_get_object(user_getid());
-exit_assert_object($u, 'User');
+if (!$u || !is_object($u)) {
+ exit_error('Error','Could Not Get User');
+} elseif ($u->isError()) {
+ exit_error('Error',$u->getErrorMessage());
+}
if ($submit) {
@@ -41,14 +58,14 @@
);
}
- if (!$u->setPasswd($passwd)) {
+ if (!$u->setPasswd($passwd)) {
exit_error(
$Language->getText('general','error'),
'Could not change password: '.$u->getErrorMessage()
);
- }
+ }
-
site_user_header(array(title=>$Language->getText('account_change_pw_changed','title'),'pagename'=>'account_change_pw'));
+
site_user_header(array(title=>$Language->getText('account_change_pw_changed','title')));
?>
<?php echo $Language->getText('account_change_pw', 'confirmation',
$GLOBALS[sys_name]); ?>
@@ -60,7 +77,7 @@
<?php
} else {
// Show change form
-
site_user_header(array(title=>$Language->getText('account_change_pw','title'),'pagename'=>'account_change_pw'));
+
site_user_header(array(title=>$Language->getText('account_change_pw','title')));
?>
<form action="<?php echo $PHP_SELF; ?>" method="post">
Index: editsshkeys.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/account/editsshkeys.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- editsshkeys.php 18 Feb 2004 09:18:25 -0000 1.6
+++ editsshkeys.php 27 Aug 2004 17:28:11 -0000 1.7
@@ -1,22 +1,38 @@
<?php
/**
- *
- * Change user's SSH authorized keys
- *
- * SourceForge: Breaking Down the Barriers to Open Source Development
- * Copyright 1999-2001 (c) VA Linux Systems
- * http://sourceforge.net
- *
- * @version $Id$
- *
- */
+ * Change user's SSH authorized keys
+ *
+ * Copyright 1999-2001 (c) VA Linux Systems
+ *
+ * @version $Id$
+ *
+ * This file is part of GForge.
+ *
+ * GForge is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * GForge is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GForge; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
require_once('pre.php');
require_once('common/include/account.php');
session_require(array('isloggedin'=>1));
$u =& user_get_object(user_getid());
-exit_assert_object($u, 'User');
+if (!$u || !is_object($u)) {
+ exit_error('Error','Could Not Get User');
+} elseif ($u->isError()) {
+ exit_error('Error',$u->getErrorMessage());
+}
if ($submit) {
if (!$u->setAuthorizedKeys($authorized_keys)) {
@@ -29,7 +45,7 @@
} else {
// not valid registration, or first time to page
- site_user_header(array(title=>"Change Authorized
Keys",'pagename'=>'account_editsshkeys'));
+ site_user_header(array('title'=>'Change Authorized Keys'));
?>
@@ -37,8 +53,8 @@
To avoid having to type your password every time for your CVS/SSH
developer account, you may upload your public key(s) here and they
will be placed on the CVS server in your ~/.ssh/authorized_keys file.
- This is done by a cron job, so it may not happen immediately. Please
allow
- for a one hour delay.
+ This is done by a cron job, so it may not happen immediately. Please
allow
+ for a one hour delay.
</p>
<p>
To generate a public key, run the program 'ssh-keygen' (you can use
Index: first.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/account/first.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- first.php 18 Feb 2004 09:18:25 -0000 1.5
+++ first.php 27 Aug 2004 17:28:11 -0000 1.6
@@ -1,23 +1,35 @@
<?php
/**
- *
- * Welcome page
- *
- * This is the page user is redirerected to after first site login
- *
- * SourceForge: Breaking Down the Barriers to Open Source Development
- * Copyright 1999-2001 (c) VA Linux Systems
- * http://sourceforge.net
- *
- * @version $Id$
- *
- */
+ * Welcome page
+ *
+ * This is the page user is redirerected to after first site login
+ *
+ * Copyright 1999-2001 (c) VA Linux Systems
+ *
+ * @version $Id$
+ *
+ * This file is part of GForge.
+ *
+ * GForge is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * GForge is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GForge; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
require_once('pre.php');
-site_user_header(array(title=>$Language->getText('account_first','title',array($GLOBALS['sys_name'])),'pagename'=>'account_first'));
+site_user_header(array('title'=>$Language->getText('account_first','title',$sys_name)));
-echo $Language->getText('account_first','about_blurb', $GLOBALS[sys_name]);
+echo $Language->getText('account_first','about_blurb', $sys_name);
site_user_footer(array());
Index: index.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/account/index.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- index.php 25 Mar 2004 23:24:12 -0000 1.20
+++ index.php 27 Aug 2004 17:28:11 -0000 1.21
@@ -1,15 +1,27 @@
<?php
/**
- *
- * User account main page - show settings with means to change them
- *
- * SourceForge: Breaking Down the Barriers to Open Source Development
- * Copyright 1999-2001 (c) VA Linux Systems
- * http://sourceforge.net
- *
- * @version $Id$
- *
- */
+ * User account main page - show settings with means to change them
+ *
+ * Copyright 1999-2001 (c) VA Linux Systems
+ *
+ * @version $Id$
+ *
+ * This file is part of GForge.
+ *
+ * GForge is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * GForge is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GForge; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
require_once('pre.php');
require_once('common/include/timezones.php');
@@ -18,7 +30,11 @@
// get global users vars
$u =& user_get_object(user_getid());
-exit_assert_object($u, 'User');
+if (!$u || !is_object($u)) {
+ exit_error('Error','Could Not Get User');
+} elseif ($u->isError()) {
+ exit_error('Error',$u->getErrorMessage());
+}
if ($submit) {
@@ -50,10 +66,7 @@
}
-site_user_header(array('title'=>$Language->getText('account_options',
'title'),'pagename'=>'account'));
-
-
-
+site_user_header(array('title'=>$Language->getText('account_options',
'title')));
echo '<form action="'.$PHP_SELF.'" method="post">';
Index: login.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/account/login.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- login.php 15 Jul 2004 21:08:29 -0000 1.13
+++ login.php 27 Aug 2004 17:28:11 -0000 1.14
@@ -1,17 +1,31 @@
<?php
/**
- * SourceForge login page
- *
- * This is main SF login page. It takes care of different account states
- * (by disallowing logging in with non-active account, with appropriate
- * notice).
- *
- * SourceForge: Breaking Down the Barriers to Open Source Development
- * Copyright 1999-2001 (c) VA Linux Systems
- * http://sourceforge.net
- *
- * @version $Id$
- */
+ * GForge login page
+ *
+ * This is main login page. It takes care of different account states
+ * (by disallowing logging in with non-active account, with appropriate
+ * notice).
+ *
+ * Copyright 1999-2001 (c) VA Linux Systems
+ *
+ * @version $Id$
+ *
+ * This file is part of GForge.
+ *
+ * GForge is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * GForge is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GForge; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
Header( "Expires: Wed, 11 Nov 1998 11:11:11 GMT");
Header( "Cache-Control: no-cache");
Index: logout.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/account/logout.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- logout.php 18 Feb 2004 09:18:25 -0000 1.2
+++ logout.php 27 Aug 2004 17:28:12 -0000 1.3
@@ -1,15 +1,27 @@
<?php
/**
- *
- * SourceForge logout page
- *
- * SourceForge: Breaking Down the Barriers to Open Source Development
- * Copyright 1999-2001 (c) VA Linux Systems
- * http://sourceforge.net
- *
- * @version $Id$
- *
- */
+ * GForge logout page
+ *
+ * Copyright 1999-2001 (c) VA Linux Systems
+ *
+ * @version $Id$
+ *
+ * This file is part of GForge.
+ *
+ * GForge is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * GForge is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GForge; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
require_once('pre.php');
Index: lostlogin.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/account/lostlogin.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- lostlogin.php 18 Feb 2004 09:18:25 -0000 1.5
+++ lostlogin.php 27 Aug 2004 17:28:12 -0000 1.6
@@ -1,23 +1,38 @@
<?php
/**
- *
- * Recover lost password page
- *
- * This page is accessed via confirmation URL in email
- *
- * SourceForge: Breaking Down the Barriers to Open Source Development
- * Copyright 1999-2001 (c) VA Linux Systems
- * http://sourceforge.net
- *
- * @version $Id$
- *
- */
+ * Recover lost password page
+ *
+ * This page is accessed via confirmation URL in email
+ *
+ * Copyright 1999-2001 (c) VA Linux Systems
+ *
+ * @version $Id$
+ *
+ * This file is part of GForge.
+ *
+ * GForge is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * GForge is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GForge; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
require_once('pre.php');
require_once('common/include/account.php');
if (!$confirm_hash) {
- $confirm_hash = $ch;
+ $confirm_hash = $ch;
+}
+if (!$confirm_hash) {
+ exit_missing_param();
}
// Remove noise from hash produced by buggy mail clients
$confirm_hash = html_clean_hash_string($confirm_hash);
@@ -36,25 +51,29 @@
);
}
$u =& user_get_object(db_result($res_user, 0, 'user_id'), $res_user);
-exit_assert_object($u, 'User');
+if (!$u || !is_object($u)) {
+ exit_error('Error','Could Not Get User');
+} elseif ($u->isError()) {
+ exit_error('Error',$u->getErrorMessage());
+}
if ($submit) {
- if (strlen($passwd)<6) {
- exit_error(
+ if (strlen($passwd)<6) {
+ exit_error(
$Language->getText('global','error'),
$Language->getText('account_lostlogin','sixchars')
- );
+ );
}
if ($passwd != $passwd2) {
- exit_error(
+ exit_error(
$Language->getText('global','error'),
$Language->getText('account_lostlogin','notmatch')
);
}
- if ($u->setPasswd($passwd)) {
+ if ($u->setPasswd($passwd)) {
// Invalidate confirm hash
$u->setNewEmailAndHash('', 0);
@@ -63,7 +82,7 @@
echo $Language->getText('account_lostlogin','passwdchanged');
$HTML->footer(array());
exit();
- }
+ }
$feedback = $Language->getText('global','error').':
'.$u->getErrorMessage();
}
Index: pending-resend.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/account/pending-resend.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- pending-resend.php 18 Feb 2004 09:18:25 -0000 1.5
+++ pending-resend.php 27 Aug 2004 17:28:12 -0000 1.6
@@ -1,21 +1,37 @@
<?php
/**
- *
- * Resend account activation email with confirmation URL
- *
- * SourceForge: Breaking Down the Barriers to Open Source Development
- * Copyright 1999-2001 (c) VA Linux Systems
- * http://sourceforge.net
- *
- * @version $Id$
- *
- */
+ * Resend account activation email with confirmation URL
+ *
+ * Copyright 1999-2001 (c) VA Linux Systems
+ *
+ * @version $Id$
+ *
+ * This file is part of GForge.
+ *
+ * GForge is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * GForge is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GForge; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
require_once('pre.php');
if ($submit) {
$u = user_get_object_by_name($loginname);
- exit_assert_object($u, 'User');
+ if (!$u || !is_object($u)) {
+ exit_error('Error','Could Not Get User');
+ } elseif ($u->isError()) {
+ exit_error('Error',$u->getErrorMessage());
+ }
if ($u->getStatus() != 'P') {
exit_error(
Index: register.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/account/register.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- register.php 4 Aug 2004 16:18:36 -0000 1.20
+++ register.php 27 Aug 2004 17:28:12 -0000 1.21
@@ -1,15 +1,27 @@
<?php
/**
- *
- * Register new acoount page
- *
- * SourceForge: Breaking Down the Barriers to Open Source Development
- * Copyright 1999-2001 (c) VA Linux Systems
- * http://sourceforge.net
- *
- * @version $Id$
- *
- */
+ * Register new acoount page
+ *
+ * Copyright 1999-2001 (c) VA Linux Systems
+ *
+ * @version $Id$
+ *
+ * This file is part of GForge.
+ *
+ * GForge is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * GForge is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GForge; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
require_once('pre.php');
require_once('common/include/account.php');
@@ -35,9 +47,9 @@
$email,$mail_site,$mail_va,$language_id,$timezone,$jabber_address,$jabber_only,$theme_id,'',
$address,$address2,$phone,$fax,$title,$ccode);
if ($register) {
- echo $HTML->header(array('title'=>'Register
Confirmation','pagename'=>'account_register'));
+ echo $HTML->header(array('title'=>'Register Confirmation'));
- echo $Language->getText('account_register','congrat',
$GLOBALS[sys_name]);
+ echo $Language->getText('account_register','congrat',
$sys_name);
echo $HTML->footer(array());
exit;
} else {
@@ -46,12 +58,8 @@
}
-$HTML->header(array('title'=>'Gforge:
Register','pagename'=>'account_register'));
-
-
-?>
+$HTML->header(array('title'=>'User Account Registration'));
-<?php
if ($feedback) {
print "<p><FONT color=#FF0000>$feedback $register_error</FONT>";
}
Index: setlang.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/account/setlang.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- setlang.php 18 Feb 2004 09:18:25 -0000 1.3
+++ setlang.php 27 Aug 2004 17:28:12 -0000 1.4
@@ -1,15 +1,27 @@
<?php
/**
- *
- * Set default language for not-logged-on sessions (via cookie)
- *
- * SourceForge: Breaking Down the Barriers to Open Source Development
- * Copyright 1999-2001 (c) VA Linux Systems
- * http://sourceforge.net
- *
- * @version $Id$
- *
- */
+ * Set default language for not-logged-on sessions (via cookie)
+ *
+ * Copyright 1999-2001 (c) VA Linux Systems
+ *
+ * @version $Id$
+ *
+ * This file is part of GForge.
+ *
+ * GForge is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * GForge is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GForge; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
require_once('pre.php');
Index: unsubscribe.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/account/unsubscribe.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- unsubscribe.php 18 Feb 2004 09:18:25 -0000 1.6
+++ unsubscribe.php 27 Aug 2004 17:28:12 -0000 1.7
@@ -1,17 +1,29 @@
<?php
/**
- *
- * Disable optional site mailings for account
- *
- * This page is accessed via URL present in site mailings
- *
- * SourceForge: Breaking Down the Barriers to Open Source Development
- * Copyright 1999-2001 (c) VA Linux Systems
- * http://sourceforge.net
- *
- * @version $Id$
- *
- */
+ * Disable optional site mailings for account
+ *
+ * This page is accessed via URL present in site mailings
+ *
+ * Copyright 1999-2001 (c) VA Linux Systems
+ *
+ * @version $Id$
+ *
+ * This file is part of GForge.
+ *
+ * GForge is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * GForge is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GForge; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
require_once('pre.php');
require_once('common/include/account.php');
@@ -19,6 +31,9 @@
if (!$confirm_hash) {
$confirm_hash = $ch;
}
+if (!$confirm_hash) {
+ exit_missing_param();
+}
$confirm_hash = html_clean_hash_string($confirm_hash);
@@ -32,7 +47,11 @@
$row_user = db_fetch_array($res_user);
$user =& user_get_object($row_user['user_id'], $res_user);
-exit_assert_object($user, 'User');
+if (!$u || !is_object($u)) {
+ exit_error('Error','Could Not Get User');
+} elseif ($u->isError()) {
+ exit_error('Error',$u->getErrorMessage());
+}
$user->unsubscribeFromMailings($all);
@@ -57,6 +76,7 @@
</p>
<?php
+
site_footer(array());
?>
Index: verify.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/account/verify.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- verify.php 18 Feb 2004 09:18:25 -0000 1.8
+++ verify.php 27 Aug 2004 17:28:12 -0000 1.9
@@ -1,18 +1,30 @@
<?php
/**
- *
- * Registration verification page
- *
- * This page is accessed with the link sent in account confirmation
- * email.
- *
- * SourceForge: Breaking Down the Barriers to Open Source Development
- * Copyright 1999-2001 (c) VA Linux Systems
- * http://sourceforge.net
- *
- * @version $Id$
- *
- */
+ * Registration verification page
+ *
+ * This page is accessed with the link sent in account confirmation
+ * email.
+ *
+ * Copyright 1999-2001 (c) VA Linux Systems
+ *
+ * @version $Id$
+ *
+ * This file is part of GForge.
+ *
+ * GForge is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * GForge is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GForge; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
require_once('pre.php');
@@ -26,12 +38,10 @@
}
$u = user_get_object_by_name($loginname);
-
- if (!$u || !is_object($u)){
- exit_error(
- $Language->getText('account_verify','invaliduser'),
- $Language->getText('account_verify','nouser')
- );
+ if (!$u || !is_object($u)) {
+ exit_error('Error','Could Not Get User');
+ } elseif ($u->isError()) {
+ exit_error('Error',$u->getErrorMessage());
}
if ($u->getStatus()=='A'){
@@ -67,7 +77,7 @@
session_redirect("/account/first.php");
}
-$HTML->header(array('title'=>'Login','pagename'=>'account_verify','titlevals'=>array($GLOBALS['sys_name'])));
+$HTML->header(array('title'=>'Verify'));
echo $Language->getText('account_verify', 'verify_blurb');
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gforge-commits] gforge/www/account change_email-complete.php, 1.4, 1.5 change_email.php, 1.9, 1.10 change_pw.php, 1.5, 1.6 editsshkeys.php, 1.6, 1.7 first.php, 1.5, 1.6 index.php, 1.20, 1.21 login.php, 1.13, 1.14 logout.php, 1.2, 1.3 lostlogin.php, 1.5, 1.6 pending-resend.php, 1.5, 1.6 register.php, 1.20, 1.21 setlang.php, 1.3, 1.4 unsubscribe.php, 1.6, 1.7 verify.php, 1.8, 1.9,
tperdue <=
- Prev by Date:
[Gforge-commits] gforge/www/my bookmark_add.php, 1.4, 1.5 bookmark_delete.php, 1.4, 1.5 bookmark_edit.php, 1.4, 1.5 diary.php, 1.11, 1.12 index.php, 1.29, 1.30 rmproject.php, 1.4, 1.5
- Next by Date:
[Gforge-commits] gforge/www/admin/trove trove_cat_add.php, 1.7, 1.8 trove_cat_edit.php, 1.19, 1.20 trove_cat_list.php, 1.8, 1.9
- Previous by thread:
[Gforge-commits] gforge/www/my bookmark_add.php, 1.4, 1.5 bookmark_delete.php, 1.4, 1.5 bookmark_edit.php, 1.4, 1.5 diary.php, 1.11, 1.12 index.php, 1.29, 1.30 rmproject.php, 1.4, 1.5
- Next by thread:
[Gforge-commits] gforge/www/admin/trove trove_cat_add.php, 1.7, 1.8 trove_cat_edit.php, 1.19, 1.20 trove_cat_list.php, 1.8, 1.9
- Index(es):