Changeset 5934 for trunk/reports/inc
- Timestamp:
- 04/12/12 15:18:08 (12 years ago)
- Location:
- trunk/reports/inc
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/reports/inc/class.uireports_cota.inc.php
r5291 r5934 101 101 // Save query 102 102 $varorganizacao = explode(",",$contextsdn); 103 $varorganizacao_nome = trim(strtoupper( ereg_replace("ou=","",$varorganizacao[0])));104 $varorganizacao_nome = trim(strtoupper( ereg_replace("DC=","",$varorganizacao_nome)));103 $varorganizacao_nome = trim(strtoupper(preg_replace('/ou=/','',$varorganizacao[0]))); 104 $varorganizacao_nome = trim(strtoupper(preg_replace('/DC=/','',$varorganizacao_nome))); 105 105 $user_logon = $GLOBALS['phpgw_info']['user'][account_lid]; 106 106 … … 137 137 if ( trim(strtoupper($varorganizacao_nome)) != trim(strtoupper($sector))) 138 138 { 139 $sectorok = trim(strtoupper( ereg_replace("dc=","",$sector)));140 $sectorok = trim(strtoupper( ereg_replace("DC=","",$sectorok)));139 $sectorok = trim(strtoupper(preg_replace('/dc=/',"",$sector))); 140 $sectorok = trim(strtoupper(preg_replace('/DC=/',"",$sectorok))); 141 141 $sector_options .= "<option value='" . $sectordn . "'>". $sectorok . "</option>"; 142 142 } … … 205 205 { 206 206 $grouplist = trim($_POST[setor]); 207 $grouplist = trim( ereg_replace("-","",$grouplist));207 $grouplist = trim(preg_replace('/-/','',$grouplist)); 208 208 $organizacao = trim($_POST[organizacao]); 209 209 $setordn = trim($_POST[setordn]); … … 514 514 515 515 $grouplist = trim($_POST[setor]); 516 $grouplist = trim( ereg_replace("-","",$grouplist));516 $grouplist = trim(preg_replace('/-/','',$grouplist)); 517 517 518 518 $setordn = trim($_POST[setordn]); -
trunk/reports/inc/class.uireports_logon.inc.php
r5291 r5934 67 67 68 68 $grouplist = trim($_POST[setor]); 69 $grouplist = trim( ereg_replace("-","",$grouplist));69 $grouplist = trim(preg_replace('/-/','',$grouplist)); 70 70 71 71 $setordn = trim($_POST[setordn]); … … 286 286 // Save query 287 287 $varorganizacao = explode(",",$contextsdn); 288 $varorganizacao_nome = trim(strtoupper( ereg_replace("ou=","",$varorganizacao[0])));289 $varorganizacao_nome = trim(strtoupper( ereg_replace("DC=","",$varorganizacao_nome)));288 $varorganizacao_nome = trim(strtoupper(preg_replace('/ou=/','',$varorganizacao[0]))); 289 $varorganizacao_nome = trim(strtoupper(preg_replace('/DC=/','',$varorganizacao_nome))); 290 290 $user_logon = $GLOBALS['phpgw_info']['user'][account_lid]; 291 291 … … 329 329 if ( trim(strtoupper($varorganizacao_nome)) != trim(strtoupper($sector))) 330 330 { 331 $sectorok = trim(strtoupper( ereg_replace("dc=","",$sector)));332 $sectorok = trim(strtoupper( ereg_replace("dc=","",$sectorok)));331 $sectorok = trim(strtoupper(preg_replace('/dc=/','',$sector))); 332 $sectorok = trim(strtoupper(preg_replace('/dc=/','',$sectorok))); 333 333 $sector_options .= "<option value='" . $sectordn . "'>". $sectorok . "</option>"; 334 334 } … … 403 403 404 404 $grouplist = trim($_POST[setor]); 405 $grouplist = trim( ereg_replace("-","",$grouplist));405 $grouplist = trim(preg_replace('/-/','',$grouplist)); 406 406 $organizacao = trim($_POST[organizacao]); 407 407 $setordn = trim($_POST[setordn]); -
trunk/reports/inc/class.uireports_maillists.inc.php
r5291 r5934 66 66 67 67 $grouplist = trim($_POST[setor]); 68 $grouplist = trim( ereg_replace("-","",$grouplist));68 $grouplist = trim(preg_replace('/-/','',$grouplist)); 69 69 70 70 $setordn = trim($_POST[setordn]); … … 192 192 // Save query 193 193 $varorganizacao = explode(",",$contextsdn); 194 $varorganizacao_nome = trim(strtoupper( ereg_replace("ou=","",$varorganizacao[0])));195 $varorganizacao_nome = trim(strtoupper( ereg_replace("DC=","",$varorganizacao_nome)));194 $varorganizacao_nome = trim(strtoupper(preg_replace('/ou=/','',$varorganizacao[0]))); 195 $varorganizacao_nome = trim(strtoupper(preg_replace('/DC=/','',$varorganizacao_nome))); 196 196 $user_logon = $GLOBALS['phpgw_info']['user'][account_lid]; 197 197 … … 235 235 if ( trim(strtoupper($varorganizacao_nome)) != trim(strtoupper($sector))) 236 236 { 237 $sectorok = trim(strtoupper( ereg_replace("dc=","",$sector)));238 $sectorok = trim(strtoupper( ereg_replace("dc=","",$sectorok)));237 $sectorok = trim(strtoupper(preg_replace('/dc=/','',$sector))); 238 $sectorok = trim(strtoupper(preg_replace('/dc=/','',$sectorok))); 239 239 $sector_options .= "<option value='" . $sectordn . "'>". $sectorok . "</option>"; 240 240 } … … 301 301 { 302 302 $grouplist = trim($_POST[setor]); 303 $grouplist = trim( ereg_replace("-","",$grouplist));303 $grouplist = trim(preg_replace('/-/','',$grouplist)); 304 304 $organizacao = trim($_POST[organizacao]); 305 305 $setordn = trim($_POST[setordn]); -
trunk/reports/inc/class.uireports_users.inc.php
r5291 r5934 66 66 67 67 $grouplist = trim($_POST[setor]); 68 $grouplist = trim( ereg_replace("-","",$grouplist));68 $grouplist = trim(preg_replace('/-/','',$grouplist)); 69 69 70 70 $setordn = trim($_POST[setordn]); … … 211 211 // Save query 212 212 $varorganizacao = explode(",",$contextsdn); 213 $varorganizacao_nome = trim(strtoupper( ereg_replace("ou=","",$varorganizacao[0])));214 $varorganizacao_nome = trim(strtoupper( ereg_replace("DC=","",$varorganizacao_nome)));213 $varorganizacao_nome = trim(strtoupper(preg_replace('/ou=/','',$varorganizacao[0]))); 214 $varorganizacao_nome = trim(strtoupper(preg_replace('/DC=/','',$varorganizacao_nome))); 215 215 $user_logon = $GLOBALS['phpgw_info']['user'][account_lid]; 216 216 … … 254 254 if ( trim(strtoupper($varorganizacao_nome)) != trim(strtoupper($sector))) 255 255 { 256 $sectorok = trim(strtoupper( ereg_replace("dc=","",$sector)));257 $sectorok = trim(strtoupper( ereg_replace("dc=","",$sectorok)));256 $sectorok = trim(strtoupper(preg_replace('/dc=/','',$sector))); 257 $sectorok = trim(strtoupper(preg_replace('/dc=/','',$sectorok))); 258 258 $sector_options .= "<option value='" . $sectordn . "'>". $sectorok . "</option>"; 259 259 } … … 320 320 { 321 321 $grouplist = trim($_POST[setor]); 322 $grouplist = trim( ereg_replace("-","",$grouplist));322 $grouplist = trim(preg_replace('/-/','',$grouplist)); 323 323 $organizacao = trim($_POST[organizacao]); 324 324 $setordn = trim($_POST[setordn]); -
trunk/reports/inc/class.uireports_usersgroups.inc.php
r5291 r5934 66 66 67 67 $grouplist = trim($_POST[setor]); 68 $grouplist = trim( ereg_replace("-","",$grouplist));68 $grouplist = trim(preg_replace('/-/','',$grouplist)); 69 69 70 70 $setordn = trim($_POST[setordn]); … … 189 189 // Save query 190 190 $varorganizacao = explode(",",$contextsdn); 191 $varorganizacao_nome = trim(strtoupper( ereg_replace("ou=","",$varorganizacao[0])));192 $varorganizacao_nome = trim(strtoupper( ereg_replace("DC=","",$varorganizacao_nome)));191 $varorganizacao_nome = trim(strtoupper(preg_replace('/ou=/','',$varorganizacao[0]))); 192 $varorganizacao_nome = trim(strtoupper(preg_replace('/DC=/','',$varorganizacao_nome))); 193 193 $user_logon = $GLOBALS['phpgw_info']['user'][account_lid]; 194 194 … … 232 232 if ( trim(strtoupper($varorganizacao_nome)) != trim(strtoupper($sector))) 233 233 { 234 $sectorok = trim(strtoupper( ereg_replace("dc=","",$sector)));235 $sectorok = trim(strtoupper( ereg_replace("dc=","",$sectorok)));234 $sectorok = trim(strtoupper(preg_replace('/dc=/','',$sector))); 235 $sectorok = trim(strtoupper(preg_replace('/dc=/','',$sectorok))); 236 236 $sector_options .= "<option value='" . $sectordn . "'>". $sectorok . "</option>"; 237 237 } … … 298 298 { 299 299 $grouplist = trim($_POST[setor]); 300 $grouplist = trim( ereg_replace("-","",$grouplist));300 $grouplist = trim(preg_replace('/-/','',$grouplist)); 301 301 $organizacao = trim($_POST[organizacao]); 302 302 $setordn = trim($_POST[setordn]);
Note: See TracChangeset
for help on using the changeset viewer.