[Phpgroupware-cvs] phpgwapi/inc class.accounts_shared.inc.php, 1.52, 1.53

[Bettina Gille <address@hidden>]

Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv17459

Modified Files:
        class.accounts_shared.inc.php 
Log Message:
accounts_popup port to head

Index: class.accounts_shared.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.accounts_shared.inc.php,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** class.accounts_shared.inc.php       6 Nov 2003 17:19:44 -0000       1.52
--- class.accounts_shared.inc.php       6 Nov 2003 17:44:40 -0000       1.53
***************
*** 270,273 ****
--- 270,315 ----
                }
  
+               function java_script($app = '')
+               {
+                       if(!$app)
+                       {
+                               $app = 
$GLOBALS['phpgw_info']['user']['current_app'];
+                       }
+ 
+                       switch($app)
+                       {
+                               case 'calendar':
+                                       $select_name = "participants[]'][0]";
+                                       break;
+                               case 'admin':
+                                       $select_name = "account_user[]']";
+                                       break;
+                               case 'admin_acl':
+                                       $select_name = 
"account_addressmaster[]']";
+                                       break;
+                               case 'projects':
+                                       $select_name = "values[coordinator]']";
+                                       break;
+                               case 'e_projects':
+                                       $select_name = "employees[]']";
+                                       break;
+                       }
+ 
+                       $script = 'var userSelectBox = 
opener.document.forms["app_form"].elements[\'' . $select_name . "\n";
+                       $script .= 'function ExchangeAccountSelect(thisform)' . 
"\n";
+                       $script .= '{' . "\n";
+                       $script .= 'NewEntry = new 
Option(thisform.elements[1].value,thisform.elements[0].value,false,true);'. 
"\n";
+                       $script .= 'userSelectBox.options[userSelectBox.length] 
= NewEntry;'. "\n";
+                       $script .= '}'. "\n";
+                       $script .= '</script>'. "\n";
+                       $script .= '<script LANGUAGE="JavaScript">'. "\n";
+                       $script .= 'function ExchangeAccountText(thisform)'. 
"\n";
+                       $script .= '{'. "\n";
+                       $script .= 'opener.document.app_form.accountid.value = 
thisform.elements[0].value;'. "\n";
+                       $script .= 'opener.document.app_form.accountname.value 
= thisform.elements[1].value;'. "\n";
+                       $script .= '}'. "\n";
+                       return $script;
+               }
+ 
                function accounts_popup($app)
                {
***************
*** 331,335 ****
                                case 'admin':
                                        $action = 
'admin.uiaccounts.accounts_popup';
-                                       $select_name = "account_user[]']";
                                        $js_function = 'ExchangeAccountSelect';
                                        break;
--- 373,376 ----
***************
*** 337,346 ****
                                        $action = 
'admin.uiaclmanager.accounts_popup';
                                        $app = 'addressbook';
-                                       $select_name = 
"account_addressmaster[]']";
                                        $js_function = 'ExchangeAccountSelect';
                                        break;
                                case 'projects':
                                        $action = 
'projects.uiprojects.accounts_popup';
-                                       $select_name = "values[coordinator]']";
                                        $js_function = 'ExchangeAccountText';
                                        break;
--- 378,385 ----
***************
*** 348,371 ****
                                        $action = 
'projects.uiprojects.e_accounts_popup';
                                        $app = 'projects';
-                                       $select_name = "employees[]']";
                                        $js_function = 'ExchangeAccountSelect';
                                        break;
                        }
  
-                       $script = 'var userSelectBox = 
opener.document.forms["app_form"].elements[\'' . $select_name;
-                       $script .= 'function ExchangeAccountSelect(thisform)' . 
"\n";
-                       $script .= '{' . "\n";
-                       $script .= 'NewEntry = new 
Option(thisform.elements[1].value,thisform.elements[0].value,false,true);';
-                       $script .= 'userSelectBox.options[userSelectBox.length] 
= NewEntry;';
-                       $script .= '}';
-                       $script .= '</script>';
-                       $script .= '<script LANGUAGE="JavaScript">';
-                       $script .= 'function ExchangeAccountText(thisform)';
-                       $script .= '{';
-                       $script .= 'opener.document.app_form.accountid.value = 
thisform.elements[0].value;';
-                       $script .= 'opener.document.app_form.accountname.value 
= thisform.elements[1].value;';
-                       $script .= '}';
- 
- 
                        $link_data = array
                        (
--- 387,394 ----
***************
*** 598,602 ****
                        $data = array
                        (
-                               'app_java_script'       => $script,
                                'start_record'                                  
=> $start,
                                'record_limit'                                  
=> $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'],
--- 621,624 ----