diff --git a/workflow/engine/methods/setup/replacementLogo.php b/workflow/engine/methods/setup/replacementLogo.php index 487b2f58f..de062f4a4 100755 --- a/workflow/engine/methods/setup/replacementLogo.php +++ b/workflow/engine/methods/setup/replacementLogo.php @@ -38,21 +38,19 @@ try {//ini_set('display_errors','1'); break; } function changeNamelogo($snameLogo){ - $snameLogo = ereg_replace("[áàâãª]","a",$snameLogo); - $snameLogo = ereg_replace("[ÁÀÂÃ]","A",$snameLogo); - $snameLogo = ereg_replace("[ÍÌÎ]","I",$snameLogo); - $snameLogo = ereg_replace("[íìî]","i",$snameLogo); - $snameLogo = ereg_replace("[éèê]","e",$snameLogo); - $snameLogo = ereg_replace("[ÉÈÊ]","E",$snameLogo); - $snameLogo = ereg_replace("[óòôõº]","o",$snameLogo); - $snameLogo = ereg_replace("[ÓÒÔÕ]","O",$snameLogo); - $snameLogo = ereg_replace("[úùû]","u",$snameLogo); - $snameLogo = ereg_replace("[ÚÙÛ]","U",$snameLogo); - $snameLogo = str_replace("ç","c",$snameLogo); - $snameLogo = str_replace("Ç","C",$snameLogo); - $snameLogo = str_replace("[ñ]","n",$snameLogo); - $snameLogo = str_replace("[Ñ]","N",$snameLogo); - return ($snameLogo); + $snameLogo = strtolower($snameLogo); + //replace special characteres and others + $buscar = array('á', 'é', 'í', 'ó', 'ú', 'ñ', 'á', 'é', 'í', 'ó', 'ú', 'ä', 'ë', 'ï', 'ö', 'ü', 'ä', 'ë', 'ï', 'ö', 'ü', 'Á', 'É', 'Í', 'Ó', 'Ú', 'Ä', 'Ë', 'Ï', 'Ö', 'Ü', 'ñ'); + $repl = array('a', 'e', 'i', 'o', 'u', 'n', 'a', 'e', 'i', 'o', 'u', 'a', 'e', 'i', 'o', 'u', 'a', 'e', 'i', 'o', 'u', 'a', 'e', 'i', 'o', 'u', 'a', 'e', 'i', 'o', 'u', 'n'); + $snameLogo = str_replace($buscar, $repl, $snameLogo); + // add some caracteres + $lookforit = array(' ', '&', '\r\n', '\n', '+', '_'); + $snameLogo = str_replace($lookforit, '-', $snameLogo); + // removing and replace others special characteres + $lookforit = array('/[^a-z0-9\-<>]/', '/[\-]+/', '/<[^>]*>/'); + $repl = array('.', '-', '.'); + $snameLogo = preg_replace ($lookforit, $repl, $snameLogo); + return ($snameLogo); } $sfunction =$_GET['function']; diff --git a/workflow/engine/templates/setup/uplogo.php b/workflow/engine/templates/setup/uplogo.php index c94ed9667..a812cd566 100755 --- a/workflow/engine/templates/setup/uplogo.php +++ b/workflow/engine/templates/setup/uplogo.php @@ -91,22 +91,21 @@ try { } } function changeNamelogo($snameLogo){ - $snameLogo = ereg_replace("[áàâãª]","a",$snameLogo); - $snameLogo = ereg_replace("[ÁÀÂÃ]","A",$snameLogo); - $snameLogo = ereg_replace("[ÍÌÎ]","I",$snameLogo); - $snameLogo = ereg_replace("[íìî]","i",$snameLogo); - $snameLogo = ereg_replace("[éèê]","e",$snameLogo); - $snameLogo = ereg_replace("[ÉÈÊ]","E",$snameLogo); - $snameLogo = ereg_replace("[óòôõº]","o",$snameLogo); - $snameLogo = ereg_replace("[ÓÒÔÕ]","O",$snameLogo); - $snameLogo = ereg_replace("[úùû]","u",$snameLogo); - $snameLogo = ereg_replace("[ÚÙÛ]","U",$snameLogo); - $snameLogo = str_replace("ç","c",$snameLogo); - $snameLogo = str_replace("Ç","C",$snameLogo); - $snameLogo = str_replace("[ñ]","n",$snameLogo); - $snameLogo = str_replace("[Ñ]","N",$snameLogo); - return ($snameLogo); + $snameLogo = strtolower($snameLogo); + //replace special characteres and others + $buscar = array('á', 'é', 'í', 'ó', 'ú', 'ñ', 'á', 'é', 'í', 'ó', 'ú', 'ä', 'ë', 'ï', 'ö', 'ü', 'ä', 'ë', 'ï', 'ö', 'ü', 'Á', 'É', 'Í', 'Ó', 'Ú', 'Ä', 'Ë', 'Ï', 'Ö', 'Ü', 'ñ'); + $repl = array('a', 'e', 'i', 'o', 'u', 'n', 'a', 'e', 'i', 'o', 'u', 'a', 'e', 'i', 'o', 'u', 'a', 'e', 'i', 'o', 'u', 'a', 'e', 'i', 'o', 'u', 'a', 'e', 'i', 'o', 'u', 'n'); + $snameLogo = str_replace($buscar, $repl, $snameLogo); + // add some caracteres + $lookforit = array(' ', '&', '\r\n', '\n', '+', '_'); + $snameLogo = str_replace($lookforit, '-', $snameLogo); + // removing and replace others special characteres + $lookforit = array('/[^a-z0-9\-<>]/', '/[\-]+/', '/<[^>]*>/'); + $repl = array('.', '-', '.'); + $snameLogo = preg_replace ($lookforit, $repl, $snameLogo); + return ($snameLogo); } + // if we have at least one image we show the restore image /*if($i>0) { $template->gotoBlock( "_ROOT" );