Edit page MicrosoftTactics

diff --git a/MicrosoftTactics b/MicrosoftTactics
index b91980ce9023e27917c49ac420f6faa50676fb60..f801c6cc108d94aca85b286df43da062674352cd 100644 (file)
--- a/MicrosoftTactics
+++ b/MicrosoftTactics
@@ -5,7 +5,7 @@ Why does Microsoft deserve special casing among all companies producing propriet
 
 This is a collection of a variety of strategies attempted by Microsoft
 against an extremely resilient competitor that couldn't be simply brought
 
 This is a collection of a variety of strategies attempted by Microsoft
 against an extremely resilient competitor that couldn't be simply brought

-or driven to bankruptcy.
+or driven out of business in the conventional ways.

 
 steve_ballmer_bill_gates_i_wish_i_knew_how_to_quit_you.jpg
 
 
 steve_ballmer_bill_gates_i_wish_i_knew_how_to_quit_you.jpg
 


@@ -86,7 +86,7 @@ steve_ballmer_bill_gates_i_wish_i_knew_how_to_quit_you.jpg
 
  * The [[http://www.catb.org/~esr/halloween/ | Halloween documents]] (1998-2004)
 
 
  * The [[http://www.catb.org/~esr/halloween/ | Halloween documents]] (1998-2004)
 

- * Microsoft claims that [[http://news.zdnet.com/2100-3513_22-152099.html | OSS violates 235 (unspecified) patents]]
+ * Microsoft claims that [[http://news.zdnet.com/2100-3513_22-152099.html | OSS violates 235 (unspecified) patents]] (FUD)

 
 
 == Help wanted! ==
 
 
 == Help wanted! ==

diff --git a/sys/info b/sys/info
index abc4bbcd6f2c1553754a94478ed6699e86f3ea5c..735e0efc783aa8ae33b7e0a5b466d13db7b5d634 100644 (file)
--- a/sys/info
+++ b/sys/info
@@ -1 +1,5 @@
-|| HTTP_IF_MODIFIED_SINCE || <<CgiVar HTTP_IF_MODIFIED_SINCE>> ||
+|| REMOTE_USER  || <<CgiVar|REMOTE_USER>>   ||
+|| REMOTE_HOST  || <<CgiVar|REMOTE_HOST>>   ||
+|| REMOTE_ADDR  || <<CgiVar|REMOTE_ADDR>>   ||
+|| QUERY_STRING || <<CgiVar|QUERY_STRING>>  ||
+|| HTTP_IF_MODIFIED_SINCE || <<CgiVar|HTTP_IF_MODIFIED_SINCE>> ||

diff --git a/sys/macros/CgiVar.py b/sys/macros/CgiVar.py
index c2ba707f1eca16a60ee7ab728a7660ff528e24f4..b29f5d489e6c7a6f15c315c9294351faec6fb993 100644 (file)
--- a/sys/macros/CgiVar.py
+++ b/sys/macros/CgiVar.py
@@ -1,6 +1,10 @@
 #acl bernie:read,write All:read
 
 #acl bernie:read,write All:read
 

+#FIXME: couldn't we just return any env variable?
+#       Would there be any security issues?

 def _macro_CgiVar(*args, **kvargs):
 def _macro_CgiVar(*args, **kvargs):

+    if args[1].startswith('HTTP_'):
+        return os.environ.get(args[1], '')

     return {
         'REMOTE_USER': remote_user(),
         'REMOTE_HOST': get_hostname(remote_host()),
     return {
         'REMOTE_USER': remote_user(),
         'REMOTE_HOST': get_hostname(remote_host()),