[Phpgroupware-cvs] calendar/inc class.boicalendar.inc.php, 1.26 class.uicalendar.inc.php, 1.109

[skwashd]

Update of calendar/inc

Modified Files:
     Branch: MAIN
            class.boicalendar.inc.php lines: +1 -1
            class.uicalendar.inc.php lines: +23 -20

Log Message:
merged from 16

====================================================

====================================================
Index: calendar/inc/class.uicalendar.inc.php
diff -u calendar/inc/class.uicalendar.inc.php:1.108 
calendar/inc/class.uicalendar.inc.php:1.109
--- calendar/inc/class.uicalendar.inc.php:1.108 Sun May 15 06:57:37 2005
+++ calendar/inc/class.uicalendar.inc.php       Fri Oct 14 23:33:04 2005
@@ -3688,14 +3688,6 @@
 // Participants
                        
if(!isset($GLOBALS['phpgw_info']['server']['deny_user_grants_access']) || 
!$GLOBALS['phpgw_info']['server']['deny_user_grants_access'])
                        {
-                               $accounts = 
$GLOBALS['phpgw']->acl->get_ids_for_location('run',1,'calendar');
-                               $users = Array();
-                               
$this->build_part_list($users,$accounts,$event['owner']);
-
-                               $str = '';
-                               @asort($users);
-                               @reset($users);
-
                                
switch($GLOBALS['phpgw_info']['user']['preferences']['common']['account_selection'])
                                {
                                        case 'popup':
@@ -3715,6 +3707,15 @@
                                                );
                                                break;
                                        default:
+
+                                               $accounts = 
$GLOBALS['phpgw']->acl->get_ids_for_location('run',1,'calendar');
+                                               $users = Array();
+                                               
$this->build_part_list($users,$accounts,$event['owner']);
+
+                                               $str = '';
+                                               @asort($users);
+                                               @reset($users);
+
                                                foreach($users as $id => 
$user_array)
                                                {
                                                        if($id != 
intval($event['owner']))
@@ -4211,17 +4212,6 @@
                                        }
                                }
                        }
-                       if (!function_exists('strcmp_name'))
-                       {
-                               function strcmp_name($arr1,$arr2)
-                               {
-                                       if ($diff = 
strcmp($arr1['type'],$arr2['type']))
-                                       {
-                                               return $diff;   // groups 
before users
-                                       }
-                                       return 
strnatcasecmp($arr1['name'],$arr2['name']);
-                               }
-                       }
                        uasort($users,'strcmp_name');
                }

@@ -4330,6 +4320,19 @@
                        }

                        return $daily;
+               }
+       }
+
+       //Moved this here for performance reasons and cos it didn't belong in 
the middle of a method - skwashd
+       if (!function_exists('strcmp_name'))
+       {
+               function strcmp_name($arr1,$arr2)
+               {
+                       if ($diff = strcmp($arr1['type'],$arr2['type']))
+                       {
+                               return $diff;   // groups before users
+                       }
+                       return strnatcasecmp($arr1['name'],$arr2['name']);
                }
        }
 ?>