- modification: configuration parameters gallery_title and

  gallery_description are GUI managed in
  Administration>Configuration>General

- bug fixed: configuration parameters (use|show)_(exif|iptc) and
  authorize_remembering should have been deleted from config table some time
  ago.


git-svn-id: http://piwigo.org/svn/trunk@882 68402e56-0260-453c-a942-63ccdbb3a9ee

5 files changed, 37 insertions, 12 deletions

diff --git a/admin/configuration.php b/admin/configuration.php
index ecbdcf1d4..f038800f4 100644
--- a/admin/configuration.php
+++ b/admin/configuration.php
@@ -111,9 +111,20 @@ if (isset($_POST['submit']))
     {
       if (isset($_POST[$row['param']]))
       {
+        $value = $_POST[$row['param']];
+      
+        if ('gallery_title' == $row['param']
+            or 'gallery_description' == $row['param'])
+        {
+          if (!$conf['allow_html_descriptions'])
+          {
+            $value = strip_tags($value);
+          }
+        }
+        
         $query = '
 UPDATE '.CONFIG_TABLE.'
-  SET value = \''. str_replace("\'", "''", $_POST[$row['param']]).'\'
+  SET value = \''. str_replace("\'", "''", $value).'\'
   WHERE param = \''.$row['param'].'\'
 ;';
         pwg_query($query);
@@ -157,6 +168,8 @@ switch ($page['section'])
         'HISTORY_NO'=>$history_no,
         'GALLERY_LOCKED_YES'=>$lock_yes,
         'GALLERY_LOCKED_NO'=>$lock_no,
+        'CONF_GALLERY_TITLE' => $conf['gallery_title'],
+        'CONF_GALLERY_DESCRIPTION' => $conf['gallery_description'],
         ));
     break;
   }
diff --git a/doc/ChangeLog b/doc/ChangeLog
index c0d8133c8..f22ec030d 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,5 +1,15 @@
 2005-10-08 Pierrick LE GALL
 
+	* modification: configuration parameters gallery_title and
+	gallery_description are GUI managed in
+	Administration>Configuration>General
+
+	* bug fixed: configuration parameters (use|show)_(exif|iptc) and
+	authorize_remembering should have been deleted from config table
+	some time ago.
+	
+2005-10-08 Pierrick LE GALL
+
 	* new: mass virtual categories movement manager in
 	Administration>Categories>Move screen.
 
diff --git a/include/config_default.inc.php b/include/config_default.inc.php
index c25bb76fc..e0c047f42 100644
--- a/include/config_default.inc.php
+++ b/include/config_default.inc.php
@@ -167,12 +167,6 @@ $conf['allow_random_representative'] = false;
 // category and element description.
 $conf['allow_html_descriptions'] = true;
 
-// gallery_title : Title at top of each page and for RSS feed
-$conf['gallery_title'] = 'PhpWebGallery demonstration site';
-
-// gallery_description : Short description displayed with gallery title
-$conf['gallery_description'] = 'My photos web site';
-
 // galery_url : URL given in RSS feed
 $conf['gallery_url'] = 'http://demo.phpwebgallery.net';
 
diff --git a/install/config.sql b/install/config.sql
index 41d109dae..d41b31113 100644
--- a/install/config.sql
+++ b/install/config.sql
@@ -13,9 +13,7 @@ INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('nb_line_page','3
 INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('recent_period','7','Period within which pictures are displayed as new (in days)');
 INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('auto_expand','false','Auto expand of the category tree');
 INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('show_nb_comments','false','Show the number of comments under the thumbnails');
-INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('use_iptc','false','Use IPTC data during database synchronization with files metadata');
-INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('use_exif','false','Use EXIF data during database synchronization with files metadata');
-INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('show_iptc','false','Show IPTC metadata on picture.php if asked by user');
-INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('show_exif','true','Show EXIF metadata on picture.php if asked by user');
-INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('authorize_remembering','true','Authorize users to be remembered, see $conf{remember_me_length}');
 INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('gallery_locked','false','Lock your gallery temporary for non admin users');
+INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('gallery_title','PhpWebGallery demonstration site','Title at top of each page and for RSS feed');
+INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('gallery_description','My photos web site','Short description displayed with gallery title');
+
diff --git a/template/yoga/admin/configuration.tpl b/template/yoga/admin/configuration.tpl
index 25cdc91b0..c2985c073 100644
--- a/template/yoga/admin/configuration.tpl
+++ b/template/yoga/admin/configuration.tpl
@@ -14,6 +14,16 @@
 
   <ul>
     <li>
+      <label for="gallery_title"><strong>{lang:Gallery title}</strong></label>
+      <input type="text" maxlength="255" size="50" name="gallery_title" id="gallery_title" value="{general.CONF_GALLERY_TITLE}" />
+    </li>
+
+    <li>
+      <label for="gallery_description"><strong>{lang:Gallery description}</strong></label>
+      <textarea cols="50" rows="5" name="gallery_description" id="gallery_description">{general.CONF_GALLERY_DESCRIPTION}</textarea>
+    </li>
+
+    <li>
       <label><strong>{lang:History}</strong></label>
       <input type="radio" class="radio" name="log" value="true" {general.HISTORY_YES} />{lang:Yes}
       <input type="radio" class="radio" name="log" value="false" {general.HISTORY_NO} />{lang:No}