diff --git a/base/classes/webform/TPDOConnection.class.php b/base/classes/webform/TPDOConnection.class.php index 4102d6f3..e1b2767e 100644 --- a/base/classes/webform/TPDOConnection.class.php +++ b/base/classes/webform/TPDOConnection.class.php @@ -159,22 +159,22 @@ public static function connect( $configFile = null, $boolRequired = true, $boolU } /** - * Verifica se o SGBD é MySQL, rodando no Windows + * Verifica se o SGBD é MySQL * Encoding do banco é UTF 8 * @return boolean */ - public static function isMySqlWinDbUtf8(){ + public static function isMySqlDbUtf8(){ $result = false; $DBMS = self::getDBMS(); $boolUtf8_Decode = self::getUtfDecode(); - if( ($DBMS == DBMS_MYSQL) && (PHP_OS != "Linux" ) && $boolUtf8_Decode==false ){ + if( ($DBMS == DBMS_MYSQL) && $boolUtf8_Decode==false ){ $result = true; } return $result; } public static function getExtraConfigPDO(){ - if( self::isMySqlWinDbUtf8() ){ + if( self::isMySqlDbUtf8() ){ self::$instance[ self::getDatabaseName()]->exec('SET CHARACTER SET utf8'); // acerta a acentuação vinda do banco de dados } } @@ -770,7 +770,7 @@ public static function encodeArray( $arrDados = null ) { foreach( $arrDados as $k => $v ) { if ( ! is_null( $v ) ) { - if( !self::isMySqlWinDbUtf8() ){ + if( !self::isMySqlDbUtf8() ){ $boolUtf8_DecodeDataBase = self::getUtfDecode(); $arrDados[ $k ] = self::getStrUtf8OrAnsi(!$boolUtf8_DecodeDataBase, $v); } @@ -812,7 +812,7 @@ public static function encodeArray( $arrDados = null ) { foreach( $arrDados as $k => $v ) { if ( !is_null($v) && !empty($v) ){ $v = self::verifyformtDateYMD( $v ); - if( !self::isMySqlWinDbUtf8() ){ + if( !self::isMySqlDbUtf8() ){ $boolUtf8_DecodeDataBase = self::getUtfDecode(); $arrDados[ $k ] = self::getStrUtf8OrAnsi(!$boolUtf8_DecodeDataBase, $v); } @@ -1149,7 +1149,8 @@ public static function dmy( $date = null ) * @param string $string * @return NULL|string */ - public static function getStrUtf8OrAnsi( $boolUtf8_Decode , $string ) { + public static function getStrUtf8OrAnsi( $boolUtf8_Decode , $string ) + { $retorno = null; if( (self::$banco == DBMS_SQLSERVER) && (PHP_OS != "Linux" ) ){ $retorno = $string; @@ -1157,7 +1158,8 @@ public static function getStrUtf8OrAnsi( $boolUtf8_Decode , $string ) { $retorno = $string; }elseif (self::$banco == DBMS_SQLITE) { $retorno = $string; - } if( self::isMySqlWinDbUtf8() ){ + } + elseif( self::isMySqlDbUtf8() ){ $retorno = $string; } else{ if ( $boolUtf8_Decode ) {