React

.gitignore

@@ -1 +1,9 @@
-/nbproject/private/
+*~
+/.babelrc
+/assets.json
+/nbproject/
+/node_modules/
+/conf/defines.php
+/javascript/build/
+/javascript/dev/
+/config/defines.php

Module.php

@@ -1,104 +1,122 @@
 <?php
 
-namespace carousel;
-
 /**
  *
  * @author Matthew McNaney <mcnaneym@appstate.edu>
  * @license http://opensource.org/licenses/lgpl-3.0.html
  */
-class Module extends \Canopy\Module implements \Canopy\SettingDefaults
+
+namespace carousel;
+
+use Canopy\Request;
+use Canopy\Response;
+use Canopy\Server;
+use Canopy\SettingDefaults;
+use carousel\View\CarouselView;
+use carousel\Factory\CarouselFactory;
+use carousel\Controller\Controller;
+
+if (is_file(PHPWS_SOURCE_DIR . 'mod/carousel/config/defines.php')) {
+    require_once PHPWS_SOURCE_DIR . 'mod/carousel/config/defines.php';
+} else {
+    require_once PHPWS_SOURCE_DIR . 'mod/carousel/config/defines.dist.php';
+}
+
+class Module extends \Canopy\Module
 {
 
     public function __construct()
     {
         parent::__construct();
         $this->setTitle('carousel');
         $this->setProperName('Carousel for Bootstrap themes');
+        spl_autoload_register('\carousel\Module::autoloader', true, true);
     }
 
-    public function getController(\Canopy\Request $request)
+    public static function autoloader($class_name)
     {
-        $cmd = $request->shiftCommand();
-        if ($cmd == 'admin' && \Current_User::allow('carousel')) {
-            $admin = new \carousel\Controller\Admin($this);
-            return $admin;
+        static $not_found = array();
+
+        if (strpos($class_name, 'carousel') !== 0) {
+            return;
+        }
+
+        if (isset($not_found[$class_name])) {
+            return;
+        }
+        $class_array = explode('\\', $class_name);
+        array_shift($class_array);
+        $class_dir = implode('/', $class_array);
+
+        $class_path = PHPWS_SOURCE_DIR . 'mod/conference/class/' . $class_dir . '.php';
+        if (is_file($class_path)) {
+            require_once $class_path;
+            return true;
+        } else {
+            $not_found[] = $class_name;
+            return false;
         }
     }
 
-    public function runTime(\Canopy\Request $request)
+    public function getController(Request $request)
     {
-        if (!$request->isVar('module')) {
-            $display = \carousel\SlideFactory::display();
-            if (!empty($display)) {
-                \Layout::add($display, 'carousel', 'slides');
+        try {
+            $controller = new Controller($this, $request);
+            return $controller;
+        } catch (\conference\Exception\PrivilegeMissing $e) {
+            if ($request->isGet() && !$request->isAjax()) {
+                \Current_User::requireLogin();
+            } else {
+                throw $e;
             }
         }
     }
 
-    public function afterRun(\Canopy\Request $request, \Canopy\Response $response)
+    public function runTime(Request $request)
     {
-        $key = \Canopy\Key::getCurrent();
-        if ($key && !$key->isDummy()) {
-            $this->checkKey($key->id);
+        if (version_compare($this->version, '2.0.0', '<')) {
+            return;
+        }
+        if (!$request->isVar('module')) {
+            $view = new CarouselView;
+            $factory = new CarouselFactory;
+            $carousel = $factory->getHomeCarousel();
+            if (!empty($carousel)) {
+                $homeView = $view->view($carousel);
+                \Layout::add($homeView, 'carousel', 'slides');
+                if (\Current_User::allow('carousel')) {
+                    \MiniAdmin::add('carousel',
+                            '<a href="./carousel/Admin/Slide/?carouselId=' . $carousel->id . '">Edit current slides</a>');
+                }
+            }
         }
     }
 
-    private function checkKey($key_id)
+    public function afterRun(Request $request, \Canopy\Response $response)
     {
-        \Layout::addJSHeader('<script type="text/javascript" src="' . PHPWS_SOURCE_HTTP
-                . 'mod/carousel/javascript/add_slide.js"></script>');
-        $db = \phpws2\Database::newDB();
-        $t = $db->addTable('caro_keyed_slide');
-        $t->addField('slide_id');
-        $t->addFieldConditional('key_id', $key_id);
-        $result = $db->selectColumn();
-        if (\Current_User::allow('carousel')) {
-            $this->miniAdmin($result, $key_id);
+        if (version_compare($this->version, '2.0.0', '<')) {
+            return;
         }
-        if (!empty($result)) {
-            \carousel\SlideFactory::showKeySlide($result);
+        $key = \Canopy\Key::getCurrent();
+        if ($key && !$key->isDummy() && !$key->isHomeKey()) {
+            if (\Current_User::allow('carousel')) {
+                $this->pinForm($key->id);
+            }
+            $this->viewPinned($key->id);
         }
     }
 
-    private function miniAdmin($result, $key_id)
+    private function viewPinned($keyId)
     {
-        if (empty($result)) {
-            $db = \phpws2\Database::newDB();
-            $t2 = $db->addTable('caro_slide');
-            $t2->addOrderBy('title');
-            $t2->addField('title');
-            $t2->addField('id');
-            $slides = $db->select();
-            if (empty($slides)) {
-                return;
-            }
-
-            $opt[] = '<option id="0" style="">' . 'Add slide to this page' . '</option>';
-            foreach ($slides as $s) {
-                $opt[] = '<option value="' . $s['id'] . '">' . substr($s['title'],
-                                0, 15) . '</option>';
-            }
-
-            $select = '<select data-key-id="' . $key_id . '" id="add-slide" style="font-size:12px" class="form-control">'
-                    . implode("\n", $opt) . '</select>';
-        } else {
-            $select = '<a href="javascript:void(0)" id="remove-slide" data-key-id="' . $key_id . '">' . 'Remove slide from page' . '</a>';
-        }
-        \MiniAdmin::add('carousel', $select);
+        $carouselView = new View\CarouselView;
+        \Layout::add($carouselView->viewPinned($keyId), 'carousel', 'slides');
     }
 
-    public function getSettingDefaults()
+    private function pinForm($keyId)
     {
-        $s['min_width'] = 1000;
-        $s['min_height'] = 100;
-        $s['iteration'] = 0;
-        $s['time_interval'] = 5;
-        $s['display_mobile'] = false;
-        // transition 0 slide, 1 fade
-        $s['transition'] = 0;
-        $s['indicator'] = 0;
-        return $s;
+        $carouselView = new View\CarouselView;
+        $content = $carouselView->miniAdmin($keyId);
+        \MiniAdmin::add('carousel', $content);
     }
 
 }

boost/Version2.php

@@ -0,0 +1,153 @@
+<?php
+
+/**
+ * MIT License
+ * Copyright (c) 2019 Electronic Student Services @ Appalachian State University
+ * 
+ * See LICENSE file in root directory for copyright and distribution permissions.
+ * 
+ * @author Matthew McNaney <mcnaneym@appstate.edu>
+ * @license https://opensource.org/licenses/MIT
+ */
+class Version2
+{
+
+    private $previousSettings;
+
+    public function __construct()
+    {
+        $this->loadPreviousSettings();
+    }
+
+    public function runUpdate()
+    {
+        $this->updateControlpanel();
+        $this->createCarouselTable();
+        $this->createThumbnailDirectory();
+        $this->createPinTable();
+        $this->updateSlideTable();
+        $carouselId = $this->createFirstCarousel();
+        $this->updateSlides($carouselId);
+    }
+
+    private function createPinTable()
+    {
+        $db = \phpws2\Database::getDB();
+        $caroPin = $db->buildTable('caro_pin');
+        $ci = $caroPin->addDataType('carouselId', 'int');
+        $ki = $caroPin->addDataType('keyId', 'int');
+        $caroPin->create();
+        $unique = new \phpws2\Database\Unique([$ci, $ki]);
+        $unique->add();
+    }
+
+    private function updateControlpanel()
+    {
+        $db = \phpws2\Database::getDB();
+        $tbl = $db->addTable('controlpanel_link');
+        $tbl->addValue('url', 'carousel/Admin/Carousel');
+        $tbl->addFieldConditional('itemname', 'carousel');
+        $db->update();
+    }
+
+    private function createCarouselTable()
+    {
+        $db = \phpws2\Database::getDB();
+        $carousel = new \carousel\Resource\CarouselResource();
+        $carousel->createTable($db);
+    }
+
+    private function loadPreviousSettings()
+    {
+        $db = \phpws2\Database::getDB();
+        $settings = $db->addTable('settings');
+        $settings->addFieldConditional('module_name', 'carousel');
+        $result = $db->select();
+        if (empty($result)) {
+            return;
+        }
+        foreach ($result as $set) {
+            $this->previousSettings[$set['variable_name']] = $set['setting'];
+        }
+    }
+
+    private function createFirstCarousel()
+    {
+        $factory = new \carousel\Factory\CarouselFactory;
+        $carousel = $factory->build();
+        $carousel->title = 'First Carousel';
+        $carousel->iterations = $this->previousSettings['iteration'];
+        if ($carousel->iterations > 3) {
+            $carousel->iterations = 3;
+        }
+        $carousel->intervalTime = $this->previousSettings['time_interval'];
+        if ($carousel->intervalTime % 2) {
+            $carousel->intervalTime = $carousel->intervalTime + 1;
+        }
+        $carousel->transition = $this->previousSettings['transition'];
+        $carousel->indicator = $this->previousSettings['indicator'];
+        $carousel->frontpage = true;
+        $factory->save($carousel);
+        return $carousel->id;
+    }
+
+    private function createThumbnailDirectory()
+    {
+        $imgDirectory = PHPWS_HOME_DIR . 'images/carousel/thumbnail/';
+        if (!is_dir($imgDirectory)) {
+            mkdir($imgDirectory);
+        }
+    }
+
+    private function updateSlideTable()
+    {
+        $db = \phpws2\Database::getDB();
+        $tbl = $db->addTable('caro_slide');
+        $width = new \phpws2\Database\Datatype\Smallint($tbl, 'width');
+        $width->add();
+        $height = new \phpws2\Database\Datatype\Smallint($tbl, 'height');
+        $height->add();
+        $type = new \phpws2\Database\Datatype\Smallint($tbl, 'type');
+        $type->add();
+        $carouselId = new \phpws2\Database\Datatype\Integer($tbl, 'carouselId');
+        $carouselId->setDefault(0);
+        $carouselId->add();
+        $thumbnail = new \phpws2\Database\Datatype\Varchar($tbl, 'thumbnail');
+        $thumbnail->setSize(255);
+        $thumbnail->add();
+        $opacity = new \phpws2\Database\Datatype\Smallint($tbl, 'opacity');
+        $opacity->setDefault(50);
+        $opacity->add();
+    }
+
+    private function moveThumbnail($slide)
+    {
+        $filepath = $slide->filepath;
+        $oldThumbnailPath = preg_replace('/\.(png|jpeg)$/', '_tn.\\1', $filepath);
+        $pathArray = explode('/', $oldThumbnailPath);
+        $thumbnailFile = array_pop($pathArray);
+        $newPath = PHPWS_HOME_DIR . 'images/carousel/thumbnail/' . $thumbnailFile;
+        copy($oldThumbnailPath, $newPath);
+        unlink($oldThumbnailPath);
+        return 'images/carousel/thumbnail/' . $thumbnailFile;
+    }
+
+    private function updateSlides($carouselId)
+    {
+        $db = \phpws2\Database::getDB();
+        $tbl = $db->addTable('caro_slide');
+        $slides = $db->selectAsResources('\\carousel\\Resource\\SlideResource');
+
+        foreach ($slides as $slide) {
+            $dim = getimagesize($slide->filepath);
+            $slide->width = $dim[0];
+            $slide->height = $dim[1];
+            $slide->type = 0;
+            $slide->carouselId = $carouselId;
+            $newPath = $this->moveThumbnail($slide);
+            $slide->thumbnail = $newPath;
+            \carousel\Factory\SlideFactory::saveResource($slide);
+        }
+    }
+
+}

boost/boost.php

@@ -4,7 +4,7 @@
  * @author Matthew McNaney <mcnaneym@appstate.edu>
  */
 $proper_name = 'Carousel for Bootstrap';
-$version = '1.5.1';
+$version = '2.0.0';
 $import_sql = false;
 $image_dir = true;
 ?>

boost/controlpanel.php

@@ -5,7 +5,7 @@
  */
 $link[] = array('label' => 'Carousel',
     'restricted' => TRUE,
-    'url' => 'carousel/admin/',
+    'url' => 'carousel/Admin/Carousel',
     'description' => 'Image carousel for Bootstrap themes',
     'image' => 'carousel.gif',
     'tab' => 'content'