diff options
| author | root <root@diekershoff.homeunix.net> | 2011-01-18 11:14:28 +0100 |
|---|---|---|
| committer | root <root@diekershoff.homeunix.net> | 2011-01-18 11:14:28 +0100 |
| commit | 13fa27f7578d292d8d722554ce6211e8e0bc91af (patch) | |
| tree | 2377a23718c3406206f03b65aad2a9f5b1eb8b12 /boot.php | |
| parent | 3323f256c35ceb30a4b2ac1984a2eded672eb33f (diff) | |
| parent | 028460a5c1de4833bb1dcfaa945c1292952bf923 (diff) | |
| download | volse-hubzilla-13fa27f7578d292d8d722554ce6211e8e0bc91af.tar.gz volse-hubzilla-13fa27f7578d292d8d722554ce6211e8e0bc91af.tar.bz2 volse-hubzilla-13fa27f7578d292d8d722554ce6211e8e0bc91af.zip | |
Merge branch 'master' of git://github.com/friendika/friendika
Diffstat (limited to 'boot.php')
| -rw-r--r-- | boot.php | 15 |
1 files changed, 10 insertions, 5 deletions
@@ -2,8 +2,8 @@ set_time_limit(0); -define ( 'BUILD_ID', 1031 ); -define ( 'FRIENDIKA_VERSION', '2.01.1000' ); +define ( 'BUILD_ID', 1032 ); +define ( 'FRIENDIKA_VERSION', '2.01.1003' ); define ( 'DFRN_PROTOCOL_VERSION', '2.0' ); define ( 'EOL', "<br />\r\n" ); @@ -910,7 +910,6 @@ function xmlify($str) { case "'" : $buffer .= '''; break; - case "\"" : $buffer .= '"'; break; @@ -946,6 +945,11 @@ function unxmlify($s) { if(! function_exists('hex2bin')) { function hex2bin($s) { + if(! ctype_xdigit($s)) { + logger('hex2bin: illegal input: ' . print_r(debug_backtrace(), true)); + return($s); + } + return(pack("H*",$s)); }} @@ -2164,11 +2168,12 @@ function get_birthdays() { foreach($r as $rr) { $now = strtotime('now'); - $today = (((strtotime($rr['start']) < $now) && (strtotime($rr['finish']) > $now)) ? true : false); + $today = (((strtotime($rr['start'] . ' +00:00') < $now) && (strtotime($rr['finish'] . ' +00:00') > $now)) ? true : false); $o .= '<div class="birthday-list" id="birthday-' . $rr['eid'] . '"><a class="sparkle" href="' . $a->get_baseurl() . '/redir/' . $rr['cid'] . '">' . $rr['name'] . '</a> ' - . day_translate(datetime_convert('UTC', $a->timezone, $rr['start'], $bd_format)) . (($today) ? ' ' . t('[today]') : '') ; + . day_translate(datetime_convert('UTC', $a->timezone, $rr['start'], $bd_format)) . (($today) ? ' ' . t('[today]') : '') + . '</div>' ; } $o .= '</div>'; |