diff options
author | Derek Jones <derek.jones@ellislab.com> | 2009-02-02 19:50:38 +0100 |
---|---|---|
committer | Derek Jones <derek.jones@ellislab.com> | 2009-02-02 19:50:38 +0100 |
commit | 33559103ddf02648837c85ed72425ac06c06080c (patch) | |
tree | be00fd757f97298f3e74a43c4eb067b729fb4af0 /system | |
parent | f1b721a3559e8eb95bc580a3f79c5c2e896c9932 (diff) |
replaced all sizeof() in favor of count() - aliases are teh sux0r
Diffstat (limited to 'system')
-rw-r--r-- | system/helpers/url_helper.php | 4 | ||||
-rw-r--r-- | system/libraries/Sha1.php | 2 | ||||
-rw-r--r-- | system/libraries/Xmlrpc.php | 18 | ||||
-rw-r--r-- | system/libraries/Xmlrpcs.php | 16 |
4 files changed, 20 insertions, 20 deletions
diff --git a/system/helpers/url_helper.php b/system/helpers/url_helper.php index 9b449ea9e..6c3bc837a 100644 --- a/system/helpers/url_helper.php +++ b/system/helpers/url_helper.php @@ -382,7 +382,7 @@ if ( ! function_exists('auto_link')) { $pop = ($popup == TRUE) ? " target=\"_blank\" " : ""; - for ($i = 0; $i < sizeof($matches['0']); $i++) + for ($i = 0; $i < count($matches['0']); $i++) { $period = ''; if (preg_match("|\.$|", $matches['6'][$i])) @@ -408,7 +408,7 @@ if ( ! function_exists('auto_link')) { if (preg_match_all("/([a-zA-Z0-9_\.\-\+Å]+)@([a-zA-Z0-9\-]+)\.([a-zA-Z0-9\-\.]*)/i", $str, $matches)) { - for ($i = 0; $i < sizeof($matches['0']); $i++) + for ($i = 0; $i < count($matches['0']); $i++) { $period = ''; if (preg_match("|\.$|", $matches['3'][$i])) diff --git a/system/libraries/Sha1.php b/system/libraries/Sha1.php index 93982bfc4..cc6e2123f 100644 --- a/system/libraries/Sha1.php +++ b/system/libraries/Sha1.php @@ -80,7 +80,7 @@ class CI_SHA { $d = 271733878; $e = -1009589776; - for ($i = 0; $i < sizeof($x); $i += 16) + for ($i = 0; $i < count($x); $i += 16) { $olda = $a; $oldb = $b; diff --git a/system/libraries/Xmlrpc.php b/system/libraries/Xmlrpc.php index b077d3d1f..987f27469 100644 --- a/system/libraries/Xmlrpc.php +++ b/system/libraries/Xmlrpc.php @@ -133,7 +133,7 @@ class CI_Xmlrpc { function initialize($config = array()) { - if (sizeof($config) > 0) + if (count($config) > 0) { foreach ($config as $key => $val) { @@ -554,7 +554,7 @@ class XML_RPC_Response { reset($xmlrpc_val->me); list($a,$b) = each($xmlrpc_val->me); - $size = sizeof($b); + $size = count($b); $arr = array(); @@ -619,9 +619,9 @@ class XML_RPC_Message extends CI_Xmlrpc parent::CI_Xmlrpc(); $this->method_name = $method; - if (is_array($pars) && sizeof($pars) > 0) + if (is_array($pars) && count($pars) > 0) { - for($i=0; $i<sizeof($pars); $i++) + for($i=0; $i<count($pars); $i++) { // $pars[$i] = XML_RPC_Values $this->params[] = $pars[$i]; @@ -639,7 +639,7 @@ class XML_RPC_Message extends CI_Xmlrpc $this->payload .= '<methodName>' . $this->method_name . "</methodName>\r\n"; $this->payload .= "<params>\r\n"; - for($i=0; $i<sizeof($this->params); $i++) + for($i=0; $i<count($this->params); $i++) { // $p = XML_RPC_Values $p = $this->params[$i]; @@ -737,7 +737,7 @@ class XML_RPC_Message extends CI_Xmlrpc // PARSE XML DATA //------------------------------------- - if ( ! xml_parse($parser, $data, sizeof($data))) + if ( ! xml_parse($parser, $data, count($data))) { $errstr = sprintf('XML error: %s at line %d', xml_error_string(xml_get_error_code($parser)), @@ -1137,7 +1137,7 @@ class XML_RPC_Message extends CI_Xmlrpc { $parameters = array(); - for ($i = 0; $i < sizeof($this->params); $i++) + for ($i = 0; $i < count($this->params); $i++) { $a_param = $this->decode_message($this->params[$i]); @@ -1171,7 +1171,7 @@ class XML_RPC_Message extends CI_Xmlrpc $arr = array(); - for($i = 0; $i < sizeof($b); $i++) + for($i = 0; $i < count($b); $i++) { $arr[] = $this->decode_message($param->me['array'][$i]); } @@ -1340,7 +1340,7 @@ class XML_RPC_Values extends CI_Xmlrpc case 2: // array $rs .= "<array>\n<data>\n"; - for($i=0; $i < sizeof($val); $i++) + for($i=0; $i < count($val); $i++) { $rs .= $this->serializeval($val[$i]); } diff --git a/system/libraries/Xmlrpcs.php b/system/libraries/Xmlrpcs.php index cdbdee955..3f538492a 100644 --- a/system/libraries/Xmlrpcs.php +++ b/system/libraries/Xmlrpcs.php @@ -204,7 +204,7 @@ class CI_Xmlrpcs extends CI_Xmlrpc $m = new XML_RPC_Message($parser_object->xh[$parser]['method']); $plist=''; - for($i=0; $i < sizeof($parser_object->xh[$parser]['params']); $i++) + for($i=0; $i < count($parser_object->xh[$parser]['params']); $i++) { if ($this->debug === TRUE) { @@ -289,13 +289,13 @@ class CI_Xmlrpcs extends CI_Xmlrpc if (isset($this->methods[$methName]['signature'])) { $sig = $this->methods[$methName]['signature']; - for($i=0; $i<sizeof($sig); $i++) + for($i=0; $i<count($sig); $i++) { $current_sig = $sig[$i]; - if (sizeof($current_sig) == sizeof($m->params)+1) + if (count($current_sig) == count($m->params)+1) { - for($n=0; $n < sizeof($m->params); $n++) + for($n=0; $n < count($m->params); $n++) { $p = $m->params[$n]; $pt = ($p->kindOf() == 'scalar') ? $p->scalarval() : $p->kindOf(); @@ -385,11 +385,11 @@ class CI_Xmlrpcs extends CI_Xmlrpc $sigs = array(); $signature = $this->methods[$method_name]['signature']; - for($i=0; $i < sizeof($signature); $i++) + for($i=0; $i < count($signature); $i++) { $cursig = array(); $inSig = $signature[$i]; - for($j=0; $j<sizeof($inSig); $j++) + for($j=0; $j<count($inSig); $j++) { $cursig[]= new XML_RPC_Values($inSig[$j], 'string'); } @@ -451,7 +451,7 @@ class CI_Xmlrpcs extends CI_Xmlrpc $m = new XML_RPC_Message($value[0]); $plist=''; - for($i=0; $i < sizeof($value[1]); $i++) + for($i=0; $i < count($value[1]); $i++) { $m->addParam(new XML_RPC_Values($value[1][$i], 'string')); } @@ -510,7 +510,7 @@ class CI_Xmlrpcs extends CI_Xmlrpc return $this->multicall_error('notarray'); list($a,$b)=each($params->me); - $numParams = sizeof($b); + $numParams = count($b); $msg = new XML_RPC_Message($scalar_value); for ($i = 0; $i < $numParams; $i++) |