[Phpgroupware-cvs] property/class.bocommon.php, 1.1.1.6

[nomail]

Update of /property
Modified Files:
        Branch: 
          class.bocommon.php

date: 2004/04/26 12:21:09;  author: sigurdne;  state: Exp;  lines: +20 -18

Log Message:
no message
=====================================================================
Index: property/class.bocommon.php
diff -u property/class.bocommon.php:1.1.1.5 property/class.bocommon.php:1.1.1.6
--- property/class.bocommon.php:1.1.1.5 Sat Apr 24 21:36:26 2004
+++ property/class.bocommon.php Mon Apr 26 12:21:09 2004
@@ -96,26 +96,26 @@
 
                function jscalendar()
                {
-                       $phpgw_js_url = 
$GLOBALS['HTTP_SERVER_VARS']['PHP_SELF'].'/phpgwapi/js';
-                       $img = $phpgw_js_url.'/jscalendar/img.gif';
+                       $phpgw_js_url = 
$GLOBALS['HTTP_SERVER_VARS']['PHP_SELF'].'/property/js';
+                       $img = $phpgw_js_url.'/jscalendar/img.png';
                        $dateformat = 
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
-                       $jsDateFormat = str_replace(array('d', 'm', 'M', 'Y'), 
array('%d', '%m', '%b', '%Y'), $dateformat);
-
+                       $jsDateFormat = '%B %e, %Y';//str_replace(array('d', 
'm', 'M', 'Y'), array('%d', '%m', '%b', '%Y'), $dateformat);
+/*
                        $GLOBALS['phpgw_info']['flags']['java_script'] 
.='</script>
                        <link rel="stylesheet" type="text/css" media="all" 
href="'.$phpgw_js_url.'/jscalendar/calendar-win2k-cold-1.css" 
title="win2k-cold-1" >
                        <script type="text/javascript" 
src="'.$phpgw_js_url.'/jscalendar/calendar.js"></script>
                        <script type="text/javascript" 
src="'.$phpgw_js_url.'/jscalendar/calendar-setup.js"></script>
                        <script type="text/javascript" 
src="'.$phpgw_js_url.'/jscalendar/lang/calendar-'.substr($GLOBALS['phpgw_info']['user']['preferences']['common']['lang'],0,2)
 .'.js"></script>
                        ';
-
+*/
 
 //                     <script type="text/javascript" 
src="'.ereg_replace('[?&]*click_history=[0-9a-f]*','',$this->link('/phpgwapi/js/jscalendar/jscalendar-setup.php')).'"></script>
 
                        $cal_info=array(
-//                             'stylesheet'                                    
=> $phpgw_js_url.'/jscalendar/calendar-win2k-cold-1.css',
-//                             'calendar_source'                               
=> $phpgw_js_url.'/jscalendar/calendar.js',
-//                             'calendar_setup_source'                 => 
$phpgw_js_url.'/jscalendar/calendar-setup.js',
-//                             'calendar_lang'                                 
=> 
$phpgw_js_url.'/jscalendar/lang/calendar-'.substr($GLOBALS['phpgw_info']['user']['preferences']['common']['lang'],0,2)
 .'.js',
+                               'stylesheet'                                    
=> $phpgw_js_url.'/jscalendar/calendar-win2k-cold-1.css',
+                               'calendar_source'                               
=> $phpgw_js_url.'/jscalendar/calendar.js',
+                               'calendar_setup_source'                 => 
$phpgw_js_url.'/jscalendar/calendar-setup.js',
+                               'calendar_lang'                                 
=> $phpgw_js_url.'/jscalendar/lang/calendar-en.js',
                                'jsDateFormat'                                  
=> $jsDateFormat,
                                'img'                                           
        => $img,
                                );
@@ -327,9 +327,10 @@
                                }
                        }
 
-                       $accounts       = CreateObject('phpgwapi_accounts');
-                       $users = $accounts->get_list('accounts', $start, $sort, 
$order, $query);
-                       unset($accounts);
+//                     $accounts       = CreateObject('phpgwapi_accounts');
+//                     $users = $accounts->get_list('accounts', $start, $sort, 
$order, $query);
+//                     unset($accounts);
+                       $users = 
$GLOBALS['phpgw']->accounts->list_repository('accounts', $start,$sort, $order, 
$query);
                        if (is_array($users_extra) && is_array($users))
                        {
                                $users = $users_extra + $users;
@@ -379,9 +380,10 @@
                                        break;
                        }
 
-                       $accounts       = CreateObject('phpgwapi_accounts');
-                       $users = $accounts->get_list('groups', $start, $sort, 
$order, $query);
-                       unset($accounts);
+//                     $accounts       = CreateObject('phpgwapi_accounts');
+//                     $users = $accounts->get_list('groups', $start, $sort, 
$order, $query);
+//                     unset($accounts);
+                       $users = 
$GLOBALS['phpgw']->accounts->list_repository('groups', $start,$sort, $order, 
$query);
                        if (isSet($users) AND is_array($users))
                        {
                                foreach($users as $user)
@@ -1180,12 +1182,12 @@
                                        }
                                }
 
-                          $filename= 
$GLOBALS['phpgw_info']['user']['account_lid'].'.xls';
+                          $filename= 
$GLOBALS['phpgw_data']['user']['lid'].'.xls';
 
                                $str.=$xls->EOF();
                                $size=strlen($str);
 
-                               $browser = CreateObject('phpgwapi_browser');
+                               $browser = 
CreateObject($this->currentapp.'_browser');
                                
$browser->content_header($filename,'application/vnd.ms-excel',$size);
 
                                echo $str;