Changeset 2878 for trunk/expressoAdmin1_2
- Timestamp:
- 05/28/10 09:42:54 (14 years ago)
- Location:
- trunk/expressoAdmin1_2
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoAdmin1_2/inc/class.ldap_functions.inc.php
r2707 r2878 2037 2037 } 2038 2038 2039 return $options;2039 return json_encode( $options ); 2040 2040 } 2041 2041 -
trunk/expressoAdmin1_2/inc/class.manager.inc.php
r2459 r2878 72 72 else 73 73 $_SESSION['phpgw_info']['expresso']['server'] = $GLOBALS['phpgw_info']['server']; 74 74 75 75 $return['status'] = 'true'; 76 76 77 77 $contexts = split("%", $params['contexts']); 78 78 $manager_lid = $params['manager_lid']; 79 79 $type = $params['type']; 80 80 81 81 if ($contexts == '') 82 82 { 83 83 $return['status'] = 'false'; 84 84 $return['msg'] = $this->functions->lang('context field is empty') . '.'; 85 86 return $return;85 86 return json_encode( $return ); 87 87 } 88 88 if (($manager_lid == '') && ($type == 'add')) … … 90 90 $return['status'] = 'false'; 91 91 $return['msg'] = $this->functions->lang('select one manager') . '.'; 92 93 return $return;92 93 return json_encode( $return ); 94 94 } 95 95 96 96 // Verifica se o contexto existe. 97 97 $dn = $GLOBALS['phpgw_info']['server']['ldap_root_dn']; … … 101 101 ldap_set_option($ldap_conn, LDAP_OPT_REFERRALS, 0); 102 102 ldap_bind($ldap_conn,$dn,$passwd); 103 103 104 104 foreach ($contexts as $index=>$context) 105 105 { … … 108 108 { 109 109 $return['status'] = 'false'; 110 $ this->functions->lang('context does not exist') . ": $context";111 return $return;112 } 110 $return['msg'] = $this->functions->lang('context does not exist') . ": $context"; 111 return json_encode( $return ); 112 } 113 113 } 114 114 115 115 if ($type == 'add') 116 116 { 117 117 include_once('class.db_functions.inc.php'); 118 118 $db = new db_functions(); 119 119 120 120 if ($db->manager_lid_exist($manager_lid)) 121 121 { 122 122 $return['status'] = 'false'; 123 123 $return['msg'] = $this->functions->lang('manager already exist') . "."; 124 125 return $return;124 125 return json_encode( $return ); 126 126 } 127 127 } 128 129 return $return;128 129 return json_encode( $return ); 130 130 } 131 131 -
trunk/expressoAdmin1_2/inc/class.uimanagers.inc.php
r2802 r2878 59 59 } 60 60 // Imprime o NavBar 61 unset($GLOBALS['phpgw_info']['flags']['nonavbar']);61 //unset($GLOBALS['phpgw_info']['flags']['nonavbar']); 62 62 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('List Managers'); 63 63 //$GLOBALS['phpgw']->common->phpgw_header(); … … 72 72 73 73 $var = Array( 74 'action' => $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uimanagers.add_managers'), 74 'action' => $GLOBALS[ 'phpgw' ] -> link( '/index.php', 'menuaction=expressoAdmin1_2.uimanagers.add_managers' ), 75 'action_back' => $GLOBALS[ 'phpgw' ] -> link( '/admin/' ), 75 76 'tr_color' => '#DDDDDD', 76 77 'th_bg' => $GLOBALS['phpgw_info']['theme']['th_bg'] … … 170 171 // Seta variaveis que estao no TPL 171 172 $var = Array( 172 'scripts_java' => '',//$scripts_java, 173 //'action' => $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uimanagers.validate'), 174 //'action' => $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.bomanagers.add_managers'), 173 'action' => $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.manager.'), 175 174 'display_samba_suport' => $this->config['expressoAdmin_samba_support'] == 'true' ? '' : 'display:none', 176 175 'type' => "add", … … 290 289 //$GLOBALS['phpgw']->common->phpgw_header(); 291 290 292 // Seta variaveis javas necessárias293 $webserver_url = $GLOBALS['phpgw_info']['server']['webserver_url'];294 $scripts_java = '<script type="text/javascript" src="'.$webserver_url.'/expressoAdmin1_2/js/jscode/expressoadmin.js"></script>';295 296 291 // App, create list of available apps 297 292 $applications_list = $this->make_app_list($manager[0]['apps']); … … 303 298 304 299 $var = Array( 305 'scripts_java' => '',//$scripts_java,306 300 'action' => $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.manager.'), 307 301 'display_samba_suport' => $this->config['expressoAdmin_samba_support'] == 'true' ? '' : 'display:none', -
trunk/expressoAdmin1_2/js/jscode/managers.js
r2802 r2878 75 75 var handler_validade = function(data) 76 76 { 77 data = data.JSON( ); 77 78 if (data.status == 'false') 78 79 { … … 90 91 } 91 92 }; 92 93 cExecute ('expressoAdmin1_2.manager.validate&contexts='+contexts+'&manager_lid='+document.managers_form.ea_select_manager.value+'&type='+type, handler_validade); 93 94 ExpressoLivre.go( { 95 "access" : 'expressoAdmin1_2.manager.validate&contexts='+contexts+'&manager_lid='+document.managers_form.ea_select_manager.value+'&type='+type, 96 "handler" : handler_validade 97 } ); 94 98 } 95 99 function handler_createsave_manager(data){ … … 132 136 var handler_search_manager = function(data) 133 137 { 138 data = data.JSON( ); 134 139 var spam = document.getElementById('ea_span_searching_manager'); 135 140 select_available_users = document.getElementById('ea_select_managers'); … … 150 155 } 151 156 152 cExecute ('$this.ldap_functions.search_user&search='+search, handler_search_manager); 157 ExpressoLivre.go( { 158 "access" : 'expressoAdmin1_2.ldap_functions.search_user&search='+search, 159 "handler" : handler_search_manager 160 } ); 153 161 } 154 162 -
trunk/expressoAdmin1_2/templates/default/managers.tpl
r309 r2878 4 4 <tr> 5 5 <td align="right"> 6 <form method="POST" action="{action}"> 7 <input type="submit" value="{lang_add_manager}" 8 </form> 6 <input type="button" value="{lang_add_manager}" onclick="ExpressoLivre.link( '{action}' )" /> 7 <input type="button" value="{lang_back}" onclick="ExpressoLivre.link( '{action_back}' )" /> 9 8 </td> 10 9 </tr> -
trunk/expressoAdmin1_2/templates/default/managers_form.tpl
r1913 r2878 1 1 <!-- BEGIN form --> 2 3 <!--JS Imports from phpGW javascript class -->4 {scripts_java}5 6 2 <form action="{action}" name="managers_form" method="post"> 7 3 <div align="center"> … … 15 11 <tr bgcolor="{color_bg1}" align="right"> 16 12 <td colspan="2"> 17 <input type="button" value="{lang_back}" onclick=" javascript:location.href='index.php?menuaction=expressoAdmin1_2.uimanagers.list_managers'">13 <input type="button" value="{lang_back}" onclick="ExpressoLivre.link( '/index.php?menuaction=expressoAdmin1_2.uimanagers.list_managers' )" /> 18 14 <input type="button" value="{lang_save}" onclick="javascript:validade_managers_data('{type}');"> 19 15 </td> … … 197 193 <td> 198 194 <input type="button" value="{lang_save}" onclick="javascript:validade_managers_data('{type}');"> 199 <input type="button" value="{lang_back}" onclick=" javascript:location.href='index.php?menuaction=expressoAdmin1_2.uimanagers.list_managers'">195 <input type="button" value="{lang_back}" onclick="ExpressoLivre.link( '/index.php?menuaction=expressoAdmin1_2.uimanagers.list_managers' )" /> 200 196 </td> 201 197 </tr>
Note: See TracChangeset
for help on using the changeset viewer.