From cdff732044805964eebac84e17ef057c36045dae Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Tue, 4 Apr 2017 19:47:32 +0200
Subject: [PATCH] added spaces + some curly braces + some usage of
dbm::is_result()
Signed-off-by: Roland Haeder <roland@mxchange.org>
---
include/datetime.php | 51 +++++++++++++++++++++-----------------------
include/event.php | 1 +
2 files changed, 25 insertions(+), 27 deletions(-)
diff --git a/include/datetime.php b/include/datetime.php
index da454a32a5..a840aa0a58 100644
--- a/include/datetime.php
+++ b/include/datetime.php
@@ -178,7 +178,7 @@ function datetime_convert($from = 'UTC', $to = 'UTC', $s = 'now', $fmt = "Y-m-d
function dob($dob) {
list($year,$month,$day) = sscanf($dob,'%4d-%2d-%2d');
- $f = get_config('system','birthday_input_format');
+ $f = get_config('system', 'birthday_input_format');
if (! $f) {
$f = 'ymd';
}
@@ -203,7 +203,7 @@ function dob($dob) {
/// @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');
+// $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');
@@ -279,7 +279,7 @@ function timesel($format, $h, $m, $id = 'timepicker') {
function datetimesel($format, $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');
+ $firstDay = get_pconfig(local_user(), 'system', 'first_day_of_week');
if ($firstDay === false) {
$firstDay=0;
}
@@ -312,14 +312,14 @@ function datetimesel($format, $min, $max, $default, $label, $id = 'datetimepicke
$pickers = '';
if (!$pickdate) {
- $pickers .= ',datepicker: false';
+ $pickers .= ', datepicker: false';
}
if (!$picktime) {
$pickers .= ',timepicker: false';
}
$extra_js = '';
- $pickers .= ",dayOfWeekStart: ".$firstDay.",lang:'".$lang."'";
+ $pickers .= ",dayOfWeekStart: " . $firstDay . ",lang:'" . $lang . "'";
if ($minfrom != '') {
$extra_js .= "\$('#id_$minfrom').data('xdsoft_datetimepicker').setOptions({onChangeDateTime: function (currentDateTime) { \$('#id_$id').data('xdsoft_datetimepicker').setOptions({minDate: currentDateTime})}})";
}
@@ -335,7 +335,7 @@ function datetimesel($format, $min, $max, $default, $label, $id = 'datetimepicke
$readable_format = str_replace('i','MM',$readable_format);
$tpl = get_markup_template('field_input.tpl');
- $o .= replace_macros($tpl,array(
+ $o .= replace_macros($tpl, array(
'$field' => array($id, $label, $input_text, '', (($required) ? '*' : ''), 'placeholder="' . $readable_format . '"'),
));
@@ -431,11 +431,11 @@ function age($dob, $owner_tz = '', $viewer_tz = '') {
$viewer_tz = date_default_timezone_get();
}
- $birthdate = datetime_convert('UTC',$owner_tz,$dob . ' 00:00:00+00:00','Y-m-d');
- list($year,$month,$day) = explode("-",$birthdate);
- $year_diff = datetime_convert('UTC',$viewer_tz,'now','Y') - $year;
- $curr_month = datetime_convert('UTC',$viewer_tz,'now','m');
- $curr_day = datetime_convert('UTC',$viewer_tz,'now','d');
+ $birthdate = datetime_convert('UTC', $owner_tz,$dob . ' 00:00:00+00:00','Y-m-d');
+ list($year, $month, $day) = explode("-", $birthdate);
+ $year_diff = datetime_convert('UTC',$viewer_tz, 'now', 'Y') - $year;
+ $curr_month = datetime_convert('UTC',$viewer_tz, 'now', 'm');
+ $curr_day = datetime_convert('UTC',$viewer_tz, 'now', 'd');
if (($curr_month < $month) || (($curr_month == $month) && ($curr_day < $day))) {
$year_diff--;
@@ -455,7 +455,7 @@ function age($dob, $owner_tz = '', $viewer_tz = '') {
*
* @return int Number of days in the given month
*/
-function get_dim($y,$m) {
+function get_dim($y, $m) {
$dim = array( 0,
31, 28, 31, 30, 31, 30,
@@ -507,14 +507,14 @@ function cal($y = 0,$m = 0, $links = false, $class='') {
// month table - start at 1 to match human usage.
$mtab = array(' ',
- 'January','February','March',
- 'April','May','June',
- 'July','August','September',
- 'October','November','December'
+ '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');
+ $thisyear = datetime_convert('UTC', date_default_timezone_get(), 'now','Y');
+ $thismonth = datetime_convert('UTC', date_default_timezone_get(), 'now','m');
if (! $y) {
$y = $thisyear;
}
@@ -530,14 +530,14 @@ function cal($y = 0,$m = 0, $links = false, $class='') {
$started = false;
if (($y == $thisyear) && ($m == $thismonth)) {
- $tddate = intval(datetime_convert('UTC',date_default_timezone_get(),'now','j'));
+ $tddate = intval(datetime_convert('UTC', date_default_timezone_get(), 'now', 'j'));
}
$str_month = day_translate($mtab[$m]);
$o = '<table class="calendar' . $class . '">';
$o .= "<caption>$str_month $y</caption><tr>";
for ($a = 0; $a < 7; $a ++) {
- $o .= '<th>' . mb_substr(day_translate($dn[$a]),0,3,'UTF-8') . '</th>';
+ $o .= '<th>' . mb_substr(day_translate($dn[$a]), 0, 3, 'UTF-8') . '</th>';
}
$o .= '</tr><tr>';
@@ -549,7 +549,7 @@ function cal($y = 0,$m = 0, $links = false, $class='') {
$today = (((isset($tddate)) && ($tddate == $d)) ? "class=\"today\" " : '');
$o .= "<td $today>";
- $day = str_replace(' ',' ',sprintf('%2.2d', $d));
+ $day = str_replace(' ', ' ', sprintf('%2.2d', $d));
if ($started) {
if (is_array($links) && isset($links[$d])) {
$o .= "<a href=\"{$links[$d]}\">$day</a>";
@@ -590,22 +590,20 @@ function update_contact_birthdays() {
// This only handles foreign or alien networks where a birthday has been provided.
// 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` ");
+ $r = q("SELECT * FROM `contact` WHERE `bd` != '' AND `bd` > '0001-01-01' AND SUBSTRING(`bd`, 1, 4) != `bdyear` ");
if (dbm::is_result($r)) {
foreach ($r as $rr) {
logger('update_contact_birthday: ' . $rr['bd']);
- $nextbd = datetime_convert('UTC','UTC','now','Y') . substr($rr['bd'],4);
+ $nextbd = datetime_convert('UTC','UTC','now','Y') . substr($rr['bd'], 4);
- /**
- *
+ /*
* Add new birthday event for this person
*
* $bdtext is just a readable placeholder in case the event is shared
* with others. We will replace it during presentation to our $importer
* to contain a sparkle link and perhaps a photo.
- *
*/
// Check for duplicates
@@ -638,7 +636,6 @@ function update_contact_birthdays() {
// update bdyear
-
q("UPDATE `contact` SET `bdyear` = '%s', `bd` = '%s' WHERE `uid` = %d AND `id` = %d",
dbesc(substr($nextbd,0,4)),
dbesc($nextbd),
diff --git a/include/event.php b/include/event.php
index 280b1380a2..64b1ebddc3 100644
--- a/include/event.php
+++ b/include/event.php
@@ -82,6 +82,7 @@ function format_event_html($ev, $simple = false) {
}
/*
+@TODO old-lost code found?
function parse_event($h) {
require_once('include/Scrape.php');
--
2.39.5