X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fcal.php;h=3a229ebadb607d1424e5f9300b20eefac06e1b05;hb=743378129b82a99ee5b59ca9ad0646ccd813d7df;hp=ab20617257160722047ef9906022add163986165;hpb=826a13eb23a2eb166a2637f79336903919cbc18c;p=friendica.git diff --git a/mod/cal.php b/mod/cal.php index ab20617257..3a229ebadb 100644 --- a/mod/cal.php +++ b/mod/cal.php @@ -40,10 +40,7 @@ function cal_init(&$a) { $profile = get_profiledata_by_nick($nick, $a->profile_uid); - if((intval($profile['page-flags']) == PAGE_COMMUNITY) || (intval($profile['page-flags']) == PAGE_PRVGROUP)) - $account_type = t('Forum'); - else - $account_type = ""; + $account_type = account_type($profile); $tpl = get_markup_template("vcard-widget.tpl"); @@ -201,8 +198,8 @@ function cal_content(&$a) { if ($a->argv[2] === 'json'){ - if (x($_GET,'start')) $start = date("Y-m-d h:i:s", $_GET['start']); - if (x($_GET,'end')) $finish = date("Y-m-d h:i:s", $_GET['end']); + if (x($_GET,'start')) $start = $_GET['start']; + if (x($_GET,'end')) $finish = $_GET['end']; } $start = datetime_convert('UTC','UTC',$start); @@ -256,7 +253,7 @@ function cal_content(&$a) { $tpl = get_markup_template("event.tpl"); } else { // if (get_config('experimentals','new_calendar')==1){ - $tpl = get_markup_template("events-js.tpl"); + $tpl = get_markup_template("events_js.tpl"); // } else { // $tpl = get_markup_template("events.tpl"); // } @@ -287,8 +284,7 @@ function cal_content(&$a) { "month" => t("month"), "week" => t("week"), "day" => t("day"), - - + "list" => t("list"), )); if (x($_GET,'id')){ echo $o; killme(); }