Changeset 69

Show
Ignore:
Timestamp:
08/31/05 00:51:49 (7 years ago)
Author:
fsiler
Message:

not much done

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/soda/www/header.php

    r60 r69  
    1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> 
    2 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"> 
    3   <head> 
    4    <title>Caffeine - official provider of soda for ACM@UIUC members</title> 
    5    <style type="text/css" media="all">@import "./caffeine.css";</style> 
    6   </head> 
    71<?php 
    82function genregmenuline($target) 
    …… 
    159<?php 
    1610} 
     11 
    1712?> 
     13<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> 
     14<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"> 
     15  <head> 
     16   <title>Caffeine - official provider of soda for ACM@UIUC members</title> 
     17   <style type="text/css" media="all">@import "./caffeine.css";</style> 
     18  </head> 
    1819<body> 
    1920<div class="main"> 
    …… 
    2122<table class="menu" align="center"> 
    2223<tr> 
    23 <td><a href="auth/"><img src="pics/login.gif" alt="Log In" /></a></td> 
    24 <td><a href="auth/"><img src="pics/user.gif" alt="User Home Page" /></a></td> 
    25         <?php 
     24<td><a href="user.php"><img src="pics/user.gif" alt="User Home Page" /></a></td> 
     25<?php 
    2626// fsiler TODO: I think it makes more sense to display a "home" button or something while on the login page 
    2727genregmenuline("news"); 
    2828genregmenuline("stats"); 
    29 // genregmenuline("info"); 
    30 if ($CAFFEINE_ADMIN == "t") 
    31 { 
    32   genregmenuline("admin"); 
    33 } 
    34         ?> 
     29//genregmenuline("info"); 
     30?> 
    3531</tr> 
    3632</table> 

  • trunk/soda/www/.htaccess

    r68 r69  
    11### fsiler: can't get below to work how I want it to: that is, redirect everybody to the secure server 
    2 #RewriteEngine On 
     2RewriteEngine On 
    33# 
    44## And for a site running on port 80 
    5 #RewriteCond %{HTTP_HOST}   !^www-s\.acm\.uiuc\.edu [NC] 
    6 #RewriteCond %{HTTP_HOST}   !^$ 
    7 #RewriteRule ^/(.*)         https://www-s.acm.uiuc.edu/$1 [L,R] 
    8 # 
     5 
     6RewriteCond %{HTTP_HOST}   !^www-s\.acm\.uiuc\.edu [NC] 
     7RewriteRule ^/(.*)         https://www-s.acm.uiuc.edu/$1 [R] 
    98 
    109<Files user.php>