malhuda/developer
1
0
Fork 0
mirror of https://github.com/easy-wi/developer.git synced 2025-02-20 11:23:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Manually merge changes from fork #759

Browse Source 
Modified and improved
68f8417290
This commit is contained in:
Ulrich Block 2016-03-06 10:38:09 +01:00
parent 07b0787d15
commit 1492dc836a
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
web/stuff/methods/functions.php
View File

@ -1232,6 +1232,7 @@ if (!function_exists('passwordgenerate')) {
global $ui, $_SESSION;
if ($check == false) {
$token = md5(mt_rand());
$tokenLifeTime = '+40 minutes';
@ -1253,29 +1254,26 @@ if (!function_exists('passwordgenerate')) {
} else {
if (isset($_SESSION[$ui->smallletters('w', 10, 'get')][$ui->smallletters('d', 10, 'get')][$ui->id('id', 10, 'get')]['t']) and $_SESSION[$ui->smallletters('w', 10, 'get')][$ui->smallletters('d', 10, 'get')][$ui->id('id', 10, 'get')]['t'] == $ui->w('token', 32, 'post') and $_SESSION[$ui->smallletters('w', 10, 'get')][$ui->smallletters('d', 10, 'get')][$ui->id('id', 10, 'get')]['d'] >= strtotime('now')) {
deleteOldToken($ui->smallletters('w', 10, 'get'), $ui->smallletters('d', 10, 'get'), $ui->id('id', 10, 'get'));
return true;
} else if (isset($_SESSION[$ui->smallletters('w', 10, 'get')][$ui->smallletters('d', 10, 'get')]['t']) and $_SESSION[$ui->smallletters('w', 10, 'get')][$ui->smallletters('d', 10, 'get')]['t'] == $ui->w('token', 32, 'post') and $_SESSION[$ui->smallletters('w', 10, 'get')][$ui->smallletters('d', 10, 'get')]['d'] >= strtotime('now')) {
deleteOldToken($ui->smallletters('w', 10, 'get'), $ui->smallletters('d', 10, 'get'));
return true;
} else if (isset($_SESSION[$ui->smallletters('w', 10, 'get')][$ui->id('id', 10, 'get')]['t']) and $_SESSION[$ui->smallletters('w', 10, 'get')][$ui->id('id', 10, 'get')]['t'] == $ui->w('token', 32, 'post') and $_SESSION[$ui->smallletters('w', 10, 'get')][$ui->id('id', 10, 'get')]['d'] >= strtotime('now')) {
deleteOldToken($ui->smallletters('w', 10, 'get'),'', $ui->id('id', 10, 'get'));
return true;
} else if (isset($_SESSION[$ui->smallletters('w', 10, 'get')]['t']) and $_SESSION[$ui->smallletters('w', 10, 'get')]['t'] == $ui->w('token', 32, 'post') and $_SESSION[$ui->smallletters('w', 10, 'get')]['d'] >= strtotime('now')) {
deleteOldToken($ui->smallletters('w', 10, 'get'));
return true;
return deleteOldToken(true, $ui->smallletters('w', 10, 'get'), $ui->smallletters('d', 10, 'get'), $ui->id('id', 10, 'get'));
}
deleteOldToken();
if (isset($_SESSION[$ui->smallletters('w', 10, 'get')][$ui->smallletters('d', 10, 'get')]['t']) and $_SESSION[$ui->smallletters('w', 10, 'get')][$ui->smallletters('d', 10, 'get')]['t'] == $ui->w('token', 32, 'post') and $_SESSION[$ui->smallletters('w', 10, 'get')][$ui->smallletters('d', 10, 'get')]['d'] >= strtotime('now')) {
return deleteOldToken(true, $ui->smallletters('w', 10, 'get'), $ui->smallletters('d', 10, 'get'));
}
if (isset($_SESSION[$ui->smallletters('w', 10, 'get')][$ui->id('id', 10, 'get')]['t']) and $_SESSION[$ui->smallletters('w', 10, 'get')][$ui->id('id', 10, 'get')]['t'] == $ui->w('token', 32, 'post') and $_SESSION[$ui->smallletters('w', 10, 'get')][$ui->id('id', 10, 'get')]['d'] >= strtotime('now')) {
return deleteOldToken(true, $ui->smallletters('w', 10, 'get'),'', $ui->id('id', 10, 'get'));
}
if (isset($_SESSION[$ui->smallletters('w', 10, 'get')]['t']) and $_SESSION[$ui->smallletters('w', 10, 'get')]['t'] == $ui->w('token', 32, 'post') and $_SESSION[$ui->smallletters('w', 10, 'get')]['d'] >= strtotime('now')) {
return deleteOldToken(true, $ui->smallletters('w', 10, 'get'));
}
return false;
}
}
function deleteOldToken ($w = '', $d = '', $id = '') {
function deleteOldToken ($returnCode, $w = '', $d = '', $id = '') {
global $_SESSION;
@ -1316,6 +1314,8 @@ if (!function_exists('passwordgenerate')) {
}
}
}
return $returnCode;
}
function customColumns($item, $id = 0, $action = false, $api = false) {