*/
use Friendica\Core\Config;
+use Friendica\Core\L10n;
use Friendica\Core\PConfig;
+use Friendica\Database\DBM;
/**
* @brief Two-level sort for timezones.
*/
function timezone_cmp($a, $b) {
if (strstr($a, '/') && strstr($b, '/')) {
- if ( t($a) == t($b)) {
+ if (L10n::t($a) == L10n::t($b)) {
return 0;
}
- return ( t($a) < t($b)) ? -1 : 1;
+ return (L10n::t($a) < L10n::t($b)) ? -1 : 1;
}
if (strstr($a, '/')) {
return -1;
} elseif (strstr($b, '/')) {
return 1;
- } elseif ( t($a) == t($b)) {
+ } elseif (L10n::t($a) == L10n::t($b)) {
return 0;
}
- return ( t($a) < t($b)) ? -1 : 1;
+ return (L10n::t($a) < L10n::t($b)) ? -1 : 1;
}
/**
$o .= '</optgroup>';
}
$continent = $ex[0];
- $o .= '<optgroup label="' . t($continent) . '">';
+ $o .= '<optgroup label="' . L10n::t($continent) . '">';
}
if (count($ex) > 2) {
$city = substr($value,strpos($value,'/')+1);
}
} else {
$city = $ex[0];
- if ($continent != t('Miscellaneous')) {
+ if ($continent != L10n::t('Miscellaneous')) {
$o .= '</optgroup>';
- $continent = t('Miscellaneous');
- $o .= '<optgroup label="' . t($continent) . '">';
+ $continent = L10n::t('Miscellaneous');
+ $o .= '<optgroup label="' . L10n::t($continent) . '">';
}
}
- $city = str_replace('_', ' ', t($city));
+ $city = str_replace('_', ' ', L10n::t($city));
$selected = (($value == $current) ? " selected=\"selected\" " : "");
$o .= "<option value=\"$value\" $selected >$city</option>";
}
$options = str_replace('</select>','', $options);
$tpl = get_markup_template('field_select_raw.tpl');
- return replace_macros($tpl, array(
- '$field' => array($name, $label, $current, $help, $options),
- ));
+ return replace_macros($tpl, [
+ '$field' => [$name, $label, $current, $help, $options],
+ ]);
}
* @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 = Config::get('system', 'birthday_input_format');
- if (! $f) {
- $f = 'ymd';
- }
if ($dob <= '0001-01-01') {
$value = '';
} else {
$age = ((intval($value)) ? age($value, $a->user["timezone"], $a->user["timezone"]) : "");
- $o = replace_macros(get_markup_template("field_input.tpl"), array(
- '$field' => array(
+ $o = replace_macros(get_markup_template("field_input.tpl"), [
+ '$field' => [
'dob',
t('Birthday:'),
$value,
- (((intval($age)) > 0 ) ? t('Age: ') . $age : ""),
+ (((intval($age)) > 0 ) ? L10n::t('Age: ') . $age : ""),
'',
- 'placeholder="' . t('YYYY-MM-DD or MM-DD') . '"'
- )
- ));
+ 'placeholder="' . L10n::t('YYYY-MM-DD or MM-DD') . '"'
+ ]
+ ]);
/// @TODO Old-lost code?
-// if ($dob && $dob > '0001-01-01')
-// $o = datesel($f,mktime(0,0,0,0,0,1900),mktime(),mktime(0,0,0,$month,$day,$year), 'dob');
-// else
-// $o = datesel($f,mktime(0,0,0,0,0,1900),mktime(),false,'dob');
+ // if ($dob && $dob > '0001-01-01')
+ // $o = datesel($f,mktime(0,0,0,0,0,1900),mktime(),mktime(0,0,0,$month,$day,$year), 'dob');
+ // else
+ // $o = datesel($f,mktime(0,0,0,0,0,1900),mktime(),false,'dob');
return $o;
}
/**
* @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
*
* @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
*
* @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
* @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 = PConfig::get(local_user(), 'system', 'first_day_of_week', 0);
- $lang = substr(get_browser_language(), 0, 2);
+ $lang = substr(L10n::getBrowserLanguage(), 0, 2);
// Check if the detected language is supported by the picker
- if (!in_array($lang, array("ar", "ro", "id", "bg", "fa", "ru", "uk", "en", "el", "de", "nl", "tr", "fr", "es", "th", "pl", "pt", "ch", "se", "kr", "it", "da", "no", "ja", "vi", "sl", "cs", "hu"))) {
+ if (!in_array($lang, ["ar", "ro", "id", "bg", "fa", "ru", "uk", "en", "el", "de", "nl", "tr", "fr", "es", "th", "pl", "pt", "ch", "se", "kr", "it", "da", "no", "ja", "vi", "sl", "cs", "hu"])) {
$lang = Config::get('system', 'language', 'en');
}
$readable_format = str_replace('i','MM',$readable_format);
$tpl = get_markup_template('field_input.tpl');
- $o .= replace_macros($tpl, array(
- '$field' => array($id, $label, $input_text, '', (($required) ? '*' : ''), 'placeholder="' . $readable_format . '"'),
- ));
+ $o .= replace_macros($tpl, [
+ '$field' => [$id, $label, $input_text, '', (($required) ? '*' : ''), 'placeholder="' . $readable_format . '"'],
+ ]);
$o .= "<script type='text/javascript'>";
$o .= "\$(function () {var picker = \$('#id_$id').datetimepicker({step:5,format:'$dateformat' $minjs $maxjs $pickers $defaultdatejs}); $extra_js})";
$abs = strtotime($localtime);
- if (is_null($posted_date) || $posted_date <= NULL_DATE || $abs === False) {
- return t('never');
+ if (is_null($posted_date) || $posted_date <= NULL_DATE || $abs === false) {
+ return L10n::t('never');
}
$etime = time() - $abs;
if ($etime < 1) {
- return t('less than a second ago');
+ return L10n::t('less than a second ago');
}
- $a = array( 12 * 30 * 24 * 60 * 60 => array( t('year'), t('years')),
- 30 * 24 * 60 * 60 => array( t('month'), t('months')),
- 7 * 24 * 60 * 60 => array( t('week'), t('weeks')),
- 24 * 60 * 60 => array( t('day'), t('days')),
- 60 * 60 => array( t('hour'), t('hours')),
- 60 => array( t('minute'), t('minutes')),
- 1 => array( t('second'), t('seconds'))
- );
+ $a = [ 12 * 30 * 24 * 60 * 60 => [L10n::t('year'), L10n::t('years')],
+ 30 * 24 * 60 * 60 => [L10n::t('month'), L10n::t('months')],
+ 7 * 24 * 60 * 60 => [L10n::t('week'), L10n::t('weeks')],
+ 24 * 60 * 60 => [L10n::t('day'), L10n::t('days')],
+ 60 * 60 => [L10n::t('hour'), L10n::t('hours')],
+ 60 => [L10n::t('minute'), L10n::t('minutes')],
+ 1 => [L10n::t('second'), L10n::t('seconds')]
+ ];
foreach ($a as $secs => $str) {
$d = $etime / $secs;
$r = round($d);
// translators - e.g. 22 hours ago, 1 minute ago
if (!$format) {
- $format = t('%1$d %2$s ago');
+ $format = L10n::t('%1$d %2$s ago');
}
return sprintf($format, $r, (($r == 1) ? $str[0] : $str[1]));
*/
function get_dim($y, $m) {
- $dim = array( 0,
+ $dim = [ 0,
31, 28, 31, 30, 31, 30,
- 31, 31, 30, 31, 30, 31);
+ 31, 31, 30, 31, 30, 31];
if ($m != 2) {
return $dim[$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(' ',
+ $mtab = [' ',
'January', 'February', 'March',
'April' , 'May' , 'June',
'July' , 'August' , 'September',
'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);
+ $dn = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'];
+ $f = get_first_dim($y, $m);
+ $l = get_dim($y, $m);
$d = 1;
$dow = 0;
$started = false;
$o .= "<td $today>";
$day = str_replace(' ', ' ', 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;
}
}
}
- $o .= '</tr></table>'."\r\n";
+ $o .= '</tr></table>' . "\r\n";
return $o;
}
// 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']);
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]') ;
+ $bdtext = sprintf(L10n::t('%s\'s birthday'), $rr['name']);
+ $bdtext2 = sprintf(L10n::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']),
projects / friendica.git / blobdiff