try #5868 @0.5

diff --git a/framework/application/configs/application.ini b/framework/application/configs/application.ini
index ba1f5485ae74dad458451152687556a7949d1c1f..367c018755976d49a455a8485f84b4aa0877b59d 100644 (file)
--- 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 b583f353cdefed9b462c32fab0233957a481128d..09e74ea419d0fd1c1d13f3a1a0b8e945dd2c8d16 100644 (file)
--- 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() . '<br />';
+                    echo 'Error installing book '.$fluidbook . '<br />';
                     exit;
                 }
             } catch (exception $e) {
-                echo $e->getMessage() . '<br />';
+                echo 'Error getting metadata for book '.$fluidbook . '<br />';
                 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) {