From 81d74386d4a52cb018257b525bfb24e32972927a Mon Sep 17 00:00:00 2001
From: Andrew McMillan <debian@mcmillan.net.nz>
Date: Sun, 26 Nov 2006 15:32:29 +1300
Subject: [PATCH] Get rid of the relationships.php which is in the user page
 now.  Provide a way of seeing some information about the items in a
 collection.

---
 htdocs/collection.php    | 46 ++++++++++++++++++++++++++++++++++++++++
 htdocs/relationships.php | 43 -------------------------------------
 rscds.webprj             |  3 ++-
 3 files changed, 48 insertions(+), 44 deletions(-)
 create mode 100644 htdocs/collection.php
 delete mode 100644 htdocs/relationships.php

diff --git a/htdocs/collection.php b/htdocs/collection.php
new file mode 100644
index 00000000..3a56da47
--- /dev/null
+++ b/htdocs/collection.php
@@ -0,0 +1,46 @@
+<?php
+require_once("always.php");
+require_once("RSCDSSession.php");
+$session->LoginRequired();
+
+require_once("interactive-page.php");
+
+
+  require_once("classBrowser.php");
+  $c->stylesheets[] = "css/browse.css";
+
+  $c->page_title = translate("Collection Contents");
+  $browser = new Browser($c->page_title);
+
+  $browser->AddColumn( 'dav_name', translate('Path'), '', '', 'caldav_data.dav_name' );
+  $browser->AddColumn( 'caldav_type', translate('Type') );
+  $browser->AddColumn( 'dtstart', translate('Start'), '', '', "to_char(dtstart,'YYYY-MM-DD HH24:MI')" );
+  $browser->AddColumn( 'dtend', translate('Finish'), '', '', "to_char(dtstart,'YYYY-MM-DD HH24:MI')" );
+  $browser->AddColumn( 'summary', translate('Summary') );
+  $browser->AddColumn( 'rrule', translate('Repeat Rule') );
+
+  $browser->SetJoins( 'caldav_data JOIN calendar_item USING ( user_no, dav_name ) ' );
+  if ( isset($user_no) ) {
+    $browser->SetWhere( "user_no=" . intval($user_no) );
+  }
+  if ( isset($dav_name) ) {
+    $browser->SetWhere( "dav_name ~ " . qpg("^".$dav_name."[^/]+$") );
+  }
+
+  if ( isset( $_GET['o']) && isset($_GET['d']) ) {
+    $browser->AddOrder( $_GET['o'], $_GET['d'] );
+  }
+  else
+    $browser->AddOrder( 'dav_name', 'A' );
+
+  $browser->RowFormat( "<tr class=\"r%d\">\n", "</tr>\n", '#even' );
+
+  $browser->DoQuery();
+
+
+include("page-header.php");
+
+echo $browser->Render();
+
+include("page-footer.php");
+?>
\ No newline at end of file
diff --git a/htdocs/relationships.php b/htdocs/relationships.php
deleted file mode 100644
index bad414af..00000000
--- a/htdocs/relationships.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-require_once("always.php");
-require_once("RSCDSSession.php");
-$session->LoginRequired();
-
-require_once("interactive-page.php");
-
-
-  require_once("classBrowser.php");
-  $c->stylesheets[] = "css/browse.css";
-
-  $c->page_title = "User Relationships";
-  $browser = new Browser($c->page_title);
-
-  $browser->AddColumn( 'from_user', 'From', '', '##from_user_link##' );
-  $browser->AddColumn( 'from_name', 'Name', '', '', 'ufrom.fullname' );
-  $browser->AddHidden( 'from_user_link', "'<a href=\"/user.php?user_no=' || from_user || '\">' || from_user || '</a>'" );
-  $browser->AddColumn( 'to_user', 'From', '', '##to_user_link##' );
-  $browser->AddColumn( 'to_name', 'Name', '', '', 'uto.fullname' );
-  $browser->AddHidden( 'to_user_link', "'<a href=\"/user.php?user_no=' || to_user || '\">' || to_user || '</a>'" );
-
-  $browser->SetJoins( 'relationship JOIN usr ufrom ON (ufrom.user_no = from_user) JOIN usr uto ON (uto.user_no = to_user) ' );
-
-  if ( isset( $_GET['o']) && isset($_GET['d']) ) {
-    $browser->AddOrder( $_GET['o'], $_GET['d'] );
-  }
-  else
-    $browser->AddOrder( 'from_user', 'A' );
-
-  $browser->RowFormat( "<tr onMouseover=\"LinkHref(this,1);\" title=\"Click to Display Role Detail\" class=\"r%d\">\n", "</tr>\n", '#even' );
-  $browser->DoQuery();
-
-
-  $user_menu->AddOption("Relationships","/relationship.php?user_no=$user_no","Relationships for this user", false, 10);
-
-  $active_menu_pattern = "#^/relationship#";
-
-include("page-header.php");
-
-echo $browser->Render();
-
-include("page-footer.php");
-?>
\ No newline at end of file
diff --git a/rscds.webprj b/rscds.webprj
index 517788e4..734b60e4 100644
--- a/rscds.webprj
+++ b/rscds.webprj
@@ -37,7 +37,6 @@
     <item url="htdocs/users.php" uploadstatus="1" />
     <item url="htdocs/help.php" uploadstatus="1" />
     <item url="htdocs/roles.php" uploadstatus="1" />
-    <item url="htdocs/relationships.php" uploadstatus="1" />
     <item url="dba/caldav_functions.sql" uploadstatus="1" />
     <item url="htdocs/user.php" uploadstatus="1" />
     <item url="inc/RSCDSUser.php" uploadstatus="1" />
@@ -224,5 +223,7 @@
     <item url="testing/tests/regression-suite/023-Mulberry-DELETE-3.test" uploadstatus="1" />
     <item url="testing/tests/regression-suite/022-Mulberry-PUT-5.test" uploadstatus="1" />
     <item url="dba/patches/1.1.5.sql" uploadstatus="1" />
+    <item url="docs/website/wikiheader.css" />
+    <item url="htdocs/collection.php" />
   </project>
 </webproject>