Changeset 21289

Timestamp:

Mar 6, 2013, 5:45:33 PM (12 years ago)

Author:

plg

Message:

bug fixed: table creation crashed with mysqli

specific code for pgsql/sqlite removed

replace $conflocal_data_dir by $confdata_location (introduced in Piwigo 2.4)

File:

• extensions/community/maintain.inc.php (modified) (4 diffs)

extensions/community/maintain.inc.php

@@ -10 +10 @@
   global $conf, $prefixeTable;
 
-  if ('mysql' == $conf['dblayer'])
-  {
-    $query = '
+  $query = '
 CREATE TABLE '.$prefixeTable.'community_permissions (
   id int(11) NOT NULL AUTO_INCREMENT,
@@ -25 +23 @@
 ) ENGINE=MyISAM DEFAULT CHARACTER SET utf8
 ;';
-    pwg_query($query);
-
-    $query = '
+  pwg_query($query);
+
+  $query = '
 CREATE TABLE '.$prefixeTable.'community_pendings (
   image_id mediumint(8) unsigned NOT NULL,
@@ -35 +33 @@
 ) ENGINE=MyISAM DEFAULT CHARACTER SET utf8
 ;';
-    pwg_query($query);
-  }
-  elseif ('pgsql' == $conf['dblayer'])
-  {
-    $query = '
-CREATE TABLE "'.$prefixeTable.'community_permissions" (
-  "id" serial NOT NULL,
-  "type" VARCHAR(255) NOT NULL,
-  "group_id" INTEGER,
-  "user_id" INTEGER,
-  "category_id" INTEGER,
-  "recursive" BOOLEAN default true,
-  "create_subcategories" BOOLEAN default false,
-  "moderated" BOOLEAN default true,
-  PRIMARY KEY ("id")
-)
-;';
-    pwg_query($query);
-
-    $query = '
-CREATE TABLE "'.$prefixeTable.'community_pendings" (
-  image_id INTEGER NOT NULL,
-  state VARCHAR(255) NOT NULL,
-  added_on TIMESTAMP NOT NULL,
-  validated_by INTEGER
-)
-;';
-    pwg_query($query);
-  }
-  else
-  {
-    $query = '
-CREATE TABLE "'.$prefixeTable.'community_permissions" (
-  "id" INTEGER NOT NULL,
-  "type" VARCHAR(255) NOT NULL,
-  "group_id" INTEGER,
-  "user_id" INTEGER,
-  "category_id" INTEGER,
-  "recursive" BOOLEAN default true,
-  "create_subcategories" BOOLEAN default false,
-  "moderated" BOOLEAN default true,
-  PRIMARY KEY ("id")
-)
-;';
-    pwg_query($query);
-
-    $query = '
-CREATE TABLE "'.$prefixeTable.'community_pendings" (
-  image_id INTEGER NOT NULL,
-  state VARCHAR(255) NOT NULL,
-  added_on TIMESTAMP NOT NULL,
-  validated_by INTEGER
-)
-;';
-    pwg_query($query);
-  }
+  pwg_query($query);
 }
 
@@ -147 +90 @@
   global $conf, $prefixeTable;
   
-  $from_piwigo21_file = $conf['local_data_dir'].'/plugins/core_user_upload_to_community.php';
+  $from_piwigo21_file = $conf['data_location'].'/plugins/core_user_upload_to_community.php';
   if (is_file($from_piwigo21_file))
   {