Changeset 3715

Timestamp:

Aug 1, 2009, 2:39:46 PM (15 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:

• admin/template/goto/install.tpl (modified) (2 diffs)
• install.php (modified) (1 diff)

trunk/admin/template/goto/install.tpl

@@ -149 +149 @@
 <p>
   <br />
-  <input type="button" name="identification" value="{'Identification'|@translate}" onClick="window.open('identification.php');"/>
+  <input type="button" name="home" value="{'home'|@translate}" onClick="window.location='index.php';"/>
+  <input type="button" name="admin" value="{'admin'|@translate}" onClick="window.location='admin.php';"/>
 </p>
 
@@ -159 +160 @@
 
 <p>
+  <br />
   <input type="button" name="subscribe" value="{'Subscribe %s'|@translate|@sprintf:$F_ADMIN_EMAIL}" onClick="window.open('{$SUBSCRIBE_BASE_URL}{$F_ADMIN_EMAIL}');"/>
 </p>

trunk/install.php

@@ -419 +419 @@
     array_push($errors, $error_copy);
   }
+  else
+  {
+    session_set_save_handler('pwg_session_open',
+      'pwg_session_close',
+      'pwg_session_read',
+      'pwg_session_write',
+      'pwg_session_destroy',
+      'pwg_session_gc'
+    );
+    if ( function_exists('ini_set') )
+    {
+      ini_set('session.use_cookies', $conf['session_use_cookies']);
+      ini_set('session.use_only_cookies', $conf['session_use_only_cookies']);
+      ini_set('session.use_trans_sid', intval($conf['session_use_trans_sid']));
+      ini_set('session.cookie_httponly', 1);
+    }
+    session_name($conf['session_name']);
+    session_set_cookie_params(0, cookie_path());
+    $user = build_user(1, true);
+    log_user($user['id'], false);
+  }
 
   $template->assign(