<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>app/controllers/Calendar.php</filename>
    </added>
    <added>
      <filename>app/views/Calendar.index.html</filename>
    </added>
    <added>
      <filename>boot/generate_certificate.sh</filename>
    </added>
    <added>
      <filename>cert/.gitignore</filename>
    </added>
    <added>
      <filename>htdocs/admin.php</filename>
    </added>
    <added>
      <filename>htdocs/css/default.print.css</filename>
    </added>
    <added>
      <filename>htdocs/css/default.screen.css</filename>
    </added>
    <added>
      <filename>lib/Account.login.html</filename>
    </added>
    <added>
      <filename>lib/Account.php</filename>
    </added>
    <added>
      <filename>lib/AdminController.php</filename>
    </added>
    <added>
      <filename>lib/Flash.php</filename>
    </added>
    <added>
      <filename>lib/FormController.php</filename>
    </added>
    <added>
      <filename>lib/HTTP.php</filename>
    </added>
    <added>
      <filename>lib/User.php</filename>
    </added>
    <added>
      <filename>lib/admin/Home.php</filename>
    </added>
    <added>
      <filename>logs/.gitignore</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -1,16 +1,16 @@
 &lt;?php
 
-class Home extends Controller
+class Home extends Controller 
 {
   public function __construct ()
   {
     $this-&gt;transport = new HTMLTransport ('default');
   }
 
-  public function index ($vars = array ())
+  public function index ()
   {
-    $parsed_template = $this-&gt;transport-&gt;parse ('Home.index.html');
-    $this-&gt;transport-&gt;add ($parsed_template);
+    $parsed = $this-&gt;transport-&gt;parse ('Home.index.html');
+    $this-&gt;transport-&gt;add ($parsed);
   }
 }
 </diff>
      <filename>app/controllers/Home.php</filename>
    </modified>
    <modified>
      <diff>@@ -1,2 +1,12 @@
-&lt;h1&gt;index&lt;/h1&gt;
+&lt;h1&gt;Rolla Catholic Newman Center&lt;/h1&gt;
+&lt;p class=&quot;pullout float_r&quot;&gt;&quot;Preach the gospel at all times - If necessary, use words.&quot;&lt;br /&gt;-- Saint Francis of Assisi&lt;/p&gt;
+
+&lt;p&gt;The Cardinal Newman Catholic Campus Ministry Center is located at 1607 N. Rolla Street along the walkway from Thomas Jefferson Hall, near St. Patrick Parish Church and Missouri S&amp;amp;T's Emerson Electrical building. Many generous parishioners, alumni, parents, students and friends made this great work of the Lord a reality.&lt;/p&gt;
+
+&lt;p&gt;The Newman Program at Missouri University of Science and Technology was begun in 1953 by Msgr. Kaiser as a weekly discussion group for Catholic Students at the then School of Mines. From 1953-1967 the students and faculty members met at St. Patrick Church. In 1967 a home was purchased for a Center and a Director was appointed. In 1986 the Newman Center moved to closer to St. Patrick Parish on Vichy Road. Up to 1997 the associate pastor of St. Patrick Church served as the Newman Director. In 1997 Sr. Renita Brummer was hired as a full time Director of Catholic Campus Ministry and continued until 2006. In July, 2006, Sr. Denise Descoteaux began her term as Director.&lt;/p&gt;
+
+&lt;p&gt;The Newman Center at UMR is named after John Henry Newman (1801-1890). Newman, a scholar and ordained clergyman of the Church of England, converted to Catholicism, lectured and wrote extensively on the role and purpose of a university. His brilliance and deep faith was an inspiration to Catholics throughout the world. Newman&#8217;s respect for the life of learning was enhanced by his Christian faith. He believed learning was a catalyst for the spiritual journey. Catholic campus ministry centers at public universities are often named after Cardinal Newman.&lt;/p&gt;
+
+&lt;p&gt;Currently Catholic Campus Ministry serves over 1,000 Catholic students and faculty at Missouri S&amp;amp;T.&lt;/p&gt;
+
 </diff>
      <filename>app/views/Home.index.html</filename>
    </modified>
    <modified>
      <diff>@@ -0,0 +1,15 @@
+&lt;?php
+
+/**
+  * Delete old flash, move this flash to the older flash variable
+  */
+if (isset ($_SESSION['old_flash']))
+  unset ($_SESSION['old_flash']);
+
+if (isset ($_SESSION['flash']))
+{
+  $_SESSION['old_flash'] = $_SESSION['flash'];
+  unset ($_SESSION['flash']);
+}
+
+?&gt;</diff>
      <filename>boot/append.php</filename>
    </modified>
    <modified>
      <diff>@@ -36,21 +36,4 @@ cd ${dir}
 ln -s ${dir}/bin/php/libs/libphp5.so ${dir}/bin/apache/modules/libphp5.so
 
 # Create a server certificate
-openssl genrsa -des3 \
-          -out ${dir}/cert/${server_url}.key \
-          -passout pass:server 1024
-openssl req -new \
-          -key ${dir}/cert/${server_url}.key \
-          -out ${dir}/cert/${server_url}.csr \
-          -passin pass:server \
-          -subj /DC=OpenSSL/CN=${server_url}/emailAddress=${server_email}
-cp ${dir}/cert/${server_url}.key ${dir}/cert/${server_url}.key.org
-openssl rsa -in ${dir}/cert/${server_url}.key.org \
-          -passin pass:server \
-          -out ${dir}/cert/${server_url}.key
-openssl x509 -req \
-          -days 365 \
-          -in ${dir}/cert/${server_url}.csr \
-          -signkey ${dir}/cert/${server_url}.key \
-          -out ${dir}/cert/${server_url}.crt
-chmod 400 ${dir}/cert/*
+. ${dir}/boot/generate_certificate.sh</diff>
      <filename>boot/install.sh</filename>
    </modified>
    <modified>
      <diff>@@ -18,4 +18,21 @@ function __autoload ($class_name)
   */
 set_error_handler (array ('Error', 'register'));
 
+/**
+  * Gets the currently logged in user (from session) or returns NULL if there 
+  * is no user logged in.
+  */
+function get_user ()
+{
+  return (isset ($_SESSION['user_obj']) ? $_SESSION['user_obj'] : NULL);
+}
+
+/**
+  * Set the currently logged in user.
+  */
+function set_user ($user)
+{
+  $_SESSION['user_obj'] = $user;
+}
+
 ?&gt;</diff>
      <filename>boot/prepend.php</filename>
    </modified>
    <modified>
      <diff>@@ -79,6 +79,11 @@ Group ${group}
 
   RewriteEngine On
 
+  RewriteRule ^admin/?$ admin.php [L]
+  RewriteRule ^admin/([^/.]+)/?$ admin.php?class=\$1 [L]
+  RewriteRule ^admin/([^/.]+)/([^/.]+)/?$ admin.php?class=\$1&amp;function=\$2 [L]
+  RewriteRule ^admin/([^/.]+)/([^/.]+)/([^/.]+)/?$ admin.php?class=\$1&amp;function=\$2&amp;mode=\$3 [L]
+
   RewriteRule ^([^/.]+)/?$ index.php?class=\$1 [L]
   RewriteRule ^([^/.]+)/([^/.]+)/?$ index.php?class=\$1&amp;function=\$2 [L]
   RewriteRule ^([^/.]+)/([^/.]+)/([^/.]+)/?$ index.php?class=\$1&amp;function=\$2&amp;mode=\$3 [L]</diff>
      <filename>boot/start_server.sh</filename>
    </modified>
    <modified>
      <diff>@@ -17,4 +17,3 @@ server_url='r04atdmt4.device.mst.edu'
 server_email='adunkman@gmail.com'
 http_port=80
 https_port=443
-</diff>
      <filename>conf/server.sh</filename>
    </modified>
    <modified>
      <diff>@@ -21,6 +21,7 @@ if (!class_exists ($class))
 else
 {
   $instance = new $class ();
+  $instance-&gt;function = $function;
   $instance-&gt;mode = $mode;
   $instance-&gt;method = $_SERVER['REQUEST_METHOD'];
 </diff>
      <filename>htdocs/index.php</filename>
    </modified>
    <modified>
      <diff>@@ -2,11 +2,12 @@
 
 abstract class Controller 
 {
+  public $function;
   public $mode;
   public $method;
   protected $transport;
 
-  abstract public function index ($vars = array ());
+  abstract public function index ();
 }
 
 ?&gt;</diff>
      <filename>lib/Controller.php</filename>
    </modified>
    <modified>
      <diff>@@ -26,13 +26,14 @@ class Error
       $context)
   {
     $message = new ErrorDisplay ();
-    $message-&gt;index (array (
+    $message-&gt;details = array (
           'number' =&gt; $number,
           'description' =&gt; $description, 
           'file' =&gt; $file, 
           'line' =&gt; $line, 
           'context' =&gt; $context
-    ));
+    );
+    $message-&gt;index ();
   }
 
   static private function log ($number, $description, $file, $line, $context)
@@ -42,13 +43,16 @@ class Error
 
 class ErrorDisplay extends Controller
 {
+  public $details;
+
   public function __construct ()
   {
     $this-&gt;transport = new HTMLTransport ();
   }
 
-  public function index ($vars = array ())
+  public function index ()
   {
+    $vars = $this-&gt;details;
     $parsed_template = $this-&gt;transport-&gt;parse (__FILE__.'.index.html', $vars);
     $this-&gt;transport-&gt;add ($parsed_template);
   }</diff>
      <filename>lib/Error.php</filename>
    </modified>
    <modified>
      <diff>@@ -11,8 +11,7 @@ class HTMLTransport extends Transport
       $final = $master-&gt;parse ('views/' . $this-&gt;template . '.html', array (
             'transport_contents' =&gt; $transport_contents
       ));
-
-      echo $final;
+      $master-&gt;add ($final);
     }
   }
 </diff>
      <filename>lib/HTMLTransport.php</filename>
    </modified>
    <modified>
      <diff>@@ -1,4 +1,30 @@
+&lt;!DOCTYPE html PUBLIC &quot;-//W3C//DTD XHTML 1.1//EN&quot; 
+&quot;http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd&quot;&gt;
 &lt;html&gt;
-
+  &lt;head&gt;
+    &lt;title&gt;Rolla Newman&lt;/title&gt;
+    &lt;link rel=&quot;stylesheet&quot; href=&quot;/css/default.screen.css&quot; media=&quot;screen&quot; /&gt;
+    &lt;link rel=&quot;stylesheet&quot; href=&quot;/css/default.print.css&quot; media=&quot;print&quot; /&gt;
+  &lt;/head&gt;
+  &lt;body&gt;
+    &lt;div id=&quot;header&quot;&gt;
+      &lt;h1&gt;Rolla Newman&lt;/h1&gt;
+      &lt;h2&gt;Engaging Life, Proclaiming Faith&lt;/h2&gt;
+    &lt;/div&gt;
+    &lt;div id=&quot;h_menu&quot;&gt;
+      &lt;ul&gt;
+        &lt;li&gt;&lt;a href=&quot;/&quot;&gt;Home&lt;/a&gt;&lt;/li&gt;
+        &lt;li&gt;&lt;a href=&quot;/about/&quot;&gt;About&lt;/a&gt;&lt;/li&gt;
+        &lt;li&gt;&lt;a href=&quot;/students/&quot;&gt;Students&lt;/a&gt;&lt;/li&gt;
+        &lt;li&gt;&lt;a href=&quot;/parents/&quot;&gt;Parents&lt;/a&gt;&lt;/li&gt;
+        &lt;li&gt;&lt;a href=&quot;/alumni/&quot;&gt;Alumni&lt;/a&gt;&lt;/li&gt;
+        &lt;li&gt;&lt;a href=&quot;/support/&quot;&gt;Supporting Catholic Campus Ministry&lt;/a&gt;&lt;/li&gt;
+        &lt;li&gt;&lt;a href=&quot;/calendar/&quot;&gt;Calendar&lt;/a&gt;&lt;/li&gt;
+        &lt;li&gt;&lt;a href=&quot;/library/&quot;&gt;Library&lt;/a&gt;&lt;/li&gt;
+      &lt;/ul&gt;
+    &lt;/div&gt;
+    &lt;div id=&quot;body&quot;&gt;
 &lt;?= $transport_contents ?&gt;
+    &lt;/div&gt;
+  &lt;/body&gt;
 &lt;/html&gt;</diff>
      <filename>views/default.html</filename>
    </modified>
  </modified>
  <removed type="array">
    <removed>
      <filename>.gitignore</filename>
    </removed>
  </removed>
  <parents type="array">
    <parent>
      <id>4fdbb98cd865476976dbb0b6979bb7c9bbced28b</id>
    </parent>
  </parents>
  <author>
    <name>Andrew Dunkman</name>
    <email>adunkman@gmail.com</email>
  </author>
  <url>http://github.com/adunkman/newman-library/commit/b339b9b175f3167c165d6c76db62403950fef278</url>
  <id>b339b9b175f3167c165d6c76db62403950fef278</id>
  <committed-date>2008-09-30T06:17:47-07:00</committed-date>
  <authored-date>2008-09-30T06:17:47-07:00</authored-date>
  <message>Added basic look and feel to site, added main menu system, and added calendar</message>
  <tree>330b9e8b7ef22e9265d3e9ccde3a9182ec01660d</tree>
  <committer>
    <name>Andrew Dunkman</name>
    <email>adunkman@gmail.com</email>
  </committer>
</commit>
