diff --git a/htdocs/adherents/admin/adherent.php b/htdocs/adherents/admin/adherent.php index 8e265eb70f7..2754c2d3690 100644 --- a/htdocs/adherents/admin/adherent.php +++ b/htdocs/adherents/admin/adherent.php @@ -125,15 +125,13 @@ print ''.$langs->trans("Description").''; print ''.$langs->trans("Value").''; print ''.$langs->trans("Action").''; print "\n"; -$var=true; // Login/Pass required for members -$var=!$var; print '
'; print ''; print ''; print ''; -print ''.$langs->trans("AdherentLoginRequired").''; +print ''.$langs->trans("AdherentLoginRequired").''; print $form->selectyesno('constvalue',(! empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)?0:1),1); print ''; print ''; @@ -141,12 +139,11 @@ print "\n"; print '
'; // Mail required for members -$var=!$var; print '
'; print ''; print ''; print ''; -print ''.$langs->trans("AdherentMailRequired").''; +print ''.$langs->trans("AdherentMailRequired").''; print $form->selectyesno('constvalue',(! empty($conf->global->ADHERENT_MAIL_REQUIRED)?$conf->global->ADHERENT_MAIL_REQUIRED:0),1); print ''; print ''; @@ -154,12 +151,11 @@ print "\n"; print '
'; // Send mail information is on by default -$var=!$var; print '
'; print ''; print ''; print ''; -print ''.$langs->trans("MemberSendInformationByMailByDefault").''; +print ''.$langs->trans("MemberSendInformationByMailByDefault").''; print $form->selectyesno('constvalue',(! empty($conf->global->ADHERENT_DEFAULT_SENDINFOBYMAIL)?$conf->global->ADHERENT_DEFAULT_SENDINFOBYMAIL:0),1); print ''; print ''; @@ -167,12 +163,11 @@ print "\n"; print '
'; // Insert subscription into bank account -$var=!$var; print '
'; print ''; print ''; print ''; -print ''.$langs->trans("MoreActionsOnSubscription").''; +print ''.$langs->trans("MoreActionsOnSubscription").''; $arraychoices=array('0'=>$langs->trans("None")); if (! empty($conf->banque->enabled)) $arraychoices['bankdirect']=$langs->trans("MoreActionBankDirect"); if (! empty($conf->banque->enabled) && ! empty($conf->societe->enabled) && ! empty($conf->facture->enabled)) $arraychoices['invoiceonly']=$langs->trans("MoreActionInvoiceOnly"); @@ -188,12 +183,11 @@ print '
'; // Use vat for invoice creation if ($conf->facture->enabled) { - $var=!$var; print '
'; print ''; print ''; print ''; - print ''.$langs->trans("VATToUseForSubscriptions").''; + print ''.$langs->trans("VATToUseForSubscriptions").''; if (! empty($conf->banque->enabled)) { print ''; @@ -213,12 +207,11 @@ if ($conf->facture->enabled) if (! empty($conf->product->enabled) || ! empty($conf->service->enabled)) { - $var=!$var; print ''; print ''; print ''; print ''; - print ''.$langs->trans("ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS").''; + print ''.$langs->trans("ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS").''; print ''; $form->select_produits($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS, 'constvalue_ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS'); print ''; diff --git a/htdocs/adherents/admin/public.php b/htdocs/adherents/admin/public.php index 47ad7a00a97..5c16a34793c 100644 --- a/htdocs/adherents/admin/public.php +++ b/htdocs/adherents/admin/public.php @@ -145,22 +145,19 @@ print ''; print ''.$langs->trans("Parameter").''; print ''.$langs->trans("Value").''; print "\n"; -$var=true; // Allow public form -$var=! $var; print ''; -print ''; +print ''; print $langs->trans("EnablePublicSubscriptionForm"); print ''; print $form->selectyesno("MEMBER_ENABLE_PUBLIC",(! empty($conf->global->MEMBER_ENABLE_PUBLIC)?$conf->global->MEMBER_ENABLE_PUBLIC:0),1); print "\n"; // Force Type -$var=! $var; $adht = new AdherentType($db); print ''; -print ''; +print ''; print $langs->trans("ForceMemberType"); print ''; $listofval = array(-1 => $langs->trans("Undefined")); @@ -170,18 +167,16 @@ print $form->selectarray("MEMBER_NEWFORM_FORCETYPE", $listofval, $forcetype, cou print "\n"; // Amount -$var=! $var; print ''; -print ''; +print ''; print $langs->trans("DefaultAmount"); print ''; print ''; print "\n"; // Can edit -$var=! $var; print ''; -print ''; +print ''; print $langs->trans("CanEditAmount"); print ''; print $form->selectyesno("MEMBER_NEWFORM_EDITAMOUNT",(! empty($conf->global->MEMBER_NEWFORM_EDITAMOUNT)?$conf->global->MEMBER_NEWFORM_EDITAMOUNT:0),1); @@ -190,8 +185,7 @@ print "\n"; if (! empty($conf->paybox->enabled) || ! empty($conf->paypal->enabled)) { // Jump to an online payment page - $var=! $var; - print ''; + print ''; print $langs->trans("MEMBER_NEWFORM_PAYONLINE"); print ''; $listofval=array(); @@ -204,8 +198,7 @@ if (! empty($conf->paybox->enabled) || ! empty($conf->paypal->enabled)) if (! empty($conf->paybox->enabled) || ! empty($conf->paypal->enabled)) { // Jump to an online payment page - $var=! $var; - print ''; + print ''; print $langs->trans("MEMBER_PAYONLINE_SENDEMAIL"); print ''; print ''; diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php index 9c1b0bb01e1..76368fc5673 100644 --- a/htdocs/adherents/index.php +++ b/htdocs/adherents/index.php @@ -246,8 +246,7 @@ $var=true; krsort($Total); foreach ($Total as $key=>$value) { - $var=!$var; - print ""; + print ''; print "$key"; print "".$Number[$key].""; print "".price($value).""; @@ -267,9 +266,6 @@ print "
\n"; print '
'; - -$var=true; - /* * Last modified members */ @@ -295,12 +291,10 @@ if ($resql) if ($num) { $i = 0; - $var = True; while ($i < $num) { - $var=!$var; $obj = $db->fetch_object($resql); - print ""; + print ''; $staticmember->id=$obj->rowid; $staticmember->lastname=$obj->lastname; $staticmember->firstname=$obj->firstname; @@ -358,12 +352,10 @@ if ($resql) if ($num) { $i = 0; - $var = True; while ($i < $num) { - $var=!$var; $obj = $db->fetch_object($resql); - print ""; + print ''; $subscriptionstatic->id=$obj->cid; $subscriptionstatic->ref=$obj->cid; $staticmember->id=$obj->rowid; @@ -407,8 +399,7 @@ print "\n"; foreach ($AdherentType as $key => $adhtype) { - $var=!$var; - print ""; + print ''; print ''.$adhtype->getNomUrl(1, dol_size(32)).''; print ''.(isset($MemberToValidate[$key]) && $MemberToValidate[$key] > 0?$MemberToValidate[$key]:'').' '.$staticmember->LibStatut(-1,$adhtype->subscription,0,3).''; print ''.(isset($MembersValidated[$key]) && ($MembersValidated[$key]-(isset($MemberUpToDate[$key])?$MemberUpToDate[$key]:0) > 0) ? $MembersValidated[$key]-(isset($MemberUpToDate[$key])?$MemberUpToDate[$key]:0):'').' '.$staticmember->LibStatut(1,$adhtype->subscription,0,3).''; diff --git a/htdocs/adherents/stats/byproperties.php b/htdocs/adherents/stats/byproperties.php index c717d20be84..6f896e186bb 100644 --- a/htdocs/adherents/stats/byproperties.php +++ b/htdocs/adherents/stats/byproperties.php @@ -127,12 +127,10 @@ if (! $foundphy) $data[]=array('label'=>'phy','nb'=>'0','lastdate'=>''); if (! $foundmor) $data[]=array('label'=>'mor','nb'=>'0','lastdate'=>''); $oldyear=0; -$var=true; foreach ($data as $val) { $year = $val['year']; - $var=!$var; - print ''; + print ''; print ''.$memberstatic->getmorphylib($val['label']).''; print ''.$val['nb'].''; print ''.dol_print_date($val['lastdate'],'dayhour').''; diff --git a/htdocs/adherents/stats/geo.php b/htdocs/adherents/stats/geo.php index ae128d940e8..8e3d0862490 100644 --- a/htdocs/adherents/stats/geo.php +++ b/htdocs/adherents/stats/geo.php @@ -291,12 +291,10 @@ if ($mode) print ''; $oldyear=0; - $var=true; foreach ($data as $val) { $year = $val['year']; - $var=!$var; - print ''; + print ''; print ''.$val['label'].''; if ($label2) print ''.$val['label2'].''; print ''.$val['nb'].''; diff --git a/htdocs/adherents/stats/index.php b/htdocs/adherents/stats/index.php index aec8cd588f6..4126fc6e68c 100644 --- a/htdocs/adherents/stats/index.php +++ b/htdocs/adherents/stats/index.php @@ -176,15 +176,13 @@ print ''.$langs->trans("AmountAverage").''; print ''; $oldyear=0; -$var=true; foreach ($data as $val) { $year = $val['year']; while ($oldyear > $year+1) { // If we have empty year $oldyear--; - $var=!$var; - print ''; + print ''; print ''; print ''; print $oldyear; @@ -195,8 +193,7 @@ foreach ($data as $val) print '0'; print ''; } - $var=!$var; - print ''; + print ''; print ''; //print ''; print $year; diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php index 0c9c8467f1f..dc66e080f48 100644 --- a/htdocs/adherents/subscription.php +++ b/htdocs/adherents/subscription.php @@ -821,12 +821,10 @@ if ($rowid > 0) } print "\n"; - $var=True; while ($i < $num) { $objp = $db->fetch_object($result); - $var=!$var; - print ""; + print ''; $subscriptionstatic->ref=$objp->crowid; $subscriptionstatic->id=$objp->crowid; print ''.$subscriptionstatic->getNomUrl(1).''; diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php index 846b0dab7a9..ab6bfcc0704 100644 --- a/htdocs/adherents/type.php +++ b/htdocs/adherents/type.php @@ -206,12 +206,10 @@ if (! $rowid && $action != 'create' && $action != 'edit') print ' '; print "\n"; - $var=True; while ($i < $num) { $objp = $db->fetch_object($result); - $var=!$var; - print ""; + print ''; print ''.img_object($langs->trans("ShowType"),'group').' '.$objp->rowid.''; print ''.dol_escape_htmltag($objp->libelle).''; print ''.yn($objp->subscription).''; @@ -518,7 +516,6 @@ if ($rowid > 0) print "\n"; - $var=True; while ($i < $num && $i < $conf->liste_limit) { $objp = $db->fetch_object($resql); @@ -530,8 +527,7 @@ if ($rowid > 0) $adh->firstname=$objp->firstname; // Lastname - $var=!$var; - print ''; + print ''; if ($objp->societe != '') { print ''.img_object($langs->trans("ShowMember"),"user").' '.$adh->getFullName($langs,0,-1,20).' / '.dol_trunc($objp->societe,12).''."\n";