Changeset 10653

Timestamp:

Apr 28, 2011, 7:16:45 PM (13 years ago)

Author:

patdenice

Message:

Insert upload form parameters in database during installation.
Remove prepare_upload_configuration function.

Location:

trunk

Files:

• admin/include/functions_upload.inc.php (modified) (1 diff)
• admin/photos_add.php (modified) (1 diff)
• admin/thumbnail.php (modified) (1 diff)
• include/ws_functions.inc.php (modified) (1 diff)
• install/config.sql (modified) (1 diff)
• install/db/104-database.php (added)

trunk/admin/include/functions_upload.inc.php

@@ -141 +141 @@
 
   return $upload_form_config;
-}
-
-/*
- * automatic fill of configuration parameters
- */
-function prepare_upload_configuration()
-{
-  global $conf;
-
-  $inserts = array();
-  
-  foreach (get_upload_form_config() as $param_shortname => $param)
-  {
-    $param_name = 'upload_form_'.$param_shortname;
-  
-    if (!isset($conf[$param_name]))
-    {
-      $conf[$param_name] = $param['default'];
-      
-      array_push(
-        $inserts,
-        array(
-          'param' => $param_name,
-          'value' => boolean_to_string($param['default']),
-          )
-        );
-    }
-  }
-  
-  if (count($inserts) > 0)
-  {
-    mass_inserts(
-      CONFIG_TABLE,
-      array_keys($inserts[0]),
-      $inserts
-      );
-  }
 }
 

trunk/admin/photos_add.php

@@ -44 +44 @@
 // |                          Load configuration                           |
 // +-----------------------------------------------------------------------+
-
-prepare_upload_configuration();
 
 $upload_form_config = get_upload_form_config();

trunk/admin/thumbnail.php

@@ -30 +30 @@
 // |                          Load configuration                           |
 // +-----------------------------------------------------------------------+
-prepare_upload_configuration();
-
 $upload_form_config = get_upload_form_config();
 

trunk/include/ws_functions.inc.php

@@ -1451 +1451 @@
 
   include_once(PHPWG_ROOT_PATH.'admin/include/functions_upload.inc.php');
-  prepare_upload_configuration();
 
   $image_id = add_uploaded_file(

trunk/install/config.sql

@@ -51 +51 @@
 INSERT INTO piwigo_config (param,value,comment) VALUES ('week_starts_on','monday','Monday may not be the first day of the week');
 INSERT INTO piwigo_config (param,value,comment) VALUES ('updates_ignored','a:3:{s:7:"plugins";a:0:{}s:6:"themes";a:0:{}s:9:"languages";a:0:{}}','Extensions ignored for update');
+INSERT INTO piwigo_config (param,value) VALUES ('websize_resize','true');
+INSERT INTO piwigo_config (param,value) VALUES ('websize_maxwidth','800');
+INSERT INTO piwigo_config (param,value) VALUES ('websize_maxheight','600');
+INSERT INTO piwigo_config (param,value) VALUES ('websize_quality','95');
+INSERT INTO piwigo_config (param,value) VALUES ('thumb_maxwidth','128');
+INSERT INTO piwigo_config (param,value) VALUES ('thumb_maxheight','96');
+INSERT INTO piwigo_config (param,value) VALUES ('thumb_quality','95');
+INSERT INTO piwigo_config (param,value) VALUES ('thumb_crop','false');
+INSERT INTO piwigo_config (param,value) VALUES ('thumb_follow_orientation','true');
+INSERT INTO piwigo_config (param,value) VALUES ('hd_keep','true');
+INSERT INTO piwigo_config (param,value) VALUES ('hd_resize','false');
+INSERT INTO piwigo_config (param,value) VALUES ('hd_maxwidth','2000');
+INSERT INTO piwigo_config (param,value) VALUES ('hd_maxheight','2000');
+INSERT INTO piwigo_config (param,value) VALUES ('hd_quality','95');