Changeset 2674
- Timestamp:
- 04/30/10 12:21:35 (14 years ago)
- Location:
- trunk
- Files:
-
- 8 edited
-
expressoMail1_2/templates/classic/index.tpl (modified) (2 diffs)
-
home.php (modified) (1 diff)
-
index.php (modified) (1 diff)
-
login.php (modified) (1 diff)
-
phpgwapi/inc/functions.inc.php (modified) (1 diff)
-
phpgwapi/js/expressoAjax/dom.js (modified) (1 diff)
-
phpgwapi/js/tools/xlink.js (modified) (3 diffs)
-
phpgwapi/templates/default/login_default.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/templates/classic/index.tpl
r2603 r2674 16 16 <tr><td><div class='content-menu'> 17 17 <table border="0" cellspacing="0" cellpadding="0" border="0"><tbody> 18 <tr><td class='content-menu-td' onclick='javascript:new_message("new","null");' onmouseover='javascript:set_menu_bg(this);' onmouseout='javascript:unset_menu_bg(this);'><div class='em_div_sidebox_menu'><img src=' ./templates/default/images/menu/createmail.gif'><span class="em_sidebox_menu">{new_message}</span></div></td></tr>19 <tr><td class='content-menu-td' id='em_refresh_button' onclick='javascript:refresh();' onmouseover='javascript:set_menu_bg(this);' onmouseout='javascript:unset_menu_bg(this);'><div class='em_div_sidebox_menu'><img src=' ./templates/default/images/menu/checkmail.gif'><span class="em_sidebox_menu">{refresh}</span></div></td></tr>20 <tr><td id="link_tools" class='content-menu-td' onmouseover='javascript:set_menu_bg(Element("link_tools"));' onmouseout='javascript:unset_menu_bg(this);'><div class='em_div_sidebox_menu'><img height='16px' src=' ./templates/default/images/menu/tools.gif'><span class="em_sidebox_menu">{tools} ...</span></div></td></tr>18 <tr><td class='content-menu-td' onclick='javascript:new_message("new","null");' onmouseover='javascript:set_menu_bg(this);' onmouseout='javascript:unset_menu_bg(this);'><div class='em_div_sidebox_menu'><img src='{url}/templates/default/images/menu/createmail.gif'><span class="em_sidebox_menu">{new_message}</span></div></td></tr> 19 <tr><td class='content-menu-td' id='em_refresh_button' onclick='javascript:refresh();' onmouseover='javascript:set_menu_bg(this);' onmouseout='javascript:unset_menu_bg(this);'><div class='em_div_sidebox_menu'><img src='{url}/templates/default/images/menu/checkmail.gif'><span class="em_sidebox_menu">{refresh}</span></div></td></tr> 20 <tr><td id="link_tools" class='content-menu-td' onmouseover='javascript:set_menu_bg(Element("link_tools"));' onmouseout='javascript:unset_menu_bg(this);'><div class='em_div_sidebox_menu'><img height='16px' src='{url}/templates/default/images/menu/tools.gif'><span class="em_sidebox_menu">{tools} ...</span></div></td></tr> 21 21 </tbody></table> 22 22 </div></td></tr> … … 30 30 <input type="text" id="em_message_search" size="16" maxlength="22" onfocus="javascript:onFocusQuickSearchEmail(this); return false;"/> 31 31 <a class='' onMouseOut="window.status='';return true;" title='{lang_Open_Search_Window}' onMouseOver="window.status='{lang_Open_Search_Window}';return true;" href="javascript:void(0);" onClick="javascript:search_emails(Element('em_message_search').value)"> 32 <img valign="center" align="center" src=" templates/default/images/search.gif">32 <img valign="center" align="center" src="{url}/templates/default/images/search.gif"> 33 33 </a> 34 34 <a class='' onMouseOut="window.status='';return true;" title='{lang_search_user}' onMouseOver="window.status='{lang_search_user}' ;return true;" href="javascript:void(0);" onClick="javascript:emQuickSearch(Element('em_message_search').value, 'null', 'null')"> 35 <img valign="center" align="center" src=" templates/default/images/users.jpg">35 <img valign="center" align="center" src="{url}/templates/default/images/users.jpg"> 36 36 </a> 37 37 </div> -
trunk/home.php
r2623 r2674 58 58 } 59 59 60 if ($_GET['cd']=='yes' && $GLOBALS['phpgw_info']['user']['preferences']['common']['default_app'] &&61 $GLOBALS['phpgw_info']['user']['apps'][$GLOBALS['phpgw_info']['user']['preferences']['common']['default_app']])62 {63 $GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/' . $GLOBALS['phpgw_info']['user']['preferences']['common']['default_app'] . '/' . 'index.php'));64 }65 60 // Default Applications (Home Page) 66 61 $default_apps = Array( -
trunk/index.php
r2656 r2674 66 66 if ( $app == 'home' && ! $api_requested ) 67 67 { 68 echo '<script>XLink( "' . $GLOBALS[ 'phpgw' ] -> link( '/home.php' ) . '", true );</script>'; 68 $target = 'home.php'; 69 if ( $GLOBALS['phpgw_info']['user']['preferences']['common']['default_app'] && $GLOBALS['phpgw_info']['user']['apps'][$GLOBALS['phpgw_info']['user']['preferences']['common']['default_app']]) 70 $target = $GLOBALS['phpgw_info']['user']['preferences']['common']['default_app'] . '/index.php'; 71 72 echo '<script>XEvents.add( window, "onload", function( ) { var target = window.location.hash; target = ( ( target && target.length > 1 ) ? URL_SERVER + target.substr( 1 ) : "' 73 . $GLOBALS[ 'phpgw' ] -> link( $target ). '" );XLink( target ); } );</script>'; 74 69 75 exit; 70 76 } -
trunk/login.php
r1742 r2674 51 51 { 52 52 include('./header.inc.php'); 53 // Force location to home, while logged in. 53 54 54 $GLOBALS['sessionid'] = @$_GET['sessionid'] ? $_GET['sessionid'] : @$_COOKIE['sessionid']; 55 55 56 if(isset($GLOBALS['sessionid']) && $_GET['cd'] != 10) 56 $GLOBALS['phpgw']->redirect_link('/home.php'); 57 $GLOBALS['phpgw']->redirect_link('/'); 58 57 59 if ($GLOBALS['phpgw_info']['server']['use_https'] > 0) 58 60 { -
trunk/phpgwapi/inc/functions.inc.php
r2645 r2674 309 309 } 310 310 } 311 312 $relpath = str_replace( 'index.php', '', $relpath ); 313 if ( $relpath[ 0 ] == '/' ) 314 $relpath = substr( $relpath, 1 ); 315 $relpath = '#' . $relpath; 316 311 317 // this removes the sessiondata if its saved in the URL 312 318 $query = preg_replace('/[&]?sessionid(=|%3D)[^&]+&kp3(=|%3D)[^&]+&domain=.*$/','',$_SERVER['QUERY_STRING']); -
trunk/phpgwapi/js/expressoAjax/dom.js
r2630 r2674 1 1 XEvents.add( window, "onload", function( ) 2 2 { 3 if ( template == 'classic' )3 if ( template == 'classic' || template == 'celepar' ) 4 4 return false; 5 5 -
trunk/phpgwapi/js/tools/xlink.js
r2656 r2674 49 49 _new_scripts[ _count ][ 2 ].substr( 50 50 URL_SERVER.length - 1, 51 _new_scripts[ _count ][ 2 ].indexOf( '?' ) - URL_SERVER.length + 1 51 _new_scripts[ _count ][ 2 ].length - URL_SERVER.length + 1 - ( 52 ( _new_scripts[ _count ][ 2 ].indexOf( '?' ) < 0 ) ? 53 0 : ( _new_scripts[ _count ][ 2 ].length - _new_scripts[ _count ][ 2 ].indexOf( '?' ) ) 54 ) 52 55 ) 53 56 ); … … 86 89 _container.appendChild( _center ); 87 90 88 var _cacheit = true;//( ( pLink.hasAttribute( 'cacheit' ) && pLink.getAttribute( 'cacheit' ) === 'true' ) ? true : false );91 var _cacheit = false;//( ( pLink.hasAttribute( 'cacheit' ) && pLink.getAttribute( 'cacheit' ) === 'true' ) ? true : false ); 89 92 90 93 _connector.go( … … 94 97 'handler' : _handler 95 98 } ); 99 100 window.location = '#' + ( 101 ( action.indexOf( URL_SERVER ) < 0 ) ? 102 action : action.substr( action.indexOf( URL_SERVER ) + URL_SERVER.length ) 103 ); 104 96 105 return false; 97 106 }; -
trunk/phpgwapi/templates/default/login_default.php
r2613 r2674 184 184 list($forward,$extra_vars) = explode('?',$forward,2); 185 185 } 186 186 187 if ($GLOBALS['phpgw_info']['server']['use_https'] != 2) 187 { 188 $forward = 'http://'.$_SERVER['HTTP_HOST'].($GLOBALS['phpgw']->link($forward.'?cd=yes')); 189 echo "<script language='Javascript1.3'>location.href='".$forward."'</script>"; 190 } 188 $GLOBALS['phpgw']->redirect_link( $forward ); 191 189 else 192 {193 190 $GLOBALS['phpgw']->redirect_link($forward,$extra_vars); 194 }195 191 } 196 192 }
Note: See TracChangeset
for help on using the changeset viewer.
