Require name or email for sql address book only

Thomas Bruederli

2013-10-19 a69363961309e46adba5cf5653a38b92af6bccaa

Require name or email for sql address book only

 program/lib/Roundcube/rcube_addressbook.php

@@ -223,12 +223,6 @@
            }
        }

        // require at least one email address or a name
        if ($valid && !strlen($save_data['firstname'].$save_data['surname'].$save_data['name']) && !array_filter($this->get_col_values('email', $save_data, true))) {
            $this->set_error(self::ERROR_VALIDATE, 'noemailwarning');
            $valid = false;
        }

        // allow plugins to do contact validation and auto-fixing
        $plugin = $rcube->plugins->exec_hook('contact_validate', array(
            'record'  => $save_data,

 program/lib/Roundcube/rcube_contacts.php

@@ -592,8 +592,8 @@
        // validate e-mail addresses
        $valid = parent::validate($save_data, $autofix);

        // require at least one e-mail address (syntax check is already done)
        if ($valid && !array_filter($this->get_col_values('email', $save_data, true))) {
        // require at least one email address or a name
        if ($valid && !strlen($save_data['firstname'].$save_data['surname'].$save_data['name']) && !array_filter($this->get_col_values('email', $save_data, true))) {
            $this->set_error(self::ERROR_VALIDATE, 'noemailwarning');
            $valid = false;
        }