-segfault (#1485109)

alecpl

2008-06-07 7e78b2ec373f4596f986bb75a0e6c33bd67a82b4

 program/include/rcube_template.php

@@ -534,7 +534,12 @@
                    return Q($name);
                }
                if ($object=='version') {
                    return (string)RCMAIL_VERSION;
                    $ver = (string)RCMAIL_VERSION;
                    if (is_file(INSTALL_PATH . '.svn/entries')) {
                        if (preg_match('/Revision:\s(\d+)/', @shell_exec('svn info'), $regs))
                          $ver .= ' [SVN r'.$regs[1].']';
                    }
                    return $ver;
                }
                if ($object=='pagetitle') {
                    $task  = $this->task;
@@ -829,7 +834,6 @@
     */
    public function current_username($attrib)
    {
        global $USER;
        static $username;

        // alread fetched
@@ -838,14 +842,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;