From ae3a0cfe90558c0e424c955ddcfa9c93c1a28882 Mon Sep 17 00:00:00 2001
From: glium337 <glium337@web11.sircon.net>
Date: Tue, 22 Feb 2011 12:37:48 +0100
Subject: [PATCH] prepare for merging

---
 inside/ActionParser.php     |  4 ++--
 inside/Page.php             | 25 ++++++++++++++++++++++++-
 inside/test.php             |  8 --------
 inside/ukesprogram.php      |  1 +
 inside/ukesprogramtekst.php |  1 +
 5 files changed, 28 insertions(+), 11 deletions(-)
 delete mode 100644 inside/test.php

diff --git a/inside/ActionParser.php b/inside/ActionParser.php
index 54b9691..957404d 100644
--- a/inside/ActionParser.php
+++ b/inside/ActionParser.php
@@ -700,13 +700,13 @@ class ActionParser {
   }
 
   public function _registerEvent() {
-    $event = new Event(NULL, $_REQUEST);
+    $event = new Event(NULL, $_POST);
     $event->store();
   }
 
   public function _updateEvent() {
     $eventId = scriptParam("eventid");
-    $event = new Event($eventId, $_REQUEST);
+    $event = new Event($eventId, $_POST);
     $event->store();
   }
 
diff --git a/inside/Page.php b/inside/Page.php
index 52ba67e..ce06351 100644
--- a/inside/Page.php
+++ b/inside/Page.php
@@ -550,6 +550,27 @@ possibly include it instead? --Thomas Misund, 26. Oct 2009
 
 	  print("      <div id=\"footer\">Script execution: $time seconds || <a href=\"mailto:support@studentersamfundet.no\">support</a></div>\n");
 
+/**
+ * Google Analytics, since 2010-11-19 15:05
+ */
+?>
+<script type="text/javascript">
+
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-52914-1']);
+  _gaq.push(['_setDomainName', '.studentersamfundet.no']);
+  _gaq.push(['_trackPageview']);
+
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+
+</script>
+<?php
+/* end Google Analytics */
+
   }
 
   public function _displayHeader(){?>
@@ -1415,7 +1436,7 @@ Teksten under er hentet fra kunnskapsdatabasen. Du st
                       "attributes" => Array("name" => "priceConcession" ,"size" => 4, "maxlength" => 5,
                                             "value" => $concert->priceConcession));
     $fields[]  =Array("label" => "bilde", "type" => "file",
-                      "attributes" => Array("comment" => "Vi blir glade hvis du bruker litt store bilder. 1024 piksler på den lengste kanten er kjempefint.",
+                      "attributes" => Array("comment" => '<img src="http://www.studentersamfundet.no/imageResize.php?pic=bilder/program/'.$concert->picture.'&amp;maxwidth=200\" alt="pressebilde" />Vi blir glade hvis du bruker litt store bilder. 1024 piksler på den lengste kanten er kjempefint.',
                       "name" => "userfile", "size" => 55));
     $fields[] = Array("label" => "linker", "type" => "textarea",
                       "attributes" => Array("comment" =>
@@ -1450,8 +1471,10 @@ Teksten under er hentet fra kunnskapsdatabasen. Du st
                             "attributes" => Array("name" => "viewWeekprogram",
                                                   "value" => $concert->viewWeekprogram));
 
+    /*
     print("<h2>Ingress blir sammendrag</h2>");
     print("<p>Ingresser utgår fra visningsmalene. I stedet kan dere nå lagre sammendrag av artiklene, som vil vises på sider med flere artikler eller arrangementer.</p>");
+     */
 
     $form = new Form($title, $enctype, $method, $action, $fields);
     $form->display();
diff --git a/inside/test.php b/inside/test.php
deleted file mode 100644
index 1685278..0000000
--- a/inside/test.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * test.php
- * Created on 12. jan 2009
- * Author: hpa
- *
- */
-?>
diff --git a/inside/ukesprogram.php b/inside/ukesprogram.php
index a5b458d..f4e2ace 100644
--- a/inside/ukesprogram.php
+++ b/inside/ukesprogram.php
@@ -412,6 +412,7 @@
 		<div id="sponsors" style="text-align: center; border-top: 1px solid black;">
 			<p>Våre samarbeidspartnere:</p>
 			<a href="http://www.toro.no"><img style="margin: 12px; border: none;" src="http://www.studentersamfundet.no/bilder/sponsorer/toro.jpg" alt="Toro" /></a>
+			<a href="http://www.akademika.no"><img style="margin: 12px; border: none;" src="http://www.studentersamfundet.no/bilder/sponsorer/akademika.png" alt="Akademika" /></a>
 		</div>
 		<div id="about" style="text-align: center; border-top: 1px solid black;">
 			<p>Det Norske Studentersamfund</p>
diff --git a/inside/ukesprogramtekst.php b/inside/ukesprogramtekst.php
index 02d9b01..02fa627 100644
--- a/inside/ukesprogramtekst.php
+++ b/inside/ukesprogramtekst.php
@@ -44,6 +44,7 @@ Pris: <?php print $gig->priceNormal; ?>/<?php print $gig->priceConcession; ?>
 
 Våre samarbeidspartnere:
 Toro
+Akademika
 
 Det Norske Studentersamfund
 www.studentersamfundet.no