Changeset 10814

Show
Ignore:
Timestamp:
01/07/11 16:04:34 (2 years ago)
Author:
p_lindheimer
Message:

Merged revisions 10813 via svnmerge from
http://www.freepbx.org/v2/svn/freepbx/trunk

........

r10813 | p_lindheimer | 2011-01-07 12:58:34 -0800 (Fri, 07 Jan 2011) | 1 line


tell user to close their browser to logout until a real solution is proposed or Chrome is 'fixed' re #4680

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • freepbx/branches/2.8

    • Property svnmerge-integrated changed from /freepbx/branches/2.7:1-10414 /freepbx/trunk:1-9714,9744,9768,10150-10151,10215,10739 to /freepbx/branches/2.7:1-10414 /freepbx/trunk:1-9714,9744,9768,10150-10151,10215,10739,10813

  • freepbx/branches/2.8/amp_conf/htdocs/admin/views/loggedout.php

    r9040 r10814  
    11<?php 
    2  
     2// Until a real solution is found for #4680 tell them to close the browser. 
     3if (strstr($_SERVER['HTTP_USER_AGENT'],'Chrome') !== false) { 
     4$template['content'] =  
     5  "<h2>"._("Close Browser to Log Out")."</h2>\n". 
     6  "<p>"._("You must close your browser to logout when using Chrome")."</p>\n"; 
     7} else { 
    38$template['content'] =  
    49  "<h2>"._("Logged out")."</h2>\n". 
    …… 
    611  "<p><span style=\"background-color: #dddddd; margin: 6px; padding: 3px; border-style: solid; border-color: #777777; border-top-width: 0px; border-left-width: 0px; border-right-width: 2px; border-bottom-width: 2px;\">\n". 
    712  "<a href=\"".$_SERVER['PHP_SELF']."\">"._("Log in")."</a></span></p>\n"; 
     13} 
    814showview('freepbx', $template); 
    915