Skip to content

Commit

Permalink
did a sed call with s=adherents/=adherent/= and mv adherents adherent…
Browse files Browse the repository at this point in the history
… to attempt at fixing 32113
  • Loading branch information
Jon Bendtsen committed Jan 5, 2025
1 parent 1cba827 commit d1ce955
Show file tree
Hide file tree
Showing 98 changed files with 306 additions and 306 deletions.
4 changes: 2 additions & 2 deletions htdocs/accountancy/journal/bankjournal.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
require_once DOL_DOCUMENT_ROOT.'/adherent/class/adherent.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
Expand All @@ -61,7 +61,7 @@
require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php';
require_once DOL_DOCUMENT_ROOT.'/loan/class/paymentloan.class.php';
require_once DOL_DOCUMENT_ROOT.'/adherents/class/subscription.class.php';
require_once DOL_DOCUMENT_ROOT.'/adherent/class/subscription.class.php';

/**
* @var Conf $conf
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
*/

/**
* \file htdocs/adherents/admin/member.php
* \file htdocs/adherent/admin/member.php
* \ingroup member
* \brief Page to setup the module Foundation
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
*/

/**
* \file htdocs/adherents/admin/member_emails.php
* \file htdocs/adherent/admin/member_emails.php
* \ingroup member
* \brief Page to setup the module Foundation
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
*/

/**
* \file htdocs/adherents/admin/member_extrafields.php
* \file htdocs/adherent/admin/member_extrafields.php
* \ingroup member
* \brief Page to setup extra fields of members
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
*/

/**
* \file htdocs/adherents/admin/member_type_extrafields.php
* \file htdocs/adherent/admin/member_type_extrafields.php
* \ingroup member
* \brief Page to setup extra fields of members
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
*/

/**
* \file htdocs/adherents/admin/website.php
* \file htdocs/adherent/admin/website.php
* \ingroup member
* \brief File of main public page for member module
*/
Expand All @@ -31,7 +31,7 @@
require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
require_once DOL_DOCUMENT_ROOT.'/adherent/class/adherent_type.class.php';

/**
* @var Conf $conf
Expand Down
14 changes: 7 additions & 7 deletions htdocs/adherents/agenda.php → htdocs/adherent/agenda.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@
*/

/**
* \file htdocs/adherents/agenda.php
* \file htdocs/adherent/agenda.php
* \ingroup member
* \brief Page of members events
*/

// Load Dolibarr environment
require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
require_once DOL_DOCUMENT_ROOT.'/adherent/class/adherent.class.php';
require_once DOL_DOCUMENT_ROOT.'/adherent/class/adherent_type.class.php';
require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
Expand Down Expand Up @@ -155,9 +155,9 @@

print dol_get_fiche_head($head, 'agenda', $langs->trans("Member"), -1, 'user');

$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
$linkback = '<a href="'.DOL_URL_ROOT.'/adherent/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';

$morehtmlref = '<a href="'.DOL_URL_ROOT.'/adherents/vcard.php?id='.$object->id.'" class="refid">';
$morehtmlref = '<a href="'.DOL_URL_ROOT.'/adherent/vcard.php?id='.$object->id.'" class="refid">';
$morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"');
$morehtmlref .= '</a>';

Expand All @@ -181,9 +181,9 @@

$newcardbutton = '';

$messagingUrl = DOL_URL_ROOT.'/adherents/messaging.php?rowid='.$object->id;
$messagingUrl = DOL_URL_ROOT.'/adherent/messaging.php?rowid='.$object->id;
$newcardbutton .= dolGetButtonTitle($langs->trans('ShowAsConversation'), '', 'fa fa-comments imgforviewmode', $messagingUrl, '', 1);
$messagingUrl = DOL_URL_ROOT.'/adherents/agenda.php?id='.$object->id;
$messagingUrl = DOL_URL_ROOT.'/adherent/agenda.php?id='.$object->id;
$newcardbutton .= dolGetButtonTitle($langs->trans('MessageListViewType'), '', 'fa fa-bars imgforviewmode', $messagingUrl, '', 2);

if (isModEnabled('agenda')) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/

/**
* \file htdocs/adherents/canvas/actions_adherentcard_common.class.php
* \file htdocs/adherent/canvas/actions_adherentcard_common.class.php
* \ingroup adherent
* \brief File of class Thirdparty member card controller (common)
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
*/

/**
* \file htdocs/adherents/canvas/default/actions_adherentcard_default.class.php
* \file htdocs/adherent/canvas/default/actions_adherentcard_default.class.php
* \ingroup member
* \brief File of class Thirdparty member card controller (default canvas)
*/
include_once DOL_DOCUMENT_ROOT.'/adherents/canvas/actions_adherentcard_common.class.php';
include_once DOL_DOCUMENT_ROOT.'/adherent/canvas/actions_adherentcard_common.class.php';

/**
* \class ActionsAdherentCardDefault
Expand Down
30 changes: 15 additions & 15 deletions htdocs/adherents/card.php → htdocs/adherent/card.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
*/

/**
* \file htdocs/adherents/card.php
* \file htdocs/adherent/card.php
* \ingroup member
* \brief Page of a member
*/
Expand All @@ -38,9 +38,9 @@
require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
require_once DOL_DOCUMENT_ROOT.'/adherents/class/subscription.class.php';
require_once DOL_DOCUMENT_ROOT.'/adherent/class/adherent.class.php';
require_once DOL_DOCUMENT_ROOT.'/adherent/class/adherent_type.class.php';
require_once DOL_DOCUMENT_ROOT.'/adherent/class/subscription.class.php';
require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
Expand Down Expand Up @@ -153,14 +153,14 @@
}

if (empty($reshook)) {
$backurlforlist = DOL_URL_ROOT.'/adherents/list.php';
$backurlforlist = DOL_URL_ROOT.'/adherent/list.php';

if (empty($backtopage) || ($cancel && empty($id))) {
if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) {
if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) {
$backtopage = $backurlforlist;
} else {
$backtopage = DOL_URL_ROOT.'/adherents/card.php?id='.((!empty($id) && $id > 0) ? $id : '__ID__');
$backtopage = DOL_URL_ROOT.'/adherent/card.php?id='.((!empty($id) && $id > 0) ? $id : '__ID__');
}
}
}
Expand Down Expand Up @@ -697,15 +697,15 @@
if (empty($labeltouse) || (int) $labeltouse === -1) {
//fallback on the old configuration.
$langs->load("errors");
setEventMessages('<a href="'.DOL_URL_ROOT.'/adherents/admin/member_emails.php">'.$langs->trans('WarningMandatorySetupNotComplete').'</a>', null, 'errors');
setEventMessages('<a href="'.DOL_URL_ROOT.'/adherent/admin/member_emails.php">'.$langs->trans('WarningMandatorySetupNotComplete').'</a>', null, 'errors');
$error++;
} else {
$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
complete_substitutions_array($substitutionarray, $outputlangs, $object);
$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
$texttosend = make_substitutions(dol_concatdesc($msg, $adht->getMailOnValid()), $substitutionarray, $outputlangs);

$moreinheader = 'X-Dolibarr-Info: send_an_email by adherents/card.php'."\r\n";
$moreinheader = 'X-Dolibarr-Info: send_an_email by adherent/card.php'."\r\n";

$result = $object->sendEmail($texttosend, $subjecttosend, array(), array(), array(), "", "", 0, -1, '', $moreinheader);
if ($result < 0) {
Expand Down Expand Up @@ -772,7 +772,7 @@
$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
$texttosend = make_substitutions(dol_concatdesc($msg, $adht->getMailOnResiliate()), $substitutionarray, $outputlangs);

$moreinheader = 'X-Dolibarr-Info: send_an_email by adherents/card.php'."\r\n";
$moreinheader = 'X-Dolibarr-Info: send_an_email by adherent/card.php'."\r\n";

$result = $object->sendEmail($texttosend, $subjecttosend, array(), array(), array(), "", "", 0, -1, '', $moreinheader);
if ($result < 0) {
Expand Down Expand Up @@ -839,7 +839,7 @@
$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
$texttosend = make_substitutions(dol_concatdesc($msg, $adht->getMailOnExclude()), $substitutionarray, $outputlangs);

$moreinheader = 'X-Dolibarr-Info: send_an_email by adherents/card.php'."\r\n";
$moreinheader = 'X-Dolibarr-Info: send_an_email by adherent/card.php'."\r\n";

$result = $object->sendEmail($texttosend, $subjecttosend, array(), array(), array(), "", "", 0, -1, '', $moreinheader);
if ($result < 0) {
Expand Down Expand Up @@ -1025,7 +1025,7 @@ function initfieldrequired() {
print '<span class="error">'.$langs->trans("NoTypeDefinedGoToSetup").'</span>';
}
if ($user->hasRight('member', 'configurer')) {
print ' <a href="'.DOL_URL_ROOT.'/adherents/type.php?action=create&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&typeid=--IDFORBACKTOPAGE--').'"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("NewMemberType").'"></span></a>';
print ' <a href="'.DOL_URL_ROOT.'/adherent/type.php?action=create&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&typeid=--IDFORBACKTOPAGE--').'"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("NewMemberType").'"></span></a>';
}
print "</td>\n";

Expand Down Expand Up @@ -1774,9 +1774,9 @@ function initfieldrequired() {
$rowspan++;
}

$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
$linkback = '<a href="'.DOL_URL_ROOT.'/adherent/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';

$morehtmlref = '<a href="'.DOL_URL_ROOT.'/adherents/vcard.php?id='.$object->id.'" class="refid">';
$morehtmlref = '<a href="'.DOL_URL_ROOT.'/adherent/vcard.php?id='.$object->id.'" class="refid">';
$morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"');
$morehtmlref .= '</a>';

Expand Down Expand Up @@ -2132,9 +2132,9 @@ function initfieldrequired() {
$MAXEVENT = 10;

$morehtmlcenter = '';
$messagingUrl = DOL_URL_ROOT.'/adherents/messaging.php?rowid='.$object->id;
$messagingUrl = DOL_URL_ROOT.'/adherent/messaging.php?rowid='.$object->id;
$morehtmlcenter .= dolGetButtonTitle($langs->trans('ShowAsConversation'), '', 'fa fa-comments imgforviewmode', $messagingUrl, '', 1);
$morehtmlcenter .= dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-bars imgforviewmode', DOL_URL_ROOT.'/adherents/agenda.php?id='.$object->id);
$morehtmlcenter .= dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-bars imgforviewmode', DOL_URL_ROOT.'/adherent/agenda.php?id='.$object->id);

// List of actions on element
include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@
*/

/**
* \file htdocs/adherents/cartes/carte.php
* \file htdocs/adherent/cartes/carte.php
* \ingroup member
* \brief Page to output members business cards
*/
require '../../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/format_cards.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
require_once DOL_DOCUMENT_ROOT.'/adherent/class/adherent.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/modules/member/modules_cards.php';
require_once DOL_DOCUMENT_ROOT.'/core/modules/printsheet/modules_labels.php';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
*/

/**
* \file htdocs/adherents/class/adherent.class.php
* \file htdocs/adherent/class/adherent.class.php
* \ingroup member
* \brief File of class to manage members of a foundation
*/
Expand Down Expand Up @@ -1563,7 +1563,7 @@ public function fetch_subscriptions()
// phpcs:enable
global $langs;

require_once DOL_DOCUMENT_ROOT.'/adherents/class/subscription.class.php';
require_once DOL_DOCUMENT_ROOT.'/adherent/class/subscription.class.php';

$sql = "SELECT c.rowid, c.fk_adherent, c.fk_type, c.subscription, c.note as note_public, c.fk_bank,";
$sql .= " c.tms as datem,";
Expand Down Expand Up @@ -1655,7 +1655,7 @@ public function subscription($date, $amount, $accountid = 0, $operation = '', $l
{
global $conf, $langs, $user;

require_once DOL_DOCUMENT_ROOT.'/adherents/class/subscription.class.php';
require_once DOL_DOCUMENT_ROOT.'/adherent/class/subscription.class.php';

$error = 0;

Expand Down Expand Up @@ -1753,7 +1753,7 @@ public function subscriptionComplementaryActions($subscriptionid, $option, $acco

$insertid = $acct->addline($dateop, $operation, $label, $amount, $num_chq, 0, $user, $emetteur_nom, $emetteur_banque);
if ($insertid > 0) {
$inserturlid = $acct->add_url_line($insertid, $this->id, DOL_URL_ROOT.'/adherents/card.php?rowid=', $this->getFullName($langs), 'member');
$inserturlid = $acct->add_url_line($insertid, $this->id, DOL_URL_ROOT.'/adherent/card.php?rowid=', $this->getFullName($langs), 'member');
if ($inserturlid > 0) {
// Update table subscription
$sql = "UPDATE ".MAIN_DB_PREFIX."subscription SET fk_bank=".((int) $insertid);
Expand Down Expand Up @@ -2360,9 +2360,9 @@ public function getNomUrl($withpictoimg = 0, $maxlen = 0, $option = 'card', $mod
$label = implode($this->getTooltipContentArray($params));
}

$url = DOL_URL_ROOT.'/adherents/card.php?rowid='.((int) $this->id);
$url = DOL_URL_ROOT.'/adherent/card.php?rowid='.((int) $this->id);
if ($option == 'subscription') {
$url = DOL_URL_ROOT.'/adherents/subscription.php?rowid='.((int) $this->id);
$url = DOL_URL_ROOT.'/adherent/subscription.php?rowid='.((int) $this->id);
}

if ($option != 'nolink') {
Expand Down Expand Up @@ -2432,7 +2432,7 @@ public function getNomUrl($withpictoimg = 0, $maxlen = 0, $option = 'card', $mod
if ($this->note_private) {
$notetoshow = $langs->trans("ViewPrivateNote").':<br>'.dol_string_nohtmltag($this->note_private, 1);
$result .= ' <span class="note inline-block">';
$result .= '<a href="'.DOL_URL_ROOT.'/adherents/note.php?id='.$this->id.'" class="classfortooltip" title="'.dol_escape_htmltag($notetoshow).'">';
$result .= '<a href="'.DOL_URL_ROOT.'/adherent/note.php?id='.$this->id.'" class="classfortooltip" title="'.dol_escape_htmltag($notetoshow).'">';
$result .= img_picto('', 'note');
$result .= '</a>';
$result .= '</span>';
Expand Down Expand Up @@ -2592,10 +2592,10 @@ public function load_board($user, $mode)
$warning_delay = $conf->adherent->subscription->warning_delay / 60 / 60 / 24;
$label = $langs->trans("MembersWithSubscriptionToReceive");
$labelShort = $langs->trans("MembersWithSubscriptionToReceiveShort");
$url = DOL_URL_ROOT.'/adherents/list.php?mainmenu=members&amp;statut='.self::STATUS_VALIDATED.'&amp;filter=outofdate';
$url = DOL_URL_ROOT.'/adherent/list.php?mainmenu=members&amp;statut='.self::STATUS_VALIDATED.'&amp;filter=outofdate';
} elseif ($mode == 'shift') {
$warning_delay = $conf->adherent->subscription->warning_delay / 60 / 60 / 24;
$url = DOL_URL_ROOT.'/adherents/list.php?mainmenu=members&amp;statut='.self::STATUS_DRAFT;
$url = DOL_URL_ROOT.'/adherent/list.php?mainmenu=members&amp;statut='.self::STATUS_DRAFT;
$label = $langs->trans("MembersListToValid");
$labelShort = $langs->trans("ToValidate");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
*/

/**
* \file htdocs/adherents/class/adherent_type.class.php
* \file htdocs/adherent/class/adherent_type.class.php
* \ingroup member
* \brief File of class to manage members types
*/
Expand Down Expand Up @@ -768,7 +768,7 @@ public function getNomUrl($withpicto = 0, $maxlen = 0, $notooltip = 0, $morecss
$label = implode($this->getTooltipContentArray($params));
}

$url = DOL_URL_ROOT.'/adherents/type.php?rowid='.((int) $this->id);
$url = DOL_URL_ROOT.'/adherent/type.php?rowid='.((int) $this->id);
if ($option != 'nolink') {
// Add param to save lastsearch_values or not
$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
*/

/**
* \file htdocs/adherents/class/adherentstats.class.php
* \file htdocs/adherent/class/adherentstats.class.php
* \ingroup member
* \brief File for class managing statistics of members
*/

include_once DOL_DOCUMENT_ROOT.'/core/class/stats.class.php';
include_once DOL_DOCUMENT_ROOT.'/adherents/class/subscription.class.php';
include_once DOL_DOCUMENT_ROOT.'/adherent/class/subscription.class.php';


/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
use Luracast\Restler\RestException;

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/subscription.class.php';
require_once DOL_DOCUMENT_ROOT.'/adherent/class/adherent.class.php';
require_once DOL_DOCUMENT_ROOT.'/adherent/class/subscription.class.php';
require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
require_once DOL_DOCUMENT_ROOT.'/adherent/class/adherent_type.class.php';


/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

use Luracast\Restler\RestException;

require_once DOL_DOCUMENT_ROOT.'/adherents/class/subscription.class.php';
require_once DOL_DOCUMENT_ROOT.'/adherent/class/subscription.class.php';

/**
* API class for subscriptions
Expand Down
Loading

0 comments on commit d1ce955

Please sign in to comment.