trying to merge this bit of code
Code:
case 'NOTIFY_PROCESS_3RD_PARTY_LOGINS': {
// BOF POS Login 1/2
if(isset($_SESSION['POStoken'])) {
if (!$p3 && zen_not_null ($p2)) {
$check = $db->Execute ("SELECT admin_id, admin_pass FROM " . TABLE_ADMIN . " WHERE admin_id = " . (int)EMP_LOGIN_ADMIN_ID);
if (!$check->EOF && !zen_validate_password ($p2, $check->fields['admin_pass'])) {
$p3 = true;
$_SESSION['emp_admin_login'] = true;
$_SESSION['emp_admin_id'] = EMP_LOGIN_ADMIN_ID;
} else {
$admin_profiles = $db->Execute ("SELECT admin_id, admin_pass FROM " . TABLE_ADMIN . " WHERE admin_profile IN (" . preg_replace('/[^0-9,]/', '', EMP_LOGIN_ADMIN_PROFILE_ID) . ")");
while (!$admin_profiles->EOF && !$p3) {
$p3 = zen_validate_password($p2, $admin_profiles->fields['admin_pass']);
if (!$p3) {
$_SESSION['emp_admin_login'] = true;
$_SESSION['emp_admin_id'] = $admin_profiles->fields['admin_id'];
}
$admin_profiles->MoveNext();
}
}
if ($p3) {
$sql_data_array = array ( 'access_date' => 'now()',
'admin_id' => $_SESSION['emp_admin_id'],
'page_accessed' => 'login.php',
'page_parameters' => '',
'ip_address' => substr ($_SERVER['REMOTE_ADDR'],0,45),
'gzpost' => gzdeflate (json_encode (array ( 'action' => 'emp_admin_login' )), 7),
'flagged' => 0,
'attention' => '',
);
zen_db_perform (TABLE_ADMIN_ACTIVITY_LOG, $sql_data_array);
}
}
} else {
// EOF POS Login 1/2
if (!$p3 && zen_not_null ($p2)) {
$check = $db->Execute ("SELECT admin_id, admin_pass FROM " . TABLE_ADMIN . " WHERE admin_id = " . (int)EMP_LOGIN_ADMIN_ID);
if (!$check->EOF && zen_validate_password ($p2, $check->fields['admin_pass'])) {
$p3 = true;
$_SESSION['emp_admin_login'] = true;
$_SESSION['emp_admin_id'] = EMP_LOGIN_ADMIN_ID;
} else {
$admin_profiles = $db->Execute ("SELECT admin_id, admin_pass FROM " . TABLE_ADMIN . " WHERE admin_profile IN (" . preg_replace('/[^0-9,]/', '', EMP_LOGIN_ADMIN_PROFILE_ID) . ")");
while (!$admin_profiles->EOF && !$p3) {
$p3 = zen_validate_password($p2, $admin_profiles->fields['admin_pass']);
if ($p3) {
$_SESSION['emp_admin_login'] = true;
$_SESSION['emp_admin_id'] = $admin_profiles->fields['admin_id'];
}
$admin_profiles->MoveNext();
}
}
if ($p3) {
$sql_data_array = array ( 'access_date' => 'now()',
'admin_id' => $_SESSION['emp_admin_id'],
'page_accessed' => 'login.php',
'page_parameters' => '',
'ip_address' => substr ($_SERVER['REMOTE_ADDR'],0,45),
'gzpost' => gzdeflate (json_encode (array ( 'action' => 'emp_admin_login' )), 7),
'flagged' => 0,
'attention' => '',
);
zen_db_perform (TABLE_ADMIN_ACTIVITY_LOG, $sql_data_array);
}
}
// BOF POS Login 2/2
}
// EOF POS Login 2/2
break;
}
default: {
break;
}
}
}
}
with this
Code:
case 'NOTIFY_PROCESS_3RD_PARTY_LOGINS':
if (!$p3 && zen_not_null($p2)) {
$pwd2 = htmlspecialchars($p2, ENT_COMPAT, CHARSET);
$check = $db->Execute(
"SELECT admin_id, admin_pass
FROM " . TABLE_ADMIN . "
WHERE admin_id = " . (int)EMP_LOGIN_ADMIN_ID . "
LIMIT 1"
);
if (!$check->EOF && (zen_validate_password($p2, $check->fields['admin_pass']) || zen_validate_password($pwd2, $check->fields['admin_pass']))) {
$p3 = true;
$_SESSION['emp_admin_login'] = true;
$_SESSION['emp_admin_id'] = EMP_LOGIN_ADMIN_ID;
} else {
$admin_profiles = $db->Execute(
"SELECT admin_id, admin_pass
FROM " . TABLE_ADMIN . "
WHERE admin_profile IN (" . preg_replace('/[^0-9,]/', '', EMP_LOGIN_ADMIN_PROFILE_ID) . ")"
);
while (!$admin_profiles->EOF && !$p3) {
$p3 = (zen_validate_password($p2, $admin_profiles->fields['admin_pass']) || zen_validate_password($pwd2, $admin_profiles->fields['admin_pass']));
if ($p3) {
$_SESSION['emp_admin_login'] = true;
$_SESSION['emp_admin_id'] = $admin_profiles->fields['admin_id'];
}
$admin_profiles->MoveNext();
}
}
if ($p3) {
$_SESSION['emp_customer_email_address'] = $p1a;
$sql_data_array = array(
'access_date' => 'now()',
'admin_id' => $_SESSION['emp_admin_id'],
'page_accessed' => 'login.php',
'page_parameters' => '',
'ip_address' => substr($_SERVER['REMOTE_ADDR'],0,45),
'gzpost' => gzdeflate(json_encode(array('action' => 'emp_admin_login', 'customer_email_address' => $p1a)), 7),
'flagged' => 0,
'attention' => '',
'severity' => 'info',
'logmessage' => 'EMP admin login',
);
zen_db_perform(TABLE_ADMIN_ACTIVITY_LOG, $sql_data_array);
}
}
break;
default:
break;
}
}
}
and am having problems
Bookmarks