Changeset 7655 for trunk/contactcenter
- Timestamp:
- 12/14/12 14:30:35 (11 years ago)
- Location:
- trunk/contactcenter/inc
- Files:
-
- 10 edited
-
class.abo_catalog.inc.php (modified) (5 diffs)
-
class.bo_company_manager.inc.php (modified) (5 diffs)
-
class.bo_contactcenter.inc.php (modified) (3 diffs)
-
class.bo_global_ldap_catalog.inc.php (modified) (9 diffs)
-
class.bo_ldap_manager.inc.php (modified) (3 diffs)
-
class.bo_people_catalog.inc.php (modified) (13 diffs)
-
class.bo_shared_people_manager.inc.php (modified) (7 diffs)
-
class.so_main.inc.php (modified) (3 diffs)
-
class.ui_api.inc.php (modified) (2 diffs)
-
class.ui_data.inc.php (modified) (34 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/contactcenter/inc/class.abo_catalog.inc.php
r5915 r7655 308 308 309 309 $n_fields = count($what); 310 for($i = 0; $i < $n_fields; $i++)310 for($i = 0; $i < $n_fields; ++$i) 311 311 { 312 312 $path = $this->get_tables_by_field($what[$i], $tables_def); … … 354 354 if ($n_joins = count($query_fields_joins)) 355 355 { 356 for($k = 0; $k < $n_joins; $k++)356 for($k = 0; $k < $n_joins; ++$k) 357 357 { 358 358 if (preg_match("/$query_join_reg/",$query_fields_joins[$k])) … … 388 388 $n_restrictions = count($restric_fields); 389 389 390 for ($i = 0; $i < $n_restrictions; $i++)390 for ($i = 0; $i < $n_restrictions; ++$i) 391 391 { 392 392 $path = $this->get_tables_by_field($restric_fields[$i], $tables_def); … … 428 428 if ($n_joins = count($query_restric_joins)) 429 429 { 430 for($k = 0; $k < $n_joins; $k++)430 for($k = 0; $k < $n_joins; ++$k) 431 431 { 432 432 if (preg_match("/$query_join_reg/",$query_restric_joins[$k])) … … 605 605 $return = array(); 606 606 $previous = false; 607 for($i = 0; $i < $n_fields-1; $i++)607 for($i = 0; $i < $n_fields-1; ++$i) 608 608 { 609 609 $actual = $field_parts[$i]; -
trunk/contactcenter/inc/class.bo_company_manager.inc.php
r2 r7655 213 213 $return['relation'.$count]['type'] = $relation->get_type_name(); 214 214 $return['relation'.$count]['is_subordinated'] = $relation->get_is_subordinated(); 215 $count++;215 ++$count; 216 216 } 217 217 … … 285 285 $return['address'.$count]['id_country'] = $address->get_id_country(); 286 286 $return['address'.$count]['country_name'] = $address->get_country_name(); 287 $count++;287 ++$count; 288 288 } 289 289 … … 331 331 $return['connection'.$count]['connection_value'] = $connection->get_value(); 332 332 $return['connection'.$count]['connection_is_default'] = $connection->is_default(); 333 $count++;333 ++$count; 334 334 } 335 335 … … 368 368 $return['contact'.$count]['title'] = $value['title']; 369 369 $return['contact'.$count]['department'] = $value['department']; 370 $count++;370 ++$count; 371 371 } 372 372 … … 412 412 $return['legal'.$count]['legal_info_value'] = $legal->get_value(); 413 413 $return['legal'.$count]['legal_is_default'] = $legal->is_default(); 414 $count++;414 ++$count; 415 415 } 416 416 -
trunk/contactcenter/inc/class.bo_contactcenter.inc.php
r3282 r7655 410 410 411 411 } 412 $i++;412 ++$i; 413 413 } 414 414 } … … 434 434 $this->tree[$i]['type'] = 'ldap'; 435 435 $this->tree[$i]['src'] = $id; 436 $i++;436 ++$i; 437 437 } 438 438 } … … 461 461 462 462 $code = '$branch =& $this->tree[\'branches\']'; 463 for ($i = 1; $i < $n_ways-1; $i++)463 for ($i = 1; $i < $n_ways-1; ++$i) 464 464 { 465 465 $code .= '['.$path[$i].'][\'sub_branch\']'; -
trunk/contactcenter/inc/class.bo_global_ldap_catalog.inc.php
r5399 r7655 194 194 195 195 $rEntry = ldap_first_entry( $ldap, $result_r ); 196 for ( $iCurrent = 0; $iCurrent < $iEnd ; $iCurrent++)196 for ( $iCurrent = 0; $iCurrent < $iEnd ;++$iCurrent) 197 197 { 198 198 … … 262 262 263 263 $rEntry = ldap_first_entry( $ldap, $result_r ); 264 for ( $iCurrent = 0; $iCurrent < $iEnd ; $iCurrent++)264 for ( $iCurrent = 0; $iCurrent < $iEnd ;++$iCurrent) 265 265 { 266 266 … … 769 769 $contact_data['relations']['relation'.$i]['type'] = $l_type; 770 770 $contact_data['relations']['relation'.$i]['names_ordered'] = utf8_decode($contact[$l_type_fields[0]][0]); 771 $i++;771 ++$i; 772 772 } 773 773 } … … 818 818 $contact_data['addresses']['address'.$i]['type'] = $l_type; 819 819 $contact_data['addresses']['address'.$i][$l_field] = utf8_decode($contact[$l_type_fields[0]][0]); 820 $i++;820 ++$i; 821 821 } 822 822 } … … 872 872 $contact_data['connections']['connection'.$i]['type'] = $l_type; 873 873 $contact_data['connections']['connection'.$i][$l_field] = utf8_decode($contact[$l_type_fields[0]][0]); 874 $i++;874 ++$i; 875 875 } 876 876 } … … 1096 1096 $contact_data['relations']['relation'.$i]['type'] = $l_type; 1097 1097 $contact_data['relations']['relation'.$i]['names_ordered'] = utf8_decode($contact[$l_type_fields[0]][0]); 1098 $i++;1098 ++$i; 1099 1099 } 1100 1100 } … … 1145 1145 $contact_data['addresses']['address'.$i]['type'] = $l_type; 1146 1146 $contact_data['addresses']['address'.$i][$l_field] = utf8_decode($contact[$l_type_fields[0]][0]); 1147 $i++;1147 ++$i; 1148 1148 } 1149 1149 } … … 1200 1200 $contact_data['connections']['connection'.$i]['type'] = $l_type; 1201 1201 $contact_data['connections']['connection'.$i][$l_field] = utf8_decode($contact[$l_type_fields[0]][0]); 1202 $i++;1202 ++$i; 1203 1203 } 1204 1204 } … … 1360 1360 { 1361 1361 $filter = '(&(objectClass='.$this->src_info['obj'] . ')(|'; 1362 for ($i = 0; $i < $size; $i++)1362 for ($i = 0; $i < $size; ++$i) 1363 1363 { 1364 1364 -
trunk/contactcenter/inc/class.bo_ldap_manager.inc.php
r4838 r7655 227 227 // stream_select native timeout. 228 228 $response = NULL; 229 for ($i = 0; $i < $timeout; $i++)229 for ($i = 0; $i < $timeout; ++$i) 230 230 { 231 231 if ($tsearch->isActive()) … … 376 376 $entries = ldap_get_entries($resource, $result_res); 377 377 378 for ($i = 0; $i < $entries['count']; $i++)378 for ($i = 0; $i < $entries['count']; ++$i) 379 379 { 380 380 $subtree = $this->get_ldap_tree_recursive($resource, $entries[$i]['dn'], $objectClass); … … 439 439 $sub_branches = array(); 440 440 441 for($i = 0; $i <count($referral); $i++) {441 for($i = 0; $i <count($referral); ++$i) { 442 442 $dn = str_replace("??base","",preg_replace('!^(ldap://[^/]+)/(.*$)!', '\\2', $referral[$i])); 443 443 $dn = explode(",",$dn); -
trunk/contactcenter/inc/class.bo_people_catalog.inc.php
r5131 r7655 355 355 $return['relation'.$count]['type'] = $relation->get_type_name(); 356 356 $return['relation'.$count]['is_subordinated'] = $relation->get_is_subordinated(); 357 $count++;357 ++$count; 358 358 } 359 359 else if ($extra !== 'subordinated') … … 363 363 $return['relation'.$count]['type'] = $relation->get_type_name(); 364 364 $return['relation'.$count]['is_subordinated'] = $relation->get_is_subordinated(); 365 $count++;365 ++$count; 366 366 } 367 367 } … … 541 541 $return['connection'.$count]['connection_value'] = $connection->get_value(); 542 542 $return['connection'.$count]['connection_is_default'] = $connection->is_default(); 543 $count++;543 ++$count; 544 544 } 545 545 else if ($extra !== 'default') … … 552 552 $return['connection'.$count]['connection_value'] = $connection->get_value(); 553 553 $return['connection'.$count]['connection_is_default'] = $connection->is_default(); 554 $count++;554 ++$count; 555 555 } 556 556 } … … 674 674 $return['company'.$count]['default_company'] = $value['default_company']; 675 675 $return['company'.$count]['default_contact'] = $value['default_contact']; 676 $count++;676 ++$count; 677 677 } 678 678 else if ($extra !== 'default') … … 684 684 $return['company'.$count]['default_company'] = $value['default_company']; 685 685 $return['company'.$count]['default_contact'] = $value['default_contact']; 686 $count++;686 ++$count; 687 687 } 688 688 } … … 1246 1246 'connection_is_default' => 1, 1247 1247 ); 1248 $i++;1248 ++$i; 1249 1249 } 1250 1250 … … 1257 1257 'connection_is_default' => 0, 1258 1258 ); 1259 $i++;1259 ++$i; 1260 1260 } 1261 1261 … … 1273 1273 { 1274 1274 if($connection_fields['connection_value'] != ''){ 1275 $i++;1275 ++$i; 1276 1276 $new_data['connections']['connection'.$i] = array( 1277 1277 'id_typeof_connection' => $preferences['personCardPhone'], … … 1288 1288 foreach($data['connections']['aditional_phone'] as $connection_name => $connection_fields) 1289 1289 { 1290 $i++;1290 ++$i; 1291 1291 $new_data['connections']['connection'.$i] = array( 1292 1292 'id_typeof_connection' => $preferences['personCardPhone'], … … 1310 1310 'address_is_default' => 0, 1311 1311 ); 1312 $i++;1312 ++$i; 1313 1313 1314 1314 $new_data['addresses']['address'.$i] = array( … … 1323 1323 'address_is_default' => 1, 1324 1324 ); 1325 $i++;1325 ++$i; 1326 1326 } 1327 1327 … … 1342 1342 'address_is_default' => 'false', 1343 1343 ); 1344 $j++;1344 ++$j; 1345 1345 }*/ 1346 1346 -
trunk/contactcenter/inc/class.bo_shared_people_manager.inc.php
r5509 r7655 402 402 $return['relation'.$count]['type'] = $relation->get_type_name(); 403 403 $return['relation'.$count]['is_subordinated'] = $relation->get_is_subordinated(); 404 $count++;404 ++$count; 405 405 } 406 406 else if ($extra !== 'subordinated') … … 410 410 $return['relation'.$count]['type'] = $relation->get_type_name(); 411 411 $return['relation'.$count]['is_subordinated'] = $relation->get_is_subordinated(); 412 $count++;412 ++$count; 413 413 } 414 414 } … … 581 581 $return['connection'.$count]['connection_value'] = $connection->get_value(); 582 582 $return['connection'.$count]['connection_is_default'] = $connection->is_default(); 583 $count++;583 ++$count; 584 584 } 585 585 else if ($extra !== 'default') … … 592 592 $return['connection'.$count]['connection_value'] = $connection->get_value(); 593 593 $return['connection'.$count]['connection_is_default'] = $connection->is_default(); 594 $count++;594 ++$count; 595 595 } 596 596 } … … 638 638 $return['company'.$count]['default_company'] = $value['default_company']; 639 639 $return['company'.$count]['default_contact'] = $value['default_contact']; 640 $count++;640 ++$count; 641 641 } 642 642 else if ($extra !== 'default') … … 648 648 $return['company'.$count]['default_company'] = $value['default_company']; 649 649 $return['company'.$count]['default_contact'] = $value['default_contact']; 650 $count++;650 ++$count; 651 651 } 652 652 } … … 1146 1146 'connection_is_default' => 1, 1147 1147 ); 1148 $i++;1148 ++$i; 1149 1149 } 1150 1150 -
trunk/contactcenter/inc/class.so_main.inc.php
r1689 r7655 240 240 $this->manage_fields($this->db_tables[$table]['fields'][$field_info['name']], 'sync', 'new'); 241 241 } 242 $pos++;243 } 244 $pos++;242 ++$pos; 243 } 244 ++$pos; 245 245 } 246 246 } … … 389 389 $where = false; 390 390 $n_values = count($table_info['keys']['primary'][0]['values']); 391 for ($i = 0; $i < $n_values; $i++)391 for ($i = 0; $i < $n_values; ++$i) 392 392 { 393 393 unset($where); … … 524 524 525 525 reset($table_info['fields']); 526 for ($i = 0; $i < $n_values; $i++)526 for ($i = 0; $i < $n_values; ++$i) 527 527 { 528 528 $multi_table_changed = false; -
trunk/contactcenter/inc/class.ui_api.inc.php
r7497 r7655 291 291 $date[$j]['name'] = lang('Day'); 292 292 } 293 $j++;293 ++$j; 294 294 } 295 295 … … 416 416 $fieldsTop = 10; 417 417 $fieldsSpace = 30; 418 for ($i = 0; $i < $nFields; $i++)418 for ($i = 0; $i < $nFields; ++$i) 419 419 { 420 420 $fieldsHTML .= '<span id="ccQuickAddT'.$i.'" style="position: absolute; top: '.($fieldsTop+$i*$fieldsSpace).'px; left: 5px; width: 100px; text-align: right; border: 0px solid #999;">'.$fields[$i].':</span>'."\n"; -
trunk/contactcenter/inc/class.ui_data.inc.php
r5928 r7655 735 735 { 736 736 $validos[$uid_relacionado] = $perms_relacao[$uid_relacionado]; 737 $count++;737 ++$count; 738 738 } 739 739 } … … 812 812 { 813 813 $validos[$uid_relacionado] = $perms_relacao[$uid_relacionado]; 814 $count++;814 ++$count; 815 815 } 816 816 } … … 833 833 $infos = ldap_get_entries($s, $r); 834 834 ldap_close($s); 835 for($z = 0; $z < $infos['count']; $z++) {835 for($z = 0; $z < $infos['count']; ++$z) { 836 836 $prop_names[$infos[$z]['uidnumber'][0]] = array("cn" => $infos[$z]['cn'][0], "uid" => $infos[$z]['uid'][0]); 837 837 } … … 1412 1412 } 1413 1413 1414 for($i = $id_i; $i < $id_f and $i < $n_entries; $i++)1414 for($i = $id_i; $i < $id_f and $i < $n_entries; ++$i) 1415 1415 { 1416 1416 /**rev 104**/ … … 1449 1449 $info = ldap_get_entries($ds, $sr); 1450 1450 ldap_close($ds); 1451 for($z = 0; $z < $info['count']; $z++) {1451 for($z = 0; $z < $info['count']; ++$z) { 1452 1452 $owner_names[$info[$z]['uidnumber'][0]] = array("cn" => $info[$z]['cn'][0], "uid" => $info[$z]['uid'][0]); 1453 1453 } … … 1463 1463 $info = ldap_get_entries($ds, $sr); 1464 1464 ldap_close($ds); 1465 for($z = 0; $z < $info['count']; $z++) {1465 for($z = 0; $z < $info['count']; ++$z) { 1466 1466 $owner_names[$info[$z]['uidnumber'][0]] = array("cn" => $info[$z]['cn'][0], "uid" => $info[$z]['uid'][0]); 1467 1467 } … … 1478 1478 1479 1479 /// Original 1480 //for($i = $id_i; $i < $id_f and $i < $n_entries; $i++)1480 //for($i = $id_i; $i < $id_f and $i < $n_entries; ++$i) 1481 1481 //{ 1482 1482 // $ids[] = $this->page_info['actual_entries'][$i]; … … 1518 1518 $final[3][$i][6] = $owner_names[$owners[$i]]['uid']; 1519 1519 $final[3][$i][7] = $owners[$i]; //uidNumber 1520 } 1521 $i++; 1520 } 1521 ++$i; 1522 1522 } 1523 1523 … … 1683 1683 1684 1684 $final[4][$i] = $contact['photo'] ? 1 : 0; 1685 1686 1687 1688 $i++;1685 1686 1687 1688 ++$i; 1689 1689 } 1690 1690 else … … 1742 1742 $sr = ldap_search($ds,$dn, $filter,$justThese); 1743 1743 $info = ldap_get_entries($ds, $sr); 1744 for($z = 0; $z < $info['count']; $z++) {1744 for($z = 0; $z < $info['count']; ++$z) { 1745 1745 $owner_names[$info[$z]['uidnumber'][0]] = array("cn" => $info[$z]['cn'][0], "uid" => $info[$z]['uid'][0]); 1746 1746 } … … 1753 1753 $info = ldap_get_entries($ds, $sr); 1754 1754 ldap_close($ds); 1755 for($z = 0; $z < $info['count']; $z++) {1755 for($z = 0; $z < $info['count']; ++$z) { 1756 1756 $owner_names[$info[$z]['uidnumber'][0]] = array("cn" => $info[$z]['cn'][0], "uid" => $info[$z]['uid'][0]); 1757 1757 } … … 1859 1859 $birthdate[$j] = $date[2]; 1860 1860 } 1861 $j++;1861 ++$j; 1862 1862 } 1863 1863 $datecount = 0; … … 1938 1938 'short_name' => $group['short_name'] 1939 1939 ); 1940 $i++;1940 ++$i; 1941 1941 } 1942 1942 … … 1983 1983 } 1984 1984 1985 $i++;1985 ++$i; 1986 1986 } 1987 1987 … … 2118 2118 2119 2119 $actualCatalog = $this->get_actual_catalog(); 2120 for ($i = 0; $i < count($data['contact_in_list']); $i++)2120 for ($i = 0; $i < count($data['contact_in_list']); ++$i) 2121 2121 { 2122 2122 if (preg_match('/ldap:.*:.*/', $data['contact_in_list'][$i])) // from ldap … … 2357 2357 sleep(1); 2358 2358 $photo_ok = $GLOBALS['phpgw']->session->appsession('ui_data.photo','contactcenter'); 2359 $sleep_count++;2359 ++$sleep_count; 2360 2360 2361 2361 if ($sleep_count > 35) … … 2410 2410 $date[$j]['digit'] = 'D'; 2411 2411 } 2412 $j++;2412 ++$j; 2413 2413 } 2414 2414 $datecount = 0; … … 2420 2420 $aa = count($dataConn); 2421 2421 2422 for($i = 0; $i < $aa; $i++)2422 for($i = 0; $i < $aa; ++$i ) 2423 2423 { 2424 2424 if($dataConn['connection'.$i]['connection_is_default'] == "TRUE") … … 2480 2480 unset($data[$field]); 2481 2481 } 2482 2483 $datecount++;2482 2483 ++$datecount; 2484 2484 2485 2485 if ($datecount != 3) … … 2666 2666 sleep(1); 2667 2667 $photo_ok = $GLOBALS['phpgw']->session->appsession('ui_data.photo','contactcenter'); 2668 $sleep_count++;2668 ++$sleep_count; 2669 2669 2670 2670 if ($sleep_count > 35) … … 2719 2719 $date[$j]['digit'] = 'D'; 2720 2720 } 2721 $j++;2721 ++$j; 2722 2722 } 2723 2723 $datecount = 0; … … 2730 2730 $aa = count($dataConn); 2731 2731 2732 for($i = 0; $i < $aa; $i++)2732 for($i = 0; $i < $aa; ++$i ) 2733 2733 { 2734 2734 if($dataConn['connection'.$i]['connection_is_default'] == "TRUE") … … 2792 2792 } 2793 2793 unset($data[$field]); 2794 $datecount++;2794 ++$datecount; 2795 2795 2796 2796 if ($datecount != 3) … … 3626 3626 3627 3627 $jsCode[] = '_this.entries.options[_this.entries.options.length] = new Option("'.$optionName.' ('.$value.')", "'.$count.'");'; 3628 $count++;3628 ++$count; 3629 3629 } 3630 3630 } … … 3643 3643 if ($connection['id_type'] == $this->preferences['personCardEmail']) { 3644 3644 $jsCode[] = '_this.entries.options[_this.entries.options.length] = new Option("'.$name.' <'.$connection['connection_value'].'>", "'.$count.'");'; 3645 $count++;3645 ++$count; 3646 3646 } 3647 3647 } … … 3759 3759 $sr = ldap_read($ds,$id, "objectClass=*",$justThese); 3760 3760 $info = ldap_get_entries($ds, $sr); 3761 for($z = 0; $z < 5; $z++) {3761 for($z = 0; $z < 5; ++$z) { 3762 3762 $participant = $info[0][$justThese[$z]]; 3763 3763 $participant[0] = utf8_decode($participant[0]); … … 3789 3789 $contact['names_ordered'] = $info[0]['description']; 3790 3790 $filter = ""; 3791 for($z = 0; $z < count($member_uids); $z++) {3791 for($z = 0; $z < count($member_uids); ++$z) { 3792 3792 if($member_uids[$z]) 3793 3793 $filter.="(uid=".$member_uids[$z].")"; … … 3802 3802 $sr = ldap_search($ds,$dn, $filter,$justThese); 3803 3803 $info = ldap_get_entries($ds, $sr); 3804 for($z = 0; $z < $info['count']; $z++) {3804 for($z = 0; $z < $info['count']; ++$z) { 3805 3805 $participant = '<font color=\'DARKBLUE\'> "'.$info[$z]['cn'][0].'" <'.$info[$z]['mail'][0].'></font><br>'; 3806 3806 $array_emails[$info[$z]['mail'][0]] = null; … … 3830 3830 3831 3831 $filter = null; 3832 for($z = 0; $z < $contact['mail_forwarding_address']['count']; $z++) {3832 for($z = 0; $z < $contact['mail_forwarding_address']['count']; ++$z) { 3833 3833 if(strstr($contact['mail_forwarding_address'][$z],'@')) { 3834 3834 $filter.="(mail=".$contact['mail_forwarding_address'][$z].")"; … … 3850 3850 $sr = ldap_search($ds,$dn, $filter,$justThese); 3851 3851 $info = ldap_get_entries($ds, $sr); 3852 for($z = 0; $z < $info['count']; $z++) {3852 for($z = 0; $z < $info['count']; ++$z) { 3853 3853 $participant = '<font color=\'DARKBLUE\'> "'.$info[$z]['cn'][0].'" <'.$info[$z]['mail'][0].'></font><br>'; 3854 3854 $array_emails[$info[$z]['mail'][0]] = null; … … 4339 4339 $text = trim($matches[2]); 4340 4340 4341 $fields[ $field_num++] = $value;4341 $fields[++$field_num] = $value; 4342 4342 } else { 4343 4343 preg_match('/^([^' . $re_d . ']*)' . $re_d . '?(.*)$/', $text, $matches); … … 4346 4346 $text = trim($matches[2]); 4347 4347 4348 $fields[ $field_num++] = $value;4348 $fields[++$field_num] = $value; 4349 4349 } 4350 4350 } … … 4806 4806 if ($info) 4807 4807 { 4808 for ($i = 0; $i < count($justThese); $i++)4808 for ($i = 0; $i < count($justThese); ++$i) 4809 4809 { 4810 4810 $attr = array(); … … 4814 4814 $attr['type'] = 'multivalues'; 4815 4815 $attr['value'] = array(); 4816 for ($j = 0; $j < $info[0][$justThese[$i]]['count']; $j++)4816 for ($j = 0; $j < $info[0][$justThese[$i]]['count']; ++$j) 4817 4817 $attr['value'][] = utf8_decode($info[0][$justThese[$i]][$j]); 4818 4818 }
Note: See TracChangeset
for help on using the changeset viewer.
