lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dolibarr_partnership' of https://github.com/NextGestion/dolibarr into dolibarr_partnership

Browse Source
This commit is contained in:
NextGestion 2021-04-17 13:38:58 +01:00
commit 345fef99b6
2 changed files with 251 additions and 285 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/partnership/admin/setup.php
View File

@ -93,8 +93,8 @@ if ($action == 'setting') {
$error += $partnership->delete_menus(); $error += $partnership->delete_menus();
$error += $partnership->insert_menus(); $error += $partnership->insert_menus();
if(GETPOST("PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL",'int')) if (GETPOST("PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL", 'int'))
dolibarr_set_const($db, "PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL", GETPOST("PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL",'int'), 'chaine', 0, '', $conf->entity); dolibarr_set_const($db, "PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL", GETPOST("PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL", 'int'), 'chaine', 0, '', $conf->entity);
dolibarr_set_const($db, "PARTNERSHIP_BACKLINKS_TO_CHECK", GETPOST("PARTNERSHIP_BACKLINKS_TO_CHECK"), 'chaine', 0, '', $conf->entity); dolibarr_set_const($db, "PARTNERSHIP_BACKLINKS_TO_CHECK", GETPOST("PARTNERSHIP_BACKLINKS_TO_CHECK"), 'chaine', 0, '', $conf->entity);
} }
@ -160,7 +160,7 @@ print '<td><span class="opacitymedium">'.$langs->trans("partnershipforthirdparty
print '</tr>'; print '</tr>';
if($conf->global->PARTNERSHIP_IS_MANAGED_FOR == 'member'){ if ($conf->global->PARTNERSHIP_IS_MANAGED_FOR == 'member') {
print '<tr class="oddeven"><td>'.$langs->trans("PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL").'</td>'; print '<tr class="oddeven"><td>'.$langs->trans("PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL").'</td>';
print '<td>'; print '<td>';
$dnbdays = '7'; $dnbdays = '7';

108
htdocs/partnership/class/partnershiputils.class.php
View File

@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
dol_include_once('partnership/lib/partnership.lib.php'); dol_include_once('partnership/lib/partnership.lib.php');
dol_include_once('/partnership/class/partnership.class.php'); dol_include_once('/partnership/class/partnership.class.php');
require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); require_once DOL_DOCUMENT_ROOT."/societe/class/societe.class.php";
require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'; require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
/** /**
* Class with cron tasks of Partnership module * Class with cron tasks of Partnership module
@ -67,7 +67,7 @@ class PartnershipUtils
$managedfor = $conf->global->PARTNERSHIP_IS_MANAGED_FOR; $managedfor = $conf->global->PARTNERSHIP_IS_MANAGED_FOR;
if($managedfor != 'member'){ if ($managedfor != 'member') {
return 0; // If option 'PARTNERSHIP_IS_MANAGED_FOR' = 'thirdparty', this cron job does nothing. return 0; // If option 'PARTNERSHIP_IS_MANAGED_FOR' = 'thirdparty', this cron job does nothing.
} }
@ -83,8 +83,7 @@ class PartnershipUtils
$partnershipsprocessed = array(); $partnershipsprocessed = array();
$gracedelay=$conf->global->PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL; $gracedelay=$conf->global->PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL;
if ($gracedelay < 1) if ($gracedelay < 1) {
{
$this->error='BadValueForDelayBeforeCancelCheckSetup'; $this->error='BadValueForDelayBeforeCancelCheckSetup';
return -1; return -1;
} }
@ -104,27 +103,23 @@ class PartnershipUtils
$sql .= " WHERE fk_member > 0"; $sql .= " WHERE fk_member > 0";
$sql .= " AND (d.datefin < '".$this->db->idate($datetotest)."' AND dty.subscription = 1)"; $sql .= " AND (d.datefin < '".$this->db->idate($datetotest)."' AND dty.subscription = 1)";
$sql .= " AND p.status = ".$partnership::STATUS_ACCEPTED; // Only accepted not yet canceled $sql .= " AND p.status = ".$partnership::STATUS_ACCEPTED; // Only accepted not yet canceled
$sql .= $this->db->order('d.rowid','ASC'); $sql .= $this->db->order('d.rowid', 'ASC');
// Limit is managed into loop later // Limit is managed into loop later
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if ($resql) if ($resql) {
{
$numofexpiredmembers = $this->db->num_rows($resql); $numofexpiredmembers = $this->db->num_rows($resql);
$somethingdoneonpartnership = 0; $somethingdoneonpartnership = 0;
$ifetchpartner = 0; $ifetchpartner = 0;
while ($ifetchpartner < $numofexpiredmembers) while ($ifetchpartner < $numofexpiredmembers) {
{
$ifetchpartner++; $ifetchpartner++;
$obj = $this->db->fetch_object($resql); $obj = $this->db->fetch_object($resql);
if ($obj) if ($obj) {
{
if (! empty($partnershipsprocessed[$obj->rowid])) continue; if (! empty($partnershipsprocessed[$obj->rowid])) continue;
if ($somethingdoneonpartnership >= $MAXPERCALL) if ($somethingdoneonpartnership >= $MAXPERCALL) {
{
dol_syslog("We reach the limit of ".$MAXPERCALL." partnership processed, so we quit loop for this batch doCancelStatusOfMemberPartnership to avoid to reach email quota.", LOG_WARNING); dol_syslog("We reach the limit of ".$MAXPERCALL." partnership processed, so we quit loop for this batch doCancelStatusOfMemberPartnership to avoid to reach email quota.", LOG_WARNING);
break; break;
} }
@ -135,23 +130,19 @@ class PartnershipUtils
// Get expiration date // Get expiration date
$expirationdate = $obj->datefin; $expirationdate = $obj->datefin;
if ($expirationdate && $expirationdate < $now) // If contract expired (we already had a test into main select, this is a security) if ($expirationdate && $expirationdate < $now) { // If contract expired (we already had a test into main select, this is a security)
{
$somethingdoneonpartnership++; $somethingdoneonpartnership++;
$result = $object->cancel($user, 0); $result = $object->cancel($user, 0);
// $conf->global->noapachereload = null; // $conf->global->noapachereload = null;
if ($result < 0) if ($result < 0) {
{
$error++; $error++;
$this->error = $object->error; $this->error = $object->error;
if (is_array($object->errors) && count($object->errors)) { if (is_array($object->errors) && count($object->errors)) {
if (is_array($this->errors)) $this->errors = array_merge($this->errors, $object->errors); if (is_array($this->errors)) $this->errors = array_merge($this->errors, $object->errors);
else $this->errors = $object->errors; else $this->errors = $object->errors;
} }
} } else {
else
{
$partnershipsprocessed[$object->id]=$object->ref; $partnershipsprocessed[$object->id]=$object->ref;
// Send an email to inform member // Send an email to inform member
@ -167,7 +158,7 @@ class PartnershipUtils
// Define output language // Define output language
$outputlangs = $langs; $outputlangs = $langs;
$newlang = ''; $newlang = '';
if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09'); if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
if (! empty($newlang)) { if (! empty($newlang)) {
$outputlangs = new Translate("", $conf); $outputlangs = new Translate("", $conf);
$outputlangs->setDefaultLang($newlang); $outputlangs->setDefaultLang($newlang);
@ -189,32 +180,25 @@ class PartnershipUtils
$cmail = new CMailFile($subject, $to, $from, $msg, array(), array(), array(), '', '', 0, 1); $cmail = new CMailFile($subject, $to, $from, $msg, array(), array(), array(), '', '', 0, 1);
$result = $cmail->sendfile(); $result = $cmail->sendfile();
if (! $result || $cmail->error) if (! $result || $cmail->error) {
{
$erroremail .= ($erroremail ? ', ' : '').$cmail->error; $erroremail .= ($erroremail ? ', ' : '').$cmail->error;
$this->errors[] = $cmail->error; $this->errors[] = $cmail->error;
if (is_array($cmail->errors) && count($cmail->errors) > 0) $this->errors += $cmail->errors; if (is_array($cmail->errors) && count($cmail->errors) > 0) $this->errors += $cmail->errors;
} }
} }
} }
} }
} }
} } else {
else
{
$error++; $error++;
$this->error = $this->db->lasterror(); $this->error = $this->db->lasterror();
} }
if (! $error) if (! $error) {
{
$this->db->commit(); $this->db->commit();
$this->output = $numofexpiredmembers.' expired partnership members found'."\n"; $this->output = $numofexpiredmembers.' expired partnership members found'."\n";
if ($erroremail) $this->output.='. Got errors when sending some email : '.$erroremail; if ($erroremail) $this->output.='. Got errors when sending some email : '.$erroremail;
} } else {
else
{
$this->db->rollback(); $this->db->rollback();
$this->output = "Rollback after error\n"; $this->output = "Rollback after error\n";
$this->output.= $numofexpiredmembers.' expired partnership members found'."\n"; $this->output.= $numofexpiredmembers.' expired partnership members found'."\n";
@ -250,8 +234,7 @@ class PartnershipUtils
$partnershipsprocessed = array(); $partnershipsprocessed = array();
$gracedelay=$conf->global->PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL; $gracedelay=$conf->global->PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL;
if ($gracedelay < 1) if ($gracedelay < 1) {
{
$this->error='BadValueForDelayBeforeCancelCheckSetup'; $this->error='BadValueForDelayBeforeCancelCheckSetup';
return -1; return -1;
} }
@ -282,26 +265,22 @@ class PartnershipUtils
$sql .= " AND p.".$fk_partner." > 0"; $sql .= " AND p.".$fk_partner." > 0";
$sql .= " AND p.status = ".$partnership::STATUS_ACCEPTED; // Only accepted not yet canceled $sql .= " AND p.status = ".$partnership::STATUS_ACCEPTED; // Only accepted not yet canceled
$sql .= " AND (p.last_check_backlink IS NULL OR p.last_check_backlink <= '".$this->db->idate($now - 7 * 24 * 3600)."')"; // Every week, check that website contains a link to dolibarr. $sql .= " AND (p.last_check_backlink IS NULL OR p.last_check_backlink <= '".$this->db->idate($now - 7 * 24 * 3600)."')"; // Every week, check that website contains a link to dolibarr.
$sql .= $this->db->order('p.rowid','ASC'); $sql .= $this->db->order('p.rowid', 'ASC');
// Limit is managed into loop later // Limit is managed into loop later
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if ($resql) if ($resql) {
{
$numofexpiredmembers = $this->db->num_rows($resql); $numofexpiredmembers = $this->db->num_rows($resql);
$somethingdoneonpartnership = 0; $somethingdoneonpartnership = 0;
$ifetchpartner = 0; $ifetchpartner = 0;
while ($ifetchpartner < $numofexpiredmembers) while ($ifetchpartner < $numofexpiredmembers) {
{
$ifetchpartner++; $ifetchpartner++;
$obj = $this->db->fetch_object($resql); $obj = $this->db->fetch_object($resql);
if ($obj) if ($obj) {
{
if (! empty($partnershipsprocessed[$obj->rowid])) continue; if (! empty($partnershipsprocessed[$obj->rowid])) continue;
if ($somethingdoneonpartnership >= $MAXPERCALL) if ($somethingdoneonpartnership >= $MAXPERCALL) {
{
dol_syslog("We reach the limit of ".$MAXPERCALL." partnership processed, so we quit loop for this batch doWarningOfPartnershipIfDolibarrBacklinkNotfound to avoid to reach email quota.", LOG_WARNING); dol_syslog("We reach the limit of ".$MAXPERCALL." partnership processed, so we quit loop for this batch doWarningOfPartnershipIfDolibarrBacklinkNotfound to avoid to reach email quota.", LOG_WARNING);
break; break;
} }
@ -311,30 +290,27 @@ class PartnershipUtils
$object = new Partnership($this->db); $object = new Partnership($this->db);
$object->fetch($obj->rowid); $object->fetch($obj->rowid);
if($managedfor == 'member'){ if ($managedfor == 'member') {
$fk_partner = $object->fk_member; $fk_partner = $object->fk_member;
}else{ } else {
$fk_partner = $object->fk_soc; $fk_partner = $object->fk_soc;
} }
$website = $obj->url; $website = $obj->url;
if(empty($website)){ if (empty($website)) {
$websitenotfound .= ($websitenotfound ? ', ' : '').'Website not found for id="'.$fk_partner.'"'."\n"; $websitenotfound .= ($websitenotfound ? ', ' : '').'Website not found for id="'.$fk_partner.'"'."\n";
} else { } else {
$backlinkfound = $this->checkDolibarrBacklink($website); $backlinkfound = $this->checkDolibarrBacklink($website);
} }
if(!$backlinkfound){ if (!$backlinkfound) {
$tmpcount = $object->count_last_url_check_error + 1; $tmpcount = $object->count_last_url_check_error + 1;
if($tmpcount == 3){ // Send Warning Email if ($tmpcount == 3) { // Send Warning Email
if (!empty($obj->email)) {
if (!empty($obj->email)){
$emailnotfound .= ($emailnotfound ? ', ' : '').'Email not found for id="'.$fk_partner.'"'."\n"; $emailnotfound .= ($emailnotfound ? ', ' : '').'Email not found for id="'.$fk_partner.'"'."\n";
} else { } else {
$labeltemplate = '(SendingEmailOnPartnershipWillExpire)'; $labeltemplate = '(SendingEmailOnPartnershipWillExpire)';
dol_syslog("Now we will send an email to partner id=".$fk_partner." with label ".$labeltemplate); dol_syslog("Now we will send an email to partner id=".$fk_partner." with label ".$labeltemplate);
@ -347,7 +323,7 @@ class PartnershipUtils
// Define output language // Define output language
$outputlangs = $langs; $outputlangs = $langs;
$newlang = ''; $newlang = '';
if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09'); if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
if (! empty($newlang)) { if (! empty($newlang)) {
$outputlangs = new Translate("", $conf); $outputlangs = new Translate("", $conf);
$outputlangs->setDefaultLang($newlang); $outputlangs->setDefaultLang($newlang);
@ -367,22 +343,18 @@ class PartnershipUtils
$cmail = new CMailFile($subject, $to, $from, $msg, array(), array(), array(), '', '', 0, 1); $cmail = new CMailFile($subject, $to, $from, $msg, array(), array(), array(), '', '', 0, 1);
$result = $cmail->sendfile(); $result = $cmail->sendfile();
if (! $result || $cmail->error) if (! $result || $cmail->error) {
{
$erroremail .= ($erroremail ? ', ' : '').$cmail->error; $erroremail .= ($erroremail ? ', ' : '').$cmail->error;
$this->errors[] = $cmail->error; $this->errors[] = $cmail->error;
if (is_array($cmail->errors) && count($cmail->errors) > 0) $this->errors += $cmail->errors; if (is_array($cmail->errors) && count($cmail->errors) > 0) $this->errors += $cmail->errors;
} }
} }
} elseif ($tmpcount > 4) { // Cancel Partnership
} elseif($tmpcount > 4) { // Cancel Partnership
$object->status = $object::STATUS_CANCELED; $object->status = $object::STATUS_CANCELED;
$object->reason_decline_or_cancel = $langs->trans('BacklinkNotFoundOnPartnerWebsite'); $object->reason_decline_or_cancel = $langs->trans('BacklinkNotFoundOnPartnerWebsite');
} }
$object->count_last_url_check_error = $tmpcount; $object->count_last_url_check_error = $tmpcount;
} else { } else {
$object->count_last_url_check_error = 0; $object->count_last_url_check_error = 0;
$object->reason_decline_or_cancel = ''; $object->reason_decline_or_cancel = '';
@ -395,23 +367,18 @@ class PartnershipUtils
$object->update($user); $object->update($user);
} }
} }
} } else {
else
{
$error++; $error++;
$this->error = $this->db->lasterror(); $this->error = $this->db->lasterror();
} }
if (! $error) if (! $error) {
{
$this->db->commit(); $this->db->commit();
$this->output = $numofexpiredmembers.' partnership checked'."\n"; $this->output = $numofexpiredmembers.' partnership checked'."\n";
if ($erroremail) $this->output.='. Got errors when sending some email : '.$erroremail."\n"; if ($erroremail) $this->output.='. Got errors when sending some email : '.$erroremail."\n";
if ($emailnotfound) $this->output.='. Email not found for some partner : '.$emailnotfound."\n"; if ($emailnotfound) $this->output.='. Email not found for some partner : '.$emailnotfound."\n";
if ($websitenotfound) $this->output.='. Website not found for some partner : '.$websitenotfound."\n"; if ($websitenotfound) $this->output.='. Website not found for some partner : '.$websitenotfound."\n";
} } else {
else
{
$this->db->rollback(); $this->db->rollback();
$this->output = "Rollback after error\n"; $this->output = "Rollback after error\n";
$this->output.= $numofexpiredmembers.' partnership checked'."\n"; $this->output.= $numofexpiredmembers.' partnership checked'."\n";
@ -454,18 +421,17 @@ class PartnershipUtils
$xpath = new DOMXPath($dom); $xpath = new DOMXPath($dom);
$hrefs = $xpath->evaluate("//a"); $hrefs = $xpath->evaluate("//a");
for($i = 0; $i < $hrefs->length; $i++){ for ($i = 0; $i < $hrefs->length; $i++) {
$href = $hrefs->item($i); $href = $hrefs->item($i);
$url = $href->getAttribute('href'); $url = $href->getAttribute('href');
$url = filter_var($url, FILTER_SANITIZE_URL); $url = filter_var($url, FILTER_SANITIZE_URL);
if(!filter_var($url, FILTER_VALIDATE_URL) === false){ if (!filter_var($url, FILTER_VALIDATE_URL) === false) {
$webcontent .= $url; $webcontent .= $url;
} }
} }
} }
if ($webcontent && !empty($conf->global->PARTNERSHIP_BACKLINKS_TO_CHECK) && preg_match('/'.$conf->global->PARTNERSHIP_BACKLINKS_TO_CHECK.'/', $webcontent)) if ($webcontent && !empty($conf->global->PARTNERSHIP_BACKLINKS_TO_CHECK) && preg_match('/'.$conf->global->PARTNERSHIP_BACKLINKS_TO_CHECK.'/', $webcontent)) {
{
$found = 1; $found = 1;
} }