aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Hu <jimhu@users.sourceforge.net>2008-12-23 10:20:50 +0000
committerJim Hu <jimhu@users.sourceforge.net>2008-12-23 10:20:50 +0000
commit3c5cbd014bb23c77129dea9d30a6f592289b5572 (patch)
treeaec074f3ce0908d7bffcb960428c5b628fbe6808
parent4a6873ff761aeb775cf57ed30e13dbf6caf64b4d (diff)
downloadphpicalendar-3c5cbd014bb23c77129dea9d30a6f592289b5572.tar.gz
phpicalendar-3c5cbd014bb23c77129dea9d30a6f592289b5572.tar.bz2
phpicalendar-3c5cbd014bb23c77129dea9d30a6f592289b5572.zip
bug fixes from tracker
Diffstat
-rw-r--r--functions/draw_functions.php32
-rw-r--r--templates/default/sidebar.tpl2
-rw-r--r--templates/default/sidebar_year.tpl2
-rw-r--r--templates/green/sidebar.tpl2
-rw-r--r--templates/grey/sidebar.tpl2
-rw-r--r--templates/red/sidebar.tpl2
-rw-r--r--templates/red/sidebar_year.tpl2
-rw-r--r--templates/tan/sidebar.tpl2
8 files changed, 37 insertions, 9 deletions
diff --git a/functions/draw_functions.php b/functions/draw_functions.php
index cc1c363..a5a98a9 100644
--- a/functions/draw_functions.php
+++ b/functions/draw_functions.php
@@ -40,8 +40,36 @@ function drawEventTimes ($start, $end) {
function word_wrap($str, $length, $lines=0) {
if ($lines > 0) {
$len = $length * $lines;
- if ($len < strlen($str)) {
- $str = substr($str,0,$len).'...';
+ //if ($len < strlen($str)) {
+ // $str = substr($str,0,$len).'...';
+ //}
+ $rstr=bite_str($str,0,$len+1);
+ }
+ return $rstr;
+}
+
+// String intercept By Bleakwind
+// utf-8:$byte=3 | gb2312:$byte=2 | big5:$byte=2
+function bite_str($string, $start, $len, $byte=3){
+ $str = "";
+ $count = 0;
+ $str_len = strlen($string);
+ for ($i=0; $i<$str_len; $i++) {
+ if (($count+1-$start)>$len) {
+ $str .= "...";
+ break;
+ } elseif ((ord(substr($string,$i,1)) <= 128) && ($count < $start)){
+ $count++;
+ } elseif ((ord(substr($string,$i,1)) > 128) && ($count < $start)){
+ $count = $count+2;
+ $i = $i+$byte-1;
+ } elseif ((ord(substr($string,$i,1)) <= 128) && ($count >= $start)){
+ $str .= substr($string,$i,1);
+ $count++;
+ } elseif ((ord(substr($string,$i,1)) > 128) && ($count >= $start)){
+ $str .= substr($string,$i,$byte);
+ $count = $count+2;
+ $i = $i+$byte-1;
}
}
return $str;
diff --git a/templates/default/sidebar.tpl b/templates/default/sidebar.tpl
index e5aa36a..8a96ae6 100644
--- a/templates/default/sidebar.tpl
+++ b/templates/default/sidebar.tpl
@@ -23,7 +23,7 @@
<td bgcolor="#FFFFFF" align="right" valign="middle"><div style="padding-right: 5px; padding-bottom: 5px;"><input type="password" name="password" size="10" /></div></td>
</tr>
<tr>
- <td bgcolor="#FFFFFF" align="center" valign="middle" colspan="2"><div style=padding-left: 5px; padding-bottom: 5px;"><input type="submit" value="{L_LOGIN}" /></div></td>
+ <td bgcolor="#FFFFFF" align="center" valign="middle" colspan="2"><div style="padding-left: 5px; padding-bottom: 5px;"><input type="submit" value="{L_LOGIN}" /></div></td>
</tr>
</table>
</form>
diff --git a/templates/default/sidebar_year.tpl b/templates/default/sidebar_year.tpl
index f4b40d9..bdbb2d3 100644
--- a/templates/default/sidebar_year.tpl
+++ b/templates/default/sidebar_year.tpl
@@ -23,7 +23,7 @@
<td bgcolor="#FFFFFF" align="right" valign="middle"><div style="padding-right: 5px; padding-bottom: 5px;"><input type="password" name="password" size="10" /></div></td>
</tr>
<tr>
- <td bgcolor="#FFFFFF" align="center" valign="middle" colspan="2"><div style=padding-left: 5px; padding-bottom: 5px;"><input type="submit" value="{L_LOGIN}" /></div></td>
+ <td bgcolor="#FFFFFF" align="center" valign="middle" colspan="2"><div style="padding-left: 5px; padding-bottom: 5px;"><input type="submit" value="{L_LOGIN}" /></div></td>
</tr>
</table>
</form>
diff --git a/templates/green/sidebar.tpl b/templates/green/sidebar.tpl
index e5aa36a..8a96ae6 100644
--- a/templates/green/sidebar.tpl
+++ b/templates/green/sidebar.tpl
@@ -23,7 +23,7 @@
<td bgcolor="#FFFFFF" align="right" valign="middle"><div style="padding-right: 5px; padding-bottom: 5px;"><input type="password" name="password" size="10" /></div></td>
</tr>
<tr>
- <td bgcolor="#FFFFFF" align="center" valign="middle" colspan="2"><div style=padding-left: 5px; padding-bottom: 5px;"><input type="submit" value="{L_LOGIN}" /></div></td>
+ <td bgcolor="#FFFFFF" align="center" valign="middle" colspan="2"><div style="padding-left: 5px; padding-bottom: 5px;"><input type="submit" value="{L_LOGIN}" /></div></td>
</tr>
</table>
</form>
diff --git a/templates/grey/sidebar.tpl b/templates/grey/sidebar.tpl
index e5aa36a..8a96ae6 100644
--- a/templates/grey/sidebar.tpl
+++ b/templates/grey/sidebar.tpl
@@ -23,7 +23,7 @@
<td bgcolor="#FFFFFF" align="right" valign="middle"><div style="padding-right: 5px; padding-bottom: 5px;"><input type="password" name="password" size="10" /></div></td>
</tr>
<tr>
- <td bgcolor="#FFFFFF" align="center" valign="middle" colspan="2"><div style=padding-left: 5px; padding-bottom: 5px;"><input type="submit" value="{L_LOGIN}" /></div></td>
+ <td bgcolor="#FFFFFF" align="center" valign="middle" colspan="2"><div style="padding-left: 5px; padding-bottom: 5px;"><input type="submit" value="{L_LOGIN}" /></div></td>
</tr>
</table>
</form>
diff --git a/templates/red/sidebar.tpl b/templates/red/sidebar.tpl
index e5aa36a..8a96ae6 100644
--- a/templates/red/sidebar.tpl
+++ b/templates/red/sidebar.tpl
@@ -23,7 +23,7 @@
<td bgcolor="#FFFFFF" align="right" valign="middle"><div style="padding-right: 5px; padding-bottom: 5px;"><input type="password" name="password" size="10" /></div></td>
</tr>
<tr>
- <td bgcolor="#FFFFFF" align="center" valign="middle" colspan="2"><div style=padding-left: 5px; padding-bottom: 5px;"><input type="submit" value="{L_LOGIN}" /></div></td>
+ <td bgcolor="#FFFFFF" align="center" valign="middle" colspan="2"><div style="padding-left: 5px; padding-bottom: 5px;"><input type="submit" value="{L_LOGIN}" /></div></td>
</tr>
</table>
</form>
diff --git a/templates/red/sidebar_year.tpl b/templates/red/sidebar_year.tpl
index f4b40d9..bdbb2d3 100644
--- a/templates/red/sidebar_year.tpl
+++ b/templates/red/sidebar_year.tpl
@@ -23,7 +23,7 @@
<td bgcolor="#FFFFFF" align="right" valign="middle"><div style="padding-right: 5px; padding-bottom: 5px;"><input type="password" name="password" size="10" /></div></td>
</tr>
<tr>
- <td bgcolor="#FFFFFF" align="center" valign="middle" colspan="2"><div style=padding-left: 5px; padding-bottom: 5px;"><input type="submit" value="{L_LOGIN}" /></div></td>
+ <td bgcolor="#FFFFFF" align="center" valign="middle" colspan="2"><div style="padding-left: 5px; padding-bottom: 5px;"><input type="submit" value="{L_LOGIN}" /></div></td>
</tr>
</table>
</form>
diff --git a/templates/tan/sidebar.tpl b/templates/tan/sidebar.tpl
index e5aa36a..8a96ae6 100644
--- a/templates/tan/sidebar.tpl
+++ b/templates/tan/sidebar.tpl
@@ -23,7 +23,7 @@
<td bgcolor="#FFFFFF" align="right" valign="middle"><div style="padding-right: 5px; padding-bottom: 5px;"><input type="password" name="password" size="10" /></div></td>
</tr>
<tr>
- <td bgcolor="#FFFFFF" align="center" valign="middle" colspan="2"><div style=padding-left: 5px; padding-bottom: 5px;"><input type="submit" value="{L_LOGIN}" /></div></td>
+ <td bgcolor="#FFFFFF" align="center" valign="middle" colspan="2"><div style="padding-left: 5px; padding-bottom: 5px;"><input type="submit" value="{L_LOGIN}" /></div></td>
</tr>
</table>
</form>

© 2014-2024 Faster IT GmbH | imprint | privacy policy