<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -1,4 +1,39 @@
 &lt;?php
+function checkPass($user, $password) {
+    global $db_prefix_forum;
+    global $con;
+    $password = sha1($password);
+    $result = mysql_query(&quot;SELECT * FROM &quot;.$db_prefix_forum.&quot;users WHERE name='$user' AND password='$password'&quot;,$con);
+    return mysql_fetch_array($result);
+}
+function navbox() {
+global $loggedIn;
+global $user;
+global $userID;
+?&gt;&lt;div class=&quot;box_right&quot;&gt;
+&lt;h2&gt;Navigation&lt;/h2&gt;
+&lt;ul class=&quot;nav2&quot;&gt;
+    &lt;li class=&quot;nav2&quot;&gt;
+        &lt;a href=&quot;.&quot;&gt;Home&lt;/a&gt;
+    &lt;/li&gt;
+    &lt;li class=&quot;nav2&quot;&gt;
+        &lt;a href=&quot;forum.php&quot;&gt;Forum&lt;/a&gt;
+    &lt;/li&gt;
+&lt;?php if ($loggedIn) { ?&gt;
+    &lt;li class=&quot;nav2&quot;&gt;
+        &lt;?php echo &quot;&lt;a href=\&quot;forum.php?type=user&amp;userid=$userID\&quot;&gt;$user&lt;/a&gt;&quot;; ?&gt;
+    &lt;/li&gt;
+    &lt;li class=&quot;nav2&quot;&gt;
+        &lt;a href=&quot;forum.php?type=post&amp;mode=logout&quot;&gt;Logout&lt;/a&gt;
+    &lt;/li&gt;
+&lt;?php } else { ?&gt;
+    &lt;li class=&quot;nav2&quot;&gt;
+        &lt;a href=&quot;forum.php?type=login&quot;&gt;Log In&lt;/a&gt;
+    &lt;/li&gt;
+&lt;?php } ?&gt;
+&lt;/ul&gt;
+&lt;/div&gt;
+&lt;?php }
 function showOther($type) {
     global $con;
     global $db_prefix;
@@ -133,14 +168,16 @@ function memList() {
         echo &quot;&lt;/li&gt;\n&quot;;
     }
 }
-function adminMembers() { ?&gt;
+function adminMembers() { /* ?&gt;
         &lt;h2&gt;Members&lt;/h2&gt;
         &lt;ul id=&quot;memlist&quot;&gt;
         &lt;?php memList(); ?&gt;
         &lt;/ul&gt;
         &lt;div id=&quot;memadd&quot;&gt;&lt;button type=&quot;button&quot; onClick=&quot;editMem('add')&quot;&gt;Add New Member&lt;/button&gt;&lt;/div&gt;
-&lt;?php }
-function adminComments() {
+&lt;?php */
+    echo &quot;&lt;br /&gt;Members are now automatically listed from all those people with satuses other than non-member in the forums.&quot;;
+}
+function adminComments() { /*
     global $con;
     global $db_prefix;
     sqlcon();?&gt;
@@ -153,15 +190,16 @@ function adminComments() {
                 echo &quot;&lt;b&gt;&quot; . $row['name'] . &quot;&lt;/b&gt;&lt;br /&gt;&quot;;
                 echo nl2br($row['comment']) . &quot;&lt;br /&gt;&quot;;
                 echo &quot;&lt;form&gt;&lt;button type=\&quot;button\&quot; onClick=\&quot;delCom($i)\&quot;&gt;Delete&lt;/button&gt;&lt;/form&gt;&lt;/div&gt;\n&quot;;
-            }
+            } */
+    echo &quot;&lt;br /&gt;User the forum instead of comments.&quot;;
 }
 function adminOther() {
     global $con;
     global $db_prefix;
     sqlcon(); ?&gt;
-        &lt;h2&gt;Other&lt;/h2&gt;
+        &lt;h2&gt;Links&lt;/h2&gt;
         &lt;?php
-            $types = Array('social', 'contact', 'links');
+            $types = Array('links');
             for ($j=0; $j&lt;count($types); $j++) {
                 $type = $types[$j];
                 echo &quot;&lt;ul id=\&quot;oth$type&quot;.&quot;list\&quot;&gt;&quot;;</diff>
      <filename>header.php</filename>
    </modified>
    <modified>
      <diff>@@ -6,6 +6,18 @@
       die('Could not connect: ' . mysql_error());
     }
     if (mysql_select_db($db_db, $con)); else die(mysql_error()); 
+session_start(); 
+$user = $_SESSION['user'];
+$result = mysql_query(&quot;SELECT userID FROM &quot;.$db_prefix_forum.&quot;users WHERE name='$user'&quot;);
+$row = mysql_fetch_array($result);
+$userID = $row['userID'];
+$pass = $_SESSION['password'];
+if (!isset($_SESSION['user']) || !checkPass($user, $pass)) {
+    $user = &quot;Guest&quot;;
+    $loggedIn = false;
+} else {
+    $loggedIn = true;
+}
 ?&gt;
 &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 xmlns=&quot;http://www.w3.org/1999/xhtml&quot; xml:lang=&quot;en&quot;&gt;
@@ -31,7 +43,7 @@
             --&gt;&lt;/script&gt;
             &lt;div id=&quot;header&quot;&gt;
                 &lt;h1&gt;&lt;?php echo showOther(&quot;title&quot;); ?&gt;&lt;/h1&gt;
-                &lt;?php $sub = showOther(&quot;subtitle&quot;); echo &quot;&lt;h2 id=\&quot;sub\&quot;&gt;&quot;.$sub.&quot;&lt;/h2&gt;&quot;; ?&gt;
+                &lt;?php $sub = showOther(&quot;subtitle&quot;); echo &quot;&lt;h2 style=\&quot;color:white;\&quot;&gt;&quot;.$sub.&quot;&lt;/h2&gt;&quot;; ?&gt;
             &lt;/div&gt;
             &lt;div id=&quot;content&quot;&gt;
                 &lt;div id=&quot;left&quot;&gt;
@@ -138,7 +150,7 @@ echo &quot;&lt;/ul&gt;&lt;script type=\&quot;text/javascript\&quot;&gt;&lt;!--\ninit($length); document.write(
                         &lt;/div&gt;
                     &lt;/div&gt;
                     &lt;/div&gt;
-                    
+&lt;?php /* ?&gt;                    
                     &lt;div id=&quot;comments&quot; class=&quot;box_left&quot;&gt;
                     &lt;div id=&quot;comments2&quot; class=&quot;box_left_inner&quot;&gt;
                         &lt;h2&gt;Comments &amp;amp; Ideas&lt;/h2&gt;
@@ -165,7 +177,7 @@ echo &quot;&lt;/ul&gt;&lt;script type=\&quot;text/javascript\&quot;&gt;&lt;!--\ninit($length); document.write(
                         &lt;/div&gt;
                     &lt;/div&gt;
                     &lt;/div&gt;
-                    
+&lt;?php */ ?&gt;
                     &lt;div id=&quot;footer&quot; class=&quot;box_left&quot;&gt;
                     &lt;div id=&quot;footer2&quot; class=&quot;box_left_inner&quot;&gt;
 &lt;div style=&quot;float:right&quot;&gt;&lt;p&gt;&lt;a href=&quot;http://www.freedomain.co.nr/&quot;&gt;
@@ -187,6 +199,8 @@ alt=&quot;Valid XHTML 1.1&quot; height=&quot;31&quot; width=&quot;88&quot; /&gt;&lt;/a&gt;
                 &lt;div id=&quot;middle&quot;&gt;
                 &lt;/div&gt;
                 &lt;div id=&quot;right&quot;&gt;
+                &lt;?php navbox() ?&gt;
+&lt;?php /* ?&gt;
                     &lt;div id=&quot;facebook&quot; class=&quot;box_right&quot;&gt;
                     &lt;div id=&quot;facebook2&quot; class=&quot;box_right_inner&quot;&gt;
                         &lt;h2&gt;Social Networking&lt;/h2&gt;
@@ -210,12 +224,13 @@ alt=&quot;Valid XHTML 1.1&quot; height=&quot;31&quot; width=&quot;88&quot; /&gt;&lt;/a&gt;
                         &lt;/ul&gt;
                     &lt;/div&gt;
                     &lt;/div&gt;
+&lt;?php */ ?&gt;
                     &lt;div id=&quot;members&quot; class=&quot;box_right&quot;&gt;
                     &lt;div id=&quot;members2&quot; class=&quot;box_right_inner&quot;&gt;
                         &lt;h2&gt;Members&lt;/h2&gt;
                         &lt;ul&gt;
 &lt;?php
-if ($result = mysql_query(&quot;SELECT * FROM `&quot;.$db_prefix.&quot;members` WHERE position!='' ORDER BY id&quot;,$con)); else die(mysql_error());
+/*if ($result = mysql_query(&quot;SELECT * FROM `&quot;.$db_prefix.&quot;members` WHERE position!='' ORDER BY id&quot;,$con)); else die(mysql_error());
 $members = Array ();
 $i = 0;
 while ($row = mysql_fetch_array($result)) {
@@ -235,6 +250,14 @@ for ($i=0; $i&lt;count($members); $i++) {
     if ($members[$i][1])
         echo &quot;&lt;span class=\&quot;job\&quot;&gt; - &quot;.$members[$i][1].&quot;&lt;/span&gt;&quot;;
     echo &quot;&lt;/li&gt;&quot;;
+}*/
+
+$userid = $_GET['userid'];
+$result = mysql_query(&quot;SELECT * FROM &quot;.$db_prefix_forum.&quot;users WHERE state!='non'&quot;);
+while ($row = mysql_fetch_array($result)) {
+    echo &quot;&lt;li&gt;&quot; . $row['firstName'].&quot; &quot;.$row['lastName'];
+    if ($members[$i][1])
+        echo &quot;&lt;span class=\&quot;job\&quot;&gt; - &quot;.$row['position'].&quot;&lt;/span&gt;&quot;;
 }
 ?&gt;
                         &lt;/ul&gt;</diff>
      <filename>index.php</filename>
    </modified>
    <modified>
      <diff>@@ -3,6 +3,7 @@ include 'config.php';
 include 'header.php';
 
 $title = $_POST['title'];
+$subtitle = $_POST['subtitle'];
 $image = $_POST['image'];
 $pics = $_POST['pics'];
 
@@ -58,6 +59,7 @@ if ($title) {
     
     upOther(&quot;about&quot;,&quot;Insert a short description of your group here.&quot;); 
     upOther(&quot;title&quot;,$title);
+    upOther(&quot;subtitle&quot;,$subtitle);
     upOther(&quot;image&quot;,$image);
     upOther(&quot;showPictures&quot;,$pics);
 }
@@ -69,6 +71,7 @@ else {
 
 &lt;form action=&quot;setup.php&quot; method=&quot;post&quot;&gt;
     Title: &lt;input type=&quot;text&quot; name=&quot;title&quot; /&gt;&lt;br /&gt;
+    Subtitle: &lt;input type=&quot;text&quot; name=&quot;subtitle&quot; /&gt;&lt;br /&gt;
     Image URL: &lt;input type=&quot;text&quot; name=&quot;image&quot; /&gt;&lt;br /&gt;
     Show Pictures? (TRUE or FALSE) &lt;input type=&quot;text&quot; name=&quot;pics&quot; /&gt;&lt;br /&gt;
     &lt;button&gt;Create!&lt;/button&gt;</diff>
      <filename>setup.php</filename>
    </modified>
    <modified>
      <diff>@@ -61,11 +61,15 @@ li.ajaxy {
     display: table-cell;
     padding: 10px;
 }
-#left {
+#forum #left {
+    width: 80%;
 }
 #right {
     width: 300px;
 }
+#forum #right {
+    width: 200px;
+}
 .box_left, .box_right {
     margin-top: 10px;
     padding: 0px;</diff>
      <filename>style_adfa.css</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>3694f1588aad8b24a7069c4c204cbee3e78b48bb</id>
    </parent>
  </parents>
  <author>
    <name>Benjamin Webb</name>
    <email>bjwebb67@googlemail.com</email>
  </author>
  <url>http://github.com/Bjwebb/audenshaw-group-cms/commit/87e7f75650a83c43b87f1407d0603375b3441613</url>
  <id>87e7f75650a83c43b87f1407d0603375b3441613</id>
  <committed-date>2008-03-19T16:38:37-07:00</committed-date>
  <authored-date>2008-03-19T16:38:37-07:00</authored-date>
  <message>RESET</message>
  <tree>8d3ec26a90782b37ae85e00c8174eb2455c8ccde</tree>
  <committer>
    <name>Benjamin Webb</name>
    <email>bjwebb67@googlemail.com</email>
  </committer>
</commit>
