From 8bf8b00a5bedbd67d58316b63824f88be35e8ad8 Mon Sep 17 00:00:00 2001 From: hertsch Date: Sat, 2 Nov 2013 05:14:02 +0100 Subject: [PATCH] Release 2.0.32 added compatibility handling for massmail Setup now drop all tables first --- VERSION | 2 +- info.php | 2 +- .../SyncData/Data/BackupFiles.php | 23 ++++++++++++++++++- .../SyncData/Data/BackupMaster.php | 23 ++++++++++++++++++- .../SyncData/Data/BackupTables.php | 23 ++++++++++++++++++- .../Data/Configuration/Configuration.php | 3 +++ .../phpManufaktur/SyncData/Data/General.php | 2 +- .../SyncData/Data/Setup/Setup.php | 15 ++++++++++++ .../SyncData/Data/SynchronizeArchives.php | 23 ++++++++++++++++++- .../SyncData/Data/SynchronizeClient.php | 23 ++++++++++++++++++- .../SyncData/Data/SynchronizeFiles.php | 23 ++++++++++++++++++- .../SyncData/Data/SynchronizeMaster.php | 23 ++++++++++++++++++- .../SyncData/Data/SynchronizeTables.php | 23 ++++++++++++++++++- 13 files changed, 197 insertions(+), 11 deletions(-) diff --git a/VERSION b/VERSION index e235558..79a82f0 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.31 +2.0.32 diff --git a/info.php b/info.php index 006779c..a9244d4 100644 --- a/info.php +++ b/info.php @@ -23,7 +23,7 @@ $module_directory = 'sync_data'; $module_name = 'SyncData'; $module_function = 'tool'; - $module_version = '2.0.31'; + $module_version = '2.0.32'; $module_status = 'Stable'; $module_platform = '2.8'; $module_author = 'Team phpManufaktur '; diff --git a/vendor/phpManufaktur/SyncData/Data/BackupFiles.php b/vendor/phpManufaktur/SyncData/Data/BackupFiles.php index b8c2d96..044cea6 100644 --- a/vendor/phpManufaktur/SyncData/Data/BackupFiles.php +++ b/vendor/phpManufaktur/SyncData/Data/BackupFiles.php @@ -71,7 +71,28 @@ public function createTable () } catch (\Doctrine\DBAL\DBALException $e) { throw new \Exception($e); } - } // createTable() + } + + /** + * Delete table - switching check for foreign keys off before executing + * + * @throws \Exception + */ + public function dropTable() + { + try { + $table = self::$table_name; + $SQL = <<app['db']->query($SQL); + $this->app['monolog']->addInfo("Drop table ".self::$table_name, array(__METHOD__, __LINE__)); + } catch (\Doctrine\DBAL\DBALException $e) { + throw new \Exception($e); + } + } /** * Insert a new record into the table diff --git a/vendor/phpManufaktur/SyncData/Data/BackupMaster.php b/vendor/phpManufaktur/SyncData/Data/BackupMaster.php index 3e37b08..6d8d47c 100644 --- a/vendor/phpManufaktur/SyncData/Data/BackupMaster.php +++ b/vendor/phpManufaktur/SyncData/Data/BackupMaster.php @@ -70,7 +70,28 @@ public function createTable () } catch (\Doctrine\DBAL\DBALException $e) { throw $e; } - } // createTable() + } + + /** + * Delete table - switching check for foreign keys off before executing + * + * @throws \Exception + */ + public function dropTable() + { + try { + $table = self::$table_name; + $SQL = <<app['db']->query($SQL); + $this->app['monolog']->addInfo("Drop table ".self::$table_name, array(__METHOD__, __LINE__)); + } catch (\Doctrine\DBAL\DBALException $e) { + throw new \Exception($e); + } + } /** * Insert a table to the backup master diff --git a/vendor/phpManufaktur/SyncData/Data/BackupTables.php b/vendor/phpManufaktur/SyncData/Data/BackupTables.php index 94c3821..defe2de 100644 --- a/vendor/phpManufaktur/SyncData/Data/BackupTables.php +++ b/vendor/phpManufaktur/SyncData/Data/BackupTables.php @@ -69,7 +69,28 @@ public function createTable () } catch (\Doctrine\DBAL\DBALException $e) { throw $e; } - } // createTable() + } + + /** + * Delete table - switching check for foreign keys off before executing + * + * @throws \Exception + */ + public function dropTable() + { + try { + $table = self::$table_name; + $SQL = <<app['db']->query($SQL); + $this->app['monolog']->addInfo("Drop table ".self::$table_name, array(__METHOD__, __LINE__)); + } catch (\Doctrine\DBAL\DBALException $e) { + throw new \Exception($e); + } + } /** * Insert a new record into the table diff --git a/vendor/phpManufaktur/SyncData/Data/Configuration/Configuration.php b/vendor/phpManufaktur/SyncData/Data/Configuration/Configuration.php index 961447b..fc2456a 100644 --- a/vendor/phpManufaktur/SyncData/Data/Configuration/Configuration.php +++ b/vendor/phpManufaktur/SyncData/Data/Configuration/Configuration.php @@ -209,6 +209,9 @@ protected function getConfigurationFromCMS() ), 'pages' => array( 'enabled' => false + ), + 'mod_massmail' => array( + 'enabled' => true ) ) ), diff --git a/vendor/phpManufaktur/SyncData/Data/General.php b/vendor/phpManufaktur/SyncData/Data/General.php index 67e2296..e25c5b2 100644 --- a/vendor/phpManufaktur/SyncData/Data/General.php +++ b/vendor/phpManufaktur/SyncData/Data/General.php @@ -351,7 +351,7 @@ public function insert($table, $data, $replace_cms_url=true) $table_name = substr($table, strlen(CMS_TABLE_PREFIX)); if (isset($this->app['config']['restore']['tables']['utf-8']['compatibility']['table'][$table_name]) && - ($this->app['config']['restore']['tables']['utf-8']['compatibility'][$table_name]['enabled'])) { + ($this->app['config']['restore']['tables']['utf-8']['compatibility']['table'][$table_name]['enabled'])) { // force the compatibility mode for this table return $this->compatibilityInsert($table, $data, $replace_cms_url); } diff --git a/vendor/phpManufaktur/SyncData/Data/Setup/Setup.php b/vendor/phpManufaktur/SyncData/Data/Setup/Setup.php index 3744323..3594aae 100644 --- a/vendor/phpManufaktur/SyncData/Data/Setup/Setup.php +++ b/vendor/phpManufaktur/SyncData/Data/Setup/Setup.php @@ -54,27 +54,42 @@ public function exec() try { // Backup Master table $BackupMaster = new BackupMaster($this->app); + $BackupMaster->dropTable(); $BackupMaster->createTable(); + // Backup Tables $BackupTables = new BackupTables($this->app); + $BackupTables->dropTable(); $BackupTables->createTable(); + // Synchronize Tables $SynchronizeTables = new SynchronizeTables($this->app); + $SynchronizeTables->dropTable(); $SynchronizeTables->createTable(); + // Backup files $BackupFiles = new BackupFiles($this->app); + $BackupFiles->dropTable(); $BackupFiles->createTable(); + // Synchronize Master $SynchronizeMaster = new SynchronizeMaster($this->app); + $SynchronizeMaster->dropTable(); $SynchronizeMaster->createTable(); + // Synchronize Files $SynchronizeFiles = new SynchronizeFiles($this->app); + $SynchronizeFiles->dropTable(); $SynchronizeFiles->createTable(); + // Synchronize Archives $SynchronizeArchives = new SynchronizeArchives($this->app); + $SynchronizeArchives->dropTable(); $SynchronizeArchives->createTable(); + // Synchronize Client $SynchronizeClient = new SynchronizeClient($this->app); + $SynchronizeClient->dropTable(); $SynchronizeClient->createTable(); $this->app['monolog']->addInfo('Setup is complete', diff --git a/vendor/phpManufaktur/SyncData/Data/SynchronizeArchives.php b/vendor/phpManufaktur/SyncData/Data/SynchronizeArchives.php index 97f2291..28e1866 100644 --- a/vendor/phpManufaktur/SyncData/Data/SynchronizeArchives.php +++ b/vendor/phpManufaktur/SyncData/Data/SynchronizeArchives.php @@ -69,7 +69,28 @@ public function createTable () } catch (\Doctrine\DBAL\DBALException $e) { throw $e; } - } // createTable() + } + + /** + * Delete table - switching check for foreign keys off before executing + * + * @throws \Exception + */ + public function dropTable() + { + try { + $table = self::$table_name; + $SQL = <<app['db']->query($SQL); + $this->app['monolog']->addInfo("Drop table ".self::$table_name, array(__METHOD__, __LINE__)); + } catch (\Doctrine\DBAL\DBALException $e) { + throw new \Exception($e); + } + } /** * Insert a new record into the table diff --git a/vendor/phpManufaktur/SyncData/Data/SynchronizeClient.php b/vendor/phpManufaktur/SyncData/Data/SynchronizeClient.php index fb49167..1a4f712 100644 --- a/vendor/phpManufaktur/SyncData/Data/SynchronizeClient.php +++ b/vendor/phpManufaktur/SyncData/Data/SynchronizeClient.php @@ -71,7 +71,28 @@ public function createTable () } catch (\Doctrine\DBAL\DBALException $e) { throw $e; } - } // createTable() + } + + /** + * Delete table - switching check for foreign keys off before executing + * + * @throws \Exception + */ + public function dropTable() + { + try { + $table = self::$table_name; + $SQL = <<app['db']->query($SQL); + $this->app['monolog']->addInfo("Drop table ".self::$table_name, array(__METHOD__, __LINE__)); + } catch (\Doctrine\DBAL\DBALException $e) { + throw new \Exception($e); + } + } /** * Insert a new record into the table diff --git a/vendor/phpManufaktur/SyncData/Data/SynchronizeFiles.php b/vendor/phpManufaktur/SyncData/Data/SynchronizeFiles.php index c5149e2..d0846c2 100644 --- a/vendor/phpManufaktur/SyncData/Data/SynchronizeFiles.php +++ b/vendor/phpManufaktur/SyncData/Data/SynchronizeFiles.php @@ -72,7 +72,28 @@ public function createTable () } catch (\Doctrine\DBAL\DBALException $e) { throw $e; } - } // createTable() + } + + /** + * Delete table - switching check for foreign keys off before executing + * + * @throws \Exception + */ + public function dropTable() + { + try { + $table = self::$table_name; + $SQL = <<app['db']->query($SQL); + $this->app['monolog']->addInfo("Drop table ".self::$table_name, array(__METHOD__, __LINE__)); + } catch (\Doctrine\DBAL\DBALException $e) { + throw new \Exception($e); + } + } /** * Insert a new record into the table diff --git a/vendor/phpManufaktur/SyncData/Data/SynchronizeMaster.php b/vendor/phpManufaktur/SyncData/Data/SynchronizeMaster.php index a1a1405..f7ead84 100644 --- a/vendor/phpManufaktur/SyncData/Data/SynchronizeMaster.php +++ b/vendor/phpManufaktur/SyncData/Data/SynchronizeMaster.php @@ -70,7 +70,28 @@ public function createTable () } catch (\Doctrine\DBAL\DBALException $e) { throw $e; } - } // createTable() + } + + /** + * Delete table - switching check for foreign keys off before executing + * + * @throws \Exception + */ + public function dropTable() + { + try { + $table = self::$table_name; + $SQL = <<app['db']->query($SQL); + $this->app['monolog']->addInfo("Drop table ".self::$table_name, array(__METHOD__, __LINE__)); + } catch (\Doctrine\DBAL\DBALException $e) { + throw new \Exception($e); + } + } /** * Insert a new record into the table diff --git a/vendor/phpManufaktur/SyncData/Data/SynchronizeTables.php b/vendor/phpManufaktur/SyncData/Data/SynchronizeTables.php index 76703cd..3b23bb9 100644 --- a/vendor/phpManufaktur/SyncData/Data/SynchronizeTables.php +++ b/vendor/phpManufaktur/SyncData/Data/SynchronizeTables.php @@ -72,7 +72,28 @@ public function createTable () } catch (\Doctrine\DBAL\DBALException $e) { throw $e; } - } // createTable() + } + + /** + * Delete table - switching check for foreign keys off before executing + * + * @throws \Exception + */ + public function dropTable() + { + try { + $table = self::$table_name; + $SQL = <<app['db']->query($SQL); + $this->app['monolog']->addInfo("Drop table ".self::$table_name, array(__METHOD__, __LINE__)); + } catch (\Doctrine\DBAL\DBALException $e) { + throw new \Exception($e); + } + } /** * Insert a new record into the table