extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-07 16:44:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

improve the handling of overlong words, fix a bug regarding the check of infolog_status existing in known status for the type selected

Browse Source
This commit is contained in:
Klaus Leithoff 2010-07-30 10:19:06 +00:00
parent 55463e493b
commit 02d2ca5157
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
infolog/inc/class.infolog_ui.inc.php
View File

@ -1013,7 +1013,7 @@ class infolog_ui
if ($content['js']) $content['js'] = '<script>'.$content['js'].'</script>'; if ($content['js']) $content['js'] = '<script>'.$content['js'].'</script>';
} }
// on a type-change, set the status to the default status of that type, if the actual status is not supported by the new type // on a type-change, set the status to the default status of that type, if the actual status is not supported by the new type
if (!in_array($content['info_status'],$this->bo->status[$content['info_type']])) if (!array_key_exists($content['info_status'],$this->bo->status[$content['info_type']]))
{ {
$content['info_status'] = $this->bo->status['defaults'][$content['info_type']]; $content['info_status'] = $this->bo->status['defaults'][$content['info_type']];
if ($content['info_status'] != 'done') $content['info_datecompleted'] = ''; if ($content['info_status'] != 'done') $content['info_datecompleted'] = '';
@ -1041,14 +1041,21 @@ class infolog_ui
{ {
continue; continue;
} }
foreach(array(',' => ', ', '.' => '. ') as $pattern => $replace) // set blank behind all , and . $cont = split(' ', $content[$key]);
$ckarray = array();
foreach($cont as &$word)
{ {
if(strpos($content[$key], $replace) === false) // set blank behind all , and . if words are too long, apply wordwrap afterwards to make sure we get
if (strlen($word)>75)
{ {
$content[$key] = str_replace($pattern, $replace, $content[$key]); if (!(strpos($word,',')===false) && strpos($word,', ')===false) $word = str_replace(',',', ',$word);
if (!(strpos($word,'.')===false) && strpos($word,'. ')===false) $word = str_replace('.','. ',$word);
$word = wordwrap($word, 75, ' ', true);
} }
$ckarray[] =$word;
} }
$content[$key] = wordwrap($content[$key], 75, ' ', true); $content[$key] = join(' ',$ckarray);
unset($ckarray);
} }
if (is_numeric($_REQUEST['cat_id'])) if (is_numeric($_REQUEST['cat_id']))
{ {