Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Mehrere kleine Korrekturen: #110

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Mehrere kleine Korrekturen: #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
54db903
Mehrere kleine Korrekturen:
finke Jun 30, 2013
a02f9b2
- Fehler beseitigt, der entsteht wenn User über das Admin menü freig…
finke Jun 30, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions include/admin/puser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
$erg = db_query("SELECT * FROM `prefix_usercheck` WHERE `check` = '" . escape($_GET[ 'check' ], 'string') . "'");
if (db_num_rows($erg) == 1) {
$row = db_fetch_assoc($erg);
$row[ 'name_clean' ] = escape(get_lower($row[ 'name' ]), 'string');
switch ($row[ 'ak' ]) {
// confirm regist
case 1:
Expand Down
4 changes: 3 additions & 1 deletion include/includes/class/menu.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,9 @@ public function get_url($w = '') {
'remind',
'13',
'3',
'logout'
'logout',
'8', //Profil
'profil'
);
if ($exit === true AND $this->get(0) == 'user' AND in_array($this->get(1), $alwaysallowed)) {
$exit = false;
Expand Down
10 changes: 5 additions & 5 deletions include/includes/func/user.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ function user_login_check($auto = false)
} else {
$lower = get_lower($_POST['email']);
$value = escape($lower, 'string');
$term = "name_clean = '" . $value . "'";
$term = "name_clean = BINARY '" . $value . "'";
debug('Login mit Nickname: ' . $value);
}
if ($lower != $value) {
Expand Down Expand Up @@ -431,20 +431,20 @@ function user_regist($name, $mail, $pass)

$crypt = new PwCrypt();

$name_clean = get_lower($name);
$name_clean = escape(get_lower($name), 'string');
$erg = db_query("SELECT `id` FROM `prefix_user` WHERE `name_clean` = BINARY '" . $name_clean . "'");
if (db_num_rows($erg) > 0) {
return (false);
}

$mail = get_lower($mail);
$mail = get_lower(escape_for_email($mail));
$erg = db_query("SELECT `id` FROM `prefix_user` WHERE `email` = BINARY '" . $mail . "'");
if (db_num_rows($erg) > 0) {
return (false);
}

if ($allgAr[ 'forum_regist_user_pass' ] == 0) {
$new_pass = PwCrypt::getRndString(8, PwCrypt::LETTERS| PwCrypt::NUMBERS | PwCrypt::SPECIAL_CHARACTERS);
$new_pass = PwCrypt::getRndString(8, PwCrypt::LETTERS| PwCrypt::NUMBERS | PwCrypt::SPECIAL_CHARACTERS);
} else {
$new_pass = $pass;
}
Expand Down
4 changes: 3 additions & 1 deletion include/includes/loader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,10 @@

if(file_exists($filePath)) {
require_once $filePath;
return true;
} else {
throw new InvalidArgumentException('the file "'.$filePath.'" does not exist');
//throw new InvalidArgumentException('the file "'.$filePath.'" does not exist');
return false
}
});

Expand Down
2 changes: 1 addition & 1 deletion install/install.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ function getInstallprofileComment($file) {
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>... ::: [ I n s t a l l a t i o n &nbsp; f &uuml; r &nbsp; C l a n s c r i p t &nbsp; v o n &nbsp; i l c h ] ::: ...</title>
<link rel="stylesheet" href="../include/designs/ilchClan12/style.css" type="text/css">
<link rel="stylesheet" href="../include/includes/css/jquery/templates/redmond/jquery-ui-1.8.21.custom.css" type="text/css">
<link rel="stylesheet" href="../include/includes/css/jquery/templates/redmond/jquery.ui.theme.css" type="text/css">
<style type="text/css">.hide { display:none; }</style>

</head>
Expand Down