aboutsummaryrefslogtreecommitdiffstats
path: root/include/config_default.inc.php
diff options
context:
space:
mode:
Diffstat (limited to 'include/config_default.inc.php')
-rw-r--r--include/config_default.inc.php92
1 files changed, 55 insertions, 37 deletions
diff --git a/include/config_default.inc.php b/include/config_default.inc.php
index 2a9ea1cad..7d6eda301 100644
--- a/include/config_default.inc.php
+++ b/include/config_default.inc.php
@@ -2,7 +2,7 @@
// +-----------------------------------------------------------------------+
// | Piwigo - a PHP based photo gallery |
// +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2013 Piwigo Team http://piwigo.org |
+// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org |
// | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net |
// | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick |
// +-----------------------------------------------------------------------+
@@ -229,40 +229,6 @@ $conf['users_page'] = 20;
// image level permissions available in the admin interface
$conf['available_permission_levels'] = array(0,1,2,4,8);
-// mail_options: only set it true if you have a send mail warning with
-// "options" parameter missing on mail() function execution.
-$conf['mail_options'] = false;
-
-// send_bcc_mail_webmaster: send bcc mail to webmaster. Set true for debug
-// or test.
-$conf['send_bcc_mail_webmaster'] = false;
-
-// default_email_format:
-// Define the default email format use to send email
-// Value could be text/plain or text/html
-$conf['default_email_format'] = 'text/html';
-
-// alternative_email_format:
-// Define the alternative email format use to send email
-// Value could be text/plain or text/html
-$conf['alternative_email_format'] = 'text/plain';
-
-// define the name of sender mail:
-// If value is empty, gallery title is used
-$conf['mail_sender_name'] = '';
-
-// smtp configuration
-// (work if fsockopen function is allowed for smtp port)
-// smtp_host: smtp server host
-// if null, regular mail function is used
-// format: hoststring[:port]
-// exemple: smtp.pwg.net:21
-// smtp_user/smtp_password: user & password for smtp identication
-$conf['smtp_host'] = '';
-$conf['smtp_user'] = '';
-$conf['smtp_password'] = '';
-
-
// check_upgrade_feed: check if there are database upgrade required. Set to
// true, a message will strongly encourage you to upgrade your database if
// needed.
@@ -305,6 +271,36 @@ $conf['ext_imagick_dir'] = '';
$conf['comments_page_nb_comments'] = 10;
// +-----------------------------------------------------------------------+
+// | email |
+// +-----------------------------------------------------------------------+
+
+// send_bcc_mail_webmaster: send bcc mail to webmaster. Set true for debug
+// or test.
+$conf['send_bcc_mail_webmaster'] = false;
+
+// define the name of sender mail: if value is empty, gallery title is used
+$conf['mail_sender_name'] = '';
+
+// define the email of sender mail: if valie is empty, webmaster email is used
+$conf['mail_sender_email'] = '';
+
+// set true to allow text/html emails
+$conf['mail_allow_html'] = true;
+
+// smtp configuration (work if fsockopen function is allowed for smtp port)
+// smtp_host: smtp server host
+// if null, regular mail function is used
+// format: hoststring[:port]
+// exemple: smtp.pwg.net:21
+// smtp_user/smtp_password: user & password for smtp identication
+$conf['smtp_host'] = '';
+$conf['smtp_user'] = '';
+$conf['smtp_password'] = '';
+
+// 'ssl' or 'tls'
+$conf['smtp_secure'] = null;
+
+// +-----------------------------------------------------------------------+
// | metadata |
// +-----------------------------------------------------------------------+
@@ -374,6 +370,11 @@ $conf['use_exif_mapping'] = array(
'date_creation' => 'DateTimeOriginal'
);
+// allow_html_in_metadata: in case the origin of the photo is unsecure (user
+// upload), we remove HTML tags to avoid XSS (malicious execution of
+// javascript)
+$conf['allow_html_in_metadata'] = false;
+
// +-----------------------------------------------------------------------+
// | sessions |
// +-----------------------------------------------------------------------+
@@ -485,7 +486,7 @@ $conf['apache_authentication'] = false;
// delete from piwigo_user_infos;
// delete from piwigo_sessions;
// delete from piwigo_rate;
-// update piwigo_images set rating_score = null;
+// update piwigo_images set rating_score = null, added_by = <webmaster_id>;
// delete from piwigo_caddie;
// delete from piwigo_favorites;
//
@@ -661,6 +662,9 @@ $conf['ws_log_filepath'] = '/tmp/piwigo_ws.log';
// Maximum number of images to be returned foreach call to the web service
$conf['ws_max_images_per_page'] = 500;
+// Maximum number of users to be returned foreach call to the web service
+$conf['ws_max_users_per_page'] = 1000;
+
// Display a link to subscribe to Piwigo Announcements Newsletter
$conf['show_newsletter_subscription'] = true;
@@ -775,10 +779,24 @@ $conf['chmod_value']= substr_compare(PHP_SAPI, 'apa', 0, 3)==0 ? 0777 : 0755;
// 'small', 'medium' or 'large'
$conf['derivative_default_size'] = 'medium';
+// below which size (in pixels, ie width*height) do we remove metadata
+// EXIF/IPTC... from derivative?
+$conf['derivatives_strip_metadata_threshold'] = 256000;
+
//Maximum Ajax requests at once, for thumbnails on-the-fly generation
$conf['max_requests']=3;
// one of '', 'images', 'all'
//TODO: Put this in admin and also manage .htaccess in #sites and upload folders
$conf['original_url_protection'] = '';
-?> \ No newline at end of file
+
+
+// Default behaviour when a new album is created: should the new album inherit the group/user
+// permissions from its parent? Note that config is only used for Ftp synchro,
+// and if that option is not explicitly transmit when the album is created.
+$conf['inheritance_by_default'] = false;
+
+// 'png' or 'jpg': your uploaded TIF photos will have a representative in
+// JPEG or PNG file format
+$conf['tiff_representative_ext'] = 'png';
+?>