*** workspace.module	Tue Jul  5 09:00:19 2005
--- ../workspace-new/workspace.module	Thu Aug 18 11:33:48 2005
***************
*** 129,144 ****
  * The default admin interface is a list of content.
  */
  function workspace_list() {
    global $user;
    $maxnodes = $user->workspaces ? $user->workspaces['default']['maxnodes'] : 50;
    $maxfilenames = $user->workspaces ? $user->workspaces['default']['maxfilenames'] : 50;
    if (!is_numeric($maxnodes)) {$maxnodes = 50;}
    if (!is_numeric($maxfilenames)) {$maxfilenames = 50;}
- 
    $comments_enabled = module_exist('comment');
    
!   $output = workspace_addform();
!   
!   $sql = "SELECT n.nid, n.type, 0 AS cid, n.title, n.status, n.changed, s.comment_count, 1 AS node FROM {node} n LEFT OUTER JOIN {node_comment_statistics} s ON n.nid = s.nid WHERE n.uid = $user->uid UNION SELECT c.nid AS cnid, '' AS type, c.cid, c.subject, c.status, c.timestamp, c.pid, 0 FROM {comments} AS c WHERE c.uid = $user->uid";
  
    $count_query = "SELECT COUNT(DISTINCT c.cid) + COUNT(DISTINCT n.nid) FROM {node} n, {comments} c WHERE n.uid = $user->uid and c.uid = $user->uid";
--- 129,161 ----
  * The default admin interface is a list of content.
  */
+ 
  function workspace_list() {
    global $user;
+   $output = '';
+   $output .= workspace_addform();
+   $output .= '<p>&nbsp;</p>';
+   $sql_1  = "SELECT n.nid, n.type, 0 AS cid, n.title, n.status, n.changed, s.comment_count, 1 AS node ";
+   $sql_1 .= "FROM {node} n LEFT OUTER JOIN {node_comment_statistics} s ON n.nid = s.nid ";
+   $sql_1 .= "WHERE n.uid = $user->uid ";
+   $output .= '<h2>'.t('Publications').'</h2>';
+   $output .= _callback_workspace_list($sql_1);
+   $sql_2 = "SELECT c.nid AS nid, '' AS type, c.cid, c.subject AS title, c.status, c.timestamp AS changed, c.pid, 0 ";
+   $sql_2 .= "FROM {comments} AS c ";
+   $sql_2 .= "WHERE c.uid = $user->uid";
+   $output .= '<br><br><h2>'.t('Comments').'</h2>';
+   $output .= _callback_workspace_list($sql_2);
+   return $output;
+ }
+ 
+ function _callback_workspace_list($sql) {
+   global $user;
    $maxnodes = $user->workspaces ? $user->workspaces['default']['maxnodes'] : 50;
    $maxfilenames = $user->workspaces ? $user->workspaces['default']['maxfilenames'] : 50;
    if (!is_numeric($maxnodes)) {$maxnodes = 50;}
    if (!is_numeric($maxfilenames)) {$maxfilenames = 50;}
    $comments_enabled = module_exist('comment');
+   $output = '';
    
!   //$sql = "SELECT n.nid, n.type, 0 AS cid, n.title, n.status, n.changed, s.comment_count, 1 AS node FROM {node} n LEFT OUTER JOIN {node_comment_statistics} s ON n.nid = s.nid WHERE n.uid = $user->uid UNION SELECT c.nid AS cnid, '' AS type, c.cid, c.subject, c.status, c.timestamp, c.pid, 0 FROM {comments} AS c WHERE c.uid = $user->uid";
  
    $count_query = "SELECT COUNT(DISTINCT c.cid) + COUNT(DISTINCT n.nid) FROM {node} n, {comments} c WHERE n.uid = $user->uid and c.uid = $user->uid";