Fix performance of rcube_db_mysql::get_variable()

Aleksander Machniak

2015-02-20 c7b77b9179f1fcb52ed5f4d6b648daa54eeda7b4

 plugins/new_user_identity/new_user_identity.php

@@ -27,10 +27,6 @@

    function lookup_user_name($args)
    {
        if (!$args['login_after']) {
            $this->load_config();
        }

        if ($this->init_ldap($args['host'])) {
            $results = $this->ldap->search('*', $args['user'], true);

@@ -67,25 +63,31 @@
    {
        $this->load_config();

        if (!$this->rc->config->get('new_user_identity_onlogin')) {
        if ($this->ldap || !$this->rc->config->get('new_user_identity_onlogin')) {
            return $args;
        }

        $identities  = $this->rc->user->list_identities();
        $ldap_entry  = $this->lookup_user_name(array('user' => $this->rc->user->data['username'],
            'host' => $this->rc->user->data['mail_host'], 'login_after' => true));
        $identities = $this->rc->user->list_emails();
        $ldap_entry = $this->lookup_user_name(array(
                'user' => $this->rc->user->data['username'],
                'host' => $this->rc->user->data['mail_host'],
        ));

        foreach ($ldap_entry['email_list'] as $email) {
            foreach($identities as $identity) {
                if ($identity['email'] == $email ) {
        foreach ((array) $ldap_entry['email_list'] as $email) {
            foreach ($identities as $identity) {
                if ($identity['email'] == $email) {
                    continue 2;
                }
            }

            $plugin = $this->rc->plugins->exec_hook('identity_create', array(
                'login' => true,
                'record' => array('user_id' => $this->rc->user->ID, 'standard' => 0,
                    'email' => $email, 'name' => $ldap_entry['user_name']),
                'login'  => true,
                'record' => array(
                    'user_id'  => $this->rc->user->ID,
                    'standard' => 0,
                    'email'    => $email,
                    'name'     => $ldap_entry['user_name']
                ),
            ));

            if (!$plugin['abort'] && $plugin['record']['email']) {
@@ -101,6 +103,8 @@
            return $this->ldap->ready;
        }

        $this->load_config();

        $addressbook = $this->rc->config->get('new_user_identity_addressbook');
        $ldap_config = (array)$this->rc->config->get('ldap_public');
        $match       = $this->rc->config->get('new_user_identity_match');