PO 2.33e
This commit is contained in:
parent
5913c7bf92
commit
49d0174f91
11
CHANGES
11
CHANGES
|
@ -25,6 +25,17 @@ For further information about Photo Organizer, see its web site at:
|
|||
|
||||
==========================================================================
|
||||
|
||||
2.33e ( August 11, 2007 )
|
||||
|
||||
[fix] Default image orientation value was bogus, so if we failed to
|
||||
properly parse the image metadata, we broke.
|
||||
[fix] File permissions on the EXIFER decoder files.
|
||||
Use long php header on the EXIFER decoder files.
|
||||
[fix] Ambiguious SQL the IPTC/XMP location header import code.
|
||||
[fix] Unknown IPTC locations were failing import.
|
||||
[fix] Removing a user (via the admin interface) was broken when they
|
||||
had keywords on their photos.
|
||||
|
||||
2.33d (May 1, 2007)
|
||||
|
||||
[add] Code to support banner ads.
|
||||
|
|
|
@ -122,6 +122,15 @@ if (!$result) {
|
|||
exit();
|
||||
}
|
||||
|
||||
$result = pg_query($database, "delete from photo_keywords where photo in (select
|
||||
identifier from photo where users='$user_id')");
|
||||
if (!$result) {
|
||||
pg_query($database, "rollback");
|
||||
site_epilog($database);
|
||||
header("location: user.php?user=$user_id");
|
||||
exit();
|
||||
}
|
||||
|
||||
$result = pg_query($database, "delete from photo_dupe where photo in (select identifier from photo where users='$user_id')");
|
||||
if (!$result) {
|
||||
pg_query($database, "rollback");
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
include_once "calendar.php";
|
||||
|
||||
function version() {
|
||||
return "2.33d";
|
||||
return "2.33e";
|
||||
}
|
||||
|
||||
function xml_to_html($xml_code) {
|
||||
|
@ -464,8 +464,7 @@ function orientation_to_xform($database, $orientation) {
|
|||
$orients = pg_fetch_row($orients);
|
||||
return $orients[0];
|
||||
}
|
||||
return "Unknown ($orientation)";
|
||||
|
||||
return "";
|
||||
}
|
||||
|
||||
function orientation_id_from_string($database, $name) {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<?
|
||||
<?php
|
||||
//================================================================================================
|
||||
//================================================================================================
|
||||
//================================================================================================
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<?
|
||||
<?php
|
||||
//================================================================================================
|
||||
//================================================================================================
|
||||
//================================================================================================
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<?
|
||||
<?php
|
||||
//================================================================================================
|
||||
//================================================================================================
|
||||
//================================================================================================
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<?
|
||||
<?php
|
||||
//================================================================================================
|
||||
//================================================================================================
|
||||
//================================================================================================
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<?
|
||||
<?php
|
||||
//================================================================================================
|
||||
//================================================================================================
|
||||
//================================================================================================
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<?
|
||||
<?php
|
||||
//================================================================================================
|
||||
//================================================================================================
|
||||
//================================================================================================
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<?
|
||||
<?php
|
||||
//================================================================================================
|
||||
//================================================================================================
|
||||
//================================================================================================
|
||||
|
|
|
@ -106,7 +106,7 @@ function convert_iptc2sql_timestamp($date, $time) {
|
|||
function convert_iptc_location($database, $user_id, $city, $state, $country) {
|
||||
$location = pg_fetch_row(pg_query($database, "
|
||||
select location.identifier
|
||||
from location, country
|
||||
from location, country, state
|
||||
where '$city' ~* location.city
|
||||
and '$state' ~* state.value
|
||||
and location.state = state.identifier
|
||||
|
@ -129,7 +129,7 @@ function convert_iptc_location($database, $user_id, $city, $state, $country) {
|
|||
$state_id = pg_fetch_row(pg_query($database, "select nextval('state_id_sequence')"));
|
||||
if (!$state_id) {
|
||||
pg_query($database, "rollback");
|
||||
return "null";
|
||||
return "0";
|
||||
}
|
||||
pg_query($database, "insert into state (identifier, value) values ($state_id[0], '$state')");
|
||||
}
|
||||
|
@ -143,28 +143,28 @@ function convert_iptc_location($database, $user_id, $city, $state, $country) {
|
|||
$country_id = pg_fetch_row(pg_query($database, "select nextval('country_id_sequence')"));
|
||||
if (!$country_id) {
|
||||
pg_query($database, "rollback");
|
||||
return "null";
|
||||
return "0";
|
||||
}
|
||||
pg_query($database, "insert into country (identifier, value) values ($country_id[0], '$country')");
|
||||
print "insert into country (identifier, value) values ($country_id[0], '$country'";
|
||||
// print "insert into country (identifier, value) values ($country_id[0], '$country')";
|
||||
}
|
||||
}
|
||||
|
||||
$new_location_id = pg_fetch_row(pg_query($database, "select nextval('location_id_sequence')"));
|
||||
if (!$new_location_id) {
|
||||
pg_query($database, "rollback");
|
||||
return "null";
|
||||
return "0";
|
||||
}
|
||||
|
||||
$state_id[0] = $state_id[0] ? $state_id[0] : "null";
|
||||
$country_id[0] = $country_id[0] ? $country_id[0] : "null";
|
||||
|
||||
$result = pg_query($database, "insert into location
|
||||
(identifier, city, state, country, last_modified_date, last_modifying_users)
|
||||
values ($new_location_id[0], '$city', $state_id[0], $country_id[0], now(), $user_id)");
|
||||
(identifier, city, state, country, last_modified_date, users, private)
|
||||
values ($new_location_id[0], '$city', $state_id[0], $country_id[0], now(), $user_id, 'f')");
|
||||
if (!$result) {
|
||||
pg_query($database, "rollback");
|
||||
return "null";
|
||||
return "0";
|
||||
}
|
||||
|
||||
pg_query($database, "commit");
|
||||
|
|
|
@ -61,7 +61,7 @@ $database = site_prolog();
|
|||
|
||||
<p>As this is a moving target, if something doesn't appear to work, please file a <a href="http://bugs.shaftnet.org">bug ticket</a>.</p>
|
||||
|
||||
<p>For more information about Photo Orzanizer's features and releases, see the <a href="http://po.shaftnet.org/">Photo Organizer web site</a>.</p>
|
||||
<p>For more information about Photo Organizer's features and releases, see the <a href="http://po.shaftnet.org/">Photo Organizer web site</a>.</p>
|
||||
|
||||
<p>Nearly all features are enabled. Feel free to create an account, upload some photos, and generally get a feel for how Photo Organizer works.</p>
|
||||
|
||||
|
|
Loading…
Reference in New Issue