Merge pull request #4195 from zeroadam/ContactSelector-#3878

[friendica.git] / include / datetime.php

diff --git a/include/datetime.php b/include/datetime.php
index 3578698240053115ea3c5f9738ee98deb082bdd0..1c9510c3303bfab6b472f17023c0665e3cc2a68f 100644 (file)
--- a/include/datetime.php
+++ b/include/datetime.php
@@ -5,6 +5,8 @@
  */
 
 use Friendica\Core\Config;
+use Friendica\Core\PConfig;
+use Friendica\Database\DBM;
 
 /**
  * @brief Two-level sort for timezones.
@@ -175,13 +177,10 @@ function datetime_convert($from = 'UTC', $to = 'UTC', $s = 'now', $fmt = "Y-m-d
  * @param string $dob Date of Birth
  * @return string Formatted html
  */
-function dob($dob) {
-       list($year,$month,$day) = sscanf($dob,'%4d-%2d-%2d');
+function dob($dob)
+{
+       list($year, $month, $day) = sscanf($dob, '%4d-%2d-%2d');
 
-       $f = get_config('system', 'birthday_input_format');
-       if (! $f) {
-               $f = 'ymd';
-       }
        if ($dob <= '0001-01-01') {
                $value = '';
        } else {
@@ -213,8 +212,6 @@ function dob($dob) {
 /**
  * @brief Returns a date selector
  *
- * @param string $format
- *  Format string, e.g. 'ymd' or 'mdy'. Not currently supported
  * @param string $min
  *  Unix timestamp of minimum date
  * @param string $max
@@ -226,15 +223,14 @@ function dob($dob) {
  *
  * @return string Parsed HTML output.
  */
-function datesel($format, $min, $max, $default, $id = 'datepicker') {
-       return datetimesel($format, $min, $max, $default, '', $id, true, false, '', '');
+function datesel($min, $max, $default, $id = 'datepicker')
+{
+       return datetimesel($min, $max, $default, '', $id, true, false, '', '');
 }
 
 /**
  * @brief Returns a time selector
  *
- * @param string $format
- *  Format string, e.g. 'ymd' or 'mdy'. Not currently supported
  * @param $h
  *  Already selected hour
  * @param $m
@@ -244,15 +240,14 @@ function datesel($format, $min, $max, $default, $id = 'datepicker') {
  *
  * @return string Parsed HTML output.
  */
-function timesel($format, $h, $m, $id = 'timepicker') {
-       return datetimesel($format, new DateTime(), new DateTime(), new DateTime("$h:$m"), '', $id, false, true);
+function timesel($h, $m, $id = 'timepicker')
+{
+       return datetimesel(new DateTime(), new DateTime(), new DateTime("$h:$m"), '', $id, false, true);
 }
 
 /**
  * @brief Returns a datetime selector.
  *
- * @param string $format
- *  format string, e.g. 'ymd' or 'mdy'. Not currently supported
  * @param string $min
  *  unix timestamp of minimum date
  * @param string $max
@@ -276,13 +271,10 @@ function timesel($format, $h, $m, $id = 'timepicker') {
  * @todo Once browser support is better this could probably be replaced with
  * native HTML5 date picker.
  */
-function datetimesel($format, $min, $max, $default, $label, $id = 'datetimepicker', $pickdate = true, $picktime = true, $minfrom = '', $maxfrom = '', $required = false) {
-
+function datetimesel($min, $max, $default, $label, $id = 'datetimepicker', $pickdate = true, $picktime = true, $minfrom = '', $maxfrom = '', $required = false)
+{
        // First day of the week (0 = Sunday)
-       $firstDay = get_pconfig(local_user(), 'system', 'first_day_of_week');
-       if ($firstDay === false) {
-               $firstDay=0;
-       }
+       $firstDay = PConfig::get(local_user(), 'system', 'first_day_of_week', 0);
 
        $lang = substr(get_browser_language(), 0, 2);
 
@@ -494,18 +486,18 @@ function get_first_dim($y,$m) {
  * altering td class.
  * Months count from 1.
  *
- * @param int $y Year
- * @param int $m Month
- * @param bool $links (default false)
+ * @param int    $y Year
+ * @param int    $m Month
+ * @param array  $links (default null)
  * @param string $class
  *
  * @return string
  *
  * @todo Provide (prev,next) links, define class variations for different size calendars
  */
-function cal($y = 0,$m = 0, $links = false, $class='') {
+function cal($y = 0, $m = 0, $links = null, $class = '')
+{
        // month table - start at 1 to match human usage.
-
        $mtab = array(' ',
                'January', 'February', 'March',
                'April'  , 'May'     , 'June',
@@ -513,18 +505,19 @@ function cal($y = 0,$m = 0, $links = false, $class='') {
                'October', 'November', 'December'
        );
 
-       $thisyear = datetime_convert('UTC', date_default_timezone_get(), 'now','Y');
-       $thismonth = datetime_convert('UTC', date_default_timezone_get(), 'now','m');
-       if (! $y) {
+       $thisyear = datetime_convert('UTC', date_default_timezone_get(), 'now', 'Y');
+       $thismonth = datetime_convert('UTC', date_default_timezone_get(), 'now', 'm');
+       if (!$y) {
                $y = $thisyear;
        }
-       if (! $m) {
+
+       if (!$m) {
                $m = intval($thismonth);
        }
 
        $dn = array('Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday');
-       $f = get_first_dim($y,$m);
-       $l = get_dim($y,$m);
+       $f = get_first_dim($y, $m);
+       $l = get_dim($y, $m);
        $d = 1;
        $dow = 0;
        $started = false;
@@ -551,8 +544,8 @@ function cal($y = 0,$m = 0, $links = false, $class='') {
                $o .= "<td $today>";
                $day = str_replace(' ', '&nbsp;', sprintf('%2.2d', $d));
                if ($started) {
-                       if (is_array($links) && isset($links[$d])) {
-                               $o .=  "<a href=\"{$links[$d]}\">$day</a>";
+                       if (x($links, $d) !== false) {
+                               $o .= "<a href=\"{$links[$d]}\">$day</a>";
                        } else {
                                $o .= $day;
                        }
@@ -575,7 +568,7 @@ function cal($y = 0,$m = 0, $links = false, $class='') {
                }
        }
 
-       $o .= '</tr></table>'."\r\n";
+       $o .= '</tr></table>' . "\r\n";
 
        return $o;
 }
@@ -591,7 +584,7 @@ function update_contact_birthdays() {
        // In-network birthdays are handled within local_delivery
 
        $r = q("SELECT * FROM `contact` WHERE `bd` != '' AND `bd` > '0001-01-01' AND SUBSTRING(`bd`, 1, 4) != `bdyear` ");
-       if (dbm::is_result($r)) {
+       if (DBM::is_result($r)) {
                foreach ($r as $rr) {
 
                        logger('update_contact_birthday: ' . $rr['bd']);
@@ -613,14 +606,14 @@ function update_contact_birthdays() {
                                dbesc(datetime_convert('UTC','UTC', $nextbd)),
                                dbesc('birthday'));
 
-                       if (dbm::is_result($s)) {
+                       if (DBM::is_result($s)) {
                                continue;
                        }
 
                        $bdtext = sprintf( t('%s\'s birthday'), $rr['name']);
                        $bdtext2 = sprintf( t('Happy Birthday %s'), ' [url=' . $rr['url'] . ']' . $rr['name'] . '[/url]') ;
 
-                       $r = q("INSERT INTO `event` (`uid`,`cid`,`created`,`edited`,`start`,`finish`,`summary`,`desc`,`type`,`adjust`)
+                       q("INSERT INTO `event` (`uid`,`cid`,`created`,`edited`,`start`,`finish`,`summary`,`desc`,`type`,`adjust`)
                                VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%d' ) ",
                                intval($rr['uid']),
                                intval($rr['id']),