Commit graph

1094 commits

Author SHA1 Message Date
rvelices
e05f2b5e61 merge -r6870 from trunk
bug fix (recent some months): RSS and mail notifications could send the same thumbnail several times


git-svn-id: http://piwigo.org/svn/branches/2.1@6871 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-09-09 13:21:06 +00:00
plegall
a17353b7bb buf 1785 fixed: the number of related tags is no longer hard coded
git-svn-id: http://piwigo.org/svn/branches/2.1@6715 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-07-27 12:49:29 +00:00
plegall
7a7569eda2 add trigger for ExtendedDescription on photo name
git-svn-id: http://piwigo.org/svn/branches/2.1@6711 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-07-27 12:30:25 +00:00
rub
a9bd998a07 Feature 0001778: Thumbnails missing on NBM
Fix move_ccs_rules_to_body function

git-svn-id: http://piwigo.org/svn/branches/2.1@6705 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-07-24 21:00:25 +00:00
rvelices
6c7b53e0b6 merge r6668 from trunk
- removed function get_extra_fields and its usage (unnecessary + perf issue when retrieving many image ids in a section)
- 2 fixes recent feed.php commit
  * month names were decalated by one
  * strptime function is not implemented under Windows in php
- added somme missing $ROOT_URL in templates

git-svn-id: http://piwigo.org/svn/branches/2.1@6669 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-07-06 20:11:06 +00:00
nikrou
4845a85685 Bug 1766 fixed : [PostgreSQL] unkown database function UNIX_TIMESTAMP()
Add a new function pwg_db_date_to_ts() to calculate a timestamp from a date
Merge from trunk

git-svn-id: http://piwigo.org/svn/branches/2.1@6667 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-07-06 12:17:37 +00:00
nikrou
b2d7edfc17 Bug 1763 fixed : [PostgreSQL] double quote used in queries
Merge from trunk

git-svn-id: http://piwigo.org/svn/branches/2.1@6665 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-07-05 21:18:45 +00:00
nikrou
52c568327c Bug 1762 fixed : Compleet RSS Feed returns notice
Remove mysql specific function
Merge from trunk

git-svn-id: http://piwigo.org/svn/branches/2.1@6663 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-07-05 20:54:10 +00:00
nikrou
6b8e08936c Bug 1760 fixed : Avoid session fixation
After connection, session id is changed using session_regenerate_id
but without removing old session. Passing param true makes the job

Merge from trunk

git-svn-id: http://piwigo.org/svn/branches/2.1@6661 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-07-05 19:35:36 +00:00
nikrou
6656dfb06a Bug 1755 fixed : Needs single quotes in queries official plugins
Merge from trunk

git-svn-id: http://piwigo.org/svn/branches/2.1@6655 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-07-03 12:22:58 +00:00
nikrou
b83df6be68 Bug 1754 fixed : The keyword AS is mandatory for alias in PostgreSQL queries
Merge from trunk

git-svn-id: http://piwigo.org/svn/branches/2.1@6653 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-07-03 12:16:12 +00:00
plegall
1b94ba922a we are on the branch 2.1 now
git-svn-id: http://piwigo.org/svn/branches/2.1@6630 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-29 20:43:02 +00:00
nikrou
d7fa727afa Bug 1744 fixed : Incorrect use of timezone with SQLite
Fixed anti-flood system.

Merge from trunk

git-svn-id: http://piwigo.org/svn/branches/2.1@6605 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-25 19:45:19 +00:00
nikrou
6394613e9f Bug 1735 fixed : merge from trunk
Comment page is not PostgreSQL compatible
Fixed by adding all fields except category_id in group by clause
category_id is retrieved later in an another query (with permissions filter)

Fixed also problem of FROM_UNIXTIME function not POstgreSQL compatible

git-svn-id: http://piwigo.org/svn/branches/2.1@6602 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-24 20:35:46 +00:00
nikrou
5f925e150a Bug 1736 fixed : Complete RSS Feed returns error start or end dates can be null
merge from trunk

git-svn-id: http://piwigo.org/svn/branches/2.1@6598 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-24 18:44:42 +00:00
nikrou
24d68bed06 Fix bug 1743 : comment form is not visible because of boolean management
merge from trunk

git-svn-id: http://piwigo.org/svn/branches/2.1@6592 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-23 18:35:21 +00:00
nikrou
d28c348908 Bug 1733 fixed : merge from trunk.
Queries must use single quotes.

git-svn-id: http://piwigo.org/svn/branches/2.1@6590 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-23 18:17:36 +00:00
nikrou
c04a906ec4 Bug 1737 fixed : merge from trunk
Concatenation error with POstgreSQL
Simplify same function for SQLite

git-svn-id: http://piwigo.org/svn/branches/2.1@6581 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-22 21:19:17 +00:00
nikrou
1661af7f3f Bug 1738 fixed : merge from trunk
hour function doesn't exists for database other than mysql.

git-svn-id: http://piwigo.org/svn/branches/2.1@6579 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-22 21:01:47 +00:00
rvelices
49952e574c misplaced closing paranthesis in common.inc.php
git-svn-id: http://piwigo.org/svn/branches/2.1@6524 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-12 09:56:20 +00:00
nikrou
9bbddd0cc4 Bug 1730 fixed : search doesn't work when database engine is not mysql
For posgresql and sqlite date must allways use day and month with two diggits.
merge from trunk

git-svn-id: http://piwigo.org/svn/branches/2.1@6519 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-10 21:08:34 +00:00
nikrou
a59d15b7b6 Fix bug 1722 : PosgtreSQL wants all fields in select to be in Group by clause
or agregate function
Fix issue for lambda function (incorrect number of params)

merge from trunk.

git-svn-id: http://piwigo.org/svn/branches/2.1@6511 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-09 20:26:47 +00:00
nikrou
a9774635bd Bug 1716 fixed : SQLite: Check upgrades failed in intro
Incorrect use of dependant database function
Fixed same problem in ws functions

merge from trunk

git-svn-id: http://piwigo.org/svn/branches/2.1@6501 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-09 09:57:57 +00:00
rvelices
497203da33 merge r6484 from trunk to branch 2.1
- revert r6473 and r6475
- moved call to event format_exif_data earlier

git-svn-id: http://piwigo.org/svn/branches/2.1@6485 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-07 19:06:20 +00:00
rvelices
30144caeb8 one of my previous merge from trunk was incomplete
git-svn-id: http://piwigo.org/svn/branches/2.1@6477 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-06 18:32:21 +00:00
rvelices
3115673888 merge r6475
previous commit was still not ok
- quick fix (maybe not the cleanest) of regression 2.0 -> 2.1 when displaying metadata on picture page (event called with different input)

git-svn-id: http://piwigo.org/svn/branches/2.1@6476 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-06 10:48:59 +00:00
rvelices
4664661c50 merge r6473 from trunk to branch 2.1
- quick fix (maybe not the cleanest) of regression 2.0 -> 2.1 when displaying metadata on picture page (event called with different input)

git-svn-id: http://piwigo.org/svn/branches/2.1@6474 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-06 10:14:26 +00:00
nikrou
e49ff390d3 Bug 1717 fixed : SQLite: access failure on Admin > Tools > History
hour function doesn't exists
Merge from trunk.

git-svn-id: http://piwigo.org/svn/branches/2.1@6464 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-04 19:39:02 +00:00
rvelices
663c13f39a merge r6437 from trunk to branch 2.1
- do not remove slashes before calling insert_user_comment (homogeneity with update_user_comment and general use of slashes in piwigo)
- when using a modifier on a non array variable use @| instead of | (generated code is simpler and faster)

git-svn-id: http://piwigo.org/svn/branches/2.1@6438 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-01 19:56:07 +00:00
nikrou
bc12301421 Bug 1705 fixed : User cannot add comment with double quotes
Merge from trunk

git-svn-id: http://piwigo.org/svn/branches/2.1@6424 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-29 11:35:26 +00:00
rvelices
f4c16c53eb added a test that $conf['gallery_url'] != http://piwigo.org/demo
git-svn-id: http://piwigo.org/svn/branches/2.1@6412 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-28 20:02:22 +00:00
rvelices
1b90ca1764 - merged the linkroot integration with the existing gallery_url (unique $conf['gallery_url'] used for RSS, mail homepage root in the browse path)
- added an option $conf['debug_mail'] - if set all outgoing mails are saved into local_data_dir

git-svn-id: http://piwigo.org/svn/branches/2.1@6410 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-28 19:55:03 +00:00
plegall
50cd8ed523 bug 1704 fixed: windows needs a specific directory separator when creating
recursive directory.

git-svn-id: http://piwigo.org/svn/branches/2.1@6384 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-27 07:30:03 +00:00
laurent.duretz
74bf86ecc5 Issue 1521 : add linkroot to spacial pages
git-svn-id: http://piwigo.org/svn/branches/2.1@6368 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-26 08:42:52 +00:00
plegall
5488e86ada feature 1697: ability to deactivate the synchronization method to add photos.
git-svn-id: http://piwigo.org/svn/branches/2.1@6361 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-25 22:29:31 +00:00
rvelices
7ab2dd2fac merge -r 6355 from trunk
fix bug 1663 : wrong decoding of non Ascii iptc/exif (charset issue)

git-svn-id: http://piwigo.org/svn/branches/2.1@6356 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-25 19:55:28 +00:00
nikrou
01788faeb5 Fix bug 1695 : incorrect boolean to string conversion for SQLite and PostgreSQL database engines merge from trunk
git-svn-id: http://piwigo.org/svn/branches/2.1@6342 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-24 20:44:55 +00:00
plegall
f010502f12 bug 1694 fixed: COMPUTED Exif fields were not displayed on picture.php
git-svn-id: http://piwigo.org/svn/branches/2.1@6338 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-24 20:07:33 +00:00
plegall
128e22b612 bug 1682: r6312 was producing a MySQL error (depending on the MySQL server
version) because a count() implies a group by.

This code change was checked against MySQL 5.0.75, MySQL 5.0.51 (where the
error occured) and SQLite 3.6.22.

git-svn-id: http://piwigo.org/svn/branches/2.1@6321 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-24 11:12:23 +00:00
patdenice
0a2e040ae7 Merge r6318 from trunk to branch 2.1.
$themeconf['id'] hard coded in template class

git-svn-id: http://piwigo.org/svn/branches/2.1@6319 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-24 07:08:16 +00:00
plegall
d1b62c1d58 bug 1685 fixed: typo on identification.php link
git-svn-id: http://piwigo.org/svn/branches/2.1@6313 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-23 23:39:00 +00:00
plegall
b7ed5e6af4 bug 1684 fixed: the test to check availability of the user_infos line was
wrong. I had changed the old db_num_rows > 0 because it was not working with
SQLite. As suggested by nicolas, let's use a simpler trick "count(1)" in the
query itself, this way it should work with any database engine.

I've also removed the while (true) (ugly infinite loop, with a condition for
exit) that was producing an infinite loop for Piwigo installations with 2.0
database model and 2.1 code (before launching upgrade.php)

git-svn-id: http://piwigo.org/svn/branches/2.1@6312 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-23 23:31:58 +00:00
plegall
0786ff3b79 bug 1683 fixed: as soon as an admin modifies the admin>conf>options>guest settings, registration is broken. This is because user_infos.theme/language are emptied (while they should not).
I have also added an "automatic repair" piece of code in get_default_user_info function. This piece of code should be removed for 2.2 with the appropriate migration task.

git-svn-id: http://piwigo.org/svn/branches/2.1@6311 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-23 23:18:59 +00:00
nikrou
d8d8ca5ed3 Fix get_enums function for SQLite
hard coded enums values for all tables
because enum feature doesn't exists for SQLite.

git-svn-id: http://piwigo.org/svn/trunk@6153 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-09 20:52:38 +00:00
plegall
8469140471 add nl.piwigo.org as domain name if current language is nl_NL
fix typos on language names in install.php

correct list of available newsletters

git-svn-id: http://piwigo.org/svn/trunk@6152 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-09 20:51:01 +00:00
plegall
eb0aec9752 bug 1652 fixed: json_encode function is required for admin.php?fckb_tags=1
(used in the new tags widget)

git-svn-id: http://piwigo.org/svn/trunk@6126 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-08 19:22:29 +00:00
nikrou
a34af69677 Amend bug 1559. standard deviation was not removed in some places.
So, sqlite crashed because std function has been removed.

git-svn-id: http://piwigo.org/svn/trunk@6125 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-08 18:43:50 +00:00
plegall
445182279c bug 1649 fixed: search EXIF/IPTC in the high definition photo if there is no
EXIF/IPTC in the web sized photo.

git-svn-id: http://piwigo.org/svn/trunk@6093 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-07 10:23:26 +00:00
nikrou
acc0b27412 SQLite availabilty must be check by existence of SQLite3 class
git-svn-id: http://piwigo.org/svn/trunk@6092 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-07 09:09:44 +00:00
plegall
48ab333212 bug 1648 fixed: add the pwg_db_check_version functions for pdo-sqlite, sqlite
and pgsql, also make the $pwg_db_link global in the install_db_connect function
so that it can be used in SQLite functions.

bug fixed: with pdo-sqlite, pwg_db_num_rows always returns 0, so when
initializing user data, it tries to insert the same row twice.

git-svn-id: http://piwigo.org/svn/trunk@6090 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-07 00:34:56 +00:00