Changeset 2707 for trunk/expressoAdmin1_2/inc
- Timestamp:
- 05/04/10 18:58:04 (14 years ago)
- Location:
- trunk/expressoAdmin1_2/inc
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoAdmin1_2/inc/class.db_functions.inc.php
r2469 r2707 683 683 } 684 684 685 return $result;685 return json_encode( $result ); 686 686 } 687 687 -
trunk/expressoAdmin1_2/inc/class.institutional_accounts.inc.php
r2549 r2707 29 29 $GLOBALS['phpgw']->js = CreateObject('phpgwapi.javascript'); 30 30 } 31 $GLOBALS['phpgw']->js->validate_file('jscode','connector','expressoAdmin1_2');#diretorio, arquivo.js, aplicacao 31 32 $GLOBALS['phpgw']->js->validate_file('jscode','globals','expressoAdmin1_2'); 33 $GLOBALS['phpgw']->js->validate_file('jscode','connector','expressoAdmin1_2'); 32 34 $GLOBALS['phpgw']->js->validate_file('jscode','institutional_accounts','expressoAdmin1_2'); 33 35 $GLOBALS['phpgw']->js->validate_file('modal','modal','expressoAdmin1_2'); -
trunk/expressoAdmin1_2/inc/class.ldap_functions.inc.php
r2459 r2707 750 750 unset($u_tmp); 751 751 } 752 return $options;752 return json_encode( $options ); 753 753 } 754 754 } … … 2292 2292 $return['status'] = 'true'; 2293 2293 $return['trs'] = $trs_string; 2294 return $return;2294 return json_encode( $return ); 2295 2295 } 2296 2296 … … 2386 2386 $return['status'] = 'true'; 2387 2387 $return['trs'] = $trs_string; 2388 return $return;2388 return json_encode( $return ); 2389 2389 } 2390 2390 -
trunk/expressoAdmin1_2/inc/class.shared_accounts.inc.php
r1983 r2707 110 110 $return['mailquota_used'] = $quota['mailquota_used']; 111 111 $i = 0; 112 error_log( var_export( $owners_acl, true ), 3, '/tmp/log' ); 112 113 if( is_array($owners_acl) ){ 113 114 foreach($owners_acl as $key => $value) … … 124 125 $return['owners_acl'] = false; 125 126 } 126 return $return; 127 error_log( var_export( $return, true ), 3, '/tmp/log' ); 128 return json_encode( $return ); 127 129 } 128 130 function delete($params){ -
trunk/expressoAdmin1_2/inc/class.uimanagers.inc.php
r2459 r2707 35 35 $GLOBALS['phpgw']->js = CreateObject('phpgwapi.javascript'); 36 36 } 37 $GLOBALS['phpgw']->js->validate_file('jscode','connector','expressoAdmin1_2');#diretorio, arquivo.js, aplicacao 37 $GLOBALS['phpgw']->js->validate_file('jscode','globals','expressoAdmin1_2'); 38 $GLOBALS['phpgw']->js->validate_file('jscode','connector','expressoAdmin1_2'); 38 39 $GLOBALS['phpgw']->js->validate_file('jscode','expressoadmin','expressoAdmin1_2'); 39 40 $GLOBALS['phpgw']->js->validate_file('jscode','managers','expressoAdmin1_2'); … … 124 125 125 126 $p->set_var($var); 126 echo "<script>var expressoAdmin_controller = '{$GLOBALS[ 'phpgw' ] -> link( '/controller.php' )}?action=';</script>" . $GLOBALS['phpgw']->js->get_script_links( ); 127 $GLOBALS[ 'phpgw_info' ][ 'flags' ][ 'java_script_thirst' ] .= "<script>var expressoAdmin_controller = '{$GLOBALS[ 'phpgw' ] -> link( '/expressoAdmin1_2/controller.php' )}?action=';</script>"; 128 //echo "<script>var expressoAdmin_controller = '{$GLOBALS[ 'phpgw' ] -> link( '/controller.php' )}?action=';</script>" . $GLOBALS['phpgw']->js->get_script_links( ); 127 129 $p->pfp('out','body'); 128 130 } … … 170 172 // Seta variaveis que estao no TPL 171 173 $var = Array( 172 'scripts_java' => $scripts_java,174 'scripts_java' => '',//$scripts_java, 173 175 //'action' => $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uimanagers.validate'), 174 176 //'action' => $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.bomanagers.add_managers'), … … 302 304 303 305 $var = Array( 304 'scripts_java' => $scripts_java,306 'scripts_java' => '',//$scripts_java, 305 307 'action' => $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uimanagers.validate'), 306 308 'display_samba_suport' => $this->config['expressoAdmin_samba_support'] == 'true' ? '' : 'display:none', … … 344 346 } 345 347 } 346 347 echo "<script>var expressoAdmin_controller = '{$GLOBALS[ 'phpgw' ] -> link( '/expressoAdmin1_2/controller.php' )}?action=';</script>" . $GLOBALS['phpgw']->js->get_script_links( );348 349 $GLOBALS[ 'phpgw_info' ][ 'flags' ][ 'java_script_thirst' ] .= "<script>var expressoAdmin_controller = '{$GLOBALS[ 'phpgw' ] -> link( '/expressoAdmin1_2/controller.php' )}?action=';</script>"; 348 350 echo $p->fp('out','form'); 349 351 } -
trunk/expressoAdmin1_2/inc/class.uishared_accounts.inc.php
r2549 r2707 31 31 $GLOBALS['phpgw']->js = CreateObject('phpgwapi.javascript'); 32 32 } 33 $GLOBALS['phpgw']->js->validate_file('jscode','connector','expressoAdmin1_2');#diretorio, arquivo.js, aplicacao 33 $GLOBALS['phpgw']->js->validate_file('jscode','globals','expressoAdmin1_2'); 34 $GLOBALS['phpgw']->js->validate_file('jscode','connector','expressoAdmin1_2'); 34 35 $GLOBALS['phpgw']->js->validate_file('jscode','shared_accounts','expressoAdmin1_2'); 35 36 $GLOBALS['phpgw']->js->validate_file('modal','modal','expressoAdmin1_2');
Note: See TracChangeset
for help on using the changeset viewer.