Changeset 415 for dev

Show
Ignore:
Timestamp:
07/10/09 14:19:56 (13 years ago)
Author:
kovell
Message:

Upgrade allows admin to log in if not already logged in.

Location:
dev
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • dev/common/includes/globals.php

    r414 r415  
    77else 
    88{ 
    9         $svn_rev = '414'; 
     9        $svn_rev = '415'; 
    1010} 
    1111define('SVN_REV', $svn_rev); 

  • dev/upgrade.php

    r413 r415  
    1313$config = new Config(KB_SITE); 
    1414session::init(); 
    15 $url="http://".$_SERVER['HTTP_HOST'].$_SERVER['PHP_SELF']; 
     15$url="http://".$_SERVER['HTTP_HOST'].$_SERVER['SCRIPT_NAME']; 
    1616if($_SERVER['QUERY_STRING'] != "") $url .= '?'.$_SERVER['QUERY_STRING']; 
    17  
     17// Move to an include for neatness? 
    1818$header = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> 
    1919<html> 
    … …  
    5050        session::create(true); 
    5151 
    52         header('Location: http://'.$url); 
     52        header('Location: '.$url); 
    5353                die; 
    5454    } 
    … …  
    5656        { ?> 
    5757<html><head><title>Upgrade admin login</title></head><body> 
    58 <form method="post" action="http://<?php echo $url; ?>"> 
     58<form method="post" action="<?php echo $url; ?>"> 
    5959<table class="kb-subtable"> 
    6060<tr>