Changeset 2707
- Timestamp:
- 05/04/10 18:58:04 (14 years ago)
- Location:
- trunk
- Files:
-
- 12 edited
-
expressoAdmin1_2/inc/class.db_functions.inc.php (modified) (1 diff)
-
expressoAdmin1_2/inc/class.institutional_accounts.inc.php (modified) (1 diff)
-
expressoAdmin1_2/inc/class.ldap_functions.inc.php (modified) (3 diffs)
-
expressoAdmin1_2/inc/class.shared_accounts.inc.php (modified) (2 diffs)
-
expressoAdmin1_2/inc/class.uimanagers.inc.php (modified) (5 diffs)
-
expressoAdmin1_2/inc/class.uishared_accounts.inc.php (modified) (1 diff)
-
expressoAdmin1_2/js/jscode/expressoadmin.js (modified) (1 diff)
-
expressoAdmin1_2/js/jscode/institutional_accounts.js (modified) (4 diffs)
-
expressoAdmin1_2/js/jscode/shared_accounts.js (modified) (9 diffs)
-
expressoAdmin1_2/templates/default/config.tpl (modified) (3 diffs)
-
index.php (modified) (2 diffs)
-
phpgwapi/js/expressolivre/expressolivre.js (modified) (1 diff)
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'); -
trunk/expressoAdmin1_2/js/jscode/expressoadmin.js
r2604 r2707 52 52 } 53 53 } 54 _controller.go( {55 "access" : " $this.ldap_functions.get_associated_domain&context=" + context,54 ExpressoLivre.go( { 55 "access" : "expressoAdmin1_2.ldap_functions.get_associated_domain&context=" + escape( context ), 56 56 "handler" : function( data ) 57 57 { -
trunk/expressoAdmin1_2/js/jscode/institutional_accounts.js
r2352 r2707 60 60 } 61 61 } 62 cExecute ('$this.ldap_functions.get_available_users&context='+context, handler_get_users); 62 ExpressoLivre.go( { 63 "access" : 'expressoAdmin1_2.ldap_functions.get_available_users&context=' + escape(context), 64 "handler" : handler_get_users 65 } ); 63 66 } 64 67 … … 114 117 115 118 //Inclui usuario comecando com a pesquisa 116 for(i = 0; i < select_available_users_clone.length; i++){117 if ( RegExp_name.test(select_available_users_clone[i].text) || (select_available_users_clone[i].value == -1) )118 {119 sel = select_available_users_tmp.options;120 option = new Option(select_available_users_clone[i].text,select_available_users_clone[i].value);121 122 if (select_available_users_clone[i].value == -1)123 option.disabled = true;124 125 sel[sel.length] = option;126 }127 }119 //for(i = 0; i < select_available_users_clone.length; i++){ 120 // if ( RegExp_name.test(select_available_users_clone[i].text) || (select_available_users_clone[i].value == -1) ) 121 // { 122 // sel = select_available_users_tmp.options; 123 // option = new Option(select_available_users_clone[i].text,select_available_users_clone[i].value); 124 // 125 // if (select_available_users_clone[i].value == -1) 126 // option.disabled = true; 127 // 128 // sel[sel.length] = option; 129 // } 130 // } 128 131 oWait.innerHTML = ' '; 129 132 } … … 202 205 var handler_get_institutional_accounts = function(data) 203 206 { 207 data = data.JSON( ); 204 208 if (data.status == 'true') 205 209 { … … 210 214 write_msg(data.msg, 'error'); 211 215 } 212 cExecute ('$this.ldap_functions.get_institutional_accounts&input='+input, handler_get_institutional_accounts); 216 ExpressoLivre.go( { 217 "access" : 'expressoAdmin1_2.ldap_functions.get_institutional_accounts&input='+input, 218 "handler" : handler_get_institutional_accounts 219 } ); 213 220 } 214 221 -
trunk/expressoAdmin1_2/js/jscode/shared_accounts.js
r2352 r2707 62 62 var handler_get_users = function(data) 63 63 { 64 data = data.JSON( ); 64 65 select_available_users = Element('ea_select_available_users'); 65 66 … … 82 83 } 83 84 } 84 cExecute ('$this.ldap_functions.get_available_users2&context='+context, handler_get_users); 85 ExpressoLivre.go( { 86 "access" : 'expressoAdmin1_2.ldap_functions.get_available_users2&context='+context, 87 "handler" : handler_get_users 88 } ); 85 89 } 86 90 … … 239 243 var handler_get_shared_accounts = function(data) 240 244 { 245 data = data.JSON( ); 241 246 if (data.status == 'true') 242 247 { … … 247 252 write_msg(data.msg, 'error'); 248 253 } 249 cExecute ('$this.ldap_functions.get_shared_accounts&input='+input, handler_get_shared_accounts); 254 ExpressoLivre.go( { 255 "access" : 'expressoAdmin1_2.ldap_functions.get_shared_accounts&input='+input, 256 "handler" : handler_get_shared_accounts 257 } ); 250 258 } 251 259 … … 254 262 var handle_edit_shared_account = function(data) 255 263 { 264 data = data.JSON( ); 256 265 if (data.status == 'true') 257 266 { … … 300 309 sinc_combos_org(data.user_context); 301 310 sharemailbox.ownersAcl = new Array(); 302 if( data.owners != "undefined" && data.owners_acl != "undefined" ){311 if( data.owners && data.owners != "undefined" && data.owners_acl != "undefined" ){ 303 312 for (i=0; i<data.owners.length; i++){ 304 313 sharemailbox.ownersAcl[ data.owners[i] ] = data.owners_acl[i]; … … 309 318 write_msg(data.msg, 'error'); 310 319 } 311 cExecute ('$this.shared_accounts.get_data&uid='+uid, handle_edit_shared_account); 320 ExpressoLivre.go( { 321 "access" : 'expressoAdmin1_2.shared_accounts.get_data&uid='+uid, 322 "handler" : handle_edit_shared_account 323 } ); 312 324 } 313 325 … … 383 395 var handler_get_available_users = function(data) 384 396 { 397 data = data.JSON( ); 398 385 399 select_available_users = document.getElementById('em_select_available_users'); 386 400 … … 403 417 } 404 418 } 405 cExecute ("$this.ldap_functions.get_available_users2&context="+context, handler_get_available_users); 419 ExpressoLivre.go( { 420 "access" : 'expressoAdmin1_2.ldap_functions.get_available_users2&context='+context, 421 "handler" : handler_get_available_users 422 } ); 406 423 } 407 424 -
trunk/expressoAdmin1_2/templates/default/config.tpl
r2703 r2707 2 2 <form method="POST" action="{action_url}"> 3 3 <table border="0" align="center"> 4 <script src="./expressoAdmin1_2/js/jscode/connector.js" type="text/javascript" language="JavaScript1.2"></script>5 4 <script> 6 5 function test_db_connection() … … 8 7 var handler_test = function(data) 9 8 { 9 data = data.JSON( ); 10 10 var result = document.getElementById('nextid_db_result'); 11 11 if (data.status) … … 21 21 var pass = document.getElementById('nextid_db_password').value; 22 22 23 cExecute ('$this.db_functions.test_db_connection&host='+host+'&port='+port+'&name='+name+'&user='+user+'&pass='+pass, handler_test); 23 ExpressoLivre.go( { 24 "access" : 'expressoAdmin1_2.db_functions.test_db_connection&host='+host+'&port='+port+'&name='+name+'&user='+user+'&pass='+pass, 25 "handler" : handler_test 26 } ); 24 27 } 25 28 </script> -
trunk/index.php
r2703 r2707 90 90 91 91 $GLOBALS[$class] = CreateObject(sprintf('%s.%s',$app,$class)); 92 if ((is_array($GLOBALS[$class]->public_functions) && $GLOBALS[$class]->public_functions[$method]) && ! $invalid_data)92 if ( is_object( $GLOBALS[ $class ] ) && ( ( ! property_exists( $class, 'public_functions' ) ) || (is_array($GLOBALS[$class]->public_functions) && $GLOBALS[$class]->public_functions[$method]) && ! $invalid_data ) ) 93 93 { 94 execmethod($_GET['menuaction']); 94 $menuaction = $_GET[ 'menuaction' ]; 95 unset( $_GET[ 'menuaction' ] ); 96 echo execmethod( $menuaction, $_GET ); 95 97 unset($app); 96 98 unset($class); … … 137 139 } 138 140 139 echo '<script>ExpressoLivre.link( "' . $GLOBALS[ 'phpgw' ] -> link( '/home.php' ) . '", true ); </script>';141 echo '<script>ExpressoLivre.link( "' . $GLOBALS[ 'phpgw' ] -> link( '/home.php' ) . '", true );/* ??? */</script>'; 140 142 exit; 141 143 } -
trunk/phpgwapi/js/expressolivre/expressolivre.js
r2704 r2707 48 48 49 49 _xconnector = new XConnector( { 50 "path" : ExpressoLivre.path( ) 50 "path" : ExpressoLivre.path( ), 51 "controller" : "?menuaction=" 51 52 } ); 52 53
Note: See TracChangeset
for help on using the changeset viewer.
