From 1c261397890a79b9a12f5e9abbfc46a549eb86fc Mon Sep 17 00:00:00 2001 From: stickler-ci Date: Tue, 28 Jan 2020 20:29:17 +0000 Subject: [PATCH] Fixing style errors. --- htdocs/adherents/class/adherent.class.php | 14 +++++++------- htdocs/index.php | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php index e1a25465a6c..dd4706b068e 100644 --- a/htdocs/adherents/class/adherent.class.php +++ b/htdocs/adherents/class/adherent.class.php @@ -2280,23 +2280,23 @@ class Adherent extends CommonObject $sql.= " FROM ".MAIN_DB_PREFIX."adherent as a"; $sql.= ", ".MAIN_DB_PREFIX."adherent_type as t"; $sql.= " WHERE a.fk_adherent_type = t.rowid"; - if ($mode == 'expired') + if ($mode == 'expired') { - $sql.= " AND a.statut = 1"; - $sql.= " AND a.entity IN (".getEntity('adherent').")"; - $sql.= " AND ((a.datefin IS NULL or a.datefin < '".$this->db->idate($now)."') AND t.subscription = 1)"; + $sql.= " AND a.statut = 1"; + $sql.= " AND a.entity IN (".getEntity('adherent').")"; + $sql.= " AND ((a.datefin IS NULL or a.datefin < '".$this->db->idate($now)."') AND t.subscription = 1)"; } elseif ($mode == 'shift') { - $sql.= " AND a.statut = -1"; - $sql.= " AND a.entity IN (".getEntity('adherent').")"; + $sql.= " AND a.statut = -1"; + $sql.= " AND a.entity IN (".getEntity('adherent').")"; } $resql=$this->db->query($sql); if ($resql) { $langs->load("members"); - + if ($mode == 'expired') { $warning_delay = $conf->adherent->subscription->warning_delay/60/60/24; $label = $langs->trans("MembersWithSubscriptionToReceive"); diff --git a/htdocs/index.php b/htdocs/index.php index 9e6ef1b7bf8..228b5870868 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -268,7 +268,7 @@ if (empty($user->socid) && empty($conf->global->MAIN_DISABLE_GLOBAL_BOXSTATS)) DOL_URL_ROOT.'/societe/list.php?type=f&mainmenu=companies', DOL_URL_ROOT.'/contact/list.php?mainmenu=companies', DOL_URL_ROOT.'/adherents/list.php?statut=1&mainmenu=members', - DOL_URL_ROOT.'/adherents/list.php?statut=-1&mainmenu=members', + DOL_URL_ROOT.'/adherents/list.php?statut=-1&mainmenu=members', DOL_URL_ROOT.'/product/list.php?type=0&mainmenu=products', DOL_URL_ROOT.'/product/list.php?type=1&mainmenu=products', DOL_URL_ROOT.'/comm/propal/list.php?mainmenu=commercial&leftmenu=propals',