Commit graph

1230 commits

Author SHA1 Message Date
rvelices
7125711f59 merge r6414 from branch 2.1
favorite image icon is not taken from php but left to the theme

git-svn-id: http://piwigo.org/svn/trunk@6615 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-28 19:45:21 +00:00
nikrou
1ba096945f Bug 1744 fixed : Incorrect use of timezone with SQLite
Fixed anti-flood system.

Need refactoring between each interval functions

git-svn-id: http://piwigo.org/svn/trunk@6604 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-25 19:43:44 +00:00
nikrou
3aaa5b2dfd Bug 1736 fixed : Complete RSS Feed returns error
start or end dates can be null

git-svn-id: http://piwigo.org/svn/trunk@6597 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-24 18:42:39 +00:00
nikrou
e1ecc62b83 Bug 1735 fixed : 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.

Fixed also problem of FROM_UNIXTIME function not POstgreSQL compatible.

git-svn-id: http://piwigo.org/svn/trunk@6596 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-24 18:36:24 +00:00
nikrou
5561730d35 Bug 1743 fixed : comment form is not visible because of boolean management
git-svn-id: http://piwigo.org/svn/trunk@6591 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-23 18:34:45 +00:00
nikrou
186e9df5af Fix bug 1733 : queries must use single quotes
git-svn-id: http://piwigo.org/svn/trunk@6589 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-23 18:11:00 +00:00
nikrou
bedacf7b08 Bug 1737 fixed : Concatenation error with POstgreSQL
Simplify same function for SQLite

git-svn-id: http://piwigo.org/svn/trunk@6580 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-22 21:18:42 +00:00
nikrou
5a677f1151 Bug 1738 fixed : hour function doesn't exists for database other than mysql.
git-svn-id: http://piwigo.org/svn/trunk@6578 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-22 21:01:05 +00:00
rvelices
613855b83b misplaced closing paranthesis in common.inc.php
git-svn-id: http://piwigo.org/svn/trunk@6523 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-12 09:55:41 +00:00
nikrou
ce187863e8 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.

git-svn-id: http://piwigo.org/svn/trunk@6518 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-10 21:07:22 +00:00
nikrou
175e9a110d 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)

git-svn-id: http://piwigo.org/svn/trunk@6510 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-09 20:25:03 +00:00
nikrou
a629994ea9 Bug 1716 fixed : Check upgrades failed in intro
Incorrect use of database dependant functions.
Fixed same problem for ws functions

git-svn-id: http://piwigo.org/svn/trunk@6500 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-09 09:55:54 +00:00
rvelices
249094fee9 - revert r6473 and r6475
- moved call to event format_exif_data earlier

git-svn-id: http://piwigo.org/svn/trunk@6484 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-07 19:05:04 +00:00
rvelices
85ed20da2c 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/trunk@6475 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-06 10:48:12 +00:00
rvelices
fbf4326d5a - 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/trunk@6473 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-06 10:13:42 +00:00
nikrou
fd0f465c59 Fix bug 1717 : SQLite: access failure on Admin > Tools > History
hour function doesn't exists

git-svn-id: http://piwigo.org/svn/trunk@6463 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-04 19:36:56 +00:00
rvelices
2a99a22130 - 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/trunk@6437 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-06-01 19:52:44 +00:00
nikrou
0005a6eec1 Bug 1705 fixed : double quotes were not escaped
git-svn-id: http://piwigo.org/svn/trunk@6423 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-29 11:32:01 +00:00
rvelices
722c4a3a97 merge r6368,6410 from branch-2.1 to trunk
- 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/trunk@6411 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-28 19:58:51 +00:00
plegall
d63d95e024 merge r6384 from branch 2.1 to trunk
bug 1704 fixed: windows needs a specific directory separator when creating
recursive directory.


git-svn-id: http://piwigo.org/svn/trunk@6385 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-27 07:31:08 +00:00
plegall
5f597c2cba merge r6361 from branch 2.1 to trunk
feature 1697: ability to deactivate the synchronization method to add photos.


git-svn-id: http://piwigo.org/svn/trunk@6365 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-26 00:20:07 +00:00
rvelices
4d013f7a32 fix bug 1663 : wrong decoding of non Ascii iptc/exif (charset issue)
git-svn-id: http://piwigo.org/svn/trunk@6355 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-25 19:49:13 +00:00
plegall
2690d2f929 merge r6338 from branch 2.1 to trunk
bug 1694 fixed: COMPUTED Exif fields were not displayed on picture.php


git-svn-id: http://piwigo.org/svn/trunk@6340 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-24 20:16:11 +00:00
nikrou
ee35b8a080 Fix bug 1695 : incorrect boolean to string conversion for SQLite and PostgreSQL database engines
git-svn-id: http://piwigo.org/svn/trunk@6339 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-24 20:12:35 +00:00
plegall
d3fc7fd446 merge r6321 from branch 2.1 to trunk
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/trunk@6322 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-24 11:14:54 +00:00
patdenice
34bce4c832 $themeconf['id'] hard coded in template class
git-svn-id: http://piwigo.org/svn/trunk@6318 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-24 07:06:35 +00:00
plegall
1e1dfbb6dd merge r6313 from branch 2.1 to trunk
bug 1685 fixed: typo on identification.php link


git-svn-id: http://piwigo.org/svn/trunk@6316 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-23 23:44:45 +00:00
plegall
3181dded77 merge r6312 from branch 2.1 to trunk
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/trunk@6315 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-23 23:43:43 +00:00
plegall
9bef83abe8 merge r6311 from branch 2.1 to trunk
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/trunk@6314 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-23 23:42:03 +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
plegall
a00a203998 remove debug trace
git-svn-id: http://piwigo.org/svn/trunk@6075 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-04 22:22:26 +00:00
plegall
fe797be8d4 bug 1501 fixed: with apache_authentication, fall back to REDIRECT_REMOTE_USER
if REMOTE_USER is not set.

git-svn-id: http://piwigo.org/svn/trunk@6074 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-04 22:21:11 +00:00
plegall
0ce0f28a23 bug 1063 fixed: avoid error when adding a tag in chinese or russian characters.
In any language where the str2url would return an empty string. The behavior
doesn't change for european characters.

rvelices warned me about the many issues we might encounter with copy/paste of
the URL and required url_encode/url_decode BUT after many tests (Linux with
Firefox 3.0/Google Chrome 5, MacOS 10.6 with Firefox/Safari, WindowsXP with
IE6/Firefox) I've found 0 problem, even with the most error prone mode
$conf['tag_url_style'] = 'tag'

git-svn-id: http://piwigo.org/svn/trunk@6060 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-03 23:31:42 +00:00
plegall
0c8cebe044 bug 1639 fixed: the upload form now correctly uses the $conf['upload_dir']
parameter (web API already use it).

By default, the $conf['upload_dir'] is no longer dependent to PHPWG_ROOT_PATH
because it becomes a real mess when admin/include/uploadify.php (called
directly, not from an include) tries to perform an upload.

Improvement: make clearer how $conf['upload_dir'] can be set (relative to the
Piwigo installation directory + HTTP reachable)

git-svn-id: http://piwigo.org/svn/trunk@6052 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-03 12:49:26 +00:00
plegall
89384aa6b1 improvement: use the same code to check upload readiness in admin>photos>add
screen and in web API.

bug fixed: UploadForm partly takes into account the configurable upload
directory (must be propagated everywhere in the UploadForm process)

git-svn-id: http://piwigo.org/svn/trunk@6051 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-03 09:56:22 +00:00
plegall
2de8344c97 bug 1635 fixed: new API method pwg.images.checkUpload tells pLoader if Piwigo
is ready for upload (currently, it checks write access on the upload directory)

git-svn-id: http://piwigo.org/svn/trunk@6049 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-05-03 09:09:40 +00:00
plegall
10dac9de37 bug 1637: make the privacy level the same everywher, use "who can see this photo?"
instead of "minimum privacy level".

git-svn-id: http://piwigo.org/svn/trunk@6025 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-04-30 22:38:17 +00:00
patdenice
0a5b09601b feature 1502: Add $themeconf['load_parent_local_head'] parameter
git-svn-id: http://piwigo.org/svn/trunk@6006 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-04-29 19:57:48 +00:00
plegall
ad27e26c48 bug 860 related: don't try to update the configuration during install because
pwg_query is not available yet.

git-svn-id: http://piwigo.org/svn/trunk@5999 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-04-29 16:02:20 +00:00
plegall
b8d3c9dba4 bug 860 related: if the directory doesn't exist (SVN users) first try to
create it. To avoid useless checks on filesystem (rvelices should
appreciate) a configuration variable tells if we have to check or not.

git-svn-id: http://piwigo.org/svn/trunk@5998 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-04-29 14:43:06 +00:00
patdenice
53f66ba4ef feature 1502: $themeconf['load_css_parent'] apply recursively
git-svn-id: http://piwigo.org/svn/trunk@5993 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-04-29 12:51:19 +00:00
patdenice
a2ccb9a5c9 feature 1502: Add $themeconf['load_parent_css'] parameter
git-svn-id: http://piwigo.org/svn/trunk@5991 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-04-29 12:45:27 +00:00
plegall
e7487082c3 bug 1484: prevent XSS vulnerability, encode url.
improvement: no need to transmit the REQUEST_URI from PHP, Smarty already
knows it.

git-svn-id: http://piwigo.org/svn/trunk@5990 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-04-29 10:44:30 +00:00
plegall
8849bd5fbc bug 1484: after a "quick connect" you are correctly redirect to the same page.
git-svn-id: http://piwigo.org/svn/trunk@5986 68402e56-0260-453c-a942-63ccdbb3a9ee
2010-04-28 16:52:28 +00:00