';
@@ -807,7 +807,7 @@ if ($mode == 'standard')
// For year
$prevyear = $year - 1; $nextyear = $year + 1;
- $link = "
".img_previous('', 'class="valignbottom"')." ".$langs->trans("Year")."
".img_next('', 'class="valignbottom"')."";
+ $link = "
".img_previous('', 'class="valignbottom"')." ".$langs->trans("Year")."
".img_next('', 'class="valignbottom"')."";
print '
'.$link.'
';
diff --git a/scripts/emailings/reset-invalid-emails.php b/scripts/emailings/reset-invalid-emails.php
index 12f279ef0d0..ed10aded257 100755
--- a/scripts/emailings/reset-invalid-emails.php
+++ b/scripts/emailings/reset-invalid-emails.php
@@ -23,6 +23,7 @@
*/
if (!defined('NOSESSION')) define('NOSESSION', '1');
+if (!defined('MAXEMAILS')) define('MAXEMAILS', 100);
$sapi_type = php_sapi_name();
$script_file = basename(__FILE__);
@@ -40,7 +41,7 @@ if (!isset($argv[2]) || !$argv[2]) {
print "- type can be 'all' or 'thirdparties', 'contacts', 'members', 'users'\n";
exit(-1);
}
-$id = $argv[1];
+$fileofinvalidemail = $argv[1];
$type = $argv[2];
require_once $path."../../htdocs/master.inc.php";
@@ -68,36 +69,66 @@ if (!empty($login))
$db->begin();
-// TODO Loop on the entry file to get the 100 first entries
-
-$groupofemails = array();
-
-
-// For each groupofemail, we update tables to set email field to empty
-if ($type == 'all' || $type == 'thirdparty')
+$myfile = fopen($fileofinvalidemail, "r");
+if (!$myfile)
{
- // Loop on each record and update the email to null if email into $groupofemails
- // TODO
+ echo "Failed to open file";
+ exit(-1);
}
-if ($type == 'all' || $type == 'contact')
+$tmp = 1;
+while ($tmp!=null)
{
- // Loop on each record and update the email to null if email into $groupofemails
- // TODO
-}
+ $groupofemails=array();
+ for ($i=0; $i < MAXEMAILS; $i++)
+ {
+ $tmp =fgets($myfile);
+ if ($tmp == null)
+ {
+ break;
+ }
+ $groupofemails[$i] = trim($tmp, "\n");
+ }
-if ($type == 'all' || $type == 'user')
-{
- // Loop on each record and update the email to null if email into $groupofemails
- // TODO
-}
+ // For each groupofemail, we update tables to set email field to empty
-if ($type == 'all' || $type == 'member')
-{
- // Loop on each record and update the email to null if email into $groupofemails
- // TODO
-}
+ $sql_base = "UPDATE ".MAIN_DB_PREFIX;
+ foreach ($groupofemails as $email)
+ {
+ if ($type == 'all' || $type == 'thirdparty')
+ {
+ // Loop on each record and update the email to null if email into $groupofemails
+ $sql=$sql_base."societe as s SET s.email = NULL WHERE s.email = '".$db->escape($email)."';";
+ $db->query($sql);
+ }
+
+ if ($type == 'all' || $type == 'contact')
+ {
+ // Loop on each record and update the email to null if email into $groupofemails
+
+ $sql=$sql_base."socpeople as s SET s.email = NULL WHERE s.email = '".$db->escape($email)."';";
+ $db->query($sql);
+ }
+
+ if ($type == 'all' || $type == 'user')
+ {
+ // Loop on each record and update the email to null if email into $groupofemails
+
+ $sql=$sql_base."user as u SET u.email = NULL WHERE u.email = '".$db->escape($email)."';";
+ $db->query($sql);
+ }
+
+ if ($type == 'all' || $type == 'member')
+ {
+ // Loop on each record and update the email to null if email into $groupofemails
+
+ $sql=$sql_base."adherent as a SET a.email = NULL WHERE a.email = '".$db->escape($email)."';";
+ $resql=$db->query($sql);
+ }
+ echo $email;
+ }
+}
if (!$error) {
$db->commit();