Skip to content
GitLab
Verified Commit 5886a623 authored by dockx thibault's avatar dockx thibault
Browse files

:sparkles: Feat(Reminder) - logic of front end - refactoring 

refactoring of reminder front end (9)
parent e9c01830
dev 6310-tasks-reminder-error-in-the-schema-duplicate-attribute-id 6311-put-the-version-1-5-in-all-yaml-for-fusiondirectory-1-5 6322-template-issue-when-creating-a-template-with-empty-password-error-message-should-not-be-seen-2 6332-zimbra-allows-update-of-data-for-unknown-domain-name-for-specific-individual-aliases 6337-webservice-issue-with-archiving-post-request-not-responding-but-successfully-archiving-user 6341-supann-extract-resources-states-sub-states-from-backend-configuration-to-their-own-objects master fusiondirectory-1.5
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 185 additions and 135 deletions
+185 -135
user-reminder/html/class_expiredUserPostpone.inc
+ 1
− 1
View file @ 5886a623
......@@ -36,7 +36,7 @@ class expiredUserPostpone extends standAlonePage
protected $message;
protected $uid;
protected function readLdapConfig (): bool
protected function readLdapConfig () : bool
{
global $config;
$this->forward_postpone = ($config->get_cfg_value('userReminderForwardConfirmation', 'TRUE') == 'TRUE');
......
user-reminder/html/class_reminderFrontEnd.inc
+ 175
− 133
View file @ 5886a623
......@@ -19,6 +19,10 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
/**
*
*/
require_once('../include/php_setup.inc');
require_once('functions.inc');
require_once('variables.inc');
......@@ -33,36 +37,14 @@ class reminderFrontEnd extends standAlonePage
* @return bool
* Note : method from extension.
* It will help to get the information from the main task.
* It is also run before class execute.
* It is also run before class execute during first arrival on the page. IF the a post is issued, it will directly go to
* execute.
*/
protected function readLdapConfig (): bool
{
global $config;
$result = FALSE;
echo "coucou";
$ldap = $config->get_ldap_link();
$this->sanitizeInputs();
if (!empty($this->task['name'])) {
$dn = 'cn=' . $this->task['name'] . ',ou=tasks,' . $config->current['BASE'];
// Retrieve tasks information
$ldap->cat($dn);
if ($attrs = $ldap->fetch()) {
// Fills the required value here.
$this->task['posix'] = $attrs['fdTasksReminderPosix'][0]; // bool as string
$this->task['ppolicy'] = $attrs['fdTasksReminderPPolicy'][0]; // bool as string
$this->task['resource'] = $attrs['fdTasksReminderNextResource'][0]; //string
$this->task['days'] = $attrs['fdTasksReminderSupannNewEndDate'][0]; // int
$this->task['state'] = $attrs['fdTasksReminderNextState'][0]; // string
$this->task['subState'] = $attrs['fdTasksReminderNextSubState'][0]; // string
$result = TRUE;
}
}
return $result;
return $this->sanitizeInputs();
}
......@@ -77,16 +59,20 @@ class reminderFrontEnd extends standAlonePage
{
global $error_collector;
if (!empty($_POST)) {
$this->sanitizeInputs();
$this->getTaskInfo();
}
// This is a protection in case the reading of ldap failed (from readLdapConfig). (Previous logic from userReminder).
if (!$this->activated) {
return;
}
// token is set during sanitization
// Verify if uid is set (thanks to post) and verify token validity.
if (!empty($this->uid)) {
$success = TRUE;
} else {
$this->message[] = _('This token is invalid or missing!');
// verification of token
echo "login retrieved";
}
if (!empty($this->message)) {
......@@ -120,7 +106,6 @@ class reminderFrontEnd extends standAlonePage
$smarty->display(get_template_path('headers.tpl'));
$smarty->assign('version', FD_VERSION);
$smarty->assign('success', $success);
$smarty->assign('activated', $this->activated);
$smarty->assign('taskName', $this->task['name']);
$smarty->assign('token', $this->token);
......@@ -172,119 +157,176 @@ class reminderFrontEnd extends standAlonePage
$this->message[] = $ldap->get_error();
}
}
}
function postponeExpiration ()
{
global $config;
$dn = $this->getUserDn();
if (empty($dn)) {
return;
}
$userTabs = objects::open($dn, 'user');
if (
isset($userTabs->by_object['posixAccount']) &&
$userTabs->by_object['posixAccount']->is_account &&
($userTabs->by_object['posixAccount']->attributesAccess['shadowExpire']->getValue() != '')
) {
$date = $userTabs->by_object['posixAccount']->attributesAccess['shadowExpire']->getDateValue();
$date->add(new DateInterval('P' . $this->postpone_days . 'D'));
$userTabs->by_object['posixAccount']->shadowExpire = $date;
}
if (
isset($userTabs->by_object['supannAccountStatus']) &&
$userTabs->by_object['supannAccountStatus']->is_account
) {
$supannRessourceEtatDateValues = [];
foreach ($userTabs->by_object['supannAccountStatus']->supannRessourceEtatDate as $line) {
list ($label, $state, $substate, $start, $end) = $userTabs->by_object['supannAccountStatus']->attributesAccess['supannRessourceEtatDate']->attribute->readValues($line);
if (($label == 'COMPTE') && ($state == 'A') && ($end != '')) {
/* Postpone enddate */
$date = new DateTime($end);
$date->add(new DateInterval('P' . $this->postpone_days . 'D'));
if ($substate != 'SupannSursis') {
/* Set start date to current date if substate changed */
$start = date('Ymd');
}
$supannRessourceEtatDateValues[] = '{COMPTE}A:SupannSursis:' . $start . ':' . $date->format('Ymd');
} else {
$supannRessourceEtatDateValues[] = $line;
}
}
$userTabs->by_object['supannAccountStatus']->supannRessourceEtatDate = $supannRessourceEtatDateValues;
// function postponeExpiration ()
// {
// global $config;
// $dn = $this->getUserDn();
// if (empty($dn)) {
// return;
// }
// $userTabs = objects::open($dn, 'user');
// if (
// isset($userTabs->by_object['posixAccount']) &&
// $userTabs->by_object['posixAccount']->is_account &&
// ($userTabs->by_object['posixAccount']->attributesAccess['shadowExpire']->getValue() != '')
// ) {
// $date = $userTabs->by_object['posixAccount']->attributesAccess['shadowExpire']->getDateValue();
// $date->add(new DateInterval('P' . $this->postpone_days . 'D'));
// $userTabs->by_object['posixAccount']->shadowExpire = $date;
// }
// if (
// isset($userTabs->by_object['supannAccountStatus']) &&
// $userTabs->by_object['supannAccountStatus']->is_account
// ) {
// $supannRessourceEtatDateValues = [];
// foreach ($userTabs->by_object['supannAccountStatus']->supannRessourceEtatDate as $line) {
// list ($label, $state, $substate, $start, $end) = $userTabs->by_object['supannAccountStatus']->attributesAccess['supannRessourceEtatDate']->attribute->readValues($line);
// if (($label == 'COMPTE') && ($state == 'A') && ($end != '')) {
// /* Postpone enddate */
// $date = new DateTime($end);
// $date->add(new DateInterval('P' . $this->postpone_days . 'D'));
// if ($substate != 'SupannSursis') {
// /* Set start date to current date if substate changed */
// $start = date('Ymd');
// }
// $supannRessourceEtatDateValues[] = '{COMPTE}A:SupannSursis:' . $start . ':' . $date->format('Ymd');
// } else {
// $supannRessourceEtatDateValues[] = $line;
// }
// }
// $userTabs->by_object['supannAccountStatus']->supannRessourceEtatDate = $supannRessourceEtatDateValues;
// }
// $error = $userTabs->save();
// if (!empty($error)) {
// $this->message = $error;
// return;
// }
// $this->deleteToken();
//
// $cn = $userTabs->getBaseObject()->cn;
// $manager_dn = $userTabs->getBaseObject()->manager;
// $email_address = '';
// if (isset($userTabs->by_object['mailAccount'])) {
// $email_address = $userTabs->by_object['mailAccount']->mail;
// } elseif ($this->use_alternate && isset($userTabs->by_object['mailAccount']) && !empty($userTabs->by_object['mailAccount']->gosaMailAlternateAddress)) {
// $email_address = reset($userTabs->by_object['mailAccount']->gosaMailAlternateAddress);
// } elseif (isset($userTabs->by_object['supannAccount']) && !empty($userTabs->by_object['supannAccount']->supannAutreMail)) {
// $email_address = reset($userTabs->by_object['supannAccount']->supannAutreMail);
// } elseif (isset($userTabs->by_object['personalInfo']) && !empty($userTabs->by_object['personalInfo']->fdPrivateMail)) {
// $email_address = $userTabs->by_object['personalInfo']->fdPrivateMail;
// }
//
// $manager_mail = '';
// if ($this->forward_postpone) {
// $ldap = $config->get_ldap_link();
// if (empty($manager_dn)) {
// $ldap->cat($userTabs->getBaseObject()->base, ['manager']);
// if (($attrs = $ldap->fetch()) && isset($attrs['manager'][0])) {
// $manager_dn = $attrs['manager'][0];
// }
// }
// if (!empty($manager_dn)) {
// $ldap->cat($manager_dn, ['cn', 'mail', 'gosaMailAlternateAddress', 'supannAutreMail', 'fdPrivateMail']);
// if ($attrs = $ldap->fetch()) {
// if (!empty($attrs['mail'][0])) {
// $manager_mail = $attrs['mail'][0];
// } elseif ($this->use_alternate && !empty($attrs['gosaMailAlternateAddress'][0])) {
// $manager_mail = $attrs['gosaMailAlternateAddress'][0];
// } elseif (!empty($attrs['supannAutreMail'][0])) {
// $manager_mail = $attrs['supannAutreMail'][0];
// } elseif (!empty($attrs['fdPrivateMail'][0])) {
// $manager_mail = $attrs['fdPrivateMail'][0];
// }
// }
// }
// }
// }
/**
* @return void
* Note : Simply set global variables after sanitization.
*/
private function sanitizeInputs (): bool
{
$result = FALSE;
if ($_SERVER['REQUEST_METHOD'] == 'GET' && isset($_GET['token']) && isset($_GET['task'])) {
// Sanitize and validate input fields
$token = filter_input(INPUT_GET, 'token', FILTER_SANITIZE_STRING);
$task = filter_input(INPUT_GET, 'task', FILTER_SANITIZE_STRING);
// Function to validate if inputs are strictly alphanumeric
function is_alphanumeric ($value)
{
return preg_match('/^[a-zA-Z0-9]+$/', $value);
}
$error = $userTabs->save();
if (!empty($error)) {
$this->message = $error;
return;
// Validate 'token'
if (!is_alphanumeric($token) || !is_alphanumeric($task)) {
die("Invalid values within passed arguments...");
}
$this->deleteToken();
$cn = $userTabs->getBaseObject()->cn;
$manager_dn = $userTabs->getBaseObject()->manager;
$email_address = '';
if (isset($userTabs->by_object['mailAccount'])) {
$email_address = $userTabs->by_object['mailAccount']->mail;
} elseif ($this->use_alternate && isset($userTabs->by_object['mailAccount']) && !empty($userTabs->by_object['mailAccount']->gosaMailAlternateAddress)) {
$email_address = reset($userTabs->by_object['mailAccount']->gosaMailAlternateAddress);
} elseif (isset($userTabs->by_object['supannAccount']) && !empty($userTabs->by_object['supannAccount']->supannAutreMail)) {
$email_address = reset($userTabs->by_object['supannAccount']->supannAutreMail);
} elseif (isset($userTabs->by_object['personalInfo']) && !empty($userTabs->by_object['personalInfo']->fdPrivateMail)) {
$email_address = $userTabs->by_object['personalInfo']->fdPrivateMail;
// Assign the sanitized values
$this->token = $token;
// Simply set the $task representing the name of main task to an array (Simplify further process down the line).
$this->task['name'] = $task;
$result = TRUE;
}
// Case of the post submission
if ($_SERVER['REQUEST_METHOD'] == 'POST' && isset($_POST['login'])) {
//
$uid = filter_input(INPUT_POST, 'login', FILTER_SANITIZE_STRING);
// Function to validate if inputs are strictly alphanumeric
function is_alphanumeric ($value)
{
return preg_match('/^[a-zA-Z0-9]+$/', $value);
}
$manager_mail = '';
if ($this->forward_postpone) {
$ldap = $config->get_ldap_link();
if (empty($manager_dn)) {
$ldap->cat($userTabs->getBaseObject()->base, ['manager']);
if (($attrs = $ldap->fetch()) && isset($attrs['manager'][0])) {
$manager_dn = $attrs['manager'][0];
}
}
if (!empty($manager_dn)) {
$ldap->cat($manager_dn, ['cn', 'mail', 'gosaMailAlternateAddress', 'supannAutreMail', 'fdPrivateMail']);
if ($attrs = $ldap->fetch()) {
if (!empty($attrs['mail'][0])) {
$manager_mail = $attrs['mail'][0];
} elseif ($this->use_alternate && !empty($attrs['gosaMailAlternateAddress'][0])) {
$manager_mail = $attrs['gosaMailAlternateAddress'][0];
} elseif (!empty($attrs['supannAutreMail'][0])) {
$manager_mail = $attrs['supannAutreMail'][0];
} elseif (!empty($attrs['fdPrivateMail'][0])) {
$manager_mail = $attrs['fdPrivateMail'][0];
}
}
}
// Validate 'token'
if (!is_alphanumeric($uid)) {
die("Invalid values within passed arguments...");
}
$this->uid = $uid;
$result = TRUE;
}
/**
* @return void
* Note : Simply set global variables after sanitization.
*/
private
function sanitizeInputs ()
{
if ($_SERVER['REQUEST_METHOD'] == 'GET' && isset($_GET['token']) && isset($_GET['task'])) {
// Sanitize and validate input fields
$token = filter_input(INPUT_GET, 'token', FILTER_SANITIZE_STRING);
$task = filter_input(INPUT_GET, 'task', FILTER_SANITIZE_STRING);
// Function to validate if inputs are strictly alphanumeric
function is_alphanumeric ($value)
{
return preg_match('/^[a-zA-Z0-9]+$/', $value);
}
return $result;
}
// Validate 'token'
if (!is_alphanumeric($token) && !is_alphanumeric($task['name'])) {
die("Invalid values within passed arguments...");
}
/**
* @return void
*/
private function getTaskInfo () : bool
{
global $config;
$ldap = $config->get_ldap_link();
$result = FALSE;
if (!empty($this->task['name'])) {
$dn = 'cn=' . $this->task['name'] . ',ou=tasks,' . $config->current['BASE'];
// Retrieve tasks information
$ldap->cat($dn);
if ($attrs = $ldap->fetch()) {
// Fills the required value here.
$this->task['posix'] = $attrs['fdTasksReminderPosix'][0]; // bool as string
$this->task['ppolicy'] = $attrs['fdTasksReminderPPolicy'][0]; // bool as string
$this->task['resource'] = $attrs['fdTasksReminderNextResource'][0]; //string
$this->task['days'] = $attrs['fdTasksReminderSupannNewEndDate'][0]; // int
$this->task['state'] = $attrs['fdTasksReminderNextState'][0]; // string
$this->task['subState'] = $attrs['fdTasksReminderNextSubState'][0]; // string
// Assign the sanitized values
$this->token = $token;
// Simply set the $task representing the name of main task to an array (Simplify further process down the line).
$this->task['name'] = $task;
$result = TRUE;
}
}
return $result;
}
}
user-reminder/ihtml/themes/breezy/taskReminder.tpl
+ 9
− 1
View file @ 5886a623
<body>
<body onLoad="javascript:$$('div.debug_div').each(function (a) { a.hide(); });">
{$php_errors}
{$msg_dialogs}
<html lang="EN">
<div id="window-container">
<div id="window-div">
<!-- Simplified form that submits taskName, token, and user ID -->
<form action='accountProlongation.php' method='post' name='mainform'>
<input type="hidden" name="CSRFtoken" value="{$CSRFtoken}"/>
<div id="window-titlebar">
<p>
<img class="center" src="geticon.php?context=types&amp;icon=user&amp;size=48" alt="{t}User{/t}" title="{t}User{/t}"/>
......@@ -55,3 +57,9 @@
</div>
</div>
</body>
<script type="text/javascript">
<!-- // Error Popup
next_msg_dialog();
-->
</script>
</html>
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment