|
@@ -66,14 +66,18 @@ import php.*;
|
|
|
}
|
|
|
|
|
|
public static function rpad( s : String, c : String, l : Int ) : String {
|
|
|
- if (c.length == 0 || s.length >= l) return s;
|
|
|
- var padLength = Math.ceil((l - s.length) / c.length) * c.length + s.length;
|
|
|
+ var cLength = c.length;
|
|
|
+ var sLength = s.length;
|
|
|
+ if (cLength == 0 || sLength >= l) return s;
|
|
|
+ var padLength = Math.ceil((l - sLength) / cLength) * cLength + sLength;
|
|
|
return Global.str_pad(s, padLength, c, Const.STR_PAD_RIGHT);
|
|
|
}
|
|
|
|
|
|
public static function lpad( s : String, c : String, l : Int ) : String {
|
|
|
- if (c.length == 0 || s.length >= l) return s;
|
|
|
- var padLength = Math.ceil((l - s.length) / c.length) * c.length + s.length;
|
|
|
+ var cLength = c.length;
|
|
|
+ var sLength = s.length;
|
|
|
+ if (cLength == 0 || sLength >= l) return s;
|
|
|
+ var padLength = Math.ceil((l - sLength) / cLength) * cLength + sLength;
|
|
|
return Global.str_pad(s, padLength, c, Const.STR_PAD_LEFT);
|
|
|
}
|
|
|
|
|
@@ -87,7 +91,7 @@ import php.*;
|
|
|
public static function hex( n : Int, ?digits : Int ) : String {
|
|
|
var s = Global.dechex(n);
|
|
|
var len = 8;
|
|
|
- if (s.length > (null == digits ? len : (len = digits > len ? digits : len)))
|
|
|
+ if (Global.strlen(s) > (null == digits ? len : (len = digits > len ? digits : len)))
|
|
|
s = s.substr(-len);
|
|
|
else if ( digits != null )
|
|
|
s = lpad(s, '0', digits);
|