Make the admin renew function use the member functions library.

components/susignup-admin.php

@@ -191,7 +191,7 @@ if (isset($session->groups[$permission])) {
 						$mode='error';
 						$smarty->assign('error_text', 'Member does not appear to have paid via the SU system. Use the old renewals system if they have paid using some other method');;
 					} else {
-						if (renew_member($username, $user['uid'], $user['name'])) {
+						if (admin_renew_member($username, $user['name'])) {
 							message_flash("Successfully renewed");
 							$mode='menu';
 						} else {
@@ -249,7 +249,7 @@ if (isset($session->groups[$permission])) {
 		} else {
 			foreach($_REQUEST['renew'] as $user) {
 				$admin_user=posix_getpwnam($session->username);
-				if (renew_member($user, $admin_user['uid'], $admin_user['name'])) {
+				if (admin_renew_member($user, $admin_user['name'])) {
 					$successes[]=$user;
 				} else {
 					$failures[]=$user;
@@ -338,37 +338,19 @@ function get_renewable_members() {
 	return $retvals;
 }
 
-function renew_member($renew_name, $admin_uid, $admin_name) {
-	global $sucsDB;
-
-	$q="UPDATE members SET paid=?, lastupdate=DEFAULT, lastedit=? WHERE username=?;";
-	$r=$sucsDB->Execute($q, array(paidUntil(time()), $admin_uid, $renew_name));
-	if (!$r) {
-		print $sucsDB->ErrorMsg();
-		return FALSE;
-	} else {	
+function admin_renew_member($renew_name, $admin_name) {
+		global $sucsDB;
+		renew_member($renew_name);
 		$q="SELECT email, typename FROM members, member_type WHERE username=?  AND type=member_type.id;";
 		$r=$sucsDB->Execute($q, array($renew_name));
-
 		$message  = "Account Renewal notification\n\n";
 		$message .= "Account   : ".$renew_name."\n";
 		$message .= "User Type : ".$r->fields['typename']."\n";
 		$message .= "Renewed by: ".$admin_name."\n\n";
 		$message .= "**** Payment was made via the SU payments system ****\n";
 		$message .= "Regards\n  The SU Renewals script";
-		mail("treasurer@sucs.org","Account Renewal",$message);
-		
-		$message = "Your Swansea University Computer Society (SUCS) membership has been renewed\n\n";
-		$message .= "Username: ".$renew_name."\n";
-		$message .= "If you do not know or have forgotten your password, please email admin@sucs.org to arrange for it to be changed.\n\n";
-		$message .= "Regards\n  The SUCS admin";
-		$header = "From: admin@sucs.org\r\n";
-		$header .= "Reply-To: admin@sucs.org";
-		// Personal account
-		mail($r->fields['email'],"SUCS account renewal",$message,$header);
-		// sucs account
-		mail($renew_name."@sucs.org","SUCS account renewal",$message,$header);
+		mail("exec@sucs.org","Account Renewal",$message);
 		return TRUE;
-	}
+}
 
 }