Changeset 3715


Ignore:
Timestamp:
08/01/09 14:39:46 (10 years ago)
Author:
patdenice
Message:

merge r3714 from branch 2.0 to trunk
bug 895 : At the end of install, webmaster is automatically connected with two buttons: "Home" and "Admin"

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/admin/template/goto/install.tpl

    r3382 r3715  
    149149<p> 
    150150  <br /> 
    151   <input type="button" name="identification" value="{'Identification'|@translate}" onClick="window.open('identification.php');"/> 
     151  <input type="button" name="home" value="{'home'|@translate}" onClick="window.location='index.php';"/> 
     152  <input type="button" name="admin" value="{'admin'|@translate}" onClick="window.location='admin.php';"/> 
    152153</p> 
    153154 
     
    159160 
    160161<p> 
     162  <br /> 
    161163  <input type="button" name="subscribe" value="{'Subscribe %s'|@translate|@sprintf:$F_ADMIN_EMAIL}" onClick="window.open('{$SUBSCRIBE_BASE_URL}{$F_ADMIN_EMAIL}');"/> 
    162164</p> 
  • trunk/install.php

    r3382 r3715  
    419419    array_push($errors, $error_copy); 
    420420  } 
     421  else 
     422  { 
     423    session_set_save_handler('pwg_session_open', 
     424      'pwg_session_close', 
     425      'pwg_session_read', 
     426      'pwg_session_write', 
     427      'pwg_session_destroy', 
     428      'pwg_session_gc' 
     429    ); 
     430    if ( function_exists('ini_set') ) 
     431    { 
     432      ini_set('session.use_cookies', $conf['session_use_cookies']); 
     433      ini_set('session.use_only_cookies', $conf['session_use_only_cookies']); 
     434      ini_set('session.use_trans_sid', intval($conf['session_use_trans_sid'])); 
     435      ini_set('session.cookie_httponly', 1); 
     436    } 
     437    session_name($conf['session_name']); 
     438    session_set_cookie_params(0, cookie_path()); 
     439    $user = build_user(1, true); 
     440    log_user($user['id'], false); 
     441  } 
    421442 
    422443  $template->assign( 
Note: See TracChangeset for help on using the changeset viewer.