phyks/bouffeatulm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

CSRF protection enhanced. To be tested...

Browse Source
This commit is contained in:
Phyks 2013-09-25 22:09:25 +02:00
parent e5014cb7f9
commit 4de572bdaf
11 changed files with 332 additions and 270 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
TODO
View File

@ -1,7 +1,3 @@
Issues :
========
* Check CSRF everywhere
Improvements : Improvements :
============== ==============
* User groups * User groups

9
inc/CSRF.inc.php
View File

@ -19,8 +19,13 @@
if(session_id() == '') if(session_id() == '')
session_start(); session_start();
if(isset($_SESSION[$name.'_token']) && isset($_SESSION[$name.'_token_time']) && isset($_POST['token'])) { if(isset($_SESSION[$name.'_token']) && isset($_SESSION[$name.'_token_time']) && (isset($_POST['token']) || isset($_GET['token']))) {
if($_SESSION[$name.'_token'] == $_POST['token']) { if(!empty($_POST['token']))
$token = $_POST['token'];
else
$token = $_GET['token'];
if($_SESSION[$name.'_token'] == $token) {
if($_SESSION[$name.'_token_time'] >= (time() - (int) $time)) if($_SESSION[$name.'_token_time'] >= (time() - (int) $time))
return true; return true;
} }

551
index.php
View File

@ -259,80 +259,97 @@
$user_id = $current_user->getId(); $user_id = $current_user->getId();
} }
$user = new User(); if(checkToken(600, 'password')) {
$user = $user->load(array('id'=>$user_id), true); $user = new User();
$user->newJsonToken(); $user = $user->load(array('id'=>$user_id), true);
$user->save(); $user->newJsonToken();
$_SESSION['current_user'] = $user->sessionStore(); $user->save();
$_SESSION['current_user'] = $user->sessionStore();
header('location: index.php?do=password&'.$get_redir);
exit(); header('location: index.php?do=password&'.$get_redir);
exit();
}
else {
$tpl->assign('error', $errors['token_error'][LANG]);
$tpl->draw('index');
}
break; break;
case 'delete_user': case 'delete_user':
if($_GET['user_id'] != $current_user->getId()) { if($_GET['user_id'] != $current_user->getId()) {
$user = new User(); if(checkToken(600, 'edit_users')) {
$user->setId($_GET['user_id']); $user = new User();
$user->delete(); $user->setId($_GET['user_id']);
$user->delete();
// Update concerned invoices // Update concerned invoices
$invoices = new Invoice(); $invoices = new Invoice();
$invoices = $invoices->load(); $invoices = $invoices->load();
if($invoices !== FALSE) { if($invoices !== FALSE) {
foreach($invoices as $invoice) { foreach($invoices as $invoice) {
if($invoice->getBuyer() == $_GET['user_id']) { if($invoice->getBuyer() == $_GET['user_id']) {
$invoice->delete();
}
if($invoice->getUsersIn()->inUsersIn($_GET['user_id'])) {
$users_in = $invoice->getUsersIn()->get();
unset($users_in[$_GET['user_id']]);
if(empty($users_in) || array_keys($users_in) == array($invoice->getBuyer()))
$invoice->delete(); $invoice->delete();
else { }
$invoice->setUsersIn($users_in); if($invoice->getUsersIn()->inUsersIn($_GET['user_id'])) {
$invoice->save(); $users_in = $invoice->getUsersIn()->get();
unset($users_in[$_GET['user_id']]);
if(empty($users_in) || array_keys($users_in) == array($invoice->getBuyer()))
$invoice->delete();
else {
$invoice->setUsersIn($users_in);
$invoice->save();
}
} }
} }
} }
}
// Update paybacks // Update paybacks
$paybacks = new Payback(); $paybacks = new Payback();
$paybacks = $paybacks->load(array('from_user'=>(int) $_GET['user_id'])); $paybacks = $paybacks->load(array('from_user'=>(int) $_GET['user_id']));
if($paybacks !== FALSE) { if($paybacks !== FALSE) {
foreach($paybacks as $payback) { foreach($paybacks as $payback) {
$payback->delete(); $payback->delete();
}
} }
} $paybacks = new Payback();
$paybacks = new Payback(); $paybacks = $paybacks->load(array('to_user'=>(int) $_GET['user_id']));
$paybacks = $paybacks->load(array('to_user'=>(int) $_GET['user_id'])); if($paybacks !== FALSE) {
if($paybacks !== FALSE) { foreach($paybacks as $payback) {
foreach($paybacks as $payback) { $payback->delete();
$payback->delete(); }
} }
// Clear the cache
($cached_files = glob(raintpl::$cache_dir."*.rtpl.php")) or ($cached_files = array());
array_map("unlink", $cached_files);
header('location: index.php?do=edit_users&'.$get_redir);
exit();
}
else {
$tpl->assign('error', $errors['token_error'][LANG]);
$tpl->draw('index');
} }
// Clear the cache
($cached_files = glob(raintpl::$cache_dir."*.rtpl.php")) or ($cached_files = array());
array_map("unlink", $cached_files);
header('location: index.php?do=edit_users&'.$get_redir);
exit();
} }
break; break;
case 'edit_notice': case 'edit_notice':
if(isset($_POST['notice'])) { if(isset($_POST['notice'])) {
setNotice($_POST['notice']); if(checkToken(600, 'settings')) {
setNotice($_POST['notice']);
// Clear the cache // Clear the cache
($cached_files = glob(raintpl::$cache_dir."*.rtpl.php")) or ($cached_files = array()); ($cached_files = glob(raintpl::$cache_dir."*.rtpl.php")) or ($cached_files = array());
array_map("unlink", $cached_files); array_map("unlink", $cached_files);
header('location: index.php?'.$get_redir); header('location: index.php?'.$get_redir);
exit(); exit();
}
else {
$tpl->assign('error', $errors['token_error'][LANG]);
}
} }
$tpl->assign('show_settings', false); $tpl->assign('show_settings', false);
@ -499,31 +516,37 @@
case 'delete_invoice': case 'delete_invoice':
if(!empty($_GET['id'])) { if(!empty($_GET['id'])) {
$invoice = new Invoice(); if(checkToken(600, 'invoice')) {
$invoice = $invoice->load(array('id'=>(int) $_GET['id']), true); $invoice = new Invoice();
$invoice = $invoice->load(array('id'=>(int) $_GET['id']), true);
if($current_user->getAdmin() || $invoice->getBuyer() == $current_user->getId()) { if($current_user->getAdmin() || $invoice->getBuyer() == $current_user->getId()) {
$invoice->delete(); $invoice->delete();
// Delete related paybacks // Delete related paybacks
$paybacks = new Payback(); $paybacks = new Payback();
$paybacks = $paybacks->load(array('invoice_id'=>(int) $_GET['id'])); $paybacks = $paybacks->load(array('invoice_id'=>(int) $_GET['id']));
if($paybacks !== false) { if($paybacks !== false) {
foreach($paybacks as $payback) { foreach($paybacks as $payback) {
$payback->delete(); $payback->delete();
}
} }
// Clear the cache
($cached_files = glob(raintpl::$cache_dir."*.rtpl.php")) or ($cached_files = array());
array_map("unlink", $cached_files);
header('location: index.php?'.$get_redir);
exit();
}
else {
$tpl->assign('error', $errors['unauthorized'][LANG]);
$tpl->draw('index');
} }
// Clear the cache
($cached_files = glob(raintpl::$cache_dir."*.rtpl.php")) or ($cached_files = array());
array_map("unlink", $cached_files);
header('location: index.php?'.$get_redir);
exit();
} }
else { else {
$tpl->assign('error', $errors['unauthorized']); $tpl->assign('error', $errors['token_error'][LANG]);
$tpl->draw('index'); $tpl->draw('index');
} }
} }
@ -536,43 +559,49 @@
case 'confirm_payback': case 'confirm_payback':
if(!empty($_GET['from']) && !empty($_GET['to']) && !empty($_GET['invoice_id']) && $_GET['from'] != $_GET['to']) { if(!empty($_GET['from']) && !empty($_GET['to']) && !empty($_GET['invoice_id']) && $_GET['from'] != $_GET['to']) {
if($_GET['to'] == $current_user->getId() || $current_user->getAdmin()) { if($_GET['to'] == $current_user->getId() || $current_user->getAdmin()) {
$invoice = new Invoice(); if(checkToken(600, 'invoice')) {
$invoice = $invoice->load(array('id'=>(int) $_GET['invoice_id']), true); $invoice = new Invoice();
$invoice = $invoice->load(array('id'=>(int) $_GET['invoice_id']), true);
$payback = new Payback(); $payback = new Payback();
if(!empty($_GET['payback_id'])) { if(!empty($_GET['payback_id'])) {
$payback = $payback->load(array('id'=>(int) $_GET['payback_id']), true); $payback = $payback->load(array('id'=>(int) $_GET['payback_id']), true);
if($payback->getFrom() != $_GET['from'] || $payback->getTo() != $_GET['to']) { if($payback->getFrom() != $_GET['from'] || $payback->getTo() != $_GET['to']) {
$payback = new Payback(); $payback = new Payback();
}
} }
else {
$payback = $payback->load(array('invoice_id'=>(int) $_GET['invoice_id'], 'to_user'=>(int) $_GET['to'], 'from_user'=>(int) $_GET['from']), true);
if($payback == false)
$payback = new Payback();
}
$payback->setDate(date('i'), date('G'), date('j'), date('n'), date('Y'));
$payback->setInvoice($_GET['invoice_id']);
$payback->setAmount($invoice->getAmountPerPerson($_GET['from']));
$payback->setFrom($_GET['from']);
$payback->setTo($_GET['to']);
$payback->save();
// Clear the cache
($cached_files = glob(raintpl::$cache_dir."*.rtpl.php")) or ($cached_files = array());
array_map("unlink", $cached_files);
header('location: index.php');
exit();
} }
else { else {
$payback = $payback->load(array('invoice_id'=>(int) $_GET['invoice_id'], 'to_user'=>(int) $_GET['to'], 'from_user'=>(int) $_GET['from']), true); $tpl->assign('error', $errors['token_error'][LANG]);
$tpl->draw('index');
if($payback == false)
$payback = new Payback();
} }
$payback->setDate(date('i'), date('G'), date('j'), date('n'), date('Y'));
$payback->setInvoice($_GET['invoice_id']);
$payback->setAmount($invoice->getAmountPerPerson($_GET['from']));
$payback->setFrom($_GET['from']);
$payback->setTo($_GET['to']);
$payback->save();
// Clear the cache
($cached_files = glob(raintpl::$cache_dir."*.rtpl.php")) or ($cached_files = array());
array_map("unlink", $cached_files);
header('location: index.php');
exit();
} }
else { else {
$tpl->assign('error', $errors['unauthorized']); $tpl->assign('error', $errors['unauthorized'][LANG]);
$tpl->draw('index'); $tpl->draw('index');
} }
} }
@ -584,22 +613,29 @@
case 'delete_payback': case 'delete_payback':
if(!empty($_GET['from']) && !empty($_GET['to']) && !empty($_GET['invoice_id'])) { if(!empty($_GET['from']) && !empty($_GET['to']) && !empty($_GET['invoice_id'])) {
if($_GET['to'] == $current_user->getId() || $current_user->getAdmin()) { if($_GET['to'] == $current_user->getId() || $current_user->getAdmin()) {
$paybacks = new Payback(); if(checkToken(600, 'invoice')) {
$paybacks = new Payback();
$paybacks = $paybacks->load(array('to_user'=>(int) $_GET['to'], 'from_user'=> (int) $_GET['from'], 'invoice_id'=> (int) $_GET['invoice_id'])); $paybacks = $paybacks->load(array('to_user'=>(int) $_GET['to'], 'from_user'=> (int) $_GET['from'], 'invoice_id'=> (int) $_GET['invoice_id']));
if($paybacks !== false) { if($paybacks !== false) {
foreach($paybacks as $payback) { foreach($paybacks as $payback) {
$payback->delete(); $payback->delete();
}
} }
// Clear the cache
($cached_files = glob(raintpl::$cache_dir."*.rtpl.php")) or ($cached_files = array());
array_map("unlink", $cached_files);
header('location: index.php');
exit();
}
else {
$tpl->assign('error', $errors['token_error'][LANG]);
$tpl->draw('index');
} }
// Clear the cache
($cached_files = glob(raintpl::$cache_dir."*.rtpl.php")) or ($cached_files = array());
array_map("unlink", $cached_files);
header('location: index.php');
exit();
} }
else { else {
header('location: index.php'); header('location: index.php');
@ -615,54 +651,61 @@
case 'payall': case 'payall':
if(!empty($_GET['from']) && !empty($_GET['to'])) { if(!empty($_GET['from']) && !empty($_GET['to'])) {
if($_GET['to'] == $current_user->getId() || $current_user->getAdmin()) { if($_GET['to'] == $current_user->getId() || $current_user->getAdmin()) {
// Confirm all paybacks when to is buyer if(checkToken(600, 'invoice')) {
$invoices = new Invoice(); // Confirm all paybacks when to is buyer
$invoices = $invoices->load(array('buyer'=>(int) $_GET['to'])); $invoices = new Invoice();
$invoices = $invoices->load(array('buyer'=>(int) $_GET['to']));
if($invoices !== false) { if($invoices !== false) {
foreach($invoices as $invoice) { foreach($invoices as $invoice) {
$paybacks = new Payback(); $paybacks = new Payback();
$paybacks = $paybacks->load(array('invoice_id'=>$invoice->getId(), 'to_user'=>(int) $_GET['to'], 'from_user'=>(int) $_GET['from'])); $paybacks = $paybacks->load(array('invoice_id'=>$invoice->getId(), 'to_user'=>(int) $_GET['to'], 'from_user'=>(int) $_GET['from']));
if($paybacks === false) { if($paybacks === false) {
$payback = new Payback(); $payback = new Payback();
$payback->setTo($_GET['to']); $payback->setTo($_GET['to']);
$payback->setFrom($_GET['from']); $payback->setFrom($_GET['from']);
$payback->setAmount($invoice->getAmountPerPerson($_GET['from'])); $payback->setAmount($invoice->getAmountPerPerson($_GET['from']));
$payback->setInvoice($invoice->getId()); $payback->setInvoice($invoice->getId());
$payback->setDate(date('i'), date('G'), date('j'), date('n'), date('Y')); $payback->setDate(date('i'), date('G'), date('j'), date('n'), date('Y'));
$payback->save(); $payback->save();
}
} }
} }
}
// Confirm all paybacks when from is buyer // Confirm all paybacks when from is buyer
$invoices = new Invoice(); $invoices = new Invoice();
$invoices = $invoices->load(array('buyer'=>(int) $_GET['from'])); $invoices = $invoices->load(array('buyer'=>(int) $_GET['from']));
if($invoices !== false) { if($invoices !== false) {
foreach($invoices as $invoice) { foreach($invoices as $invoice) {
$paybacks = new Payback(); $paybacks = new Payback();
$paybacks = $paybacks->load(array('invoice_id'=>$invoice->getId(), 'to_user'=>(int) $_GET['from'], 'from_user'=>(int) $_GET['to'])); $paybacks = $paybacks->load(array('invoice_id'=>$invoice->getId(), 'to_user'=>(int) $_GET['from'], 'from_user'=>(int) $_GET['to']));
if($paybacks === false) { if($paybacks === false) {
$payback = new Payback(); $payback = new Payback();
$payback->setTo($_GET['from']); $payback->setTo($_GET['from']);
$payback->setFrom($_GET['to']); $payback->setFrom($_GET['to']);
$payback->setAmount($invoice->getAmountPerPerson($_GET['to'])); $payback->setAmount($invoice->getAmountPerPerson($_GET['to']));
$payback->setInvoice($invoice->getId()); $payback->setInvoice($invoice->getId());
$payback->setDate(date('i'), date('G'), date('j'), date('n'), date('Y')); $payback->setDate(date('i'), date('G'), date('j'), date('n'), date('Y'));
$payback->save(); $payback->save();
}
} }
} }
// Clear the cache
($cached_files = glob(raintpl::$cache_dir."*.rtpl.php")) or ($cached_files = array());
array_map("unlink", $cached_files);
header('location: index.php');
exit();
}
else {
$tpl->assign('error', $errors['token_error'][LANG]);
$tpl->draw('index');
} }
// Clear the cache
($cached_files = glob(raintpl::$cache_dir."*.rtpl.php")) or ($cached_files = array());
array_map("unlink", $cached_files);
header('location: index.php');
exit();
} }
else { else {
header('location: index.php'); header('location: index.php');
@ -702,6 +745,7 @@
$tpl->assign('list', true); $tpl->assign('list', true);
$tpl->assign('global_paybacks', $global_paybacks); $tpl->assign('global_paybacks', $global_paybacks);
$tpl->assign('payback', generateToken('global_payback'));
$tpl->draw('see_paybacks'); $tpl->draw('see_paybacks');
break; break;
@ -709,35 +753,40 @@
case "confirm_global_paybacks": case "confirm_global_paybacks":
if(!empty($_GET['from']) && !empty($_GET['to']) && !empty($_GET['payback_id']) && $_GET['from'] != $_GET['to']) { if(!empty($_GET['from']) && !empty($_GET['to']) && !empty($_GET['payback_id']) && $_GET['from'] != $_GET['to']) {
if($_GET['to'] == $current_user->getId() || $current_user->getAdmin()) { if($_GET['to'] == $current_user->getId() || $current_user->getAdmin()) {
$global_payback = new GlobalPayback(); if(checkToken(600, 'global_payback')) {
$global_payback = $global_payback->load(array('id'=>(int) $_GET['payback_id']), true); $global_payback = new GlobalPayback();
$global_payback = $global_payback->load(array('id'=>(int) $_GET['payback_id']), true);
$users_in = $global_payback->getUsersIn()->get(); $users_in = $global_payback->getUsersIn()->get();
$users_in[(int) $_GET['from']][(int) $_GET['to']] = 0; $users_in[(int) $_GET['from']][(int) $_GET['to']] = 0;
$users_in[(int) $_GET['to']][(int) $_GET['from']] = 0; $users_in[(int) $_GET['to']][(int) $_GET['from']] = 0;
$global_payback->setUsersIn($users_in); $global_payback->setUsersIn($users_in);
if($global_payback->getUsersIn()->isEmpty()) { if($global_payback->getUsersIn()->isEmpty()) {
$global_payback->setClosed(true); $global_payback->setClosed(true);
}
else {
$global_payback->setClosed(false);
}
$global_payback->save();
// Clear the cache
($cached_files = glob(raintpl::$cache_dir."*.rtpl.php")) or ($cached_files = array());
array_map("unlink", $cached_files);
header('location: ?do=see_paybacks&id='.(int)$_GET['payback_id']);
exit();
} }
else { else {
$global_payback->setClosed(false); header('location: index.php');
exit();
} }
$global_payback->save();
// Clear the cache
($cached_files = glob(raintpl::$cache_dir."*.rtpl.php")) or ($cached_files = array());
array_map("unlink", $cached_files);
header('location: ?do=see_paybacks&id='.(int)$_GET['payback_id']);
exit();
} }
else { else {
$tpl->assign('error', $errors['unauthorized']); $tpl->assign('error', $errors['token_error'][LANG]);
$tpl->draw('index'); $tpl->draw('index');
} }
} }
@ -765,104 +814,110 @@
} }
else { else {
if(!empty($_POST['users_in'])) { if(!empty($_POST['users_in'])) {
$global_payback = new GlobalPayback(); if(checkToken(600, 'global_payback')) {
$global_payback = new GlobalPayback();
// Backup database // Backup database
if(!is_dir('db_backups')) { if(!is_dir('db_backups')) {
mkdir('db_backups'); mkdir('db_backups');
} }
system("mysqldump -h ".MYSQL_HOST." -u ".MYSQL_LOGIN." -p ".MYSQL_PASSWORD." ".MYSQL_DB." > db_backups/".date('d-m-Y_H:i')); system("mysqldump -h ".MYSQL_HOST." -u ".MYSQL_LOGIN." -p ".MYSQL_PASSWORD." ".MYSQL_DB." > db_backups/".date('d-m-Y_H:i'));
$users_in = array(); $users_in = array();
foreach($_POST['users_in'] as $user1_id) { foreach($_POST['users_in'] as $user1_id) {
$user1_id = intval($user1_id); $user1_id = intval($user1_id);
foreach($_POST['users_in'] as $user2_id) { foreach($_POST['users_in'] as $user2_id) {
$user2_id = intval($user2_id); $user2_id = intval($user2_id);
if($user1_id == $user2_id) { if($user1_id == $user2_id) {
$users_in[$user1_id][$user2_id] = 0;
}
elseif(!empty($users_in[$user2_id][$user1_id])) {
if($users_in[$user2_id][$user1_id] > 0) {
$users_in[$user1_id][$user2_id] = 0; $users_in[$user1_id][$user2_id] = 0;
} }
else { elseif(!empty($users_in[$user2_id][$user1_id])) {
$users_in[$user1_id][$user2_id] = -$users_in[$user2_id][$user1_id]; if($users_in[$user2_id][$user1_id] > 0) {
$users_in[$user2_id][$user1_id] = 0; $users_in[$user1_id][$user2_id] = 0;
} }
} else {
else { $users_in[$user1_id][$user2_id] = -$users_in[$user2_id][$user1_id];
// Get the amount user1 owes to user2 $users_in[$user2_id][$user1_id] = 0;
$users_in[$user1_id][$user2_id] = 0;
// Confirm all paybacks when user2 is buyer
$invoices = new Invoice();
$invoices = $invoices->load(array('buyer'=>$user2_id));
if($invoices !== false) {
foreach($invoices as $invoice) {
$paybacks = new Payback();
$paybacks = $paybacks->load(array('invoice_id'=>$invoice->getId(), 'to_user'=>$user2_id, 'from_user'=>$user1_id));
if($paybacks === false) {
$payback = new Payback();
$payback->setTo($user2_id);
$payback->setFrom($user1_id);
$payback->setAmount($invoice->getAmountPerPerson($user1_id));
$payback->setInvoice($invoice->getId());
$payback->setDate(date('i'), date('G'), date('j'), date('n'), date('Y'));
$payback->save();
// Add the amount to what user1 owes to user2
$users_in[$user1_id][$user2_id] += $payback->getAmount();
}
} }
} }
else {
// Get the amount user1 owes to user2
$users_in[$user1_id][$user2_id] = 0;
// Confirm all paybacks when from is buyer // Confirm all paybacks when user2 is buyer
$invoices = new Invoice(); $invoices = new Invoice();
$invoices = $invoices->load(array('buyer'=>$user1_id)); $invoices = $invoices->load(array('buyer'=>$user2_id));
if($invoices !== false) { if($invoices !== false) {
foreach($invoices as $invoice) { foreach($invoices as $invoice) {
$paybacks = new Payback(); $paybacks = new Payback();
$paybacks = $paybacks->load(array('invoice_id'=>$invoice->getId(), 'to_user'=>$user1_id, 'from_user'=>$user2_id)); $paybacks = $paybacks->load(array('invoice_id'=>$invoice->getId(), 'to_user'=>$user2_id, 'from_user'=>$user1_id));
if($paybacks === false) { if($paybacks === false) {
$payback = new Payback(); $payback = new Payback();
$payback->setTo($user1_id); $payback->setTo($user2_id);
$payback->setFrom($user2_id); $payback->setFrom($user1_id);
$payback->setAmount($invoice->getAmountPerPerson($user2_id)); $payback->setAmount($invoice->getAmountPerPerson($user1_id));
$payback->setInvoice($invoice->getId()); $payback->setInvoice($invoice->getId());
$payback->setDate(date('i'), date('G'), date('j'), date('n'), date('Y')); $payback->setDate(date('i'), date('G'), date('j'), date('n'), date('Y'));
$payback->save(); $payback->save();
// Substract the amount to what user1 owes to user2 // Add the amount to what user1 owes to user2
$users_in[$user1_id][$user2_id] -= $payback->getAmount(); $users_in[$user1_id][$user2_id] += $payback->getAmount();
}
}
}
// Confirm all paybacks when from is buyer
$invoices = new Invoice();
$invoices = $invoices->load(array('buyer'=>$user1_id));
if($invoices !== false) {
foreach($invoices as $invoice) {
$paybacks = new Payback();
$paybacks = $paybacks->load(array('invoice_id'=>$invoice->getId(), 'to_user'=>$user1_id, 'from_user'=>$user2_id));
if($paybacks === false) {
$payback = new Payback();
$payback->setTo($user1_id);
$payback->setFrom($user2_id);
$payback->setAmount($invoice->getAmountPerPerson($user2_id));
$payback->setInvoice($invoice->getId());
$payback->setDate(date('i'), date('G'), date('j'), date('n'), date('Y'));
$payback->save();
// Substract the amount to what user1 owes to user2
$users_in[$user1_id][$user2_id] -= $payback->getAmount();
}
} }
} }
} }
} }
} }
}
$global_payback->setUsersIn($users_in); $global_payback->setUsersIn($users_in);
if($global_payback->getUsersIn()->isEmpty()) { if($global_payback->getUsersIn()->isEmpty()) {
$global_payback->setClosed(true); $global_payback->setClosed(true);
}
else {
$global_payback->setClosed(false);
}
$global_payback->setDate(date('i'), date('G'), date('j'), date('n'), date('Y'));
$global_payback->save();
// Clear the cache
($cached_files = glob(raintpl::$cache_dir."*.rtpl.php")) or ($cached_files = array());
array_map("unlink", $cached_files);
header('location: index.php?do=manage_paybacks&'.$get_redir);
exit();
} }
else { else {
$global_payback->setClosed(false); $tpl->assign('error', $errors['token_error'][LANG]);
$tpl->draw('index');
} }
$global_payback->setDate(date('i'), date('G'), date('j'), date('n'), date('Y'));
$global_payback->save();
// Clear the cache
($cached_files = glob(raintpl::$cache_dir."*.rtpl.php")) or ($cached_files = array());
array_map("unlink", $cached_files);
header('location: index.php?do=manage_paybacks&'.$get_redir);
exit();
} }
$users_list = new User(); $users_list = new User();
@ -870,6 +925,7 @@
$tpl->assign('users', $users_list); $tpl->assign('users', $users_list);
} }
$tpl->assign('payback', generateToken('global_payback'));
$tpl->draw('manage_paybacks'); $tpl->draw('manage_paybacks');
break; break;
@ -971,6 +1027,9 @@
$tpl->assign('paybacks', secureDisplay($paybacks)); $tpl->assign('paybacks', secureDisplay($paybacks));
$tpl->assign('balances', secureDisplay($balances)); $tpl->assign('balances', secureDisplay($balances));
$tpl->assign('token', generate_token('invoice'));
// Cache the page (1 month to make it almost permanent and only regenerate it upon new invoice) // Cache the page (1 month to make it almost permanent and only regenerate it upon new invoice)
$tpl->cache('index', 108000, $current_user->getLogin().$_GET['all']); $tpl->cache('index', 108000, $current_user->getLogin().$_GET['all']);

4
tpl/default_en/edit_users.html
View File

@ -19,7 +19,7 @@
<td>{$value->getDisplayName()}</td> <td>{$value->getDisplayName()}</td>
<td>{$value->getAdmin() ? "Yes" : "No"}</td> <td>{$value->getAdmin() ? "Yes" : "No"}</td>
<td><a href="index.php?do=edit_users&user_id={$value->getId()}">Edit</a></td> <td><a href="index.php?do=edit_users&user_id={$value->getId()}">Edit</a></td>
<td>{if condition="$value->getId() != $current_user->getId()"}<a href="index.php?do=delete_user&user_id={$value->getId()}">Delete</a>{/if}</td> <td>{if condition="$value->getId() != $current_user->getId()"}<a href="index.php?do=delete_user&amp;user_id={$value->getId()}&amp;token={$token}">Delete</a>{/if}</td>
</tr> </tr>
{/loop} {/loop}
</table> </table>
@ -52,7 +52,7 @@
{if condition="$user_id != -1"} {if condition="$user_id != -1"}
<h2>Personal token for this user</h2> <h2>Personal token for this user</h2>
<p>The personal token for this user to be used with the API is : {$user_data->getJsonToken()}.<br/>If you think it might be compromised, you can <a href="index.php?do=new_token&user_id={$user_data->getId()}">generate a new one</a>.</p> <p>The personal token for this user to be used with the API is : {$user_data->getJsonToken()}.<br/>If you think it might be compromised, you can <a href="index.php?do=new_token&user_id={$user_data->getId()}&token={$token}">generate a new one</a>.</p>
{/if} {/if}
{elseif condition="$view == 'password'"} {elseif condition="$view == 'password'"}

10
tpl/default_en/index.html
View File

@ -23,7 +23,7 @@
{elseif condition="$balances[$value1->getId()][$value2->getId()] === '-' || ($value2->getId() != $current_user->getId() && !$current_user->getAdmin())"} {elseif condition="$balances[$value1->getId()][$value2->getId()] === '-' || ($value2->getId() != $current_user->getId() && !$current_user->getAdmin())"}
<td>{$balances[$value1->getId()][$value2->getId()]}</td> <td>{$balances[$value1->getId()][$value2->getId()]}</td>
{else} {else}
<td><a href="?do=payall&amp;from={$value1->getId()}&amp;to={$value2->getId()}">{$balances[$value1->getId()][$value2->getId()]}</a></td> <td><a href="?do=payall&amp;from={$value1->getId()}&amp;to={$value2->getId()}&amp;token={$token}">{$balances[$value1->getId()][$value2->getId()]}</a></td>
{/if} {/if}
{/loop} {/loop}
</tr> </tr>
@ -66,7 +66,7 @@
- -
{if condition="$paybacks[$value1->getId()] === false || !in_array($key2, array_keys($paybacks[$value1->getId()]))"} {if condition="$paybacks[$value1->getId()] === false || !in_array($key2, array_keys($paybacks[$value1->getId()]))"}
{if condition="$current_user->getId() == $value1->getBuyer() || $current_user->getAdmin()"} {if condition="$current_user->getId() == $value1->getBuyer() || $current_user->getAdmin()"}
<a href="?do=confirm_payback&amp;from={$key2}&amp;to={$value1->getBuyer()}&amp;invoice_id={$value1->getId()}" title="Confirm payback"> <a href="?do=confirm_payback&amp;from={$key2}&amp;to={$value1->getBuyer()}&amp;invoice_id={$value1->getId()}&amp;token={$token}" title="Confirm payback">
{/if} {/if}
Remains {$value1->getAmountPerPerson($key2)} {$currency} Remains {$value1->getAmountPerPerson($key2)} {$currency}
{if condition="$current_user->getId() == $value1->getBuyer() || $current_user->getAdmin()"} {if condition="$current_user->getId() == $value1->getBuyer() || $current_user->getAdmin()"}
@ -75,7 +75,7 @@
{else} {else}
{if condition="$paybacks[$value1->getId()][$key2]->getAmount() == $value1->getAmountPerPerson($key2)"} {if condition="$paybacks[$value1->getId()][$key2]->getAmount() == $value1->getAmountPerPerson($key2)"}
{if condition="$current_user->getId() == $value1->getBuyer() || $current_user->getAdmin()"} {if condition="$current_user->getId() == $value1->getBuyer() || $current_user->getAdmin()"}
<a href="?do=delete_payback&amp;from={$key2}&amp;to={$value1->getBuyer()}&amp;invoice_id={$value1->getId()}" title="Delete payback"> <a href="?do=delete_payback&amp;from={$key2}&amp;to={$value1->getBuyer()}&amp;invoice_id={$value1->getId()}&amp;token={$token}" title="Delete payback">
{/if} {/if}
Paid Paid
{if condition="$current_user->getId() == $value1->getBuyer() || $current_user->getAdmin()"} {if condition="$current_user->getId() == $value1->getBuyer() || $current_user->getAdmin()"}
@ -83,7 +83,7 @@
{/if} {/if}
{else} {else}
{if condition="$current_user->getId() == $value1->getBuyer() || $current_user->getAdmin()"} {if condition="$current_user->getId() == $value1->getBuyer() || $current_user->getAdmin()"}
<a href="?do=confirm_payback&amp;from={$key2}&amp;to={$value1->getBuyer()}&amp;invoice_id={$value1->getId()}&amp;payback_id={$paybacks[$value1->getId()][$key2]->getId()}" title="Confirm payback"> <a href="?do=confirm_payback&amp;from={$key2}&amp;to={$value1->getBuyer()}&amp;invoice_id={$value1->getId()}&amp;payback_id={$paybacks[$value1->getId()][$key2]->getId()}&amp;token={$token}" title="Confirm payback">
{/if} {/if}
Remains {$value1->getAmountPerPerson($key2) - $paybacks[$value1->getId()][$key2]->getAmount()}{$currency} Remains {$value1->getAmountPerPerson($key2) - $paybacks[$value1->getId()][$key2]->getAmount()}{$currency}
{if condition="$current_user->getId() == $value1->getBuyer() || $current_user->getAdmin()"} {if condition="$current_user->getId() == $value1->getBuyer() || $current_user->getAdmin()"}
@ -106,7 +106,7 @@
</td> </td>
<td> <td>
{if condition="$value->getBuyer() == $current_user->getId() || $current_user->getAdmin()"} {if condition="$value->getBuyer() == $current_user->getId() || $current_user->getAdmin()"}
<a href="index.php?do=delete_invoice&id={$value->getId()}">Delete</a> <a href="index.php?do=delete_invoice&id={$value->getId()}&token={$token}">Delete</a>
{else} {else}
- -
{/if} {/if}

1
tpl/default_en/manage_paybacks.html
View File

@ -37,6 +37,7 @@
</fieldset> </fieldset>
<p> <p>
<input type="submit" onclick="return confirm('You are going to add a global payback which includes the selected user. Confirm ?');" value="Confirm"/> <input type="submit" onclick="return confirm('You are going to add a global payback which includes the selected user. Confirm ?');" value="Confirm"/>
<input type="hidden" name="token" value="{$token}"/>
</p> </p>
</form> </form>
{/if} {/if}

4
tpl/default_en/see_paybacks.html
View File

@ -8,7 +8,7 @@
<dt>{$value->getDate()}</dt> <dt>{$value->getDate()}</dt>
<dd> <dd>
{if condition="$value->getClosed() !== false"} {if condition="$value->getClosed() !== false"}
<a href="?do=see_paybacks&id={$value->getId()}" onclick="return confirm("Are you sure you want to confirm this payback ? This action can't be undone easily");">Payback n°{$value->getId()}</a> <a href="?do=see_paybacks&id={$value->getId()}">Payback n°{$value->getId()}</a>
{else} {else}
[Closed] Payback n°{$value->getId()} [Closed] Payback n°{$value->getId()}
{/if} {/if}
@ -41,7 +41,7 @@
{else} {else}
<td> <td>
{if condition="$table[$key1][$key2] != 0"} {if condition="$table[$key1][$key2] != 0"}
<a href="?do=confirm_global_paybacks&amp;from={$key1}&amp;to={$key2}&amp;payback_id={$global_paybacks->getId()}" title="Confirm payback">{$table[$key1][$key2]}</a> <a href="?do=confirm_global_paybacks&amp;from={$key1}&amp;to={$key2}&amp;payback_id={$global_paybacks->getId()}&amp;token={$token}" title="Confirm payback" onclick="return confirm("Are you sure you want to confirm this payback ? This action can't be undone easily");">{$table[$key1][$key2]}</a>
{else} {else}
- -
{/if} {/if}

4
tpl/default_fr/edit_users.html
View File

@ -19,7 +19,7 @@
<td>{$value->getDisplayName()}</td> <td>{$value->getDisplayName()}</td>
<td>{$value->getAdmin() ? "Yes" : "No"}</td> <td>{$value->getAdmin() ? "Yes" : "No"}</td>
<td><a href="index.php?do=edit_users&user_id={$value->getId()}">Modifier</a></td> <td><a href="index.php?do=edit_users&user_id={$value->getId()}">Modifier</a></td>
<td>{if condition="$value->getId() != $current_user->getId()"}<a href="index.php?do=delete_user&user_id={$value->getId()}">Supprimer</a>{/if}</td> <td>{if condition="$value->getId() != $current_user->getId()"}<a href="index.php?do=delete_user&amp;user_id={$value->getId()}&amp;token={$token}">Supprimer</a>{/if}</td>
</tr> </tr>
{/loop} {/loop}
</table> </table>
@ -64,6 +64,6 @@
</form> </form>
<h2>Votre jeton de connexion à l'API</h2> <h2>Votre jeton de connexion à l'API</h2>
<p>Votre jeton personnel de connexion à l'API est : {$json_token}.<br/>Si vous pensez qu'il a pu être compromis, vous pouvez <a href="index.php?do=new_token">en générer un nouveau</a>.</p> <p>Votre jeton personnel de connexion à l'API est : {$json_token}.<br/>Si vous pensez qu'il a pu être compromis, vous pouvez <a href="index.php?do=new_token&amp;token={$token}">en générer un nouveau</a>.</p>
{/if} {/if}
{include="footer"} {include="footer"}

10
tpl/default_fr/index.html
View File

@ -23,7 +23,7 @@
{elseif condition="$balances[$value1->getId()][$value2->getId()] === '-' || ($value2->getId() != $current_user->getId() && !$current_user->getAdmin())"} {elseif condition="$balances[$value1->getId()][$value2->getId()] === '-' || ($value2->getId() != $current_user->getId() && !$current_user->getAdmin())"}
<td>{$balances[$value1->getId()][$value2->getId()]}</td> <td>{$balances[$value1->getId()][$value2->getId()]}</td>
{else} {else}
<td><a href="?do=payall&amp;from={$value1->getId()}&amp;to={$value2->getId()}">{$balances[$value1->getId()][$value2->getId()]}</a></td> <td><a href="?do=payall&amp;from={$value1->getId()}&amp;to={$value2->getId()}&amp;token={$token}">{$balances[$value1->getId()][$value2->getId()]}</a></td>
{/if} {/if}
{/loop} {/loop}
</tr> </tr>
@ -66,7 +66,7 @@
- -
{if condition="$paybacks[$value1->getId()] === false || !in_array($key2, array_keys($paybacks[$value1->getId()]))"} {if condition="$paybacks[$value1->getId()] === false || !in_array($key2, array_keys($paybacks[$value1->getId()]))"}
{if condition="$current_user->getId() == $value1->getBuyer() || $current_user->getAdmin()"} {if condition="$current_user->getId() == $value1->getBuyer() || $current_user->getAdmin()"}
<a href="?do=confirm_payback&amp;from={$key2}&amp;to={$value1->getBuyer()}&amp;invoice_id={$value1->getId()}" title="Confirmer le remboursement"> <a href="?do=confirm_payback&amp;from={$key2}&amp;to={$value1->getBuyer()}&amp;invoice_id={$value1->getId()}&amp;token={$token}" title="Confirmer le remboursement">
{/if} {/if}
Reste {$value1->getAmountPerPerson($key2)} {$currency} Reste {$value1->getAmountPerPerson($key2)} {$currency}
{if condition="$current_user->getId() == $value1->getBuyer() || $current_user->getAdmin()"} {if condition="$current_user->getId() == $value1->getBuyer() || $current_user->getAdmin()"}
@ -75,7 +75,7 @@
{else} {else}
{if condition="$paybacks[$value1->getId()][$key2]->getAmount() == $value1->getAmountPerPerson($key2)"} {if condition="$paybacks[$value1->getId()][$key2]->getAmount() == $value1->getAmountPerPerson($key2)"}
{if condition="$current_user->getId() == $value1->getBuyer() || $current_user->getAdmin()"} {if condition="$current_user->getId() == $value1->getBuyer() || $current_user->getAdmin()"}
<a href="?do=delete_payback&amp;from={$key2}&amp;to={$value1->getBuyer()}&amp;invoice_id={$value1->getId()}" title="Supprimer le remboursement"> <a href="?do=delete_payback&amp;from={$key2}&amp;to={$value1->getBuyer()}&amp;invoice_id={$value1->getId()}&amp;token={$token}" title="Supprimer le remboursement">
{/if} {/if}
Payé Payé
{if condition="$current_user->getId() == $value1->getBuyer() || $current_user->getAdmin()"} {if condition="$current_user->getId() == $value1->getBuyer() || $current_user->getAdmin()"}
@ -83,7 +83,7 @@
{/if} {/if}
{else} {else}
{if condition="$current_user->getId() == $value1->getBuyer() || $current_user->getAdmin()"} {if condition="$current_user->getId() == $value1->getBuyer() || $current_user->getAdmin()"}
<a href="?do=confirm_payback&amp;from={$key2}&amp;to={$value1->getBuyer()}&amp;invoice_id={$value1->getId()}&amp;payback_id={$paybacks[$value1->getId()][$key2]->getId()}" title="Confirmer le remboursement"> <a href="?do=confirm_payback&amp;from={$key2}&amp;to={$value1->getBuyer()}&amp;invoice_id={$value1->getId()}&amp;payback_id={$paybacks[$value1->getId()][$key2]->getId()}&amp;token={$token}" title="Confirmer le remboursement">
{/if} {/if}
Reste {$value1->getAmountPerPerson($key2) - $paybacks[$value1->getId()][$key2]->getAmount()}{$currency} Reste {$value1->getAmountPerPerson($key2) - $paybacks[$value1->getId()][$key2]->getAmount()}{$currency}
{if condition="$current_user->getId() == $value1->getBuyer() || $current_user->getAdmin()"} {if condition="$current_user->getId() == $value1->getBuyer() || $current_user->getAdmin()"}
@ -106,7 +106,7 @@
</td> </td>
<td> <td>
{if condition="$value->getBuyer() == $current_user->getId() || $current_user->getAdmin()"} {if condition="$value->getBuyer() == $current_user->getId() || $current_user->getAdmin()"}
<a href="index.php?do=delete_invoice&id={$value->getId()}">Supprimer</a> <a href="index.php?do=delete_invoice&id={$value->getId()}&amp;token={$token}">Supprimer</a>
{else} {else}
- -
{/if} {/if}

1
tpl/default_fr/manage_paybacks.html
View File

@ -37,6 +37,7 @@
</fieldset> </fieldset>
<p> <p>
<input type="submit" onclick="return confirm('Vous êtes sur le point d\'ajouter un remboursement global incluant les utilisateurs sélectionnés.');" value="Valider"/> <input type="submit" onclick="return confirm('Vous êtes sur le point d\'ajouter un remboursement global incluant les utilisateurs sélectionnés.');" value="Valider"/>
<input type="hidden" name="token" value="{$token}"/>
</p> </p>
</form> </form>
{/if} {/if}

4
tpl/default_fr/see_paybacks.html
View File

@ -8,7 +8,7 @@
<dt>{$value->getDate()}</dt> <dt>{$value->getDate()}</dt>
<dd> <dd>
{if condition="$value->getClosed() !== false"} {if condition="$value->getClosed() !== false"}
<a href="?do=see_paybacks&id={$value->getId()}" onclick="return confirm('Etes-vous sur de vouloir confirmer ce remboursement ? Cette action ne peut etre annulée facilement.');">Remboursement n°{$value->getId()}</a> <a href="?do=see_paybacks&id={$value->getId()}">Remboursement n°{$value->getId()}</a>
{else} {else}
[Terminé] Remboursement n°{$value->getId()} [Terminé] Remboursement n°{$value->getId()}
{/if} {/if}
@ -40,7 +40,7 @@
{else} {else}
<td> <td>
{if condition="$table[$key1][$key2] != 0"} {if condition="$table[$key1][$key2] != 0"}
<a href="?do=confirm_global_paybacks&amp;from={$key1}&amp;to={$key2}&amp;payback_id={$global_paybacks->getId()}" title="Confirmer le remboursement">{$table[$key1][$key2]}</a> <a href="?do=confirm_global_paybacks&amp;from={$key1}&amp;to={$key2}&amp;payback_id={$global_paybacks->getId()}&amp;token={$token}" title="Confirmer le remboursement" onclick="return confirm('Êtes-vous sûr de vouloir confirmer ce remboursement ? Cette action est irréversible.');">{$table[$key1][$key2]}</a>
{else} {else}
- -
{/if} {/if}