Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1672) +++ branches/2.8.x/CHANGELOG (revision 1673) @@ -11,7 +11,11 @@ ! = Update/Change =============================================================================== + 18 Apr-2012 Build 1668 Dietmar Woellbrink (Luisehahne) +! fixed signup, remove $admin->print_error methods ++ add send registation mail to systemadministartor +18 Apr-2012 Build 1668 Dietmar Woellbrink (Luisehahne) + add languages vars for signup 18 Apr-2012 Build 1668 Dietmar Woellbrink (Luisehahne) # fixes installer and upgrade-script Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1672) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1673) @@ -51,5 +51,5 @@ // check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled) if(!defined('VERSION')) define('VERSION', '2.8.3'); -if(!defined('REVISION')) define('REVISION', '1672'); +if(!defined('REVISION')) define('REVISION', '1673'); if(!defined('SP')) define('SP', ''); Index: branches/2.8.x/wb/account/signup.php =================================================================== --- branches/2.8.x/wb/account/signup.php (revision 1672) +++ branches/2.8.x/wb/account/signup.php (revision 1673) @@ -17,6 +17,7 @@ */ require_once('../config.php'); +ini_set('display_errors','0'); if(!( intval(FRONTEND_SIGNUP) && ( 0 == (isset($_SESSION['USER_ID']) ? intval($_SESSION['USER_ID']) : 0) ))) { @@ -48,6 +49,7 @@ } $page_id = (isset($_SESSION['PAGE_ID']) && ($_SESSION['PAGE_ID']!='') ? $_SESSION['PAGE_ID'] : 0); +$_SESSION['display_form'] = true; // Required page details // $page_id = 0; @@ -62,6 +64,8 @@ define('MODULE', ''); define('VISIBILITY', 'public'); +define('PAGE_CONTENT', WB_PATH.'/account/signup_form.php'); +/* // Set the page content include file if(isset($_POST['username'])) { define('PAGE_CONTENT', WB_PATH.'/account/signup2.php'); @@ -68,7 +72,7 @@ } else { define('PAGE_CONTENT', WB_PATH.'/account/signup_form.php'); } - +*/ // Set auto authentication to false $auto_auth = false; Index: branches/2.8.x/wb/account/save_signup.php =================================================================== --- branches/2.8.x/wb/account/save_signup.php (nonexistent) +++ branches/2.8.x/wb/account/save_signup.php (revision 1673) @@ -0,0 +1,201 @@ +Access denied

Cannot access this file directly

'); +} +/* -------------------------------------------------------- */ + + +if (!function_exists('emailAdmin')) { + function emailAdmin() { + global $database,$admin; + $retval = $admin->get_email(); + if($admin->get_user_id()!='1') { + $sql = 'SELECT `email` FROM `'.TABLE_PREFIX.'users` '; + $sql .= 'WHERE `user_id`=\'1\' '; + $retval = $database->get_one($sql); + + } + return $retval; + } +} + +$_SESSION['username'] = ''; +$_SESSION['DISPLAY_NAME'] = ''; +$_SESSION['email'] = ''; +$_SESSION['display_form'] = true; + +if(isset($_POST['action']) && $_POST['action']=='send') { + $_SESSION['username'] = strtolower(strip_tags($wb->get_post_escaped('username'))); + $_SESSION['DISPLAY_NAME'] = strip_tags($wb->get_post_escaped('display_name')); + $_SESSION['email'] = $wb->get_post('email'); + + $aErrorMsg = array(); + + if($_SESSION['username'] != "") + { + // Check if username already exists + $sql = 'SELECT `user_id` FROM `'.TABLE_PREFIX.'users` WHERE `username` = \''.$_SESSION['username'].'\''; + if($database->get_one($sql)){ + $aErrorMsg[] = $MESSAGE['USERS_USERNAME_TAKEN']; + $_SESSION['username'] = ''; + } else { + if(!preg_match('/^[a-z]{1}[a-z0-9_-]{3,}$/i', $_SESSION['username'])) { + $aErrorMsg[] = $MESSAGE['USERS_NAME_INVALID_CHARS']; + $_SESSION['username'] = ''; + } + } + } else { + $aErrorMsg[] = $MESSAGE['LOGIN_USERNAME_BLANK']; + } + + if($_SESSION['DISPLAY_NAME'] == "") { + $aErrorMsg[] = $MESSAGE['GENERIC_FILL_IN_ALL']; + } + + if($_SESSION['email'] != "") { + // Check if the email already exists + $sql = 'SELECT `user_id` FROM `'.TABLE_PREFIX.'users` WHERE `email` = \''.mysql_escape_string($_SESSION['email']).'\''; + if($database->get_one($sql)){ + $aErrorMsg[] = $MESSAGE['USERS_EMAIL_TAKEN']; + $_SESSION['email'] = ''; + } else { + if(!$wb->validate_email($_SESSION['email'])){ + $aErrorMsg[] = $MESSAGE['USERS_INVALID_EMAIL']; + $_SESSION['email'] = ''; + } + } + } else { + $aErrorMsg[] = $MESSAGE['SIGNUP_NO_EMAIL']; + } + + $sServerEmail = (defined('SERVER_EMAIL') && SERVER_EMAIL != '' ? SERVER_EMAIL : emailAdmin()); + // Captcha + if(ENABLED_CAPTCHA) { + if(isset($_POST['captcha']) AND $_POST['captcha'] != ''){ + // Check for a mismatch get email user_id + if(!isset($_POST['captcha']) OR !isset($_SESSION['captcha']) OR $_POST['captcha'] != $_SESSION['captcha']) { + $replace = array('SERVER_EMAIL' => emailAdmin() ); + $aErrorMsg[] = replace_vars($MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'], $replace); + } + } else { + $replace = array('SERVER_EMAIL'=>emailAdmin() ); + $aErrorMsg[] = replace_vars($MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'],$replace ); + } + + } + if(isset($_SESSION['captcha'])) { unset($_SESSION['captcha']); } + + if (sizeof($aErrorMsg)) { + $aTmp = array_unshift ($aErrorMsg,''); + $sMessage = implode('
  • ',$aErrorMsg); +?>
    +
    +
      + +
    +
    +
    + +mail(SERVER_EMAIL,$mail_to,$email_subject,$email_body)) { } + $success = false; + if( $wb->mail($sServerEmail,$email_to,$email_subject,$email_body,WB_MAILER) ) { + $sql = 'SELECT `user_id` FROM `'.TABLE_PREFIX.'users` '; + $sql .= 'ORDER BY `user_id` DESC '; + $user_id = $database->get_one($sql)+1; + + $email_subject = $MESSAGE['SIGNUP2_NEW_USER']; + $search = array('{LOGIN_EMAIL}','{LOGIN_ID}', '{SIGNUP_DATE}', '{LOGIN_NAME}', '{LOGIN_IP}'); + $replace = array($email_to, $email_fromname.' ('.$user_id.')', date(DATE_FORMAT.' '.TIME_FORMAT,$get_ts ), $sLoginName, $get_ip); + $mail_message = str_replace($search, $replace, $MESSAGE['SIGNUP2_ADMIN_INFO']); + $email_body = preg_replace( "/(content-type:|bcc:|cc:|to:|from:)/im", "", $mail_message ); + $success_email_to = emailAdmin(); + $success = $wb->mail($sServerEmail,$success_email_to,$email_subject,$email_body,$email_fromname); + } + } + + if($success) { + + $sql = 'INSERT INTO `'.TABLE_PREFIX.'users` SET '; + $sql .= 'group_id = \''.$groups_id.'\', '; + $sql .= 'groups_id = \''.$groups_id.'\', '; + $sql .= 'active = \'1\', '; + $sql .= 'username = \''.$sLoginName.'\', '; + $sql .= 'password = \''.$md5_password.'\', '; + $sql .= 'display_name = \''.$sDisplayName.'\', '; + $sql .= 'email = \''.$email_to.'\', '; + $sql .= 'login_when = \''.$get_ts.'\', '; + $sql .= 'login_ip = \''.$get_ip.'\' '; + if($database->query($sql)) { + $_SESSION['display_form'] = false; + unset($_SESSION['username']); + unset($_SESSION['DISPLAY_NAME']); + unset($_SESSION['email']); + unset($_POST); +// send msgbox +?>
    +
    + +

    + +
    +
    +
    + -
    +include_once (WB_PATH.'/framework/functions.php'); +require(WB_PATH.'/account/save_signup.php'); +if($_SESSION['display_form']){ +?>

     

    @@ -31,8 +38,9 @@ getFTAN(); ?> + +
    -

    email-address: @@ -51,19 +59,19 @@ : - + (): - + : - +   +