Changeset 3170

Timestamp:

08/17/10 16:44:05 (14 years ago)

Author:

amuller

Message:

Ticket #1165 - Avisando o usuário e não deslogando-o

Location:

branches/2.2/phpgwapi

Files:

• inc/class.common.inc.php (modified) (2 diffs)
• inc/class.sessions.inc.php (modified) (3 diffs)
• setup/phpgw_pt-br.lang (modified) (previous)

branches/2.2/phpgwapi/inc/class.common.inc.php

@@ -316 +316 @@
 
                                         if(function_exists("lang"))
-                                                echo '<center><b>'.lang("ExpressoLivre is unavailable at this moment. Code %1<br>Please, try later.","002").'</b></center>';
+                                                echo '<div style="border: 2px dashed red; top: 0px; left: 0px; position: absolute; background-color: #EEE; width: 260px;">'.
+                                                        '<center><img src="../admin/templates/default/images/navbar.png"><br>'.
+                                                        lang("Catalog is out of service, you will not able to do some operations").'</center></div>';
                                         else
                                                 printf("Error: Can't bind to LDAP server (invalid credentials): %s",$dn);
@@ -331 +333 @@
                                 }
                                 if(function_exists("lang"))
-                                        echo '<center><b>'.lang("ExpressoLivre is unavailable at this moment. Code %1<br>Please, try later.","002").'</b></center>';
+                                                echo '<div style="border: 2px dashed red; top: 0px; left: 0px; position: absolute; background-color: #EEE; width: 260px;">'.
+                                                        '<center><img src="../admin/templates/default/images/navbar.png"><br>'.
+                                                        lang("Catalog is out of service, you will not able to do some operations").'</center></div>';
                                 else
                                         printf("Error: Can't bind to LDAP server (anonymous bind): %s",$dn);

branches/2.2/phpgwapi/inc/class.sessions.inc.php

@@ -291 +291 @@
 
                         $this->update_dla();
-                        $this->account_id = $GLOBALS['phpgw']->accounts->name2id($this->account_lid);
+                        if (isset($_SESSION['phpgw_session']['account_id']))
+                                $this->account_id =  $_SESSION['phpgw_session']['account_id'];
+                        else
+                                $this->account_id = $GLOBALS['phpgw']->accounts->name2id($this->account_lid);
                         if (!$this->account_id)
                         {
                                 return False;
                         }
-
                         $GLOBALS['phpgw_info']['user']['account_id'] = $this->account_id;
+                        $_SESSION['phpgw_session']['account_id'] = $this->account_id;
 
                         /* init the crypto object before appsession call below */
@@ -305 +308 @@
 
                         $this->read_repositories(@$GLOBALS['phpgw_info']['server']['cache_phpgw_info']);
-                        
+                        if (strlen($this->user['expires']) == 0)
+                                $this->user['expires'] = $_SESSION['phpgw_session']['expires_account'];
                         if ($this->user['expires'] != -1 && $this->user['expires'] < time())
                         {
@@ -320 +324 @@
                                 return False;
                         }
+                        $_SESSION['phpgw_session']['expires_account'] = $this->user['expires'];
+
 
                         $GLOBALS['phpgw_info']['user']  = $this->user;