fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUG 6989 Solved types of images that not viewable as logos

Browse Source 
The problem was solved modificatin the name of the file image
This commit is contained in:
Douglas Medrano Chura
2011-08-03 10:10:37 -04:00
parent 196d6b0103
commit 4f6f2b9c95
4 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
workflow/engine/methods/setup/replacementLogo.php
View File

@@ -38,18 +38,20 @@ try {//ini_set('display_errors','1');
break;
}
function changeNamelogo($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);
$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);
}
@@ -87,8 +89,6 @@ try {//ini_set('display_errors','1');
G::SendTemporalMessage('ID_REPLACED_LOGO', 'tmp-info', 'labels');
//header('location: uplogo.php');
//G::header('location: uplogo');
break;
}

11
workflow/engine/methods/setup/showLogoFile.php
View File

@@ -24,6 +24,7 @@
*/
// if (($RBAC_Response = $RBAC->userCanAccess("PM_CASES"))!=1) return $RBAC_Response;
$idDecode64= base64_decode($_GET['id']);
$ainfoSite = explode("/",$_SERVER["REQUEST_URI"]);
//it was added to show the logo into management plugin add by krlos
@@ -32,13 +33,15 @@
}
//end add
$dir=PATH_DATA."sites".PATH_SEP.str_replace("sys","",$ainfoSite[1]).PATH_SEP."files/logos";
$imagen = $dir .PATH_SEP.G::decrypt($_GET['id'],'imagen');
$imagen = $dir .PATH_SEP.$idDecode64;
if (is_file($imagen))
{
showLogo($imagen);
}else{
}
else {
$newDir = PATH_DATA."sites".PATH_SEP.str_replace("sys","",$ainfoSite[1]).PATH_SEP."files/logos";
$dir = PATH_HOME . "public_html/files/logos";
@@ -48,8 +51,8 @@
}
//this function does copy all logos from public_html/files/logos to /shared/site/yourSite/files/logos
//cpyMoreLogos($dir,$newDir);
$newDir .= PATH_SEP.G::decrypt($_GET['id'],'imagen');
$dir .= PATH_SEP.G::decrypt($_GET['id'],'imagen');
$newDir .= PATH_SEP.$idDecode64;
$dir .= PATH_SEP.$idDecode64;
copy($dir,$newDir);
showLogo($newDir);
die;

3
workflow/engine/skinEngine/skinEngine.php
View File

@@ -475,12 +475,11 @@ if (isset($G_ENABLE_BLANK_SKIN) && $G_ENABLE_BLANK_SKIN) {
$sWspaceSelect = trim($aFotoSelect['WORKSPACE_LOGO_NAME']);
}
}
if (class_exists('PMPluginRegistry')) {
$oPluginRegistry = &PMPluginRegistry::getSingleton();
if ( isset($sFotoSelect) && $sFotoSelect!='' && !(strcmp($sWspaceSelect,SYS_SYS)) ){
$sCompanyLogo = $oPluginRegistry->getCompanyLogo($sFotoSelect);
$sCompanyLogo= "/sys".SYS_SYS."/".SYS_LANG."/".SYS_SKIN."/setup/showLogoFile.php?id=".G::encrypt($sCompanyLogo,"imagen");
$sCompanyLogo= "/sys".SYS_SYS."/".SYS_LANG."/".SYS_SKIN."/setup/showLogoFile.php?id=".base64_encode($sCompanyLogo);
}
else {
$sCompanyLogo = $oPluginRegistry->getCompanyLogo('/images/processmaker.logo.jpg');

2
workflow/engine/templates/setup/uplogo.php
View File

@@ -74,7 +74,7 @@ try {
$template->newBlock( 'logo_Detail');
$template->assign ('TR1' , ($i%3==0)?'<tr>':'' );
$template->assign ('TR2' , ($i%3==2)?'</tr>':'' );
$template->assign ('LOG0_IMAGE' , "showLogoFile.php?id=".G::encrypt($file,'imagen') );
$template->assign ('LOG0_IMAGE' , "showLogoFile.php?id=".base64_encode($file) );
$template->assign ('LOG0_NAME' , $file );
$template->assign ('LOG0_DESCRIPTION', $extention[count($extention)-1] );
$template->assign ('LOGO_CHARACT' , $aImageProp[3] );