Changeset 882

Timestamp:

Oct 8, 2005, 1:25:42 AM (19 years ago)

Author:

plg

Message:

• 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.

Location:

trunk

Files:

• admin/configuration.php (modified) (2 diffs)
• doc/ChangeLog (modified) (1 diff)
• include/config_default.inc.php (modified) (1 diff)
• install/config.sql (modified) (1 diff)
• template/yoga/admin/configuration.tpl (modified) (1 diff)

trunk/admin/configuration.php

@@ -112 +112 @@
       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'].'\'
 ;';
@@ -158 +169 @@
         'GALLERY_LOCKED_YES'=>$lock_yes,
         'GALLERY_LOCKED_NO'=>$lock_no,
+        'CONF_GALLERY_TITLE' => $conf['gallery_title'],
+        'CONF_GALLERY_DESCRIPTION' => $conf['gallery_description'],
         ));
     break;

trunk/doc/ChangeLog

@@ +1 @@
+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
 

trunk/include/config_default.inc.php

@@ -168 +168 @@
 $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';

trunk/install/config.sql

@@ -14 +14 @@
 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');
+

trunk/template/yoga/admin/configuration.tpl

@@ -14 +14 @@
 
   <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>