DeletedContactInfo: Remove redundant entries

Author: kohler

src/conference.php

@@ -367,7 +367,7 @@ function __load_settings() {
 
     function load_settings() {
         $this->__load_settings();
-        if ($this->sversion < 321) {
+        if ($this->sversion < 322) {
             $old_nerrors = Dbl::$nerrors;
             while ((new UpdateSchema($this))->run()) {
                 usleep(50000);

src/schema.sql

@@ -659,7 +659,7 @@ CREATE TABLE `TopicInterest` (
 -- Initial settings
 -- (each setting must be on its own line for createdb.php/createdb.sh)
 insert into Settings (name, value, data) values
-  ('allowPaperOption', 321, null),   -- schema version
+  ('allowPaperOption', 322, null),   -- schema version
   ('setupPhase', 1, null),           -- initial user is chair
   ('no_papersub', 1, null),          -- no submissions yet
   ('sub_pcconf', 1, null),           -- collect PC conflicts, not collaborators

src/updateschema.php

@@ -3267,6 +3267,10 @@ function run() {
             && $this->v321_correct_mimetypes("Paper")) {
             $conf->update_schema_version(321);
         }
+        if ($conf->sversion === 321
+            && $conf->ql_ok("delete from DeletedContactInfo where (select email from ContactInfo where contactId=DeletedContactInfo.contactId and (cflags&8)!=0)=DeletedContactInfo.email")) {
+            $conf->update_schema_version(322);
+        }
 
         $conf->ql_ok("delete from Settings where name='__schema_lock'");
         Conf::$main = $old_conf_g;

src/useractions.php

@@ -222,9 +222,6 @@ function delete(Contact $user) {
             return;
         }
 
-        // insert deletion marker
-        $this->conf->qe("insert into DeletedContactInfo set contactId=?, firstName=?, lastName=?, unaccentedName=?, email=?, affiliation=?", $user->contactId, $user->firstName, $user->lastName, $user->unaccentedName, $user->email, $user->affiliation);
-
         // change cflags to mark user as deleted
         // also change roles (do not log roles change, as we will shortly log deletion)
         // and delete password