[Phpgroupware-cvs] CVS: bookmarks index.php,1.17,1.17.4.1 create.php,1.30.2.1.2.1,NONE export.php,1.1.2.1,NONE faq.php,1.8,NONE import.php,1.17.2.2,NONE list.php,1.27.2.1,NONE maillink.php,1.12.2.2,NONE maintain.php,1.26.2.2.2.1,NONE mass_maintain.php,1.5,NONE preferences.php,1.8,NONE redirect.php,1.14,NONE search.php,1.18.2.1,NONE tree.php,1.26.2.1,NONEview.php,1.18.2.1.2.1,NONE

[Michael Totschnig <address@hidden>]

Update of /cvsroot/phpgroupware/bookmarks
In directory subversions:/tmp/cvs-serv7092

Modified Files:
      Tag: Version-0_9_16-branch
        index.php 
Removed Files:
      Tag: Version-0_9_16-branch
        create.php export.php faq.php import.php list.php maillink.php 
        maintain.php mass_maintain.php preferences.php redirect.php 
        search.php tree.php view.php 
Log Message:
ported bookmarks to three-layered design
additional changes:
- unlimited category hierarchy can be used (formerly only two levels were 
possible)
- tree view is javascript based
- location_info works better


Index: index.php
===================================================================
RCS file: /cvsroot/phpgroupware/bookmarks/index.php,v
retrieving revision 1.17
retrieving revision 1.17.4.1
diff -C2 -r1.17 -r1.17.4.1
*** index.php   19 Nov 2001 03:56:04 -0000      1.17
--- index.php   8 Apr 2003 04:46:15 -0000       1.17.4.1
***************
*** 21,46 ****
        include('../header.inc.php');
  
!       $GLOBALS['phpgw']->bookmarks = createobject('bookmarks.bookmarks');
!       $location_info    = $GLOBALS['phpgw']->bookmarks->read_session_data();
  
-       if (is_array($location_info))
-       {
-               $extravars = 'bm_cat=' . $location_info['bm_cat'];
-       }
- 
-       if (is_array($location_info) && $location_info['returnto'])
-       {
-               
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/bookmarks/' . 
$location_info['returnto'],$extravars));
-       }
-       else
-       {
-               if 
($GLOBALS['phpgw_info']['user']['preferences']['bookmarks']['defaultview'] == 
'tree')
-               {
-                       
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/bookmarks/tree.php',$extravars));
-               }
-               else
-               {
-                       
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/bookmarks/list.php',$extravars));
-               }
-       }
  ?>
--- 21,27 ----
        include('../header.inc.php');
  
!       $obj = createobject('bookmarks.ui');
!       $obj->init();
!       $GLOBALS['phpgw']->common->phpgw_footer();
  
  ?>

--- create.php DELETED ---

--- export.php DELETED ---

--- faq.php DELETED ---

--- import.php DELETED ---

--- list.php DELETED ---

--- maillink.php DELETED ---

--- maintain.php DELETED ---

--- mass_maintain.php DELETED ---

--- preferences.php DELETED ---

--- redirect.php DELETED ---

--- search.php DELETED ---

--- tree.php DELETED ---

--- view.php DELETED ---