From c6d07feff575862b5db8d05e02be6375e51034c7 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 8 Sep 2014 20:35:15 -0700 Subject: This is long overdue - use a symblic constant NULL_DATE instead of the easily mis-typed sequence '0000-00-00 00:00:00' --- mod/events.php | 2 +- mod/feed.php | 2 +- mod/import.php | 2 +- mod/item.php | 4 ++-- mod/mail.php | 2 +- mod/profiles.php | 4 ++-- mod/removeaccount.php | 2 +- mod/removeme.php | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) (limited to 'mod') diff --git a/mod/events.php b/mod/events.php index 195dcb0ff..c80d1dd39 100755 --- a/mod/events.php +++ b/mod/events.php @@ -53,7 +53,7 @@ function events_post(&$a) { } if($nofinish) { - $finish = '0000-00-00 00:00:00'; + $finish = NULL_DATE; } if($finish_text) { diff --git a/mod/feed.php b/mod/feed.php index fdbe4db8c..776f9787f 100644 --- a/mod/feed.php +++ b/mod/feed.php @@ -7,7 +7,7 @@ function feed_init(&$a) { $params = array(); - $params['begin'] = ((x($_REQUEST,'date_begin')) ? $_REQUEST['date_begin'] : '0000-00-00 00:00:00'); + $params['begin'] = ((x($_REQUEST,'date_begin')) ? $_REQUEST['date_begin'] : NULL_DATE); $params['end'] = ((x($_REQUEST,'date_end')) ? $_REQUEST['date_end'] : ''); $params['type'] = ((stristr(argv(0),'json')) ? 'json' : 'xml'); $params['pages'] = ((x($_REQUEST,'pages')) ? intval($_REQUEST['pages']) : 0); diff --git a/mod/import.php b/mod/import.php index e732c3c06..7452bcdc9 100644 --- a/mod/import.php +++ b/mod/import.php @@ -256,7 +256,7 @@ function import_post(&$a) { require_once('include/photo/photo_driver.php'); $photos = import_profile_photo($xchan['xchan_photo_l'],$xchan['xchan_hash']); if($photos[4]) - $photodate = '0000-00-00 00:00:00'; + $photodate = NULL_DATE; else $photodate = $xchan['xchan_photo_date']; diff --git a/mod/item.php b/mod/item.php index 9338cf401..23d39a62c 100644 --- a/mod/item.php +++ b/mod/item.php @@ -384,13 +384,13 @@ function item_post(&$a) { } - $expires = '0000-00-00 00:00:00'; + $expires = NULL_DATE; if(feature_enabled($profile_uid,'content_expire')) { if(x($_REQUEST,'expire')) { $expires = datetime_convert(date_default_timezone_get(),'UTC', $_REQUEST['expire']); if($expires <= datetime_convert()) - $expires = '0000-00-00 00:00:00'; + $expires = NULL_DATE; } } diff --git a/mod/mail.php b/mod/mail.php index b7297443c..d6d802fe7 100644 --- a/mod/mail.php +++ b/mod/mail.php @@ -17,7 +17,7 @@ function mail_post(&$a) { $body = ((x($_REQUEST,'body')) ? escape_tags(trim($_REQUEST['body'])) : ''); $recipient = ((x($_REQUEST,'messageto')) ? notags(trim($_REQUEST['messageto'])) : ''); $rstr = ((x($_REQUEST,'messagerecip')) ? notags(trim($_REQUEST['messagerecip'])) : ''); - $expires = ((x($_REQUEST,'expires')) ? datetime_convert(date_default_timezone_get(),'UTC', $_REQUEST['expires']) : '0000-00-00 00:00:00'); + $expires = ((x($_REQUEST,'expires')) ? datetime_convert(date_default_timezone_get(),'UTC', $_REQUEST['expires']) : NULL_DATE); // If we have a raw string for a recipient which hasn't been auto-filled, // it means they probably aren't in our address book, hence we don't know diff --git a/mod/profiles.php b/mod/profiles.php index 6361f56a3..063e714e7 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -304,7 +304,7 @@ function profiles_post(&$a) { $with = ((x($_POST,'with')) ? escape_tags(trim($_POST['with'])) : ''); if(! strlen($howlong)) - $howlong = '0000-00-00 00:00:00'; + $howlong = NULL_DATE; else $howlong = datetime_convert(date_default_timezone_get(),'UTC',$howlong); @@ -707,7 +707,7 @@ logger('extra_fields: ' . print_r($extra_fields,true)); '$marital' => marital_selector($r[0]['marital']), '$marital_min' => marital_selector_min($r[0]['marital']), '$with' => $r[0]['with'], - '$howlong' => ($r[0]['howlong'] === '0000-00-00 00:00:00' ? '' : datetime_convert('UTC',date_default_timezone_get(),$r[0]['howlong'])), + '$howlong' => ($r[0]['howlong'] === NULL_DATE ? '' : datetime_convert('UTC',date_default_timezone_get(),$r[0]['howlong'])), '$sexual' => sexpref_selector($r[0]['sexual']), '$sexual_min' => sexpref_selector_min($r[0]['sexual']), '$about' => $r[0]['about'], diff --git a/mod/removeaccount.php b/mod/removeaccount.php index 1f9dbcafa..70979c07d 100644 --- a/mod/removeaccount.php +++ b/mod/removeaccount.php @@ -24,7 +24,7 @@ function removeaccount_post(&$a) { if(! account_verify_password($account['account_email'],$_POST['qxz_password'])) return; - if($account['account_password_changed'] != '0000-00-00 00:00:00') { + if($account['account_password_changed'] != NULL_DATE) { $d1 = datetime_convert('UTC','UTC','now - 48 hours'); if($account['account_password_changed'] > d1) { notice( t('Account removals are not allowed within 48 hours of changing the account password.') . EOL); diff --git a/mod/removeme.php b/mod/removeme.php index 13bf6cf63..d2ff013b8 100644 --- a/mod/removeme.php +++ b/mod/removeme.php @@ -23,7 +23,7 @@ function removeme_post(&$a) { if(! account_verify_password($account['account_email'],$_POST['qxz_password'])) return; - if($account['account_password_changed'] != '0000-00-00 00:00:00') { + if($account['account_password_changed'] != NULL_DATE) { $d1 = datetime_convert('UTC','UTC','now - 48 hours'); if($account['account_password_changed'] > d1) { notice( t('Channel removals are not allowed within 48 hours of changing the account password.') . EOL); -- cgit v1.2.3