Code cleanup: use common objects and methods

thomascube

2008-05-27 7e9cecda9804e6137566795d67d6b6b5f95dd343

Code cleanup: use common objects and methods

 program/include/rcube_template.php

@@ -829,7 +829,6 @@
     */
    public function current_username($attrib)
    {
        global $USER;
        static $username;

        // alread fetched
@@ -838,14 +837,11 @@
        }

        // get e-mail address form default identity
        if ($sql_arr = $USER->get_identity()) {
          $s_username = $sql_arr['email'];
        }
        else if (strstr($_SESSION['username'], '@')) {
            $username = $_SESSION['username'];
        if ($sql_arr = $this->app->user->get_identity()) {
            $username = $sql_arr['email'];
        }
        else {
            $username = $_SESSION['username'].'@'.$_SESSION['imap_host'];
            $username = $this->app->user->get_username();
        }

        return $username;