Changeset 3404 for branches/2.2/phpgwapi/templates
- Timestamp:
- 10/22/10 16:04:42 (14 years ago)
- Location:
- branches/2.2/phpgwapi/templates
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2/phpgwapi/templates/classic/js/listUsers.js
r1510 r3404 179 179 180 180 option = window.opener.document.createElement('option'); 181 option.value =select.options[i].value; 181 option.value =select.options[i].value; 182 182 option.text = select.options[i].text; 183 if( option.value.charAt(0) == 'g' ) 184 option.text = "(G) "+option.text; 183 185 selectOpener.options[selectOpener.options.length] = option; 184 186 -
branches/2.2/phpgwapi/templates/classic/listUsers.php
r1565 r3404 115 115 $users = Array(); 116 116 $groups = Array(); 117 $justthese = array("phpgwaccountvisible","uidNumber","cn" );117 $justthese = array("phpgwaccountvisible","uidNumber","cn","phpgwaccounttype","gidnumber"); 118 118 119 119 $typeAccount = 'u'; … … 126 126 if ($ds) 127 127 { 128 $sr=ldap_search($ds, $user_context, ("(&(cn=$cn)(phpgwaccounttype=".$typeAccount."))"),$justthese);129 $info = ldap_get_entries($ds, $sr);130 131 if($typeAccount == 'u'){128 if( $acl_app == 'calendar' ){ 129 $sr=ldap_search($ds, $user_context, ("(&(cn=$cn)(|(phpgwaccounttype=u)(phpgwaccounttype=g)))"),$justthese); 130 $info = ldap_get_entries($ds, $sr); 131 132 132 for ($i=0; $i<$info["count"]; $i++) 133 { 134 if ($info[$i]["phpgwaccountvisible"][0] == '-1') 135 continue; 136 $users[$uids=$info[$i]["uidnumber"][0]] = Array('name' => $uids=$info[$i]["cn"][0], 'type' => u ); 137 } 138 } 139 else { 140 for ($i=0; $i<$info["count"]; $i++) 141 $users[$uids=$info[$i]["gidnumber"][0]] = Array('name' => $uids=$info[$i]["cn"][0], 'type' => g); 142 143 } 133 { 134 if ($info[$i]["phpgwaccountvisible"][0] == '-1') 135 continue; 136 if( $info[$i]["phpgwaccounttype"][0] == 'u') 137 $users[$uids=$info[$i]["uidnumber"][0]] = Array('name' => $uids=$info[$i]["cn"][0], 'type' => u ); 138 else 139 $groups[$uids=$info[$i]["gidnumber"][0]] = Array('name' => $uids=$info[$i]["cn"][0], 'type' => g ); 140 } 141 } 142 else{ 143 $sr=ldap_search($ds, $user_context, ("(&(cn=$cn)(phpgwaccounttype=".$typeAccount."))"),$justthese); 144 $info = ldap_get_entries($ds, $sr); 145 if($typeAccount == 'u'){ 146 for ($i=0; $i<$info["count"]; $i++) 147 { 148 if ($info[$i]["phpgwaccountvisible"][0] == '-1') 149 continue; 150 $users[$uids=$info[$i]["uidnumber"][0]] = Array('name' => $uids=$info[$i]["cn"][0], 'type' => u ); 151 } 152 } 153 else { 154 for ($i=0; $i<$info["count"]; $i++) 155 $users[$uids=$info[$i]["gidnumber"][0]] = Array('name' => $uids=$info[$i]["cn"][0], 'type' => g); 156 157 } 158 } 144 159 } 145 160 ldap_close($ds); … … 147 162 @asort($users); 148 163 @reset($users); 149 //@asort($groups);150 //@reset($groups);164 @asort($groups); 165 @reset($groups); 151 166 152 167 … … 155 170 156 171 if($current == 'preferences'){ 157 foreach($users as $id => $user_array) { 158 if($owner != $id){ 159 $newId = 'u_'.$acl_app.'['.$id; 160 $options .= '<option value="'.$newId.'">'.utf8_decode($user_array['name']).'</option>'."\n"; 172 if( count($users) > 0 ){ 173 $options .= '<option value="-1" disabled="disabled">------------------- '.lang('users').' ------------------ </option>'; 174 foreach($users as $id => $user_array) { 175 if($owner != $id){ 176 $newId = 'u_'.$acl_app.'['.$id; 177 $options .= '<option value="'.$newId.'">'.utf8_decode($user_array['name']).'</option>'."\n"; 178 } 179 } 180 } 181 if( count($groups) > 0 ){ 182 $options .= '<option value="-1" disabled="disabled">------------------- '.lang('groups').' ------------------ </option>'; 183 foreach($groups as $id => $groups_array) { 184 if($owner != $id){ 185 $newId = 'g_'.$acl_app.'['.$id; 186 $options .= '<option value="'.$newId.'">'.utf8_decode($groups_array['name']).'</option>'."\n"; 187 } 161 188 } 162 189 } -
branches/2.2/phpgwapi/templates/default/js/listUsers.js
r1510 r3404 181 181 option.value =select.options[i].value; 182 182 option.text = select.options[i].text; 183 if( option.value.charAt(0) == 'g' ) 184 option.text = "(G) "+option.text; 183 185 selectOpener.options[selectOpener.options.length] = option; 184 186 -
branches/2.2/phpgwapi/templates/default/listUsers.php
r1559 r3404 115 115 $users = Array(); 116 116 $groups = Array(); 117 $justthese = array("phpgwaccountvisible","uidNumber","cn" );117 $justthese = array("phpgwaccountvisible","uidNumber","cn","phpgwaccounttype","gidnumber"); 118 118 119 119 $typeAccount = 'u'; … … 126 126 if ($ds) 127 127 { 128 $sr=ldap_search($ds, $user_context, ("(&(cn=$cn)(phpgwaccounttype=".$typeAccount."))"),$justthese); 129 $info = ldap_get_entries($ds, $sr);130 131 if($typeAccount == 'u'){128 if( $acl_app == 'calendar' ){ 129 $sr=ldap_search($ds, $user_context, ("(&(cn=$cn)(|(phpgwaccounttype=u)(phpgwaccounttype=g)))"),$justthese); 130 $info = ldap_get_entries($ds, $sr); 131 132 132 for ($i=0; $i<$info["count"]; $i++) 133 { 134 if ($info[$i]["phpgwaccountvisible"][0] == '-1') 135 continue; 136 $users[$uids=$info[$i]["uidnumber"][0]] = Array('name' => $uids=$info[$i]["cn"][0], 'type' => u ); 137 } 138 } 139 else { 140 for ($i=0; $i<$info["count"]; $i++) 141 $users[$uids=$info[$i]["gidnumber"][0]] = Array('name' => $uids=$info[$i]["cn"][0], 'type' => g); 142 133 { 134 if ($info[$i]["phpgwaccountvisible"][0] == '-1') 135 continue; 136 if( $info[$i]["phpgwaccounttype"][0] == 'u') 137 $users[$uids=$info[$i]["uidnumber"][0]] = Array('name' => $uids=$info[$i]["cn"][0], 'type' => u ); 138 else 139 $groups[$uids=$info[$i]["gidnumber"][0]] = Array('name' => $uids=$info[$i]["cn"][0], 'type' => g ); 140 } 141 } 142 else{ 143 $sr=ldap_search($ds, $user_context, ("(&(cn=$cn)(phpgwaccounttype=".$typeAccount."))"),$justthese); 144 $info = ldap_get_entries($ds, $sr); 145 if($typeAccount == 'u'){ 146 for ($i=0; $i<$info["count"]; $i++) 147 { 148 if ($info[$i]["phpgwaccountvisible"][0] == '-1') 149 continue; 150 $users[$uids=$info[$i]["uidnumber"][0]] = Array('name' => $uids=$info[$i]["cn"][0], 'type' => u ); 151 } 152 } 153 else { 154 for ($i=0; $i<$info["count"]; $i++) 155 $users[$uids=$info[$i]["gidnumber"][0]] = Array('name' => $uids=$info[$i]["cn"][0], 'type' => g); 156 157 } 143 158 } 144 159 } … … 147 162 @asort($users); 148 163 @reset($users); 149 //@asort($groups);150 //@reset($groups);164 @asort($groups); 165 @reset($groups); 151 166 152 167 … … 155 170 156 171 if($current == 'preferences'){ 157 foreach($users as $id => $user_array) { 158 if($owner != $id){ 159 $newId = 'u_'.$acl_app.'['.$id; 160 $options .= '<option value="'.$newId.'">'.utf8_decode($user_array['name']).'</option>'."\n"; 172 if( count($users) > 0 ){ 173 $options .= '<option value="-1" disabled="disabled">------------------- '.lang('users').' ------------------ </option>'; 174 foreach($users as $id => $user_array) { 175 if($owner != $id){ 176 $newId = 'u_'.$acl_app.'['.$id; 177 $options .= '<option value="'.$newId.'">'.utf8_decode($user_array['name']).'</option>'."\n"; 178 } 179 } 180 } 181 if( count($groups) > 0 ){ 182 $options .= '<option value="-1" disabled="disabled">------------------- '.lang('groups').' ------------------ </option>'; 183 foreach($groups as $id => $groups_array) { 184 if($owner != $id){ 185 $newId = 'g_'.$acl_app.'['.$id; 186 $options .= '<option value="'.$newId.'">'.utf8_decode($groups_array['name']).'</option>'."\n"; 187 } 161 188 } 162 189 }
Note: See TracChangeset
for help on using the changeset viewer.