\n";
- print "$num_of_users[0] ".$strings['generic_members_storing']." $num_of_photos[0] ".$strings['generic_photos'];
+ print "$num_of_users[0] ".$strings['generic_members_storing']." $num_of_photos[0] ".$strings['generic_photos'];
if ($num_of_photo_versions[0] > 0) {
print " + $num_of_photo_versions[0] ".$strings['generic_add_versions'];
}
@@ -228,21 +228,21 @@ function register_user($database, $username, $user_type, $password, $fn, $ln, $e
$zipcode = pg_escape_string($database, $_REQUEST['zipcode']);
$state = pg_escape_string($database, $_REQUEST['state']);
$country = pg_escape_string($database, $_REQUEST['country']);
-
+
pg_query($database, "begin");
$new_user_id = pg_fetch_row(pg_query($database, "select nextval('users_id_sequence')"));
-
+
$user_id = $new_user_id[0];
-
+
if (strlen($url) && (substr($url, 0, 7) != "http://"))
$url = "http://".$url;
-
+
$password = pg_escape_string($database, $auth_handle->passwd_transform($password, $username));
$username = pg_escape_string($database, $username);
$result = pg_query($database, "insert into users (identifier, first_name, last_name, company, username, password, member_since, type, address1, address2, city, zipcode, state, country, phone, email, url)
values ('$user_id', '$first_name', '$last_name', '$company', '$username', '$password', now(), $user_type, '$address1', '$address2', '$city', '$zipcode', $state, $country, '$phone', '$email', '$url')");
- if ($result) {
+ if ($result) {
$result = pg_query($database, "insert into folder (identifier, parent_folder, users, caption, access_rights)
values (nextval('folder_id_sequence'), null, '$user_id', 'Trash', 3)");
}
@@ -251,7 +251,7 @@ function register_user($database, $username, $user_type, $password, $fn, $ln, $e
values (nextval('album_id_sequence'), null, $user_id,
'Spool', 3, null)");
}
-
+
if ($result)
$result = store_user_pref($database, $user_id, 'lang', $lang);
if ($result)
@@ -260,13 +260,13 @@ function register_user($database, $username, $user_type, $password, $fn, $ln, $e
$result = store_user_pref($database, $user_id, 'quota_count', $po_options_default['quota_count']);
if ($result)
$result = store_user_pref($database, $user_id, 'bulk_upload_enable', $po_options_default['bulk_upload_enable']);
-
+
/* Create the client association */
if ($result && $po_user['type'] == PO_USER_TYPE_USER) {
$result = pg_query($database, "insert into client (identifier, users, client, status, trusted)
values (nextval('client_id_sequence'), '$po_user[id]', '$user_id', 2, 't')");
}
-
+
if ($result) {
pg_query($database, "commit");
return $user_id;
diff --git a/src/include/calendar.php b/src/include/calendar.php
index 8258c1c..549dc95 100644
--- a/src/include/calendar.php
+++ b/src/include/calendar.php
@@ -171,13 +171,13 @@ function emit_date_html($timestamp, $format, $special = FALSE) {
global $po_user;
global $strings;
- if ($special)
+ if ($special)
$link = FALSE;
else if ($po_user['type'] > PO_USER_TYPE_DISABLED)
$link = TRUE;
- else
+ else
$link = FALSE;
-
+
if (!$timestamp)
return "";
@@ -225,19 +225,19 @@ function emit_date_html($timestamp, $format, $special = FALSE) {
$html_string = "";
if ($date_format) {
- $html_string .= strftime($date_format, $timestamp);
+ $html_string .= date($date_format, $timestamp);
}
- if ($link)
+ if ($link)
$html_string = emit_a("my.datebook.php?view=1&year=$year&month=$month&day=$day", $html_string);
if ($time_format) {
if ($time_format == $format) {
$html_string .= $format;
} else {
- if ($date_format)
+ if ($date_format)
$html_string .= " @ ";
- $html_string .= strftime($time_format, $timestamp);
+ $html_string .= date($time_format, $timestamp);
}
}
diff --git a/src/my.datebook.php b/src/my.datebook.php
index 4ea9c1c..e329303 100644
--- a/src/my.datebook.php
+++ b/src/my.datebook.php
@@ -115,10 +115,10 @@ switch ($calendar_view) {
print "
";
$yesterday = adjustDay($calendar_year, $calendar_month, $calendar_day - 1);
-
+
print sprintf($thm_elem['button.previous'], "my.datebook.php?view=1&year=$yesterday[0]&month=$yesterday[1]&day=$yesterday[2]", $strings['generic_day'], "");
- print " $dayNames[$dayNameIndex] ".strftime($strings['formats_date'], $timestamp)." ";
+ print " $dayNames[$dayNameIndex] ".date($strings['formats_date'], $timestamp)." ";
$tomorrow = adjustDay($calendar_year, $calendar_month, $calendar_day + 1);
print sprintf($thm_elem['button.next'], "my.datebook.php?view=1&year=$tomorrow[0]&month=$tomorrow[1]&day=$tomorrow[2]", $strings['generic_day'], "");
@@ -228,7 +228,7 @@ switch ($calendar_view) {
$curDate = adjustDay($calendar_year, $calendar_month, $day);
$num_photos = 0;
if ($showcounts) {
- $num_photos = photos_between_dates($database, $po_user['id'],
+ $num_photos = photos_between_dates($database, $po_user['id'],
mktime(0,0,0,$curDate[1],$curDate[2],$curDate[0]),
mktime(0,0,0,$curDate[1],$curDate[2]+1,$curDate[0]));
}
@@ -236,8 +236,8 @@ switch ($calendar_view) {
$bgcolor = "";
if ($curDate[2]!=$day)
$bgcolor = "class=\"inactive\"";
- if (($calendar_year == $today["year"]) &&
- ($calendar_month == $today["mon"]) &&
+ if (($calendar_year == $today["year"]) &&
+ ($calendar_month == $today["mon"]) &&
($day == $today["mday"])) {
$bgcolor = "class=\"selected\"";
}