diff --git a/modify.php b/modify.php index db19558..9e48450 100755 --- a/modify.php +++ b/modify.php @@ -1,12 +1,19 @@ MODIFY Sess: $sess
Loginname: $loginname
Login:$login"); @@ -15,39 +22,36 @@ require("./config/owl.php"); require("./lib/owl.lib.php"); require("./config/html.php"); require("./lib/security.lib.php"); - 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_expand_width BGCOLOR=$default->main_header_bgcolor CELLSPACING=0 CELLPADDING=0 BORDER=$default->table_border HEIGHT=30>"); @@ -72,36 +76,37 @@ print("
table_expand_width BGCOLOR=$default->main_header_b print("
"); if ($action == "file_update") { - if(check_auth($id, "file_modify", $userid) == 1) { + if(check_auth($id, "file_modify", $userid) == 1) { print("
"); $expand = 1; print("
table_expand_width BORDER=$default->table_border>"); print(""); print("
$lang_updating ".gen_navbar($parent)."/".flid_to_name($id)."
table_expand_width>
"); print("
- - + + "); -// BUG FIX: #449395 expanded/collapse view bugs - print(""); -// END BUG FIX: #449395 expanded/collapse view bugs - print("table_border>"); - // begin Daphne change - version control - if ($default->owl_version_control == 1) { - print(" - "); - print(" - "); - } - // End Daphne Change - print("
table_header_bg>$lang_sendthisfile
table_header_bg valign=top>$lang_vertype
table_header_bg valign=top>$lang_verdescription -
"); + // BUG FIX: #449395 expanded/collapse view bugs + print(""); + // END BUG FIX: #449395 expanded/collapse view bugs + print("table_border>"); + + // begin Daphne change - version control + if ($default->owl_version_control == 1) { + print(" + "); + print(" + "); + } + // End Daphne Change + print("
table_header_bg>$lang_sendthisfile
table_header_bg valign=top>$lang_vertype
table_header_bg valign=top>$lang_verdescription +
"); include("./lib/footer.inc"); } else { print($lang_noupload); @@ -122,60 +127,60 @@ if ($action == "file_upload") { $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_expand_width BORDER=$default->table_border>"); print(""); print("
$lang_addingfile".gen_navbar($parent)."
table_expand_width>
"); print("
- - - - - - - - table_border>"); - - if ($type == "url") - print(""); - else + + + + + + + +
table_header_bg>$lang_sendthisurl:
table_border>"); + + if ($type == "url") { + print(""); + } else { print(""); + } - print(" - "); - - print(" -
table_header_bg>$lang_sendthisurl:
table_header_bg>$lang_sendthisfile:
table_header_bg>$lang_title:
table_header_bg>$lang_keywords:
table_header_bg>$lang_ownergroup:
table_header_bg>"); - // Daphne Change - add wrap=hard to textarea for logs - print("$lang_description:
"); + print("table_header_bg>$lang_title: + table_header_bg>$lang_keywords:"); + + print("table_header_bg>$lang_ownergroup: + "); include("./lib/footer.inc"); } else { print($lang_noupload); @@ -189,102 +194,99 @@ if ($action == "file_modify") { /* 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()) { + $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++; - } - } - 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_expand_width BORDER=$default->table_border>"); print(""); print("
$lang_modifying".gen_navbar($parent)."/".flid_to_name($id)."
table_expand_width>
"); - $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_border> + print("
table_header_bg> - $lang_title:f("name")."\">
table_border>"); - // 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(""); - -print(""); - printfileperm($security, "security", "$lang_permissions:","admin"); - } - else - { - print(""); - print(""); - print(""); - print(""); - } - // Bozz change End - //print(" - print(" + $current_groupid = owlfilegroup($id); + $current_owner = owlfilecreator($id); + if ( owlusergroup($userid) == 0 || uid_to_name($userid) == fid_to_creator($id)) { + print(""); + + print(""); + printfileperm($security, "security", "$lang_permissions:","admin"); + } else { + print(""); + print(""); + print(""); + print(""); + } + // Bozz change End + + //print(" + print("
table_header_bg> + $lang_title:f("name")."\">
table_header_bg>$lang_file:".$sql->f("filename")." (".gen_filesize($sql->f("size")).")
table_header_bg>$lang_ownership:
table_header_bg>$lang_ownergroup:
table_header_bg>$lang_ownership:".fid_to_creator($id)." (".group_to_name(owlfilegroup($id)).")
table_header_bg>$lang_keywords:
table_header_bg>$lang_ownership:
table_header_bg>$lang_ownergroup:
table_header_bg>$lang_ownership:".fid_to_creator($id)." (".group_to_name(owlfilegroup($id)).")
table_header_bg>$lang_keywords:
table_header_bg VALIGN=TOP> $lang_description: - - + +
@@ -293,7 +295,7 @@ print("table_header_bg>$lang_ownergroup:
".$lang_nofilemod); + print("

".$lang_nofilemod); } } @@ -304,25 +306,21 @@ if ($action == "folder_create") { /* 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"); + } 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++; - } - + $i=0; + while($sql->next_record()) { + $groups[$i][0] = $sql->f("id"); + $groups[$i][1] = $sql->f("name"); + $i++; + } /* END Bozz Change */ print("table_expand_width BORDER=$default->table_border>
$lang_addingfolder ".gen_navbar($parent)."
table_expand_width>
@@ -330,23 +328,25 @@ if ($action == "folder_create") { - - + + "); - /* BEGIN Bozz Change - Display Retrieved Group information if the user is in the - Administrator group */ - print("table_header_bg>$lang_ownergroup:"); + /* BEGIN Bozz Change + Display Retrieved Group information if the user is in the + Administrator group */ + print("table_header_bg>$lang_ownergroup:"); include("./lib/footer.inc"); } else { print($lang_nosubfolder); @@ -357,105 +357,101 @@ if ($action == "folder_modify") { 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_expand_width BORDER=$default->table_border>"); print(""); print("
$lang_modifying ".gen_navbar($id)."
table_expand_width>
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(""); print(""); - //print(""); - print(" + //print(""); + print(" - - - - "); - - /* BEGIN Bozz Change - Display Retrieved Group information if the user is in the - Administrator group */ - if ( owlusergroup($userid) == 0 ) - { - print("
table_header_bg>$lang_name:
table_header_bg>$lang_policy:$security
table_header_bg>$lang_ownership:".uid_to_name(owlfoldercreator($id))." (".group_to_name(owlfoldergroup($id)).")
table_header_bg>$lang_policy:$security
table_header_bg>$lang_ownership:".uid_to_name(owlfoldercreator($id))." (".group_to_name(owlfoldergroup($id)).")
table_header_bg>$lang_ownergroup:
+ + + + "); + + /* BEGIN Bozz Change + Display Retrieved Group information if the user is in the + Administrator group */ + if ( owlusergroup($userid) == 0 ) { + print("table_header_bg>$lang_ownergroup: "); include("./lib/footer.inc"); - - } - } else { - print($lang_nofoldermod); - } + } // end while + } else { + print($lang_nofoldermod); + } } if ($action == "file_email") { - if(check_auth($id, "file_modify", $userid) == 1) { - print("
"); - $expand = 1; + if(check_auth($id, "file_modify", $userid) == 1) { + print("
"); + $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("
"); - print(""); - - print("table_expand_width BORDER=$default->table_border>"); - print(""); - print("
$lang_emailing ".gen_navbar($parent)."/".flid_to_name($id)."
table_expand_width>
"); - print(" - - - - - - - - "); - - print(""); - print("table_border> - - - "); - print(" - "); - print("
table_header_bg>$lang_email_to
table_header_bg>$lang_email_cc
table_header_bg>$lang_email_reply_to
table_header_bg>$lang_email_subject
table_header_bg valign=top>$lang_email_body
"); - include("./lib/footer.inc"); - } else { - print($lang_noemail); - } + $default_reply_to = $sql->f("email"); + + print("
"); + print(""); + + print("table_expand_width BORDER=$default->table_border>"); + print(""); + print("
$lang_emailing ".gen_navbar($parent)."/".flid_to_name($id)."
table_expand_width>
"); + print(" + + + + + + + + "); + + print(""); + print("table_border> + + + "); + print(" + "); + print("
table_header_bg>$lang_email_to
table_header_bg>$lang_email_cc
table_header_bg>$lang_email_reply_to
table_header_bg>$lang_email_subject
table_header_bg valign=top>$lang_email_body
"); + include("./lib/footer.inc"); + } else { + print($lang_noemail); + } } ?>