Changeset 7681 for trunk/expressoAdmin1_2
- Timestamp:
- 12/19/12 16:44:18 (11 years ago)
- Location:
- trunk/expressoAdmin1_2/inc
- Files:
-
- 4 edited
-
class.boconfiguration.inc.php (modified) (1 diff)
-
class.functions.inc.php (modified) (1 diff)
-
class.ldap_functions.inc.php (modified) (2 diffs)
-
class.uimanagers.inc.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoAdmin1_2/inc/class.boconfiguration.inc.php
r5144 r7681 166 166 $params['inputTextMaximumRecipientsGroupModal'] = 0 ; 167 167 168 foreach ($params[ selectGroupsInRule] as $groupInRule)168 foreach ($params['selectGroupsInRule'] as $groupInRule) 169 169 { 170 170 //Verifica se este usuario Já tem uma regra -
trunk/expressoAdmin1_2/inc/class.functions.inc.php
r7655 r7681 120 120 { 121 121 case list_users: 122 if ($array_acl[ acl_add_users] || $array_acl[acl_edit_users] || $array_acl[acl_delete_users] || $array_acl[acl_change_users_password] || $array_acl[acl_change_users_quote] || $array_acl[acl_edit_sambausers_attributes] || $array_acl[acl_view_users] || $array_acl[acl_manipulate_corporative_information])122 if ($array_acl['acl_add_users'] || $array_acl['acl_edit_users'] || $array_acl['acl_delete_users'] || $array_acl['acl_change_users_password'] || $array_acl['acl_change_users_quote'] || $array_acl['acl_edit_sambausers_attributes'] || $array_acl['acl_view_users'] || $array_acl['acl_manipulate_corporative_information']) 123 123 return true; 124 124 break; 125 125 case add_users: 126 if ($array_acl[ acl_add_users])126 if ($array_acl['acl_add_users']) 127 127 return true; 128 128 break; 129 129 case edit_users: 130 if ($array_acl[ acl_edit_users])130 if ($array_acl['acl_edit_users']) 131 131 return true; 132 132 break; 133 133 case delete_users: 134 if ($array_acl[ acl_delete_users])134 if ($array_acl['acl_delete_users']) 135 135 return true; 136 136 break; 137 137 case rename_users: 138 if ($array_acl[ acl_rename_users])138 if ($array_acl['acl_rename_users']) 139 139 return true; 140 140 break; 141 141 case view_users: 142 if ($array_acl[ acl_view_users])142 if ($array_acl['acl_view_users']) 143 143 return true; 144 144 break; 145 145 case edit_users_picture: 146 if ($array_acl[ acl_edit_users_picture])146 if ($array_acl['acl_edit_users_picture']) 147 147 return true; 148 148 break; 149 149 case manipulate_corporative_information: 150 if ($array_acl[ acl_manipulate_corporative_information])150 if ($array_acl['acl_manipulate_corporative_information']) 151 151 return true; 152 152 break; 153 153 case change_users_password: 154 if ($array_acl[ acl_change_users_password])154 if ($array_acl['acl_change_users_password']) 155 155 return true; 156 156 break; 157 157 case change_users_quote: 158 if ($array_acl[ acl_change_users_quote])158 if ($array_acl['acl_change_users_quote']) 159 159 return true; 160 160 break; 161 161 case set_user_default_password: 162 if ($array_acl[ acl_set_user_default_password])162 if ($array_acl['acl_set_user_default_password']) 163 163 return true; 164 164 break; 165 165 case empty_user_inbox: 166 if (($array_acl[ acl_empty_user_inbox]) && ($array_acl[acl_edit_users]))166 if (($array_acl['acl_empty_user_inbox']) && ($array_acl['acl_edit_users'])) 167 167 return true; 168 168 break; 169 169 case edit_sambausers_attributes: case list_maillists: 170 if ($array_acl[ acl_add_maillists] || $array_acl[acl_edit_maillists] || $array_acl[acl_delete_maillists])171 return true; 172 break; 173 174 if ($array_acl[ acl_edit_sambausers_attributes])170 if ($array_acl['acl_add_maillists'] || $array_acl['acl_edit_maillists'] || $array_acl['acl_delete_maillists']) 171 return true; 172 break; 173 174 if ($array_acl['acl_edit_sambausers_attributes']) 175 175 return true; 176 176 break; 177 177 case edit_sambadomains: 178 if ($array_acl[ acl_edit_sambadomains])178 if ($array_acl['acl_edit_sambadomains']) 179 179 return true; 180 180 break; 181 181 182 182 case list_groups: 183 if ($array_acl[ acl_add_groups] || $array_acl[acl_edit_groups] || $array_acl[acl_delete_groups])183 if ($array_acl['acl_add_groups'] || $array_acl['acl_edit_groups'] || $array_acl['acl_delete_groups']) 184 184 return true; 185 185 break; 186 186 case add_groups: 187 if ($array_acl[ acl_add_groups])187 if ($array_acl['acl_add_groups']) 188 188 return true; 189 189 break; 190 190 case edit_groups: 191 if ($array_acl[ acl_edit_groups])191 if ($array_acl['acl_edit_groups']) 192 192 return true; 193 193 break; 194 194 case delete_groups: 195 if ($array_acl[ acl_delete_groups])195 if ($array_acl['acl_delete_groups']) 196 196 return true; 197 197 break; 198 198 case edit_email_groups: 199 if ($array_acl[ acl_edit_email_groups])199 if ($array_acl['acl_edit_email_groups']) 200 200 return true; 201 201 break; 202 202 203 203 case list_maillists: 204 if ($array_acl[ acl_add_maillists] || $array_acl[acl_edit_maillists] || $array_acl[acl_delete_maillists])204 if ($array_acl['acl_add_maillists'] || $array_acl['acl_edit_maillists'] || $array_acl['acl_delete_maillists']) 205 205 return true; 206 206 break; 207 207 case add_maillists: 208 if ($array_acl[ acl_add_maillists])208 if ($array_acl['acl_add_maillists']) 209 209 return true; 210 210 break; 211 211 case edit_maillists: 212 if ($array_acl[ acl_edit_maillists])212 if ($array_acl['acl_edit_maillists']) 213 213 return true; 214 214 break; 215 215 case delete_maillists: 216 if ($array_acl[ acl_delete_maillists])216 if ($array_acl['acl_delete_maillists']) 217 217 return true; 218 218 break; 219 219 220 220 case list_sectors: 221 if ($array_acl[ acl_create_sectors] || $array_acl[acl_edit_sectors] || $array_acl[acl_delete_sectors])221 if ($array_acl['acl_create_sectors'] || $array_acl['acl_edit_sectors'] || $array_acl['acl_delete_sectors']) 222 222 return true; 223 223 break; 224 224 case create_sectors: 225 if ($array_acl[ acl_create_sectors])225 if ($array_acl['acl_create_sectors']) 226 226 return true; 227 227 break; 228 228 case edit_sectors: 229 if ($array_acl[ acl_edit_sectors])229 if ($array_acl['acl_edit_sectors']) 230 230 return true; 231 231 break; 232 232 case delete_sectors: 233 if ($array_acl[ acl_delete_sectors])233 if ($array_acl['acl_delete_sectors']) 234 234 return true; 235 235 break; 236 236 237 237 case view_global_sessions: 238 if ($array_acl[ acl_view_global_sessions])238 if ($array_acl['acl_view_global_sessions']) 239 239 return true; 240 240 break; 241 241 242 242 case list_computers: 243 if ($array_acl[ acl_create_computers] || $array_acl[acl_edit_computers] || $array_acl[acl_delete_computers])243 if ($array_acl['acl_create_computers'] || $array_acl['acl_edit_computers'] || $array_acl['acl_delete_computers']) 244 244 return true; 245 245 break; 246 246 case create_computers: 247 if ($array_acl[ acl_create_computers])247 if ($array_acl['acl_create_computers']) 248 248 return true; 249 249 break; 250 250 case edit_computers: 251 if ($array_acl[ acl_edit_computers])251 if ($array_acl['acl_edit_computers']) 252 252 return true; 253 253 break; 254 254 case delete_computers: 255 if ($array_acl[ acl_delete_computers])255 if ($array_acl['acl_delete_computers']) 256 256 return true; 257 257 break; 258 258 259 259 case view_logs: 260 if ($array_acl[ acl_view_logs])260 if ($array_acl['acl_view_logs']) 261 261 return true; 262 262 break; 263 263 264 264 case display_groups: 265 if ( $array_acl[ acl_edit_users] || $array_acl[acl_view_users] || ($array_acl[acl_edit_sambausers_attributes] && ($this->current_config['expressoAdmin_samba_support'] == 'true')) )265 if ( $array_acl['acl_edit_users'] || $array_acl['acl_view_users'] || ($array_acl['acl_edit_sambausers_attributes'] && ($this->current_config['expressoAdmin_samba_support'] == 'true')) ) 266 266 return true; 267 267 break; 268 268 case display_emailconfig: 269 if ($array_acl[ acl_edit_users] || $array_acl[acl_view_users])269 if ($array_acl['acl_edit_users'] || $array_acl['acl_view_users']) 270 270 return true; 271 271 break; 272 272 case display_applications: 273 if ($array_acl[ acl_edit_users] || $array_acl[acl_view_users])273 if ($array_acl['acl_edit_users'] || $array_acl['acl_view_users']) 274 274 return true; 275 275 break; 276 276 case display_emaillists: 277 if ($array_acl[ acl_edit_users] || $array_acl[acl_view_users])277 if ($array_acl['acl_edit_users'] || $array_acl['acl_view_users']) 278 278 return true; 279 279 break; -
trunk/expressoAdmin1_2/inc/class.ldap_functions.inc.php
r7673 r7681 382 382 if ($anchor != $dn) 383 383 { 384 if (!@ldap_rename($this->ldap, $params['anchor'], "uid= $params[uid]", $params['context'], true))384 if (!@ldap_rename($this->ldap, $params['anchor'], "uid={$params['uid']}", $params['context'], true)) 385 385 { 386 386 $result['status'] = false; … … 467 467 return $result; 468 468 } 469 $dn = "uid= $params[uid]," . $params['context'];469 $dn = "uid={$params['uid']}," . $params['context']; 470 470 $filter = "(mail=".$params['mail'].")"; 471 471 $justthese = array("cn"); -
trunk/expressoAdmin1_2/inc/class.uimanagers.inc.php
r7655 r7681 112 112 $ldap_search = ldap_search($ldap_conn, $GLOBALS['phpgw_info']['server']['ldap_context'], $filter, $justthese); 113 113 $ldap_result = ldap_get_entries($ldap_conn, $ldap_search); 114 $p->set_var('manager_lid', $array_managers[ manager_lid]);114 $p->set_var('manager_lid', $array_managers['manager_lid']); 115 115 $p->set_var('manager_cn', $ldap_result[0]['cn'][0] == '' ? '<font color=red>NAO ENCONTRADO NO LDAP</font>' : $ldap_result[0]['cn'][0]); 116 116 $p->set_var('context', $managers_context); 117 $p->set_var('link_edit',$this->row_action('edit','edit_managers',$array_managers[ manager_lid],$array_managers[context]));118 $p->set_var('link_delete',$this->row_action('delete','delete_managers',$array_managers[ manager_lid],$array_managers[context]));117 $p->set_var('link_edit',$this->row_action('edit','edit_managers',$array_managers['manager_lid'],$array_managers['context'])); 118 $p->set_var('link_delete',$this->row_action('delete','delete_managers',$array_managers['manager_lid'],$array_managers['context'])); 119 119 $p->set_var('link_copy',"<a href='#' onClick='javascript:copy_manager(\"".$array_managers['manager_lid']."\");'>Copiar</a>"); 120 120 $p->fp('rows','row',True);
Note: See TracChangeset
for help on using the changeset viewer.
