Changeset 6111 for trunk/prototype/request.php

Timestamp:

05/04/12 18:38:56 (12 years ago)

Author:

natan

Message:

Ticket #2141 - Eventos com repeticao nao dispara notificacao nos alarmes - implementação final

File:

• trunk/prototype/request.php (modified) (1 diff)

trunk/prototype/request.php

@@ -29 +29 @@
 
 ///Conversor Para utf8 ante de codificar para json pois o json so funciona com utf8
-function srtToUtf8($data)
-{
-    return mb_convert_encoding( $data , 'UTF-8' , 'UTF-8 , ISO-8859-1' );
-}
-
 function toUtf8($data)
 {
-    if(is_array($data))
-    {   
-        $return = array();
-        foreach ($data as $i => $v)
-           $return[srtToUtf8($i)] = (is_array($v)) ? toUtf8($v) : srtToUtf8($v);
-        
-        return $return;
-    }
-    else
-       return srtToUtf8($data);
+    if(!is_array($data))
+      return mb_convert_encoding( $data , 'UTF-8' , 'UTF-8 , ISO-8859-1' );
+
+    $return = array();
+
+    foreach ($data as $i => $v)
+      $return[toUtf8($i)] = toUtf8($v);
+
+    return $return;
 }
 ////////////////////////////////////////////////////////////////////////////////////////