phpdocumentation completed

git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@31 c91229c3-7414-0410-bfa2-8a42b809f60b

phpdocumentation completed
git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@31 c91229c3-7414-0410-bfa2-8a42b809f60b
mukhtar
1 parent 383456fb
Showing 15 changed files with 2846 additions and 1717 deletions
admin/admin_dbmodify.php
admin/index.php
admin/upgrade-users.php
browse.php
dbmodify.php
download.php
index.php
lib/owl.lib.php
lib/readhd.php
log.php
modify.php
move.php
prefs.php
search.php
view.php
 <?php
-/*
- * admin_dbmodify.php
+/*  admin_dbmodify.php
+ *
+ * this is used to modify the db
  *
  * Copyright (c) 1999-2002 The Owl Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
- *
- * $Id$
- */
+ * @version v 1.1.1.1 2002/12/04
+ * @author michael
+ * @package Owl
+*/
+
 require("../config/owl.php");
 require("../lib/owl.lib.php");
 require("../config/html.php");
-if(owlusergroup($userid) != 0) exit("$lang_err_unauth_area");
-
+// if not authorised exit from area
+if(owlusergroup($userid) != 0) 
+{
+	exit("$lang_err_unauth_area");
+}
-if($action == "user") {
+// action selected is user
+if($action == "user") 
+{
+	//increment sessions
         $maxsessions = $maxsessions - 1; // always is stored - 1
+        //open connection
 	$sql = new Owl_DB;
 	$sql->query("SELECT * FROM $default->owl_users_table WHERE id = '$id'");
 	$sql->next_record();
 	$newpass = $sql->f("password");
-	if ($newpass == $password) {
+	
+	// update password
+	if ($newpass == $password) 
+	{
 		$sql->query("UPDATE $default->owl_users_table SET groupid='$groupid',username='$loginname',name='$name',password='$password',quota_max='$quota', email='$email',notify='$notify',email='$email',attachfile='$attachfile',disabled='$disabled',noprefaccess='$noprefaccess',language='$newlanguage',maxsessions='$maxsessions' where id = '$id'");
 	} 
         else 
@@ -31,13 +44,14 @@ if($action == &quot;user&quot;) {
         // Bozz Change BEGIN 
         // Clean Up the member group table first
-
 	$sql->query("DELETE FROM $default->owl_users_grpmem_table WHERE userid = $id");
         // Insert the new Choices the member group table with selected groups
-        for ( $i = 0 ; $i <= $no_groups_displayed; $i++ ) {
+        for ( $i = 0 ; $i <= $no_groups_displayed; $i++ ) 
+        {
              $checkboxfields = 'group' . $i;
-             if($$checkboxfields != '') {
+             if($$checkboxfields != '') 
+             {
                   $checkboxvalue = $$checkboxfields;
                   $sql->query("INSERT INTO $default->owl_users_grpmem_table (userid,groupid) VALUES ('$id', '$checkboxvalue')");
              } 
@@ -46,7 +60,10 @@ if($action == &quot;user&quot;) {
 	header("Location: index.php?sess=$sess&action=users&owluser=$id&change=1");
 }
-if($action == "group") {
+// if action selected is group
+if($action == "group") 
+{
+	//update the group table
 	global $default;
 	$sql = new Owl_DB;
 	$sql->query("UPDATE $default->owl_groups_table SET name='$name' where id = '$id'");
@@ -54,8 +71,13 @@ if($action == &quot;group&quot;) {
 }
 // BEGIN BUG FIX: #448232 mistake in admin_dbmodify.php
-if($action == $lang_deleteuser) {
+
+// if action is delete user
+if($action == $lang_deleteuser) 
+{
 // END BUG FIX: #448232 mistake in admin_dbmodify.php
+
+	//delete the user
 	$sql = new Owl_DB;
 	$sql->query("DELETE FROM $default->owl_users_table WHERE id = '$id'");
         // Bozz Change Begin
@@ -65,7 +87,10 @@ if($action == $lang_deleteuser) {
 	header("Location: index.php?sess=$sess&action=users");
 }
-if($action == "edhtml") {
+// if action is edit html
+if($action == "edhtml") 
+{
+  //update html settings	
   $sql = new Owl_DB;
   $sql->query("UPDATE $default->owl_html_table SET table_border='$border', table_header_bg='$header_bg', table_cell_bg='$cell_bg',table_cell_bg_alt='$cell_bg_alt',body_bgcolor='$body_bgcolor',body_textcolor='$body_textcolor',body_link='$body_link',body_vlink='$body_vlink',table_expand_width='$expand_width',table_collapse_width='$collapse_width', main_header_bgcolor='$main_header_bgcolor' ");    
@@ -73,9 +98,11 @@ if($action == &quot;edhtml&quot;) {
 }
+//if action is edit prefernces
 if($action == "edprefs") {
   $sql = new Owl_DB;
+  //update the preferences
   if ($lookAtHD != "false" )
   	$lookAtHD = "true";
   if ($owl_expand != "1")
@@ -89,42 +116,64 @@ if($action == &quot;edprefs&quot;) {
 }
 // BEGIN BUG FIX: #448232 mistake in admin_dbmodify.php
-if($action == $lang_deletegroup ) {
+// if action is delete group
+if($action == $lang_deletegroup ) 
+{
 // END BUG FIX: #448232 mistake in admin_dbmodify.php
+	
+	//delete specified group
 	global $default;
 	$sql = new Owl_DB;
 	$sql->query("DELETE FROM $default->owl_groups_table WHERE id = '$id'");
 	header("Location: index.php?sess=$sess&action=groups");
 }
-if($action == "add") {
-	if($type == "user") {
+// if action selected is add
+if($action == "add") 
+{
+	// if user to be added insert user into db
+	if($type == "user") 
+	{
                 $maxsessions = $maxsessions - 1; // always is stored - 1
 		$sql = new Owl_DB;
 		$sql->query("SELECT * FROM $default->owl_users_table WHERE username = '$loginname'");
-		if($sql->num_rows($sql) > 0) die ("$lang_err_user_exists");
+	
+		//check if user exists
+		if($sql->num_rows($sql) > 0) 
+		{
+			die ("$lang_err_user_exists");
+		}
+		
 		$sql->query("INSERT INTO $default->owl_users_table (groupid,username,name,password,quota_max,quota_current,email,notify,attachfile,disabled,noprefaccess,language,maxsessions) VALUES ('$groupid', '$loginname', '$name', '" . md5($password) . "', '$quota', '0', '$email', '$notify','$attachfile', '$disabled', '$noprefaccess', '$newlanguage', '$maxsessions')");
                 // Bozz Change BEGIN 
                 // Populated the member group table with selected groups
 		$sql->query("SELECT id FROM $default->owl_users_table WHERE username = '$loginname'");
                 $sql->next_record();
                 $newuid = $sql->f("id");
-                for ( $i = 0 ; $i <= $no_groups_displayed; $i++ ) {
-                                $checkboxfields = 'group' . $i;
-                                if($$checkboxfields != '') {
-                                     $checkboxvalue = $$checkboxfields;
-                                     $sql->query("INSERT INTO $default->owl_users_grpmem_table (userid,groupid) VALUES ('$newuid', '$checkboxvalue')");
-                                } 
+                
+                for ( $i = 0 ; $i <= $no_groups_displayed; $i++ ) 
+                {
+                     $checkboxfields = 'group' . $i;
+                     if($$checkboxfields != '') 
+                     {
+                         $checkboxvalue = $$checkboxfields;
+                         $sql->query("INSERT INTO $default->owl_users_grpmem_table (userid,groupid) VALUES ('$newuid', '$checkboxvalue')");
+                      } 
                 }
                 /* Bozz Change END */
-		if($home == "1") {
+                
+                // set home folder????
+		if($home == "1") 
+		{
 			$sql->query("select * from $default->owl_users_table where username = '$loginname'");
 			while($sql->next_record()) $id = $sql->f("id");
 			$sql->query("insert into $default->owl_folders_table values (0, '$loginname', '2', '54', '$groupid', '$id')");
 			mkdir($default->owl_fs_root."/".fid_to_name("1")."/Home/$loginname", 0777);
 		}
 		header("Location: index.php?sess=$sess");
-	} elseif($type == "group") {
+	}
+	elseif($type == "group") 
+	{
 		$sql = new Owl_DB;
 		$sql->query("INSERT INTO $default->owl_groups_table (name) VALUES ('$name')");
 		header("Location: index.php?sess=$sess");
 <?php
-/*
+/**
  * index.php
  *
+ * This is the index page for the admin
+ *
  * Copyright (c) 1999-2002 The Owl Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
- *
- * $Id$
+ * @version v 1.1.1.1 2002/12/04
+ * @author michael
+ * @package Owl
  */
+ 
 require("../config/owl.php");
 require("../lib/owl.lib.php");
 require("../config/html.php");
-
-if($action == "backup") dobackup();
+// action selected is to backup then doBackup function is called
+if($action == "backup") 
+{
+	dobackup();
+}
 include("../lib/header.inc");
 print("<CENTER>");
-if($usergroupid != "0") die("$lang_err_unauthorized");
+// if usergroupid invalid then unauthorised view and exit
+if($usergroupid != "0")
+{
+	 die("$lang_err_unauthorized");
+}
-if(!isset($action)) $action = "users";
+// if not action set ..set action to users
+if(!isset($action))
+{
+	 $action = "users";
+}
-function printusers() {
+//-------------------------------------------------------------
+/**
+ *   Function PrintUsers
+ *
+ *   Prints the users out
+ *	
+ */
+//-------------------------------------------------------------
+// Semi-Usable - Interface based
+function printusers() 
+{
 	global $sess, $default, $lang_users;
+	//create a new connection
 	$sql = new Owl_DB;
+	// create a new active session
 	$sql_active_sess = new Owl_DB;
+	
 	$sql->query("select username,name,id,maxsessions from $default->owl_users_table order by name");
@@ -64,18 +92,21 @@ function printusers() {
  	print("<TABLE BORDER=$default->table_border><TR><TD BGCOLOR=$default->table_header_bg>$lang_users</TD><TD BGCOLOR=$default->table_header_bg>&nbsp</TD></TR>");
-
+	
 	while($sql->next_record()) {
+        	// loop through record getting user information
                 $uid = $sql->f("id");
                 $username = $sql->f("username");
                 $name = $sql->f("name");
  		$maxsess = $sql->f("maxsessions") + 1;
                 $numrows = 0;
+                // find active sessions
                 $sql_active_sess->query("select * from $default->owl_sessions_table where uid = $uid");
                 $sql_active_sess->next_record();
                 $numrows = $sql_active_sess->num_rows($sql_active_sess);
+		// print out information ->not usable
                 if ($name == "")
 			print("<TR><TD align=left><A HREF='index.php?sess=$sess&action=users&owluser=".$uid."'>".$username."</A></TD>");
                 else
@@ -85,24 +116,53 @@ function printusers() {
 	print("</TABLE>");  
 }
-function printgroups() {
+//-------------------------------------------------------------
+/**
+ *   Function PrintGroups
+ *
+ *   Prints the Groups out
+ *	
+ */
+//-------------------------------------------------------------
+// Semi-Usable -> Interface Based
+function printgroups() 
+{// print out all groups 
 	global $sess, $lang_groups, $default;
 	$sql = new Owl_DB;
 	$sql->query("select name,id from $default->owl_groups_table order by name");
 	print("<TABLE BORDER=$default->table_border><TR><TD BGCOLOR=$default->table_header_bg>$lang_groups</TD></TR>");
-	while($sql->next_record()) {
+	
+	while($sql->next_record())
+	 {
 		print("<TR><TD align=left><A HREF='index.php?sess=$sess&action=groups&group=".$sql->f("id")."'>".$sql->f("name")."</A></TD></TR>");
 	}
 	print("</TABLE>");
 }
-function printuser($id) {
+//-------------------------------------------------------------
+/**
+ *   Function PrintUsr($id)
+ *
+ *   Prints the User out
+ *
+ *   @param $id
+ *	The Id of the user who's info is to be printed
+ *	
+ */
+//-------------------------------------------------------------
+// Semi-Usable -> Interface Based
+function printuser($id) 
+{	//declare globals
 	global $sess,$change,$lang_saved,$lang_title,$lang_group,$lang_username,$lang_password,$lang_change,$lang_quota,$lang_groupmember,$lang_noprefaccess,$lang_disableuser, $lang_userlang, $lang_maxsessions, $lang_attach_file;
 	global $lang_flush_sessions_alt, $lang_flushed, $lang_deleteuser, $lang_email, $lang_notification, $default, $flush;
-	if($change == 1) print("$lang_saved<BR>");
+	if($change == 1) 
+	{
+		print("$lang_saved<BR>");
+	}
-	if ($flush == 1) {
+	if ($flush == 1) 
+	{
 	  flushsessions($id, $sess); 
 	  print($lang_flushed);
 	}
@@ -110,13 +170,19 @@ function printuser($id) {
 	$sql = new Owl_DB;
 	$sql->query("select id,name from $default->owl_groups_table order by name");
 	$i=0;
-	while($sql->next_record()) {
+	
+	// store groups in array
+	while($sql->next_record()) 
+	{
 		$groups[$i][0] = $sql->f("id");
 		$groups[$i][1] = $sql->f("name");
 		$i++;
 	}
 	$sql->query("select * from $default->owl_users_table where id = '$id'");
-	while($sql->next_record()) {
+	
+	//post to dbmodify any changes and their values
+	while($sql->next_record()) 
+	{
 		print("<FORM ACTION='admin_dbmodify.php' METHOD=POST>");
 		print("<INPUT TYPE=HIDDEN NAME=id VALUE=".$sql->f("id").">");
 		print("<INPUT TYPE=HIDDEN NAME=sess VALUE=$sess>");
@@ -124,7 +190,8 @@ function printuser($id) {
 		print("<TABLE BORDER=$default->table_border><TR><TD BGCOLOR=$default->table_header_bg align=right>$lang_title</TD><TD align=left><INPUT TYPE=text NAME=name VALUE='".$sql->f("name")."'></TD></TR>");
 		print("<TR><TD BGCOLOR=$default->table_header_bg align=right>$lang_group</TD><TD align=left><SELECT NAME=groupid>");
 		print("<OPTION VALUE=".$sql->f("groupid").">".group_to_name($sql->f("groupid")));
-		foreach($groups as $g) {
+		foreach($groups as $g) 
+		{
 			print("<OPTION VALUE=$g[0]>$g[1]");
 		}
 		print("</SELECT></TD></TR>");
@@ -146,17 +213,22 @@ function printuser($id) {
                 // Bozz Change  begin
                 //This is to allow a user to be part of more than one group
+        	// assign a user to more than one group
                 print("<TR><TD BGCOLOR=$default->table_header_bg align=right>$lang_groupmember</TD><TD align=left>");
                 $i=0;
                 $sqlmemgroup = new Owl_DB;
-                foreach($groups as $g) {
+                foreach($groups as $g) 
+                {
                         $is_set_gid = $g[0];
                         $sqlmemgroup->query("select userid from $default->owl_users_grpmem_table where userid = '$id' and groupid = '$is_set_gid'");
                         $sqlmemgroup->next_record();
-                        if ($sqlmemgroup->num_rows($sqlmemgroup) > 0) {
+                        
+                        if ($sqlmemgroup->num_rows($sqlmemgroup) > 0) 
+                        {
                              print("<input type='checkbox' name='group$i' value=$g[0] checked>$g[1]<BR>");
                         }
-                        else {
+                        else
+                        {
                              print("<input type='checkbox' name='group$i' value=$g[0]>$g[1]<BR>");
                         }
                         $i++;
@@ -171,29 +243,59 @@ function printuser($id) {
                 print("<TR><TD BGCOLOR=$default->table_header_bg ALIGN=RIGHT>$lang_username</TD><TD align=left><INPUT TYPE=TEXT NAME=loginname VALUE='".$sql->f("username")."'></TD></TR>");
 		print("<TR><TD BGCOLOR=$default->table_header_bg align=right>$lang_quota</TD><TD align=left>".$sql->f("quota_current")." / <INPUT TYPE=TEXT NAME=quota VALUE=".$sql->f("quota_max")."></TD></TR>");
 		print("<TR><TD BGCOLOR=$default->table_header_bg align=right>$lang_maxsessions</TD><TD align=left>".($sql->f("maxsessions") + 1)." / <INPUT TYPE=TEXT NAME=maxsessions VALUE=".($sql->f("maxsessions") + 1).">
-<a href=\"index.php?sess=$sess&action=user&owluser=$id&change=0&flush=1\"><IMG SRC='$default->owl_root_url/graphics/admin_flush.gif' BORDER=0 ALT='$lang_flush_sessions_alt' TITLE='$lang_flush_sessions_alt'></a></TD></TR>");
+		<a href=\"index.php?sess=$sess&action=user&owluser=$id&change=0&flush=1\"><IMG SRC='$default->owl_root_url/graphics/admin_flush.gif' BORDER=0 ALT='$lang_flush_sessions_alt' TITLE='$lang_flush_sessions_alt'></a></TD></TR>");
 		print("<TR><TD BGCOLOR=$default->table_header_bg align=right>$lang_password</TD><TD align=left><INPUT TYPE=PASSWORD NAME=password VALUE='".$sql->f("password")."'></TD></TR>");
                 print("<TR><TD BGCOLOR=$default->table_header_bg align=right>$lang_email</TD><TD align=left><INPUT TYPE=TEXT NAME=email VALUE='".$sql->f("email")."'></TD></TR>");
+                
+                // if notify is on ..set its value to checked
                 if ( $sql->f("notify") == 1)
-                    print("<TR><TD BGCOLOR=$default->table_header_bg align=right>$lang_notification</TD><TD align=left><INPUT TYPE=CHECKBOX NAME=notify VALUE=1 checked></TD></TR>");
+                {
+                    	print("<TR><TD BGCOLOR=$default->table_header_bg align=right>$lang_notification</TD><TD align=left><INPUT TYPE=CHECKBOX NAME=notify VALUE=1 checked></TD></TR>");
+                }
                 else
+                {
                     print("<TR><TD BGCOLOR=$default->table_header_bg align=right>$lang_notification</TD><TD align=left><INPUT TYPE=CHECKBOX NAME=notify VALUE=1></TD></TR>");
+                }
+                
+                // if attachfile is on ..set its value to checked
                 if ( $sql->f("attachfile") == 1)
+                {
                     print("<TR><TD BGCOLOR=$default->table_header_bg align=right>$lang_attach_file</TD><TD align=left><INPUT TYPE=CHECKBOX NAME=attachfile VALUE=1 checked></TD></TR>");
+                }
                 else
+                 {
                     print("<TR><TD BGCOLOR=$default->table_header_bg align=right>$lang_attach_file</TD><TD align=left><INPUT TYPE=CHECKBOX NAME=attachfile VALUE=1></TD></TR>");
-		if ($id != 1) {
-                if ( $sql->f("disabled") == 1)
-                    print("<TR><TD BGCOLOR=$default->table_header_bg align=right>$lang_disableuser</TD><TD align=left><INPUT TYPE=CHECKBOX NAME=disabled VALUE=1 checked></TD></TR>");
-                else
-                    print("<TR><TD BGCOLOR=$default->table_header_bg align=right>$lang_disableuser</TD><TD align=left><INPUT TYPE=CHECKBOX NAME=disabled VALUE=1></TD></TR>");
-                if ( $sql->f("noprefaccess") == 1)
-                    print("<TR><TD BGCOLOR=$default->table_header_bg align=right>$lang_noprefaccess</TD><TD align=left><INPUT TYPE=CHECKBOX NAME=noprefaccess VALUE=1 checked></TD></TR>");
-                else
-                    print("<TR><TD BGCOLOR=$default->table_header_bg align=right>$lang_noprefaccess</TD><TD align=left><INPUT TYPE=CHECKBOX NAME=noprefaccess VALUE=1></TD></TR>");
+                 }
+		
+		
+		if ($id != 1) 
+		{
+			// if disabled is on ..set its value to checked
+                	if ( $sql->f("disabled") == 1)
+                    	{
+                    		print("<TR><TD BGCOLOR=$default->table_header_bg align=right>$lang_disableuser</TD><TD align=left><INPUT TYPE=CHECKBOX NAME=disabled VALUE=1 checked></TD></TR>");
+                    	}
+                	else
+                	{
+                    		print("<TR><TD BGCOLOR=$default->table_header_bg align=right>$lang_disableuser</TD><TD align=left><INPUT TYPE=CHECKBOX NAME=disabled VALUE=1></TD></TR>");
+                    	}
+                    	
+                    	// if noprefaccess is on ..set its value to checked
+                	if ( $sql->f("noprefaccess") == 1)
+                	{
+                		print("<TR><TD BGCOLOR=$default->table_header_bg align=right>$lang_noprefaccess</TD><TD align=left><INPUT TYPE=CHECKBOX NAME=noprefaccess VALUE=1 checked></TD></TR>");
+                	}
+                	else
+                	{
+                    		print("<TR><TD BGCOLOR=$default->table_header_bg align=right>$lang_noprefaccess</TD><TD align=left><INPUT TYPE=CHECKBOX NAME=noprefaccess VALUE=1></TD></TR>");
+                    	}
 		}
+		
 		print("</TABLE><BR><INPUT TYPE=SUBMIT VALUE=$lang_change>");
-		if ($sql->f("id") != 1) {
+		
+		// delete user if id != 1
+		if ($sql->f("id") != 1)
+		{
 			print("<INPUT TYPE=SUBMIT NAME=action VALUE='$lang_deleteuser'>");
 		}
@@ -201,31 +303,83 @@ function printuser($id) {
 	}
 }
-function flushsessions($id, $sess) {
+//-------------------------------------------------------------
+/**
+ *   Function flushsessions($id, $sess) 
+ *
+ *   Flushes the session variable form the db
+ *
+ *   @param $id
+ *	The Id of the user
+ *   @param $sess
+ *	The session variable
+*/
+//-------------------------------------------------------------
+// Usable
+function flushsessions($id, $sess) 
+{
   global $default;
   $sql= new Owl_DB;
   $sql->query("delete from $default->owl_sessions_table where uid='$id' AND sessid!='$sess'");
 }
-function printgroup($id) {
+//-------------------------------------------------------------
+/**
+ *   Function printgroup($id) 
+ *
+ *   Prints out the group
+ *
+ *   @param $id
+ *	The Id of the user
+ *   
+*/
+//-------------------------------------------------------------
+// Semi-Usable -> interface based
+
+function printgroup($id) 
+{
 	global $sess,$change,$lang_title,$lang_change,$lang_deletegroup,$lang_saved,$default;
-	if(isset($change)) print("$lang_saved<BR>");
+	
+	if(isset($change))
+	{
+		 print("$lang_saved<BR>");
+	}
+	
 	$sql = new Owl_DB;
 	$sql->query("select id,name from $default->owl_groups_table where id = '$id'");
-	while($sql->next_record()) {
+	
+	// post to dbmodify with several values
+	while($sql->next_record()) 
+	{
 		print("<FORM ACTION='admin_dbmodify.php' METHOD=POST>");
 		print("<INPUT TYPE=HIDDEN NAME=id VALUE=".$sql->f("id").">");
 		print("<INPUT TYPE=HIDDEN NAME=sess VALUE=$sess>");
 		print("<INPUT TYPE=HIDDEN name=action VALUE=group>");
 		print("<TABLE BORDER=$default->table_border><TR><TD BGCOLOR=$default->table_header_bg>$lang_title</TD><TD><INPUT TYPE=text NAME=name VALUE='".$sql->f("name")."'></TD></TR></TABLE>");
 		print("<BR><INPUT TYPE=SUBMIT VALUE=$lang_change>");
-		if($sql->f("id") != 0) print("<INPUT TYPE=SUBMIT NAME=action VALUE='$lang_deletegroup'>");
+		
+		// delete the group
+		if($sql->f("id") != 0) 
+		{
+			print("<INPUT TYPE=SUBMIT NAME=action VALUE='$lang_deletegroup'>");
+		}
 		print("</FORM>");
 	}
 }
-function printnewgroup() {
+//-------------------------------------------------------------
+/**
+ *   Function printnewgroup() 
+ *
+ *   Prints out a new group
+ *
+ 
+*/
+//-------------------------------------------------------------
+// NOT Usable
+function printnewgroup() 
+{
 	global $default, $sess,$lang_title,$lang_add;
 	print("<FORM ACTION='admin_dbmodify.php' METHOD=post>");
 	print("<INPUT TYPE=HIDDEN NAME=action VALUE=add>");
@@ -234,13 +388,24 @@ function printnewgroup() {
 	print("<TABLE BORDER=$default->table_border><TR><TD BGCOLOR=$default->table_header_bg>$lang_title</TD><TD><INPUT TYPE=TEXT NAME=name></TD></TR></TABLE><BR><INPUT TYPE=SUBMIT VALUE=$lang_add></FORM>");
 }
+//-------------------------------------------------------------
+/**
+ *   Function printnewuserr() 
+ *
+ *   Prints out a new user
+ *
+*/
+//-------------------------------------------------------------
+// Semi-Usable
 function printnewuser() {
 	global $sess,$lang_title,$lang_username,$lang_group,$lang_password,$lang_add,$default, $lang_quota,$lang_groupmember;
         global $lang_email, $lang_notification, $lang_noprefaccess, $lang_disableuser, $lang_userlang, $lang_maxsessions, $lang_attach_file; 
 	$sql = new Owl_DB;
 	$sql->query("select id,name from $default->owl_groups_table order by name");
 	$i=0;
-	while($sql->next_record()) {
+	// get all groups
+	while($sql->next_record()) 
+	{
 		$groups[$i][0] = $sql->f("id");
 		$groups[$i][1] = $sql->f("name");
 		$i++;
@@ -252,30 +417,32 @@ function printnewuser() {
 	print("<TABLE BORDER=$default->table_border><TR><TD BGCOLOR=$default->table_header_bg align=right>$lang_title</TD><TD align=left><INPUT TYPE=TEXT NAME=name></TD></TR>");
 	print("<TR><TD BGCOLOR=$default->table_header_bg align=right>$lang_username</TD><TD align=left><INPUT TYPE=TEXT NAME=loginname></TD></TR>");
 	print("<TR><TD BGCOLOR=$default->table_header_bg align=right>$lang_group</TD><TD align=left><SELECT NAME=groupid>");
-	foreach($groups as $g) {
+	
+	foreach($groups as $g) 
+	{
 		print("<OPTION VALUE=$g[0]>$g[1]");
 	}
         print("</SELECT></TD></TR>");
         //*******************************
         // Display the Language dropdown
         //*******************************
-                print("<TR><TD BGCOLOR=$default->table_header_bg align=right>$lang_userlang</TD><TD align=left><SELECT NAME=newlanguage>");
-                                                 $dir = dir($default->owl_LangDir);
-                                                 $dir->rewind();
+        print("<TR><TD BGCOLOR=$default->table_header_bg align=right>$lang_userlang</TD><TD align=left><SELECT NAME=newlanguage>");
+        $dir = dir($default->owl_LangDir);
+        $dir->rewind();
-                                                 while($file=$dir->read())
-                                                        {
-                                                                if ($file != "." and $file != "..")
-                                                                        { 
-                        							//janu's change BEGIN
-                        							print("<OPTION VALUE=$file");
-                        							if ($file == $default->owl_lang)
-                                							print (" SELECTED");
-                        							print(">$file");
-                        							//janu's change END 
-                                                                        }
-                                                        }
-                                         $dir->close();
+        while($file=$dir->read())
+        {
+        	if ($file != "." and $file != "..")
+        	{ 
+                //janu's change BEGIN
+                	print("<OPTION VALUE=$file");
+                	if ($file == $default->owl_lang)
+                        print (" SELECTED");
+                        print(">$file");
+                 //janu's change END 
+                 }
+         }
+                $dir->close();
                 print("</SELECT></TD></TR>");
         // Bozz Change  begin
@@ -283,7 +450,8 @@ function printnewuser() {
         print("<TR><TD BGCOLOR=$default->table_header_bg align=right>$lang_groupmember</TD><TD align=left>");
         $i=0;
-	foreach($groups as $g) {
+	foreach($groups as $g) 
+	{
 		print("<input type='checkbox' name='group$i' value=$g[0]>$g[1]<BR>");
                 $i++;
 	}
@@ -302,6 +470,15 @@ function printnewuser() {
 	print("</TABLE><BR><INPUT TYPE=SUBMIT VALUE=$lang_add></FORM>");
 }
+//-------------------------------------------------------------
+/**
+ *   Function printHTML() 
+ *
+ *   Prints out the required HTML
+ *
+ */
+//-------------------------------------------------------------
+// NOT Usable
 function printhtml() {
         global $default, $sess, $lang_add, $lang_change, $change, $lang_saved;
         global $lang_ht_tbl_border_sz, $lang_ht_tbl_hd_bg, $lang_ht_tbl_cell_bg_cl, $lang_ht_tbl_cell_bg_al, $lang_ht_tbl_bg_cl, $lang_ht_expand_width, $lang_ht_collapse_width, $lang_ht_bd_bg_cl, $lang_ht_bd_txt_cl, $lang_ht_bd_lnk_cl, $lang_ht_bd_vlnk_cl, $lang_ht_bd_width; 
@@ -335,7 +512,15 @@ function printhtml() {
                    <TD align=left><INPUT TYPE=TEXT NAME=body_vlink VALUE='$default->body_vlink'></TD></TR>");
         print("</TABLE><BR><INPUT TYPE=SUBMIT VALUE=$lang_change></FORM>");
 }
-
+//-------------------------------------------------------------
+/**
+ *   Function printPrefs() 
+ *
+ *   Prints out the preferences in a specific format
+ *
+ */
+//-------------------------------------------------------------
+// NOT Usable
 function printprefs() {
         global $default, $sess, $lang_add, $lang_change, $change, $lang_saved;
 	global $lang_owl_title_email, $lang_owl_email_from, $lang_owl_email_fromname, $lang_owl_email_replyto , $lang_owl_email_server, $lang_owl_title_HD, $lang_owl_lookAtHD, $lang_owl_def_file_security, $lang_owl_def_file_group_owner, $lang_owl_def_file_owner, $lang_owl_def_file_title, $lang_owl_def_file_meta , $lang_owl_def_fold_sec, $lang_owl_def_fold_group_owner, $lang_owl_def_fold_owner, $lang_owl_title_other, $lang_owl_max_filesize, $lang_owl_owl_timeout, $lang_owl_owl_expand, $lang_owl_version_control, $lang_owl_restrict_view ;
@@ -358,7 +543,8 @@ function printprefs() {
                    <TD align=left><INPUT TYPE=TEXT NAME=email_server VALUE='$default->owl_email_server' size=30></TD></TR>");
         print("<TR><TD BGCOLOR=$default->main_header_bgcolor align=CENTER colspan=2>$lang_owl_title_HD</TD></TR>");
-	if ( $default->owl_LookAtHD == "false" ){
+	if ( $default->owl_LookAtHD == "false" )
+	{
                	print("<TR><TD BGCOLOR=$default->table_header_bg align=right>$lang_owl_lookAtHD</TD><TD align=left><INPUT TYPE=CHECKBOX NAME=lookAtHD VALUE='false' checked></TD></TR>");
         	print("<INPUT TYPE=HIDDEN NAME=def_file_security VALUE='$default->owl_def_file_security'>");
         	print("<INPUT TYPE=HIDDEN NAME=def_file_group_owner VALUE='$default->owl_def_file_group_owner'>");
@@ -369,103 +555,138 @@ function printprefs() {
         	print("<INPUT TYPE=HIDDEN NAME=def_fold_group_owner VALUE='$default->owl_def_fold_group_owner'>");
         	print("<INPUT TYPE=HIDDEN NAME=def_fold_owner VALUE='$default->owl_def_fold_owner'>");
 	}
-      	else {
+      	else 
+      	{
       		print("<TR><TD BGCOLOR=$default->table_header_bg align=right>$lang_owl_lookAtHD</TD><TD align=left><INPUT TYPE=CHECKBOX NAME=lookAtHD VALUE='false'></TD></TR>");
              	printfileperm($default->owl_def_file_security, "def_file_security", $lang_owl_def_file_security, "user");
-
-
      	   $sql = new Owl_DB;
            $sql->query("select id,name from $default->owl_groups_table");
            $i=0;
-           while($sql->next_record()) {
+           // get all groups
+           while($sql->next_record())
+            {
                    $groups[$i][0] = $sql->f("id");
                    $groups[$i][1] = $sql->f("name");
                    $i++;
-           }
+            }
           print("<TR><TD ALIGN=RIGHT BGCOLOR=$default->table_header_bg>$lang_owl_def_file_group_owner</TD><TD align=left><SELECT NAME=def_file_group_owner>");
-	   foreach($groups as $g) {
-                             print("<OPTION VALUE=$g[0] ");
-                             if($g[0] == $default->owl_def_file_group_owner)
-				print("SELECTED");
-			     print(">$g[1]");
-                          }
+	   
+	   // loop through all groups
+	   foreach($groups as $g)
+	    {
+                 print("<OPTION VALUE=$g[0] ");
+                 if($g[0] == $default->owl_def_file_group_owner)
+	 	 print("SELECTED");
+		 print(">$g[1]");
+             }
                           print("</SELECT></TD></TR>");
      	   $sql = new Owl_DB;
            $sql->query("select id,name from $default->owl_users_table");
            $i=0;
-           while($sql->next_record()) {
+           
+           // get all users
+           while($sql->next_record()) 
+           {
                    $users[$i][0] = $sql->f("id");
                    $users[$i][1] = $sql->f("name");
                    $i++;
            }
           print("<TR><TD ALIGN=RIGHT BGCOLOR=$default->table_header_bg>$lang_owl_def_file_owner</TD><TD align=left><SELECT NAME=def_file_owner>");
-	   foreach($users as $g) {
-                             print("<OPTION VALUE=$g[0] ");
-                             if($g[0] == $default->owl_def_file_owner)
-				print("SELECTED");
-			     print(">$g[1]");
-                          }
-                          print("</SELECT></TD></TR>");
+	   
+	   loop through users
+	   foreach($users as $g) 
+	   {
+                print("<OPTION VALUE=$g[0] ");
+                if($g[0] == $default->owl_def_file_owner)
+	 	print("SELECTED");
+	        print(">$g[1]");
+            }
+                        print("</SELECT></TD></TR>");
         print("<TR><TD BGCOLOR=$default->table_header_bg align=right>$lang_owl_def_file_title</TD>
-                   <TD align=left><INPUT TYPE=TEXT NAME=def_file_title VALUE='$default->owl_def_file_title' size=40></TD></TR>");
+        <TD align=left><INPUT TYPE=TEXT NAME=def_file_title VALUE='$default->owl_def_file_title' size=40></TD></TR>");
         print("<TR><TD BGCOLOR=$default->table_header_bg align=right>$lang_owl_def_file_meta</TD>
-                   <TD align=left><INPUT TYPE=TEXT NAME=def_file_meta VALUE='$default->owl_def_file_meta' size=40></TD></TR>");
-
-             	printgroupperm($default->owl_def_fold_security, "def_fold_security", $lang_owl_def_fold_sec, "user");
-
-          print("<TR><TD ALIGN=RIGHT BGCOLOR=$default->table_header_bg>$lang_owl_def_fold_group_owner</TD><TD align=left><SELECT NAME=def_fold_group_owner>");
-           foreach($groups as $g) {
-                             print("<OPTION VALUE=$g[0] ");
-                             if($g[0] == $default->owl_def_fold_group_owner)
-                                print("SELECTED");
-                             print(">$g[1]");
-                          }
-                          print("</SELECT></TD></TR>");
+        <TD align=left><INPUT TYPE=TEXT NAME=def_file_meta VALUE='$default->owl_def_file_meta' size=40></TD></TR>");
+
+        printgroupperm($default->owl_def_fold_security, "def_fold_security", $lang_owl_def_fold_sec, "user");
+
+        print("<TR><TD ALIGN=RIGHT BGCOLOR=$default->table_header_bg>$lang_owl_def_fold_group_owner</TD><TD align=left><SELECT NAME=def_fold_group_owner>");
+        foreach($groups as $g) 
+           {
+                print("<OPTION VALUE=$g[0] ");
+                if($g[0] == $default->owl_def_fold_group_owner)
+                print("SELECTED");
+                print(">$g[1]");
+            }
+                print("</SELECT></TD></TR>");
-          print("<TR><TD ALIGN=RIGHT BGCOLOR=$default->table_header_bg>$lang_owl_def_fold_owner</TD><TD align=left><SELECT NAME=def_fold_owner>");
-	   foreach($users as $g) {
-                             print("<OPTION VALUE=$g[0] ");
-                             if($g[0] == $default->owl_def_fold_owner)
-				print("SELECTED");
-			     print(">$g[1]");
-                          }
-                          print("</SELECT></TD></TR>");
+         print("<TR><TD ALIGN=RIGHT BGCOLOR=$default->table_header_bg>$lang_owl_def_fold_owner</TD><TD align=left><SELECT NAME=def_fold_owner>");
+	 foreach($users as $g) 
+	 {
+                print("<OPTION VALUE=$g[0] ");
+                if($g[0] == $default->owl_def_fold_owner)
+		print("SELECTED");
+	        print(">$g[1]");
+          }
+                print("</SELECT></TD></TR>");
         }
         print("<TR><TD BGCOLOR=$default->main_header_bgcolor align=CENTER colspan=2>$lang_owl_title_other</TD></TR>");
         print("<TR><TD BGCOLOR=$default->table_header_bg align=right>$lang_owl_max_filesize</TD>
-                   <TD align=left><INPUT TYPE=TEXT NAME=max_filesize VALUE='$default->max_filesize'></TD></TR>");
+        <TD align=left><INPUT TYPE=TEXT NAME=max_filesize VALUE='$default->max_filesize'></TD></TR>");
         print("<TR><TD BGCOLOR=$default->table_header_bg align=right>$lang_owl_owl_timeout</TD>
-                   <TD align=left><INPUT TYPE=TEXT NAME=owl_timeout VALUE='$default->owl_timeout'></TD></TR>");
+        <TD align=left><INPUT TYPE=TEXT NAME=owl_timeout VALUE='$default->owl_timeout'></TD></TR>");
+	//if expansion is true
 	if ( $default->expand == 1 )
-                    print("<TR><TD BGCOLOR=$default->table_header_bg align=right>$lang_owl_owl_expand</TD><TD align=left><INPUT TYPE=CHECKBOX NAME=owl_expand VALUE=1 checked></TD></TR>");
-                else
-                    print("<TR><TD BGCOLOR=$default->table_header_bg align=right>$lang_owl_owl_expand:</TD><TD align=left><INPUT TYPE=CHECKBOX NAME=owl_expand VALUE=1></TD></TR>");
-
+	{
+                print("<TR><TD BGCOLOR=$default->table_header_bg align=right>$lang_owl_owl_expand</TD><TD align=left><INPUT TYPE=CHECKBOX NAME=owl_expand VALUE=1 checked></TD></TR>");
+         }
+         else
+         {
+         	print("<TR><TD BGCOLOR=$default->table_header_bg align=right>$lang_owl_owl_expand:</TD><TD align=left><INPUT TYPE=CHECKBOX NAME=owl_expand VALUE=1></TD></TR>");
+         }
+	
+	// if version control checked
 	if ( $default->owl_version_control == 1 )
-                    print("<TR><TD BGCOLOR=$default->table_header_bg align=right>$lang_owl_version_control</TD><TD align=left><INPUT TYPE=CHECKBOX NAME=version_control VALUE=1 checked></TD></TR>");
-                else
-                    print("<TR><TD BGCOLOR=$default->table_header_bg align=right>$lang_owl_version_control</TD><TD align=left><INPUT TYPE=CHECKBOX NAME=version_control VALUE=1></TD></TR>");
+         {
+         	print("<TR><TD BGCOLOR=$default->table_header_bg align=right>$lang_owl_version_control</TD><TD align=left><INPUT TYPE=CHECKBOX NAME=version_control VALUE=1 checked></TD></TR>");
+         }
+        else
+         {
+         	print("<TR><TD BGCOLOR=$default->table_header_bg align=right>$lang_owl_version_control</TD><TD align=left><INPUT TYPE=CHECKBOX NAME=version_control VALUE=1></TD></TR>");
+         }
+	// restrict view checked if true
 	if ( $default->restrict_view == 1 )
-                    print("<TR><TD BGCOLOR=$default->table_header_bg align=right>$lang_owl_restrict_view</TD><TD align=left><INPUT TYPE=CHECKBOX NAME=restrict_view VALUE=1 checked></TD></TR>");
-                else
-                    print("<TR><TD BGCOLOR=$default->table_header_bg align=right>$lang_owl_restrict_view</TD><TD align=left><INPUT TYPE=CHECKBOX NAME=restrict_view VALUE=1></TD></TR>");
+	{
+              print("<TR><TD BGCOLOR=$default->table_header_bg align=right>$lang_owl_restrict_view</TD><TD align=left><INPUT TYPE=CHECKBOX NAME=restrict_view VALUE=1 checked></TD></TR>");
+        }
+        else
+        {      print("<TR><TD BGCOLOR=$default->table_header_bg align=right>$lang_owl_restrict_view</TD><TD align=left><INPUT TYPE=CHECKBOX NAME=restrict_view VALUE=1></TD></TR>");
+	}
         print("<TR><TD BGCOLOR=$default->main_header_bgcolor align=CENTER colspan=2>$lang_owl_title_tools</TD></TR>");
         print("<TR><TD BGCOLOR=$default->table_header_bg align=right>$lang_owl_dbdump_path</TD>
-                   <TD align=left><INPUT TYPE=TEXT NAME=dbdump_path VALUE='$default->dbdump_path' size=30></TD></TR>");
+        <TD align=left><INPUT TYPE=TEXT NAME=dbdump_path VALUE='$default->dbdump_path' size=30></TD></TR>");
         print("<TR><TD BGCOLOR=$default->table_header_bg align=right>$lang_owl_gzip_path</TD>
-                   <TD align=left><INPUT TYPE=TEXT NAME=gzip_path VALUE='$default->gzip_path' size=30></TD></TR>");
+        <TD align=left><INPUT TYPE=TEXT NAME=gzip_path VALUE='$default->gzip_path' size=30></TD></TR>");
         print("<TR><TD BGCOLOR=$default->table_header_bg align=right>$lang_owl_tar_path</TD>
-                   <TD align=left><INPUT TYPE=TEXT NAME=tar_path VALUE='$default->tar_path' size=30></TD></TR>");
+        <TD align=left><INPUT TYPE=TEXT NAME=tar_path VALUE='$default->tar_path' size=30></TD></TR>");
         print("</TABLE><BR><INPUT TYPE=SUBMIT VALUE=$lang_change></FORM>");
 }
+//-------------------------------------------------------------
+/**
+ *   Function DoBackup() 
+ *
+ *   Does a backup by zipping relevant data
+ *
+ */
+//-------------------------------------------------------------
+// NOT Usable
 function dobackup() {
   global $default;
@@ -484,7 +705,7 @@ function dobackup() {
 }
-
+// if action has been selected..do it..
 if($action) {
 	print("<TABLE WIDTH=$default->table_expand_width BGCOLOR=$default->main_header_bgcolor CELLSPACING=0 CELLPADDING=0 BORDER=$default->table_border HEIGHT=30>");
 	print("<TR><TD WIDTH=200 VALIGN=TOP>");
@@ -503,26 +724,60 @@ if($action) {
 	print("<A HREF='index.php?sess=$sess&action=newgroup'><IMG SRC='$default->owl_root_url/graphics/admin_groups.gif' BORDER=0 ALT='$lang_newgroup_alt' TITLE='$lang_newgroup_alt'></A><BR>");
 	print("<A HREF='index.php?sess=$sess&action=edhtml'><IMG SRC='$default->owl_root_url/graphics/admin_html_prefs.gif' BORDER=0 ALT='$lang_edthtml_alt' TITLE='$lang_edthtml_alt'></A><BR>");
 	print("<A HREF='index.php?sess=$sess&action=edprefs'><IMG SRC='$default->owl_root_url/graphics/admin_site_prefs.gif' BORDER=0 ALT='$lang_edprefs_alt' TITLE='$lang_edprefs_alt'></A><BR>");
-        if (file_exists($default->dbdump_path) && file_exists($default->gzip_path)) {
+        
+        if (file_exists($default->dbdump_path) && file_exists($default->gzip_path)) 
+        {
 		print("<A HREF='index.php?sess=$sess&action=backup'><IMG SRC='$default->owl_root_url/graphics/admin_backup.gif' BORDER=0 ALT='$lang_backup_alt' TITLE='$lang_backup_alt'></A><BR><BR>");
         }
         else {
 		print("<IMG SRC='$default->owl_root_url/graphics/admin_backup_disabled.gif' BORDER=0 ALT='$lang_backup_dis_alt' TITLE='$lang_backup_dis_alt'></A><BR><BR>");
 	}
+
 //	print("<A HREF='upgrade-users.php?sess=$sess'>$lang_upg_MD5</A><BR><BR>");
 	printusers();
 	print("<BR><BR>");
 	printgroups();
 	print("</TD></TR></TABLE>");
 	print("</TD><TD VALIGN=TOP>");
-	if(isset($owluser)) printuser($owluser);
-	if(isset($group)) printgroup($group);
-	if($action == "newgroup") printnewgroup();
-	if($action == "newuser") printnewuser();
-	if($action == "edhtml") printhtml();
-	if($action == "edprefs") printprefs();
+	// if user action selected..print user
+	if(isset($owluser))
+	{
+		 printuser($owluser);
+	}
+	
+	//if group action selected print group
+	if(isset($group)) 
+	{
+		printgroup($group);
+	}
+	
+	// if newgroup action slelected print the new group
+	if($action == "newgroup") 
+	{
+		printnewgroup();
+	}
+	
+	// if the newuser action print the new user
+	if($action == "newuser") 
+	{
+		printnewuser();
+	}
+	
+	//if the edit html action has been selected run the printHTML
+	if($action == "edhtml") 
+	{ 
+		printhtml();
+	}
+	
+	// if edit preferences selected print the preferences
+	if($action == "edprefs") 
+	{
+		printprefs();
+	}
 	print("</TD></TR></TABLE>");
-} else {
+} 
+else 
+{
 	exit("$lang_err_general");
 }
 <?php
-/*
-
-  File: upgrade-users.php
-  Author: Chris
-  Date: 2001/01/24
-
-  Owl: Copyright Chris Vincent <cvincent@project802.net>
-
-  You should have received a copy of the GNU Public
-  License along with this package; if not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
-
-*/
-
+/**
+ * upgrade-users.php
+ *
+ * This is used to upgrade a user's password
+ *
+ * Copyright (c) 1999-2002 The Owl Project Team
+ * Licensed under the GNU GPL. For full terms see the file COPYING.
+ * @version v 1.1.1.1 2002/12/04
+ * @author michael
+ * @package Owl
+ */
+ 
 require("../config/owl.php");
 require("../lib/owl.lib.php");
 require("../config/html.php");
+// this page is used to upgrade a user's password
 print("<CENTER>");
 print("********************** WARNING WARNING WARNING ****************************<BR>");
 print("********************** WARNING WARNING WARNING ****************************<BR>");
@@ -30,13 +28,17 @@ print(&quot;Running through $default-&gt;owl_users_table&lt;BR&gt;&quot;);
 $sql = new Owl_DB;
 $sql->query("select * from $default->owl_users_table");
 $sqlupd = new Owl_DB;
-while($sql->next_record()) {
+while($sql->next_record()) 
+{
 	$userid = $sql->f("id");
 	$password = $sql->f("password");
-        if (strlen($password) <> 32) {
+        if (strlen($password) <> 32)
+         {
 		$sqlupd->query("update $default->owl_users_table set password='" . md5($password) . "' where id = '$userid'");
 		print "Updated user id  $userid: ".$sql->f("username")."<BR>";
-        } else {
+        } 
+        else
+         {
 		print "ALREADY UPGRADED -> $userid: ".$sql->f("username")."<BR>";
         }
 }
 <?php
-/**
+/*
  * browse.php -- Browse page
- * 
- * Browse a list of files/folders
  *
  * Copyright (c) 1999-2002 The Owl Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
@@ -24,7 +22,7 @@ if(!isset($sortname)) $sortname = &quot;ASC&quot;;
 // Daphne change
 if(!isset($sortver)) $sortver = "ASC, minor_revision ASC";
 if(!isset($sortcheckedout)) $sortcheckedout = "ASC";
-// end Daphne change
+// end daphne change
 if(!isset($sortfilename)) $sortfilename = "DESC";
 if(!isset($sortsize)) $sortsize = "DESC";
 if(!isset($sortposted)) $sortposted = "DESC";
@@ -69,7 +67,6 @@ switch ($order) {
 // END 496814 Column Sorts are not persistant
-//if the user does not have permission to view the folder
 if(check_auth($parent, "folder_view", $userid) != "1") {
  	printError($lang_nofolderaccess,"");
 	exit;
@@ -126,47 +123,40 @@ if ($expand == 1) {
 	print("\t\t<HR WIDTH=$default->table_collapse_width>\n");
 }
-/**
-* Creates links that can be sorted
-*
-* @param $column	current column
-* @param $sortname
-* @param $sortvalue	ASC or DESC
-* @param $order		column to order by
-* @param $sess
-* @param $expand
-* @param $parent
-* @param $lang_title
-* @param $url
-*/
-
+//
+// functions to create/show the links to be sorted on
+//
 function show_link($column,$sortname,$sortvalue,$order,$sess,$expand,$parent,$lang_title,$url) {
-	if ($sortvalue == "ASC") {
-	     print("\t\t\t\t<TD align=left><A HREF='browse.php?sess=$sess&expand=$expand&parent=$parent&order=$column&$sortname=DESC' STYLE='toplink'>$lang_title");
-	     if ($order == $column)
-	     {
-	       print("<img border='0' src='$url/graphics/asc.gif' width='16' height='16'></A></TD>");
-	     }
-	     else
-	     {
-	       print("</A></TD>");
-	     }
-	
-	}
-	else {
-	     print("\t\t\t\t<TD align=left><A HREF='browse.php?sess=$sess&expand=$expand&parent=$parent&order=$column&$sortname=ASC' STYLE='toplink'>$lang_title");
-	     if ($order == $column)
-	     {
-	       print("<img border='0' src='$url/graphics/desc.gif' width='16' height='16'></A></TD>");
-	     }
-	     else {
-	       print("</A></TD>");
-	     }
-	}
+                if ($sortvalue == "ASC")
+                {
+                     print("\t\t\t\t<TD align=left><A HREF='browse.php?sess=$sess&expand=$expand&parent=$parent&order=$column&$sortname=DESC' STYLE='toplink'>$lang_title");
+                     if ($order == $column)
+                     {
+                       print("<img border='0' src='$url/graphics/asc.gif' width='16' height='16'></A></TD>");
+                     }
+                     else
+                     {
+                       print("</A></TD>");
+                     }
+
+                }
+                else
+                {
+                     print("\t\t\t\t<TD align=left><A HREF='browse.php?sess=$sess&expand=$expand&parent=$parent&order=$column&$sortname=ASC' STYLE='toplink'>$lang_title");
+                     if ($order == $column)
+                     {
+                       print("<img border='0' src='$url/graphics/desc.gif' width='16' height='16'></A></TD>");
+                     }
+                     else
+                     {
+                       print("</A></TD>");
+                     }
+                }
 }
+
 if ($expand == 1) {
 	print("\t\t\t<TABLE WIDTH=$default->table_expand_width BORDER=$default->table_border><TR BGCOLOR='$default->table_header_bg'>");
         show_link("name","sortname",$sortname,$order,$sess,$expand,$parent,$lang_title,$default->owl_root_url);
@@ -219,9 +209,7 @@ if ($order == &quot;creatorid&quot;) {
 //**********************
 while($sql->next_record()) {
-	//if the current user has a restricted view
 	if($default->restrict_view == 1) {
-		//if the current user does not have permission to view the folder
 		if(!check_auth($sql->f("id"), "folder_view", $userid)) 
 			continue;
 	}
 <?php
-/**
+/*
  * dbmodify.php
  *
- * Performs all file (upload, update, modify, email) and folder (create, modify) 
- * maintenance and management.
- * 
  * Copyright (c) 1999-2002 The Owl Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
  * $Id$
- * @todo line 28, 47, 53- refactor 
  */
 require("./config/owl.php");
@@ -19,591 +15,598 @@ require(&quot;./config/html.php&quot;);
 require("./lib/security.lib.php");
 require("phpmailer/class.phpmailer.php");
-/**
- * Lookup the path to the parent of the passed folder.
- *
- * @param $folderID    the id of the child folder
- * @return string      the name of the parent folder
- */
-function find_path($folderID) {
-    global $default;
-    $path = fid_to_name($folderID);
-    $sql = new Owl_DB;
-    while($folderID != 1) {
-        $sql->query("select parent from $default->owl_folders_table where id = '$folderID'");
-        while($sql->next_record()) {
-            $path = fid_to_name($sql->f("parent"))."/".$path;
-            $folderID = $sql->f("parent");
-        }
+function find_path($parent) {
+	global $default;
+	$path = fid_to_name($parent);
+	$sql = new Owl_DB;
+	while($parent != 1) {
+		$sql->query("select parent from $default->owl_folders_table where id = '$parent'");
+		while($sql->next_record()) {
+			$path = fid_to_name($sql->f("parent"))."/".$path;
+			$parent = $sql->f("parent");
+		}
 	}
 	return $path;
 }
-/**
- * Recursively deletes a folder from the database
- *
- * @param $folderID    the ID of the folder to delete
- */
-function delTree($folderID) {
+function delTree($fid) {
 	global $fCount, $folderList, $default;
 	//delete from database
 	$sql = new Owl_DB;
-	$sql->query("delete from $default->owl_folders_table where id = '$folderID'");
-	$sql->query("delete from $default->owl_files_table where parent = '$folderID'");
-    for ($c=0; $c < $fCount; $c++) {
-        if ($folderList[$c][2]==$folderID) {
-            delTree($folderList[$c][0]);
-        }
-    }
+	$sql->query("delete from $default->owl_folders_table where id = '$fid'");
+	$sql->query("delete from $default->owl_files_table where parent = '$fid'");
+        for ($c=0; $c < $fCount; $c++) {
+                if ($folderList[$c][2]==$fid) {
+                        delTree($folderList[$c][0]);
+                }
+       	}
 }
 // Begin 496814 Column Sorts are not persistant
 // + ADDED &order=$order&$sortorder=$sortname to
 // all browse.php?  header and HREF LINES
+
 switch ($order) {
-    case "name":
-        $sortorder = 'sortname';
-        break;
-    case "major_revision":
-        $sortorder = 'sortver';
-        break;
-    case "filename" :
-        $sortorder = 'sortfilename';
-        break;
-    case "size" :
-        $sortorder = 'sortsize';
-        break;
-    case "creatorid" :
-        $sortorder = 'sortposted';
-        break;
-    case "smodified" :
-        $sortorder = 'sortmod';
-        break;
-    case "checked_out":
-        $sortorder = 'sortcheckedout';
-        break;
-    default:
-        break;
+     case "name":
+           $sortorder = 'sortname';
+           break;
+     case "major_revision":
+           $sortorder = 'sortver';
+           break;
+     case "filename" :
+           $sortorder = 'sortfilename';
+           break;
+     case "size" :
+           $sortorder = 'sortsize';
+           break;
+     case "creatorid" :
+           $sortorder = 'sortposted';
+           break;
+     case "smodified" :
+           $sortorder = 'sortmod';
+           break;
+     case "checked_out":
+           $sortorder = 'sortcheckedout';
+           break;
+     default:
+          break;
 }
-// END 496814 Column Sorts are not persistant
+// END 496814 Column Sorts are not persistant
 // BEGIN BUG FIX: #433932 Fileupdate and Quotas
 if($action == "file_update") {
-    if(check_auth($parent, "folder_modify", $userid) == 1) {
-        //if($title == "") exit($lang_specifyname);
-        $userfile = uploadCompat("userfile");
-        $sql = new Owl_DB;
-        $sql->query("select * from $default->owl_users_table where id = '$userid'");
+	if(check_auth($parent, "folder_modify", $userid) == 1) {
+		//if($title == "") exit($lang_specifyname);
+		$userfile = uploadCompat("userfile");
+		$sql = new Owl_DB;
+		$sql->query("select * from $default->owl_users_table where id = '$userid'");
 		while($sql->next_record()) { 
-            $quota_max = $sql->f("quota_max");
-            $quota_current = $sql->f("quota_current");
-            //$new_quota = $quota_current + $userfile_size;
+			$quota_max = $sql->f("quota_max");
+			$quota_current = $sql->f("quota_current");
+			//$new_quota = $quota_current + $userfile_size;
 		}
 		$new_name = ereg_replace("[^-A-Za-z0-9._]", "", ereg_replace(" ", "_", ereg_replace("%20|^-", "_", $userfile["name"])));
 		$newpath = $default->owl_FileDir."/".find_path($parent)."/".$new_name;
-        /* Begin Daphne Change - backups of files
-         * If user requests automatic backups of files 
-         * get current details from db and save file state information
-         */
-        if ($default->owl_version_control == 1) {
-            if ($default->owl_use_fs) {
-                $sql->query("select * from $default->owl_files_table where filename='$new_name' and parent='$parent'");
-            } else {
-                // this is guaranteed to get the ID of the most recent revision, just in case we're updating a previous rev.
-                $sql->query("select distinct b.* from $default->owl_files_table as a, $default->owl_files_table as b where b.id='$id' AND a.name=b.name AND a.parent=b.parent order by major_revision, minor_revision desc");
-       		}
+                /* Begin Daphne Change - backups of files
+                 * If user requests automatic backups of files 
+                 * get current details from db and save file state information
+                 */
+                if ($default->owl_version_control == 1) {
+
+          		if ($default->owl_use_fs)
+            		{
+              			$sql->query("select * from $default->owl_files_table where filename='$new_name' and parent='$parent'");
+            		}
+          		else
+            		{
+              			// this is guaranteed to get the ID of the most recent revision, just in case we're updating a previous rev.
+              			$sql->query("select distinct b.* from $default->owl_files_table as a, $default->owl_files_table as b where b.id='$id' AND a.name=b.name AND a.parent=b.parent order by major_revision, minor_revision desc");
+            		}
 			//$query = "select b.* from $default->owl_files_table as a, $default->owl_files_table as b where a.id='$id' AND a.name=b.name AND a.parent=b.parent order by major_revision, minor_revision desc";
 			//printError("QU: $query");
-            while($sql->next_record()) {
-                // save state information
-                $major_revision = $backup_major = $sql->f("major_revision");
-                $minor_revision = $backup_minor = $sql->f("minor_revision");
-                $backup_filename = $sql->f("filename");
-                $backup_name = $sql->f("name");
-                $backup_size = $sql->f("size");
-                $backup_creatorid = $sql->f("creatorid");
-                $backup_modified = $sql->f("modified");
-                $backup_smodified = $sql->f("smodified");
-                $backup_description = $sql->f("description");
-                $backup_description = ereg_replace("'","\\'",$backup_description);
-                $backup_metadata = $sql->f("metadata");
-                $backup_parent = $sql->f("parent");
-                $backup_security = $sql->f("security");
-                $backup_groupid = $groupid = $sql->f("groupid");
-
-                $new_quota = $quota_current - $backup_size + $userfile['size'];
-                $filename = $sql->f(filename);
-                $title = $sql->f(name);
-                $description = $sql->f(description);
-                
-                if ($default->owl_use_fs) {	
-                    if ($default->owl_FileDir."/".find_path($parent)."/".$sql->f(filename) != $newpath) {
-                        printError("$lang_err_file_update","");
-                    }
+                        while($sql->next_record()) {
+                                // save state information
+                                $major_revision = $backup_major = $sql->f("major_revision");
+                                $minor_revision = $backup_minor = $sql->f("minor_revision");
+                                $backup_filename = $sql->f("filename");
+                                $backup_name = $sql->f("name");
+                                $backup_size = $sql->f("size");
+                                $backup_creatorid = $sql->f("creatorid");
+                                $backup_modified = $sql->f("modified");
+                                $backup_smodified = $sql->f("smodified");
+                                $backup_description = $sql->f("description");
+                                $backup_description = ereg_replace("'","\\'",$backup_description);
+                                $backup_metadata = $sql->f("metadata");
+                                $backup_parent = $sql->f("parent");
+                                $backup_security = $sql->f("security");
+                                $backup_groupid = $groupid = $sql->f("groupid");
+
+              			$new_quota = $quota_current - $backup_size + $userfile['size'];
+                        	$filename = $sql->f(filename);
+                        	$title = $sql->f(name);
+                        	$description = $sql->f(description);
+
+              			if ($default->owl_use_fs)
+                		{	
+                  			if ($default->owl_FileDir."/".find_path($parent)."/".$sql->f(filename) != $newpath)
+                    				printError("$lang_err_file_update","");
+                		}
+
+                        }
                 }
-            }
-        }
-        // End Daphne Change
-        
+
+                // End Daphne Change
+
 		//$newpath = $default->owl_fs_root."/".find_path($parent)."/".$new_name;
 		//$newpath = $default->owl_FileDir."/".find_path($parent)."/".$new_name;
-        //***neller: Read data from database
-        //$sql->query("select * from $default->owl_files_table where id='$id'");
-        //while($sql->next_record()) {
-            //if ($default->owl_fs_root."/".find_path($parent)."/".$sql->f(filename) != $newpath) {
-            //if ($default->owl_FileDir."/".find_path($parent)."/".$sql->f(filename) != $newpath) {
-                //printError("$lang_err_file_update","");
-            //}
-            //$new_quota = $quota_current - $sql->f(size) + $userfile_size;
-            //$filename = $sql->f(filename);
-            //$title = $sql->f(name);
-            //$description = $sql->f(description);
-        //}
-        if (($new_quota > $quota_max) && ($quota_max != "0")) {
-            printError("$lang_err_quota".$new_quota."$lang_err_quota_needed".($quota_max - $quota_current)."$lang_err_quota_avail","");
-            if(($quota_max - $quota_current) == "0") {
-                printError("$lang_err_quota_exceed");
-            }
-        }
-        // End neller
-
-        // BEGIN wes change       
-        if ($default->owl_use_fs) {
-            /* Begin Daphne Change
-             * copy old version to backup folder
-             * change version numbers, 
-             * update database entries
-             * upload new file over the old
-             * backup filename will be 'name_majorrev-minorrev' e.g. 'testing_1-2.doc'
-             */           
-            if ($default->owl_version_control == 1) {
-                if(!(file_exists($newpath)==1) || $backup_filename != $new_name){
-                    printError("$lang_err_file_update","");
+                //***neller: Read data from database
+                //$sql->query("select * from $default->owl_files_table where id='$id'");
+                //while($sql->next_record()) {
+                        //if ($default->owl_fs_root."/".find_path($parent)."/".$sql->f(filename) != $newpath)
+                        //if ($default->owl_FileDir."/".find_path($parent)."/".$sql->f(filename) != $newpath)
+                            //printError("$lang_err_file_update","");
+                        //$new_quota = $quota_current - $sql->f(size) + $userfile_size;
+                        //$filename = $sql->f(filename);
+                        //$title = $sql->f(name);
+                        //$description = $sql->f(description);
+                //}
+                if (($new_quota > $quota_max) && ($quota_max != "0")) {
+                        printError("$lang_err_quota".$new_quota."$lang_err_quota_needed".($quota_max - $quota_current)."$lang_err_quota_avail","");
+                        if(($quota_max - $quota_current) == "0")
+                                printError("$lang_err_quota_exceed");
                 }
-                // Get the file extension.
-                $extension = explode(".",$new_name);
-                // rename the new, backed up (versioned) filename
-                $version_name = $extension[0]."_$major_revision-$minor_revision.$extension[1]";
-                // specify path for new file in the /backup/ file of each directory.
-                $backuppath = $default->owl_FileDir."/".find_path($parent)."/backup/$version_name";
-
-                if(!is_dir("$default->owl_FileDir/".find_path($parent)."/backup")) {
-                    // Danilo change
-                    mkdir("$default->owl_FileDir/".find_path($parent)."/backup", 0777);
-                    // End Danilo change
-                    // is there already a backup directory for current dir?
-                    if(is_dir("$default->owl_FileDir/".find_path($parent)."/backup")) {
-                        $sql->query("INSERT into $default->owl_folders_table (name, parent, security, groupid, creatorid)  values ('backup', '$parent', '50', '$groupid', '$userid')");
-                    } else {
-                        printError("$lang_err_backup_folder_create","");
-                    }
-                }
-                copy($newpath,$backuppath); // copy existing file to backup folder
-            }
-            // End Daphne Change 
-
-            if(!file_exists($newpath) == 1) {
-                printError("$lang_err_file_update","");
-            }
-            copy($userfile['tmp_name'], $newpath);
-            unlink($userfile['tmp_name']);
-            if(!file_exists($newpath)) {
-                if ($default->debug == true) {
-                    printError($lang_err_upload,$newpath);
-                } else {
-                    printError($lang_err_upload,"");
+                // End neller
+
+                /* Begin Daphne Change
+                 * copy old version to backup folder
+                 * change version numbers, 
+                 * update database entries
+                 * upload new file over the old
+                 * backup filename will be 'name_majorrev-minorrev' e.g. 'testing_1-2.doc'
+                 */
+
+                      // BEGIN wes change
+      if ($default->owl_use_fs)
+        {
+		if ($default->owl_version_control == 1) {
+                        if(!(file_exists($newpath)==1) || $backup_filename != $new_name) printError("$lang_err_file_update","");
+                        // Get the file extension.
+                        $extension = explode(".",$new_name);
+                        // rename the new, backed up (versioned) filename
+                        $version_name = $extension[0]."_$major_revision-$minor_revision.$extension[1]";
+                        // specify path for new file in the /backup/ file of each directory.
+                        $backuppath = $default->owl_FileDir."/".find_path($parent)."/backup/$version_name";
+
+                        // Danilo change
+			
+                        if(!is_dir("$default->owl_FileDir/".find_path($parent)."/backup")) {
+                                mkdir("$default->owl_FileDir/".find_path($parent)."/backup", 0777);
+
+                        // End Danilo change
+
+
+
+                        // is there already a backup directory for current dir?
+                                if(is_dir("$default->owl_FileDir/".find_path($parent)."/backup")) {
+                                        $sql->query("INSERT into $default->owl_folders_table (name, parent, security, groupid, creatorid)  values ('backup', '$parent', '50', '$groupid', '$userid')");
+                                } else {
+                                        printError("$lang_err_backup_folder_create","");
+                                }
+                        }
+                        copy($newpath,$backuppath); // copy existing file to backup folder
                 }
+                // End Daphne Change 
+
+		if(!file_exists($newpath) == 1) printError("$lang_err_file_update","");
+		copy($userfile['tmp_name'], $newpath);
+		unlink($userfile['tmp_name']);
+		if(!file_exists($newpath))
+			if ($default->debug == true)
+                          printError($lang_err_upload,$newpath);
+                        else
+                          printError($lang_err_upload,"");
                 // Begin Daphne Change
                 if ($default->owl_version_control == 1) {
-                    if(!file_exists($backuppath)) {
-                        die ("$lang_err_backup_file");
-                    }
-                    // find id of the backup folder you are saving the old file to
-                    $sql->query("Select id from $default->owl_folders_table where name='backup' and parent='$parent'");
-                    while($sql->next_record()) {
-                        $backup_parent = $sql->f("id");
-                    }
-                }
-            }
+                        if(!file_exists($backuppath)) die ("$lang_err_backup_file");
-            if($versionchange == 'major_revision') {
-                // if someone requested a major revision, must
-                // make the minor revision go back to 0
-                //$versionchange = "minor_revision='0', major_revision";
-                //$new_version_num = $major_revision + 1;
-                $new_major = $major_revision + 1;
-                $new_minor = 0;
-                $versionchange = "minor_revision='0', major_revision";
-                $new_version_num = $major_revision + 1;
-            } else {
-                // simply increment minor revision number
-                $new_version_num = $minor_revision + 1;
+                        // find id of the backup folder you are saving the old file to
+                        $sql->query("Select id from $default->owl_folders_table where name='backup' and parent='$parent'");
+                        while($sql->next_record()) {
+                                $backup_parent = $sql->f("id");
+                        }
+		}
+	  }
+
+                        if($versionchange == 'major_revision') {
+                                // if someone requested a major revision, must
+                                // make the minor revision go back to 0
+                                //$versionchange = "minor_revision='0', major_revision";
+                                //$new_version_num = $major_revision + 1;
+          			$new_major = $major_revision + 1;
+          			$new_minor = 0;
+          			$versionchange = "minor_revision='0', major_revision";
+          			$new_version_num = $major_revision + 1;
+
+                        }
+                        else {
+                                // simply increment minor revision number
+                                $new_version_num = $minor_revision + 1;
 				$new_minor = $minor_revision + 1;
-                $new_major = $major_revision;
-            }
-            //	printError("old: $minor_revision", "New: $new_minor");
-            // End Daphne Change
-
-            $groupid = owlusergroup($userid);
-            $modified = date("M d, Y \a\\t h:i a");
-            $smodified = date("Y-m-d g:i:s");
-
-            // Begin Daphne Change
-            if ($default->owl_version_control == 1) {
-                if ($default->owl_use_fs) {
-                    // insert entry for backup file
-                    // WORKING WORKING
-                    $sql->query("INSERT into $default->owl_files_table (name,filename,size,creatorid,parent,modified, smodified,groupid,description,metadata,security,major_revision,minor_revision) values ('$backup_name','$version_name','$backup_size','$backup_creatorid','$backup_parent','$backup_modified', '$backup_smodified','$backup_groupid', '$backup_description','$backup_metadata','$backup_security','$backup_major','$backup_minor')") or unlink($backuppath);
-
-                    // update entry for existing file. Bozz's code is repeated underneath,
-                    // without the versioning attribute included.
-
-                    // BEGIN Bozz Change
-                    // Added this check, if the policy is allow Read Write NO DELETE
-                    // we have to make sure that the Creator is not changed.
-                    // in the case of an updated, that would then allow a user to
-                    // delete the file.  Only the original Creator should be allowed
-                    // to delete the file.
-                    if ( getfilepolicy($id) == 5 || getfilepolicy($id) == 6) {
-                        // Daphne addition -- $versionchange = $new_version_num
-                        $sql->query("UPDATE $default->owl_files_table set size='".$userfile['size']."',modified='$modified',smodified='$smodified', $versionchange='$new_version_num', description='$newdesc' where id='$id'") or unlink($newpath);
-               		} else {
-                        // Daphne addition -- $versionchange = $new_version_num
-                        $sql->query("UPDATE $default->owl_files_table set size='".$userfile['size']."',creatorid='$userid',modified='$modified',smodified='$smodified', $versionchange='$new_version_num',description='$newdesc'  where id='$id'") or unlink($newpath);
-               		}
-                } else {
-                    // BEGIN wes change
-              		// insert entry for current version of file
-                    $compressed = '0';
-                    $userfile = uploadCompat("userfile");
-                    $fsize = filesize($userfile['tmp_name']);
-                    $sql->query("INSERT into $default->owl_files_table (name,filename,size,creatorid,parent,modified, smodified,groupid,description,metadata,security,major_revision,minor_revision) values ('$backup_name','".$userfile['name']."','".$userfile['size']."','$backup_creatorid','$parent','$modified', '$smodified','$backup_groupid', '$newdesc', '$backup_metadata','$backup_security','$new_major','$new_minor')");
-                    $id = $sql->insert_id();
-                    
-                    if ($default->owl_compressed_database && file_exists($default->gzip_path)) {
-                        system($default->gzip_path . " " . escapeshellarg($userfile['tmp_name']));
-                        $fd = fopen($userfile['tmp_name'] . ".gz", 'rb');
-                        $userfile['tmp_name'] = $userfile['tmp_name'] . ".gz";
-                        $fsize = filesize($userfile['tmp_name']);
-                        $compressed = '1';
-                    } else {
-                        $fd = fopen($userfile['tmp_name'], 'rb');
-                    }
-                    $filedata = addSlashes(fread($fd, $fsize));
-                    fclose($fd);
-
-                    if ($id !== NULL && $filedata) {
-                        $sql->query("insert into $default->owl_files_data_table (id, data, compressed) values ('$id', '$filedata','$compressed')");
-                    }
-                    // END wes change
+          			$new_major = $major_revision;
+                        }
+
+ //	printError("old: $minor_revision", "New: $new_minor");
+                // End Daphne Change
+
+                $groupid = owlusergroup($userid);
+		$modified = date("M d, Y \a\\t h:i a");
+                $smodified = date("Y-m-d g:i:s");
+
+                // Begin Daphne Change
+                if ($default->owl_version_control == 1) {
+			if ($default->owl_use_fs)
+            		{
+                        	// insert entry for backup file
+                        	// WORKING WORKING
+                        	$sql->query("INSERT into $default->owl_files_table (name,filename,size,creatorid,parent,modified, smodified,groupid,description,metadata,security,major_revision,minor_revision) values ('$backup_name','$version_name','$backup_size','$backup_creatorid','$backup_parent','$backup_modified', '$backup_smodified','$backup_groupid', '$backup_description','$backup_metadata','$backup_security','$backup_major','$backup_minor')") or unlink($backuppath);
+
+                        	// update entry for existing file. Bozz's code is repeated underneath,
+                        	// without the versioning attribute included.
+
+
+                        	// BEGIN Bozz Change
+                        	// Added this check, if the policy is allow Read Write NO DELETE
+                        	// we have to make sure that the Creator is not changed.
+                        	// in the case of an updated, that would then allow a user to
+                        	// delete the file.  Only the original Creator should be allowed
+                        	// to delete the file.
+                        	if ( getfilepolicy($id) == 5 || getfilepolicy($id) == 6)
+                        	{
+                        		// Daphne addition -- $versionchange = $new_version_num
+                        		$sql->query("UPDATE $default->owl_files_table set size='".$userfile['size']."',modified='$modified',smodified='$smodified', $versionchange='$new_version_num', description='$newdesc' where id='$id'") or unlink($newpath);
+                		}
+                		else
+                		{
+                        		// Daphne addition -- $versionchange = $new_version_num
+                        		$sql->query("UPDATE $default->owl_files_table set size='".$userfile['size']."',creatorid='$userid',modified='$modified',smodified='$smodified', $versionchange='$new_version_num',description='$newdesc'  where id='$id'") or unlink($newpath);
+                		}
+			} else {
+				// BEGIN wes change
+              			// insert entry for current version of file
+				$compressed = '0';
+				$userfile = uploadCompat("userfile");
+                  		$fsize = filesize($userfile['tmp_name']);
+              			$sql->query("INSERT into $default->owl_files_table (name,filename,size,creatorid,parent,modified, smodified,groupid,description,metadata,security,major_revision,minor_revision) values ('$backup_name','".$userfile['name']."','".$userfile['size']."','$backup_creatorid','$parent','$modified', '$smodified','$backup_groupid', '$newdesc', '$backup_metadata','$backup_security','$new_major','$new_minor')");
+              			$id = $sql->insert_id();
+
+              			
+
+
+
+				if ($default->owl_compressed_database && file_exists($default->gzip_path)) {
+                			system($default->gzip_path . " " . escapeshellarg($userfile['tmp_name']));
+                			$fd = fopen($userfile['tmp_name'] . ".gz", 'rb');
+                  			$userfile['tmp_name'] = $userfile['tmp_name'] . ".gz";
+                  			$fsize = filesize($userfile['tmp_name']);
+					$compressed = '1';
+              			} else {
+                			$fd = fopen($userfile['tmp_name'], 'rb');
+              			}
+              				$filedata = addSlashes(fread($fd, $fsize));
+              			fclose($fd);
+			
+              			if ($id !== NULL && $filedata) {
+                			$sql->query("insert into $default->owl_files_data_table (id, data, compressed) values ('$id', '$filedata','$compressed')");
+              			}
+              			// END wes change
+			}
+                        // END Bozz Change
+
                 }
-                // END Bozz Change
-            } else {  // versioning not included in the DB update
-                if ($default->owl_use_fs) {
-                    // BEGIN Bozz Change
-                    if ( getfilepolicy($id) == 5 || getfilepolicy($id) == 6) {
-                        $sql->query("update $default->owl_files_table set size='".$userfile['size']."',modified='$modified',smodified='$smodified' where id='$id'") or unlink($newpath);
-                	} else {
-                        $sql->query("update $default->owl_files_table set size='".$userfile['size']."',creatorid='$userid',modified='$modified',smodified='$smodified' where id='$id'") or unlink($newpath);
+
+                else {  // versioning not included in the DB update
+			if ($default->owl_use_fs)
+	            	{
+                        // BEGIN Bozz Change
+                        if ( getfilepolicy($id) == 5 || getfilepolicy($id) == 6)
+                        {
+                        	$sql->query("update $default->owl_files_table set size='".$userfile['size']."',modified='$modified',smodified='$smodified' where id='$id'") or unlink($newpath);
                 	}
-                    // END Bozz Change
-                }
-            }
-            // End Daphne Change
+                	else
+                	{
+                        	$sql->query("update $default->owl_files_table set size='".$userfile['size']."',creatorid='$userid',modified='$modified',smodified='$smodified' where id='$id'") or unlink($newpath);
+                	}
+                        // END Bozz Change
+                } 
+		}
-            if ($quota_max != "0") {
-                $sql->query("update $default->owl_users_table set quota_current = '$new_quota' where id = '$userid'");
-            }
+                // End Daphne Change
+
+		if ($quota_max != "0") $sql->query("update $default->owl_users_table set quota_current = '$new_quota' where id = '$userid'");
-            //notify_users($groupid,1, find_path($parent),$filename, $title, $newdesc);
-            notify_users($groupid,1,$parent,$filename, $title, $newdesc, $type);
-            header("Location: browse.php?sess=$sess&parent=$parent&expand=$expand&order=$order&$sortorder=$sortname");
-            // END BUG FIX: #433932 Fileupdate and Quotas
-        } else {
-            include("./lib/header.inc");
-            print("<TABLE WIDTH=$default->table_expand_width BGCOLOR=$default->main_header_bgcolor CELLSPACING=0 CELLPADDING=0 BORDER=$default->table_border HEIGHT=30>
-            	   <TR><TD ALIGN=LEFT>");
-            print("$lang_user: ");
-            print("<A HREF='prefs.php?owluser=$userid&sess=$sess&expand=$expand'>");
-            print uid_to_name($userid);
-            print ("</A>");
-            print ("<FONT SIZE=-1>");
-            print("<A HREF='index.php?login=logout&sess=$sess'>$lang_logout</A>
-                   </FONT></TD>
-                   <TD ALIGN=RIGHT>
-                   <A HREF='browse.php?sess=$sess&parent=$parent&expand=$expand&order=$order&$sortorder=$sortname'><IMG SRC='$default->owl_root_url/locale/$language/graphics/btn_browse.gif' BORDER=0></A>
-                   </TD></TR></TABLE><BR><BR>");
-            print($lang_noupload);
-        }
-    }
+		//notify_users($groupid,1, find_path($parent),$filename, $title, $newdesc);
+		notify_users($groupid,1,$parent,$filename, $title, $newdesc, $type);
+		header("Location: browse.php?sess=$sess&parent=$parent&expand=$expand&order=$order&$sortorder=$sortname");
+// END BUG FIX: #433932 Fileupdate and Quotas
+	} else {
+		include("./lib/header.inc");
+		print("<TABLE WIDTH=$default->table_expand_width BGCOLOR=$default->main_header_bgcolor CELLSPACING=0 CELLPADDING=0 BORDER=$default->table_border HEIGHT=30>");
+		?>
+		<TR><TD ALIGN=LEFT>
+<?php print("$lang_user: ");
+      print("<A HREF='prefs.php?owluser=$userid&sess=$sess&expand=$expand'>");
+      print uid_to_name($userid);
+      print ("</A>");
+?>
+<FONT SIZE=-1>
+
+		<?php print("<A HREF='index.php?login=logout&sess=$sess'>$lang_logout</A>");?>
+		    </FONT></TD>
+		    <TD ALIGN=RIGHT><?php print("<A HREF='browse.php?sess=$sess&parent=$parent&expand=$expand&order=$order&$sortorder=$sortname'><IMG SRC='$default->owl_root_url/locale/$language/graphics/btn_browse.gif' BORDER=0></A>"); ?>
+			</TD></TR></TABLE><BR><BR>
+		<?php
+		print($lang_noupload);
+	}
 }
+
 if($action == "file_upload") {
-    if(check_auth($parent, "folder_modify", $userid) == 1) {
-        //if($title == "") exit($lang_specifyname);	
-        $groupid = owlusergroup($userid);
-        $sql = new Owl_DB;
-        $userfile = uploadCompat("userfile");
-        if ($type == "url") {
-            $modified = date("M d, Y \a\\t h:i a");
-            $smodified = date("Y-m-d g:i:s");
-            $new_name = $userfile["name"];
-            if ($title == "") {
-                $title = $userfile["name"];
-            }
-            $sql->query("insert into $default->owl_files_table (name,filename,size,creatorid,parent,modified,description,metadata,security,groupid,smodified,checked_out, major_revision, minor_revision, url) values ('$title', '".$userfile["name"]."', '".$userfile["size"]."', '$userid', '$parent', '$modified', '$description', '$metadata', '$security', '$groupid','$smodified','$checked_out','$major_revision','1','1')");
-		} else {
-            $sql->query("select * from $default->owl_users_table where id = '$userid'");
-            while($sql->next_record()) { 
-                $quota_max = $sql->f("quota_max");
-                $quota_current = $sql->f("quota_current");
-                $new_quota = $quota_current + $userfile["size"];
-            }
-            if (($new_quota > $quota_max) && ($quota_max != "0")) {
-                die("$lang_err_quota".$new_quota."$lang_err_quota_needed".($quota_max - $quota_current)."$lang_err_quota_avail");
-                if(($quota_max - $quota_current) == "0") {
-                    die("$lang_err_quota_exceed");
-                }
-            }
-            $new_name = ereg_replace("[^-A-Za-z0-9._]", "", ereg_replace(" ", "_", ereg_replace("%20|^-", "_", $userfile["name"])));
-
-            if ($default->owl_use_fs) {
-                $newpath = $default->owl_FileDir."/".find_path($parent)."/".$new_name;
-                if(file_exists($newpath) == 1) { 
-                    if ($default->debug == true) {
-                        printError($lang_fileexists,$newpath);
-                    } else {
-                        printError($lang_fileexists,"");
-                    }
-                }
+	if(check_auth($parent, "folder_modify", $userid) == 1) {
+		//if($title == "") exit($lang_specifyname);	
+		$groupid = owlusergroup($userid);
+		$sql = new Owl_DB;
+		$userfile = uploadCompat("userfile");
+                if ($type == "url") {
+			$modified = date("M d, Y \a\\t h:i a");
+                	$smodified = date("Y-m-d g:i:s");
+                        $new_name = $userfile["name"];
+                        if ($title == "")
+                        $title = $userfile["name"];
+                	$sql->query("insert into $default->owl_files_table (name,filename,size,creatorid,parent,modified,description,metadata,security,groupid,smodified,checked_out, major_revision, minor_revision, url) values ('$title', '".$userfile["name"]."', '".$userfile["size"]."', '$userid', '$parent', '$modified', '$description', '$metadata', '$security', '$groupid','$smodified','$checked_out','$major_revision','1','1')");
+		}
+                else {
+		$sql->query("select * from $default->owl_users_table where id = '$userid'");
+		while($sql->next_record()) { 
+			$quota_max = $sql->f("quota_max");
+			$quota_current = $sql->f("quota_current");
+			$new_quota = $quota_current + $userfile["size"];
+		}
+		if (($new_quota > $quota_max) && ($quota_max != "0")) {
+
+                        die("$lang_err_quota".$new_quota."$lang_err_quota_needed".($quota_max - $quota_current)."$lang_err_quota_avail");
+                        if(($quota_max - $quota_current) == "0")
+                                die("$lang_err_quota_exceed");
+		}
+		$new_name = ereg_replace("[^-A-Za-z0-9._]", "", ereg_replace(" ", "_", ereg_replace("%20|^-", "_", $userfile["name"])));
-                copy($userfile["tmp_name"], $newpath);
-                unlink($userfile["tmp_name"]);
-                if(!file_exists($newpath)) { 
-                    if ($default->debug == true) {
-                        printError($lang_err_upload,$newpath);
-                    } else {
-                        printError($lang_err_upload,"");
-                    }
-                } else {
+		if ($default->owl_use_fs)
+                  {
+		$newpath = $default->owl_FileDir."/".find_path($parent)."/".$new_name;
+		if(file_exists($newpath) == 1) 
+			if ($default->debug == true)
+                          printError($lang_fileexists,$newpath);
+                        else
+                          printError($lang_fileexists,"");
+
+		copy($userfile["tmp_name"], $newpath);
+		unlink($userfile["tmp_name"]);
+		if(!file_exists($newpath)) 
+        		if ($default->debug == true)
+                          printError($lang_err_upload,$newpath);
+                        else
+                          printError($lang_err_upload,"");
+                }
+		else {
                     // is name already used?
-                    //printError("SQL", "select filename from $default->owl_files_table where filename = '$new_name' and parent='$parent'");
+		    //printError("SQL", "select filename from $default->owl_files_table where filename = '$new_name' and parent='$parent'");
                     $sql->query("select filename from $default->owl_files_table where filename = '$new_name' and parent='$parent'");
-                    while($sql->next_record()) {
+                    while($sql->next_record())
+                      {
                         if ($sql->f("filename")) {
                           // can't move...
                           printError("<b>File Exists:</b>","There is already a file with the name <i>$new_name</i> in this directory.","");
-                          // print("<A HREF='browse.php?sess=$sess&parent=$parent&expand=$expand&order=$order&$sortorder=$sortname'>$lang_return</A><P>");
+		//	print("<A HREF='browse.php?sess=$sess&parent=$parent&expand=$expand&order=$order&$sortorder=$sortname'>$lang_return</A><P>");
                           // needs to be internationalized
                           //exit("<b>File Exists:</b> There is already a file with the name <i>$title</i> in this directory.");
                         }
-                    }
-                }
+                      }
+
+		}
                 /* BEGIN Bozz Change
                    If your not part of the Administartor Group
                    the Folder will have your group ID assigned to it */
-                if ( owlusergroup($userid) != 0 ) {
-                    $groupid = owlusergroup($userid);
+
+                if ( owlusergroup($userid) != 0 )
+                {
+                   $groupid = owlusergroup($userid);
                 }
                 // Bozz Change End
-                $modified = date("M d, Y \a\t h:i a");
+		$modified = date("M d, Y \a\t h:i a");
                 $smodified = date("Y-m-d g:i:s");
-                if($title == "") {
-                    $title = $new_name;
-                }
-                if($major_revision == "") {
-                    $major_revision = 0;
-                }
-                if($minor_revision == "") {
-                    $minor_revision = 1;
-                }
-                if($checked_out == "") {
-                    $checked_out = 0;
-                }
+		if($title == "") $title = $new_name;
+                if($major_revision == "") $major_revision = 0;
+                if($minor_revision == "") $minor_revision = 1;
+                if($checked_out == "") $checked_out = 0;
                 // WORKING WORKING
-                $compressed = '0';
-                $userfile = uploadCompat("userfile");
-                $fsize = $userfile['size'];
+		$compressed = '0';
+		$userfile = uploadCompat("userfile");
+		$fsize = $userfile['size'];
                 if (!$default->owl_use_fs && $default->owl_compressed_database && file_exists($default->gzip_path)) {
-                    system($default->gzip_path . " " . escapeshellarg($userfile['tmp_name']));
-                    $userfile['tmp_name'] = $userfile['tmp_name'] . ".gz";
-                    $fsize = filesize($userfile['tmp_name']);
-                    $compressed = '1';
+                  system($default->gzip_path . " " . escapeshellarg($userfile['tmp_name']));
+                  $userfile['tmp_name'] = $userfile['tmp_name'] . ".gz";
+                  $fsize = filesize($userfile['tmp_name']);
+                  $compressed = '1';
                 }
                 $result = $sql->query("insert into $default->owl_files_table (name,filename,size,creatorid,parent,modified,description,metadata,security,groupid,smodified,checked_out, major_revision, minor_revision, url) values ('$title', '$new_name', '".$userfile['size']."', '$userid', '$parent', '$modified', '$description', '$metadata', '$security', '$groupid','$smodified','$checked_out','$major_revision','$minor_revision', '0')") or unlink($newpath);
-                if (!$result && $default->owl_use_fs) {
-                    unlink($newpath);
-                }
+                if (!$result && $default->owl_use_fs) unlink($newpath);
                 // BEGIN wes change
                 if (!$default->owl_use_fs) {
-                    $id = $sql->insert_id();
-                    $fd = fopen($userfile['tmp_name'], 'rb');
-                    $filedata = addSlashes(fread($fd, $fsize));
-                    fclose($fd);
-                    
-                    if ($id !== NULL && $filedata) {
-                        $sql->query("insert into $default->owl_files_data_table (id, data, compressed) values ('$id', '$filedata', '$compressed')");
-                    }
+                  $id = $sql->insert_id();
+                  $fd = fopen($userfile['tmp_name'], 'rb');
+                  $filedata = addSlashes(fread($fd, $fsize));
+                  fclose($fd);
+
+                  if ($id !== NULL && $filedata) {
+                    $sql->query("insert into $default->owl_files_data_table (id, data, compressed) values ('$id', '$filedata', '$compressed')");
+                  }
                 }
-                if ($quota_max != "0") {
-                    $sql->query("update $default->owl_users_table set quota_current = '$new_quota' where id = '$userid'");
+
+		if ($quota_max != "0") $sql->query("update $default->owl_users_table set quota_current = '$new_quota' where id = '$userid'");
                 }
-            }
-            notify_users($groupid,0,$parent,$new_name, $title, $description, $type);
-            header("Location: browse.php?sess=$sess&parent=$parent&expand=$expand&order=$order&$sortorder=$sortname");
+                notify_users($groupid,0,$parent,$new_name, $title, $description, $type);
+
+		header("Location: browse.php?sess=$sess&parent=$parent&expand=$expand&order=$order&$sortorder=$sortname");
 	} else {
 		include("./lib/header.inc");
 		print("<TABLE WIDTH=$default->table_expand_width BGCOLOR=$default->main_header_bgcolor CELLSPACING=0 CELLPADDING=0 BORDER=$default->table_border HEIGHT=30>");
-?>
+		?>
 		<TR><TD ALIGN=LEFT>
-<?php
-        print("$lang_user: ");
-        print("<A HREF='prefs.php?owluser=$userid&sess=$sess&expand=$expand'>");
-        print uid_to_name($userid);
-        print ("</A>");
-?>
-        <FONT SIZE=-1>
-<?php
-        print("<A HREF='index.php?login=logout&sess=$sess'>$lang_logout</A>");
-?>
-	    </FONT></TD>
-	    <TD ALIGN=RIGHT><?php print("<A HREF='browse.php?sess=$sess&parent=$parent&expand=$expand&order=$order&$sortorder=$sortname'><IMG SRC='$default->owl_root_url/locale/$language/graphics/btn_browse.gif' BORDER=0></A>"); ?>
-		</TD></TR></TABLE><BR><BR><CENTER>
-<?php
+                <?php print("$lang_user: ");
+                      print("<A HREF='prefs.php?owluser=$userid&sess=$sess&expand=$expand'>");
+                      print uid_to_name($userid);
+                      print ("</A>");
+                ?>
+<FONT SIZE=-1>
+
+		<?php print("<A HREF='index.php?login=logout&sess=$sess'>$lang_logout</A>");?>
+		    </FONT></TD>
+		    <TD ALIGN=RIGHT><?php print("<A HREF='browse.php?sess=$sess&parent=$parent&expand=$expand&order=$order&$sortorder=$sortname'><IMG SRC='$default->owl_root_url/locale/$language/graphics/btn_browse.gif' BORDER=0></A>"); ?>
+			</TD></TR></TABLE><BR><BR><CENTER>
+		<?php
 		print($lang_noupload);
 	}
 }
 if($action == "file_modify") {
-    if(check_auth($id, "file_modify", $userid) == 1) {
-        $sql = new Owl_DB;
-        // Begin Bozz Change
-        if ( owlusergroup($userid) != 0 && $groupid == "" ) {
-            $groupid = owlusergroup($userid);
-        }
+	if(check_auth($id, "file_modify", $userid) == 1) {
+		$sql = new Owl_DB;
+                // Begin Bozz Change
+                if ( owlusergroup($userid) != 0 && $groupid == "" )
+                {
+                   $groupid = owlusergroup($userid);
+                }
+
+
 		// BEGIN WES change
-        if (!$default->owl_use_fs) {
-            $name = flid_to_name($id);
-            if ($name != $title) {
-                // we're changing the name ... need to roll this to other revisions
-                // is name already used?
-                $sql->query("select name from $default->owl_files_table where name = '$title' and parent='$parent'");
-                while($sql->next_record()) {
-                    if ($sql->f("name")) {
-                        // can't move...
-                        //print("<A HREF='browse.php?sess=$sess&parent=$parent&expand=$expand&order=$order&$sortorder=$sortname'>$lang_return</A><P>");
-                        // needs to be internationalized
-                        printError("<b>File Exists:</b> There is already a file with the name <i>$title</i> in this directory.","");
-                    }
+      if (!$default->owl_use_fs)
+        {
+
+          $name = flid_to_name($id);
+          if ($name != $title)
+            {
+              // we're changing the name ... need to roll this to other revisions
+              // is name already used?
+              $sql->query("select name from $default->owl_files_table where name = '$title' and parent='$parent'");
+              while($sql->next_record())
+                {
+                  if ($sql->f("name")) {
+                    // can't move...
+                    //print("<A HREF='browse.php?sess=$sess&parent=$parent&expand=$expand&order=$order&$sortorder=$sortname'>$lang_return</A><P>");
+                    // needs to be internationalized
+                    printError("<b>File Exists:</b> There is already a file with the name <i>$title</i> in this directory.","");
+                  }
                 }
-                $sql->query("update $default->owl_files_table set name='$title' where parent='$parent' AND name = '$name'");
+              $sql->query("update $default->owl_files_table set name='$title' where parent='$parent' AND name = '$name'");
             }
         }
 		$sql->query("update $default->owl_files_table set name='$title', security='$security', metadata='$metadata', description='$description',groupid='$groupid', creatorid ='$file_owner' where id = '$id'");
-        // End Bozz Change
+                // End Bozz Change
 		header("Location: browse.php?sess=$sess&parent=$parent&expand=$expand&order=$order&$sortorder=$sortname");
 	} else {
 		include("./lib/header.inc");
 		print("<TABLE WIDTH=$default->table_expand_width BGCOLOR=$default->main_header_bgcolor CELLSPACING=0 CELLPADDING=0 BORDER=$default->table_border HEIGHT=30>");
-?>
+		?>
 		<TR><TD ALIGN=LEFT>
-<?php
-        print("$lang_user: ");
-	 	if(prefaccess($userid)) {
-            print("<A HREF='prefs.php?owluser=$userid&sess=$sess&expand=$expand&order=$order&$sortorder=$sortname'>");
-        }
-        print uid_to_name($userid);
-        print ("</A>");
-?>
-        <FONT SIZE=-1>
-
-<?php
-        print("<A HREF='index.php?login=logout&sess=$sess'>$lang_logout</A>");
-?>
-        </FONT></TD>
-		<TD ALIGN=RIGHT><?php print("<A HREF='browse.php?sess=$sess&parent=$parent&expand=$expand&order=$order&$sortorder=$sortname'><IMG SRC='$default->owl_root_url/locale/$language/graphics/btn_browse.gif' BORDER=0></A>"); ?>
-		</TD></TR></TABLE><BR><BR><CENTER>
-<?php
+                <?php print("$lang_user: ");
+	  		if(prefaccess($userid)) {
+                      		print("<A HREF='prefs.php?owluser=$userid&sess=$sess&expand=$expand&order=$order&$sortorder=$sortname'>");
+      			}
+                      print uid_to_name($userid);
+                      print ("</A>");
+                ?>
+<FONT SIZE=-1>
+
+		<?php print("<A HREF='index.php?login=logout&sess=$sess'>$lang_logout</A>");?>
+		    </FONT></TD>
+		    <TD ALIGN=RIGHT><?php print("<A HREF='browse.php?sess=$sess&parent=$parent&expand=$expand&order=$order&$sortorder=$sortname'><IMG SRC='$default->owl_root_url/locale/$language/graphics/btn_browse.gif' BORDER=0></A>"); ?>
+			</TD></TR></TABLE><BR><BR><CENTER>
+		<?php
 		exit($lang_nofilemod);
 	}
 }
 if($action == "file_delete") {
-    if(check_auth($id, "file_delete", $userid) == 1) {
-        $sql = new Owl_DB;
-        if ($type == "url") {
-            $sql->query("delete from $default->owl_files_table where id = '$id'");
-        } else {
+if(check_auth($id, "file_delete", $userid) == 1) {
+		$sql = new Owl_DB;
+                if ($type == "url")
+                {
+			$sql->query("delete from $default->owl_files_table where id = '$id'");
+                }
+                else {
 			$sql->query("select * from $default->owl_files_table where id = '$id'");
 			while($sql->next_record()) {
-                $path = find_path($sql->f("parent"));
-                $filename = $sql->f("filename");
-                $filesize = $sql->f("size");
-                $owner = $sql->f("creatorid");
+				$path = find_path($sql->f("parent"));
+				$filename = $sql->f("filename");
+				$filesize = $sql->f("size");
+				$owner = $sql->f("creatorid");
 			}
-            
 			$sql->query("select * from $default->owl_users_table where id = '$owner'");
 			while($sql->next_record()) {
 				$quota_current = $sql->f("quota_current");
 				$quota_max = $sql->f("quota_max");
 			}
-            
 			$new_quota = $quota_current - $filesize;
-			if($quota_max != "0") {
-                $sql->query("update $default->owl_users_table set quota_current = '$new_quota' where id = '$owner'");
-            }
+			if($quota_max != "0") $sql->query("update $default->owl_users_table set quota_current = '$new_quota' where id = '$owner'");
-            if($default->owl_use_fs) {
-                unlink($default->owl_FileDir."/".$path."/".$filename);
-            } else {
-                $sql->query("delete from $default->owl_files_data_table where id = '$id'");
-            }
+                	if($default->owl_use_fs) {
+                  		unlink($default->owl_FileDir."/".$path."/".$filename);
+                	} else {
+                  		$sql->query("delete from $default->owl_files_data_table where id = '$id'");
+                	}
 			$sql->query("delete from $default->owl_files_table where id = '$id'");
 			sleep(.5);
-        }
+                }
 		header("Location: browse.php?sess=$sess&parent=$parent&expand=$expand&order=$order&$sortorder=$sortname");
 	} else {
 		include("./lib/header.inc");
 		print("<TABLE WIDTH=$default->table_expand_width BGCOLOR=$default->main_header_bgcolor CELLSPACING=0 CELLPADDING=0 BORDER=$default->table_border HEIGHT=30>");
-?>
+		?>
 		<TR><TD ALIGN=LEFT>
-<?php
-        print("$lang_user: ");
-        print("<A HREF='prefs.php?owluser=$userid&sess=$sess&expand=$expand'>");
-        print uid_to_name($userid);
-        print ("</A>");
+<?php print("$lang_user: ");
+      print("<A HREF='prefs.php?owluser=$userid&sess=$sess&expand=$expand'>");
+      print uid_to_name($userid);
+      print ("</A>");
 ?>
-        <FONT SIZE=-1>
-<?php
-        print("<A HREF='index.php?login=logout&sess=$sess'>$lang_logout</A>");
-?>
-        </FONT></TD>
-		<TD ALIGN=RIGHT><?php print("<A HREF='browse.php?sess=$sess&parent=$parent&expand=$expand&order=$order&$sortorder=$sortname'><IMG SRC='$default->owl_root_url/locale/$language/graphics/btn_browse.gif' BORDER=0></A>"); ?>
-		</TD></TR></TABLE><BR><BR><CENTER>
-<?php
+<FONT SIZE=-1>
+		<?php print("<A HREF='index.php?login=logout&sess=$sess'>$lang_logout</A>");?>
+		    </FONT></TD>
+		    <TD ALIGN=RIGHT><?php print("<A HREF='browse.php?sess=$sess&parent=$parent&expand=$expand&order=$order&$sortorder=$sortname'><IMG SRC='$default->owl_root_url/locale/$language/graphics/btn_browse.gif' BORDER=0></A>"); ?>
+			</TD></TR></TABLE><BR><BR><CENTER>
+		<?php
 		exit($lang_nofiledelete);
 	}
 }
-
 // Begin Daphne Change
 // the file policy authorisation has been taken from file_modify
 // (it's assumed that if you can't modify the file you can't check it out)
+
 if($action == "file_lock") {
-    if(check_auth($id, "file_modify", $userid) == 1) {
-        $sql = new Owl_DB;
-        // Begin Bozz Change
-        if ( owlusergroup($userid) != 0 ) {
-            $groupid = owlusergroup($userid);
-        }
+        if(check_auth($id, "file_modify", $userid) == 1) {
+                $sql = new Owl_DB;
+                // Begin Bozz Change
+                if ( owlusergroup($userid) != 0 )
+                {
+                   $groupid = owlusergroup($userid);
+                }
         // check that file hasn't been reserved while updates have gone through
         $sql->query("select checked_out from $default->owl_files_table where id = '$id'");
@@ -612,301 +615,299 @@ if($action == &quot;file_lock&quot;) {
         }
         if ($file_lock == 0) {
-            // reserve the file
-            $sql->query("update $default->owl_files_table set checked_out='$userid' where id='$id'");
+                        // reserve the file
+                $sql->query("update $default->owl_files_table set checked_out='$userid' where id='$id'");
+        }
+        else {
+                        if ($file_lock == $userid) {
+                                // check the file back in
+                                $sql->query("update $default->owl_files_table set checked_out='0' where id='$id'");
+                        }
+                        else {
+                                // throw error; someone else is trying to lock the file!
+                                include("./lib/header.inc");
+				print("<TABLE WIDTH=$default->table_expand_width BGCOLOR=$default->main_header_bgcolor CELLSPACING=0 CELLPADDING=0 BORDER=$default->table_border HEIGHT=30>");
+                                ?>
+                                <TR><TD ALIGN=LEFT>
+                                <?php print("$lang_user: ");
+                                      print("<A HREF='prefs.php?owluser=$userid&sess=$sess&expand=$expand'>");
+                                 print uid_to_name($userid);
+                                 print ("</A>");
+                                ?>
+<FONT SIZE=-1>
+
+                                <?php print("<A HREF='index.php?login=logout&sess=$sess'>$lang_logout</A>");?>
+                                    </FONT></TD>
+                                        <TD ALIGN=RIGHT><?php print("<A HREF='browse.php?sess=$sess&parent=$parent&expand=$expand&order=$order&$sortorder=$sortname'><IMG SRC='$default->owl_root_url/locale/$language/graphics/btn_browse.gif' BORDER=0></A>"); ?>
+                                        </TD></TR></TABLE><BR><BR><CENTER>
+                                <?php
+                                exit("$lang_err_file_lock ".uid_to_name($file_lock).".");
+                        }
+        }
+
+        header("Location: browse.php?sess=$sess&parent=$parent&expand=$expand&order=$order&$sortorder=$sortname");
+
+
         } else {
-            if ($file_lock == $userid) {
-                // check the file back in
-                $sql->query("update $default->owl_files_table set checked_out='0' where id='$id'");
-            } else {
-                // throw error; someone else is trying to lock the file!
                 include("./lib/header.inc");
-				print("<TABLE WIDTH=$default->table_expand_width BGCOLOR=$default->main_header_bgcolor CELLSPACING=0 CELLPADDING=0 BORDER=$default->table_border HEIGHT=30>
-                       <TR><TD ALIGN=LEFT>");
-                print("$lang_user: ");
-                print("<A HREF='prefs.php?owluser=$userid&sess=$sess&expand=$expand'>");
-                print uid_to_name($userid);
-                print("</A>");
-                print("<FONT SIZE=-1>"
-                print("<A HREF='index.php?login=logout&sess=$sess'>$lang_logout</A>");
-?>
-                        </FONT></TD>
-                        <TD ALIGN=RIGHT><?php print("<A HREF='browse.php?sess=$sess&parent=$parent&expand=$expand&order=$order&$sortorder=$sortname'><IMG SRC='$default->owl_root_url/locale/$language/graphics/btn_browse.gif' BORDER=0></A>"); ?>
+		print("<TABLE WIDTH=$default->table_expand_width BGCOLOR=$default->main_header_bgcolor CELLSPACING=0 CELLPADDING=0 BORDER=$default->table_border HEIGHT=30>");
+                ?>
+                <TR><TD ALIGN=LEFT>
+                <?php print("$lang_user: ");
+                      print("<A HREF='prefs.php?owluser=$userid&sess=$sess&expand=$expand'>");
+                      print uid_to_name($userid);
+                      print ("</A>");
+                ?>
+<FONT SIZE=-1>
+
+                <?php print("<A HREF='index.php?login=logout&sess=$sess'>$lang_logout</A>");?>
+                    </FONT></TD>
+                    <TD ALIGN=RIGHT><?php print("<A HREF='browse.php?sess=$sess&parent=$parent&expand=$expand&order=$order&$sortorder=$sortname'><IMG SRC='$default->owl_root_url/locale/$language/graphics/btn_browse.gif' BORDER=0></A>"); ?>
                         </TD></TR></TABLE><BR><BR><CENTER>
-<?php
-                exit("$lang_err_file_lock ".uid_to_name($file_lock).".");
-            }
+                <?php
+                exit($lang_nofilemod);
         }
-        header("Location: browse.php?sess=$sess&parent=$parent&expand=$expand&order=$order&$sortorder=$sortname");
-    } else {
-        include("./lib/header.inc");
-		print("<TABLE WIDTH=$default->table_expand_width BGCOLOR=$default->main_header_bgcolor CELLSPACING=0 CELLPADDING=0 BORDER=$default->table_border HEIGHT=30>");
-?>
-               <TR><TD ALIGN=LEFT>
-<?php   
-        print("$lang_user: ");
-        print("<A HREF='prefs.php?owluser=$userid&sess=$sess&expand=$expand'>");
-        print uid_to_name($userid);
-        print ("</A>");
-?>
-        <FONT SIZE=-1>
-<?php   
-        print("<A HREF='index.php?login=logout&sess=$sess'>$lang_logout</A>");
-?>
-        </FONT></TD>
-        <TD ALIGN=RIGHT>
-<?php   
-        print("<A HREF='browse.php?sess=$sess&parent=$parent&expand=$expand&order=$order&$sortorder=$sortname'><IMG SRC='$default->owl_root_url/locale/$language/graphics/btn_browse.gif' BORDER=0></A>"); 
-?>
-        </TD></TR></TABLE><BR><BR><CENTER>
-<?php
-        exit($lang_nofilemod);
-    }
 }
 // End Daphne Change
 if($action == "file_email") {
-    if(check_auth($parent, "folder_modify", $userid) == 1) {
-        $sql = new Owl_DB;
+
+        if(check_auth($parent, "folder_modify", $userid) == 1) {
+
+		$sql = new Owl_DB;
 		$path="";
-        $filename= flid_to_filename($id);
+        	$filename= flid_to_filename($id);
 		if ($default->owl_use_fs) {
-            $fID=$parent;
-        	do {
-                $sql->query("select name,parent from $default->owl_folders_table where id='$fID'");
-                while($sql->next_record()) {
-                    $tName = $sql->f("name");
-                    $fID = $sql->f("parent");
-                }
-                $path=$tName."/".$path;
-            } while ($fID != 0);
+        		$fID=$parent;
+        		do {
+                		$sql->query("select name,parent from $default->owl_folders_table where id='$fID'");
+                		while($sql->next_record()) {
+                        		$tName = $sql->f("name");
+                        		$fID = $sql->f("parent");
+                		}
+                		$path=$tName."/".$path;
+        		} while ($fID != 0);
 		}
-        $sql->query("select name, filename, description from $default->owl_files_table where id='$id'");
-        $sql->next_record();
-        $name=  $sql->f("name");
-        $desc=  $sql->f("description");
+                $sql->query("select name, filename, description from $default->owl_files_table where id='$id'");
+                $sql->next_record();
+                $name=  $sql->f("name");
+                $desc=  $sql->f("description");
 		$filename = $sql->f("filename");
 		$mail = new phpmailer();
+
 		$mail->IsSMTP();                                      // set mailer to use SMTP
 		$mail->Host = "$default->owl_email_server";        // specify main and backup server
 		$mail->From = "$default->owl_email_from";
 		$mail->FromName = "$default->owl_email_fromname";
-        $r=preg_split("(\;|\,)",$mailto);
-        reset ($r);
-        while (list ($occ, $email) = each ($r)) { 
+                $r=preg_split("(\;|\,)",$mailto);
+                reset ($r);
+                while (list ($occ, $email) = each ($r)) 
 			$mail->AddAddress($email);
-        }
-		if($replyto == "" ) { 
+		if($replyto == "" ) 
 			$mail->AddReplyTo("$default->owl_email_replyto", "OWL Intranet");
-		} else {
+		else
 			$mail->AddReplyTo("$replyto");
-        }
-		if($ccto != "") {
-            $mail->AddCC("$ccto");
-        }
+		if($ccto != "")
+                  $mail->AddCC("$ccto");
+
 		$mail->WordWrap = 50;                                 // set word wrap to 50 characters
 		$mail->IsHTML(true);                                  // set email format to HTML
 		$mail->Subject = "$lang_file: $name  -- $subject";
-        if ($type != "url") {
-            $mail->Body    = "$mailbody" . "<BR><BR>" . "$lang_description: <BR><BR>$desc";
-            $mail->altBody = "$mailbody" . "\n\n" . "$lang_description: \n\n $desc";
+                if ($type != "url") {
+			$mail->Body    = "$mailbody" . "<BR><BR>" . "$lang_description: <BR><BR>$desc";
+			$mail->altBody = "$mailbody" . "\n\n" . "$lang_description: \n\n $desc";
 			// BEGIN wes change
-            if (!$default->owl_use_fs) {
-                if (file_exists("$default->owl_FileDir/$path$filename")) {
-                    unlink("$default->owl_FileDir/$path$filename");
-                }
-                $file = fopen("$default->owl_FileDir/$path$filename", 'wb');
-                $sql->query("select data,compressed from $default->owl_files_data_table where id='$id'");
-                while ($sql->next_record()) {
-                    if ($sql->f("compressed")) {
-                        $tmpfile = $default->owl_FileDir . "owltmp.$id.gz";
-                        $uncomptmpfile = $default->owl_FileDir . "owltmp.$id";
-                        if (file_exists($tmpfile)) {
-                            unlink($tmpfile);
-                        }
-
-                        $fp=fopen($tmpfile,"w");
-                        fwrite($fp, $sql->f("data"));
-                        fclose($fp);
-
-                        system($default->gzip_path . " -df $tmpfile");
-
-                        $fsize = filesize($uncomptmpfile);
-                        $fd = fopen($uncomptmpfile, 'rb');
-                        $filedata = fread($fd, $fsize);
-                        fclose($fd);
-
-                        fwrite($file, $filedata);
-                        unlink($uncomptmpfile);
-                    } else {
-                        fwrite($file, $sql->f("data"));
-                    }
+                	if (!$default->owl_use_fs) {
+                  		if (file_exists("$default->owl_FileDir/$path$filename")) {
+                    			unlink("$default->owl_FileDir/$path$filename");
+                  		}
+                  		$file = fopen("$default->owl_FileDir/$path$filename", 'wb');
+                  		$sql->query("select data,compressed from $default->owl_files_data_table where id='$id'");
+                  		while ($sql->next_record()) {
+					if ($sql->f("compressed")) {
+
+                                		$tmpfile = $default->owl_FileDir . "owltmp.$id.gz";
+                                		$uncomptmpfile = $default->owl_FileDir . "owltmp.$id";
+                                		if (file_exists($tmpfile)) unlink($tmpfile);
+
+                                		$fp=fopen($tmpfile,"w");
+                                		fwrite($fp, $sql->f("data"));
+                                		fclose($fp);
+
+                                		system($default->gzip_path . " -df $tmpfile");
+
+                                		$fsize = filesize($uncomptmpfile);
+                                		$fd = fopen($uncomptmpfile, 'rb');
+                                		$filedata = fread($fd, $fsize);
+                                		fclose($fd);
+
+                                		fwrite($file, $filedata);
+                                		unlink($uncomptmpfile);
+                        		} else {
+                                		fwrite($file, $sql->f("data"));
+                        		}
 				}
-                fclose($file);
-            }
+                                fclose($file);
+                	}
 			$mail->AddAttachment("$default->owl_FileDir/$path$filename");
-        } else {
+                } 
+                else {
 			$mail->Body    = "$filename" . "<BR><BR>" . "$mailbody" . "<BR><BR>" . "$lang_description: <BR><BR>$desc";
 			$mail->altBody = "$filename" . "\n\n" ."$mailbody" . "\n\n" . "$lang_description: \n\n $desc";
-        }
+                }
-		if(!$mail->Send()) {
-            printError($lang_err_email, $mail->ErrorInfo);
-            //printError("Server:$default->owl_email_server<BR>File:$default->owl_FileDir/$path$filename ", $mail->ErrorInfo);
+		if(!$mail->Send())
+		{
+                        printError($lang_err_email, $mail->ErrorInfo);
+                        //printError("Server:$default->owl_email_server<BR>File:$default->owl_FileDir/$path$filename ", $mail->ErrorInfo);
 		}
 		if (!$default->owl_use_fs) {
-            unlink("$default->owl_FileDir/$path$filename");
-        }
+                  unlink("$default->owl_FileDir/$path$filename");
+                }
+
 	}
 }
+
 if($action == "folder_create") {
 	if(check_auth($parent, "folder_modify", $userid) == 1) {
-        $sql = new Owl_DB;
+                $sql = new Owl_DB;
 		//we have to be careful with the name just like with the files
-        //Comment this one out TRACKER : 603887, this was not done for renaming a folder
-        // So lets see if it causes problems while creating folders.
+                //Comment this one out TRACKER : 603887, this was not done for renaming a folder
+                // So lets see if it causes problems while creating folders.
 		// Seems it causes a problem, so I put it back.
 		$name = ereg_replace("[^-A-Za-z0-9._[:space:]]", "", ereg_replace("%20|^-", " ", $name));
 		$sql->query("select * from $default->owl_folders_table where name = '$name' and parent = '$parent'");
-		if($sql->num_rows() > 0) { 
-            printError("$lang_err_folder_exist","");
-        }
+		if($sql->num_rows() > 0) 
+		 	printError("$lang_err_folder_exist","");
-        if ( $name == '') {
-            printError($lang_err_nameempty,"");
-        }
+                if ( $name == '')
+		   printError($lang_err_nameempty,"");
 		if($default->owl_use_fs) {
 			$path = find_path($parent);
 			mkdir($default->owl_FileDir."/".$path."/".$name, 0777);
 			if(!is_dir("$default->owl_FileDir/$path/$name")) {
-                if ($default->debug == true) {
-                    printError($lang_err_folder_create,"$default->owl_FileDir/$path/$name");
-                } else {
-                    printError($lang_err_folder_create,"");
-                }
-            }
+			 	if ($default->debug == true)
+                          		printError($lang_err_folder_create,"$default->owl_FileDir/$path/$name");
+                        	else
+                        	  	printError($lang_err_folder_create,"");
+                        }
+		}
 			$sql->query("insert into $default->owl_folders_table (name,parent,security,groupid,creatorid) values ('$name', '$parent', '$policy', '$groupid', '$userid')");
-            header("Location: browse.php?sess=$sess&parent=$parent&expand=$expand&order=$order&$sortorder=$sortname");
-        }
-    } else {
-        include("./lib/header.inc");
-        print("<TABLE WIDTH=$default->table_expand_width BGCOLOR=$default->main_header_bgcolor CELLSPACING=0 CELLPADDING=0 BORDER=$default->table_border HEIGHT=30>");
-?>
-        <TR><TD ALIGN=LEFT>
-<?php 
-        print("$lang_user: ");
-        print("<A HREF='prefs.php?owluser=$userid&sess=$sess&expand=$expand'>");
-        print uid_to_name($userid);
-        print ("</A>");
-?>
-        <FONT SIZE=-1>
-<?php 
-        print("<A HREF='index.php?login=logout&sess=$sess'>$lang_logout</A>");
-?>
-        </FONT></TD>
-        <TD ALIGN=RIGHT>
-<?php 
-        print("<A HREF='browse.php?sess=$sess&parent=$parent&expand=$expand&order=$order&$sortorder=$sortname'><IMG SRC='$default->owl_root_url/locale/$language/graphics/btn_browse.gif' BORDER=0></A>"); 
-?>
-        </TD></TR></TABLE><BR><BR><CENTER>
-<?php
-        exit($lang_nosubfolder);
-    }
+		header("Location: browse.php?sess=$sess&parent=$parent&expand=$expand&order=$order&$sortorder=$sortname");
+	} else {
+		include("./lib/header.inc");
+		print("<TABLE WIDTH=$default->table_expand_width BGCOLOR=$default->main_header_bgcolor CELLSPACING=0 CELLPADDING=0 BORDER=$default->table_border HEIGHT=30>");
+		?>
+		<TR><TD ALIGN=LEFT>
+                <?php print("$lang_user: ");
+                      print("<A HREF='prefs.php?owluser=$userid&sess=$sess&expand=$expand'>");
+                      print uid_to_name($userid);
+                      print ("</A>");
+                ?>
+<FONT SIZE=-1>
+
+		<?php print("<A HREF='index.php?login=logout&sess=$sess'>$lang_logout</A>");?>
+		    </FONT></TD>
+		    <TD ALIGN=RIGHT><?php print("<A HREF='browse.php?sess=$sess&parent=$parent&expand=$expand&order=$order&$sortorder=$sortname'><IMG SRC='$default->owl_root_url/locale/$language/graphics/btn_browse.gif' BORDER=0></A>"); ?>
+			</TD></TR></TABLE><BR><BR><CENTER>
+		<?php
+		exit($lang_nosubfolder);
+	}
 }
 if($action == "folder_modify") {
-    if(check_auth($id, "folder_modify", $userid) == 1) {
-        $sql = new Owl_DB;
-        $origname = fid_to_name($id);
+	if(check_auth($id, "folder_modify", $userid) == 1) {
+		$sql = new Owl_DB;
+		$origname = fid_to_name($id);
 		$sql->query("select parent from $default->owl_folders_table where id = '$id'");
-		while($sql->next_record()) {
-            $parent = $sql->f("parent");
-        }
+		while($sql->next_record()) $parent = $sql->f("parent");
 		$path = $default->owl_FileDir."/".find_path($parent)."/";
-        $source = $path . $origname;
+                $source = $path . $origname;
 		$name = ereg_replace("[^-A-Za-z0-9._[:space:]]", "", ereg_replace("%20|^-", " ", $name));
-        $dest = $path . $name;
+                $dest   = $path . $name;
 		if ($default->owl_use_fs) {
-            if (!file_exists($path . $name) == 1 || $source == $dest) {
-                if (substr(php_uname(), 0, 7) != "Windows") {
-                    if ($source != $dest) {
-                        $cmd="mv \"$path$origname\" \"$path$name\" 2>&1";
-                        $lines=array();$errco=0;
-                        $result = myExec($cmd,$lines,$errco);
-                        if ( $errco != 0 ) {
-                            printError($lang_err_movecancel, $result);
-                        }
-                    }
-                } else {
-                    // IF Windows just do a rename and hope for the best
-                    rename ("$path$origname", "$path$name"); 
+                	if (!file_exists($path . $name) == 1 || $source == $dest) {
+             			if (substr(php_uname(), 0, 7) != "Windows") {
+                        		if ($source != $dest) {
+						$cmd="mv \"$path$origname\" \"$path$name\" 2>&1";
+                        			$lines=array();$errco=0;
+                        			$result = myExec($cmd,$lines,$errco);
+                        			if ( $errco != 0 )
+                                			printError($lang_err_movecancel, $result);
+					}
+                		}
+                		else {
+                        		// IF Windows just do a rename and hope for the best
+                        		rename ("$path$origname", "$path$name"); 
+                     		}
+
+                	}
+                	else 
+                		printError($lang_err_folderexists,"");
+		}
+		else {
+                	$sql->query("select * from $default->owl_folders_table where parent = '$parent' and name = '$name'");
+			if ($sql->num_rows($sql) != 0)
+                		printError($lang_err_folderexists,"");
                 }
-            } else { 
-                printError($lang_err_folderexists,"");
-            }
-		} else {
-            $sql->query("select * from $default->owl_folders_table where parent = '$parent' and name = '$name'");
-			if ($sql->num_rows($sql) != 0) {
-                printError($lang_err_folderexists,"");
-            }
-        }
-        /* BEGIN Bozz Change
-           If your not part of the Administartor Group
-               the Folder will have your group ID assigned to it */
-        if ( owlusergroup($userid) != 0 ) {
+	        /* BEGIN Bozz Change
+           	   If your not part of the Administartor Group
+                   the Folder will have your group ID assigned to it */
+                if ( owlusergroup($userid) != 0 )
+                {
 		   	$sql->query("update $default->owl_folders_table set name='$name', security='$policy' where id = '$id'");
-        } else {
+                }
+                else
+                {
 		   	$sql->query("update $default->owl_folders_table set name='$name', security='$policy', groupid='$groupid'  where id = '$id'");
-        }
-        // Bozz change End
-        
+                }
+
+
+                // Bozz change End
 		header("Location: browse.php?sess=$sess&parent=$parent&expand=$expand&order=$order&$sortorder=$sortname");
 	} else {
 		include("./lib/header.inc");
 		print("<TABLE WIDTH=$default->table_expand_width BGCOLOR=$default->main_header_bgcolor CELLSPACING=0 CELLPADDING=0 BORDER=$default->table_border HEIGHT=30>");
-?>
+		?>
 		<TR><TD ALIGN=LEFT>
-<?php 
-        print("$lang_user: ");
-        print("<A HREF='prefs.php?owluser=$userid&sess=$sess&expand=$expand'>");
-        print uid_to_name($userid);
-        print ("</A>");
-?>
-        <FONT SIZE=-1>
-<?php 
-        print("<A HREF='index.php?login=logout&sess=$sess'>$lang_logout</A>");
-?>
-	    </FONT></TD>
-	    <TD ALIGN=RIGHT><?php print("<A HREF='browse.php?sess=$sess&parent=$parent&expand=$expand&order=$order&$sortorder=$sortname'><IMG SRC='$default->owl_root_url/locale/$language/graphics/btn_browse.gif' BORDER=0></A>"); ?>
-		</TD></TR></TABLE><BR><BR><CENTER>
-<?php
+                <?php print("$lang_user: ");
+                      print("<A HREF='prefs.php?owluser=$userid&sess=$sess&expand=$expand'>");
+                      print uid_to_name($userid);
+                      print ("</A>");
+                ?>
+<FONT SIZE=-1>
+
+		<?php print("<A HREF='index.php?login=logout&sess=$sess'>$lang_logout</A>");?>
+		    </FONT></TD>
+		    <TD ALIGN=RIGHT><?php print("<A HREF='browse.php?sess=$sess&parent=$parent&expand=$expand&order=$order&$sortorder=$sortname'><IMG SRC='$default->owl_root_url/locale/$language/graphics/btn_browse.gif' BORDER=0></A>"); ?>
+			</TD></TR></TABLE><BR><BR><CENTER>
+		<?php
 		exit($lang_nofoldermod);
 	}
 }
 if($action == "folder_delete") {
-    if(check_auth($id, "folder_delete", $userid) == 1) {
-        $sql = new Owl_DB;
-        $sql->query("select id,name,parent from $default->owl_folders_table order by name");
-        $fCount = ($sql->nf());
-        $i = 0;
-        while($sql->next_record()) {
-            $folderList[$i][0] = $sql->f("id");
-            $folderList[$i][2] = $sql->f("parent");
-            $i++;
+	if(check_auth($id, "folder_delete", $userid) == 1) {
+		$sql = new Owl_DB;
+		$sql->query("select id,name,parent from $default->owl_folders_table order by name");
+		$fCount = ($sql->nf());
+		$i = 0;
+		while($sql->next_record()) {
+			$folderList[$i][0] = $sql->f("id");
+			$folderList[$i][2] = $sql->f("parent");
+			$i++;
 		}
-		if ($default->owl_use_fs) {
+		if ($default->owl_use_fs)
 			myDelete($default->owl_FileDir."/".find_path($id));
-        }
 		delTree($id);
 		sleep(.5);
@@ -914,50 +915,50 @@ if($action == &quot;folder_delete&quot;) {
 	} else {
 		include("./lib/header.inc");
 		print("<TABLE WIDTH=$default->table_expand_width BGCOLOR=$default->main_header_bgcolor CELLSPACING=0 CELLPADDING=0 BORDER=$default->table_border HEIGHT=30>");
-?>
+		?>
 		<TR><TD ALIGN=LEFT>
-<?php 
-        print("$lang_user: ");
-        print("<A HREF='prefs.php?owluser=$userid&sess=$sess&expand=$expand'>");
-        print uid_to_name($userid);
-        print ("</A>");
-?>
-        <FONT SIZE=-1>
-
-<?php 
-        print("<A HREF='index.php?login=logout&sess=$sess'>$lang_logout</A>");
-?>
-        </FONT></TD>
-		<TD ALIGN=RIGHT><?php print("<A HREF='browse.php?sess=$sess&parent=$parent&expand=$expand&order=$order&$sortorder=$sortname'><IMG SRC='$default->owl_root_url/locale/$language/graphics/btn_browse.gif' BORDER=0></A>"); ?>
-		</TD></TR></TABLE><BR><BR><CENTER>
-<?php
+                <?php print("$lang_user: ");
+                      print("<A HREF='prefs.php?owluser=$userid&sess=$sess&expand=$expand'>");
+                      print uid_to_name($userid);
+                      print ("</A>");
+                ?>
+<FONT SIZE=-1>
+
+		<?php print("<A HREF='index.php?login=logout&sess=$sess'>$lang_logout</A>");?>
+		    </FONT></TD>
+		    <TD ALIGN=RIGHT><?php print("<A HREF='browse.php?sess=$sess&parent=$parent&expand=$expand&order=$order&$sortorder=$sortname'><IMG SRC='$default->owl_root_url/locale/$language/graphics/btn_browse.gif' BORDER=0></A>"); ?>
+			</TD></TR></TABLE><BR><BR><CENTER>
+		<?php
 		exit($lang_nofolderdelete);
 	}
 }
 if($action == "user") {
-    // the following should prevent users from changing others passwords.
-    $sql = new Owl_DB;
-    $sql->query("select * from $default->owl_sessions_table where uid = '$id' and sessid = '$sess'");
-    if($sql->num_rows() <>  1) {
-        die ("$lang_err_unauthorized"); 
-    }
-
-    if ($newpassword <> '') {
+       //
+       // the following should prevent users from changing others passwords.
+       //
         $sql = new Owl_DB;
-        $sql->query("select * from $default->owl_users_table where id = '$id' and password = '" . md5($oldpassword) ."'");
-        if($sql->num_rows() ==  0) {
-            die("$lang_err_pass_wrong");
+        $sql->query("select * from $default->owl_sessions_table where uid = '$id' and sessid = '$sess'");
+        if($sql->num_rows() <>  1)
+        {
+            die ("$lang_err_unauthorized"); 
         }
-        if ( $newpassword == $confpassword) {
-            $sql->query("UPDATE $default->owl_users_table SET name='$name',password='" . md5("$newpassword") . "' where id = '$id'");
-        } else {
-           die ("$lang_err_pass_missmatch");
+
+        if ($newpassword <> '')
+        {
+           $sql = new Owl_DB;
+           $sql->query("select * from $default->owl_users_table where id = '$id' and password = '" . md5($oldpassword) ."'");
+           if($sql->num_rows() ==  0) 
+              die("$lang_err_pass_wrong");
+           if ( $newpassword == $confpassword)
+              $sql->query("UPDATE $default->owl_users_table SET name='$name',password='" . md5("$newpassword") . "' where id = '$id'");
+           else
+              die ("$lang_err_pass_missmatch");
         }
-    }
-    $sql->query("UPDATE $default->owl_users_table SET name='$name', email='$email', notify='$notify', attachfile='$attachfile', language='$newlanguage' where id = '$id'");
+              $sql->query("UPDATE $default->owl_users_table SET name='$name', email='$email', notify='$notify', attachfile='$attachfile', language='$newlanguage' where id = '$id'");
 }
+
 header("Location: browse.php?sess=$sess&parent=$parent&expand=$expand&order=$order&$sortorder=$sortname");
 ?>
 <?php
-/**
+/*
  * download.php
  *
- * Allows the user to download the contents of a folder in zip format
- *
  * Copyright (c) 1999-2002 The Owl Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
  * $Id$
- *
- * @todo line 187 spin out into separate function
- * @todo line 195 spin out into separate function 
- */
+*/
 require("./config/owl.php");
 require("./lib/owl.lib.php");
 require("./config/html.php");
 require("./lib/security.lib.php");
-/**
-* Finds the path from the root folder to the required folder
-*
-* @param $parent required folder
-*
-* @returns string containing path from root folder to required folder 
-*/
 function find_path($parent) {
 	global $parent, $default;
         $path = fid_to_name($parent);
@@ -40,13 +28,6 @@ function find_path($parent) {
         return $path;
 }
-/**
-* Get a file name for a file id
-*
-* @paramater $id file id
-*
-* @return string file name
-*/
 function fid_to_filename($id) {
 	global $default;
 	$sql = new Owl_DB;
@@ -54,22 +35,16 @@ function fid_to_filename($id) {
 	while($sql->next_record()) return $sql->f("filename");
 }
-/**
-* Zips an entire folder, including sub folders and places the resulting
-* zip file in a temporary directory just off $default->owl_FileDir
-*
-* @param $id 		folder id
-* @param $userid 	current user id
-*/
 function zip_folder($id, $userid) {
   global $default, $sess;
-  $tmpdir = $default->owl_FileDir . "/owltmpfld_$sess.$id";  
+  $tmpdir = $default->owl_FileDir . "/owltmpfld_$sess.$id";
+  //if (file_exists($tmpdir)) system("rm -rf " . escapeshellarg($tmpdir));
   if (file_exists($tmpdir)) myDelete($tmpdir);
   mkdir("$tmpdir", 0777);
-  
+  //system("mkdir " . escapeshellarg($tmpdir));
   $sql = new Owl_DB;
   $sql2 = new Owl_DB;
@@ -79,6 +54,7 @@ function zip_folder($id, $userid) {
   }
   $path = "$tmpdir/$top";
   mkdir("$path", 0777);
+  //system("mkdir " . escapeshellarg($path));
   folder_loop($sql, $sql2, $id, $path, $userid);
   // get all files in folder 
@@ -114,19 +90,11 @@ function zip_folder($id, $userid) {
-/**
-*
-* @param $sql 		query selecting the id and name of the folder from the $default->owl_folders_table
-* @param $sql2		not sure what this param is - its previous value appears to have no bearing on the recursive nature of the function
-* @param $id 		folder id
-* @param $tmpdir 	temporary director in which zip file will be placed
-* @param $userid 	current user id
-*/
+//function folder_loop(&$sql, &$sql2, $id, $tmpdir, $userid) {
 function folder_loop($sql, $sql2, $id, $tmpdir, $userid) {
   global $default;
-  //if you have rights to the folder
   if(check_auth($id, "folder_view", $userid) == 1) {
     $sql = new Owl_DB;
@@ -137,15 +105,10 @@ function folder_loop($sql, $sql2, $id, $tmpdir, $userid) {
       $filename = $tmpdir . "/" . $sql->f("filename");
       if(check_auth($fid, "file_download", $userid) == 1) {
-	//if documents are being stored using the file system
-	//simply place a copy of the file in the temporary directory
         if ($default->owl_use_fs) {
 	   $source = $default->owl_FileDir . "/" . get_dirpath($id) . "/" . $sql->f("filename");
 	   copy($source, $filename);
 	}
-	//else documents are being stored in the database
-	//and a file must be created in the temporary directory for the document
-	//and filled with the data stored in the database
 	else {
 	$sql2->query("select data,compressed from " . $default->owl_files_data_table . " where id='$fid'");
         while($sql2->next_record()) {
@@ -160,9 +123,9 @@ function folder_loop($sql, $sql2, $id, $tmpdir, $userid) {
             $fp=fopen($filename,"w");
             fwrite($fp, $sql2->f("data"));
             fclose($fp);
-          } // end if
+          } // end if     
-          } // end if
+          } // end if     
         } // end while
 <?php
-/*
+/**
  * index.php -- Main page
+ *  
+ * This is the main login page
+ * Does some user verification and authentication as well as 
+ * Determining the Role of the User logging in (i.e. Admin or user) 
+ *
+ * Creates a new session for the user for duration of usage
  *
- * Copyright (c) 1999-2002 The Owl Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
- * $Id$
+ * @version v 1.1.1.1 2002/12/04
+ * @Copyright (c) 1999-2002 The Owl Project Team
+ * @author michael
+ * @package test
+ */
+
 */
 require("./config/owl.php");
 require("./lib/owl.lib.php");
 require("./config/html.php");
-if (checkrequirements() == 1) {
+//check the requirements
+if (checkrequirements() == 1) 
+{
 exit;
 }
-if(!isset($failure)) $failure = 0;
-if(!$login) $login = 1;
+/*
+* $failure is a counter to the number of times the user has tried to
+* login.
+*/
+if(!isset($failure)) 
+{
+	$failure = 0;
+}
+if(!$login)
+{
+	 $login = 1;
+}
-if($loginname && $password) {
+// if requirements are met
+if($loginname && $password) 
+{
+	//Verifies the Login and password of the user
 	$verified["bit"] = 0;
 	$verified = verify_login($loginname, $password);
-	if ($verified["bit"] == 1) {
+	if ($verified["bit"] == 1) 
+	{
+		// if verified open a new session 
 		$session = new Owl_Session;
 		$uid = $session->Open_Session(0,$verified["uid"]);
 	/*
@@ -31,41 +58,57 @@ if($loginname &amp;&amp; $password) {
 	*/
 		$id = 1;
-
-
-
-        /* BEGIN Bozz Change */
+        /* BEGIN Admin Change */
         /*  If an admin signs on We want to se the admin menu
             Not the File Browser.                               */
-        if ( $verified["group"] == 0)
-        {
-		  if(!isset($fileid))
-                   header("Location: admin/index.php?sess=". $uid->sessdata["sessid"]);
-                  else
-                   header("Location: browse.php?sess=". $uid->sessdata["sessid"]."&parent=$parent&fileid=$fileid");
-        }
-        else
-        {
-		  if(!isset($fileid))
-                   header("Location: browse.php?sess=". $uid->sessdata["sessid"]);
-                  else
-                   header("Location: browse.php?sess=". $uid->sessdata["sessid"]."&parent=$parent&fileid=$fileid");
-        }
-       /* END Bozz Change */
+      		  if ( $verified["group"] == 0)
+      		  {
+        		// if admin logs on..goto the admin main page
+        		// else goto the normal file browser page
+			  if(!isset($fileid))
+			  {
+		  		header("Location: admin/index.php?sess=". $uid->sessdata["sessid"]);
+               		  }
+                  	  else
+                  	  {
+                  		header("Location: browse.php?sess=". $uid->sessdata["sessid"]."&parent=$parent&fileid=$fileid");
+                  	  }
+        	  }
+        	else
+        	  {
+		  	if(!isset($fileid))
+		  	{
+		  		header("Location: browse.php?sess=". $uid->sessdata["sessid"]);
+		  	}
+                  	else
+                  	{
+                   		header("Location: browse.php?sess=". $uid->sessdata["sessid"]."&parent=$parent&fileid=$fileid");
+                  	}
+        	 }
+       /* END Admin Change */
-	} else {
-		if ($verified["bit"] == 2) 
-			header("Location: index.php?login=1&failure=2");
-                else if ($verified["bit"] == 3 )
- 			header("Location: index.php?login=1&failure=3");
-		else 
-			header("Location: index.php?login=1&failure=1");
 	}
+	 else 
+		{//normal user..check failures
+			if ($verified["bit"] == 2) 
+			{
+				header("Location: index.php?login=1&failure=2");
+			}
+                	else if ($verified["bit"] == 3 )
+                	{
+ 				header("Location: index.php?login=1&failure=3");
+ 			}
+			else 
+			{
+				header("Location: index.php?login=1&failure=1");
+			}
+		}
 }
-
-if(($login == 1) || ($failure == 1)) {
+// 
+if(($login == 1) || ($failure == 1))
+ {
 	include("./lib/header.inc");
 	print("<CENTER>");
 // BUG Number: 457588
@@ -73,22 +116,35 @@ if(($login == 1) || ($failure == 1)) {
 // BEGIN
 	print("<IMG SRC='$default->owl_root_url/locale/$default->owl_lang/graphics/$default->logo'><BR>$lang_engine<BR>$lang_version: $default->version<BR><HR WIDTH=300>");
 // END
-	if($failure == 1) print("<BR>$lang_loginfail<BR>");
-        if($failure == 2) print("<BR>$lang_logindisabled<BR>");
-        if($failure == 3) print("<BR>$lang_toomanysessions<BR>");
+	if($failure == 1)
+	{
+	 	print("<BR>$lang_loginfail<BR>");
+	}
+        if($failure == 2)
+        {
+         	print("<BR>$lang_logindisabled<BR>");
+        }
+        if($failure == 3) 
+        {
+        	print("<BR>$lang_toomanysessions<BR>");
+        }
 	print "<FORM ACTION=index.php METHOD=POST>";
-        if (isset($fileid)) {
+	
+        if (isset($fileid))
+        {
         	print "<INPUT TYPE=HIDDEN NAME=parent value=$parent>";
         	print "<INPUT TYPE=HIDDEN NAME=fileid value=$fileid>";
         }
+        
 	print "<TABLE><TR><TD>$lang_username:</TD><TD><INPUT TYPE=TEXT NAME=loginname><BR></TD></TR>";
 	print "<TR><TD>$lang_password:</TD><TD><INPUT TYPE=PASSWORD NAME=password><BR></TD></TR></TABLE>";
 	print "<INPUT TYPE=SUBMIT Value=$lang_login>\n";
 	print "<BR><BR><HR WIDTH=300>";
 	exit;
 }
-
-if($login == "logout") {
+// when the user logouts the session is deleted from the session table
+if($login == "logout") 
+{
 	include("./lib/header.inc");
 	print("<CENTER>");
 // BUG Number: 457588
 <?php
-/**
- * owl.lib.php
+
+/* owl.lib.php
  *
- * Main library routines, language and session handling.
+ *  contains the major owl classes and functions
  *
  * Copyright (c) 1999-2002 The Owl Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
- *
- * $Id$
- * @todo move classes to their own files (Owl_DB, Owl_Session)
- * @todo refactor functions by function (authentication, session, language)
+ * @version v 1.1.1.1 2002/12/04
+ * @author michael
+ * @package Owl
  */
-
+ 
 // Support for reg.globals off WES
-if (substr(phpversion(),0,5) >= "4.1.0") {
-    import_request_variables('pgc');
-} else {
-    if (!EMPTY($_POST)) {
-        extract($_POST);
-    } else {
-        extract($HTTP_POST_VARS);
-    }
-    if (!EMPTY($_GET)) {
-        extract($_GET);
-    } else {
-        extract($HTTP_GET_VARS);
-    }
-    if (!EMPTY($_FILE)) {
-        extract($_FILE);
-    } else {
-        extract($HTTP_POST_FILES);
-    }
+
+// check for phpversion
+if (substr(phpversion(),0,5) >= "4.1.0")
+ {
+ 	import_request_variables('pgc');
+ }
+ else 
+ {
+        if (!EMPTY($_POST)) 
+        {
+             extract($_POST);
+        }
+        else
+        {
+             extract($HTTP_POST_VARS);
+        }
+        if (!EMPTY($_GET)) 
+        {
+              extract($_GET);
+        } 
+        else 
+        {
+             extract($HTTP_GET_VARS);
+        }
+        
+        if (!EMPTY($_FILE)) 
+        {
+                extract($_FILE);
+        }
+        else 
+        {
+                extract($HTTP_POST_FILES);
+        }
 }
-if(!isset($sess)) {
+
+//set initial session var
+if(!isset($sess))
+{
     $sess = 0;
 }
-if(!isset($loginname)) {
-    $loginname = 0;
+
+// set initial loginname
+if(!isset($loginname)) 
+{
+	$loginname = 0;
 }
-if(!isset($login)) {
-    $login = 0;
+//set login var
+if(!isset($login)) 
+{
+	$login = 0;
 }
-// load appropriate language
-if(isset($default->owl_lang)) {
+// set default language
+if(isset($default->owl_lang))
+ {
 	$langdir = "$default->owl_fs_root/locale/$default->owl_lang";
-	if(is_dir("$langdir") != 1) {
+
+	if(is_dir("$langdir") != 1) 
+	{
 		die("$lang_err_lang_1 $langdir $lang_err_lang_2");
-	} else {
+	}
+	 else
+	 {
 		$sql = new Owl_DB;
-        $sql->query("select * from $default->owl_sessions_table where sessid = '$sess'");
+                $sql->query("select * from $default->owl_sessions_table where sessid = '$sess'");
 		$sql->next_record();
-        $numrows = $sql->num_rows($sql);
-        $getuid = $sql->f("uid");
-		if($numrows == 1) {
-            $sql->query("select * from $default->owl_users_table where id = $getuid");
+                $numrows = $sql->num_rows($sql);
+                $getuid = $sql->f("uid");
+		if($numrows == 1)
+		 {
+                	$sql->query("select * from $default->owl_users_table where id = $getuid");
 			$sql->next_record();
-            $language = $sql->f("language");
+                	$language = $sql->f("language");
 			// BEGIN wes fix
-			if(!$language) {
-                $language = $default->owl_lang;
+			if(!$language) 
+			{
+			  $language = $default->owl_lang;
 			}
 			// END wes fix
 			require("$default->owl_fs_root/locale/$language/language.inc");
 			$default->owl_lang = $language;
-        } else {
+                }
+                else
 			require("$default->owl_fs_root/locale/$default->owl_lang/language.inc");
-        }
 	}
 } else {
 	die("$lang_err_lang_notfound");
 }
-
 /**
- * Owl specific database class.
+ * class Owl_DB extends DB_Sql 
+ *
+ * This class is used for DB connections
+ *
+ * @version v 1.1.1.1 2002/12/04
+ * @author michael
+ * @package Owl
  */
+
 class Owl_DB extends DB_Sql {
-    /**
-     * Identifier for this class
-     */
-    var $classname = "Owl_DB";
-    
-    // BEGIN wes changes -- moved these settings to config/owl.php
-
-    /**
-     * Server where the database resides
-     */
-    var $Host = ""; 
-    
-    /**
-     * Database name
-     */
-    var $Database = "";
-    
-    /**
-     * User to access database
-     */
-    var $User = "";
-    
-    /** 
-     * Password for database
-     */
-    var $Password = "";
-
-    /**
-     * Creates an instance of Owl_DB.
-     * This constructor sets the connection details
-     * from the global defaults defined in config/owl.php
-     */
+	
+	//declare member variables
+        var $classname = "Owl_DB";
+
+        // BEGIN wes changes -- moved these settings to config/owl.php
+        // Server where the database resides
+        var $Host = ""; 
+
+        // Database name
+        var $Database = "";
+
+        // User to access database
+        var $User = "";
+
+        // Password for database
+        var $Password = "";
+//------------------------------------------------------------        
+/**
+ * Function Owl_DB 
+ *
+ * Default Constructor
+ * 
+*/
+//------------------------------------------------------------	
+// Usable
 	function Owl_DB() {
-        global $default;
-        $this->Host = $default->owl_db_host;
-        $this->Database = $default->owl_db_name;
-        $this->User = $default->owl_db_user;
-        $this->Password = $default->owl_db_pass;
+	  global $default;
+	  $this->Host = $default->owl_db_host;
+	  $this->Database = $default->owl_db_name;
+	  $this->User = $default->owl_db_user;
+	  $this->Password = $default->owl_db_pass;
 	}
 	// END wes changes
-    /**
-     * Prints database error message
-     *
-     * @param $msg  the error message
-     */
-    function haltmsg($msg) {
-        printf("</td></table><b>Database error:</b> %s<br>\n", $msg);
-        printf("<b>SQL Error</b>: %s (%s)<br>\n", $this->Errno, $this->Error);
-    }
+//------------------------------------------------------------        
+/**
+ * Function haltmsg
+ *
+ * Error Handling
+ * 
+*/
+//------------------------------------------------------------	
+//usable
+        function haltmsg($msg) 
+        {
+                printf("</td></table><b>Database error:</b> %s<br>\n", $msg);
+                printf("<b>SQL Error</b>: %s (%s)<br>\n",
+                        $this->Errno, $this->Error);
+        }
 }
+/**
+ * class Owl_Session
+ *
+ * This class is used for opening and closing sessions
+ *
+ * @version v 1.1.1.1 2002/12/04
+ * @author michael
+ * @package Owl
+*/
 class Owl_Session {
 	var $sessid;
 	var $sessuid;
 	var $sessdata;
-
+//------------------------------------------------------------        
+/**
+ * Function Open_Session($sessid=0, $sessuid=0)
+ *
+ * Opens a session
+ *
+ * @param $sessid
+ *	The Session id
+ * @param ssessuid
+ *	The user session id
+ * @Return $this
+ * 	Return the session
+ * 
+*/
+//------------------------------------------------------------
+// Usable
 	function Open_Session($sessid=0, $sessuid=0) {
                 global $default;
 		$this->sessid = $sessid;
 		$this->sessuid = $sessuid;
-		if($sessid == "0") { 		// if there is no user loged in, then create a session for them
+		// if there is no user loged in, then create a session for them
+		if($sessid == "0")
+		 { 		
 			$current = time();
 			$random = $this->sessuid . $current;
 			$this->sessid = md5($random);
 			$sql = new Owl_DB;
- 			if(getenv("HTTP_CLIENT_IP")) {
+ 		
+ 			if(getenv("HTTP_CLIENT_IP")) 
+ 			{
                                 $ip = getenv("HTTP_CLIENT_IP");
-                        } elseif(getenv("HTTP_X_FORWARDED_FOR")) {
+                        }
+                         elseif(getenv("HTTP_X_FORWARDED_FOR")) 
+                        {
                                 $forwardedip = getenv("HTTP_X_FORWARDED_FOR");
                                 list($ip,$ip2,$ip3,$ip4)= split (",", $forwardedip);
-                        } else {
+                        } 
+                        else 
+                        {
                                 $ip = getenv("REMOTE_ADDR");
                         }
 			//$result = $sql->query("insert into active_sessions  values ('$this->sessid', '$this->sessuid', '$current', '$ip')");
 			$result = $sql->query("insert into $default->owl_sessions_table  values ('$this->sessid', '$this->sessuid', '$current', '$ip')");
-			if(!'result') die("$lang_err_sess_write");
+			
+			if(!'result') 
+			{
+				die("$lang_err_sess_write");
+			}
 		}
 		// else we have a session id, try to validate it...
@@ -175,12 +245,37 @@ class Owl_Session {
 		return $this;
 	}
 }
-function notify_users($groupid, $flag, $parent, $filename, $title, $desc, $type) {
+
+
+//------------------------------------------------------------        
+/**
+ * Function notify_users($groupid, $flag, $parent, $filename, $title, $desc, $type)
+ *
+ * Used to notify users 
+ *
+ *   @param $groupid
+ *	The Id of the group
+ *   @param $flag
+ *	The relvant flag
+ *   @param $filename
+ *	The relevant filename
+ *   @param $title
+ *	The relevant title
+ *   @param $desc
+ *	The description
+ *   @param $type
+ *	the Relevant type
+ */
+//-------------------------------------------------------------	
+// Semi-Usable Some Interface based code
+function notify_users($groupid, $flag, $parent, $filename, $title, $desc, $type) 
+{
                 global $default;
                 global $lang_notif_subject_new, $lang_notif_subject_upd, $lang_notif_msg;
                 global $lang_title, $lang_description;
                 $sql = new Owl_DB; 
 // BEGIN BUG 548994
+                // get the fileid
                 $path = find_path($parent);
 		$sql->query("select id from $default->owl_files_table where filename='$filename' AND parent='$parent'");
 		$sql->next_record();
@@ -188,10 +283,13 @@ function notify_users($groupid, $flag, $parent, $filename, $title, $desc, $type)
 // END BUG 548994 More Below
                 $sql->query("select distinct id, email,language,attachfile from $default->owl_users_table as u, $default->owl_users_grpmem_table as m where notify = 1 and (u.groupid = $groupid or m.groupid = $groupid)");
+                // loop through records
                 while($sql->next_record()) 
                 {
 // BEGIN BUG 548994
-			if ( check_auth($fileid, "file_download", $sql->f(id)) == 1 ) {
+			// check authentication rights
+			if ( check_auth($fileid, "file_download", $sql->f(id)) == 1 )
+			 {
 // END BUG 548994 More Below
                   		$newpath = ereg_replace(" ","%20",$path);
                   		$newfilename = ereg_replace(" ","%20",$filename);
@@ -200,7 +298,8 @@ function notify_users($groupid, $flag, $parent, $filename, $title, $desc, $type)
 				$r=preg_split("(\;|\,)",$sql->f("email"));
 				reset ($r);
-				while (list ($occ, $email) = each ($r)) {
+				while (list ($occ, $email) = each ($r)) 
+				{
            				$mail = new phpmailer();
                                 	// Create a temporary session id, the user
 					// will need to get to this file before
@@ -209,6 +308,7 @@ function notify_users($groupid, $flag, $parent, $filename, $title, $desc, $type)
                 			$uid = $session->Open_Session(0,$sql->f("id"));
                                         $tempsess = $uid->sessdata["sessid"];
+					// if flag set to 0
                   			if ( $flag == 0 ) {
                 				$mail->IsSMTP();                                      // set mailer to use SMTP
                 				$mail->Host = "$default->owl_email_server";        // specify main and backup server
@@ -219,18 +319,30 @@ function notify_users($groupid, $flag, $parent, $filename, $title, $desc, $type)
                 				$mail->WordWrap = 50;                                 // set word wrap to 50 characters
                 				$mail->IsHTML(true);                                  // set email format to HTML
                 				$mail->Subject = "$lang_notif_subject_new";
-						if ($type != "url") {
-                                                        if ($sql->f("attachfile") == 1) {
+					
+						// as long as its not a url
+						if ($type != "url") 
+						{
+							// if attachfile is true
+                                                        if ($sql->f("attachfile") == 1)
+                                                         {
                                                                 $mail->Body    = "$lang_notif_msg<BR><BR>" . "$lang_title: $title" . "<BR><BR>$lang_description: $desc";
                         					$mail->altBody = "$lang_notif_msg\n\n" . "$lang_title: $title" . "\n\n $lang_description: $desc";
-								if (!$default->owl_use_fs) {
-									if (file_exists("$default->owl_FileDir/$filename")) {
+								
+								// use file system
+								if (!$default->owl_use_fs)
+								 {
+								 	//check if file exits
+									if (file_exists("$default->owl_FileDir/$filename"))
+									{
                                         					unlink("$default->owl_FileDir/$filename");
                                 					}
                                 					$file = fopen("$default->owl_FileDir$filename", 'wb');
 									$getfile = new Owl_DB;	
                                 					$getfile->query("select data,compressed from $default->owl_files_data_table where id='$fileid'");
-                                					while ($getfile->next_record()) {
+                                					while ($getfile->next_record()) 
+                                					{
+                                						//check if compressed ..and uncompress it
                                         					if ($getfile->f("compressed")) {
                                                 					$tmpfile = $default->owl_FileDir . "owltmp.$fileid.gz";
@@ -250,28 +362,36 @@ function notify_users($groupid, $flag, $parent, $filename, $title, $desc, $type)
                                                 					fwrite($file, $filedata);
                                                 					unlink($uncomptmpfile);
-                                        					} else {
+                                        					} 
+                                        					else
+                                        					{	// otherwise just write the file
                                                 					fwrite($file, $getfile->f("data"));
                                         					}
                                 					}
                                 					fclose($file);
+                                					// add a mail attachment
                         						$mail->AddAttachment("$default->owl_FileDir$newfilename");
-								} else {
+								} else 
+								{
                         						$mail->AddAttachment("$default->owl_FileDir/$newpath/$newfilename");
 								}
                                                         }
-                                                        else {
+                                                        else 
+                                                        {	// set up mail body 
                                                                 $mail->Body    = "$lang_notif_msg<BR><BR>" . "$lang_title: $title" . "<BR><BR>URL:  $default->owl_notify_link" . "browse.php?sess=$tempsess&parent=$parent&expand=1&fileid=$fileid" . "<BR><BR>$lang_description: $desc";
                         					$mail->altBody = "$lang_notif_msg\n\n" . "$lang_title: $title" . "\n\n $lang_description: $desc";
                                                         }
                 				}
-                				else {
+                				else 
+                				{
                         				$mail->Body    = "URL: $newfilename <BR><BR>$lang_notif_msg<BR><BR>" . "$lang_title: $title" . "<BR><BR>$lang_description: $desc";
                         				$mail->altBody = "URL: $newfilename \n\n$lang_notif_msg\n\n" . "$lang_title: $title" . "\n\n $lang_description: $desc";
                 				}
                                  	}
-                  			else {
+                  			else 
+                  				// set up mailer
+                  			{
  						$mail = new phpmailer();
                                                 $mail->IsSMTP();                                      // set mailer to use SMTP
                                                 $mail->Host = "$default->owl_email_server";        // specify main and backup server
@@ -282,18 +402,31 @@ function notify_users($groupid, $flag, $parent, $filename, $title, $desc, $type)
                                                 $mail->WordWrap = 50;                                 // set word wrap to 50 characters
                                                 $mail->IsHTML(true);                                  // set email format to HTML
 						$mail->Subject = "$lang_notif_subject_upd";
-                                                if ($type != "url") {
-                                                        if ($sql->f("attachfile") == 1) {
+                                        
+                                        	// if type not a url
+                                                if ($type != "url") 
+                                                {
+                                                	// if attachfile is true..go through process of attaching file..simarly to previous
+                                                        if ($sql->f("attachfile") == 1)
+                                                         {
                                                                 $mail->Body    = "$lang_notif_msg<BR><BR>" . "$lang_title: $title" . "<BR><BR>$lang_description: $desc";
                                                                 $mail->altBody = "$lang_notif_msg\n\n" . "$lang_title: $title" . "\n\n $lang_description: $desc";
-								if (!$default->owl_use_fs) {
-                                                                        if (file_exists("$default->owl_FileDir/$filename")) {
+								if (!$default->owl_use_fs) 
+								{
+									// check existence of file
+                                                                        if (file_exists("$default->owl_FileDir/$filename")) 
+                                                                        {
                                                                                 unlink("$default->owl_FileDir/$filename");
                                                                         }
+                                                                        
                                                                         $file = fopen("$default->owl_FileDir$filename", 'wb');
                                                                         $getfile = new Owl_DB;
                                                                         $getfile->query("select data,compressed from $default->owl_files_data_table where id='$fileid'");
-                                                                        while ($getfile->next_record()) {
+                                                                        
+                                                                        // get file check if compressed, if so uncompress 
+                                                                        // otherwise write away
+                                                                        while ($getfile->next_record()) 
+                                                                        {
                                                                                 if ($getfile->f("compressed")) {
                                                                                         $tmpfile = $default->owl_FileDir . "owltmp.$fileid.gz";
@@ -313,29 +446,37 @@ function notify_users($groupid, $flag, $parent, $filename, $title, $desc, $type)
                                                                                         fwrite($file, $filedata);
                                                                                         unlink($uncomptmpfile);
-                                                                                } else {
+                                                                                } 
+                                                                                else 
+                                                                                {
                                                                                         fwrite($file, $getfile->f("data"));
                                                                                 }
                                                                         }
                                                                         fclose($file);
                                                                         $mail->AddAttachment("$default->owl_FileDir$newfilename");
-                                                                } else {
+                                                                }
+                                                                 else 
+                                                                {
                                                                         $mail->AddAttachment("$default->owl_FileDir/$newpath/$newfilename");
                                                                 }
                                                         }
-                                                        else {
+                                                        else 
+                                                        {
                                                                 $mail->Body    = "$lang_notif_msg<BR><BR>" . "$lang_title: $title" . "<BR><BR>URL:  $default->owl_notify_link" . "browse.php?sess=$tempsess&parent=$parent&expand=1&fileid=$fileid" . "<BR><BR>$lang_description: $desc";
                                                                 $mail->altBody = "$lang_notif_msg\n\n" . "$lang_title: $title" . "\n\n $lang_description: $desc";
                                                         } 
                                                 }
-                                                else {
+                                                else 
+                                                {
                                                         $mail->Body    = "URL: $newfilename <BR><BR>$lang_notif_msg<BR><BR>" . "$lang_title: $title" . "<BR><BR>$lang_description: $desc";
                                                         $mail->altBody = "URL: $newfilename \n\n$lang_notif_msg\n\n" . "$lang_title: $title" . "\n\n $lang_description: $desc";
                                                 }
                                      	}
+                                     	// send the email
                   			$mail->Send();
-					if (!$default->owl_use_fs && $sql->f("attachfile") == 1) {
+					if (!$default->owl_use_fs && $sql->f("attachfile") == 1) 
+					{
                         			unlink("$default->owl_FileDir$newfilename");
 					}
@@ -346,7 +487,21 @@ function notify_users($groupid, $flag, $parent, $filename, $title, $desc, $type)
 // END BUG 548994
 }
-function verify_login($username, $password) {
+//------------------------------------------------------------        
+/**
+ * Function verify_login($username, $password) 
+ *
+ * Used to verify a users login name and password
+ *
+ *   @param $username
+ *	The username to verfiy
+ *   @param $password
+ *	The password to verify
+ */
+//-------------------------------------------------------------
+// Usable 
+function verify_login($username, $password) 
+{
 	global $default;
 	$sql = new Owl_DB; 
 	$query = "select * from $default->owl_users_table where username = '$username' and password = '" . md5($password) . "'";
@@ -355,7 +510,8 @@ function verify_login($username, $password) {
         // Bozz Begin added Password Encryption above, but for now 
         // I will allow admin to use non crypted password untile he 
         // upgrades all users 
-	if ($numrows == "1") {
+	if ($numrows == "1") 
+	{
                	while($sql->next_record()) {
                        if ( $sql->f("disabled") == 1 )  
                         	$verified["bit"]        = 2;
@@ -369,11 +525,15 @@ function verify_login($username, $password) {
         }
         // Remove this else in a future version
         else {
-           if ($username == "admin") {
+        	// username admin check password 
+           if ($username == "admin") 
+           {
 	        $sql->query("select * from $default->owl_users_table where username = '$username' and password = '$password'");
                 $numrows = $sql->num_rows($sql);
-                if ($numrows == "1") {
-                   while($sql->next_record()) {
+                if ($numrows == "1") 
+                {
+                   while($sql->next_record()) 
+                   {
                         $verified["bit"]        = 1;
                         $verified["user"]       = $sql->f("username");
                         $verified["uid"]        = $sql->f("id");
@@ -404,34 +564,63 @@ function verify_login($username, $password) {
 	return $verified;
 }
+//------------------------------------------------------------        
+/**
+ * Function verify_session($username, $password) 
+ *
+ * Used to verify a users session
+ *
+ *   @param $username
+ *	The username to check
+ *   @param $password
+ *	The password to check
+ */
+//-------------------------------------------------------------
+// Usable 
+
 function verify_session($sess) {
         getprefs();
 	global $default, $lang_sesstimeout, $lang_sessinuse, $lang_clicklogin;
         $sess = ltrim($sess);
 	$verified["bit"] = 0;
+	
 	$sql = new Owl_DB; 
         $sql->query("select * from $default->owl_sessions_table where sessid = '$sess'");
 	$numrows = $sql->num_rows($sql);
 	$time = time();
-	if ($numrows == "1") {
-		while($sql->next_record()) {
-			if(getenv("HTTP_CLIENT_IP")) {
+	
+	if ($numrows == "1")
+	{
+		while($sql->next_record()) 
+		{
+			if(getenv("HTTP_CLIENT_IP"))
+			{
 				$ip = getenv("HTTP_CLIENT_IP");
-			} elseif(getenv("HTTP_X_FORWARDED_FOR")) {
+			} 
+			elseif(getenv("HTTP_X_FORWARDED_FOR")) 
+			{
 				$forwardedip = getenv("HTTP_X_FORWARDED_FOR");
 				list($ip,$ip2,$ip3,$ip4)= split (",", $forwardedip);
-			} else {
+			}
+			 else 
+			{
 				$ip = getenv("REMOTE_ADDR");
 			}
-			if ($ip == $sql->f("ip")) {
-				if(($time - $sql->f("lastused")) <= $default->owl_timeout) {
+			if ($ip == $sql->f("ip")) 
+			{
+				// if timeout not exceeded
+				if(($time - $sql->f("lastused")) <= $default->owl_timeout) 
+				{
 					$verified["bit"] = 1;
 					$verified["userid"] = $sql->f("uid");
 					$sql->query("select * from $default->owl_users_table where id = '".$verified["userid"]."'");
 					while($sql->next_record()) $verified["groupid"] = $sql->f("groupid");
-				} else {
+				} 
+				else 
+				{
                                         // Bozz Bug Fix begin
-                                        if (file_exists("./lib/header.inc")) {
+                                        if (file_exists("./lib/header.inc")) 
+                                        {
 					    include("./lib/header.inc");
                                         } else {
                                            include("../lib/header.inc");
@@ -460,80 +649,257 @@ function verify_session($sess) {
 	return $verified;
 }
-function fid_to_name($parent) {
+//------------------------------------------------------------        
+/**
+ * Function fid_to_name($parent) 
+ *
+ * used to get the folder name
+ *
+ *   @param $parent
+ *	The parent id
+ *   @Return $sql->f("name");
+ *	Return the name of the folder	
+*/
+//-------------------------------------------------------------
+// Usable 
+function fid_to_name($parent) 
+{
 	global $default;
 	$sql = new Owl_DB; $sql->query("select name from $default->owl_folders_table where id = $parent");
-	while($sql->next_record()) return $sql->f("name");
+	while($sql->next_record()) 
+	{
+		return $sql->f("name");
+	}
 }
-function flid_to_name($id) {
+//------------------------------------------------------------        
+/**
+ * Function flid_to_name($id) 
+ *
+ *  Gets the filename corresponding to the file id
+ *
+ *   @param $id
+ *	The file  id
+ *   @Return $sql->f("name");
+ *	Return the name of the file	
+*/
+//-------------------------------------------------------------
+// Usable 
+function flid_to_name($id) 
+{
 	global $default;
 	$sql = new Owl_DB; $sql->query("select name from $default->owl_files_table where id = $id");
-	while($sql->next_record()) return $sql->f("name");
+	while($sql->next_record()) 
+	{
+		return $sql->f("name");
+	}
 }
+//------------------------------------------------------------        
+/**
+ * Function fid_to_filename($id) 
+ *
+ * gets filename based on id
+ *
+ *   @param $id
+ *	file id
+ *   @Return $sql->f("name");
+ *	Return the name of the file
+*/
+//-------------------------------------------------------------
+// Usable 
 function flid_to_filename($id) {
 	global $default;
 	$sql = new Owl_DB; $sql->query("select filename from $default->owl_files_table where id = $id");
-	while($sql->next_record()) return $sql->f("filename");
+	while($sql->next_record()) 
+	{
+		return $sql->f("filename");
+	}
 }
-
-function owlusergroup($userid) {
+//------------------------------------------------------------        
+/**
+ * Function owlusergroup($userid) 
+ *
+ * Gets the group id that the user blongs to
+ *
+ *   @param $userid
+ *	The user id
+ *   @Return $groupid
+ *	Return the groupId
+*/
+//-------------------------------------------------------------
+// Usable 
+function owlusergroup($userid) 
+{
 	global $default;
 	$sql = new Owl_DB; $sql->query("select groupid from $default->owl_users_table where id = '$userid'");
-	while($sql->next_record()) $groupid = $sql->f("groupid");
-	return $groupid;
+	while($sql->next_record()) 
+	{
+		$groupid = $sql->f("groupid");
+		return $groupid;
+	}
 }
-
+//------------------------------------------------------------        
+/**
+ * Function owlfilecreator($fileid) 
+ *
+ * used to find the file creator
+ *
+ *   @param $fileid
+ *	The parent id
+ *   @return $filecreator
+ *	Return the creatorid of the file
+*/
+//-------------------------------------------------------------
+// Usable 
 function owlfilecreator($fileid) {
 	global $default;
 	$sql = new Owl_DB; $sql->query("select creatorid from ".$default->owl_files_table." where id = '$fileid'");
-	while($sql->next_record()) $filecreator = $sql->f("creatorid");
-	return $filecreator;
+	while($sql->next_record()) 
+	{
+		$filecreator = $sql->f("creatorid");
+		return $filecreator;
+	}
 }
-
-function owlfoldercreator($folderid) {
+//------------------------------------------------------------        
+/**
+ * Function owlfoldercreator($fileid) {
+ *
+ * Used to get the folder creator
+ *
+ *   @param $fileid
+ *	The file id
+ *   @Return $foldercreator
+ *	Return the creatorid of the folder	
+*/
+//-------------------------------------------------------------
+// Usable 
+function owlfoldercreator($folderid) 
+{
 	global $default;
 	$sql = new Owl_DB; $sql->query("select creatorid from ".$default->owl_folders_table." where id = '$folderid'");
-	while($sql->next_record()) $foldercreator = $sql->f("creatorid");
-	return $foldercreator;
+	while($sql->next_record()) 
+	{
+		$foldercreator = $sql->f("creatorid");
+		return $foldercreator;
+	}
 }
-
-function owlfilegroup($fileid) {
+//-------------------------------------------------------------
+/**
+ * Function owlfilegroup($fileid)
+ *
+ * Used to get the file group id
+ *
+ *   @param $fileid
+ *	The file id
+ *   @Return $filegroup;
+ *	Returns the group id of the file group
+*/
+//-------------------------------------------------------------
+// Usable 
+function owlfilegroup($fileid)
+ {
 	global $default;
 	$sql = new Owl_DB; $sql->query("select groupid from $default->owl_files_table where id = '$fileid'");
-	while($sql->next_record()) $filegroup = $sql->f("groupid");
-	return $filegroup;
+	while($sql->next_record())
+	{
+		 $filegroup = $sql->f("groupid");
+		 return $filegroup;
+	}
+	
 }
-
+//-------------------------------------------------------------
+/**
+ * Function owlfoldergroup($folderid)
+ *
+ * Used to get the folder group id
+ *
+ *   @param $folderid
+ *	The folder id
+ *   @Return $foldergroup;
+ *	Returns the group id of the folder group
+*/
+//-------------------------------------------------------------
+// Usable  
 function owlfoldergroup($folderid) {
 	global $default;
 	$sql = new Owl_DB; $sql->query("select groupid from $default->owl_folders_table where id = '$folderid'");
-	while($sql->next_record()) $foldergroup = $sql->f("groupid");
-	return $foldergroup;
+	while($sql->next_record()) 
+	{
+		$foldergroup = $sql->f("groupid");
+		return $foldergroup;
+	}
+	
 }
-
-function owlfolderparent($folderid) {
+//-------------------------------------------------------------
+/**
+ * Function owlfolderparent($folderid)
+ *
+ * Used to get the folder parent
+ *
+ *   @param $folderid
+ *	The folder id
+ *   @Return $folderparent
+ *	Returns the folderparent of from the folder
+*/
+//-------------------------------------------------------------
+// Usable 
+function owlfolderparent($folderid)
+ {
 	global $default;
 	$sql = new Owl_DB; $sql->query("select parent from $default->owl_folders_table where id = '$folderid'");
-	while($sql->next_record()) $folderparent = $sql->f("parent");
-	return $folderparent;
+	while($sql->next_record()) 
+	{
+		$folderparent = $sql->f("parent");
+		return $folderparent;
+	}
+	
 }
-
-function owlfileparent($fileid) {
+//-------------------------------------------------------------
+/**
+ * Function owlfileparent($fileid)
+ *
+ * Used to get the file parent
+ *
+ *   @param $fileid
+ *	The file id
+ *   @Return $fileparent
+ *	Returns the file parent of from the files
+*/
+//-------------------------------------------------------------
+// Usable 
+function owlfileparent($fileid) 
+{
 	global $default;
 	$sql = new Owl_DB; $sql->query("select parent from $default->owl_files_table where id = '$fileid'");
-	while($sql->next_record()) $fileparent = $sql->f("parent");
+	while($sql->next_record()) 
+	{
+		$fileparent = $sql->f("parent");
+	
 	return $fileparent;
+	}
 }
-
+//------------------------------------------------------------        
+/**
+ * Function fid_to_creator($id) 
+ *
+ * Used to get the creator of the files
+ *
+ *   @param $id
+ *	The id
+ *   @Return $name;
+ *	Return the name of the creator
+*/
+//-------------------------------------------------------------
+// Usable 
 function fid_to_creator($id) {
 	global $default;
 	$sql = new Owl_DB; 
 	$sql->query("select creatorid from ".$default->owl_files_table." where id = '$id'");
 	$sql2 = new Owl_DB; 
-	while($sql->next_record()) {
+	while($sql->next_record()) 
+	{
 		$creatorid = $sql->f("creatorid");
 		$sql2->query("select name from $default->owl_users_table where id = '".$creatorid."'");
 		$sql2->next_record();
@@ -541,36 +907,103 @@ function fid_to_creator($id) {
 	}
 	return $name;
 }
-
-function group_to_name($id) {
+//------------------------------------------------------------        
+/**
+ * Function group_to_name($id) 
+ *
+ * select name from the group
+ *
+ *   @param $id
+ *	The id
+ *   @Return $sql->f("name");
+ *	Return the name of the group
+*/
+//-------------------------------------------------------------
+// Usable 
+function group_to_name($id) 
+{
 	global $default;
-	$sql = new Owl_DB; $sql->query("select name from $default->owl_groups_table where id = '$id'");
-	while($sql->next_record()) return $sql->f("name");
+	$sql = new Owl_DB; 
+	$sql->query("select name from $default->owl_groups_table where id = '$id'");
+	while($sql->next_record()) 
+	{
+		return $sql->f("name");
+	}
 }
-
-function uid_to_name($id) {
+//------------------------------------------------------------        
+/**
+ * Function uid_to_name($id) 
+ *
+ *  name from the users
+ *
+ *   @param $id
+ *	The id
+ *   @Return $name
+ *	Return the name of the user
+*/
+//-------------------------------------------------------------
+// Usable 
+function uid_to_name($id) 
+{
 	global $default;
-	$sql = new Owl_DB; $sql->query("select name from $default->owl_users_table where id = '$id'");
-	while($sql->next_record()) $name = $sql->f("name");
-	if ($name == "") $name = "Owl";
-	return $name;
+	$sql = new Owl_DB; 
+	$sql->query("select name from $default->owl_users_table where id = '$id'");
+	while($sql->next_record()) 
+	{
+		$name = $sql->f("name");
+		if ($name == "") 
+		{
+			$name = "Owl";
+		}
+		return $name;
+	}
 }
+//------------------------------------------------------------        
+/**
+ * Function prefaccess($id) 
+ *
+ * get the noprefaccess from the users to compare if access granted
+ *
+ *   @param $id
+ *	The id
+ *   @Return prefaccess;
+ *	Return the name of the folder	
+*/
+//-------------------------------------------------------------
+// Usable 
 function prefaccess($id) {
 	global $default;
 	$prefaccess = 1;
 	$sql = new Owl_DB; $sql->query("select noprefaccess from $default->owl_users_table where id = '$id'");
-	while($sql->next_record()) $prefaccess = !($sql->f("noprefaccess"));
-	return $prefaccess;
+	while($sql->next_record()) 
+	{
+		$prefaccess = !($sql->f("noprefaccess"));
+		return $prefaccess;
+	}
 }
-
-function gen_navbar($parent) {
+//------------------------------------------------------------        
+/**
+ * Function gen_navbar($parent) 
+ *
+ * Used to generate a nav bar
+ *
+ *   @param $parent
+ *	The parent id
+ *   @Return $Navbar
+ *	Return the navbar that has been generated
+*/
+//-------------------------------------------------------------
+// NOT Usable -> Interface based
+function gen_navbar($parent) 
+{
 	global $default;
 	global $sess, $expand, $sort, $sortorder, $order;
 	$name = fid_to_name($parent);
 	$navbar = "<A HREF='browse.php?sess=$sess&parent=$parent&expand=$expand&order=$order&$sortorder=$sort'>$name</A>";
 	$new = $parent;
-	while ($new != "1") {
+	while ($new != "1")
+	 {
 		$sql = new Owl_DB; $sql->query("select parent from $default->owl_folders_table where id = '$new'");
 		while($sql->next_record()) $newparentid = $sql->f("parent");
 		$name = fid_to_name($newparentid);
@@ -579,7 +1012,19 @@ function gen_navbar($parent) {
 	}
 	return $navbar;
 }
-
+//------------------------------------------------------------        
+/**
+ * Function get_dirpath($parent) 
+ *
+ * Get the directory path from the db
+ *
+ *   @param $parent
+ *	The parent id
+ *   @Return $Navbar;
+ *	Return the navbar with directory path
+*/
+//-------------------------------------------------------------
+// NOT Usable  if used in ocnjunction with navbar
 //only get dir path from db
 function get_dirpath($parent) {
         global $default;
@@ -597,22 +1042,57 @@ function get_dirpath($parent) {
         return $navbar;
 }
+//------------------------------------------------------------        
+/**
+ * Function gen_filesze($filesize) 
+ *
+ * generates the file size
+ *
+ *   @param $filesize
+ *	The size of the file
+ *   @Return $file_size;
+ *	Return the rounded off file size
+*/
+//-------------------------------------------------------------
+// Usable 
+function gen_filesize($file_size) 
+{
+	if(ereg("[^0-9]", $file_size))
+	{
+		 return $file_size;
+	}
-function gen_filesize($file_size) {
-	if(ereg("[^0-9]", $file_size)) return $file_size;
-
-	if ($file_size >= 1073741824) {
+	if ($file_size >= 1073741824) 
+	{
 		$file_size = round($file_size / 1073741824 * 100) / 100 . "g";
-        } elseif ($file_size >= 1048576) {
+        } 
+        elseif ($file_size >= 1048576) 
+        {
                 $file_size = round($file_size / 1048576 * 100) / 100 . "m";
-        } elseif ($file_size >= 1024) {
+        } 
+        elseif ($file_size >= 1024) 
+        {
                 $file_size = round($file_size / 1024 * 100) / 100 . "k";
-        } else {
+        } 
+        else 
+        {
                 $file_size = $file_size . "b"; 
         }
 	return $file_size;
 }
-
+//------------------------------------------------------------        
+/**
+ * Function unloadCompat($varname) 
+ *
+ * used to upload 
+ *
+ *   @param $varname
+ *	The parent id
+ *   @Return $sql->f("name");
+ *	Return the name of the folder	
+*/
+//-------------------------------------------------------------
+// Usable 
 function uploadCompat($varname) {
    if ($_FILES[$varname]) return $_FILES[$varname];
@@ -625,8 +1105,9 @@ function uploadCompat($varname) {
    return $retfile;
 }
-
-if ($sess) {
+// why is this code here???????????????????????????? is it part of the function??????
+if ($sess) 
+{
         gethtmlprefs();
         $ok = verify_session($sess);
         $temporary_ok =  $ok["bit"];
@@ -652,11 +1133,24 @@ if ($sess) {
 		$sql->query("update $default->owl_sessions_table set lastused = '$lastused' where uid = '$userid'");
 	}
 }
+
+//------------------------------------------------------------        
+/**
+ * Function checkrequirements() 
+ *
+ * Used to check requirments
+ *
+ *   @Return 1
+ *	Returns 1
+*/
+//-------------------------------------------------------------
+// Usable 
 function checkrequirements()
 {
     global $default, $lang_err_bad_version_1, $lang_err_bad_version_2, $lang_err_bad_version_3;
-    if (substr(phpversion(),0,5) < $default->phpversion) {
+    if (substr(phpversion(),0,5) < $default->phpversion) 
+    {
         print("<CENTER><H3>$lang_err_bad_version_1<BR>");
         print("$default->phpversion<BR>");
         print("$lang_err_bad_version_2<BR>");
@@ -664,41 +1158,92 @@ function checkrequirements()
         print("<BR>$lang_err_bad_version_3</H3></CENTER>");
         return 1; 
     }
-    else {
+    else 
+    {
         return 0;
     }
 }
-
-function myExec($_cmd, &$lines, &$errco) {
+//------------------------------------------------------------        
+/**
+ * Function myExec($cmd, &$lines, &$errco) 
+ *
+ * 
+ *
+ *   @param $cmd
+ *	The command
+ *   @param $lines
+ *
+ *   @param $errco
+ *	The error code
+ *   @Return "";
+ *	Return empty string
+ *   @Return $lines[count($lines)-1]
+ *	Returns numba of lines
+*/
+//-------------------------------------------------------------
+// Usable 
+function myExec($_cmd, &$lines, &$errco) 
+{
 	$cmd = "$_cmd ; echo $?";
 	exec($cmd, $lines);
 	// Get rid of the last errco line...
 	$errco = (integer) array_pop($lines);
-	if (count($lines) == 0) {
+	if (count($lines) == 0) 
+	{
 		return "";
-	} else {
+	} 
+	else 
+	{
 		return $lines[count($lines) - 1];
 	}
 }
-
+//------------------------------------------------------------        
+/**
+ * Function my_delete($file)
+ *
+ * used to delete a file if it exists
+ *
+ *   @param $file
+ *	The file to be deleted
+*/
+//-------------------------------------------------------------
+// Usable 
 function myDelete($file) {
-	if (file_exists($file)) {
+	if (file_exists($file)) 
+	{
 		chmod($file,0777);
-		if (is_dir($file)) {
+		if (is_dir($file))
+		 {
 			$handle = opendir($file);
-			while($filename = readdir($handle)) {
-				if ($filename != "." && $filename != "..") {
+			while($filename = readdir($handle)) 
+			{
+				if ($filename != "." && $filename != "..") 
+				{
 					myDelete($file."/".$filename);
 				}
 			}
 			closedir($handle);
 			rmdir($file);
-		} else {
+		} 
+		else 
+		{
 			unlink($file);
 		}
 	}
 }
-
+//------------------------------------------------------------        
+/**
+ * Function printError($message, $submessage) 
+ *
+ * Prints out error messages
+ *
+ *   @param $message
+ *	The message 
+ *   @param $submessage
+ *	The submessage
+*/
+//-------------------------------------------------------------
+// Not Usable -> INTERFACE Based
 function printError($message, $submessage) {
 	global $default;
         global $sess, $parent, $expand, $order, $sortorder ,$sortname, $userid;
@@ -730,7 +1275,15 @@ function printError($message, $submessage) {
 	include("./lib/footer.inc");
         exit();
 }
-
+//------------------------------------------------------------        
+/**
+ * Function getprefs() 
+ *
+ * gets all the preferences
+ *
+*/
+//-------------------------------------------------------------
+// Usable 
 function getprefs ( )
 {
 	global $default;
@@ -765,6 +1318,15 @@ function getprefs ( )
 };
+//------------------------------------------------------------        
+/**
+ * Function gethtmlprefs() 
+ *
+ * get html preferences
+ *
+*/
+//-------------------------------------------------------------
+// Usable 
 function gethtmlprefs ( )
 {
@@ -787,7 +1349,23 @@ function gethtmlprefs ( )
 	$default->body_vlink            = $sql->f("body_vlink");
 };
-
+//------------------------------------------------------------        
+/**
+ * Function printfileperm($currentval, $namevariable, $printmessage, $type) 
+ *
+ * Print file permissions
+ *
+ *   @param $currentval
+ *	The current value
+ *   @param $namevariable
+ *	The name of the file
+ *   @param $pringmessage
+ *	The message to be printed
+ *   @param $type
+ *	The type of file
+*/
+//-------------------------------------------------------------
+// SEMI-Usable Interface based
 function printfileperm($currentval, $namevariable, $printmessage, $type) {
 	global $default;
 	global $lang_everyoneread, $lang_everyonewrite, $lang_everyonewrite_nod, $lang_groupread, $lang_groupwrite, $lang_groupwrite_nod, $lang_groupwrite_worldread, $lang_groupwrite_worldread_nod, $lang_onlyyou;
@@ -803,7 +1381,10 @@ function printfileperm($currentval, $namevariable, $printmessage, $type) {
                    $file_perm[6][0] = 6;
                    $file_perm[7][0] = 7;
                    $file_perm[8][0] = 8;
-	if ($type == "admin") {
+	
+	// show admin permissions
+	if ($type == "admin")
+	 {
         	$file_perm[0][1] = "$lang_everyoneread_ad";
        		$file_perm[1][1] = "$lang_everyonewrite_ad";
        		$file_perm[2][1] = "$lang_groupread_ad";
@@ -814,7 +1395,7 @@ function printfileperm($currentval, $namevariable, $printmessage, $type) {
        		$file_perm[7][1] = "$lang_groupwrite_worldread_ad";
        		$file_perm[8][1] = "$lang_groupwrite_worldread_ad_nod";
       	} 
-	else {
+	else {// otherwise show other permissions
         	$file_perm[0][1] = "$lang_everyoneread";
        		$file_perm[1][1] = "$lang_everyonewrite";
        		$file_perm[2][1] = "$lang_groupread";
@@ -837,7 +1418,29 @@ function printfileperm($currentval, $namevariable, $printmessage, $type) {
 };
-
+//------------------------------------------------------------        
+/**
+ * Function printFileIcons ($fid, $filename, $checked_out, $url, $allicons, $ext)
+ *
+ *prints the file icons
+ *
+ *   @param $fid
+ *	The folder id
+ *   @param $filename
+ *	The name of the file
+ *   @param $check_out
+ *	checkout status
+ *   @param $url
+ *	The relevant url
+ *   @param $allicons
+ *	
+ *   @param $ext
+ *	The extension of the file
+ *   @Return $sql->f("name");
+ *	Return the name of the folder	
+*/
+//-------------------------------------------------------------
+// NOT  Usable INTERFACE based
 function printFileIcons ($fid, $filename, $checked_out, $url, $allicons, $ext)
 {
 	global $default;
@@ -941,6 +1544,23 @@ function printFileIcons ($fid, $filename, $checked_out, $url, $allicons, $ext)
 	}
 };
+//------------------------------------------------------------        
+/**
+ * Function printgroupperm($currentval, $namevariable, $printmessage, $type) 
+ *
+ * Prints group permissions
+ *
+ *   @param $currentval
+ *	The current value
+ *   @param $namevariable
+ *	The name of the group
+ *   @param $printmessage
+ *	The message to be printed
+ *   @param $type
+ *	The type of group
+*/
+//-------------------------------------------------------------
+// NOT Usable INTERFACE based
 function printgroupperm($currentval, $namevariable, $printmessage, $type) {
 	global $default;
 	global $lang_geveryoneread, $lang_geveryonewrite, $lang_geveryonewrite_nod, $lang_ggroupread, $lang_ggroupwrite, $lang_ggroupwrite_nod, $lang_ggroupwrite_worldread, $lang_ggroupwrite_worldread_nod, $lang_gonlyyou;
@@ -956,7 +1576,8 @@ function printgroupperm($currentval, $namevariable, $printmessage, $type) {
                    $group_perm[6][0] = 56;
                    $group_perm[7][0] = 57;
                    $group_perm[8][0] = 58;
-	if ($type == "admin") {
+	if ($type == "admin")
+	 {
                    $group_perm[0][1] = "$lang_geveryoneread_ad";
                    $group_perm[1][1] = "$lang_geveryonewrite_ad";
                    $group_perm[2][1] = "$lang_ggroupread_ad";
@@ -968,7 +1589,8 @@ function printgroupperm($currentval, $namevariable, $printmessage, $type) {
                    $group_perm[8][1] = "$lang_ggroupwrite_worldread_ad_nod";
 	}
-	else {
+	else
+	 {
                    $group_perm[0][1] = "$lang_geveryoneread";
                    $group_perm[1][1] = "$lang_geveryonewrite";
                    $group_perm[2][1] = "$lang_ggroupread";
@@ -978,10 +1600,11 @@ function printgroupperm($currentval, $namevariable, $printmessage, $type) {
                    $group_perm[6][1] = "$lang_geveryonewrite_nod";
                    $group_perm[7][1] = "$lang_ggroupwrite_worldread";
                    $group_perm[8][1] = "$lang_ggroupwrite_worldread_nod";
-	}
+	 }
           print("<TR><TD ALIGN=RIGHT BGCOLOR=$default->table_header_bg>$printmessage</TD><TD align=left><SELECT NAME=$namevariable>");
-                foreach($group_perm as $fp) {
+                foreach($group_perm as $fp) 
+                {
                         print("<OPTION VALUE=$fp[0] ");
                         if($fp[0] == $currentval)
                                 print("SELECTED");
@@ -991,7 +1614,7 @@ function printgroupperm($currentval, $namevariable, $printmessage, $type) {
 };
-
+// why is this here?????????????????????????????????????????
 if (!$sess && !$loginname && !$login) 
 	if(!isset($fileid))
 		header("Location: " . $default->owl_root_url . "/index.php?login=1");
 <?php
+/**
+ * ReadHD.php
+ *
+ * this is used for file system manipulation
+ *
+ * Copyright (c) 1999-2002 The Owl Project Team
+ * Licensed under the GNU GPL. For full terms see the file COPYING.
+ * @version v 1.1.1.1 2002/12/04
+ * @author michael
+ * @package Owl
+ */
+ 
+
 #Ugly code by Anders Axesson.
 # Adapted to OWL global config file by B0zz
-function GetFromHD($GetWhat, $ThePath) {
-  if ($Dir = opendir($ThePath)) {
+
+//-------------------------------------------------------------
+/**
+ *   Function GetFromHD($GetWhat, $ThePath)
+ *
+ *   Retrieves files/folders from the Hard Drive, given
+ *   a file/folder to get and a path
+ *
+ *   @param $GetWhat
+ *	The File/Folder(s) that needs to be retrieved 
+ *   @param $ThePath
+ *	The Path to Search for the File/Folder(s)
+ *   @Return $Files
+ *	Returns an array of Files that needs to be retrieved 
+ *   @Return $Folders
+ *	Returns an array Folder(s) that needs to be retrieved 
+*/
+//-------------------------------------------------------------
+// Usable
+
+function GetFromHD($GetWhat, $ThePath)
+ {
+  if ($Dir = opendir($ThePath))
+   {
      $FileCount = 0;
      $DirCount = 0;
-     while($file = readdir($Dir)) {
+     while($file = readdir($Dir))
+      {
        $PathFile = $ThePath . "/" . $file; //must test with full path (is_file etc)
-       if(($file <> ".") and ($file <> "..")) {
-         if (!is_file($PathFile)) {  //check if it is a folder (dir) or file (dont check if it is a link)
+       if(($file <> ".") and ($file <> "..")) 
+       {
+         if (!is_file($PathFile)) 
+         {  //check if it is a folder (dir) or file (dont check if it is a link)
             $DirCount++;
             $Dirs[$DirCount] = $file;
-          }else{
+          }
+          else
+          {
             $FileCount++;
             $Files[$FileCount] = $file;
          }
        }
      }
-     if ($GetWhat == 'file') {
+     // if it is a file add it to an array of files and return it
+     if ($GetWhat == 'file') 
+     {
        $FileCount++;
        $Files[$FileCount] = "[END]";  //stop looping @ this
        return $Files;
      }
-
-     if ($GetWhat == 'folder') {
+     
+     // if it is a folder add it to the array of folders and return it
+     if ($GetWhat == 'folder') 
+     {
        $DirCount++;
        $Dirs[$DirCount] = "[END]";  //stop looping @ this
        return $Dirs;
@@ -35,6 +79,20 @@ function GetFromHD($GetWhat, $ThePath) {
    }
 }
+//-------------------------------------------------------------
+/**
+ *   Function GetFileInfo($PathFile)
+ *
+ *   Gets the information on the specified file i.e. modification
+ *   and file size
+ *
+ *   @param $PathFile
+ *	The Path to the File
+ *   @Return $FileInfo
+ *	Returns an array with the information of the file
+*/
+//-------------------------------------------------------------
+// Usable
 function GetFileInfo($PathFile) {
   $TheFileSize = filesize($PathFile);  //get filesize
   $TheFileTime = date("Y-m-d H:i:s", filemtime($PathFile));  //get and fix time of last modifikation
@@ -48,46 +106,103 @@ function GetFileInfo($PathFile) {
   return $FileInfo;
 }
+
+//-------------------------------------------------------------
+/**
+ *   Function CompareDBnHD($GetWhat, $ThePath, $DBList, $parent, $DBTable) 
+ *
+ *   Compare files or folders in database with files on harddrive
+ *
+ *   @param $GetWhat
+ *	The File/Folder(s) that will be compared
+ *   @param $ThePath
+ *	The Path  of the File/Folder(s)
+ *   @param $DBList
+ *	The List of files in the DB
+ *   @param $Parent
+ *      The parent folder id
+ *   @param $DBTable
+ *	The DBTable to compare to
+ *   @Return $RefreshPage
+ *	Return true or false if page needs to be refreshed
+*/
+//-------------------------------------------------------------
+// Usable
+
 function CompareDBnHD($GetWhat, $ThePath, $DBList, $parent, $DBTable) {  //compare files or folders in database with files on harddrive
+  
+  // get from HD the relevant Files/Folders, store in array
   $F = GetFromHD($GetWhat, $ThePath);
-$RefreshPage = false;  //if filez/Folderz are found the page need to be refreshed in order to see them.
+$RefreshPage = false;  //if filez/Folders are found the page need to be refreshed in order to see them.
-if(is_array($F)) {
+// if array exists
+if(is_array($F)) 
+{
-    for($HDLoopCount = 1; $F[$HDLoopCount] !== "[END]";$HDLoopCount++) {
+// loop through file/folderarray and Dblist array to compare them
+    for($HDLoopCount = 1; $F[$HDLoopCount] !== "[END]";$HDLoopCount++) 
+    {
-      for($DBLoopCount = 1; $DBList[$DBLoopCount] !== "[END]";$DBLoopCount++) {
-        if($F[$HDLoopCount] == $DBList[$DBLoopCount]) {
+      for($DBLoopCount = 1; $DBList[$DBLoopCount] !== "[END]";$DBLoopCount++)
+       {
+        if($F[$HDLoopCount] == $DBList[$DBLoopCount]) 
+        {
 	  unset($F[$HDLoopCount]); //removing file/folder that is in db from list of filez on disc (leaving list of filez on disc but not in db)
 	  break;
         }
       }
     }
-  for($HDLoopCount = 1; $F[$HDLoopCount] !== "[END]";$HDLoopCount++) {
-    if(ord($F[$HDLoopCount]) !== 0) {  //if not the file/folder name is empty...
-      if($GetWhat == "file") {
+// if certain files/Folders are not in the DB but are on the list, add them to the DB
+  for($HDLoopCount = 1; $F[$HDLoopCount] !== "[END]";$HDLoopCount++) 
+  {
+    if(ord($F[$HDLoopCount]) !== 0) 
+    {  //if not the file/folder name is empty...
+      if($GetWhat == "file") 
+      {
 	$RefreshPage = true;
-        InsertHDFilezInDB($F[$HDLoopCount], $parent, $ThePath, $DBTable); //call function that inserts the filez-on-disc-but-not-in-db into the db.
-      }else{
+        InsertHDFilezInDB($F[$HDLoopCount], $parent, $ThePath, $DBTable); //call function that inserts the files-on-disc-but-not-in-db into the db.
+        
+      }
+      else
+      {
 	$RefreshPage = false;
       }
-      if($GetWhat == "folder") {
+      if($GetWhat == "folder") 
+      {
 	$RefreshPage = true;
-        InsertHDFolderzInDB($F[$HDLoopCount], $parent, $ThePath, $DBTable); //call function that inserts the folderz-on-disc-but-not-in-db into the db.
+        InsertHDFolderzInDB($F[$HDLoopCount], $parent, $ThePath, $DBTable); //call function that inserts the folders-on-disc-but-not-in-db into the db.
       }
     }
   }
 }
- 
+ // return true or false
   return $RefreshPage;
 }
-function InsertHDFolderzInDB($TheFolder, $parent, $ThePath, $DBTable) {
+//-------------------------------------------------------------
+/**
+ *   Function InsertHDFolderzInDB($TheFolder, $parent, $ThePath, $DBTable) 
+ *
+ *   Compare files or folders in database with files on harddrive
+ *
+ *   @param $TheFolder
+ *	The Folder to be inserted
+ *   @param $Parent
+ *      The parent folder id
+ *   @param $ThePath
+ *	The Path  of the Folder
+ *   @param $DBTable
+ *	The DBTable to insert into
+ */
+//-------------------------------------------------------------
+// Usable
+function InsertHDFolderzInDB($TheFolder, $parent, $ThePath, $DBTable) 
+{
   global $default;
   $sql = new Owl_DB;  //create new db connection
@@ -98,6 +213,23 @@ function InsertHDFolderzInDB($TheFolder, $parent, $ThePath, $DBTable) {
 }
+//-------------------------------------------------------------
+/**
+ *   Function InsertHDFilezInDB($TheFile, $parent, $ThePath, $DBTable) 
+ *
+ *   Compare files or folders in database with files on harddrive
+ *
+ *   @param $TheFile
+ *	The Folder to be inserted
+ *   @param $Parent
+ *      The parent folder id
+ *   @param $ThePath
+ *	The Path  of the File
+ *   @param $DBTable
+ *	The DBTable to insert into
+ */
+//-------------------------------------------------------------
+// Usable
 function InsertHDFilezInDB($TheFile, $parent, $ThePath, $DBTable) {
   global $default;
@@ -105,6 +237,7 @@ function InsertHDFilezInDB($TheFile, $parent, $ThePath, $DBTable) {
   $FileInfo = GetFileInfo($ThePath . "/" . $TheFile);  //get file size etc. 2=File size, 2=File time (smodified), 3=File time 2 (modified)
+  // if there is no file title assign it to default file title
   if ($default->owl_def_file_title == "")
   {
    $title_name =  $TheFile;
@@ -114,6 +247,7 @@ function InsertHDFilezInDB($TheFile, $parent, $ThePath, $DBTable) {
      $title_name = $default->owl_def_file_title;
   }
+// insert into DB
   $SQL = "insert into $DBTable (name,filename,size,creatorid,parent,modified,description,metadata,security,groupid,smodified) values ('$title_name', '$TheFile', '$FileInfo[1]', '$default->owl_def_file_owner', '$parent', '$FileInfo[3]', '$TheFile', '$default->owl_def_file_meta', '$default->owl_def_file_security', '$default->owl_def_file_group_owner','$FileInfo[2]')";
   $sql->query($SQL);
 <?php
-/*
+/**
  * log.php
  *
+ * Used for Revision history and logs when the changes occurred
+ *
  * Copyright (c) 1999-2002 The Owl Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
- *
- * $Id$
+ * @version v 1.1.1.1 2002/12/04
+ * @author michael
+ * @package test
  */
+
 require("./config/owl.php");
 require("./lib/owl.lib.php");
 require("./config/html.php");
@@ -22,6 +26,7 @@ $filesearch = explode(&#39;.&#39;,$filename);
 // + ADDED &order=$order&$sortorder=$sortname to
 // all browse.php?  header and HREF LINES
+// responsible for determining the order of information
 switch ($order) {
      case "name":
            $sortorder = 'sortname';
@@ -53,7 +58,9 @@ print(&quot;&lt;TABLE WIDTH=$default-&gt;table_expand_width BGCOLOR=$default-&gt;main_header_b
 ?>
 <TR><TD ALIGN=LEFT>
 <?php print("$lang_user: ");
-      if(prefaccess($userid)) {
+
+      if(prefaccess($userid)) 
+      {
 	print("<A HREF='prefs.php?owluser=$userid&sess=$sess&expand=$expand&order=$order&sortname=$sortname'>");
       }
 	print uid_to_name($userid);
@@ -68,13 +75,13 @@ print(&quot;&lt;TABLE WIDTH=$default-&gt;table_expand_width BGCOLOR=$default-&gt;main_header_b
 <?php
 print("<CENTER>");
-
+	// generates a navigation bar and provides details for the docs
 	print("<TABLE WIDTH=$default->table_expand_width BORDER=$default->table_border>");
 	print("<TR><TD align=left>$lang_viewlog ".gen_navbar($parent)."/".flid_to_name($id)."</TD></TR>");
 	print("</TABLE><HR WIDTH=$default->table_expand_width><BR>$filename");
 	print ("<TABLE width=$default->table_expand_width border=$default->table_border cellpadding=3 cellspacing=0>
-		<TR><TD BGCOLOR='$default->table_header_bg' width=5%>$lang_ver</td>
+	 	<TR><TD BGCOLOR='$default->table_header_bg' width=5%>$lang_ver</td>
 		<TD BGCOLOR='$default->table_header_bg' width=10%>$lang_user</TD>
 		<TD BGCOLOR='$default->table_header_bg' width=60%>$lang_log_file</TD>
 		<TD BGCOLOR='$default->table_header_bg' width=25%>$lang_modified</TD></TR>");
@@ -116,31 +123,29 @@ if ($default-&gt;owl_use_fs)
 else
 {
 // name based query -- assuming that the given name for the file doesn't change...
-// at some point, we should really look into creating a "revision_id" field so that all revisions can be linked. 
-// in the meanwhile, the code for changing the Title of the file has been altered to go back and 
   $name = flid_to_name($id);
   $sql->query("select * from $default->owl_files_table where name='$name' AND parent='$parent' order by major_revision desc, minor_revision desc");
 }
 //global $sess;
-
-		
-	while($sql->next_record()) {
-	$choped = split("\.", $sql->f("filename"));
-        $pos = count($choped);
-        $ext = strtolower($choped[$pos-1]);
-
-print("<TR><TD valign=top>".$sql->f("major_revision").".".$sql->f("minor_revision")."</TD>
+// prints out all the relevant information on the specific document
+	while($sql->next_record()) 
+	{
+		$choped = split("\.", $sql->f("filename"));
+        	$pos = count($choped);
+        	$ext = strtolower($choped[$pos-1]);
+
+		print("<TR><TD valign=top>".$sql->f("major_revision").".".$sql->f("minor_revision")."</TD>
                <TD valign=top>".uid_to_name($sql->f("creatorid"))."</TD>
                <TD valign=top align=left><font size=2 style='font-weight:bold'>");
 		printFileIcons($sql->f("id"),$sql->f("filename"),$sql->f("checked_out"),$sql->f("url"),$default->owl_version_control,$ext);
 		print("&nbsp&nbsp[ ".$sql->f("filename")." ]</font><br>
                <pre>".$sql->f("description")."</></TD>
                <TD valign=top>".$sql->f("modified")."</TD></TR>");
-}
+	}
-//		print("<TR><TD valign=top>".$sql->f("major_revision").".".$sql->f("minor_revision")."</TD>
+	       //print("<TR><TD valign=top>".$sql->f("major_revision").".".$sql->f("minor_revision")."</TD>
 	       //<TD valign=top>".uid_to_name($sql->f("creatorid"))."</TD>
 	       //<TD valign=top><font style='font-weight:bold'>[ ".$sql->f("filename")." ]</font><br>
 	       //<pre>".$sql->f("description")."</></TD>
 <?php
-/**
+/*
  * modify.php
  *
- * Displays forms for file (upload, update, modify, email) and folder (create, modify) 
- * maintenance and management.
- *
  * Copyright (c) 1999-2002 The Owl Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
  * $Id$
- * @todo line 27- refactor
- * @todo line 55-71- refactor into header.inc and new navigation.inc
- * @todo quote attribute values in all forms
- * @todo refactor permission handling
  */
 //print("<H1>MODIFY Sess: $sess<BR> Loginname: $loginname<BR> Login:$login</H1>");
@@ -22,36 +15,39 @@ require(&quot;./config/owl.php&quot;);
 require("./lib/owl.lib.php");
 require("./config/html.php");
 require("./lib/security.lib.php");
-include("./lib/header.inc");
+include("./lib/header.inc");
 // Begin 496814 Column Sorts are not persistant
 // + ADDED &order=$order&$sortorder=$sortname to
 // all browse.php?  header and HREF LINES
+
+
 switch ($order) {
-    case "name":
-        $sortorder = 'sortname';
-        break;
-    case "major_revision":
-        $sortorder = 'sortver';
-        break;
-    case "filename" :
-        $sortorder = 'sortfilename';
-        break;
-    case "size" :
-        $sortorder = 'sortsize';
-        break;
-    case "creatorid" :
-        $sortorder = 'sortposted';
-        break;
-    case "smodified" :
-        $sortorder = 'sortmod';
-        break;
-    case "checked_out":
-        $sortorder = 'sortcheckedout';
-        break;
-    default:
-        break;
+     case "name":
+           $sortorder = 'sortname';
+           break;
+     case "major_revision":
+           $sortorder = 'sortver';
+           break;
+     case "filename" :
+           $sortorder = 'sortfilename';
+           break;
+     case "size" :
+           $sortorder = 'sortsize';
+           break;
+     case "creatorid" :
+           $sortorder = 'sortposted';
+           break;
+     case "smodified" :
+           $sortorder = 'sortmod';
+           break;
+     case "checked_out":
+           $sortorder = 'sortcheckedout';
+           break;
+     default:
+          break;
 }
+
 // END 496814 Column Sorts are not persistant
 print("<TABLE WIDTH=$default->table_expand_width BGCOLOR=$default->main_header_bgcolor CELLSPACING=0 CELLPADDING=0 BORDER=$default->table_border HEIGHT=30>");
@@ -76,37 +72,36 @@ print(&quot;&lt;TABLE WIDTH=$default-&gt;table_expand_width BGCOLOR=$default-&gt;main_header_b
 print("<CENTER>");
 if ($action == "file_update") {
-	if(check_auth($id, "file_modify", $userid) == 1) {
+        if(check_auth($id, "file_modify", $userid) == 1) {
 		print("<BR>");
 		$expand = 1;
 		print("<TABLE WIDTH=$default->table_expand_width BORDER=$default->table_border>");
 		print("<TR><TD align=left>$lang_updating ".gen_navbar($parent)."/".flid_to_name($id)."</TD></TR>");
 		print("</TABLE><HR WIDTH=$default->table_expand_width><BR>");
 		print("<FORM enctype='multipart/form-data' ACTION='dbmodify.php' METHOD=POST>
-			<INPUT TYPE=HIDDEN NAME=order VALUE='$order'>
-			<INPUT TYPE=HIDDEN NAME=sortname VALUE='$sortname'>
+                        <INPUT TYPE=HIDDEN NAME=order VALUE='$order'>
+                        <INPUT TYPE=HIDDEN NAME=sortname VALUE='$sortname'>
 			<INPUT TYPE=HIDDEN NAME=sess VALUE='$sess'>
 			<INPUT TYPE=HIDDEN NAME=parent VALUE=$parent>
 			<INPUT TYPE=HIDDEN NAME=MAX_FILE_SIZE VALUE='$default->max_filesize'>
 			<INPUT TYPE=HIDDEN NAME=action VALUE=file_update>
 			<INPUT TYPE=HIDDEN NAME=id VALUE='$id'>");
-		// BUG FIX: #449395 expanded/collapse view bugs
-		print("<INPUT TYPE=HIDDEN NAME=expand VALUE='$expand'>");
-		// END BUG FIX: #449395 expanded/collapse view bugs
-		print("<TABLE BORDER=$default->table_border><TR><TD ALIGN=RIGHT bgcolor=$default->table_header_bg>$lang_sendthisfile</TD><TD align=left><input name='userfile' type='file'></TD></TR>");
-        
-		// begin Daphne change - version control
-		if ($default->owl_version_control == 1) {
-		    print("<TR align=left><TD ALIGN=RIGHT bgcolor=$default->table_header_bg valign=top>$lang_vertype</td>
-			   <td><SELECT NAME=versionchange>
-			       <OPTION VALUE=major_revision>$lang_vermajor
-			       <OPTION selected VALUE=minor_revision>$lang_verminor</select></td></tr>");
-		    print("<tr><TD align=right bgcolor=$default->table_header_bg valign=top>$lang_verdescription
-			   </td>
-			   <td align=left><textarea name=newdesc rows=5 cols=30 wrap=hard></textarea></tr>");
-		}
-		// End Daphne Change
-		print("</TABLE><INPUT TYPE=SUBMIT VALUE='$lang_sendfile'></FORM>");
+// BUG FIX: #449395 expanded/collapse view bugs
+			print("<INPUT TYPE=HIDDEN NAME=expand VALUE='$expand'>");
+// END BUG FIX: #449395 expanded/collapse view bugs
+				print("<TABLE BORDER=$default->table_border><TR><TD ALIGN=RIGHT bgcolor=$default->table_header_bg>$lang_sendthisfile</TD><TD align=left><input name='userfile' type='file'></TD></TR>");
+                        // begin Daphne change - version control
+                        if ($default->owl_version_control == 1) {
+                        print("<TR align=left><TD ALIGN=RIGHT bgcolor=$default->table_header_bg valign=top>$lang_vertype</td>
+                        <td><SELECT NAME=versionchange>
+                                <OPTION VALUE=major_revision>$lang_vermajor
+                    <OPTION selected VALUE=minor_revision>$lang_verminor</select></td></tr>");
+                        print("<tr><TD align=right bgcolor=$default->table_header_bg valign=top>$lang_verdescription
+                        </td>
+                        <td align=left><textarea name=newdesc rows=5 cols=30 wrap=hard></textarea></tr>");
+                        }
+                        // End Daphne Change
+			print("</TABLE><INPUT TYPE=SUBMIT VALUE='$lang_sendfile'></FORM>");
 		include("./lib/footer.inc");
 	} else {
 		print($lang_noupload);
@@ -127,60 +122,60 @@ if ($action == &quot;file_upload&quot;) {
            $sql->query("select id,name from $default->owl_groups_table");
            $i=0;
            while($sql->next_record()) {
-               $groups[$i][0] = $sql->f("id");
-               $groups[$i][1] = $sql->f("name");
-               $i++;
+                   $groups[$i][0] = $sql->f("id");
+                   $groups[$i][1] = $sql->f("name");
+                   $i++;
            }
-        } else {        
-            $sql = new Owl_DB;
-            $sql->query("select userid,groupid from $default->owl_users_grpmem_table where userid = $userid ");
-            if ($sql->num_rows($sql) == 0) {
-                $sql->query("SELECT u.groupid as groupid, g.name as name  from $default->owl_users_table as u join $default->owl_groups_table as g where u.id = $userid and u.groupid = g.id");
-            }
-            $i=0;
-            while($sql->next_record()) {
-               $groups[$i][0] = $sql->f("groupid");
-               $groups[$i][1] = group_to_name($sql->f("groupid"));
-               $i++;
-            }
-        }
+         }
+ 	else {
+           $sql = new Owl_DB;
+           $sql->query("select userid,groupid from $default->owl_users_grpmem_table where userid = $userid ");
+            if ($sql->num_rows($sql) == 0)
+		$sql->query("SELECT u.groupid as groupid, g.name as name  from $default->owl_users_table as u join $default->owl_groups_table as g where u.id = $userid and u.groupid = g.id");
+           $i=0;
+           while($sql->next_record()) {
+                   $groups[$i][0] = $sql->f("groupid");
+                   $groups[$i][1] = group_to_name($sql->f("groupid"));
+                   $i++;
+           }
+	}
         /* END Bozz Change */
 		print("<TABLE WIDTH=$default->table_expand_width BORDER=$default->table_border>");
 		print("<TR><TD align=left>$lang_addingfile".gen_navbar($parent)."</TD></TR>");
 		print("</TABLE><HR WIDTH=$default->table_expand_width><BR>");
 		print("<FORM enctype= 'multipart/form-data' ACTION='dbmodify.php' METHOD=POST>
-			   <INPUT TYPE=HIDDEN NAME=sess VALUE='$sess'><INPUT TYPE=HIDDEN NAME=parent VALUE=$parent>
-               <INPUT TYPE=HIDDEN NAME=order VALUE='$order'>
-               <INPUT TYPE=HIDDEN NAME=sortname VALUE='$sortname'>
-			   <INPUT TYPE=HIDDEN NAME=MAX_FILE_SIZE VALUE='$default->max_filesize'>
-			   <INPUT TYPE=HIDDEN NAME=action VALUE=file_upload>
-			   <INPUT TYPE=HIDDEN NAME=expand VALUE=$expand>
-			   <INPUT TYPE=HIDDEN NAME=type VALUE=$type>
-			   <TABLE BORDER=$default->table_border><TR>");
-
-		if ($type == "url") {
-            print("<TD ALIGN=RIGHT bgcolor=$default->table_header_bg>$lang_sendthisurl:</TD><TD align=left><input name='userfile' type='text'size='80'></TD></TR>");
-        } else {
+			<INPUT TYPE=HIDDEN NAME=sess VALUE='$sess'><INPUT TYPE=HIDDEN NAME=parent VALUE=$parent>
+                        <INPUT TYPE=HIDDEN NAME=order VALUE='$order'>
+                        <INPUT TYPE=HIDDEN NAME=sortname VALUE='$sortname'>
+			<INPUT TYPE=HIDDEN NAME=MAX_FILE_SIZE VALUE='$default->max_filesize'>
+			<INPUT TYPE=HIDDEN NAME=action VALUE=file_upload>
+			<INPUT TYPE=HIDDEN NAME=expand VALUE=$expand>
+			<INPUT TYPE=HIDDEN NAME=type VALUE=$type>
+			<TABLE BORDER=$default->table_border><TR>");
+
+		if ($type == "url")
+                	print("<TD ALIGN=RIGHT bgcolor=$default->table_header_bg>$lang_sendthisurl:</TD><TD align=left><input name='userfile' type='text'size='80'></TD></TR>");
+               else
 			print("<TD ALIGN=RIGHT bgcolor=$default->table_header_bg>$lang_sendthisfile:</TD><TD align=left><input name='userfile' type='file'></TD></TR>");
-        }
-        print("<TR><TD ALIGN=RIGHT bgcolor=$default->table_header_bg>$lang_title:</TD><TD align=left><INPUT TYPE=TEXT NAME=title></TD></TR>
-			   <TR><TD ALIGN=RIGHT bgcolor=$default->table_header_bg>$lang_keywords:</TD><TD align=left><INPUT TYPE=TEXT NAME=metadata></TD></TR>");
-
-        print("<TR><TD ALIGN=RIGHT BGCOLOR=$default->table_header_bg>$lang_ownergroup:</TD><TD align=left><SELECT NAME=groupid>");
-        if(isset($groupid)) {
-            print("<OPTION VALUE=".$sql->f("groupid").">".group_to_name($sql->f("groupid")));
-        }
-        foreach($groups as $g) {
-            print("<OPTION VALUE=$g[0]>$g[1]");
-        }
-        printfileperm("4", "security", $lang_permissions, "admin");
-
-        print("<TR><TD ALIGN=RIGHT VALIGN=TOP bgcolor=$default->table_header_bg>");
-        // Daphne Change - add wrap=hard to textarea for logs
-        print("$lang_description:</TD><TD align=left><TEXTAREA NAME=description ROWS=10 COLS=50 WRAP=hard></TEXTAREA></TD></TR>
-               </TABLE><INPUT TYPE=SUBMIT VALUE='$lang_sendfile'></FORM>");
+			print("<TR><TD ALIGN=RIGHT bgcolor=$default->table_header_bg>$lang_title:</TD><TD align=left><INPUT TYPE=TEXT NAME=title></TD></TR>
+			<TR><TD ALIGN=RIGHT bgcolor=$default->table_header_bg>$lang_keywords:</TD><TD align=left><INPUT TYPE=TEXT NAME=metadata></TD></TR>");
+
+                          print("<TR><TD ALIGN=RIGHT BGCOLOR=$default->table_header_bg>$lang_ownergroup:</TD><TD align=left><SELECT NAME=groupid>");
+                          if(isset($groupid))
+                          {
+                             print("<OPTION VALUE=".$sql->f("groupid").">".group_to_name($sql->f("groupid")));
+                          }
+                          foreach($groups as $g) {
+                             print("<OPTION VALUE=$g[0]>$g[1]");
+                          }
+                          printfileperm("4", "security", $lang_permissions, "admin");
+
+                	print("<TR><TD ALIGN=RIGHT VALIGN=TOP bgcolor=$default->table_header_bg>");
+                        // Daphne Change - add wrap=hard to textarea for logs
+                        print("$lang_description:</TD><TD align=left><TEXTAREA NAME=description ROWS=10 COLS=50 WRAP=hard></TEXTAREA></TD></TR>
+			</TABLE><INPUT TYPE=SUBMIT VALUE='$lang_sendfile'></FORM>");
 		include("./lib/footer.inc");
 	} else {
 		print($lang_noupload);
@@ -194,99 +189,102 @@ if ($action == &quot;file_modify&quot;) {
         /* BEGIN Bozz Change
            Retrieve Group information if the user is in the
            Administrator group   */
+
         if ( owlusergroup($userid) == 0 ) {
-            $sql = new Owl_DB;
-            $sql->query("select id,name from $default->owl_groups_table");
-            $i=0;
-            while($sql->next_record()) {
-                $groups[$i][0] = $sql->f("id");
-                $groups[$i][1] = $sql->f("name");
-                $i++;
-            }
-            $sql->query("select id,name from $default->owl_users_table");
-            $i=0;
-            while($sql->next_record()) {
-                $users[$i][0] = $sql->f("id");
-                $users[$i][1] = $sql->f("name");
-                $i++;
-            }
-         } else {
-             if (uid_to_name($userid) == fid_to_creator($id)) {
-                $sql = new Owl_DB;
-                $sql->query("select userid,groupid from $default->owl_users_grpmem_table where userid = $userid ");
-                if ($sql->num_rows($sql) == 0) {
-                    $sql->query("SELECT u.groupid as groupid, g.name as name  from $default->owl_users_table as u join $default->owl_groups_table as g where u.id = $userid and u.groupid = g.id");
-                }
-                $i=0;
-                while($sql->next_record()) {
-                    $groups[$i][0] = $sql->f("groupid");
-                    $groups[$i][1] = group_to_name($sql->f("groupid"));
-                    $i++;
-                }
-                $mygroup = owlusergroup($userid);
-                $sql->query("select id,name from $default->owl_users_table where groupid='$mygroup'");
-                $i=0;
-                while($sql->next_record()) {
+           $sql = new Owl_DB;
+           $sql->query("select id,name from $default->owl_groups_table");
+           $i=0;
+           while($sql->next_record()) {
+                   $groups[$i][0] = $sql->f("id");
+                   $groups[$i][1] = $sql->f("name");
+                   $i++;
+           }
+           $sql->query("select id,name from $default->owl_users_table");
+           $i=0;
+           while($sql->next_record()) {
                    $users[$i][0] = $sql->f("id");
                    $users[$i][1] = $sql->f("name");
                    $i++;
-                }
-            }
-        }
+           }
+         }
+	else {
+           if (uid_to_name($userid) == fid_to_creator($id)) {
+		$sql = new Owl_DB;
+           	$sql->query("select userid,groupid from $default->owl_users_grpmem_table where userid = $userid ");
+                if ($sql->num_rows($sql) == 0)
+                $sql->query("SELECT u.groupid as groupid, g.name as name  from $default->owl_users_table as u join $default->owl_groups_table as g where u.id = $userid and u.groupid = g.id");
+           	$i=0;
+           	while($sql->next_record()) {
+                   	$groups[$i][0] = $sql->f("groupid");
+                   	$groups[$i][1] = group_to_name($sql->f("groupid"));
+                   	$i++;
+           	}
+           $mygroup = owlusergroup($userid);
+           $sql->query("select id,name from $default->owl_users_table where groupid='$mygroup'");
+           $i=0;
+           while($sql->next_record()) {
+                   $users[$i][0] = $sql->f("id");
+                   $users[$i][1] = $sql->f("name");
+                   $i++;
+           }
+           }
+       }
+
         /* END Bozz Change */
 		print("<TABLE WIDTH=$default->table_expand_width BORDER=$default->table_border>");
 		print("<TR><TD align=left>$lang_modifying".gen_navbar($parent)."/".flid_to_name($id)."</TD></TR>");
 		print("</TABLE><HR WIDTH=$default->table_expand_width><BR>");
-		$sql = new Owl_DB;
-        $sql->query("select * from $default->owl_files_table where id = '$id'");
-        
+		$sql = new Owl_DB; $sql->query("select * from $default->owl_files_table where id = '$id'");
 		while($sql->next_record()) {
-            print("<TABLE WIDTH=66% BORDER=$default->table_border><FORM ACTION='dbmodify.php'><TR><TD ALIGN=RIGHT BGCOLOR=$default->table_header_bg>
-                   $lang_title:</TD><TD align=left><INPUT TYPE=TEXT NAME=title VALUE=\"".$sql->f("name")."\"></TD></TR>
+			print("<TABLE WIDTH=66% BORDER=$default->table_border><FORM ACTION='dbmodify.php'><TR><TD ALIGN=RIGHT BGCOLOR=$default->table_header_bg>
+				$lang_title:</TD><TD align=left><INPUT TYPE=TEXT NAME=title VALUE=\"".$sql->f("name")."\"></TD></TR>
 			       <TR><TD ALIGN=RIGHT BGCOLOR=$default->table_header_bg>$lang_file:</TD><TD align=left>".$sql->f("filename")."&nbsp;(".gen_filesize($sql->f("size")).")</TD></TR>");
-            // Bozz Change Begin
+                  // Bozz Change Begin
+
+
 			$security = $sql->f("security");
-            $current_groupid = owlfilegroup($id);
-            $current_owner = owlfilecreator($id);
-            if ( owlusergroup($userid) == 0  || uid_to_name($userid) == fid_to_creator($id)) {
-                print("<TR><TD ALIGN=RIGHT BGCOLOR=$default->table_header_bg>$lang_ownership:</TD><TD align=left><SELECT NAME=file_owner>");
-                foreach($users as $g) {
-                    print("<OPTION VALUE=$g[0] ");
-                    if($g[0] == owlfilecreator($id)) {
-                        print("SELECTED");
-                    }
-                    print(">$g[1]");
-                }
-                print("</SELECT></TD></TR>");
-
-                print("<TR><TD ALIGN=RIGHT BGCOLOR=$default->table_header_bg>$lang_ownergroup:</TD><TD align=left><SELECT NAME=groupid>");
-                //print("<OPTION VALUE=$groupid>".group_to_name($sql->f("groupid")));
-                foreach($groups as $g) {
-                    print("<OPTION VALUE=$g[0] ");
-                    if($g[0] == $current_groupid) {
-                        print("SELECTED");
-                    }
-                    print(">$g[1]");
-                }
-                print("</SELECT></TD></TR>");
-                printfileperm($security, "security", "$lang_permissions:","admin");
-            } else {
-                print("<TR><TD ALIGN=RIGHT BGCOLOR=$default->table_header_bg>$lang_ownership:</TD><TD align=left>".fid_to_creator($id)."&nbsp;(".group_to_name(owlfilegroup($id)).")</TD></TR>");
-                print("<INPUT TYPE=HIDDEN NAME=file_owner VALUE='$current_owner'>");
-                print("<INPUT TYPE=HIDDEN NAME=security VALUE='$security'>");
-                print("<INPUT TYPE=HIDDEN NAME=groupid VALUE='$current_groupid'>");
-            }
-            // Bozz change End
-            
-			//print("</SELECT></TD></TR>
-			print("<TR><TD ALIGN=RIGHT BGCOLOR=$default->table_header_bg>$lang_keywords:</TD><TD align=left><INPUT TYPE=TEXT NAME=metadata VALUE='".$sql->f("metadata")."'></TD></TR>
+                        $current_groupid = owlfilegroup($id);
+                        $current_owner = owlfilecreator($id);
+      			 
+                       if ( owlusergroup($userid) == 0  || uid_to_name($userid) == fid_to_creator($id))
+                       {
+          print("<TR><TD ALIGN=RIGHT BGCOLOR=$default->table_header_bg>$lang_ownership:</TD><TD align=left><SELECT NAME=file_owner>");
+           foreach($users as $g) {
+                             print("<OPTION VALUE=$g[0] ");
+                             if($g[0] == owlfilecreator($id))
+                                print("SELECTED");
+                             print(">$g[1]");
+                          }
+                          print("</SELECT></TD></TR>");
+
+print("<TR><TD ALIGN=RIGHT BGCOLOR=$default->table_header_bg>$lang_ownergroup:</TD><TD align=left><SELECT NAME=groupid>");
+                          //print("<OPTION VALUE=$groupid>".group_to_name($sql->f("groupid")));
+                          foreach($groups as $g) {
+                             print("<OPTION VALUE=$g[0] ");
+                             if($g[0] == $current_groupid)
+                                print("SELECTED");
+                             print(">$g[1]");
+                          }
+			       print("</SELECT></TD></TR>");
+				printfileperm($security, "security", "$lang_permissions:","admin");
+                       }
+                       else
+                       {
+			       print("<TR><TD ALIGN=RIGHT BGCOLOR=$default->table_header_bg>$lang_ownership:</TD><TD align=left>".fid_to_creator($id)."&nbsp;(".group_to_name(owlfilegroup($id)).")</TD></TR>");
+				print("<INPUT TYPE=HIDDEN NAME=file_owner VALUE='$current_owner'>");
+				print("<INPUT TYPE=HIDDEN NAME=security VALUE='$security'>");
+				print("<INPUT TYPE=HIDDEN NAME=groupid VALUE='$current_groupid'>");
+                        }
+                        // Bozz change End
+			       //print("</SELECT></TD></TR>
+			       print("<TR><TD ALIGN=RIGHT BGCOLOR=$default->table_header_bg>$lang_keywords:</TD><TD align=left><INPUT TYPE=TEXT NAME=metadata VALUE='".$sql->f("metadata")."'></TD></TR>
 			       <TR><TD ALIGN=RIGHT BGCOLOR=$default->table_header_bg VALIGN=TOP>
 			       $lang_description:</TD><TD align=left><TEXTAREA NAME=description ROWS=10 COLS=50>".$sql->f("description")."</TEXTAREA>
 			       <INPUT TYPE=HIDDEN NAME=action VALUE=file_modify>
-                   <INPUT TYPE=HIDDEN NAME=order VALUE='$order'>
-                   <INPUT TYPE=HIDDEN NAME=sortname VALUE='$sortname'>
+                        <INPUT TYPE=HIDDEN NAME=order VALUE='$order'>
+                        <INPUT TYPE=HIDDEN NAME=sortname VALUE='$sortname'>
 			       <INPUT TYPE=HIDDEN NAME=id VALUE=$id>
 			       <INPUT TYPE=HIDDEN NAME=sess VALUE='$sess'>
 			       <INPUT TYPE=HIDDEN NAME=parent VALUE=$parent></TD></TR></TABLE>
@@ -295,7 +293,7 @@ if ($action == &quot;file_modify&quot;) {
 			include("./lib/footer.inc");
 		}
 	} else {
-        print("<BR><BR>".$lang_nofilemod);
+		print("<BR><BR>".$lang_nofilemod);
 	}
 }
@@ -306,21 +304,25 @@ if ($action == &quot;folder_create&quot;) {
         /* BEGIN Bozz Change
            Retrieve Group information if the user is in the
            Administrator group   */
+
+
+ 
         $sql = new Owl_DB;
         if ( owlusergroup($userid) == 0 ) {
-            $sql->query("SELECT id,name from $default->owl_groups_table");
-        } else {
-            $sql->query("SELECT * from $default->owl_users_grpmem_table join $default->owl_groups_table where id = groupid and userid = $userid");
-            if ($sql->num_rows($sql) == 0) {
-                $sql->query("SELECT u.groupid as id, g.name as name  from $default->owl_users_table as u join $default->owl_groups_table as g where u.id = $userid and u.groupid = g.id");
-            }
+           $sql->query("SELECT id,name from $default->owl_groups_table");
         } 
-        $i=0;
-        while($sql->next_record()) {
-            $groups[$i][0] = $sql->f("id");
-            $groups[$i][1] = $sql->f("name");
-            $i++;
-        }
+        else {
+           $sql->query("SELECT * from $default->owl_users_grpmem_table join $default->owl_groups_table where id = groupid and userid = $userid");
+            if ($sql->num_rows($sql) == 0)
+		$sql->query("SELECT u.groupid as id, g.name as name  from $default->owl_users_table as u join $default->owl_groups_table as g where u.id = $userid and u.groupid = g.id");
+        } 
+           $i=0;
+           while($sql->next_record()) {
+                   $groups[$i][0] = $sql->f("id");
+                   $groups[$i][1] = $sql->f("name");
+                   $i++;
+           }
+
         /* END Bozz Change */
 		print("<TABLE WIDTH=$default->table_expand_width BORDER=$default->table_border><TR><TD align=left>$lang_addingfolder ".gen_navbar($parent)."</TD></TR></TABLE><HR WIDTH=$default->table_expand_width><BR>
@@ -328,25 +330,23 @@ if ($action == &quot;folder_create&quot;) {
 		       <INPUT TYPE=HIDDEN NAME=parent VALUE=$parent><INPUT TYPE=HIDDEN NAME=expand VALUE=$expand>
 		       <INPUT TYPE=HIDDEN NAME=action VALUE=folder_create><INPUT TYPE=TEXT NAME=name></TD></TR>
 		       <INPUT TYPE=HIDDEN NAME=sess VALUE='$sess'>
-               <INPUT TYPE=HIDDEN NAME=order VALUE='$order'>
-               <INPUT TYPE=HIDDEN NAME=sortname VALUE='$sortname'>
+                        <INPUT TYPE=HIDDEN NAME=order VALUE='$order'>
+                        <INPUT TYPE=HIDDEN NAME=sortname VALUE='$sortname'>
 		       <INPUT TYPE=HIDDEN NAME=expand VALUE='$expand'>");
-        /* BEGIN Bozz Change
-          Display Retrieved Group information if the user is in the
-          Administrator group   */
-        print("<TR><TD ALIGN=RIGHT BGCOLOR=$default->table_header_bg>$lang_ownergroup:</TD><TD align=left><SELECT NAME=groupid>");
-        foreach($groups as $g) {
-            print("<OPTION VALUE=$g[0]>$g[1]");
-        }
-        if ( owlusergroup($userid) == 0 ) {
-            printgroupperm(54, "policy", $lang_policy, "admin");
-        } else {
-            printgroupperm(54, "policy", $lang_policy, "user");
-        }
-        /* END Bozz Change */
-        
-		print("</TABLE><INPUT TYPE=SUBMIT VALUE=$lang_create></FORM>");
+                       /* BEGIN Bozz Change
+                          Display Retrieved Group information if the user is in the
+                          Administrator group   */
+		          print("<TR><TD ALIGN=RIGHT BGCOLOR=$default->table_header_bg>$lang_ownergroup:</TD><TD align=left><SELECT NAME=groupid>");
+                          foreach($groups as $g) {
+                             print("<OPTION VALUE=$g[0]>$g[1]");
+                          }
+                       if ( owlusergroup($userid) == 0 )
+			  printgroupperm(54, "policy", $lang_policy, "admin");
+                       else
+			  printgroupperm(54, "policy", $lang_policy, "user");
+                       /* END Bozz Change */
+		       print("</TABLE><INPUT TYPE=SUBMIT VALUE=$lang_create></FORM>");
 		include("./lib/footer.inc");
 	} else {
 		print($lang_nosubfolder);
@@ -357,101 +357,105 @@ if ($action == &quot;folder_modify&quot;) {
 	if(check_auth($id, "folder_property", $userid) == 1) {
 		$expand=1;
-        /* BEGIN Bozz Change
-           Retrieve Group information if the user is in the
-           Administrator group   */        
-        if ( owlusergroup($userid) == 0 ) {
-            $sql = new Owl_DB;
-            $sql->query("select id,name from $default->owl_groups_table");
-            $i=0;
-            while($sql->next_record()) {
-                $groups[$i][0] = $sql->f("id");
-                $groups[$i][1] = $sql->f("name");
-                $i++;
-            }
-        }
-        /* END Bozz Change */
+                /* BEGIN Bozz Change
+                   Retrieve Group information if the user is in the
+                   Administrator group   */
+        
+                if ( owlusergroup($userid) == 0 ) {
+                   $sql = new Owl_DB;
+                   $sql->query("select id,name from $default->owl_groups_table");
+                   $i=0;
+                   while($sql->next_record()) {
+                           $groups[$i][0] = $sql->f("id");
+                           $groups[$i][1] = $sql->f("name");
+                           $i++;
+                   }
+                 }
+                /* END Bozz Change */
 		print("<TABLE WIDTH=$default->table_expand_width BORDER=$default->table_border>");
 		print("<TR><TD align=left>$lang_modifying ".gen_navbar($id)."</TD></TR>");
 		print("</TABLE><HR WIDTH=$default->table_expand_width><BR><TABLE WIDTH=50% BORDER=$default->table_border>");
-		$sql = new Owl_DB; 
-        $sql->query("select * from $default->owl_folders_table where id = '$id'");
-        
-        while($sql->next_record()) {
-            $security = $sql->f("security");
+		$sql = new Owl_DB; $sql->query("select * from $default->owl_folders_table where id = '$id'");
+		while($sql->next_record()) {
+			$security = $sql->f("security");
+	 		
 			print("<FORM ACTION='dbmodify.php'><INPUT TYPE=HIDDEN NAME=action VALUE=folder_modify>");
 			print("<TR><TD ALIGN=RIGHT BGCOLOR=$default->table_header_bg>$lang_name:</TD><TD align=left><INPUT TYPE=TEXT NAME=name VALUE='".$sql->f("name")."'></TD></TR>");
-            //print("<TR><TD ALIGN=RIGHT BGCOLOR=$default->table_header_bg>$lang_policy:</TD><TD align=left>$security</TD></TR>");
-            print("<TR><TD ALIGN=RIGHT BGCOLOR=$default->table_header_bg>$lang_ownership:</TD><TD align=left>".uid_to_name(owlfoldercreator($id))."&nbsp;(".group_to_name(owlfoldergroup($id)).")</TD></TR>
+			       //print("<TR><TD ALIGN=RIGHT BGCOLOR=$default->table_header_bg>$lang_policy:</TD><TD align=left>$security</TD></TR>");
+			       print("<TR><TD ALIGN=RIGHT BGCOLOR=$default->table_header_bg>$lang_ownership:</TD><TD align=left>".uid_to_name(owlfoldercreator($id))."&nbsp;(".group_to_name(owlfoldergroup($id)).")</TD></TR>
 			       <INPUT TYPE=HIDDEN NAME=id VALUE=$id>
-                   <INPUT TYPE=HIDDEN NAME=order VALUE='$order'>
-                   <INPUT TYPE=HIDDEN NAME=sortname VALUE='$sortname'>
-	               <INPUT TYPE=HIDDEN NAME=parent VALUE=$parent>
-        	       <INPUT TYPE=HIDDEN NAME=expand VALUE=$expand>");
-
-            /* BEGIN Bozz Change
-               Display Retrieved Group information if the user is in the
-               Administrator group   */
-            if ( owlusergroup($userid) == 0 ) {
-                print("<TR><TD ALIGN=RIGHT BGCOLOR=$default->table_header_bg>$lang_ownergroup:</TD><TD align=left><SELECT NAME=groupid>");
-                print("<OPTION VALUE=".$sql->f("groupid").">".group_to_name($sql->f("groupid")));
-                foreach($groups as $g) {
-                    print("<OPTION VALUE=$g[0]>$g[1]");
-                }
-                printgroupperm($security, "policy", $lang_policy, "admin");
-            } else {
-                printgroupperm($security, "policy", $lang_policy, "user");
-            }
-            /* END Bozz Change */
-
-	        print("</TABLE><INPUT TYPE=SUBMIT VALUE=$lang_change><INPUT TYPE=RESET VALUE=$lang_reset>
+                        <INPUT TYPE=HIDDEN NAME=order VALUE='$order'>
+                        <INPUT TYPE=HIDDEN NAME=sortname VALUE='$sortname'>
+	                       <INPUT TYPE=HIDDEN NAME=parent VALUE=$parent>
+        	               <INPUT TYPE=HIDDEN NAME=expand VALUE=$expand>");
+
+                       /* BEGIN Bozz Change
+                          Display Retrieved Group information if the user is in the
+                          Administrator group   */
+                       if ( owlusergroup($userid) == 0 )
+                       {
+                          print("<TR><TD ALIGN=RIGHT BGCOLOR=$default->table_header_bg>$lang_ownergroup:</TD><TD align=left><SELECT NAME=groupid>");
+                          print("<OPTION VALUE=".$sql->f("groupid").">".group_to_name($sql->f("groupid")));
+                          foreach($groups as $g) {
+                             print("<OPTION VALUE=$g[0]>$g[1]");
+                          }
+			  printgroupperm($security, "policy", $lang_policy, "admin");
+                       }
+                       else
+                       {
+			  printgroupperm($security, "policy", $lang_policy, "user");
+                       }
+                       /* END Bozz Change */
+
+	                       print("</TABLE><INPUT TYPE=SUBMIT VALUE=$lang_change><INPUT TYPE=RESET VALUE=$lang_reset>
 			       <INPUT TYPE=HIDDEN NAME=sess VALUE='$sess'></FORM></TABLE>");
 			include("./lib/footer.inc");
-        } // end while	
-    } else {
-        print($lang_nofoldermod);
-    }
+
+		}	
+	} else {
+		print($lang_nofoldermod);
+	}
 }
 if ($action == "file_email") {
-    if(check_auth($id, "file_modify", $userid) == 1) {
-        print("<BR>");
-        $expand = 1;
+        if(check_auth($id, "file_modify", $userid) == 1) {
+                print("<BR>");
+                $expand = 1;
 		$sql = new Owl_DB;
-      	$sql->query("select * from $default->owl_users_table where id = '$userid'");
+        	$sql->query("select * from $default->owl_users_table where id = '$userid'");
 		$sql->next_record();
-        $default_reply_to = $sql->f("email");
-
-        print("<FORM ACTION='./dbmodify.php' METHOD=POST>");
-        print("<INPUT TYPE=HIDDEN NAME=id VALUE=".$sql->f("id").">");
-
-        print("<TABLE WIDTH=$default->table_expand_width BORDER=$default->table_border>");
-        print("<TR><TD align=left>$lang_emailing ".gen_navbar($parent)."/".flid_to_name($id)."</TD></TR>");
-        print("</TABLE><HR WIDTH=$default->table_expand_width><BR>");
-        print("<FORM enctype='multipart/form-data' ACTION='dbmodify.php' METHOD=POST>
-                <INPUT TYPE=HIDDEN NAME=order VALUE='$order'>
-                <INPUT TYPE=HIDDEN NAME=sortname VALUE='$sortname'>
-                <INPUT TYPE=HIDDEN NAME=sess VALUE='$sess'>
-                <INPUT TYPE=HIDDEN NAME=parent VALUE=$parent>
-                <INPUT TYPE=HIDDEN NAME=MAX_FILE_SIZE VALUE='$default->max_filesize'>
-                <INPUT TYPE=HIDDEN NAME=action VALUE=file_email>
-                <INPUT TYPE=HIDDEN NAME=type VALUE='$type'>
-                <INPUT TYPE=HIDDEN NAME=id VALUE='$id'>");
-                 
-        print("<INPUT TYPE=HIDDEN NAME=expand VALUE='$expand'>");
-        print("<TABLE BORDER=$default->table_border><TR><TD ALIGN=RIGHT bgcolor=$default->table_header_bg>$lang_email_to</TD><TD align=left><INPUT TYPE=TEXT NAME=mailto></TD></TR>
-               <TR><TD ALIGN=RIGHT bgcolor=$default->table_header_bg>$lang_email_cc</TD><TD align=left><INPUT TYPE=TEXT NAME=ccto></TD></TR>
-               <TR><TD ALIGN=RIGHT bgcolor=$default->table_header_bg>$lang_email_reply_to</TD><TD align=left><INPUT TYPE=TEXT NAME=replyto VALUE='$default_reply_to'></TD></TR>
-               <TR><TD ALIGN=RIGHT bgcolor=$default->table_header_bg>$lang_email_subject</TD><TD align=left><INPUT TYPE=TEXT NAME=subject size=80></TD></TR>");
-        print("<tr><TD align=right bgcolor=$default->table_header_bg valign=top>$lang_email_body</td>
-               <td align=left><textarea name=mailbody rows=20 cols=80 wrap=hard></textarea></tr>");
-        print("</TABLE><INPUT TYPE=SUBMIT VALUE='$lang_sendfile'></FORM>");
-        include("./lib/footer.inc");
-    } else {
-        print($lang_noemail);
-    }
+                $default_reply_to = $sql->f("email");
+
+                print("<FORM ACTION='./dbmodify.php' METHOD=POST>");
+                print("<INPUT TYPE=HIDDEN NAME=id VALUE=".$sql->f("id").">");
+
+                print("<TABLE WIDTH=$default->table_expand_width BORDER=$default->table_border>");
+                print("<TR><TD align=left>$lang_emailing ".gen_navbar($parent)."/".flid_to_name($id)."</TD></TR>");
+                print("</TABLE><HR WIDTH=$default->table_expand_width><BR>");
+                print("<FORM enctype='multipart/form-data' ACTION='dbmodify.php' METHOD=POST>
+                        <INPUT TYPE=HIDDEN NAME=order VALUE='$order'>
+                        <INPUT TYPE=HIDDEN NAME=sortname VALUE='$sortname'>
+                        <INPUT TYPE=HIDDEN NAME=sess VALUE='$sess'>
+                        <INPUT TYPE=HIDDEN NAME=parent VALUE=$parent>
+                        <INPUT TYPE=HIDDEN NAME=MAX_FILE_SIZE VALUE='$default->max_filesize'>
+                        <INPUT TYPE=HIDDEN NAME=action VALUE=file_email>
+                        <INPUT TYPE=HIDDEN NAME=type VALUE='$type'>
+                        <INPUT TYPE=HIDDEN NAME=id VALUE='$id'>");
+                         
+                        print("<INPUT TYPE=HIDDEN NAME=expand VALUE='$expand'>");
+			print("<TABLE BORDER=$default->table_border><TR><TD ALIGN=RIGHT bgcolor=$default->table_header_bg>$lang_email_to</TD><TD align=left><INPUT TYPE=TEXT NAME=mailto></TD></TR>
+			       <TR><TD ALIGN=RIGHT bgcolor=$default->table_header_bg>$lang_email_cc</TD><TD align=left><INPUT TYPE=TEXT NAME=ccto></TD></TR>
+			       <TR><TD ALIGN=RIGHT bgcolor=$default->table_header_bg>$lang_email_reply_to</TD><TD align=left><INPUT TYPE=TEXT NAME=replyto VALUE='$default_reply_to'></TD></TR>
+			       <TR><TD ALIGN=RIGHT bgcolor=$default->table_header_bg>$lang_email_subject</TD><TD align=left><INPUT TYPE=TEXT NAME=subject size=80></TD></TR>");
+                        print("<tr><TD align=right bgcolor=$default->table_header_bg valign=top>$lang_email_body</td>
+                               <td align=left><textarea name=mailbody rows=20 cols=80 wrap=hard></textarea></tr>");
+                        print("</TABLE><INPUT TYPE=SUBMIT VALUE='$lang_sendfile'></FORM>");
+                include("./lib/footer.inc");
+        } else {
+                print($lang_noemail);
+        }
 }
 ?>
@@ -3,8 +3,6 @@
 /*
  * move.php
  *
- * Move a folder or a file to a new destination
- *
  * Copyright (c) 1999-2002 The Owl Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
@@ -48,18 +46,14 @@ switch ($order) {
 if($action == "file") {
-	//if  the user does not have permission to modify the file
 	if(check_auth($id, "file_modify", $userid) == 0) {
 		include("./lib/header.inc");
 		print("<TABLE WIDTH=$default->table_expand_width BGCOLOR=$default->main_header_bgcolor CELLSPACING=0 CELLPADDING=0 BORDER=$default->table_border HEIGHT=30>");
 		?>
 		<TR><TD ALIGN=LEFT>
                 <?php print("$lang_user: ");
-		
-		//if the user has access to his/her preferences
-		//print a link to the user's preferences
 		if(prefaccess($userid)) {
-			print("<A HREF='prefs.php?owluser=$userid&sess=$sess&expand=$expand&order=$order&sortname=$sortname'>");
+                print("<A HREF='prefs.php?owluser=$userid&sess=$sess&expand=$expand&order=$order&sortname=$sortname'>");
                 }
                 print uid_to_name($userid);
                 print ("</A>");
@@ -75,18 +69,14 @@ if($action == &quot;file&quot;) {
 		exit($lang_nofilemod);
 	}
 } else {
-	//if the user does not have permission to modify the folder
 	if(check_auth($id, "folder_modify", $userid) == 0) {
 		include("./lib/header.inc");
 		print("<TABLE WIDTH=$default->table_expand_width BGCOLOR=$default->main_header_bgcolor CELLSPACING=0 CELLPADDING=0 BORDER=$default->table_border HEIGHT=30>");
 		?>
 		<TR><TD ALIGN=LEFT>
                 <?php print("$lang_user: ");
-		
-		//if the user has access to his/her preferences
-		//print a link to the user's preferences
                 if(prefaccess($userid)) {
-			print("<A HREF='prefs.php?owluser=$userid&sess=$sess&expand=$expand&order=$order&sortname=$sortname'>");
+                print("<A HREF='prefs.php?owluser=$userid&sess=$sess&expand=$expand&order=$order&sortname=$sortname'>");
                 }
                 print uid_to_name($userid);
                 print ("</A>");
@@ -102,17 +92,9 @@ if($action == &quot;file&quot;) {
 	}
 }
-
-/**
-* Check for new folders.  Sets $newFolder to the new folder id
-*/
 function checkForNewFolder() {
 	global $HTTP_POST_VARS, $newFolder;
-	if (!is_array($HTTP_POST_VARS)) 
-	{
-		return;
-	}
-	
+	if (!is_array($HTTP_POST_VARS)) return;
 	while (list($key, $value) = each ($HTTP_POST_VARS)) {
 		if (substr($key,0,2)=="ID") { 
 			$newFolder = intval(substr($key,2)); 
@@ -121,58 +103,27 @@ function checkForNewFolder() {
 	}
 }
-/**
-* Display all the sub-folders in a folder
-*
-* @param $fid		folder id
-* @param $folder	folder name
-*
-*/
 function showFoldersIn($fid, $folder) {
 	global $folderList, $fCount, $fDepth, $excludeID, $action, $id, $default, $userid ;
 	for ($c=0 ;$c < ($fDepth-1) ; $c++) print "<img src='$default->owl_root_url/locale/$default->owl_lang/graphics/icons/blank.gif' height=16 width=18 align=top>";
 	if ($fDepth) print "<img src='$default->owl_root_url/locale/$default->owl_lang/graphics/icons/link.gif' height=16 width=16 align=top>";
 	$gray=0;	//	Work out when to gray out folders ...
-	
-	//current parent for all moves
-	if ($fid==$excludeID)
-	{
-		$gray=1;	
-	}
-	//subtree for folder moves
-	//can't move a folder to itself
-	if (($action=="folder") && ($fid==$id)) 
-	{
-		$gray=1;	
-	}
-	//check for permissions
-	//if you don't have folder modify permissions
-	if (check_auth($fid, "folder_modify", $userid) == 0)
-	{
-		$gray = 1; 	
-	}
+	if ($fid==$excludeID) $gray=1;	//	current parent for all moves
+	if (($action=="folder") && ($fid==$id)) $gray=1;	//	subtree for folder moves
+	if (check_auth($fid, "folder_modify", $userid) == 0) $gray = 1; 	//	check for permissions
+
-	
 	if ($gray) {
 		print "<img src='$default->owl_root_url/locale/$default->owl_lang/graphics/icons/folder_gray.gif' height=16 width=16 align=top>";
 		print " <font color=\"silver\">$folder</font><br>\n";
-	}	
-	else 
-	{
+	} else {
 		print "<input type='image' border=0 src='$default->owl_root_url/locale/$default->owl_lang/graphics/icons/folder_closed.gif' height=16 width=16 align=top name=\"ID";
 		print "$fid\"> $folder<br>\n";
 	}
-	//Don't show subtree of selected folder as target for folder move
-	if (($action=="folder") && ($fid==$id)) 
-	{
-		return;	
-	}
-	
-	//recurse through all the folders in the current folder and
-	//display their sub-folders
-	for ($c=0; $c < $fCount; $c++) {
+	if (($action=="folder") && ($fid==$id)) return;	//	Don't show subtree of selected folder as target for folder move
+	for ($c=0; $c<$fCount; $c++) {
 		if ($folderList[$c][2]==$fid) {
 			$fDepth++;
 			showFoldersIn( $folderList[$c][0] , $folderList[$c][1] ); 
@@ -187,14 +138,12 @@ if ($action==&quot;$lang_cancel_button&quot;) {
 }
 checkForNewFolder();
-//if there is a new folder
 if (isset($newFolder)) {
 	$sql = new Owl_DB;
 	$source="";
 	$fID=$parent;
 	do {
-		//build the directory path from the root folder to the current parent folder
 		$sql->query("select name,parent from $default->owl_folders_table where id='$fID'");
 		while($sql->next_record()) {
 			$tName = $sql->f("name");
@@ -206,7 +155,6 @@ if (isset($newFolder)) {
 	$dest="";
 	$fID=$newFolder;
 	do {
-		//build the directory path from the root folder to the new folder
 		$sql->query("select name,parent from $default->owl_folders_table where id='$fID'");
 		while($sql->next_record()) {
 			$tName = $sql->f("name");
@@ -232,8 +180,6 @@ if (isset($newFolder)) {
 	}
-	//if we're using the file system
-	//then move the file
 	if($default->owl_use_fs) {
 		if ($type != "url") {
            		if (!file_exists("$default->owl_FileDir/$dest$fname")) {
 <?php
-/*
- * prefs.php
+/**
+ * prefs.php -- Main page
+ *  
+ * This is the preferences page
+ *
+ * This page displays the various preference of the specific user
+ * It Allows for ordering of informatio nas well as the changing 
+ * Of specific information e.g. passwords etc
  *
- * Copyright (c) 1999-2002 The Owl Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
- * $Id$
+ * @version v 1.1.1.1 2002/12/04
+ * @Copyright (c) 1999-2002 The Owl Project Team
+ * @author michael
+ * @package test
  */
 require("./config/owl.php");
@@ -18,7 +26,10 @@ include(&quot;./lib/header.inc&quot;);
 // + ADDED &order=$order&$sortorder=$sortname to
 // all browse.php?  header and HREF LINES
 // Begin 496814 Column Sorts are not persistant
-switch ($order) {
+
+// This handles the sorting order of information
+switch ($order) 
+{
      case "name":
            $sortorder = 'sortname';
            break;
@@ -52,31 +63,64 @@ print(&quot;&lt;TABLE WIDTH=$default-&gt;table_expand_width BGCOLOR=$default-&gt;main_header_b
 ?>
 <TR><TD ALIGN=LEFT><?php print "$lang_user: "; print uid_to_name($userid);?> <FONT SIZE=-1>
-<?php print("<A HREF='index.php?login=logout&sess=$sess'>$lang_logout</A>");?>
+<?
+	php print("<A HREF='index.php?login=logout&sess=$sess'>$lang_logout</A>");
+?>
     </FONT></TD><TD ALIGN=RIGHT>
-<?php print("<A HREF='browse.php?sess=$sess&parent=$parent&expand=$expand&order=$order&$sortorder=$sortname'><IMG SRC='$default->owl_root_url/locale/$language/graphics/btn_browse.gif' BORDER=0>");?>
+<?php 
+	print("<A HREF='browse.php?sess=$sess&parent=$parent&expand=$expand&order=$order&$sortorder=$sortname'><IMG SRC='$default->owl_root_url/locale/$language/graphics/btn_browse.gif' BORDER=0>");?>
         </A></TD></TR></TABLE>
+        
         <?php print $lang_preference; ?><br><hr width=50%>
-
 <?php
-if(!$action) $action = "users";
-function printuser($id) {
+if(!$action) 
+{
+	$action = "users";
+}
+
+//-------------------------------------------------------------
+/**
+ *   Function Printuser($id)
+ *
+ *   Displays the user information
+ *
+ *   @param $id
+ *	The UserId of the user that is currently logged on 
+*/
+//-------------------------------------------------------------
+// Not Usable - Interface has to Change
+function printuser($id)
+ {
+ 	// declare some global variables
 	global $order, $sortname, $sort;
         global $sess,$change,$lang_saved,$lang_title,$lang_group,$lang_username,$lang_change,$lang_quota,$lang_groupmember;
 	global $lang_deleteuser, $default, $expand, $parent, $lang_oldpassword, $lang_newpassword, $lang_confpassword;
 	global $lang_email, $lang_notification, $lang_userlang,$lang_attach_file;
-	if(isset($change)) print("$lang_saved<BR>");
+	
+	if(isset($change))
+	{ 
+		print("$lang_saved<BR>");
+	}
+	
+	// get the id  and name from the groups table
 	$sql = new Owl_DB;
 	$sql->query("select id,name from $default->owl_groups_table");
 	$i=0;
-	while($sql->next_record()) {
+	
+	// store in a double array
+	while($sql->next_record()) 
+	{
 		$groups[$i][0] = $sql->f("id");
 		$groups[$i][1] = $sql->f("name");
 		$i++;
 	}
+	
+	//get all information from the users table based on the group id
 	$sql->query("select * from $default->owl_users_table where id = '$id'");
-	while($sql->next_record()) {
+	// loop through the recordset
+	while($sql->next_record()) 
+	{
 		print("<FORM ACTION='./dbmodify.php' METHOD=POST>");
 		print("<INPUT TYPE=HIDDEN NAME=id VALUE=".$sql->f("id").">");
                 print("<INPUT TYPE=HIDDEN NAME=order VALUE='$order'>");
@@ -86,11 +130,14 @@ function printuser($id) {
 		print("<INPUT TYPE=HIDDEN name=expand VALUE=$expand>");
 		print("<INPUT TYPE=HIDDEN name=parent VALUE=$parent>");
 		print("<TABLE><TR><TD BGCOLOR=$default->table_header_bg align=right>$lang_title</TD><TD><INPUT TYPE=text NAME=name VALUE='".$sql->f("name")."'></TD></TR>");
+		
         //*******************************
         // Display the Language dropdown
         //*******************************
+                
                 print("<TR><TD BGCOLOR=$default->table_header_bg align=right>$lang_userlang</TD><TD align=left><SELECT NAME=newlanguage>");
                 print("<OPTION VALUE=".$sql->f("language").">".$sql->f("language"));
+                
                 $dir = dir($default->owl_LangDir);
                 $dir->rewind();
@@ -101,28 +148,48 @@ function printuser($id) {
                         print("<OPTION VALUE=$file>$file");
                      }
                 }
-                $dir->close();
+                 $dir->close();
+                
+               // get values if password is to be changed
                 print("</SELECT></TD></TR>"); 
 		print("<TR><TD BGCOLOR=$default->table_header_bg align=right>$lang_oldpassword</TD><TD><INPUT TYPE=PASSWORD NAME=oldpassword VALUE=></TD></TR>");
 		print("<TR><TD BGCOLOR=$default->table_header_bg align=right>$lang_newpassword</TD><TD><INPUT TYPE=PASSWORD NAME=newpassword VALUE=></TD></TR>");
 		print("<TR><TD BGCOLOR=$default->table_header_bg align=right>$lang_confpassword</TD><TD><INPUT TYPE=PASSWORD NAME=confpassword VALUE=></TD></TR>");
                 print("<TR><TD BGCOLOR=$default->table_header_bg align=right>$lang_email</TD><TD align=left><INPUT TYPE=TEXT NAME=email VALUE='".$sql->f("email")."'></TD></TR>");
+ 		// check if notification has been checked on
                 if ( $sql->f("notify") == 1)
+                {
                     print("<TR><TD BGCOLOR=$default->table_header_bg align=right>$lang_notification</TD><TD align=left><INPUT TYPE=CHECKBOX NAME=notify VALUE=1 checked></TD></TR>");
+                }
                 else
+                {
                     print("<TR><TD BGCOLOR=$default->table_header_bg align=right>$lang_notification</TD><TD align=left><INPUT TYPE=CHECKBOX NAME=notify VALUE=1></TD></TR>");
+                }
+               
+               // check if attachfile has been checked
                 if ( $sql->f("attachfile") == 1)
-                    print("<TR><TD BGCOLOR=$default->table_header_bg align=right>$lang_attach_file</TD><TD align=left><INPUT TYPE=CHECKBOX NAME=attachfile VALUE=1 checked></TD></TR>");
+                {
+                   	 print("<TR><TD BGCOLOR=$default->table_header_bg align=right>$lang_attach_file</TD><TD align=left><INPUT TYPE=CHECKBOX NAME=attachfile VALUE=1 checked></TD></TR>");
+                }
                 else
-                    print("<TR><TD BGCOLOR=$default->table_header_bg align=right>$lang_attach_file</TD><TD align=left><INPUT TYPE=CHECKBOX NAME=attachfile VALUE=1></TD></TR>");
+                print("<TR><TD BGCOLOR=$default->table_header_bg align=right>$lang_attach_file</TD><TD align=left><INPUT TYPE=CHECKBOX NAME=attachfile VALUE=1></TD></TR>");
 		print("</TABLE><BR><INPUT TYPE=SUBMIT VALUE=$lang_change>");
-		print("</FORM>"); }
+		print("</FORM>"); 
+		}
 }
-if($action) {
-	if(isset($owluser)) printuser($owluser);
-} else {
+//-------------------------------------------------------------
+// if an action has occurred, check if user is set and then print out user preferences
+if($action) 
+{
+	if(isset($owluser)) 
+	{
+		printuser($owluser);
+	}
+} 
+else 
+{
 	exit("$lang_err_general");
 }
 <?php 
-
-/*
- * search.php
+/**
+ * Search.php
  *
  * Copyright (c) 1999-2002 The Owl Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
+ * This class is just random php used as a example.
  *
- * $Id$
+ * @version 1.1.1.1 2002/12/04
+ * @author Michael
+ * @package Owl
  */
 require("./config/owl.php");
@@ -14,13 +16,30 @@ require(&quot;./lib/owl.lib.php&quot;);
 require("./config/html.php");
 require("./lib/security.lib.php");
-function find_path($parent) {
+
+//-------------------------------------------------------------
+/**
+ *   Function find_path($parent) 
+ *
+ *   Retrieves the parent folder from the DB
+ *
+ *   @param $parent
+ *	The parent folder id of the parent folder that needs to be retrieved 
+ *   @Return $path
+ *	Returns the path of the parent folder
+*/
+//-------------------------------------------------------------
+// Usable
+function find_path($parent) 
+{
         global $default;
         $path = fid_to_name($parent);
         $sql = new Owl_DB;
-        while($parent != 1) {
+        while($parent != 1) 
+        {// retrieve the parent from the folders table that corresponds to the parent id param
                 $sql->query("select parent from $default->owl_folders_table where id = '$parent'");
-                while($sql->next_record()) {
+                while($sql->next_record()) 
+                {
                         $path = fid_to_name($sql->f("parent"))."/".$path;
                         $parent = $sql->f("parent");
                 }
@@ -28,6 +47,8 @@ function find_path($parent) {
         return $path;
 }
+// This Layout section will not be needed as it is going to change
+
 // BEGIN patch Scott Tigr
 // patch for layout
 include("./lib/header.inc");
@@ -45,9 +66,12 @@ include(&quot;./lib/header.inc&quot;);
 print "<center>";
 print "<br>";
-if ($expand == 1) { // long view
+if ($expand == 1) 
+{ // long view
         print("\t\t<TABLE WIDTH=\"".$default->table_expand_width."\" border=\"0\">\n");
-} else {
+} 
+else 
+{
         print("\t\t<TABLE WIDTH=$default->table_collapse_width>\n");
 }
@@ -67,18 +91,23 @@ $sql-&gt;query(&quot;SELECT id,creatorid,groupid,security FROM $default-&gt;owl_folders_tab
 //
 // get all the folders that the user can read
-while($sql->next_record()) {
+while($sql->next_record()) 
+{
 	$id = $sql->f("id");
 	if(check_auth($id, "folder_view", $userid) == 1) $folders[$id] = $id;
 }
 //
 // get all the files in those folders that the user can read
-foreach($folders as $item) {
+foreach($folders as $item) 
+{
 	$sql->query("SELECT * FROM $default->owl_files_table where parent = '$item'");
-	while($sql->next_record()) {
+	while($sql->next_record()) 
+	{
 		$id = $sql->f("id");
-		if(check_auth($id, "file_download", $userid) == 1) {
+		
+		if(check_auth($id, "file_download", $userid) == 1) 
+		{
 			$files[$id][id] = $id;
 			$files[$id][n] = $sql->f("name");
 			$files[$id][m] = explode(" ", $sql->f("metadata"));
@@ -109,21 +138,48 @@ $query = explode(&quot; &quot;, $query);
 //
 // the is the meat of the matching
 if(sizeof($files) > 0) {
-foreach($query as $keyword) {
-	foreach(array_keys($files) as $key) {
+foreach($query as $keyword)
+ {
+	foreach(array_keys($files) as $key) 
+	{
 		// BEGIN enhancement Sunil Savkar
 		// if the $parent string contains a keyword to be searched, then the score is
 		// adjusted.  This takes into account the hierarchy.
-		if(eregi("$keyword", find_path($files[$key][p]))) $files[$key][score] = $files[$key][score] + 4;
-		if(eregi("$keyword", $files[$key][n])) $files[$key][score] = $files[$key][score] + 4;
-		if(eregi("$keyword", $files[$key][f])) $files[$key][score] = $files[$key][score] + 3;
-		foreach($files[$key][m] as $metaitem) {
+		
+		// if keyword is found in the path
+		if(eregi("$keyword", find_path($files[$key][p])))
+		{ 
+			$files[$key][score] = $files[$key][score] + 4;
+		}
+		
+		//if keyword is found in the files array
+		if(eregi("$keyword", $files[$key][n]))
+		{
+			 $files[$key][score] = $files[$key][score] + 4;
+		}
+		
+		if(eregi("$keyword", $files[$key][f]))
+		{
+			$files[$key][score] = $files[$key][score] + 3;
+		}
+		// if keyword is found in metadata
+		foreach($files[$key][m] as $metaitem) 
+		{
 			// add 2 to the score if we find it in metadata (key search items)
-			if(eregi("$keyword", $metaitem)) $files[$key][score] = $files[$key][score] + 2;
+			if(eregi("$keyword", $metaitem)) 
+			{
+				$files[$key][score] = $files[$key][score] + 2;
+			}
 		}
-		foreach($files[$key][d] as $descitem) {
+		
+		// if keyword is found in description
+		foreach($files[$key][d] as $descitem) 
+		{
 			// only add 1 for regular description matches
-			if(eregi("$keyword", $descitem)) $files[$key][score] = $files[$key][score] + 1;
+			if(eregi("$keyword", $descitem)) 
+			{
+				$files[$key][score] = $files[$key][score] + 1;
+			}
 		}
 	}
 }
@@ -136,11 +192,16 @@ $hit = 1;
 $CountLines = 0;
 $iconfiles = array("html","htm","gif","jpg","bmp","zip","tar","doc","mdb","xls","ppt","pdf","gz","mp3","tgz");
-
-if(sizeof($files) > 0) {
-	while($max > 0) {
-		foreach(array_keys($files) as $key) {
-			if($files[$key][score] == $max) {
+//if array exists print out the results based on their score of relavence
+// This section will have to change as the interface is changing
+if(sizeof($files) > 0) 
+{
+	while($max > 0) 
+	{
+		foreach(array_keys($files) as $key)
+		 {
+			if($files[$key][score] == $max)
+			 {
 				$name = find_path($files[$key][p])."/".$files[$key][n];			
 				$filename = $files[$key][f];
 				$choped = split("\.", $filename);
@@ -151,22 +212,32 @@ if(sizeof($files) &gt; 0) {
         			$CountLines++;
         			$PrintLines = $CountLines % 2;
         			if ($PrintLines == 0)
+        			{
                 			print("<TR BGCOLOR='$default->table_cell_bg_alt'>");
+                		}
         			else
                 			print("<TR BGCOLOR='$default->table_cell_bg'>");
 				print "<TD ALIGN=CENTER width=5%>";
 				//for ($i=$max; $i>0; $i--) {
 				//} 
+				
+				// display results based on relevance (different graphics) and score
 				$t_score = $max;
-				for ($c=$max; $c>=1; $c--) {	
-					if ( $t_score >= 10) {
-						if ( 0 == ($c % 10)) {
+				for ($c=$max; $c>=1; $c--) 
+				{	
+					if ( $t_score >= 10) 
+					{					
+						if ( 0 == ($c % 10)) 
+						{
 							print "<IMG SRC='$default->owl_root_url/graphics/star10.gif' BORDER=0>";
 							$t_score = $t_score - 10;	
 						}
-					} else {
-						if ( (0 == ($t_score % 2)) && $t_score > 0 ) {
+					} 
+					else 
+					{
+						if ( (0 == ($t_score % 2)) && $t_score > 0 ) 
+						{
 							print "<IMG SRC='$default->owl_root_url/graphics/star.gif' BORDER=0>";
 						}
 							$t_score = $t_score - 1;
@@ -3,8 +3,6 @@
 /*
  * view.php
  *
- * Displays file details, image previews, zip previews depending on the current action
- *
  * Copyright (c) 1999-2002 The Owl Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
@@ -54,13 +52,7 @@ switch ($order) {
 }
 // END 496814 Column Sorts are not persistant
-/**
-* Finds the path from the root folder to the required folder
-*
-* @param $parent required folder
-*
-* @returns string containing path from root folder to required folder 
-*/
+
 function find_path($parent) {
 	global $default;
         $path = fid_to_name($parent);
@@ -75,13 +67,6 @@ function find_path($parent) {
         return $path;
 }
-/**
-* Get a file name for a file id
-*
-* @paramater $id file id
-*
-* @return string file name
-*/
 function fid_to_filename($id) {
 	global $default;
         $sql = new Owl_DB;
@@ -90,14 +75,11 @@ function fid_to_filename($id) {
 }
 if($action == "image_show") {
-	//if the user has permission to download the file
 	if(check_auth($id, "file_download", $userid) == 1) {
-		//if the file is stored on the file system
 		if ($default->owl_use_fs) {
 			$path = $default->owl_FileDir."/".find_path($parent)."/".fid_to_filename($id);
 			readfile("$path");
 		}
-		//else the file is stored in the database
 		else {
 			$sql = new Owl_DB;
                 	$filename =  fid_to_filename($id);
@@ -145,17 +127,12 @@ print(&quot;&lt;TABLE WIDTH=$default-&gt;table_expand_width BGCOLOR=$default-&gt;main_header_b
 <?php print("<A HREF='browse.php?sess=$sess&parent=$parent&expand=$expand&order=$order&$sortorder=$sortname'><IMG SRC='$default->owl_root_url/locale/$language/graphics/btn_browse.gif' BORDER=0>");?>
 	</A></TD></TR></TABLE>
 <?php
-
-//view the file details (name, creator, security rights etc.)
 if($action == "file_details") {
-	//if the current user has permission to view the folder
 	if(check_auth($parent, "folder_view", $userid) == 1) {
                 $expand = 1;
                 print("<TABLE WIDTH=$default->table_expand_width BORDER=$default->table_border>");
                 print("<TR><TD align=left>".gen_navbar($parent)."/".flid_to_name($id)."</TD></TR>");
                 print("</TABLE><HR WIDTH=$default->table_expand_width><BR>");
-		
-		//get the file information
                 $sql = new Owl_DB; $sql->query("select * from $default->owl_files_table where id = '$id'");
                 while($sql->next_record()) {
                         $security = $sql->f("security");
@@ -183,9 +160,7 @@ if($action == &quot;file_details&quot;) {
 	}
 }
-//preview an image
 if($action == "image_preview") {
-	//if the current user has permission to dowload the file
 	if(check_auth($id, "file_download", $userid) == 1) {
 		$path = find_path($parent)."/".fid_to_filename($id);
 		print("$lang_viewing". gen_navbar($parent) . "/" . fid_to_filename($id) ."<HR WIDTH=50%><BR><BR>");
@@ -195,18 +170,13 @@ if($action == &quot;image_preview&quot;) {
 	}
 }
-//preview a zip file
 if($action == "zip_preview") {
-	//if the current user has permission to download the file
 	if(check_auth($id, "file_download", $userid) == 1) {
 		$name = fid_to_filename($id);
-		//if the file is stored on the file system
 		if ($default->owl_use_fs) {
                   $path = find_path($parent)."/".$name;
-                }
-		//else the file is stored in the database
-		else {
+                } else {
                   $path = $name;
                   if (file_exists($default->owl_FileDir. "/$path")) unlink($default->owl_FileDir. "/$path");
                   $file = fopen($default->owl_FileDir. "/$path", 'wb');
@@ -254,18 +224,13 @@ if($action == &quot;zip_preview&quot;) {
 // BEGIN wes change
 if($action == "html_show" || $action == "text_show") {
-	//if the current user has permission to download the file
         if(check_auth($id, "file_download", $userid) == 1) {
-	 //if the file is stored on the file system
           if ($default->owl_use_fs) {
                 $path = $default->owl_FileDir."/".find_path($parent)."/".fid_to_filename($id);
 		print("<BR>$lang_viewing". gen_navbar($parent) . "/" . fid_to_filename($id) ."<HR WIDTH=50%><BR><BR></CENTER>");
                 if ($action == "text_show") print("<xmp>");
                 readfile("$path");
-          }
-	  //else the file is stored in the database
-	  else 
-	  {
+          } else {
                 print("$lang_viewing /".find_path($parent)."/".fid_to_filename($id)."<HR WIDTH=50%><BR><BR></CENTER>");
                 if ($action == "text_show") print("<xmp>");