steffen: server/kolab-webadmin/kolab-webadmin/php/admin/include form.class.php, 1.22, 1.23 mysmarty.php, 1.9, 1.10
cvs at intevation.de
cvs at intevation.de
Mon Aug 29 23:28:30 CEST 2005
- Previous message: steffen: server/kolab-webadmin/kolab-webadmin/www/admin/addressbook addr.php, 1.12, 1.13
- Next message: steffen: server/kolab-webadmin/kolab-webadmin/www/admin/user deliver.php, 1.1, 1.2 forward.php, 1.11, 1.12 user.php, 1.65, 1.66 vacation.php, 1.17, 1.18
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: steffen
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include
In directory doto:/tmp/cvs-serv9272/kolab-webadmin/php/admin/include
Modified Files:
form.class.php mysmarty.php
Log Message:
Fix for Issue915 (encoding problem)
Index: form.class.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/form.class.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- form.class.php 24 Jul 2005 21:47:41 -0000 1.22
+++ form.class.php 29 Aug 2005 21:28:28 -0000 1.23
@@ -77,11 +77,11 @@
$str .= '<tr>';
$str .= '<td>'.$value['name'].'</td>';
if( ereg( 'readonly', $value['attrs'] ) ) {
- $str .= '<td><p class="ctrl">'.htmlentities($value['value']).'</p><input name="'
- .$key.'" type="hidden" value="'.htmlentities($value['value']).'" /></td>';
+ $str .= '<td><p class="ctrl">'.MySmarty::htmlentities($value['value']).'</p><input name="'
+ .$key.'" type="hidden" value="'.MySmarty::htmlentities($value['value']).'" /></td>';
} else {
- $str .= '<td><input name="'.$key.'" type="'.$value['type'].'" value="'.htmlentities($value['value']).'" '
- .htmlentities($value['attrs']).' size="'.$size.'" /></td>';
+ $str .= '<td><input name="'.$key.'" type="'.$value['type'].'" value="'.MySmarty::htmlentities($value['value']).'" '
+ .MySmarty::htmlentities($value['attrs']).' size="'.$size.'" /></td>';
}
$str .= '<td>'.$value['comment'].'</td>';
$str .= '</tr>'."\n";
@@ -91,21 +91,21 @@
$str .= '<td>'.$value['name'].'</td>';
list($uname,$domain) = split('@',$value['value']);
if( ereg( 'readonly', $value['attrs'] ) ) {
- $str .= '<td><p class="ctrl">'.htmlentities($value['value']).'</p><input name="user_'.$key.'" type="hidden" value="'.
- htmlentities($uname).'" /><input name="domain_'.$key.'" type="hidden" value="'.
- htmlentities($domain).'" /></td>';
+ $str .= '<td><p class="ctrl">'.MySmarty::htmlentities($value['value']).'</p><input name="user_'.$key.'" type="hidden" value="'.
+ MySmarty::htmlentities($uname).'" /><input name="domain_'.$key.'" type="hidden" value="'.
+ MySmarty::htmlentities($domain).'" /></td>';
} else {
- $str .= '<td><input name="user_'.$key.'" type="text" value="'.htmlentities($uname).'" '
+ $str .= '<td><input name="user_'.$key.'" type="text" value="'.MySmarty::htmlentities($uname).'" '
.$value['attrs'].' size="'.($size-40).'" />';
if( count($value['domains']) == 1 ) {
- $str .= '<input name="domain_'.$key.'" type="hidden" value="'.htmlentities($value['domains'][0]).'" />';
- $str .= '<span class="ctrl">@'.htmlentities($value['domains'][0]).'</span></td>';
+ $str .= '<input name="domain_'.$key.'" type="hidden" value="'.MySmarty::htmlentities($value['domains'][0]).'" />';
+ $str .= '<span class="ctrl">@'.MySmarty::htmlentities($value['domains'][0]).'</span></td>';
} else {
$str .= '@<select name="domain_'.$key.'" '.$value['attrs']." >\n";
foreach( $value['domains'] as $dom ) {
if( $dom == $domain ) $s = 'selected';
else $s = '';
- $str .= '<option value="'.htmlentities($dom).'" '.$s.'>'.htmlentities($dom).'</option>'."\n";
+ $str .= '<option value="'.MySmarty::htmlentities($dom).'" '.$s.'>'.MySmarty::htmlentities($dom).'</option>'."\n";
}
$str .= '</select>';
$str .= '</td>';
@@ -125,9 +125,9 @@
$str .= '<tr>';
$str .= '<td>'.$value['name'].'</td>';
if( ereg( 'readonly', $value['attrs'] ) ) {
- $str .= '<td><p class="ctrl">'.htmlentities($value['value']).'</p></td>';
+ $str .= '<td><p class="ctrl">'.MySmarty::htmlentities($value['value']).'</p></td>';
} else {
- $str .= '<td><textarea name="'.$key.'" rows="5" cols="'.$size.'" '.$value['attrs'].' onkeypress="javascript:textareakeypress()">'.htmlentities($value['value']).'</textarea></td>';
+ $str .= '<td><textarea name="'.$key.'" rows="5" cols="'.$size.'" '.$value['attrs'].' onkeypress="javascript:textareakeypress()">'.MySmarty::htmlentities($value['value']).'</textarea></td>';
}
$str .= '<td>'.$value['comment'].'</td>';
$str .= '</tr>'."\n";
@@ -153,8 +153,8 @@
foreach( $value['options'] as $opt ) {
$checked = ( in_array($opt ,$value['value'] ))?"checked":"";
debug("Checking if $opt is in ".join(",",$value['value'])." :$checked");
- $str .= '<tr><td><input name="'.$key.'[]" type="checkbox" value="'.htmlentities($opt).'" '.$value['attrs']." $checked /></td><td>"
- .htmlentities($opt).'</td></tr>';
+ $str .= '<tr><td><input name="'.$key.'[]" type="checkbox" value="'.MySmarty::htmlentities($opt).'" '.$value['attrs']." $checked /></td><td>"
+ .MySmarty::htmlentities($opt).'</td></tr>';
}
$str .= '</table></td>';
}
@@ -165,15 +165,15 @@
$str .= '<tr>';
$str .= '<td>'.$value['name'].'</td>';
if( ereg( 'readonly', $value['attrs'] ) ) {
- $str .= '<td><p class="ctrl">'.htmlentities($value['options'][$value['value']]).
- '<input type="hidden" name="'.$key.'" value="'.htmlentities($value['value']).'" /></p></td>';
+ $str .= '<td><p class="ctrl">'.MySmarty::htmlentities($value['options'][$value['value']]).
+ '<input type="hidden" name="'.$key.'" value="'.MySmarty::htmlentities($value['value']).'" /></p></td>';
} else {
$str .= '<td><select name="'.$key.'" '.$value['attrs'].' >'."\n";
for( $i = 0; $i < count($value['options']); ++$i) {
if( $i == $value['value'] ) $s = 'selected';
else $s = '';
- $str .= '<option value="'.$i.'" '.$s.'>'.htmlentities($value['options'][$i]).'</option>'."\n";
+ $str .= '<option value="'.$i.'" '.$s.'>'.MySmarty::htmlentities($value['options'][$i]).'</option>'."\n";
}
$str .= '</select>';
$str .= '</td>';
@@ -185,10 +185,10 @@
$str .= '<tr>';
$str .= '<td>'.$value['name'].'</td>';
if( ereg( 'readonly', $value['attrs'] ) ) {
- if( $value['user'] ) $str .= '<td><span class="ctrl">'.htmlentities($value['user']).'</span> <span class="ctrl">'.$value['perm'].'</span></td>';
+ if( $value['user'] ) $str .= '<td><span class="ctrl">'.MySmarty::htmlentities($value['user']).'</span> <span class="ctrl">'.$value['perm'].'</span></td>';
} else {
$str .= '<td><input name="user_'.$key.'" type="'.$value['type'].'" size="'.($size-15).'" value="'
- .htmlentities($value['user']).'" '.$value['attrs'].' />';
+ .MySmarty::htmlentities($value['user']).'" '.$value['attrs'].' />';
$str .= '<select name="perm_'.$key.'">'."\n";
if( $value['perm'] ) $selected_perm = $value['perm'];
else $selected_perm = 'all';
@@ -235,15 +235,15 @@
if( !$user ) continue;
$str .= '<tr><td>';
if( $user == 'anyone' ) $str .= '<p class="ctrl">'._('Anyone').'</p>';
- else $str .= '<p class="ctrl">'.htmlentities($user).'</p>';
- $str .= '</td><td><p class="ctrl">'.htmlentities($policies[$pol]).'</p></td></tr>'."\n";
+ else $str .= '<p class="ctrl">'.MySmarty::htmlentities($user).'</p>';
+ $str .= '</td><td><p class="ctrl">'.MySmarty::htmlentities($policies[$pol]).'</p></td></tr>'."\n";
} else {
$str .= '<tr><td>';
if( $user == 'anyone' ) {
- $str .= _('Anyone').'<input type="hidden" name="user_'.$key.'_'.$i.'" value="'.htmlentities($user).'" '.$value['attrs'].' />';
+ $str .= _('Anyone').'<input type="hidden" name="user_'.$key.'_'.$i.'" value="'.MySmarty::htmlentities($user).'" '.$value['attrs'].' />';
} else {
$str .= '<input name="user_'.$key.'_'.$i.'" type="text" size="'.($size-20)
- .'" value="'.htmlentities($user).'" '.$value['attrs'].' />';
+ .'" value="'.MySmarty::htmlentities($user).'" '.$value['attrs'].' />';
}
$str .= '</td><td><select name="policy_'.$key.'_'.$i.'">'."\n";
$j = 0;
@@ -272,7 +272,7 @@
if( !isset( $value['comment'] ) ) $value['comment'] = '';
if( !isset( $value['attrs'] ) ) $value['attrs'] = '';
if( $value['type'] == 'hidden' ) {
- $str .= '<input name="'.$key.'" type="hidden" value="'.htmlentities($value['value']).'" '.$value['attrs'].' />';
+ $str .= '<input name="'.$key.'" type="hidden" value="'.MySmarty::htmlentities($value['value']).'" '.$value['attrs'].' />';
}
}
$str .= '</form>';
Index: mysmarty.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/mysmarty.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- mysmarty.php 10 Aug 2005 07:40:08 -0000 1.9
+++ mysmarty.php 29 Aug 2005 21:28:28 -0000 1.10
@@ -67,6 +67,12 @@
'code' => 'nl_NL' )
));
}
+
+
+ /** UTF-8 friendly htmlentities() */
+ /* static */ function htmlentities( $str ) {
+ return htmlentities( $str, ENT_QUOTES, "UTF-8");
+ }
};
/*
- Previous message: steffen: server/kolab-webadmin/kolab-webadmin/www/admin/addressbook addr.php, 1.12, 1.13
- Next message: steffen: server/kolab-webadmin/kolab-webadmin/www/admin/user deliver.php, 1.1, 1.2 forward.php, 1.11, 1.12 user.php, 1.65, 1.66 vacation.php, 1.17, 1.18
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the commits
mailing list