From 6affb54459b84523da52f4d294e04485eb3eb173 Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Tue, 25 Apr 2023 08:06:35 +0000 Subject: [PATCH] try #5868 @0.5 --- framework/application/configs/application.ini | 8 -------- .../controllers/MaintenanceController.php | 20 ++++++++++++++----- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/framework/application/configs/application.ini b/framework/application/configs/application.ini index ba1f548..367c018 100644 --- a/framework/application/configs/application.ini +++ b/framework/application/configs/application.ini @@ -29,14 +29,6 @@ database.params.username = fluidbookwebv3 database.params.password = QsFe2wxVMW database.params.dbname = fluidbookwebv3 -former.database.adapter = pdo_mysql -former.database.params.host = localhost -former.database.params.username = fluidbook -former.database.params.password = *arica*2 -former.database.params.dbname = fluidbook - -former.home = /home/fluidbook/www - seo.universalAnalytics = UA-4339912-2 seo.google = google93c0129ef18a399d.html seo.bing = 8986457D1D126C38A815027C839372DC diff --git a/framework/application/controllers/MaintenanceController.php b/framework/application/controllers/MaintenanceController.php index b583f35..09e74ea 100644 --- a/framework/application/controllers/MaintenanceController.php +++ b/framework/application/controllers/MaintenanceController.php @@ -21,12 +21,22 @@ class MaintenanceController extends CubeIT_Controller_MaintenanceController // } // } + /** + * @return CubeIT_Services_Fluidbook + */ + protected static function getFluidbookAPI() + { + $res = new CubeIT_Services_Fluidbook(); + $res->login('api@fluidbook.com', '#fTJAx!Ea5kanhX'); + return $res; + } + public function importReferences() { set_time_limit(0); ignore_user_abort(true); - $ws = new CubeIT_Services_Fluidbook('vincent@cubedesigners.com', 'mT3HuyUdCd'); + $ws = self::getFluidbookAPI(); $references = Fluidbook_Model_Reference::factory()->find(); if (isset($_GET['id'])) { @@ -44,7 +54,7 @@ class MaintenanceController extends CubeIT_Controller_MaintenanceController } } $fluidbooks = array_values(array_unique($fluidbooks)); - print_r($fluidbooks); + shuffle($fluidbooks); $n = 0; foreach ($fluidbooks as $fluidbook) { @@ -61,11 +71,11 @@ class MaintenanceController extends CubeIT_Controller_MaintenanceController $n++; } } catch (exception $e) { - echo $e->getMessage() . '
'; + echo 'Error installing book '.$fluidbook . '
'; exit; } } catch (exception $e) { - echo $e->getMessage() . '
'; + echo 'Error getting metadata for book '.$fluidbook . '
'; exit; } } @@ -74,7 +84,7 @@ class MaintenanceController extends CubeIT_Controller_MaintenanceController public static function importReference($id) { - $ws = new CubeIT_Services_Fluidbook('vincent@cubedesigners.com', 'mT3HuyUdCd'); + $ws = self::getFluidbookAPI(); $meta = $ws->getMetadata($id); $dir = PUBLIC_PATH . '/references/' . $id . '-' . CubeIT_Text::str2URL(trim($meta->title)); $res = $ws->installBook($id, $dir, 'online', 3, function () use ($id) { -- 2.39.5