From 151374add107f2eeab862bd9a786dc2ba99e303f Mon Sep 17 00:00:00 2001
From: Mark Hamstra <hello@markhamstra.com>
Date: Mon, 28 Jan 2019 11:57:54 +0100
Subject: [PATCH 01/20] Fix nonaggregated column in SELECT list when showing
 gallery items (only_full_group_by)

Full error: Expression #13 of SELECT list is not in GROUP BY clause and contains nonaggregated column 'premium.AlbumItems.rank' which is not functionally dependent on columns in GROUP BY clause; this is incompatible with sql_mode=only_full_group_by
---
 core/components/gallery/processors/mgr/item/getlist.class.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/components/gallery/processors/mgr/item/getlist.class.php b/core/components/gallery/processors/mgr/item/getlist.class.php
index b1f3735..9dc4c7e 100644
--- a/core/components/gallery/processors/mgr/item/getlist.class.php
+++ b/core/components/gallery/processors/mgr/item/getlist.class.php
@@ -62,7 +62,6 @@ public function prepareQueryAfterCount(xPDOQuery $c) {
                 WHERE Tags.item = galItem.id
             ) AS tags'
         ));
-        $c->groupBy('id');
         return $c;
     }
 

From 1812e5cff4a5da1e9533adddb39b97971b2f2345 Mon Sep 17 00:00:00 2001
From: Dmitriy Antipov <aston_bonny@mail.ru>
Date: Thu, 1 Oct 2020 21:51:50 +0300
Subject: [PATCH 02/20] Update ajaxupload.php

ERROR .../core/components/gallery/processors/mgr/item/ajaxupload.php 75
[Gallery] Album Type: # (number) - fix
---
 core/components/gallery/processors/mgr/item/ajaxupload.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/components/gallery/processors/mgr/item/ajaxupload.php b/core/components/gallery/processors/mgr/item/ajaxupload.php
index 90eb498..01addb6 100644
--- a/core/components/gallery/processors/mgr/item/ajaxupload.php
+++ b/core/components/gallery/processors/mgr/item/ajaxupload.php
@@ -72,7 +72,7 @@
 
     $file = array("name" => $relativePath, "tmp_name" => $randomFilename, "error" => "0"); // emulate a $_FILES object
 
-    $modx->log(xPDO::LOG_LEVEL_ERROR,'[Gallery] Album Type: '.$scriptProperties['album']);
+    $modx->log(xPDO::MODX_LOG_LEVEL_INFO,'[Gallery] Album Type: '.$scriptProperties['album']);
 
 
     if ($bytes == 0 || !$item->upload($file,$scriptProperties['album'])) {

From b91eda0c8e24fd116ec8d44f2c26894a8fbaa299 Mon Sep 17 00:00:00 2001
From: Dmitriy Antipov <aston_bonny@mail.ru>
Date: Thu, 21 Jan 2021 00:39:40 +0300
Subject: [PATCH 03/20] Update ajaxupload.php

---
 core/components/gallery/processors/mgr/item/ajaxupload.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/components/gallery/processors/mgr/item/ajaxupload.php b/core/components/gallery/processors/mgr/item/ajaxupload.php
index 01addb6..54fe3fc 100644
--- a/core/components/gallery/processors/mgr/item/ajaxupload.php
+++ b/core/components/gallery/processors/mgr/item/ajaxupload.php
@@ -72,7 +72,7 @@
 
     $file = array("name" => $relativePath, "tmp_name" => $randomFilename, "error" => "0"); // emulate a $_FILES object
 
-    $modx->log(xPDO::MODX_LOG_LEVEL_INFO,'[Gallery] Album Type: '.$scriptProperties['album']);
+    $modx->log(xPDO::LOG_LEVEL_INFO,'[Gallery] Album Type: '.$scriptProperties['album']);
 
 
     if ($bytes == 0 || !$item->upload($file,$scriptProperties['album'])) {

From 417aa530b383fd47f2b73602acbcf6cf10788ac0 Mon Sep 17 00:00:00 2001
From: halftrainedharry <katachrese@gmx.ch>
Date: Wed, 20 Apr 2022 10:04:32 +0200
Subject: [PATCH 04/20] change flat-file processors

---
 .../gallery/import/galzipimport.class.php     |  15 +-
 .../processors/mgr/item/ajaxupload.php        | 234 ++++++------
 .../processors/mgr/item/batchupload.php       | 235 ++++++------
 .../gallery/processors/mgr/item/sort.php      |  79 ++--
 .../gallery/processors/mgr/item/zipupload.php |  69 ++--
 .../gallery/processors/web/phpthumb.php       | 347 +++++++++---------
 6 files changed, 510 insertions(+), 469 deletions(-)

diff --git a/core/components/gallery/model/gallery/import/galzipimport.class.php b/core/components/gallery/model/gallery/import/galzipimport.class.php
index 3e6c75f..e87a8f4 100644
--- a/core/components/gallery/model/gallery/import/galzipimport.class.php
+++ b/core/components/gallery/model/gallery/import/galzipimport.class.php
@@ -150,11 +150,18 @@ public function importFile($file,array $options = array()) {
      * @return bool|string
      */
     public function unpack() {
-        if (!$this->modx->loadClass('compression.xPDOZip',$this->modx->getOption('core_path').'xpdo/',true,true)) {
-            return $this->modx->lexicon('gallery.xpdozip_err_nf');
+        $archive = null;
+        if ($this->modx->getVersionData()['version'] >= 3){
+            //V3
+            $archive = new xPDO\Compression\xPDOZip($this->modx,$this->source['tmp_name']);
+        } else {
+            //V2
+            if (!$this->modx->loadClass('compression.xPDOZip',$this->modx->getOption('core_path').'xpdo/',true,true)) {
+                return $this->modx->lexicon('gallery.xpdozip_err_nf');
+            }
+            $archive = new xPDOZip($this->modx,$this->source['tmp_name']);
         }
-        /* unpack zip file */
-        $archive = new xPDOZip($this->modx,$this->source['tmp_name']);
+        /* unpack zip file */ 
         if (!$archive) {
             return $this->modx->lexicon('gallery.zip_err_unpack');
         }
diff --git a/core/components/gallery/processors/mgr/item/ajaxupload.php b/core/components/gallery/processors/mgr/item/ajaxupload.php
index 90eb498..e2a02ff 100644
--- a/core/components/gallery/processors/mgr/item/ajaxupload.php
+++ b/core/components/gallery/processors/mgr/item/ajaxupload.php
@@ -2,119 +2,125 @@
 /* @var modX $modx
  * @var array $scriptProperties
  */
-
-/* validate form */
-$album = $modx->getOption('album',$scriptProperties,false);
-$filenm = $modx->getOption('qqfile',$scriptProperties,false);
-/* If $filenm is an array, it means we've used IE and we need to use a different name. */
-if (is_array($filenm)) $filenm = $filenm['name'];
-
-if (empty($album)) return $modx->error->failure($modx->lexicon('gallery.album_err_ns'));
-if (empty($filenm)) return $modx->error->failure($modx->lexicon('gallery.item_err_ns'));
-
-/* create item */
-$scriptProperties['active'] = !empty($scriptProperties['active']) ? 1 : 0;
-/** @var galItem $item */
-$item = $modx->newObject('galItem');
-$item->fromArray($scriptProperties);
-$item->set('createdby',$modx->user->get('id'));
-$item->set('name',$filenm);
-
-if (!$item->save()) {
-    return $modx->error->failure($modx->lexicon('gallery.item_err_save'));
-}
-
-/* Upload */
-$albumDir = $album.'/';
-$targetDir = $modx->call('galAlbum','getFilesPath',array(&$modx)).$albumDir;
-
-// $cacheManager = $modx->getCacheManager();
-// /* if directory doesnt exist, create it */
-// if (!file_exists($targetDir) || !is_dir($targetDir)) {
-//     if (!$cacheManager->writeTree($targetDir)) {
-//        $modx->log(xPDO::LOG_LEVEL_ERROR,'[Gallery] Could not create directory: '.$targetDir);
-//        return $modx->toJSON(array('error' => 'Could not create directory: ' . $targetDir));
-//     }
-// }
-// /* make sure directory is readable/writable */
-// if (!is_readable($targetDir) || !is_writable($targetDir)) {
-//     $modx->log(xPDO::LOG_LEVEL_ERROR,'[Gallery] Could not write to directory: '.$targetDir);
-//     return $modx->toJSON(array('error' => 'Could not write to directory: ' . $targetDir));
-// }
-
-/* upload the file */
-$extension = @end(explode('.', $filenm));
-$filename = $item->get('id').'.'.$extension;
-$relativePath = $albumDir.$filename;
-$absolutePath = $targetDir.$filename;
-
-
-if (!empty($_FILES['qqfile'])) {
-    if (!$item->upload($_FILES['qqfile'],$scriptProperties['album'])) {
-        $item->remove();
-        return $modx->error->failure($modx->lexicon('gallery.item_err_upload'));
-    }
-} else {
-
-    $length = 10;
-    $tmpDir = MODX_CORE_PATH."cache/gallery-tmp/";
-
-    if(!file_exists($tmpDir)) mkdir($tmpDir);
-
-    $randomFilename = $tmpDir.substr(str_shuffle("0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"), 0, $length).".$extension";
-
-    /* Using AJAX upload - to tmp file then use the correct media source to upload */
-    $input = fopen("php://input", "r");
-    $target = fopen($randomFilename, "w");
-    $bytes = stream_copy_to_stream($input, $target);
-    fclose($input);
-    fclose($target);
-
-    $file = array("name" => $relativePath, "tmp_name" => $randomFilename, "error" => "0"); // emulate a $_FILES object
-
-    $modx->log(xPDO::LOG_LEVEL_ERROR,'[Gallery] Album Type: '.$scriptProperties['album']);
-
-
-    if ($bytes == 0 || !$item->upload($file,$scriptProperties['album'])) {
-        $modx->log(xPDO::LOG_LEVEL_ERROR,'[Gallery] An error occurred while trying to upload the file to '.$absolutePath);
-        $item->remove();
-        return $modx->toJSON(array('error' => 'gallery.item_err_upload'));
-    } else {
-        $item->set('filename',str_replace(' ','',$relativePath));
+class GalleryItemAjaxUploadProcessor extends modProcessor {
+
+    public function process(){
+        $modx = $this->modx;
+        $scriptProperties = $this->properties;
+
+        /* validate form */
+        $album = $modx->getOption('album',$scriptProperties,false);
+        $filenm = $modx->getOption('qqfile',$scriptProperties,false);
+        /* If $filenm is an array, it means we've used IE and we need to use a different name. */
+        if (is_array($filenm)) $filenm = $filenm['name'];
+
+        if (empty($album)) return $modx->error->failure($modx->lexicon('gallery.album_err_ns'));
+        if (empty($filenm)) return $modx->error->failure($modx->lexicon('gallery.item_err_ns'));
+
+        /* create item */
+        $scriptProperties['active'] = !empty($scriptProperties['active']) ? 1 : 0;
+        /** @var galItem $item */
+        $item = $modx->newObject('galItem');
+        $item->fromArray($scriptProperties);
+        $item->set('createdby',$modx->user->get('id'));
+        $item->set('name',$filenm);
+
+        if (!$item->save()) {
+            return $modx->error->failure($modx->lexicon('gallery.item_err_save'));
+        }
+
+        /* Upload */
+        $albumDir = $album.'/';
+        $targetDir = $modx->call('galAlbum','getFilesPath',array(&$modx)).$albumDir;
+
+        // $cacheManager = $modx->getCacheManager();
+        // /* if directory doesnt exist, create it */
+        // if (!file_exists($targetDir) || !is_dir($targetDir)) {
+        //     if (!$cacheManager->writeTree($targetDir)) {
+        //        $modx->log(xPDO::LOG_LEVEL_ERROR,'[Gallery] Could not create directory: '.$targetDir);
+        //        return $modx->toJSON(array('error' => 'Could not create directory: ' . $targetDir));
+        //     }
+        // }
+        // /* make sure directory is readable/writable */
+        // if (!is_readable($targetDir) || !is_writable($targetDir)) {
+        //     $modx->log(xPDO::LOG_LEVEL_ERROR,'[Gallery] Could not write to directory: '.$targetDir);
+        //     return $modx->toJSON(array('error' => 'Could not write to directory: ' . $targetDir));
+        // }
+
+        /* upload the file */
+        $extension = @end(explode('.', $filenm));
+        $filename = $item->get('id').'.'.$extension;
+        $relativePath = $albumDir.$filename;
+        $absolutePath = $targetDir.$filename;
+
+
+        if (!empty($_FILES['qqfile'])) {
+            if (!$item->upload($_FILES['qqfile'],$scriptProperties['album'])) {
+                $item->remove();
+                return $modx->error->failure($modx->lexicon('gallery.item_err_upload'));
+            }
+        } else {
+
+            $length = 10;
+            $tmpDir = MODX_CORE_PATH."cache/gallery-tmp/";
+
+            if(!file_exists($tmpDir)) mkdir($tmpDir);
+
+            $randomFilename = $tmpDir.substr(str_shuffle("0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"), 0, $length).".$extension";
+
+            /* Using AJAX upload - to tmp file then use the correct media source to upload */
+            $input = fopen("php://input", "r");
+            $target = fopen($randomFilename, "w");
+            $bytes = stream_copy_to_stream($input, $target);
+            fclose($input);
+            fclose($target);
+
+            $file = array("name" => $relativePath, "tmp_name" => $randomFilename, "error" => "0"); // emulate a $_FILES object
+
+            $modx->log(xPDO::LOG_LEVEL_ERROR,'[Gallery] Album Type: '.$scriptProperties['album']);
+
+
+            if ($bytes == 0 || !$item->upload($file,$scriptProperties['album'])) {
+                $modx->log(xPDO::LOG_LEVEL_ERROR,'[Gallery] An error occurred while trying to upload the file to '.$absolutePath);
+                $item->remove();
+                return $modx->toJSON(array('error' => 'gallery.item_err_upload'));
+            } else {
+                $item->set('filename',str_replace(' ','',$relativePath));
+            }
+
+            @unlink($randomFilename);
+        }
+
+        $item->save();
+
+        /* get count of items in album */
+        $total = $modx->getCount('galAlbumItem',array('album' => $scriptProperties['album']));
+
+        /* associate with album */
+        /** @var galAlbumItem $albumItem */
+        $albumItem = $modx->newObject('galAlbumItem');
+        $albumItem->set('album',$scriptProperties['album']);
+        $albumItem->set('item',$item->get('id'));
+        $albumItem->set('rank',$total);
+        $albumItem->save();
+
+        /* save tags */
+        if (isset($scriptProperties['tags'])) {
+            $tagNames = explode(',',$scriptProperties['tags']);
+            foreach ($tagNames as $tagName) {
+                $tagName = trim($tagName);
+                if (empty($tagName)) continue;
+
+                /** @var galTag $tag */
+                $tag = $modx->newObject('galTag');
+                $tag->set('item',$item->get('id'));
+                $tag->set('tag',$tagName);
+                $tag->save();
+            }
+        }
+
+        /* output to browser */
+        return $modx->toJSON(array('success' => true));
     }
-
-    @unlink($randomFilename);
 }
-
-$item->save();
-
-/* get count of items in album */
-$total = $modx->getCount('galAlbumItem',array('album' => $scriptProperties['album']));
-
-/* associate with album */
-/** @var galAlbumItem $albumItem */
-$albumItem = $modx->newObject('galAlbumItem');
-$albumItem->set('album',$scriptProperties['album']);
-$albumItem->set('item',$item->get('id'));
-$albumItem->set('rank',$total);
-$albumItem->save();
-
-/* save tags */
-if (isset($scriptProperties['tags'])) {
-    $tagNames = explode(',',$scriptProperties['tags']);
-    foreach ($tagNames as $tagName) {
-        $tagName = trim($tagName);
-        if (empty($tagName)) continue;
-
-        /** @var galTag $tag */
-        $tag = $modx->newObject('galTag');
-        $tag->set('item',$item->get('id'));
-        $tag->set('tag',$tagName);
-        $tag->save();
-    }
-}
-
-/* output to browser */
-return $modx->toJSON(array('success' => true));
-
-?>
+return 'GalleryItemAjaxUploadProcessor';
diff --git a/core/components/gallery/processors/mgr/item/batchupload.php b/core/components/gallery/processors/mgr/item/batchupload.php
index 32b7249..7ec6aa1 100644
--- a/core/components/gallery/processors/mgr/item/batchupload.php
+++ b/core/components/gallery/processors/mgr/item/batchupload.php
@@ -18,128 +18,139 @@
  * Place, Suite 330, Boston, MA 02111-1307 USA
  *
  * @package gallery
- */
-/**
+ * 
  * Batch upload items into an Album via a directory
- *
- * @package gallery
  */
+class GalleryItemBatchUploadProcessor extends modProcessor {
 
-/* validate form */
-$album = $modx->getOption('album',$scriptProperties,false);
-if (empty($album)) return $modx->error->failure($modx->lexicon('gallery.album_err_ns'));
-
-$scriptProperties['active'] = !empty($scriptProperties['active']) ? 1 : 0;
-
-if (empty($scriptProperties['directory'])) $modx->error->addField('directory',$modx->lexicon('gallery.directory_err_ns'));
-$directory = str_replace(array(
-    '{base_path}',
-    '{assets_path}',
-    '{core_path}',
-),array(
-    $modx->getOption('base_path',null,MODX_BASE_PATH),
-    $modx->getOption('assets_path',null,MODX_ASSETS_PATH),
-    $modx->getOption('core_path',null,MODX_CORE_PATH),
-),$scriptProperties['directory']);
-
-if (empty($directory) || !is_dir($directory)) $modx->error->addField('directory',$modx->lexicon('gallery.directory_err_nf'));
-
-if ($modx->error->hasError()) {
-    return $modx->error->failure();
-}
-
-
-/* get sanitized base path and current path */
-$modx->getService('fileHandler','modFileHandler');
-$fullpath = $modx->fileHandler->sanitizePath($directory);
+    public function process(){
+        $modx = $this->modx;
+        $scriptProperties = $this->properties;
 
+        /* validate form */
+        $album = $modx->getOption('album',$scriptProperties,false);
+        if (empty($album)) return $modx->error->failure($modx->lexicon('gallery.album_err_ns'));
 
-$targetDir = $modx->call('galAlbum','getFilesPath',array(&$modx)).$scriptProperties['album'].'/';
+        $scriptProperties['active'] = !empty($scriptProperties['active']) ? 1 : 0;
 
-$imagesExts = array('jpg','jpeg','png','gif','bmp');
-$use_multibyte = $modx->getOption('use_multibyte',null,false);
-$encoding = $modx->getOption('modx_charset',null,'UTF-8');
-/* iterate */
-$images = array();
-$errors = array();
-$files = array();
-foreach (new DirectoryIterator($fullpath) as $file) {
-    if (in_array($file,array('.','..','.svn','_notes'))) continue;
-    if (!$file->isReadable() || $file->isDir()) continue;
+        if (empty($scriptProperties['directory'])) $modx->error->addField('directory',$modx->lexicon('gallery.directory_err_ns'));
+        $directory = str_replace(array(
+            '{base_path}',
+            '{assets_path}',
+            '{core_path}',
+        ),array(
+            $modx->getOption('base_path',null,MODX_BASE_PATH),
+            $modx->getOption('assets_path',null,MODX_ASSETS_PATH),
+            $modx->getOption('core_path',null,MODX_CORE_PATH),
+        ),$scriptProperties['directory']);
 
-    $files[$file->getFilename()] = array(
-        'pathname' => $file->getPathname()
-    );
-}
-ksort($files);
-foreach ($files as $f_name => $file) {
-    $fileName = $f_name;
-    $filePathName = $file['pathname'];
-
-    $fileExtension = pathinfo($filePathName,PATHINFO_EXTENSION);
-    $fileExtension = $use_multibyte ? mb_strtolower($fileExtension,$encoding) : strtolower($fileExtension);
-    if (!in_array($fileExtension,$imagesExts)) continue;
-
-    /* create item */
-    $item = $modx->newObject('galItem');
-    $item->set('name',$fileName);
-    $item->set('createdby',$modx->user->get('id'));
-    $item->set('mediatype','image');
-    $item->set('active',$scriptProperties['active']);
-    if (!$item->save()) {
-        $errors[] = $modx->lexicon('gallery.item_err_save');
-        continue;
-    }
+        if (empty($directory) || !is_dir($directory)) $modx->error->addField('directory',$modx->lexicon('gallery.directory_err_nf'));
 
-    $newFileName = $item->get('id').'.'.$fileExtension;
-    $newRelativePath = $scriptProperties['album'].'/'.$newFileName;
-    $newAbsolutePath = $targetDir.'/'.$newFileName;
-
-    $file = array("name" => $newRelativePath, "tmp_name" => $filePathName, "error" => "0"); // emulate a $_FILES object
-
-    $success = $item->upload($file,$scriptProperties['album']);
-    if(!$success) {
-        $errors[] = $modx->lexicon('gallery.file_err_move',array(
-            'file' => $newFileName,
-            'target' => $newAbsolutePath,
-        ));
-        $item->remove();
-        continue;
-    } else {
-        $item->set('filename',$newRelativePath);
-        $item->save();
-    }
+        if ($modx->error->hasError()) {
+            return $modx->error->failure();
+        }
 
-    /* get count of items in album */
-    $total = $modx->getCount('galAlbumItem',array('album' => $_POST['album']));
-
-    /* associate with album */
-    $albumItem = $modx->newObject('galAlbumItem');
-    $albumItem->set('album',$scriptProperties['album']);
-    $albumItem->set('item',$item->get('id'));
-    $albumItem->set('rank',$total);
-    $albumItem->save();
-
-    /* save tags */
-    if (isset($scriptProperties['tags'])) {
-        $tagNames = explode(',',$scriptProperties['tags']);
-        foreach ($tagNames as $tagName) {
-            $tagName = trim($tagName);
-            if (empty($tagName)) continue;
-
-            $tag = $modx->newObject('galTag');
-            $tag->set('item',$item->get('id'));
-            $tag->set('tag',$tagName);
-            $tag->save();
+        /* get sanitized base path and current path */
+        $filehandler = null;
+        if ($this->modx->getVersionData()['version'] >= 3){
+            //V3
+            $filehandler = new MODX\Revolution\File\modFileHandler($modx);
+        } else {
+            //V2
+            $modx->getService('fileHandler','modFileHandler');
+            $filehandler = $modx->fileHandler;
+        }
+        $fullpath = $filehandler->sanitizePath($directory);
+
+        $targetDir = $modx->call('galAlbum','getFilesPath',array(&$modx)).$scriptProperties['album'].'/';
+
+        $imagesExts = array('jpg','jpeg','png','gif','bmp');
+        $use_multibyte = $modx->getOption('use_multibyte',null,false);
+        $encoding = $modx->getOption('modx_charset',null,'UTF-8');
+        /* iterate */
+        $images = array();
+        $errors = array();
+        $files = array();
+        foreach (new DirectoryIterator($fullpath) as $file) {
+            if (in_array($file,array('.','..','.svn','_notes'))) continue;
+            if (!$file->isReadable() || $file->isDir()) continue;
+
+            $files[$file->getFilename()] = array(
+                'pathname' => $file->getPathname()
+            );
+        }
+        ksort($files);
+        foreach ($files as $f_name => $file) {
+            $fileName = $f_name;
+            $filePathName = $file['pathname'];
+
+            $fileExtension = pathinfo($filePathName,PATHINFO_EXTENSION);
+            $fileExtension = $use_multibyte ? mb_strtolower($fileExtension,$encoding) : strtolower($fileExtension);
+            if (!in_array($fileExtension,$imagesExts)) continue;
+
+            /* create item */
+            $item = $modx->newObject('galItem');
+            $item->set('name',$fileName);
+            $item->set('createdby',$modx->user->get('id'));
+            $item->set('mediatype','image');
+            $item->set('active',$scriptProperties['active']);
+            if (!$item->save()) {
+                $errors[] = $modx->lexicon('gallery.item_err_save');
+                continue;
+            }
+
+            $newFileName = $item->get('id').'.'.$fileExtension;
+            $newRelativePath = $scriptProperties['album'].'/'.$newFileName;
+            $newAbsolutePath = $targetDir.'/'.$newFileName;
+
+            $file = array("name" => $newRelativePath, "tmp_name" => $filePathName, "error" => "0"); // emulate a $_FILES object
+
+            $success = $item->upload($file,$scriptProperties['album']);
+            if(!$success) {
+                $errors[] = $modx->lexicon('gallery.file_err_move',array(
+                    'file' => $newFileName,
+                    'target' => $newAbsolutePath,
+                ));
+                $item->remove();
+                continue;
+            } else {
+                $item->set('filename',$newRelativePath);
+                $item->save();
+            }
+
+            /* get count of items in album */
+            $total = $modx->getCount('galAlbumItem',array('album' => $_POST['album']));
+
+            /* associate with album */
+            $albumItem = $modx->newObject('galAlbumItem');
+            $albumItem->set('album',$scriptProperties['album']);
+            $albumItem->set('item',$item->get('id'));
+            $albumItem->set('rank',$total);
+            $albumItem->save();
+
+            /* save tags */
+            if (isset($scriptProperties['tags'])) {
+                $tagNames = explode(',',$scriptProperties['tags']);
+                foreach ($tagNames as $tagName) {
+                    $tagName = trim($tagName);
+                    if (empty($tagName)) continue;
+
+                    $tag = $modx->newObject('galTag');
+                    $tag->set('item',$item->get('id'));
+                    $tag->set('tag',$tagName);
+                    $tag->save();
+                }
+            }
+
+            $images[] = $fileName;
         }
-    }
 
-    $images[] = $fileName;
-}
+        if (!empty($errors)) {
+            return $modx->error->failure(implode(',',$errors));
+        }
 
-if (!empty($errors)) {
-    return $modx->error->failure(implode(',',$errors));
+        /* output to browser */
+        return $modx->error->success('',$images);
+    }
 }
-
-/* output to browser */
-return $modx->error->success('',$images);
+return 'GalleryItemBatchUploadProcessor';
diff --git a/core/components/gallery/processors/mgr/item/sort.php b/core/components/gallery/processors/mgr/item/sort.php
index 3ce8880..26dd88b 100644
--- a/core/components/gallery/processors/mgr/item/sort.php
+++ b/core/components/gallery/processors/mgr/item/sort.php
@@ -25,41 +25,50 @@
  * @package gallery
  * @subpackage processors
  */
-$source = $modx->getObject('galAlbumItem',array(
-    'album' => $scriptProperties['album'],
-    'item' => $scriptProperties['source'],
-));
-if (empty($source)) return $modx->error->failure();
+class GalleryItemSortProcessor extends modProcessor {
 
-$target = $modx->getObject('galAlbumItem',array(
-    'album' => $scriptProperties['album'],
-    'item' => $scriptProperties['target'],
-));
-if (empty($target)) return $modx->error->failure();
+    public function process(){
+        $modx = $this->modx;
+        $scriptProperties = $this->properties;
 
-if ($source->get('rank') < $target->get('rank')) {
-    $modx->exec("
-        UPDATE {$modx->getTableName('galAlbumItem')}
-            SET rank = rank - 1
-        WHERE
-            album = ".$scriptProperties['album']."
-        AND rank < {$target->get('rank')}
-        AND rank > {$source->get('rank')}
-        AND rank > 0
-    ");
-    $newRank = $target->get('rank')-1;
-} else {
-    $modx->exec("
-        UPDATE {$modx->getTableName('galAlbumItem')}
-            SET rank = rank + 1
-        WHERE
-            album = ".$scriptProperties['album']."
-        AND rank >= {$target->get('rank')}
-        AND rank < {$source->get('rank')}
-    ");
-    $newRank = $target->get('rank');
-}
-$source->set('rank',$newRank);
-$source->save();
+        $source = $modx->getObject('galAlbumItem',array(
+            'album' => $scriptProperties['album'],
+            'item' => $scriptProperties['source'],
+        ));
+        if (empty($source)) return $modx->error->failure();
+
+        $target = $modx->getObject('galAlbumItem',array(
+            'album' => $scriptProperties['album'],
+            'item' => $scriptProperties['target'],
+        ));
+        if (empty($target)) return $modx->error->failure();
 
-return $modx->error->success();
+        if ($source->get('rank') < $target->get('rank')) {
+            $modx->exec("
+                UPDATE {$modx->getTableName('galAlbumItem')}
+                    SET rank = rank - 1
+                WHERE
+                    album = ".$scriptProperties['album']."
+                AND rank < {$target->get('rank')}
+                AND rank > {$source->get('rank')}
+                AND rank > 0
+            ");
+            $newRank = $target->get('rank')-1;
+        } else {
+            $modx->exec("
+                UPDATE {$modx->getTableName('galAlbumItem')}
+                    SET rank = rank + 1
+                WHERE
+                    album = ".$scriptProperties['album']."
+                AND rank >= {$target->get('rank')}
+                AND rank < {$source->get('rank')}
+            ");
+            $newRank = $target->get('rank');
+        }
+        $source->set('rank',$newRank);
+        $source->save();
+
+        return $modx->error->success();
+    }
+}
+return 'GalleryItemSortProcessor';
diff --git a/core/components/gallery/processors/mgr/item/zipupload.php b/core/components/gallery/processors/mgr/item/zipupload.php
index 0497e47..a4c6a92 100644
--- a/core/components/gallery/processors/mgr/item/zipupload.php
+++ b/core/components/gallery/processors/mgr/item/zipupload.php
@@ -18,44 +18,49 @@
  * Place, Suite 330, Boston, MA 02111-1307 USA
  *
  * @package gallery
- */
-/**
- * Batch upload items into an Album via a Zip file
  *
- * @package gallery
+ * Batch upload items into an Album via a Zip file
  */
+class GalleryItemZipUploadProcessor extends modProcessor {
 
-/* validate form */
-$album = $modx->getOption('album',$scriptProperties,false);
-if (empty($album)) return $modx->error->failure($modx->lexicon('gallery.album_err_ns'));
+    public function process(){
+        $modx = $this->modx;
+        $scriptProperties = $this->properties;
 
-$scriptProperties['active'] = !empty($scriptProperties['active']) ? 1 : 0;
-if (empty($_FILES['zip']) || $_FILES['zip']['error'] !== UPLOAD_ERR_OK) {
-    $modx->error->addField('zip',$modx->lexicon('gallery.zip_err_ns'));
-}
+        /* validate form */
+        $album = $modx->getOption('album',$scriptProperties,false);
+        if (empty($album)) return $modx->error->failure($modx->lexicon('gallery.album_err_ns'));
 
-/* load import class */
-$loaded = $modx->gallery->loadImporter('galZipImport');
-if ($loaded !== true) return $modx->error->failure($loaded);
+        $scriptProperties['active'] = !empty($scriptProperties['active']) ? 1 : 0;
+        if (empty($_FILES['zip']) || $_FILES['zip']['error'] !== UPLOAD_ERR_OK) {
+            $modx->error->addField('zip',$modx->lexicon('gallery.zip_err_ns'));
+        }
 
-/* attempt to set source zip */
-if (!$modx->gallery->galZipImport->setSource($_FILES['zip'])) {
-    $modx->error->addField('zip',$modx->lexicon('gallery.zip_err_ns'));
-}
+        /* load import class */
+        $loaded = $modx->gallery->loadImporter('galZipImport');
+        if ($loaded !== true) return $modx->error->failure($loaded);
 
-$targetSet = $modx->gallery->galZipImport->setTarget($scriptProperties['album']);
-if (!$targetSet) {
-    $modx->error->addField('zip',$targetSet);
-}
-if ($modx->error->hasError()) {
-    return $modx->error->failure();
-}
+        /* attempt to set source zip */
+        if (!$modx->gallery->galZipImport->setSource($_FILES['zip'])) {
+            $modx->error->addField('zip',$modx->lexicon('gallery.zip_err_ns'));
+        }
 
-/* run import */
-$success = $modx->gallery->galZipImport->run($scriptProperties);
-if ($success !== true) {
-    return $modx->error->failure($success);
-}
+        $targetSet = $modx->gallery->galZipImport->setTarget($scriptProperties['album']);
+        if (!$targetSet) {
+            $modx->error->addField('zip',$targetSet);
+        }
+        if ($modx->error->hasError()) {
+            return $modx->error->failure();
+        }
+
+        /* run import */
+        $success = $modx->gallery->galZipImport->run($scriptProperties);
+        if ($success !== true) {
+            return $modx->error->failure($success);
+        }
 
-/* output to browser */
-return $modx->error->success('',$modx->gallery->galZipImport->results);
\ No newline at end of file
+        /* output to browser */
+        return $modx->error->success('',$modx->gallery->galZipImport->results);
+    }
+}
+return 'GalleryItemZipUploadProcessor';
\ No newline at end of file
diff --git a/core/components/gallery/processors/web/phpthumb.php b/core/components/gallery/processors/web/phpthumb.php
index 0ced2c6..a1b3b57 100644
--- a/core/components/gallery/processors/web/phpthumb.php
+++ b/core/components/gallery/processors/web/phpthumb.php
@@ -1,199 +1,202 @@
 <?php
 
 /**
- * @var modX $modx
- * @var array $scriptProperties
- * @var Gallery $gallery
- *
  * @package gallery
  */
 
 /* load phpThumb */
+class GalleryPhpthumbProcessor extends modProcessor {
 
+    public function process(){
+        $modx = $this->modx;
+        $scriptProperties = $this->properties;
 
-if (!class_exists('phpthumb', false)) {
-    if (!$modx->loadClass('phpthumb', MODX_CORE_PATH . 'model/phpthumb/', true, true)) {
-        $modx->log(modX::LOG_LEVEL_ERROR, '[phpThumbOf] Could not load modPhpThumb class.');
-        return '';
-    }
-}
+        if (!class_exists('phpthumb', false)) {
+            if (!$modx->loadClass('phpthumb', MODX_CORE_PATH . 'model/phpthumb/', true, true)) {
+                $modx->log(modX::LOG_LEVEL_ERROR, '[phpThumbOf] Could not load modPhpThumb class.');
+                return '';
+            }
+        }
 
 
-$debug = $modx->getOption('debug', $scriptProperties, false);
+        $debug = $modx->getOption('debug', $scriptProperties, false);
 
-$src = $modx->getOption('src', $scriptProperties, '');
-$src = str_replace('+', '%27', urldecode($src));
+        $src = $modx->getOption('src', $scriptProperties, '');
+        $src = str_replace('+', '%27', urldecode($src));
 
-/* explode tag options */
-$ptOptions = array();
+        /* explode tag options */
+        $ptOptions = array();
 
-// Only public parameters of phpThumb should be allowed to pass from user input.
-// List properties between START PARAMETERS and START PARAMETERS in src/core/model/phpthumb/phpthumb.class.php
-$allowed = array(
-    'src', 'new', 'w', 'h', 'wp', 'hp', 'wl', 'hl', 'ws', 'hs',
-    'f', 'q', 'sx', 'sy', 'sw', 'sh', 'zc', 'bc', 'bg', 'fltr',
-    'goto', 'err', 'xto', 'ra', 'ar', 'aoe', 'far', 'iar', 'maxb', 'down',
-    'md5s', 'sfn', 'dpi', 'sia', 'phpThumbDebug'
-);
+        // Only public parameters of phpThumb should be allowed to pass from user input.
+        // List properties between START PARAMETERS and START PARAMETERS in src/core/model/phpthumb/phpthumb.class.php
+        $allowed = array(
+            'src', 'new', 'w', 'h', 'wp', 'hp', 'wl', 'hl', 'ws', 'hs',
+            'f', 'q', 'sx', 'sy', 'sw', 'sh', 'zc', 'bc', 'bg', 'fltr',
+            'goto', 'err', 'xto', 'ra', 'ar', 'aoe', 'far', 'iar', 'maxb', 'down',
+            'md5s', 'sfn', 'dpi', 'sia', 'phpThumbDebug'
+        );
 
-/* iterate through properties */
-foreach ($scriptProperties as $property => $value) {
-    if (!in_array($property, $allowed, true)) {
-        $this->modx->log(modX::LOG_LEVEL_WARN, "Detected attempt of using private parameter `$property` (for internal usage) of phpThumb that not allowed and insecure");
-        continue;
-    }
-    $ptOptions[$property] = $value;
-}
+        /* iterate through properties */
+        foreach ($scriptProperties as $property => $value) {
+            if (!in_array($property, $allowed, true)) {
+                $this->modx->log(modX::LOG_LEVEL_WARN, "Detected attempt of using private parameter `$property` (for internal usage) of phpThumb that not allowed and insecure");
+                continue;
+            }
+            $ptOptions[$property] = $value;
+        }
 
-if (empty($ptOptions['f'])) {
-    $ext = pathinfo($src, PATHINFO_EXTENSION);
-    $ext = strtolower($ext);
-    switch ($ext) {
-        case 'jpg':
-        case 'jpeg':
-        case 'png':
-        case 'gif':
-        case 'bmp':
-            $ptOptions['f'] = $ext;
-            break;
-        default:
-            $ptOptions['f'] = 'jpeg';
-            break;
-    }
-}
+        if (empty($ptOptions['f'])) {
+            $ext = pathinfo($src, PATHINFO_EXTENSION);
+            $ext = strtolower($ext);
+            switch ($ext) {
+                case 'jpg':
+                case 'jpeg':
+                case 'png':
+                case 'gif':
+                case 'bmp':
+                    $ptOptions['f'] = $ext;
+                    break;
+                default:
+                    $ptOptions['f'] = 'jpeg';
+                    break;
+            }
+        }
 
-/* load phpthumb */
-$assetsPath = $modx->getOption('gallery.assets_path', $scriptProperties, $modx->getOption('assets_path') . 'components/gallery/');
-$cacheDir = $assetsPath . 'cache/';
+        /* load phpthumb */
+        $assetsPath = $modx->getOption('gallery.assets_path', $scriptProperties, $modx->getOption('assets_path') . 'components/gallery/');
+        $cacheDir = $assetsPath . 'cache/';
 
-/* check to make sure cache dir is writable */
-if (!is_writable($cacheDir)) {
-    if (!$modx->cacheManager->writeTree($cacheDir)) {
-        $modx->log(modX::LOG_LEVEL_ERROR, '[phpThumbOf] Cache dir not writable: ' . $assetsPath . 'cache/');
-        return '';
-    }
-}
+        /* check to make sure cache dir is writable */
+        if (!is_writable($cacheDir)) {
+            if (!$modx->cacheManager->writeTree($cacheDir)) {
+                $modx->log(modX::LOG_LEVEL_ERROR, '[phpThumbOf] Cache dir not writable: ' . $assetsPath . 'cache/');
+                return '';
+            }
+        }
 
-/* get absolute url of image */
-if (strpos($src, '/') != 0 && strpos($src, 'http') != 0) {
-    $src = $modx->getOption('base_url') . $src;
-} else {
-    $src = urldecode($src);
-}
-/* auto-prepend base path if not a URL */
-if (strpos($src, 'http') === false) {
-    $basePath = $modx->getOption('base_path', null, MODX_BASE_PATH);
-    if ($basePath != '/') {
-        $src = str_replace(basename($basePath), '', $src);
-        $src = ltrim($src, '/');
-        $src = $basePath . $src;
-    }
-}
+        /* get absolute url of image */
+        if (strpos($src, '/') != 0 && strpos($src, 'http') != 0) {
+            $src = $modx->getOption('base_url') . $src;
+        } else {
+            $src = urldecode($src);
+        }
+        /* auto-prepend base path if not a URL */
+        if (strpos($src, 'http') === false) {
+            $basePath = $modx->getOption('base_path', null, MODX_BASE_PATH);
+            if ($basePath != '/') {
+                $src = str_replace(basename($basePath), '', $src);
+                $src = ltrim($src, '/');
+                $src = $basePath . $src;
+            }
+        }
 
-if (!isset($config['modphpthumb'])) { // make sure we get a few relevant system settings
-    $config['modphpthumb'] = array();
-    $config['modphpthumb']['config_allow_src_above_docroot'] = (boolean)$modx->getOption('phpthumb_allow_src_above_docroot', null, false);
-    $config['modphpthumb']['zc'] = $modx->getOption('phpthumb_zoomcrop', null, 0);
-    $config['modphpthumb']['far'] = $modx->getOption('phpthumb_far', null, 'C');
-    $config['modphpthumb']['config_ttf_directory'] = MODX_CORE_PATH . 'model/phpthumb/fonts/';
-    $config['modphpthumb']['config_document_root'] = $modx->getOption('phpthumb_document_root', null, '');
-}
-$phpThumb = new phpthumb(); // unfortunately we have to create a new object for each image!
-foreach ($config['modphpthumb'] as $param => $value) { // add MODX system settings
-    $phpThumb->$param = $value;
-}
-foreach ($ptOptions as $param => $value) { // add options passed to the snippet
-    $phpThumb->setParameter($param, $value);
-}
-// try to avert problems when $_SERVER['DOCUMENT_ROOT'] is different than MODX_BASE_PATH
-if (!$phpThumb->config_document_root) {
-    $phpThumb->config_document_root = MODX_BASE_PATH; // default if nothing set from system settings
-}
-$phpThumb->config_cache_directory = $assetsPath . 'cache/'; // doesn't matter, but saves phpThumb some frustration
-$phpThumb->setSourceFilename($src);
-
-/* setup cache filename that is unique to this tag */
-$inputSanitized = str_replace(array(':', '/'), '_', $src);
-$cacheFilename = $inputSanitized;
-$cacheFilename .= '.' . md5(serialize($scriptProperties));
-$cacheFilename .= '.' . (!empty($ptOptions['f']) ? $ptOptions['f'] : 'png');
-$cacheKey = $assetsPath . 'cache/' . $cacheFilename;
-
-/* get cache Url */
-$assetsUrl = $modx->getOption('gallery.assets_url', $scriptProperties, $modx->getOption('assets_url') . 'components/gallery/');
-$cacheUrl = $assetsUrl . 'cache/' . str_replace($cacheDir, '', $cacheKey);
-$cacheUrl = str_replace('//', '/', $cacheUrl);
-
-/* ensure we have an accurate and clean cache directory */
-$phpThumb->CleanUpCacheDirectory();
-
-/* debugging code */
-if ($debug) {
-    $mtime = microtime();
-    $mtime = explode(" ", $mtime);
-    $mtime = $mtime[1] + $mtime[0];
-    $tstart = $mtime;
-    set_time_limit(0);
-
-    $oldLogTarget = $modx->getLogTarget();
-    $oldLogLevel = $modx->getLogLevel();
-    $modx->setLogLevel(modX::LOG_LEVEL_DEBUG);
-    $logTarget = $modx->getOption('debugTarget', $scriptProperties, '');
-    if (!empty($logTarget)) {
-        $modx->setLogTarget();
-    }
-}
+        if (!isset($config['modphpthumb'])) { // make sure we get a few relevant system settings
+            $config['modphpthumb'] = array();
+            $config['modphpthumb']['config_allow_src_above_docroot'] = (boolean)$modx->getOption('phpthumb_allow_src_above_docroot', null, false);
+            $config['modphpthumb']['zc'] = $modx->getOption('phpthumb_zoomcrop', null, 0);
+            $config['modphpthumb']['far'] = $modx->getOption('phpthumb_far', null, 'C');
+            $config['modphpthumb']['config_ttf_directory'] = MODX_CORE_PATH . 'model/phpthumb/fonts/';
+            $config['modphpthumb']['config_document_root'] = $modx->getOption('phpthumb_document_root', null, '');
+        }
+        $phpThumb = new phpthumb(); // unfortunately we have to create a new object for each image!
+        foreach ($config['modphpthumb'] as $param => $value) { // add MODX system settings
+            $phpThumb->$param = $value;
+        }
+        foreach ($ptOptions as $param => $value) { // add options passed to the snippet
+            $phpThumb->setParameter($param, $value);
+        }
+        // try to avert problems when $_SERVER['DOCUMENT_ROOT'] is different than MODX_BASE_PATH
+        if (!$phpThumb->config_document_root) {
+            $phpThumb->config_document_root = MODX_BASE_PATH; // default if nothing set from system settings
+        }
+        $phpThumb->config_cache_directory = $assetsPath . 'cache/'; // doesn't matter, but saves phpThumb some frustration
+        $phpThumb->setSourceFilename($src);
+
+        /* setup cache filename that is unique to this tag */
+        $inputSanitized = str_replace(array(':', '/'), '_', $src);
+        $cacheFilename = $inputSanitized;
+        $cacheFilename .= '.' . md5(serialize($scriptProperties));
+        $cacheFilename .= '.' . (!empty($ptOptions['f']) ? $ptOptions['f'] : 'png');
+        $cacheKey = $assetsPath . 'cache/' . $cacheFilename;
+
+        /* get cache Url */
+        $assetsUrl = $modx->getOption('gallery.assets_url', $scriptProperties, $modx->getOption('assets_url') . 'components/gallery/');
+        $cacheUrl = $assetsUrl . 'cache/' . str_replace($cacheDir, '', $cacheKey);
+        $cacheUrl = str_replace('//', '/', $cacheUrl);
+
+        /* ensure we have an accurate and clean cache directory */
+        $phpThumb->CleanUpCacheDirectory();
+
+        /* debugging code */
+        if ($debug) {
+            $mtime = microtime();
+            $mtime = explode(" ", $mtime);
+            $mtime = $mtime[1] + $mtime[0];
+            $tstart = $mtime;
+            set_time_limit(0);
+
+            $oldLogTarget = $modx->getLogTarget();
+            $oldLogLevel = $modx->getLogLevel();
+            $modx->setLogLevel(modX::LOG_LEVEL_DEBUG);
+            $logTarget = $modx->getOption('debugTarget', $scriptProperties, '');
+            if (!empty($logTarget)) {
+                $modx->setLogTarget();
+            }
+        }
 
-/* ensure file has proper permissions */
-if (!empty($cacheKey)) {
-    $filePerm = (int)$modx->getOption('new_file_permissions', $scriptProperties, '0664');
-    @chmod($cacheKey, octdec($filePerm));
-}
-if ($debug) {
-    $mtime = microtime();
-    $mtime = explode(" ", $mtime);
-    $mtime = $mtime[1] + $mtime[0];
-    $tend = $mtime;
-    $totalTime = ($tend - $tstart);
-    $totalTime = sprintf("%2.4f s", $totalTime);
-
-    $modx->log(modX::LOG_LEVEL_DEBUG, "\n<br />Execution time: {$totalTime}\n<br />");
-    $modx->setLogLevel($oldLogLevel);
-    $modx->setLogTarget($oldLogTarget);
-}
-$output = $assetsUrl;
-
-
-/* check to see if there's a cached file of this already */
-if (file_exists($cacheKey)) {
-    $modx->log(modX::LOG_LEVEL_DEBUG, '[phpThumbOf] Using cached file found for thumb: ' . $cacheKey);
-    $output = str_replace(' ', '%20', $cacheUrl);
-} else {
-    /* actually make the thumbnail */
-    //return $cacheKey;
-    if ($phpThumb->GenerateThumbnail()) { // this line is VERY important, do not remove it!
-        if ($phpThumb->RenderToFile($cacheKey)) {
+        /* ensure file has proper permissions */
+        if (!empty($cacheKey)) {
+            $filePerm = (int)$modx->getOption('new_file_permissions', $scriptProperties, '0664');
+            @chmod($cacheKey, octdec($filePerm));
+        }
+        if ($debug) {
+            $mtime = microtime();
+            $mtime = explode(" ", $mtime);
+            $mtime = $mtime[1] + $mtime[0];
+            $tend = $mtime;
+            $totalTime = ($tend - $tstart);
+            $totalTime = sprintf("%2.4f s", $totalTime);
+
+            $modx->log(modX::LOG_LEVEL_DEBUG, "\n<br />Execution time: {$totalTime}\n<br />");
+            $modx->setLogLevel($oldLogLevel);
+            $modx->setLogTarget($oldLogTarget);
+        }
+        $output = $assetsUrl;
+
+
+        /* check to see if there's a cached file of this already */
+        if (file_exists($cacheKey)) {
+            $modx->log(modX::LOG_LEVEL_DEBUG, '[phpThumbOf] Using cached file found for thumb: ' . $cacheKey);
             $output = str_replace(' ', '%20', $cacheUrl);
         } else {
-            $modx->log(modX::LOG_LEVEL_ERROR, '[phpThumbOf] Could not cache thumb "' . $src . '" to file at: ' . $cacheKey . ' - Debug: ' . print_r($phpThumb->debugmessages, true));
+            /* actually make the thumbnail */
+            //return $cacheKey;
+            if ($phpThumb->GenerateThumbnail()) { // this line is VERY important, do not remove it!
+                if ($phpThumb->RenderToFile($cacheKey)) {
+                    $output = str_replace(' ', '%20', $cacheUrl);
+                } else {
+                    $modx->log(modX::LOG_LEVEL_ERROR, '[phpThumbOf] Could not cache thumb "' . $src . '" to file at: ' . $cacheKey . ' - Debug: ' . print_r($phpThumb->debugmessages, true));
+                }
+            } else {
+                $modx->log(modX::LOG_LEVEL_ERROR, '[phpThumbOf] Could not generate thumbnail: ' . $src . ' - Debug: ' . print_r($phpThumb->debugmessages, true));
+            }
         }
-    } else {
-        $modx->log(modX::LOG_LEVEL_ERROR, '[phpThumbOf] Could not generate thumbnail: ' . $src . ' - Debug: ' . print_r($phpThumb->debugmessages, true));
-    }
-}
 
-if (!headers_sent()) {
-    $headers = $modx->request->getHeaders();
-    $mtime = filemtime($cacheKey);
-    if (isset($headers['If-Modified-Since']) && strtotime($headers['If-Modified-Since']) == $mtime) {
-        // cache is good, send 304
-        header('Last-Modified: '.gmdate('D, d M Y H:i:s', $mtime).' GMT', true, 304);
-        exit();
+        if (!headers_sent()) {
+            $headers = $modx->request->getHeaders();
+            $mtime = filemtime($cacheKey);
+            if (isset($headers['If-Modified-Since']) && strtotime($headers['If-Modified-Since']) == $mtime) {
+                // cache is good, send 304
+                header('Last-Modified: '.gmdate('D, d M Y H:i:s', $mtime).' GMT', true, 304);
+                exit();
+            }
+            header('Last-Modified: '.gmdate('D, d M Y H:i:s', $mtime).' GMT', true, 200);
+            $phpThumb->setOutputFormat();
+            header('Content-Type: '.phpthumb_functions::ImageTypeToMIMEtype($phpThumb->thumbnailFormat));
+            header('Content-Disposition: inline; filename="'.basename($src).'"');
+        }
+
+        return file_get_contents($cacheKey);
     }
-    header('Last-Modified: '.gmdate('D, d M Y H:i:s', $mtime).' GMT', true, 200);
-    $phpThumb->setOutputFormat();
-    header('Content-Type: '.phpthumb_functions::ImageTypeToMIMEtype($phpThumb->thumbnailFormat));
-    header('Content-Disposition: inline; filename="'.basename($src).'"');
 }
-
-return file_get_contents($cacheKey);
+return 'GalleryPhpthumbProcessor';

From 0b6a380dd1661980d12381269e29148997efb58a Mon Sep 17 00:00:00 2001
From: halftrainedharry <katachrese@gmx.ch>
Date: Wed, 20 Apr 2022 10:14:14 +0200
Subject: [PATCH 05/20] rename flat-file processor files

---
 .../processors/mgr/item/{ajaxupload.php => ajaxupload.class.php}  | 0
 .../mgr/item/{batchupload.php => batchupload.class.php}           | 0
 .../gallery/processors/mgr/item/{sort.php => sort.class.php}      | 0
 .../processors/mgr/item/{zipupload.php => zipupload.class.php}    | 0
 .../gallery/processors/web/{phpthumb.php => phpthumb.class.php}   | 0
 5 files changed, 0 insertions(+), 0 deletions(-)
 rename core/components/gallery/processors/mgr/item/{ajaxupload.php => ajaxupload.class.php} (100%)
 rename core/components/gallery/processors/mgr/item/{batchupload.php => batchupload.class.php} (100%)
 rename core/components/gallery/processors/mgr/item/{sort.php => sort.class.php} (100%)
 rename core/components/gallery/processors/mgr/item/{zipupload.php => zipupload.class.php} (100%)
 rename core/components/gallery/processors/web/{phpthumb.php => phpthumb.class.php} (100%)

diff --git a/core/components/gallery/processors/mgr/item/ajaxupload.php b/core/components/gallery/processors/mgr/item/ajaxupload.class.php
similarity index 100%
rename from core/components/gallery/processors/mgr/item/ajaxupload.php
rename to core/components/gallery/processors/mgr/item/ajaxupload.class.php
diff --git a/core/components/gallery/processors/mgr/item/batchupload.php b/core/components/gallery/processors/mgr/item/batchupload.class.php
similarity index 100%
rename from core/components/gallery/processors/mgr/item/batchupload.php
rename to core/components/gallery/processors/mgr/item/batchupload.class.php
diff --git a/core/components/gallery/processors/mgr/item/sort.php b/core/components/gallery/processors/mgr/item/sort.class.php
similarity index 100%
rename from core/components/gallery/processors/mgr/item/sort.php
rename to core/components/gallery/processors/mgr/item/sort.class.php
diff --git a/core/components/gallery/processors/mgr/item/zipupload.php b/core/components/gallery/processors/mgr/item/zipupload.class.php
similarity index 100%
rename from core/components/gallery/processors/mgr/item/zipupload.php
rename to core/components/gallery/processors/mgr/item/zipupload.class.php
diff --git a/core/components/gallery/processors/web/phpthumb.php b/core/components/gallery/processors/web/phpthumb.class.php
similarity index 100%
rename from core/components/gallery/processors/web/phpthumb.php
rename to core/components/gallery/processors/web/phpthumb.class.php

From 9c62e95874367e1a898f5ad4fc3d69b93f7a2660 Mon Sep 17 00:00:00 2001
From: halftrainedharry <katachrese@gmx.ch>
Date: Wed, 20 Apr 2022 10:42:47 +0200
Subject: [PATCH 06/20] fix navigation | remove modAction

---
 _build/data/transport.menu.php                | 20 ++++---------------
 .../gallery/js/mgr/sections/album/update.js   |  2 +-
 assets/components/gallery/js/mgr/tree.js      |  2 +-
 .../js/mgr/widgets/album/album.tree.js        |  2 +-
 .../js/mgr/widgets/album/albums.grid.js       |  2 +-
 .../controllers/album/update.class.php        |  8 +++++++-
 .../gallery/controllers/home.class.php        |  2 ++
 .../plugins/gallerycustomtv.plugin.php        | 13 ++++++++----
 .../processors/mgr/album/getnodes.class.php   | 14 +++++++++----
 9 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/_build/data/transport.menu.php b/_build/data/transport.menu.php
index 25f3c66..0f480aa 100644
--- a/_build/data/transport.menu.php
+++ b/_build/data/transport.menu.php
@@ -20,34 +20,22 @@
  * @package gallery
  */
 /**
- * Adds modActions and modMenus into package
+ * Adds modMenus into package
  *
  * @package gallery
  * @subpackage build
  */
-$action= $modx->newObject('modAction');
-$action->fromArray(array(
-    'id' => 1,
-    'namespace' => 'gallery',
-    'parent' => 0,
-    'controller' => 'index',
-    'haslayout' => 1,
-    'lang_topics' => 'gallery:default',
-    'assets' => '',
-),'',true,true);
-
-/* load action into menu */
 $menu= $modx->newObject('modMenu');
 $menu->fromArray(array(
     'text' => 'gallery',
     'parent' => 'components',
     'description' => 'gallery.menu_desc',
-    'icon' => 'images/icons/plugin.gif',
+    'icon' => '',
     'menuindex' => 0,
+    'action' => 'home',
+    'namespace' => 'gallery',
     'params' => '',
     'handler' => '',
 ),'',true,true);
-$menu->addOne($action);
-unset($action);
 
 return $menu;
\ No newline at end of file
diff --git a/assets/components/gallery/js/mgr/sections/album/update.js b/assets/components/gallery/js/mgr/sections/album/update.js
index 69de8fd..5b3282f 100644
--- a/assets/components/gallery/js/mgr/sections/album/update.js
+++ b/assets/components/gallery/js/mgr/sections/album/update.js
@@ -17,7 +17,7 @@ GAL.page.UpdateAlbum = function(config) {
             text: _('gallery.back')
             ,id: 'gal-btn-back'
             ,handler: function() {
-                location.href = '?a='+MODx.request.a+'&view=index';
+                MODx.loadPage('home', 'namespace=gallery');
             }
             ,scope: this
         }]
diff --git a/assets/components/gallery/js/mgr/tree.js b/assets/components/gallery/js/mgr/tree.js
index 0a910e0..029062c 100644
--- a/assets/components/gallery/js/mgr/tree.js
+++ b/assets/components/gallery/js/mgr/tree.js
@@ -112,7 +112,7 @@ Ext.extend(galTreeHandlerClass,Ext.Component,{
     }
     ,updateAlbum: function(btn,e) {
         var id = this.data.id ? this.data.id : 0;
-        location.href = '?a='+MODx.action['gallery:index']+'&album='+id+'&action=album/update';
+        MODx.loadPage('album/update', 'namespace=gallery&album='+id);
     }
     ,removeAlbum: function(btn,e) {
         MODx.msg.confirm({
diff --git a/assets/components/gallery/js/mgr/widgets/album/album.tree.js b/assets/components/gallery/js/mgr/widgets/album/album.tree.js
index ca29059..c1d01c6 100644
--- a/assets/components/gallery/js/mgr/widgets/album/album.tree.js
+++ b/assets/components/gallery/js/mgr/widgets/album/album.tree.js
@@ -52,7 +52,7 @@ Ext.extend(GAL.tree.Album,MODx.tree.Tree,{
     
     ,updateAlbum: function(btn,e) {
         var id = this.cm.activeNode ? this.cm.activeNode.attributes.pk : 0;
-        location.href = '?a='+GAL.action+'&album='+id+'&action=album/update';
+        MODx.loadPage('album/update', 'namespace=gallery&album='+id);
     }
     
     ,removeAlbum: function(btn,e) {
diff --git a/assets/components/gallery/js/mgr/widgets/album/albums.grid.js b/assets/components/gallery/js/mgr/widgets/album/albums.grid.js
index ecb98a8..0f8bd38 100644
--- a/assets/components/gallery/js/mgr/widgets/album/albums.grid.js
+++ b/assets/components/gallery/js/mgr/widgets/album/albums.grid.js
@@ -55,7 +55,7 @@ Ext.extend(GAL.grid.Albums,MODx.grid.Grid,{
     ,updateAlbum: function(btn,e) {
         if (!this.menu.record || !this.menu.record.id) return false;
         
-        location.href = '?a='+MODx.request.a+'&action=album/update'+'&album='+this.menu.record.id;
+        MODx.loadPage('album/update', 'namespace=gallery&album='+this.menu.record.id);
     }
     
     ,removeAlbum: function(btn,e) {
diff --git a/core/components/gallery/controllers/album/update.class.php b/core/components/gallery/controllers/album/update.class.php
index 24d8458..d6cc29f 100644
--- a/core/components/gallery/controllers/album/update.class.php
+++ b/core/components/gallery/controllers/album/update.class.php
@@ -27,6 +27,8 @@
  * @var modX $this->modx
  * @var Gallery $gallery
  */
+require_once dirname(__FILE__,3) . '/index.class.php';
+
 class GalleryAlbumUpdateManagerController extends GalleryManagerController {
     public function getPageTitle() { return $this->modx->lexicon('gallery.album_update'); }
     public function loadCustomCssJs() {
@@ -62,7 +64,11 @@ public function checkForTinyMCE() {
                 $css =  $this->modx->getOption('gallery.tiny.theme_advanced_css_selectors',null,'');
         
                 /** @var modAction $browserAction */
-                $browserAction = $this->modx->getObject('modAction',array('controller' => 'browser'));
+                $browserAction = null;
+                if ($this->modx->getVersionData()['version'] < 3){
+                    //V2
+                    $browserAction = $this->modx->getObject('modAction',array('controller' => 'browser'));
+                }
         
                 /* If the settings are empty, override them with the generic tinymce settings. */
                 $tinyProperties = array(
diff --git a/core/components/gallery/controllers/home.class.php b/core/components/gallery/controllers/home.class.php
index c8a6df4..102b109 100644
--- a/core/components/gallery/controllers/home.class.php
+++ b/core/components/gallery/controllers/home.class.php
@@ -25,6 +25,8 @@
  * @package gallery
  * @subpackage controllers
  */
+require_once dirname(__FILE__,2) . '/index.class.php';
+
 class GalleryHomeManagerController extends GalleryManagerController {
     public function getPageTitle() { return $this->modx->lexicon('gallery'); }
     public function loadCustomCssJs() {
diff --git a/core/components/gallery/elements/plugins/gallerycustomtv.plugin.php b/core/components/gallery/elements/plugins/gallerycustomtv.plugin.php
index ba7f63e..1376815 100644
--- a/core/components/gallery/elements/plugins/gallerycustomtv.plugin.php
+++ b/core/components/gallery/elements/plugins/gallerycustomtv.plugin.php
@@ -51,10 +51,15 @@
         $modx->controller->addLexiconTopic('gallery:tv');
 
         /* @var modAction $action */
-        $action = $modx->getObject('modAction',array(
-            'namespace' => 'gallery',
-            'controller' => 'index',
-        ));
+        $action = null;
+        if ($this->modx->getVersionData()['version'] < 3){
+            //V2
+            $action = $modx->getObject('modAction',array(
+                'namespace' => 'gallery',
+                'controller' => 'index',
+            ));
+        }
+        
         $modx->controller->addHtml('<script type="text/javascript">
         Ext.onReady(function() {
             GAL.config = {};
diff --git a/core/components/gallery/processors/mgr/album/getnodes.class.php b/core/components/gallery/processors/mgr/album/getnodes.class.php
index 8c86152..576848e 100644
--- a/core/components/gallery/processors/mgr/album/getnodes.class.php
+++ b/core/components/gallery/processors/mgr/album/getnodes.class.php
@@ -34,10 +34,14 @@ public function getAlbums($id) {
         $c->sortby('galAlbum.rank','ASC');
         $albums = $this->modx->getCollection('galAlbum',$c);
 
-        $action = $this->modx->getObject('modAction',array(
-            'controller' => 'index',
-            'namespace' => 'gallery',
-        ));
+        $action = null;
+        if ($this->modx->getVersionData()['version'] < 3){
+            //V2
+            $action = $this->modx->getObject('modAction',array(
+                'controller' => 'index',
+                'namespace' => 'gallery',
+            ));
+        }
 
         /** @var galAlbum $album */
         foreach ($albums as $album) {
@@ -58,6 +62,8 @@ public function getAlbums($id) {
             $albumArray['classKey'] = 'galAlbum';
             if (!empty($action)) {
                 $albumArray['page'] = '?a='.$action->get('id').'&album='.$album->get('id').'&action=album/update';
+            } else {
+                $albumArray['page'] = '?a=album/update&namespace=gallery&album='.$album->get('id'); //V3
             }
 
             $albumArray['menu'] = array('items' => array());

From 4a9e491c99202585af7630cf17e83df82d97b5b3 Mon Sep 17 00:00:00 2001
From: halftrainedharry <katachrese@gmx.ch>
Date: Wed, 20 Apr 2022 12:13:11 +0200
Subject: [PATCH 07/20] fix cache (multiple_object_delete)

---
 core/components/gallery/model/gallery/galalbum.class.php    | 6 +++---
 .../gallery/model/gallery/galalbumcontext.class.php         | 4 ++--
 .../components/gallery/model/gallery/galalbumitem.class.php | 4 ++--
 core/components/gallery/model/gallery/galitem.class.php     | 2 +-
 core/components/gallery/model/gallery/galtag.class.php      | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/core/components/gallery/model/gallery/galalbum.class.php b/core/components/gallery/model/gallery/galalbum.class.php
index 32be371..11562eb 100644
--- a/core/components/gallery/model/gallery/galalbum.class.php
+++ b/core/components/gallery/model/gallery/galalbum.class.php
@@ -48,9 +48,9 @@ public function save($cacheFlag= null) {
         $saved= parent :: save($cacheFlag);
         if ($saved) {
             if ($this->xpdo->getCacheManager()) {
-                $this->xpdo->cacheManager->delete('gallery/album/'.$this->get('id'));
-                $this->xpdo->cacheManager->delete('gallery/album/list/');
-                $this->xpdo->cacheManager->delete('gallery/item/list/');
+                $this->xpdo->cacheManager->delete('gallery/album/'.$this->get('id'), array('multiple_object_delete' => true));
+                $this->xpdo->cacheManager->delete('gallery/album/list/', array('multiple_object_delete' => true));
+                $this->xpdo->cacheManager->delete('gallery/item/list/', array('multiple_object_delete' => true));
             }
         }
         return $saved;
diff --git a/core/components/gallery/model/gallery/galalbumcontext.class.php b/core/components/gallery/model/gallery/galalbumcontext.class.php
index 8dd41fb..9165d89 100644
--- a/core/components/gallery/model/gallery/galalbumcontext.class.php
+++ b/core/components/gallery/model/gallery/galalbumcontext.class.php
@@ -29,8 +29,8 @@ public function save($cacheFlag=null) {
         $saved = parent::save($cacheFlag);
         if ($saved) {
             if ($this->xpdo->getCacheManager()) {
-                $this->xpdo->cacheManager->delete('gallery/album/'.$this->get('album_id'));
-                $this->xpdo->cacheManager->delete('gallery/item/list/');
+                $this->xpdo->cacheManager->delete('gallery/album/'.$this->get('album_id'), array('multiple_object_delete' => true));
+                $this->xpdo->cacheManager->delete('gallery/item/list/', array('multiple_object_delete' => true));
             }
         }
         return $saved;
diff --git a/core/components/gallery/model/gallery/galalbumitem.class.php b/core/components/gallery/model/gallery/galalbumitem.class.php
index c3c1f3d..d6510c0 100644
--- a/core/components/gallery/model/gallery/galalbumitem.class.php
+++ b/core/components/gallery/model/gallery/galalbumitem.class.php
@@ -42,8 +42,8 @@ public function save($cacheFlag=null) {
         $saved = parent::save($cacheFlag);
         if ($saved) {
             if ($this->xpdo->getCacheManager()) {
-                $this->xpdo->cacheManager->delete('gallery/album/'.$this->get('album_id'));
-                $this->xpdo->cacheManager->delete('gallery/item/list/');
+                $this->xpdo->cacheManager->delete('gallery/album/'.$this->get('album_id'), array('multiple_object_delete' => true));
+                $this->xpdo->cacheManager->delete('gallery/item/list/', array('multiple_object_delete' => true));
             }
         }
         return $saved;
diff --git a/core/components/gallery/model/gallery/galitem.class.php b/core/components/gallery/model/gallery/galitem.class.php
index 597b12d..9ad5e98 100644
--- a/core/components/gallery/model/gallery/galitem.class.php
+++ b/core/components/gallery/model/gallery/galitem.class.php
@@ -208,7 +208,7 @@ public function save($cacheFlag= null) {
         $saved= parent :: save($cacheFlag);
         if ($saved) {
             if ($this->xpdo->getCacheManager()) {
-                $this->xpdo->cacheManager->delete('gallery/item/list/');
+                $this->xpdo->cacheManager->delete('gallery/item/list/', array('multiple_object_delete' => true));
             }
         }
         return $saved;
diff --git a/core/components/gallery/model/gallery/galtag.class.php b/core/components/gallery/model/gallery/galtag.class.php
index 4134834..ef84f23 100644
--- a/core/components/gallery/model/gallery/galtag.class.php
+++ b/core/components/gallery/model/gallery/galtag.class.php
@@ -27,7 +27,7 @@ public function save($cacheFlag=null) {
         $saved = parent::save($cacheFlag);
         if ($saved) {
             if ($this->xpdo->getCacheManager()) {
-                $this->xpdo->cacheManager->delete('gallery/item/list/');
+                $this->xpdo->cacheManager->delete('gallery/item/list/', array('multiple_object_delete' => true));
             }
         }
         return $saved;

From 1d3159e8e7b07106ecfaf2d8b43c3291018f0f88 Mon Sep 17 00:00:00 2001
From: halftrainedharry <katachrese@gmx.ch>
Date: Fri, 22 Apr 2022 10:21:42 +0200
Subject: [PATCH 08/20] fix typo (modAction in plugin)

---
 .../gallery/elements/plugins/gallerycustomtv.plugin.php         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/components/gallery/elements/plugins/gallerycustomtv.plugin.php b/core/components/gallery/elements/plugins/gallerycustomtv.plugin.php
index 1376815..f3bf519 100644
--- a/core/components/gallery/elements/plugins/gallerycustomtv.plugin.php
+++ b/core/components/gallery/elements/plugins/gallerycustomtv.plugin.php
@@ -52,7 +52,7 @@
 
         /* @var modAction $action */
         $action = null;
-        if ($this->modx->getVersionData()['version'] < 3){
+        if ($modx->getVersionData()['version'] < 3){
             //V2
             $action = $modx->getObject('modAction',array(
                 'namespace' => 'gallery',

From 4596100990d3188a8d93c69fc75d18768f6bc313 Mon Sep 17 00:00:00 2001
From: halftrainedharry <katachrese@gmx.ch>
Date: Fri, 22 Apr 2022 10:35:35 +0200
Subject: [PATCH 09/20] change flat-file TVs

---
 .../elements/tv/input/galleryalbumlist.php    | 183 +++++++++++-------
 .../gallery/elements/tv/input/galleryitem.php |  73 +++++--
 .../elements/tv/output/galleryitem.php        | 101 ++++++----
 3 files changed, 219 insertions(+), 138 deletions(-)

diff --git a/core/components/gallery/elements/tv/input/galleryalbumlist.php b/core/components/gallery/elements/tv/input/galleryalbumlist.php
index 3d82879..d80613c 100644
--- a/core/components/gallery/elements/tv/input/galleryalbumlist.php
+++ b/core/components/gallery/elements/tv/input/galleryalbumlist.php
@@ -25,90 +25,123 @@
  * @package gallery
  * @subpackage tv
  */
-$modx->lexicon->load('tv_widget','gallery:default');
-$modx->smarty->assign('base_url',$this->xpdo->getOption('base_url'));
+class GalleryAlbumListInputRender extends modTemplateVarInputRender
+{
+    /**
+     * Return the template path to load
+     *
+     * @return string
+     */
+    public function getTemplate()
+    {
+        $corePath = $this->modx->getOption('gallery.core_path', null, $this->modx->getOption('core_path') . 'components/gallery/');
+        return $corePath . 'elements/tv/galleryalbumlist.input.tpl';
+    }
 
-$corePath = $modx->getOption('gallery.core_path',null,$modx->getOption('core_path').'components/gallery/');
-$modx->addPackage('gallery',$corePath.'model/');
+    /**
+     * Get lexicon topics
+     *
+     * @return array
+     */
+    public function getLexiconTopics()
+    {
+        return ['gallery:default'];
+    }
 
-if (empty($params)) $params = array();
+    /**
+     * Process Input Render
+     *
+     * @param string $value
+     * @param array $params
+     * @return void
+     */
+    public function process($value, array $params = [])
+    {
+        $this->setPlaceholder('base_url', $this->modx->getOption('base_url'));
 
-/* setup default properties */
-$sort = $modx->getOption('sort',$params,'rank');
-$dir = $modx->getOption('dir',$params,'ASC');
-$limit = (int)$modx->getOption('limit',$params,0);
-$start = (int)$modx->getOption('start',$params,0);
-$showNone = (boolean)$modx->getOption('showNone',$params,true);
-$showCover = (boolean)$modx->getOption('showCover',$params,true);
-$parent = $modx->getOption('parent',$params,'');
-$subchilds = $modx->getOption('subchilds',$params,false);
+        $corePath = $this->modx->getOption('gallery.core_path',null,$this->modx->getOption('core_path').'components/gallery/');
+        $this->modx->addPackage('gallery',$corePath.'model/');
 
-/* get albums */
-$c = $modx->newQuery('galAlbum');
-if ($parent != '') {
-    $c->where(array(
-        'parent' => (int)$parent,
-    ));
-}
-$c->where(array(
-    'active' => 1,
-));
-$c->sortby($sort,$dir);
-if ($limit > 0) {
-    $c->limit($limit,$start);
-}
-$albums = $modx->getCollection('galAlbum',$c);
+        if (empty($params)) $params = array();
 
-if(($parent != '') && ($subchilds == true)){
-        $album = $modx->getObject('galAlbum',(int)$parent);
-        if($album != null){
-            $albumsWithSubs = array();
-            $gallery = new Gallery($modx);
-            $gallery->getAllChilds($album, $albumsWithSubs, $sort, $dir, -1);
-            
-            $albums = $albumsWithSubs;
-        }
-}
-
-/* setup thumb properties */
-$thumbProperties = array(
-    'w' => (int)$modx->getOption('thumbWidth',$params,40),
-    'h' => (int)$modx->getOption('thumbHeight',$params,40),
-    'zc' => (boolean)$modx->getOption('thumbZoomCrop',$params,1),
-    'far' => (string)$modx->getOption('thumbFar',$params,'C'),
-    'q' => (int)$modx->getOption('thumbQuality',$params,90),
-    'f' => 'png',
-);
+        /* setup default properties */
+        $sort = $this->modx->getOption('sort',$params,'rank');
+        $dir = $this->modx->getOption('dir',$params,'ASC');
+        $limit = (int)$this->modx->getOption('limit',$params,0);
+        $start = (int)$this->modx->getOption('start',$params,0);
+        $showNone = (boolean)$this->modx->getOption('showNone',$params,true);
+        $showCover = (boolean)$this->modx->getOption('showCover',$params,true);
+        $parent = $this->modx->getOption('parent',$params,'');
+        $subchilds = $this->modx->getOption('subchilds',$params,false);
 
-/* iterate over albums */
-$coverItem = false;
-$list = array();
-if ($showNone) {
-    $list[] = array('','('.$modx->lexicon('none').')');
-}
-foreach ($albums as $album) {
-    if ($showCover) {
-        $albumArray = $album->toArray();
-        $c = $modx->newQuery('galItem');
-        $c->innerJoin('galAlbumItem','AlbumItems');
+        /* get albums */
+        $c = $this->modx->newQuery('galAlbum');
+        if ($parent != '') {
+            $c->where(array(
+                'parent' => (int)$parent,
+            ));
+        }
         $c->where(array(
-            'AlbumItems.album' => $album->get('id'),
+            'active' => 1,
         ));
-        $c->sortby('rank','ASC');
-        $c->limit(1);
-        $coverItem = $modx->getObject('galItem',$c);
-    }
+        $c->sortby($sort,$dir);
+        if ($limit > 0) {
+            $c->limit($limit,$start);
+        }
+        $albums = $this->modx->getCollection('galAlbum',$c);
+
+        if(($parent != '') && ($subchilds == true)){
+                $album = $this->modx->getObject('galAlbum',(int)$parent);
+                if($album != null){
+                    $albumsWithSubs = array();
+                    $gallery = new Gallery($this->modx);
+                    $gallery->getAllChilds($album, $albumsWithSubs, $sort, $dir, -1);
+                    
+                    $albums = $albumsWithSubs;
+                }
+        }
 
-    $albumArray = array(
-        $album->get('id'),
-        $album->get('name'),
-        $album->get('description'),
-    );
-    if ($showCover && $coverItem) {
-        $albumArray[] = $coverItem->get('thumbnail',$thumbProperties);
+        /* setup thumb properties */
+        $thumbProperties = array(
+            'w' => (int)$this->modx->getOption('thumbWidth',$params,40),
+            'h' => (int)$this->modx->getOption('thumbHeight',$params,40),
+            'zc' => (boolean)$this->modx->getOption('thumbZoomCrop',$params,1),
+            'far' => (string)$this->modx->getOption('thumbFar',$params,'C'),
+            'q' => (int)$this->modx->getOption('thumbQuality',$params,90),
+            'f' => 'png',
+        );
+
+        /* iterate over albums */
+        $coverItem = false;
+        $list = array();
+        if ($showNone) {
+            $list[] = array('','('.$this->modx->lexicon('none').')');
+        }
+        foreach ($albums as $album) {
+            if ($showCover) {
+                $albumArray = $album->toArray();
+                $c = $this->modx->newQuery('galItem');
+                $c->innerJoin('galAlbumItem','AlbumItems');
+                $c->where(array(
+                    'AlbumItems.album' => $album->get('id'),
+                ));
+                $c->sortby('rank','ASC');
+                $c->limit(1);
+                $coverItem = $this->modx->getObject('galItem',$c);
+            }
+
+            $albumArray = array(
+                $album->get('id'),
+                $album->get('name'),
+                $album->get('description'),
+            );
+            if ($showCover && $coverItem) {
+                $albumArray[] = $coverItem->get('thumbnail',$thumbProperties);
+            }
+            $list[] = $albumArray;
+        }
+        $this->setPlaceholder('list', $this->modx->toJSON($list));
     }
-    $list[] = $albumArray;
 }
-$modx->smarty->assign('list',$modx->toJSON($list));
 
-return $modx->smarty->fetch($corePath.'elements/tv/galleryalbumlist.input.tpl');
\ No newline at end of file
+return 'GalleryAlbumListInputRender';
\ No newline at end of file
diff --git a/core/components/gallery/elements/tv/input/galleryitem.php b/core/components/gallery/elements/tv/input/galleryitem.php
index 1f0f9ce..a6fd7fd 100644
--- a/core/components/gallery/elements/tv/input/galleryitem.php
+++ b/core/components/gallery/elements/tv/input/galleryitem.php
@@ -25,29 +25,62 @@
  * @package gallery
  * @subpackage tv
  */
-$modx->lexicon->load('tv_widget','gallery:default');
-$modx->smarty->assign('base_url',$this->xpdo->getOption('base_url'));
+class GalleryItemInputRender extends modTemplateVarInputRender
+{
+    /**
+     * Return the template path to load
+     *
+     * @return string
+     */
+    public function getTemplate()
+    {
+        $corePath = $this->modx->getOption('gallery.core_path', null, $this->modx->getOption('core_path') . 'components/gallery/');
+        return $corePath . 'elements/tv/galleryitem.input.tpl';
+    }
+
+    /**
+     * Get lexicon topics
+     *
+     * @return array
+     */
+    public function getLexiconTopics()
+    {
+        return ['gallery:default'];
+    }
+
+    /**
+     * Process Input Render
+     *
+     * @param string $value
+     * @param array $params
+     * @return void
+     */
+    public function process($value, array $params = [])
+    {
+        $this->setPlaceholder('base_url', $this->modx->getOption('base_url'));
 
-$corePath = $modx->getOption('gallery.core_path',null,$modx->getOption('core_path').'components/gallery/');
-$modx->addPackage('gallery',$corePath.'model/');
+        $corePath = $this->modx->getOption('gallery.core_path',null,$this->modx->getOption('core_path').'components/gallery/');
+        $this->modx->addPackage('gallery',$corePath.'model/');
 
-if (!empty($this->value)) {
-    $data = $modx->fromJSON($this->value);
-    if (is_array($data) && !empty($data['gal_id'])) {
-        $item = $modx->getObject('galItem',$data['gal_id']);
-        if ($item) {
-            $item->getSize();
-            $data = array_merge($item->toArray('gal_',true,true),$data);
-            $pt = $item->getPhpThumbUrl();
-            $data['gal_id'] = $item->get('id');
-            $data['gal_src'] = $item->get('absoluteImage');
-            $data['gal_rotate'] = !empty($data['gal_rotate']) ? $data['gal_rotate'] : 0;
-            $data['gal_watermark-text'] = !empty($data['gal_watermark-text']) ? $data['gal_watermark-text'] : '';
-            $data['gal_watermark-text-position'] = !empty($data['gal_watermark-text-position']) ? $data['gal_watermark-text-position'] : 'BL';
-            $js = $modx->toJSON($data);
-            $modx->smarty->assign('itemjson',$js);
+        if (!empty($value)) {
+            $data = $this->modx->fromJSON($value);
+            if (is_array($data) && !empty($data['gal_id'])) {
+                $item = $this->modx->getObject('galItem',$data['gal_id']);
+                if ($item) {
+                    $item->getSize();
+                    $data = array_merge($item->toArray('gal_',true,true),$data);
+                    $pt = $item->getPhpThumbUrl();
+                    $data['gal_id'] = $item->get('id');
+                    $data['gal_src'] = $item->get('absoluteImage');
+                    $data['gal_rotate'] = !empty($data['gal_rotate']) ? $data['gal_rotate'] : 0;
+                    $data['gal_watermark-text'] = !empty($data['gal_watermark-text']) ? $data['gal_watermark-text'] : '';
+                    $data['gal_watermark-text-position'] = !empty($data['gal_watermark-text-position']) ? $data['gal_watermark-text-position'] : 'BL';
+                    $js = $this->modx->toJSON($data);
+                    $this->setPlaceholder('itemjson', $js);
+                }
+            }
         }
     }
 }
 
-return $modx->smarty->fetch($corePath.'elements/tv/galleryitem.input.tpl');
\ No newline at end of file
+return 'GalleryItemInputRender';
\ No newline at end of file
diff --git a/core/components/gallery/elements/tv/output/galleryitem.php b/core/components/gallery/elements/tv/output/galleryitem.php
index 9c72b5d..8fcbe5f 100644
--- a/core/components/gallery/elements/tv/output/galleryitem.php
+++ b/core/components/gallery/elements/tv/output/galleryitem.php
@@ -25,53 +25,68 @@
  * @package gallery
  * @subpackage tv
  */
-$corePath = $modx->getOption('gallery.core_path',null,$modx->getOption('core_path').'components/gallery/');
-$modx->addPackage('gallery',$corePath.'model/');
+class GalleryItemOutputRender extends modTemplateVarOutputRender
+{
+    /**
+     * Process Output Render
+     *
+     * @param string $value
+     * @param array $params
+     * @return string
+     */
+    public function process($value, array $params = [])
+    {
+        $corePath = $this->modx->getOption('gallery.core_path',null,$this->modx->getOption('core_path').'components/gallery/');
+        $this->modx->addPackage('gallery',$corePath.'model/');
 
-if (!empty($value) && $value != '{}') {
-    $data = $modx->fromJSON($value);
-    if (empty($data)) return '';
+        if (!empty($value) && $value != '{}') {
+            $data = $this->modx->fromJSON($value);
+            if (empty($data)) return '';
 
-    $item = $modx->getObject('galItem',$data['gal_id']);
-    if ($item) {
-        /* get filters */
-        $filtersArray = array();
-        if (!empty($data['gal_rotate'])) {
-            $filtersArray['rot'] = (string)$data['gal_rotate'];
-        }
-        /* text watermark */
-        if (!empty($data['gal_watermark-text'])) {
-            $filtersArray['wmt'] = (string)$data['gal_watermark-text'].'|5|'.$data['gal_watermark-text-position'].'|ffffff|||5|||100|0';
-        }
-        /* crop */
-        if (!empty($data['gal_cropCoords'])) {
-            $filtersArray['crop'] = $data['gal_cropLeft'].'|'.$data['gal_cropRight'].'|'.$data['gal_cropTop'].'|'.$data['gal_cropBottom'];
-        }
-        $filters = '';
-        foreach ($filtersArray as $filter => $val) {
-            $filters .= '&fltr[]='.$filter.'|'.$val;
-        }
+            $item = $this->modx->getObject('galItem',$data['gal_id']);
+            if ($item) {
+                /* get filters */
+                $filtersArray = array();
+                if (!empty($data['gal_rotate'])) {
+                    $filtersArray['rot'] = (string)$data['gal_rotate'];
+                }
+                /* text watermark */
+                if (!empty($data['gal_watermark-text'])) {
+                    $filtersArray['wmt'] = (string)$data['gal_watermark-text'].'|5|'.$data['gal_watermark-text-position'].'|ffffff|||5|||100|0';
+                }
+                /* crop */
+                if (!empty($data['gal_cropCoords'])) {
+                    $filtersArray['crop'] = $data['gal_cropLeft'].'|'.$data['gal_cropRight'].'|'.$data['gal_cropTop'].'|'.$data['gal_cropBottom'];
+                }
+                $filters = '';
+                foreach ($filtersArray as $filter => $val) {
+                    $filters .= '&fltr[]='.$filter.'|'.$val;
+                }
 
-        /* get any other params */
-        $other = !empty($data['gal_other']) ? $data['gal_other'] : '';
-        if (!empty($other)) {
-            if (substr($other,0,1) != '&') {
-                $other = '&'.$other;
-            }
-        }
+                /* get any other params */
+                $other = !empty($data['gal_other']) ? $data['gal_other'] : '';
+                if (!empty($other)) {
+                    if (substr($other,0,1) != '&') {
+                        $other = '&'.$other;
+                    }
+                }
 
-        $url = $item->get('image',array(
-            'w' => $data['gal_image_width'],
-            'h' => $data['gal_image_height'],
-            'f' => 'png',
-        )).$filters.$other;
+                $url = $item->get('image',array(
+                    'w' => $data['gal_image_width'],
+                    'h' => $data['gal_image_height'],
+                    'f' => 'png',
+                )).$filters.$other;
 
-        $class = !empty($data['gal_class']) ? 'class="'.$data['gal_class'].'"' : '';
-        $value = '<img src="'.$url.'" alt="'.$data['gal_description'].'" title="'.$data['gal_name'].'" '.$class.' />';
-    } else {
-        $value = '';
+                $class = !empty($data['gal_class']) ? 'class="'.$data['gal_class'].'"' : '';
+                $value = '<img src="'.$url.'" alt="'.$data['gal_description'].'" title="'.$data['gal_name'].'" '.$class.' />';
+            } else {
+                $value = '';
+            }
+        } else { /* if empty dont return json, return blank */
+            $value = '';
+        }
+        return $value;
     }
-} else { /* if empty dont return json, return blank */
-    $value = '';
 }
-return $value;
\ No newline at end of file
+
+return 'GalleryItemOutputRender';
\ No newline at end of file

From 7da598e79a702a989d96442cea9bd7a71258496d Mon Sep 17 00:00:00 2001
From: halftrainedharry <katachrese@gmx.ch>
Date: Fri, 22 Apr 2022 10:39:51 +0200
Subject: [PATCH 10/20] rename flat-file TV files

---
 .../tv/input/{galleryalbumlist.php => galleryalbumlist.class.php} | 0
 .../elements/tv/input/{galleryitem.php => galleryitem.class.php}  | 0
 .../elements/tv/output/{galleryitem.php => galleryitem.class.php} | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 rename core/components/gallery/elements/tv/input/{galleryalbumlist.php => galleryalbumlist.class.php} (100%)
 rename core/components/gallery/elements/tv/input/{galleryitem.php => galleryitem.class.php} (100%)
 rename core/components/gallery/elements/tv/output/{galleryitem.php => galleryitem.class.php} (100%)

diff --git a/core/components/gallery/elements/tv/input/galleryalbumlist.php b/core/components/gallery/elements/tv/input/galleryalbumlist.class.php
similarity index 100%
rename from core/components/gallery/elements/tv/input/galleryalbumlist.php
rename to core/components/gallery/elements/tv/input/galleryalbumlist.class.php
diff --git a/core/components/gallery/elements/tv/input/galleryitem.php b/core/components/gallery/elements/tv/input/galleryitem.class.php
similarity index 100%
rename from core/components/gallery/elements/tv/input/galleryitem.php
rename to core/components/gallery/elements/tv/input/galleryitem.class.php
diff --git a/core/components/gallery/elements/tv/output/galleryitem.php b/core/components/gallery/elements/tv/output/galleryitem.class.php
similarity index 100%
rename from core/components/gallery/elements/tv/output/galleryitem.php
rename to core/components/gallery/elements/tv/output/galleryitem.class.php

From d981f9470912e1f591272d518fc05918f2e3a9ca Mon Sep 17 00:00:00 2001
From: halftrainedharry <katachrese@gmx.ch>
Date: Fri, 22 Apr 2022 10:46:56 +0200
Subject: [PATCH 11/20] create custom mediasource with namespace

---
 core/components/gallery/bootstrap.php         |  17 +
 .../src/Model/GalleryAlbumsMediaSource.php    | 464 ++++++++++++++++++
 .../gallery/src/Model/metadata.mysql.php      |  13 +
 .../Model/mysql/GalleryAlbumsMediaSource.php  |  26 +
 4 files changed, 520 insertions(+)
 create mode 100644 core/components/gallery/bootstrap.php
 create mode 100644 core/components/gallery/src/Model/GalleryAlbumsMediaSource.php
 create mode 100644 core/components/gallery/src/Model/metadata.mysql.php
 create mode 100644 core/components/gallery/src/Model/mysql/GalleryAlbumsMediaSource.php

diff --git a/core/components/gallery/bootstrap.php b/core/components/gallery/bootstrap.php
new file mode 100644
index 0000000..b99bad6
--- /dev/null
+++ b/core/components/gallery/bootstrap.php
@@ -0,0 +1,17 @@
+<?php
+
+/**
+ * @var \MODX\Revolution\modX $modx
+ * @var array $namespace
+ */
+
+use Gallery\Gallery;
+use xPDO\xPDO;
+
+try {
+    // Add the package and model classes
+    $modx->addPackage('Gallery\Model', $namespace['path'] . 'src/', null, 'Gallery\\');
+}
+catch (\Exception $e) {
+    $modx->log(xPDO::LOG_LEVEL_ERROR, $e->getMessage());
+}
\ No newline at end of file
diff --git a/core/components/gallery/src/Model/GalleryAlbumsMediaSource.php b/core/components/gallery/src/Model/GalleryAlbumsMediaSource.php
new file mode 100644
index 0000000..cf48c05
--- /dev/null
+++ b/core/components/gallery/src/Model/GalleryAlbumsMediaSource.php
@@ -0,0 +1,464 @@
+<?php
+namespace Gallery\Model;
+
+use xPDO\xPDO;
+
+/**
+ * Class GalleryAlbumsMediaSource
+ *
+ * Basically a copy of the file core/components/gallery/model/gallery/galleryalbumsmediasource.class.php to make the custom mediasource work in 3.x
+ * New function signature for moveObject() in 3.x
+ *
+ * @package Gallery\Model
+ */
+class GalleryAlbumsMediaSource extends \MODX\Revolution\Sources\modMediaSource
+{
+//class GalleryAlbumsMediaSource extends modMediaSource implements modMediaSourceInterface {
+    /** @var Gallery $gallery */
+    public $gallery;
+    /**
+     * Initialize the source, preparing it for usage.
+     *
+     * @return boolean
+     */
+    public function initialize() {
+        $this->gallery = $this->xpdo->getService('gallery','Gallery',$this->xpdo->getOption('gallery.core_path',null,$this->xpdo->getOption('core_path').'components/gallery/').'model/gallery/');
+        if (!($this->gallery instanceof \Gallery)){
+            return false;
+        } 
+        $this->xpdo->lexicon->load('gallery:default','gallery:source');
+        return true;
+    }
+
+    /**
+     * Return an array of containers at this current level in the container structure. Used for the tree
+     * navigation on the files tree.
+     *
+     * @abstract
+     * @param string $path
+     * @return array
+     */
+    public function getContainerList($path) {
+        $properties = $this->getPropertyList();
+        $list = array();
+        if ($path == '/') {
+            if (!empty($properties['album'])) {
+
+            } else {
+                $c = $this->xpdo->newQuery('galAlbum');
+                $c->where(array('parent' => 0));
+                $c->sortby('rank','ASC');
+                $albums = $this->xpdo->getCollection('galAlbum',$c);
+                /** @var galAlbum $album */
+                foreach ($albums as $album) {
+                    $list[] = array(
+                        'id' => 'album-'.$album->get('id'),
+                        'text' => $album->get('name'),
+                        'cls' => 'icon-album icon-avi',
+                        'type' => 'gallery-album',
+                        'data' => $album->toArray(),
+                        'leaf' => false,
+                        'treeHandler' => 'gal-tree-handler',
+                    );
+                }
+            }
+        } else {
+            $id = explode('-',$path);
+            $id = (int)$id[1];
+
+            /* get albums */
+
+            $c = $this->xpdo->newQuery('galAlbum');
+            $c->where(array('parent' => $id));
+            $c->sortby('rank','ASC');
+            $albums = $this->xpdo->getCollection('galAlbum',$c);
+            /** @var galAlbum $album */
+            foreach ($albums as $album) {
+                $list[] = array(
+                    'id' => 'album-'.$album->get('id'),
+                    'text' => $album->get('name'),
+                    'cls' => 'icon-album icon-avi',
+                    'type' => 'gallery-album',
+                    'data' => $album->toArray(),
+                    'leaf' => false,
+                    'treeHandler' => 'gal-tree-handler',
+                );
+            }
+
+            /* get items */
+            $c = $this->xpdo->newQuery('galItem');
+            $c->innerJoin('galAlbumItem','AlbumItems');
+            $c->leftJoin('galTag','Tags');
+            $c->select($this->xpdo->getSelectColumns('galItem','galItem'));
+            $c->select(array(
+                'AlbumItems.rank',
+                '(SELECT GROUP_CONCAT(Tags.tag) FROM '.$this->xpdo->getTableName('galTag').' Tags WHERE Tags.item = galItem.id) AS tags',
+            ));
+            $c->select(array());
+            $c->where(array(
+                'AlbumItems.album' => $id,
+            ));
+            $c->sortby('AlbumItems.rank','ASC');
+            $items = $this->xpdo->getCollection('galItem',$c);
+            /** @var galItem $item */
+            foreach ($items as $item) {
+                $itemArray = $item->toArray();
+                $itemArray['image'] = $item->get('image');
+                $itemArray['absoluteImage'] = $item->get('absoluteImage');
+                $itemArray['relativeImage'] = $item->get('relativeImage');
+
+                $list[] = array(
+                    'id' => 'item-'.$item->get('id'),
+                    'text' => $item->get('name'),
+                    'cls' => 'icon-album-item icon-jpg',
+                    'type' => 'gallery-item',
+                    'leaf' => true,
+                    'data' => $itemArray,
+                    'qtip' => '<img src="'.$item->get('image').'" alt="'.$item->get('name').'" />',
+                    'treeHandler' => 'gal-tree-handler',
+                );
+            }
+        }
+        return $list;
+    }
+
+    /**
+     * Return a detailed list of objects in a specific path. Used for thumbnails in the Browser.
+     *
+     * @param string $path
+     * @return array
+     */
+    public function getObjectsInContainer($path) {
+        $properties = $this->getPropertyList();
+        $list = array();
+        if ($path == '/') {
+            // Nothing to do?  Perhaps displaying all gallery items, or a list of albums might be good.
+        }
+        else {
+            $id = explode('-',$path);
+            $id = (int)$id[1];
+
+            /* get items */
+            $c = $this->xpdo->newQuery('galItem');
+            $c->innerJoin('galAlbumItem','AlbumItems');
+            $c->leftJoin('galTag','Tags');
+            $c->select($this->xpdo->getSelectColumns('galItem','galItem'));
+            $c->select(array(
+                'AlbumItems.rank',
+                '(SELECT GROUP_CONCAT(Tags.tag) FROM '.$this->xpdo->getTableName('galTag').' Tags WHERE Tags.item = galItem.id) AS tags',
+            ));
+            $c->select(array());
+            $c->where(array(
+                'AlbumItems.album' => $id,
+            ));
+            $c->sortby('AlbumItems.rank','ASC');
+            $items = $this->xpdo->getCollection('galItem',$c);
+
+            $imageWidth = $this->ctx->getOption('filemanager_image_width', 400);
+            $imageHeight = $this->ctx->getOption('filemanager_image_height', 300);
+            $thumbHeight = $this->ctx->getOption('filemanager_thumb_height', 60);
+            $thumbWidth = $this->ctx->getOption('filemanager_thumb_width', 80);
+
+            /** @var galItem $item */
+            foreach ($items as $item) {
+                $itemArray = $item->toArray();
+                $itemArray['image'] = $item->get('image');
+                $itemArray['absoluteImage'] = $item->get('absoluteImage');
+                $itemArray['relativeImage'] = $item->get('relativeImage');
+
+                $size = @getimagesize($itemArray['image']);
+                if (is_array($size)) {
+                    $imageWidth = $size[0] > 800 ? 800 : $size[0];
+                    $imageHeight = $size[1] > 600 ? 600 : $size[1];
+                }
+
+                /* ensure max h/w */
+                if ($thumbWidth > $imageWidth) $thumbWidth = $imageWidth;
+                if ($thumbHeight > $imageHeight) $thumbHeight = $imageHeight;
+
+                $list[] = array(
+                    'id' => 'item-'.$item->get('id'),
+                    'name' => $item->get('name'),
+                    'cls' => 'icon-album-item icon-jpg',
+                    'type' => 'gallery-item',
+                    'leaf' => true,
+                    'image' => $item->get('image'),
+                    'image_width' => $imageWidth,
+                    'image_height' => $imageHeight,
+                    'thumb' => $item->get('thumbnail'),
+                    'thumb_width' => $thumbWidth,
+                    'thumb_height' => $thumbHeight,
+                    'url' => $itemArray['image'],
+                    'relativeUrl' => $itemArray['relativeImage'],
+                    'fullRelativeUrl' => $itemArray['relativeImage'],
+                );
+            }
+        }
+        return $list;
+    }
+
+    /**
+     * Create a container at the passed location with the passed name
+     *
+     * @abstract
+     * @param string $name
+     * @param string $parentContainer
+     * @return boolean
+     */
+    public function createContainer($name,$parentContainer) {
+        /** @var galAlbum $album */
+        $album = $this->xpdo->newObject('galAlbum');
+        $album->set('name',$name);
+        $album->set('createdby',$this->xpdo->user->get('id'));
+
+        $total = $this->xpdo->getCount('galAlbum');
+        $album->set('rank',$total);
+
+        if (!($saved = $album->save())) {
+            $this->xpdo->log(modX::LOG_LEVEL_ERROR,'[Gallery] Could not create album: '.print_r($album->toArray(),true));
+        }
+
+        return $saved;
+    }
+
+    /**
+     * Remove the specified container
+     *
+     * @abstract
+     * @param string $path
+     * @return boolean
+     */
+    public function removeContainer($path) {
+        $removed = false;
+        /** @var galAlbum $album */
+        $album = $this->xpdo->getObject('galAlbum',$path);
+        if ($album) {
+            if (!($removed = $album->remove())) {
+                $this->xpdo->log(modX::LOG_LEVEL_ERROR,'[Gallery] Could not remove album.');
+            }
+        }
+        return $removed;
+    }
+
+    /**
+     * Rename a container
+     *
+     * @abstract
+     * @param string $oldPath
+     * @param string $newName
+     * @return boolean
+     */
+    public function renameContainer($oldPath,$newName) { }
+
+    /**
+     * Upload objects to a specific container
+     *
+     * @abstract
+     * @param string $container
+     * @param array $objects
+     * @return boolean
+     */
+    public function uploadObjectsToContainer($container,array $objects = array()) { }
+
+    /**
+     * Get the contents of an object
+     *
+     * @abstract
+     * @param string $objectPath
+     * @return boolean
+     */
+    public function getObjectContents($objectPath) { }
+
+    /**
+     * Update the contents of a specific object
+     *
+     * @abstract
+     * @param string $objectPath
+     * @param string $content
+     * @return boolean
+     */
+    public function updateObject($objectPath,$content) { }
+
+    /**
+     * Create an object from a path
+     *
+     * @param string $objectPath
+     * @param string $name
+     * @param string $content
+     * @return boolean|string
+     */
+    public function createObject($objectPath,$name,$content) { }
+
+    /**
+     * Remove an object
+     *
+     * @abstract
+     * @param string $objectPath
+     * @return boolean
+     */
+    public function removeObject($objectPath) { }
+
+    /**
+     * Rename a file/object
+     *
+     * @abstract
+     * @param string $oldPath
+     * @param string $newName
+     * @return bool
+     */
+    public function renameObject($oldPath,$newName) { }
+
+    /**
+     * Get the openTo path for this source, used with TV input types and Static Elements/Resources
+     *
+     * @param string $value
+     * @param array $parameters
+     * @return string
+     */
+    public function getOpenTo($value,array $parameters = array()) { }
+
+    /**
+     * Get the base path for this source. Only applicable to sources that are streams, used for determining
+     * the base path with Static objects.
+     *
+     * @param string $object An optional file to find the base path with
+     * @return string
+     */
+    public function getBasePath($object = '') { }
+
+    /**
+     * Get the base URL for this source. Only applicable to sources that are streams; used for determining the base
+     * URL with Static objects and downloading objects.
+     *
+     * @abstract
+     * @param string $object
+     * @return void
+     */
+    public function getBaseUrl($object = '') { }
+
+    /**
+     * Get the URL for an object in this source. Only applicable to sources that are streams; used for determining
+     * the base URL with Static objects and downloading objects.
+     *
+     * @abstract
+     * @param string $object
+     * @return void
+     */
+    public function getObjectUrl($object = '') { }
+
+    /**
+     * Move a file or folder to a specific location
+     *
+     * @param string $from The location to move from
+     * @param string $to The location to move to
+     * @param string $point
+     * @return boolean
+     */
+    public function moveObject($from, $to, $point = 'append', $to_source = 0) {
+        $from = explode('-',$from);
+        if (empty($from[1])) return false;
+
+        $to = explode('-',$to);
+        if (empty($to[1])) return false;
+
+        /** If reordering */
+        if ($from[0] == 'item' && $to[0] == 'item') {
+            /** @TODO Eventually find a way to send the item; may need to refactor Revo code to do this. This current
+             * code will break when we add multi-album support for items */
+            /** @var galAlbumItem $fromItem */
+            $fromItem = $this->xpdo->getObject('galAlbumItem',array('item' => $from[1]));
+            if (empty($fromItem)) return false;
+            /** @var galAlbumItem $toItem */
+            $toItem = $this->xpdo->getObject('galAlbumItem',array('item' => $to[1]));
+            if (empty($toItem)) return false;
+
+            /* if dragging between items in an album */
+            if ($fromItem->get('album') != $toItem->get('album')) {
+                $from = implode('-',$from);
+                return $this->moveObject($from,'album-'.$toItem->get('album'),$point);
+            }
+
+            switch ($point) {
+                case 'below':
+                    /* move FROM to below TO */
+                    $newRank = $toItem->get('rank');
+                    $fromItem->reorder($newRank);
+                    break;
+                case 'above':
+                    /* move FROM to above TO */
+                    $newRank = $toItem->get('rank')-1;
+                    $newRank = $newRank > 0 ? $newRank : 0;
+                    $fromItem->reorder($newRank);
+                    break;
+            }
+
+        /** Moving item to different album */
+        } else if ($from[0] == 'item' && $to[0] == 'album') {
+            /** @var galItem $fromItem */
+            $fromItem = $this->xpdo->getObject('galItem',$from[1]);
+            if (empty($fromItem)) return false;
+            /** @var galAlbum $toAlbum */
+            $toAlbum = $this->xpdo->getObject('galAlbum',$to[1]);
+            if (empty($toAlbum)) return false;
+
+            $fromItem->move($toAlbum->get('id'));
+
+        /** Moving album */
+        } else if ($from[0] == 'album') {
+            /** @var galAlbum $fromAlbum */
+            $fromAlbum = $this->xpdo->getObject('galAlbum',$from[1]);
+            if (empty($fromAlbum)) return false;
+            /** @var galAlbum $toAlbum */
+            $toAlbum = $this->xpdo->getObject('galAlbum',$to[1]);
+            if (empty($toAlbum)) return false;
+
+            switch ($point) {
+                case 'below':
+                    /* move FROM to below TO */
+                    $newRank = $toAlbum->get('rank');
+                    $fromAlbum->reorder($newRank);
+                    break;
+                case 'above':
+                    /* move FROM to above TO */
+                    $newRank = $toAlbum->get('rank')-1;
+                    $fromAlbum->reorder($newRank);
+                    break;
+                case 'append':
+                    /* move FROM inside TO */
+                    $fromAlbum->move($toAlbum->get('id'));
+                    break;
+            }
+
+        }
+        return true;
+    }
+
+    /**
+     * Get the name of this source type, ie, "File System"
+     * @return string
+     */
+    public function getTypeName() {
+        $this->xpdo->lexicon->load('gallery:source');
+        return $this->xpdo->lexicon('gallery.source_name');
+    }
+
+    /**
+     * Get a short description of this source type
+     * @return string
+     */
+    public function getTypeDescription() {
+        $this->xpdo->lexicon->load('gallery:source');
+        return $this->xpdo->lexicon('gallery.source_desc');
+    }
+
+    /**
+     * Get the default properties for this source. Override this in your custom source driver to provide custom
+     * properties for your source type.
+     * @return array
+     */
+    public function getDefaultProperties() {
+        return array(
+
+        );
+    }
+}
diff --git a/core/components/gallery/src/Model/metadata.mysql.php b/core/components/gallery/src/Model/metadata.mysql.php
new file mode 100644
index 0000000..8790174
--- /dev/null
+++ b/core/components/gallery/src/Model/metadata.mysql.php
@@ -0,0 +1,13 @@
+<?php
+$xpdo_meta_map = array (
+    'version' => '3.0',
+    'namespace' => 'Gallery\\Model',
+    'namespacePrefix' => 'Gallery',
+    'class_map' => 
+    array (
+        'MODX\\Revolution\\Sources\\modMediaSource' => 
+        array (
+            0 => 'Gallery\\Model\\GalleryAlbumsMediaSource',
+        ),
+    ),
+);
\ No newline at end of file
diff --git a/core/components/gallery/src/Model/mysql/GalleryAlbumsMediaSource.php b/core/components/gallery/src/Model/mysql/GalleryAlbumsMediaSource.php
new file mode 100644
index 0000000..1b3d05b
--- /dev/null
+++ b/core/components/gallery/src/Model/mysql/GalleryAlbumsMediaSource.php
@@ -0,0 +1,26 @@
+<?php
+namespace Gallery\Model\mysql;
+
+use xPDO\xPDO;
+
+class GalleryAlbumsMediaSource extends \Gallery\Model\GalleryAlbumsMediaSource
+{
+
+    public static $metaMap = array (
+        'package' => 'Gallery\\Model',
+        'version' => '3.0',
+        'table' => '',
+        'extends' => 'MODX\\Revolution\\Sources\\modMediaSource',
+        'tableMeta' => 
+        array (
+            'engine' => 'MyISAM',
+        ),
+        'fields' => 
+        array (
+        ),
+        'fieldMeta' => 
+        array (
+        ),
+    );
+
+}

From 03a4834c2bedef5194df551eabc11b2ac3cf0a6a Mon Sep 17 00:00:00 2001
From: halftrainedharry <katachrese@gmx.ch>
Date: Fri, 22 Apr 2022 10:52:00 +0200
Subject: [PATCH 12/20] minor changes to avoid warnings

---
 .../gallery/js/mgr/widgets/album/album.items.view.js        | 4 ++++
 .../gallery/elements/snippets/snippet.gallery.php           | 6 ++++--
 .../gallery/elements/snippets/snippet.galleryalbums.php     | 2 +-
 core/components/gallery/model/gallery/galitem.class.php     | 2 +-
 .../gallery/processors/mgr/item/ajaxupload.class.php        | 2 +-
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/assets/components/gallery/js/mgr/widgets/album/album.items.view.js b/assets/components/gallery/js/mgr/widgets/album/album.items.view.js
index 31bb242..e5703cd 100644
--- a/assets/components/gallery/js/mgr/widgets/album/album.items.view.js
+++ b/assets/components/gallery/js/mgr/widgets/album/album.items.view.js
@@ -41,6 +41,10 @@ Ext.extend(GAL.view.AlbumItems,MODx.DataView,{
                 ,source: o.source.id
                 ,target: o.target.id
             }
+            ,listeners: {
+                'success': {fn:function(r) {
+                },scope:this}
+            }
         });
     }
 
diff --git a/core/components/gallery/elements/snippets/snippet.gallery.php b/core/components/gallery/elements/snippets/snippet.gallery.php
index 9e84ebf..a28d7e5 100644
--- a/core/components/gallery/elements/snippets/snippet.gallery.php
+++ b/core/components/gallery/elements/snippets/snippet.gallery.php
@@ -45,7 +45,9 @@
 
 $data = $modx->call('galItem','getList',array(&$modx,$scriptProperties));
 $totalVar = $modx->getOption('totalVar', $scriptProperties, 'total');
-$modx->setPlaceholder($totalVar,$data['total']);
+if (is_array($data) && isset($data['total'])){
+    $modx->setPlaceholder($totalVar,$data['total']);
+}
 
 /* load plugins */
 $plugin = $modx->getOption('plugin',$scriptProperties,'');
@@ -110,7 +112,7 @@
 $nthTpls = array();
 foreach($keys as $key) {
     $keyBits = $gallery->explodeAndClean($key, '_');
-    if (isset($keyBits[0]) && $keyBits[0] === 'thumbTpl') {
+    if (isset($keyBits[0]) && $keyBits[0] === 'thumbTpl' && isset($keyBits[1])) {
         if ($i = (int) $keyBits[1]) $nthTpls[$i] = $scriptProperties[$key];
     }
 }
diff --git a/core/components/gallery/elements/snippets/snippet.galleryalbums.php b/core/components/gallery/elements/snippets/snippet.galleryalbums.php
index 267dc18..6995300 100644
--- a/core/components/gallery/elements/snippets/snippet.galleryalbums.php
+++ b/core/components/gallery/elements/snippets/snippet.galleryalbums.php
@@ -85,7 +85,7 @@
     if (!isset($nav['next']) && isset($nav['current'])) {
         $nav['next'] = $albumArray['id'];
     }
-    if ($_GET[$albumRequestVar] == $albumArray['id']) {
+    if (isset($_GET[$albumRequestVar]) && $_GET[$albumRequestVar] == $albumArray['id']) {
         $nav['current'] = $albumArray['id'];
         $nav['curIdx'] = $idx + 1;
         $classes[] = 'current';
diff --git a/core/components/gallery/model/gallery/galitem.class.php b/core/components/gallery/model/gallery/galitem.class.php
index 9ad5e98..635cf0d 100644
--- a/core/components/gallery/model/gallery/galitem.class.php
+++ b/core/components/gallery/model/gallery/galitem.class.php
@@ -199,7 +199,7 @@ public function save($cacheFlag= null) {
             $this->set('createdon', strftime('%Y-%m-%d %H:%M:%S'));
         }
         if ($this->isNew() && !$this->get('createdby')) {
-            if (!empty($this->xpdo->user) && $this->xpdo->user instanceof modUser) {
+            if (!empty($this->xpdo->user) && ($this->xpdo->user instanceof modUser || $this->xpdo->user instanceof \MODX\Revolution\modUser)) {
                 if ($this->xpdo->user->isAuthenticated()) {
                     $this->set('createdby',$this->xpdo->user->get('id'));
                 }
diff --git a/core/components/gallery/processors/mgr/item/ajaxupload.class.php b/core/components/gallery/processors/mgr/item/ajaxupload.class.php
index e2a02ff..6f2f566 100644
--- a/core/components/gallery/processors/mgr/item/ajaxupload.class.php
+++ b/core/components/gallery/processors/mgr/item/ajaxupload.class.php
@@ -77,7 +77,7 @@ public function process(){
 
             $file = array("name" => $relativePath, "tmp_name" => $randomFilename, "error" => "0"); // emulate a $_FILES object
 
-            $modx->log(xPDO::LOG_LEVEL_ERROR,'[Gallery] Album Type: '.$scriptProperties['album']);
+            //$modx->log(xPDO::LOG_LEVEL_ERROR,'[Gallery] Album Type: '.$scriptProperties['album']);
 
 
             if ($bytes == 0 || !$item->upload($file,$scriptProperties['album'])) {

From 4b0613e0f61e00494352a52765e389c23677e6d8 Mon Sep 17 00:00:00 2001
From: halftrainedharry <katachrese@gmx.ch>
Date: Fri, 22 Apr 2022 11:09:58 +0200
Subject: [PATCH 13/20] fix bug request-parameter for album parent not part of
 cache-key

---
 .../gallery/model/gallery/galalbum.class.php          | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/core/components/gallery/model/gallery/galalbum.class.php b/core/components/gallery/model/gallery/galalbum.class.php
index 11562eb..029c690 100644
--- a/core/components/gallery/model/gallery/galalbum.class.php
+++ b/core/components/gallery/model/gallery/galalbum.class.php
@@ -411,6 +411,11 @@ public function getCoverItem($albumCoverSort = 'rank',$albumCoverSortDir = 'ASC'
     }
 
     public static function getList(modX &$modx,array $scriptProperties = array()) {
+        /* implement tree-style albums*/
+        if ($modx->getOption('checkForRequestAlbumVar',$scriptProperties,false)) {
+            $albumRequestVar = $modx->getOption('albumRequestVar',$scriptProperties,'galAlbum');
+            if (!empty($_REQUEST[$albumRequestVar])) $scriptProperties['parent'] = $_REQUEST[$albumRequestVar];
+        }
         $cacheKey = 'gallery/album/list/'.md5(serialize($scriptProperties));
         if ($modx->getCacheManager() && $cache = $modx->cacheManager->get($cacheKey)) {
             $albums = array();
@@ -431,12 +436,6 @@ public static function getList(modX &$modx,array $scriptProperties = array()) {
             $showInactive = $modx->getOption('showInactive',$scriptProperties,false);
             $prominentOnly = $modx->getOption('prominentOnly',$scriptProperties,true);
 
-            /* implement tree-style albums*/
-            if ($modx->getOption('checkForRequestAlbumVar',$scriptProperties,false)) {
-                $albumRequestVar = $modx->getOption('albumRequestVar',$scriptProperties,'galAlbum');
-                if (!empty($_REQUEST[$albumRequestVar])) $parent = $_REQUEST[$albumRequestVar];
-            }
-
             /* add random sorting for albums */
             if (in_array(strtolower($sort),array('random','rand()','rand'))) {
                 $sort = 'RAND()';

From 62f0bd168345e4d2d4461011aa837d7e0f37de0f Mon Sep 17 00:00:00 2001
From: halftrainedharry <katachrese@gmx.ch>
Date: Fri, 22 Apr 2022 16:03:18 +0200
Subject: [PATCH 14/20] fix upper case in processor call

---
 .../gallery/js/mgr/widgets/album/album.items.view.js        | 6 +++---
 .../components/gallery/js/mgr/widgets/album/album.tree.js   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/assets/components/gallery/js/mgr/widgets/album/album.items.view.js b/assets/components/gallery/js/mgr/widgets/album/album.items.view.js
index e5703cd..93a3fce 100644
--- a/assets/components/gallery/js/mgr/widgets/album/album.items.view.js
+++ b/assets/components/gallery/js/mgr/widgets/album/album.items.view.js
@@ -8,7 +8,7 @@ GAL.view.AlbumItems = function(config) {
         ,ident: 'galbit'
         ,id: 'gal-album-items-view'
         ,baseParams: {
-            action: 'mgr/item/getList'
+            action: 'mgr/item/getlist'
             ,album: config.album
         }
         ,loadingText: _('loading')
@@ -86,7 +86,7 @@ Ext.extend(GAL.view.AlbumItems,MODx.DataView,{
         MODx.Ajax.request({
             url: this.config.url
             ,params: {
-                action: 'mgr/album/setCoverItem'
+                action: 'mgr/album/setcoveritem'
                 ,id: data.id
                 ,albumid: data.album
             }
@@ -130,7 +130,7 @@ Ext.extend(GAL.view.AlbumItems,MODx.DataView,{
             text: _('gallery.item_delete_multiple_confirm')
             ,url: this.config.url
             ,params: {
-                action: 'mgr/item/removeMultiple'
+                action: 'mgr/item/removemultiple'
                 ,ids: ids.substr(1)
             }
             ,listeners: {
diff --git a/assets/components/gallery/js/mgr/widgets/album/album.tree.js b/assets/components/gallery/js/mgr/widgets/album/album.tree.js
index c1d01c6..1246ba0 100644
--- a/assets/components/gallery/js/mgr/widgets/album/album.tree.js
+++ b/assets/components/gallery/js/mgr/widgets/album/album.tree.js
@@ -4,7 +4,7 @@ GAL.tree.Album = function(config) {
     Ext.applyIf(config,{
         id: 'gal-tree-album'
         ,url: GAL.config.connector_url
-        ,action: 'mgr/album/getNodes'
+        ,action: 'mgr/album/getnodes'
         ,tbar: [{
             text: _('gallery.album_create')
             ,cls: 'primary-button'

From f132a62381931cc20d4b4dfb800934e664ee4d0b Mon Sep 17 00:00:00 2001
From: halftrainedharry <katachrese@gmx.ch>
Date: Fri, 22 Apr 2022 16:07:13 +0200
Subject: [PATCH 15/20] fix "Access denied." error for web/phpthumb processor
 in PHP8

---
 assets/components/gallery/connector.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/components/gallery/connector.php b/assets/components/gallery/connector.php
index 958ac59..5e32a14 100644
--- a/assets/components/gallery/connector.php
+++ b/assets/components/gallery/connector.php
@@ -47,7 +47,7 @@
         if ($modx->user->hasSessionContext($modx->context->get('key'))) {
             $_SERVER['HTTP_MODAUTH'] = $_SESSION["modx.{$modx->context->get('key')}.user.token"];
         } else {
-            $_SERVER['HTTP_MODAUTH'] = 0;
+            $_SERVER['HTTP_MODAUTH'] = '';
         }
     } else {
         $_SERVER['HTTP_MODAUTH'] = $modx->site_id;

From d0742cc7dc2189075659ed05f3824f9febda0882 Mon Sep 17 00:00:00 2001
From: Thomas Jakobi <thomas.jakobi@partout.info>
Date: Wed, 21 Sep 2016 11:59:38 +0200
Subject: [PATCH 16/20] Removed link to the current maintainer

---
 readme.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/readme.md b/readme.md
index cda7759..20e4120 100644
--- a/readme.md
+++ b/readme.md
@@ -2,8 +2,6 @@ Gallery Extra for MODx Revolution
 =================================
 **Author: Shaun McCormick (http://www.splittingred.com)**
 
-Gallery is currently maintained at [modxcms/Gallery](http://github.com/modxcms/Gallery). Please [go there](http://github.com/modxcms/Gallery).
-
 A Gallery system for your photos. Supports albums, items, tagging, and more.
 Also integrates a custom TV for resizing/cropping/editing of a photo before
 putting it into a document.

From c356923f2dc82735669926c421f230f2b830b620 Mon Sep 17 00:00:00 2001
From: matdave <mat@matdave.com>
Date: Sat, 11 Jun 2022 08:19:53 -0500
Subject: [PATCH 17/20] adjusting the build config to work with just GPM

---
 _build/build.config.sample.php                |  38 --
 _build/build.transport.php                    | 267 --------
 _build/config.json                            | 593 ++++++++++++++----
 _build/data/events/events.gallerycustomtv.php |  49 --
 _build/data/transport.chunks.php              |  58 --
 _build/data/transport.menu.php                |  42 --
 _build/data/transport.plugins.php             |  28 -
 _build/data/transport.settings.php            | 222 -------
 _build/data/transport.snippets.php            |  61 --
 _build/properties/properties.gallery.php      | 303 ---------
 .../properties/properties.galleryalbums.php   | 208 ------
 _build/properties/properties.galleryitem.php  | 215 -------
 _build/resolvers/resolve.dbchanges.php        |  68 --
 _build/resolvers/resolve.extpack.php          |  53 --
 _build/resolvers/resolve.paths.php            |   6 +-
 _build/resolvers/resolve.tables.php           |  48 --
 16 files changed, 483 insertions(+), 1776 deletions(-)
 delete mode 100644 _build/build.config.sample.php
 delete mode 100644 _build/build.transport.php
 delete mode 100644 _build/data/events/events.gallerycustomtv.php
 delete mode 100644 _build/data/transport.chunks.php
 delete mode 100644 _build/data/transport.menu.php
 delete mode 100644 _build/data/transport.plugins.php
 delete mode 100644 _build/data/transport.settings.php
 delete mode 100644 _build/data/transport.snippets.php
 delete mode 100644 _build/properties/properties.gallery.php
 delete mode 100644 _build/properties/properties.galleryalbums.php
 delete mode 100644 _build/properties/properties.galleryitem.php
 delete mode 100644 _build/resolvers/resolve.dbchanges.php
 delete mode 100644 _build/resolvers/resolve.extpack.php
 delete mode 100644 _build/resolvers/resolve.tables.php

diff --git a/_build/build.config.sample.php b/_build/build.config.sample.php
deleted file mode 100644
index a15fff5..0000000
--- a/_build/build.config.sample.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Gallery
- *
- * Copyright 2010-2012 by Shaun McCormick <shaun@modx.com>
- *
- * Gallery is free software; you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option) any later
- * version.
- *
- * Gallery is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * Gallery; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * @package gallery
- */
-/**
- * Define the MODX path constants necessary for installation
- *
- * @package gallery
- * @subpackage build
- */
-define('MODX_BASE_PATH','/path/to/modx/');
-define('MODX_CORE_PATH', MODX_BASE_PATH . 'core/');
-define('MODX_MANAGER_PATH', MODX_BASE_PATH . 'manager/');
-define('MODX_CONNECTORS_PATH', MODX_BASE_PATH . 'connectors/');
-define('MODX_ASSETS_PATH', MODX_BASE_PATH . 'assets/');
-
-define('MODX_BASE_URL','/modx/');
-define('MODX_CORE_URL', MODX_BASE_URL . 'core/');
-define('MODX_MANAGER_URL', MODX_BASE_URL . 'manager/');
-define('MODX_CONNECTORS_URL', MODX_BASE_URL . 'connectors/');
-define('MODX_ASSETS_URL', MODX_BASE_URL . 'assets/');
\ No newline at end of file
diff --git a/_build/build.transport.php b/_build/build.transport.php
deleted file mode 100644
index 3a81fb5..0000000
--- a/_build/build.transport.php
+++ /dev/null
@@ -1,267 +0,0 @@
-<?php
-/**
- * Gallery
- *
- * Copyright 2010-2012 by Shaun McCormick <shaun@modx.com>
- *
- * Gallery is free software; you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option) any later
- * version.
- *
- * Gallery is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * Gallery; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * @package gallery
- */
-/**
- * Gallery build script
- *
- * @package gallery
- * @subpackage build
- */
-$mtime = microtime();
-$mtime = explode(' ', $mtime);
-$mtime = $mtime[1] + $mtime[0];
-$tstart = $mtime;
-set_time_limit(0);
-
-/* define package */
-define('PKG_NAME','Gallery');
-define('PKG_NAME_LOWER','gallery');
-define('PKG_VERSION','1.7.1');
-define('PKG_RELEASE','pl');
-
-/* define sources */
-$root = dirname(dirname(__FILE__)).'/';
-$sources = array(
-    'root' => $root,
-    'build' => $root . '_build/',
-    'data' => $root . '_build/data/',
-    'resolvers' => $root . '_build/resolvers/',
-    'chunks' => $root.'core/components/'.PKG_NAME_LOWER.'/elements/chunks/',
-    'snippets' => $root.'core/components/'.PKG_NAME_LOWER.'/elements/snippets/',
-    'plugins' => $root.'core/components/'.PKG_NAME_LOWER.'/elements/plugins/',
-    'lexicon' => $root . 'core/components/'.PKG_NAME_LOWER.'/lexicon/',
-    'docs' => $root.'core/components/'.PKG_NAME_LOWER.'/docs/',
-    'pages' => $root.'core/components/'.PKG_NAME_LOWER.'/elements/pages/',
-    'source_assets' => $root.'assets/components/'.PKG_NAME_LOWER,
-    'source_core' => $root.'core/components/'.PKG_NAME_LOWER,
-);
-unset($root);
-
-/* override with your own defines here (see build.config.sample.php) */
-require_once $sources['build'] . '/build.config.php';
-require_once MODX_CORE_PATH . 'model/modx/modx.class.php';
-require_once $sources['build'] . '/includes/functions.php';
-
-$modx= new modX();
-$modx->initialize('mgr');
-echo '<pre>'; /* used for nice formatting of log messages */
-$modx->setLogLevel(modX::LOG_LEVEL_INFO);
-$modx->setLogTarget('ECHO');
-
-$modx->loadClass('transport.modPackageBuilder','',false, true);
-$builder = new modPackageBuilder($modx);
-$builder->directory = dirname(dirname(__FILE__)).'/_packages/';
-$builder->createPackage(PKG_NAME_LOWER,PKG_VERSION,PKG_RELEASE);
-$builder->registerNamespace(PKG_NAME_LOWER,false,true,'{core_path}components/'.PKG_NAME_LOWER.'/','{assets_path}components/'.PKG_NAME_LOWER.'/');
-$modx->log(modX::LOG_LEVEL_INFO,'Created Transport Package and Namespace.');
-
-/* create category */
-$category= $modx->newObject('modCategory');
-$category->set('id',1);
-$category->set('category',PKG_NAME);
-
-/* add snippets */
-$snippets = include $sources['data'].'transport.snippets.php';
-if (!is_array($snippets)) {
-    $modx->log(modX::LOG_LEVEL_ERROR,'Could not package in snippets.');
-} else {
-    $category->addMany($snippets);
-    $modx->log(modX::LOG_LEVEL_INFO,'Packaged in '.count($snippets).' snippets.');
-}
-
-/* add chunks */
-$chunks = include $sources['data'].'transport.chunks.php';
-if (!is_array($chunks)) {
-    $modx->log(modX::LOG_LEVEL_ERROR,'Could not package in chunks.');
-} else {
-    $category->addMany($chunks);
-    $modx->log(modX::LOG_LEVEL_INFO,'Packaged in '.count($chunks).' chunks.');
-}
-
-/* add tv plugin */
-$plugin= $modx->newObject('modPlugin');
-$plugin->fromArray(array(
-    'id' => 1,
-    'name' => 'GalleryCustomTV',
-    'description' => '',
-    'plugincode' => getSnippetContent($sources['plugins'] . 'gallerycustomtv.plugin.php'),
-),'',true,true);
-$events = include $sources['data'].'events/events.gallerycustomtv.php';
-if (is_array($events) && !empty($events)) {
-    $modx->log(modX::LOG_LEVEL_INFO,'Added '.count($events).' events to GalleryCustomTV plugin.');
-    $plugin->addMany($events);
-}
-unset($events);
-$attributes = array (
-    xPDOTransport::PRESERVE_KEYS => false,
-    xPDOTransport::UPDATE_OBJECT => true,
-    xPDOTransport::UNIQUE_KEY => 'name',
-    xPDOTransport::RELATED_OBJECTS => true,
-    xPDOTransport::RELATED_OBJECT_ATTRIBUTES => array (
-        'PluginEvents' => array(
-            xPDOTransport::PRESERVE_KEYS => true,
-            xPDOTransport::UPDATE_OBJECT => false,
-            xPDOTransport::UNIQUE_KEY => array('pluginid','event'),
-        ),
-    ),
-);
-$vehicle = $builder->createVehicle($plugin, $attributes);
-$builder->putVehicle($vehicle);
-unset($vehicle,$attributes,$plugin);
-
-/* create category vehicle */
-$attr = array(
-    xPDOTransport::UNIQUE_KEY => 'category',
-    xPDOTransport::PRESERVE_KEYS => false,
-    xPDOTransport::UPDATE_OBJECT => true,
-    xPDOTransport::RELATED_OBJECTS => true,
-    xPDOTransport::RELATED_OBJECT_ATTRIBUTES => array (
-        'Children' => array(
-            xPDOTransport::PRESERVE_KEYS => false,
-            xPDOTransport::UPDATE_OBJECT => true,
-            xPDOTransport::UNIQUE_KEY => 'category',
-            xPDOTransport::RELATED_OBJECTS => true,
-            xPDOTransport::RELATED_OBJECT_ATTRIBUTES => array (
-                'Snippets' => array(
-                    xPDOTransport::PRESERVE_KEYS => false,
-                    xPDOTransport::UPDATE_OBJECT => true,
-                    xPDOTransport::UNIQUE_KEY => 'name',
-                ),
-                'Chunks' => array(
-                    xPDOTransport::PRESERVE_KEYS => false,
-                    xPDOTransport::UPDATE_OBJECT => true,
-                    xPDOTransport::UNIQUE_KEY => 'name',
-                ),
-            ),
-        ),
-        'Snippets' => array(
-            xPDOTransport::PRESERVE_KEYS => false,
-            xPDOTransport::UPDATE_OBJECT => true,
-            xPDOTransport::UNIQUE_KEY => 'name',
-        ),
-        'Chunks' => array (
-            xPDOTransport::PRESERVE_KEYS => false,
-            xPDOTransport::UPDATE_OBJECT => true,
-            xPDOTransport::UNIQUE_KEY => 'name',
-        ),
-    ),
-);
-$vehicle = $builder->createVehicle($category,$attr);
-
-$modx->log(modX::LOG_LEVEL_INFO,'Adding file resolvers to category...');
-$vehicle->resolve('file',array(
-    'source' => $sources['source_assets'],
-    'target' => "return MODX_ASSETS_PATH . 'components/';",
-));
-$vehicle->resolve('file',array(
-    'source' => $sources['source_core'],
-    'target' => "return MODX_CORE_PATH . 'components/';",
-));
-$builder->putVehicle($vehicle);
-
-/* load system settings */
-$settings = include $sources['data'].'transport.settings.php';
-if (!is_array($settings)) {
-    $modx->log(modX::LOG_LEVEL_ERROR,'Could not package in settings.');
-} else {
-    $attributes= array(
-        xPDOTransport::UNIQUE_KEY => 'key',
-        xPDOTransport::PRESERVE_KEYS => true,
-        xPDOTransport::UPDATE_OBJECT => false,
-    );
-    foreach ($settings as $setting) {
-        $vehicle = $builder->createVehicle($setting,$attributes);
-        $builder->putVehicle($vehicle);
-    }
-    $modx->log(modX::LOG_LEVEL_INFO,'Packaged in '.count($settings).' System Settings.');
-}
-unset($settings,$setting,$attributes);
-
-/* load menu */
-$menu = include $sources['data'].'transport.menu.php';
-if (empty($menu)) {
-    $modx->log(modX::LOG_LEVEL_ERROR,'Could not package in menu.');
-} else {
-    $vehicle= $builder->createVehicle($menu,array (
-        xPDOTransport::PRESERVE_KEYS => true,
-        xPDOTransport::UPDATE_OBJECT => true,
-        xPDOTransport::UNIQUE_KEY => 'text',
-        xPDOTransport::RELATED_OBJECTS => true,
-        xPDOTransport::RELATED_OBJECT_ATTRIBUTES => array (
-            'Action' => array (
-                xPDOTransport::PRESERVE_KEYS => false,
-                xPDOTransport::UPDATE_OBJECT => true,
-                xPDOTransport::UNIQUE_KEY => array ('namespace','controller'),
-            ),
-        ),
-    ));
-    $modx->log(modX::LOG_LEVEL_INFO,'Adding in PHP resolvers...');
-    $vehicle->resolve('php',array(
-        'source' => $sources['resolvers'] . 'resolve.tables.php',
-    ));
-    $vehicle->resolve('php',array(
-        'source' => $sources['resolvers'] . 'resolve.phpthumb.php',
-    ));
-    $vehicle->resolve('php',array(
-        'source' => $sources['resolvers'] . 'resolve.paths.php',
-    ));
-    $vehicle->resolve('php',array(
-        'source' => $sources['resolvers'] . 'resolve.dbchanges.php',
-    ));
-    $vehicle->resolve('php',array(
-        'source' => $sources['resolvers'] . 'resolve.spaces.php',
-    ));
-    $vehicle->resolve('php',array(
-        'source' => $sources['resolvers'] . 'resolve.albumfiles.php',
-    ));
-    $vehicle->resolve('php',array(
-        'source' => $sources['resolvers'] . 'resolve.extpack.php',
-    ));
-    $builder->putVehicle($vehicle);
-    $modx->log(modX::LOG_LEVEL_INFO,'Packaged in menu.');
-}
-unset($vehicle,$menu);
-
-/* now pack in the license file, readme and setup options */
-$builder->setPackageAttributes(array(
-    'license' => file_get_contents($sources['docs'] . 'license.txt'),
-    'readme' => file_get_contents($sources['docs'] . 'readme.txt'),
-    'changelog' => file_get_contents($sources['docs'] . 'changelog.txt'),
-    'setup-options' => array(
-        'source' => $sources['build'].'setup.options.php',
-    ),
-));
-$modx->log(modX::LOG_LEVEL_INFO,'Added package attributes and setup options.');
-
-/* zip up package */
-$modx->log(modX::LOG_LEVEL_INFO,'Packing up transport package zip...');
-$builder->pack();
-
-$mtime= microtime();
-$mtime= explode(" ", $mtime);
-$mtime= $mtime[1] + $mtime[0];
-$tend= $mtime;
-$totalTime= ($tend - $tstart);
-$totalTime= sprintf("%2.4f s", $totalTime);
-
-$modx->log(modX::LOG_LEVEL_INFO,"\n<br />Package Built.<br />\nExecution time: {$totalTime}\n");
-
-exit ();
\ No newline at end of file
diff --git a/_build/config.json b/_build/config.json
index 230d9c2..2d965ce 100644
--- a/_build/config.json
+++ b/_build/config.json
@@ -1,136 +1,501 @@
 {
-    "name": "Gallery"
-    ,"lowCaseName": "gallery"
-    ,"description": "Gallery"
-    ,"author": "Shaun McCormick"
-    ,"version": "1.7.1"
-    ,"package":{
+    "name": "Gallery",
+    "lowCaseName": "gallery",
+    "description": "Gallery",
+    "author": "Shaun McCormick",
+    "version": "2.0.0",
+    "package":{
         "actions": [{
-            "id": 1
-            ,"controller": "index"
+            "id": 1,
+            "controller": "index"
         }]
         ,"menus": [{
-            "text": "gallery"
-            ,"description": "gallery.menu_desc"
-            ,"action": 1
-            ,"parent": "components"
+            "text": "gallery",
+            "description": "gallery.menu_desc",
+            "action": 1,
+            "parent": "components"
         }]
         ,"elements": {
             "snippets": [{
-                "name": "Gallery"
-                ,"file": "snippet.gallery.php"
+                "name": "Gallery",
+                "file": "snippet.gallery.php",
+                "properties": [
+                    {
+                        "name": "album",
+                        "description": "gallery.album_desc",
+                        "value": "",
+                    },{
+                        "name": "tag",
+                        "description": "gallery.tag_desc",
+                        "value": "",
+                    },{
+                        "name": "plugin",
+                        "description": "gallery.plugin_desc",
+                        "value": "",
+                    },{
+                        "name": "pluginPath",
+                        "description": "gallery.pluginpath_desc",
+                        "value": "",
+                    },{
+                        "name": "thumbTpl",
+                        "description": "gallery.thumbtpl_desc",
+                        "value": "galItemThumb",
+                    },{
+                        "name": "containerTpl",
+                        "description": "gallery.containertpl_desc",
+                        "value": "",
+                    },{
+                        "name": "itemCls",
+                        "description": "gallery.itemcls_desc",
+                        "value": "gal-item",
+                    },{
+                        "name": "activeCls",
+                        "description": "gallery.activecls_desc",
+                        "value": "gal-item-active",
+                    },{
+                        "name": "toPlaceholder",
+                        "description": "gallery.toplaceholder_desc",
+                        "value": "",
+                    },{
+                        "name": "thumbWidth",
+                        "description": "gallery.thumbwidth_desc",
+                        "value": "100",
+                    },{
+                        "name": "thumbHeight",
+                        "description": "gallery.thumbheight_desc",
+                        "value": "100",
+                    },{
+                        "name": "thumbZoomCrop",
+                        "description": "gallery.thumbzoomcrop_desc",
+                        "type": "combo-boolean",
+                        "value": true,
+                    },{
+                        "name": "thumbFar",
+                        "description": "gallery.thumbfar_desc",
+                        "value": "C",
+                    },{
+                        "name": "thumbQuality",
+                        "description": "gallery.thumbquality_desc",
+                        "value": 90,
+                    },{
+                        "name": "thumbProperties",
+                        "description": "gallery.thumbproperties_desc",
+                        "value": "",
+                    },{
+                        "name": "linkToImage",
+                        "description": "gallery.linktoimage_desc",
+                        "type": "combo-boolean",
+                        "value": "",
+                    },{
+                        "name": "imageGetParam",
+                        "description": "gallery.imagegetparam_desc",
+                        "value": "galItem",
+                    },{
+                        "name": "imageWidth",
+                        "description": "gallery.imagewidth_desc",
+                        "value": 500,
+                    },{
+                        "name": "imageHeight",
+                        "description": "gallery.imageheight_desc",
+                        "value": 500,
+                    },{
+                        "name": "imageZoomCrop",
+                        "description": "gallery.imagezoomcrop_desc",
+                        "type": "combo-boolean",
+                        "value": false,
+                    },{
+                        "name": "imageFar",
+                        "description": "gallery.imagefar_desc",
+                        "value": "",
+                    },{
+                        "name": "imageQuality",
+                        "description": "gallery.imagequality_desc",
+                        "value": 90,
+                    },{
+                        "name": "imageProperties",
+                        "description": "gallery.imageproperties_desc",
+                        "value": "",
+                    },{
+                        "name": "sort",
+                        "description": "gallery.sort_desc",
+                        "value": "rank",
+                    },{
+                        "name": "dir",
+                        "description": "gallery.dir_desc",
+                        "value": "ASC",
+                    },{
+                        "name": "limit",
+                        "description": "gallery.limit_desc",
+                        "value": 0,
+                    },{
+                        "name": "start",
+                        "description": "gallery.start_desc",
+                        "value": 0,
+                    },{
+                        "name": "showInactive",
+                        "description": "gallery.showinactive_desc",
+                        "type": "combo-boolean",
+                        "value": false,
+                    },{
+                        "name": "checkForRequestAlbumVar",
+                        "description": "gallery.checkforrequestalbumvar_desc",
+                        "type": "combo-boolean",
+                        "value": true,
+                    },{
+                        "name": "albumRequestVar",
+                        "description": "gallery.albumrequestvar_desc",
+                        "value": "galAlbum",
+                    },{
+                        "name": "checkForRequestTagVar",
+                        "description": "gallery.checkforrequesttagvar_desc",
+                        "type": "combo-boolean",
+                        "value": true,
+                    },{
+                        "name": "tagRequestVar",
+                        "description": "gallery.tagrequestvar_desc",
+                        "value": "galTag",
+                    },{
+                        "name": "useCss",
+                        "description": "gallery.usecss_desc",
+                        "type": "combo-boolean",
+                        "value": true,
+                    }
+                ]
             },{
-                "name": "GalleryAlbums"
-                ,"file": "snippet.galleryalbums.php"
+                "name": "GalleryAlbums",
+                "file": "snippet.galleryalbums.php",
+                "properties": [
+                    {
+                        "name": "rowTpl",
+                        "description": "galleryalbums.rowtpl_desc",
+                        "value": "galAlbumRowTpl",
+                    },{
+                        "name": "rowCls",
+                        "description": "galleryalbums.rowcls_desc",
+                        "value": "",
+                    },{
+                        "name": "sort",
+                        "description": "galleryalbums.sort_desc",
+                        "value": "rank",
+                    },{
+                        "name": "dir",
+                        "description": "galleryalbums.dir_desc",
+                        "value": "DESC",
+                    },{
+                        "name": "limit",
+                        "description": "galleryalbums.limit_desc",
+                        "value": "10",
+                    },{
+                        "name": "start",
+                        "description": "galleryalbums.start_desc",
+                        "value": "0",
+                    },{
+                        "name": "toPlaceholder",
+                        "description": "galleryalbums.toplaceholder_desc",
+                        "value": "",
+                    },{
+                        "name": "showInactive",
+                        "description": "galleryalbums.showinactive_desc",
+                        "type": "combo-boolean",
+                        "value": false,
+                    },{
+                        "name": "prominentOnly",
+                        "description": "galleryalbums.prominentonly_desc",
+                        "type": "combo-boolean",
+                        "value": true,
+                    },{
+                        "name": "parent",
+                        "description": "galleryalbums.parent_desc",
+                        "value": "0",
+                    },{
+                        "name": "showAll",
+                        "description": "galleryalbums.showall_desc",
+                        "type": "combo-boolean",
+                        "value": true,
+                    },{
+                        "name": "showName",
+                        "description": "galleryalbums.showname_desc",
+                        "type": "combo-boolean",
+                        "value": true,
+                    },{
+                        "name": "albumRequestVar",
+                        "description": "galleryalbums.albumrequestvar_desc",
+                        "value": "galAlbum",
+                    },{
+                        "name": "albumCoverSort",
+                        "description": "galleryalbums.albumcoversort_desc",
+                        "value": "rank",
+                    },{
+                        "name": "albumCoverSortDir",
+                        "description": "galleryalbums.albumcoversortdir_desc",
+                        "value": "ASC",
+                    },{
+                        "name": "thumbWidth",
+                        "description": "galleryalbums.thumbwidth_desc",
+                        "value": "100",
+                    },{
+                        "name": "thumbHeight",
+                        "description": "galleryalbums.thumbheight_desc",
+                        "value": "100",
+                    },{
+                        "name": "thumbZoomCrop",
+                        "description": "galleryalbums.thumbzoomcrop_desc",
+                        "type": "combo-boolean",
+                        "value": true,
+                    },{
+                        "name": "thumbFar",
+                        "description": "galleryalbums.thumbfar_desc",
+                        "value": "C",
+                    },{
+                        "name": "thumbQuality",
+                        "description": "galleryalbums.thumbquality_desc",
+                        "value": 90,
+                    },{
+                        "name": "thumbProperties",
+                        "description": "galleryalbums.thumbproperties_desc",
+                        "value": "",
+                    }
+                ]
             },{
-                "name": "GalleryItem"
-                ,"file": "snippet.galleryitem.php"
+                "name": "GalleryItem",
+                "file": "snippet.galleryitem.php",
+                "properties": [
+                    {
+                        "name": "id",
+                        "description": "galleryitem.id_desc",
+                        "value": "",
+                    },{
+                        "name": "toPlaceholders",
+                        "description": "galleryitem.toplaceholders_desc",
+                        "type": "combo-boolean",
+                        "value": true,
+                    },{
+                        "name": "toPlaceholdersPrefix",
+                        "description": "galleryitem.toplaceholdersprefix_desc",
+                        "value": "galitem",
+                    },{
+                        "name": "tpl",
+                        "description": "galleryitem.tpl_desc",
+                        "value": "galItem",
+                    },{
+                        "name": "albumTpl",
+                        "description": "galleryitem.albumtpl_desc",
+                        "value": "galItemAlbum",
+                    },{
+                        "name": "albumSeparator",
+                        "description": "galleryitem.albumseparator_desc",
+                        "value": ",&nbsp;",
+                    },{
+                        "name": "albumRequestVar",
+                        "description": "galleryitem.albumrequestvar_desc",
+                        "value": "galAlbum",
+                    },{
+                        "name": "tagTpl",
+                        "description": "galleryitem.tagtpl_desc",
+                        "value": "galItemTag",
+                    },{
+                        "name": "tagSeparator",
+                        "description": "galleryitem.tagseparator_desc",
+                        "value": ",&nbsp;",
+                    },{
+                        "name": "tagSortDir",
+                        "description": "galleryitem.tagsortdir_desc",
+                        "value": "DESC",
+                    },{
+                        "name": "tagRequestVar",
+                        "description": "galleryitem.tagrequestvar_desc",
+                        "value": "galTag",
+                    },{
+                        "name": "thumbWidth",
+                        "description": "galleryitem.thumbwidth_desc",
+                        "value": "100",
+                    },{
+                        "name": "thumbHeight",
+                        "description": "galleryitem.thumbheight_desc",
+                        "value": "100",
+                    },{
+                        "name": "thumbZoomCrop",
+                        "description": "galleryitem.thumbzoomcrop_desc",
+                        "type": "combo-boolean",
+                        "value": true,
+                    },{
+                        "name": "thumbFar",
+                        "description": "galleryitem.thumbfar_desc",
+                        "value": "C",
+                    },{
+                        "name": "thumbQuality",
+                        "description": "galleryitem.thumbquality_desc",
+                        "value": 90,
+                    },{
+                        "name": "thumbProperties",
+                        "description": "galleryitem.thumbproperties_desc",
+                        "value": "",
+                    },{
+                        "name": "imageWidth",
+                        "description": "galleryitem.imagewidth_desc",
+                        "value": "",
+                    },{
+                        "name": "imageHeight",
+                        "description": "galleryitem.imageheight_desc",
+                        "value": "",
+                    },{
+                        "name": "imageZoomCrop",
+                        "description": "galleryitem.imagezoomcrop_desc",
+                        "type": "combo-boolean",
+                        "value": 0,
+                    },{
+                        "name": "imageFar",
+                        "description": "galleryitem.imagefar_desc",
+                        "value": "",
+                    },{
+                        "name": "imageQuality",
+                        "description": "galleryitem.imagequality_desc",
+                        "value": 90,
+                    },{
+                        "name": "imageProperties",
+                        "description": "galleryitem.imageproperties_desc",
+                        "value": "",
+                    }
+                ]
             }]
             ,"chunks": [{
                 "name": "galAlbumRowTpl"
+            },{
+                "name": "galAlbumRowWithCoverTpl"
+            },{
+                "name": "galItem"
+            },{
+                "name": "galItemAlbum"
+            },{
+                "name": "galItemTag"
             },{
                 "name": "galItemThumb"
+            }],
+            "plugins": [{
+                "name": "GalleryCustomTV",
+                "file": "gallerycustomtv.plugin.php",
+                "events": [
+                    "OnTVInputRenderList",
+                    "OnTVInputPropertiesList",
+                    "OnTVOutputRenderList",
+                    "OnTVOutputRenderPropertiesList",
+                    "OnDocFormPrerender",
+                    "OnManagerPageBeforeRender"
+                ]
             }]
         }
         ,"systemSettings": [{
-            "key": "backend_thumb_far"
-            ,"type": "textfield"
-            ,"area": "backend"
-            ,"value": "C"
-        },{
-            "key": "backend_thumb_height"
-            ,"type": "textfield"
-            ,"area": "backend"
-            ,"value": "100"
-        },{
-            "key": "backend_thumb_width"
-            ,"type": "textfield"
-            ,"area": "backend"
-            ,"value": "100"
-        },{
-            "key": "backend_thumb_zoomcrop"
-            ,"type": "combo-boolean"
-            ,"area": "backend"
-            ,"value": 1
-        },{
-            "key": "default_batch_upload_path"
-            ,"type": "textfield"
-            ,"area": "backend"
-            ,"value": "{assets_path}images/"
-        },{
-            "key": "thumbs_prepend_site_url"
-            ,"type": "combo-boolean"
-            ,"area": "backend"
-            ,"value": 0
-        },{
-            "key": "mediaSource"
-            ,"type": "modx-combo-source"
-            ,"area": "backend"
-            ,"value": 1
-        },{
-            "key": "use_richtext"
-            ,"type": "combo-boolean"
-            ,"area": "TinyMCE"
-            ,"value": 0
-        },{
-            "key": "tiny.width"
-            ,"type": "textfield"
-            ,"area": "TinyMCE"
-            ,"value": "95%"
-        },{
-            "key": "tiny.height"
-            ,"type": "textfield"
-            ,"area": "TinyMCE"
-            ,"value": "200"
-        },{
-            "key": "tiny.buttons1"
-            ,"type": "textfield"
-            ,"area": "TinyMCE"
-            ,"value": "undo,redo,selectall,pastetext,pasteword,charmap,separator,image,modxlink,unlink,media,separator,code,help"
-        },{
-            "key": "tiny.buttons2"
-            ,"type": "textfield"
-            ,"area": "TinyMCE"
-            ,"value": "bold,italic,underline,strikethrough,sub,sup,separator,bullist,numlist,outdent,indent,separator,justifyleft,justifycenter,justifyright,justifyfull"
-        },{
-            "key": "tiny.buttons3"
-            ,"type": "textfield"
-            ,"area": "TinyMCE"
-            ,"value": "styleselect,formatselect,separator,styleprops"
-        },{
-            "key": "tiny.buttons4"
-            ,"type": "textfield"
-            ,"area": "TinyMCE"
-            ,"value": ""
-        },{
-            "key": "tiny.buttons5"
-            ,"type": "textfield"
-            ,"area": "TinyMCE"
-            ,"value": ""
-        },{
-            "key": "tiny.custom_plugins"
-            ,"type": "textfield"
-            ,"area": "TinyMCE"
-            ,"value": ""
-        },{
-            "key": "tiny.theme"
-            ,"type": "textfield"
-            ,"area": "TinyMCE"
-            ,"value": ""
-        },{
-            "key": "tiny.theme_advanced_blockformats"
-            ,"type": "textfield"
-            ,"area": "TinyMCE"
-            ,"value": ""
-        },{
-            "key": "tiny.theme_advanced_css_selectors"
-            ,"type": "textfield"
-            ,"area": "TinyMCE"
-            ,"value": ""
+            "key": "backend_thumb_far",
+            "type": "textfield",
+            "area": "backend",
+            "value": "C"
+        },{
+            "key": "backend_thumb_height",
+            "type": "textfield",
+            "area": "backend",
+            "value": "100"
+        },{
+            "key": "backend_thumb_width",
+            "type": "textfield",
+            "area": "backend",
+            "value": "100"
+        },{
+            "key": "backend_thumb_zoomcrop",
+            "type": "combo-boolean",
+            "area": "backend",
+            "value": 1
+        },{
+            "key": "default_batch_upload_path",
+            "type": "textfield",
+            "area": "backend",
+            "value": "{assets_path}images/"
+        },{
+            "key": "thumbs_prepend_site_url",
+            "type": "combo-boolean",
+            "area": "backend",
+            "value": 0
+        },{
+            "key": "mediaSource",
+            "type": "modx-combo-source",
+            "area": "backend",
+            "value": 1
+        },{
+            "key": "use_richtext",
+            "type": "combo-boolean",
+            "area": "TinyMCE",
+            "value": 0
+        },{
+            "key": "tiny.width",
+            "type": "textfield",
+            "area": "TinyMCE",
+            "value": "95%"
+        },{
+            "key": "tiny.height",
+            "type": "textfield",
+            "area": "TinyMCE",
+            "value": "200"
+        },{
+            "key": "tiny.buttons1",
+            "type": "textfield",
+            "area": "TinyMCE",
+            "value": "undo,redo,selectall,pastetext,pasteword,charmap,separator,image,modxlink,unlink,media,separator,code,help"
+        },{
+            "key": "tiny.buttons2",
+            "type": "textfield",
+            "area": "TinyMCE",
+            "value": "bold,italic,underline,strikethrough,sub,sup,separator,bullist,numlist,outdent,indent,separator,justifyleft,justifycenter,justifyright,justifyfull"
+        },{
+            "key": "tiny.buttons3",
+            "type": "textfield",
+            "area": "TinyMCE",
+            "value": "styleselect,formatselect,separator,styleprops"
+        },{
+            "key": "tiny.buttons4",
+            "type": "textfield",
+            "area": "TinyMCE",
+            "value": ""
+        },{
+            "key": "tiny.buttons5",
+            "type": "textfield",
+            "area": "TinyMCE",
+            "value": ""
+        },{
+            "key": "tiny.custom_plugins",
+            "type": "textfield",
+            "area": "TinyMCE",
+            "value": ""
+        },{
+            "key": "tiny.theme",
+            "type": "textfield",
+            "area": "TinyMCE",
+            "value": ""
+        },{
+            "key": "tiny.theme_advanced_blockformats",
+            "type": "textfield",
+            "area": "TinyMCE",
+            "value": ""
+        },{
+            "key": "tiny.theme_advanced_css_selectors",
+            "type": "textfield",
+            "area": "TinyMCE",
+            "value": ""
         }]
     }
     ,"database": {
         "tables": ["galItem", "galAlbum", "galAlbumItem", "galAlbumContext", "galTag"]
     }
-    ,"extensionPackage": {}
-}
\ No newline at end of file
+    ,"build": {
+        "setupOptions": {
+            "source": "setup.options.php"
+        },
+        "resolver": {
+            "before": [
+                "resolve.paths.php"
+            ],
+            "after": [
+                "resolve.albumfiles.php",
+                "resolve.spaces.php"
+            ]
+        }
+    }
+}
diff --git a/_build/data/events/events.gallerycustomtv.php b/_build/data/events/events.gallerycustomtv.php
deleted file mode 100644
index 76abcf6..0000000
--- a/_build/data/events/events.gallerycustomtv.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * Gallery
- *
- * Copyright 2010-2012 by Shaun McCormick <shaun@modx.com>
- *
- * Gallery is free software; you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option) any later
- * version.
- *
- * Gallery is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * Gallery; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * @package gallery
- */
-/**
- * Events for GalleryCustomTV plugin
- *
- * @var modX $modx
- * @package gallery
- * @subpackage build
- */
-$events = array();
-
-$evs = array(
-    'OnTVInputRenderList',
-    'OnTVInputPropertiesList',
-    'OnTVOutputRenderList',
-    'OnTVOutputRenderPropertiesList',
-    'OnDocFormPrerender',
-    'OnManagerPageBeforeRender',
-);
-
-foreach ($evs as $ev) {
-    $events[(string)$ev] = $modx->newObject('modPluginEvent');
-    $events[(string)$ev]->fromArray(array(
-        'event' => (string)$ev,
-        'priority' => 0,
-        'propertyset' => 0,
-    ),'',true,true);
-}
-
-return $events;
\ No newline at end of file
diff --git a/_build/data/transport.chunks.php b/_build/data/transport.chunks.php
deleted file mode 100644
index 62e083d..0000000
--- a/_build/data/transport.chunks.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-/**
- * Gallery
- *
- * Copyright 2010-2012 by Shaun McCormick <shaun@modx.com>
- *
- * Gallery is free software; you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option) any later
- * version.
- *
- * Gallery is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * Gallery; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * @package gallery
- */
-/**
- * @package gallery
- * @subpackage build
- */
-$chunks = array();
-
-$chunks[0]= $modx->newObject('modChunk');
-$chunks[0]->fromArray(array(
-    'id' => 0,
-    'name' => 'galAlbumRowTpl',
-    'description' => '',
-    'snippet' => file_get_contents($sources['source_core'].'/elements/chunks/galalbumrowtpl.chunk.tpl'),
-    'properties' => '',
-),'',true,true);
-
-$chunks[1]= $modx->newObject('modChunk');
-$chunks[1]->fromArray(array(
-    'id' => 1,
-    'name' => 'galItemThumb',
-    'description' => '',
-    'snippet' => file_get_contents($sources['source_core'].'/elements/chunks/galitemthumb.chunk.tpl'),
-    'properties' => '',
-),'',true,true);
-
-
-/*
-$chunks[0]= $modx->newObject('modChunk');
-$chunks[0]->fromArray(array(
-    'id' => 0,
-    'name' => 'gal',
-    'description' => '',
-    'snippet' => file_get_contents($sources['source_core'].'/elements/chunks/gal.chunk.tpl'),
-    'properties' => '',
-),'',true,true);
- */
-
-return $chunks;
\ No newline at end of file
diff --git a/_build/data/transport.menu.php b/_build/data/transport.menu.php
deleted file mode 100644
index 9c80194..0000000
--- a/_build/data/transport.menu.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * Gallery
- *
- * Copyright 2010-2012 by Shaun McCormick <shaun@modx.com>
- *
- * Gallery is free software; you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option) any later
- * version.
- *
- * Gallery is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * Gallery; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * @package gallery
- */
-/**
- * Adds modMenus into package
- *
- * @package gallery
- * @subpackage build
- */
-/** @noinspection PhpUndefinedVariableInspection */
-$menu= $modx->newObject('modMenu');
-$menu->fromArray(array(
-    'text' => 'gallery',
-    'parent' => 'components',
-    'description' => 'gallery.menu_desc',
-    'icon' => '',
-    'menuindex' => 0,
-    'action' => 'home',
-    'namespace' => 'gallery',
-    'params' => '',
-    'handler' => '',
-),'',true,true);
-
-return $menu;
diff --git a/_build/data/transport.plugins.php b/_build/data/transport.plugins.php
deleted file mode 100644
index 7a2681c..0000000
--- a/_build/data/transport.plugins.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * Gallery
- *
- * Copyright 2010-2012 by Shaun McCormick <shaun@modx.com>
- *
- * Gallery is free software; you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option) any later
- * version.
- *
- * Gallery is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * Gallery; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * @package gallery
- */
-/**
- * @package gallery
- * @subpackage build
- */
-$plugins = array();
-
-return $plugins;
\ No newline at end of file
diff --git a/_build/data/transport.settings.php b/_build/data/transport.settings.php
deleted file mode 100644
index 2a0c94d..0000000
--- a/_build/data/transport.settings.php
+++ /dev/null
@@ -1,222 +0,0 @@
-<?php
-/**
- * Gallery
- *
- * Copyright 2010-2012 by Shaun McCormick <shaun@modx.com>
- *
- * Gallery is free software; you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option) any later
- * version.
- *
- * Gallery is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * Gallery; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * @package gallery
- */
-/**
- * Loads system settings
- *
- * @package gallery
- * @subpackage build
- */
-$settings = array();
-
-$settings['gallery.backend_thumb_far']= $modx->newObject('modSystemSetting');
-$settings['gallery.backend_thumb_far']->fromArray(array(
-    'key' => 'gallery.backend_thumb_far',
-    'value' => 'C',
-    'xtype' => 'textfield',
-    'namespace' => 'gallery',
-    'area' => 'backend',
-),'',true,true);
-
-$settings['gallery.backend_thumb_height']= $modx->newObject('modSystemSetting');
-$settings['gallery.backend_thumb_height']->fromArray(array(
-    'key' => 'gallery.backend_thumb_height',
-    'value' => '80',
-    'xtype' => 'textfield',
-    'namespace' => 'gallery',
-    'area' => 'backend',
-),'',true,true);
-
-$settings['gallery.backend_thumb_width']= $modx->newObject('modSystemSetting');
-$settings['gallery.backend_thumb_width']->fromArray(array(
-    'key' => 'gallery.backend_thumb_width',
-    'value' => '100',
-    'xtype' => 'textfield',
-    'namespace' => 'gallery',
-    'area' => 'backend',
-),'',true,true);
-
-$settings['gallery.backend_thumb_zoomcrop']= $modx->newObject('modSystemSetting');
-$settings['gallery.backend_thumb_zoomcrop']->fromArray(array(
-    'key' => 'gallery.backend_thumb_zoomcrop',
-    'value' => 1,
-    'xtype' => 'combo-boolean',
-    'namespace' => 'gallery',
-    'area' => 'backend',
-),'',true,true);
-
-$settings['gallery.default_batch_upload_path']= $modx->newObject('modSystemSetting');
-$settings['gallery.default_batch_upload_path']->fromArray(array(
-    'key' => 'gallery.default_batch_upload_path',
-    'value' => '{assets_path}images/',
-    'xtype' => 'textfield',
-    'namespace' => 'gallery',
-    'area' => 'backend',
-),'',true,true);
-
-$settings['xhtml_urls']= $modx->newObject('modSystemSetting');
-$settings['xhtml_urls']->fromArray(array(
-    'key' => 'xhtml_urls',
-    'value' => 0,
-    'xtype' => 'combo-boolean',
-    'namespace' => 'core',
-    'area' => 'furls',
-),'',true,true);
-
-$settings['gallery.thumbs_prepend_site_url']= $modx->newObject('modSystemSetting');
-$settings['gallery.thumbs_prepend_site_url']->fromArray(array(
-    'key' => 'gallery.thumbs_prepend_site_url',
-    'value' => false,
-    'xtype' => 'combo-boolean',
-    'namespace' => 'gallery',
-    'area' => '',
-),'',true,true);
-
-$settings['gallery.mediaSource']= $modx->newObject('modSystemSetting');
-$settings['gallery.mediaSource']->fromArray(array(
-    'key' => 'gallery.mediaSource',
-    'value' => 1,
-    'xtype' => 'modx-combo-source',
-    'namespace' => 'gallery',
-    'area' => '',
-),'',true,true);
-
-/*
-$settings['gallery.']= $modx->newObject('modSystemSetting');
-$settings['gallery.']->fromArray(array(
-    'key' => 'gallery.',
-    'value' => '',
-    'xtype' => 'textfield',
-    'namespace' => 'gallery',
-    'area' => '',
-),'',true,true);
-*/
-
-/* Settings for the TinyMCE integration */
-$settings['gallery.use_richtext']= $modx->newObject('modSystemSetting');
-$settings['gallery.use_richtext']->fromArray(array(
-    'key' => 'gallery.use_richtext',
-    'value' => false,
-    'xtype' => 'combo-boolean',
-    'namespace' => 'gallery',
-    'area' => 'TinyMCE',
-),'',true,true);
-
-$settings['gallery.tiny.width']= $modx->newObject('modSystemSetting');
-$settings['gallery.tiny.width']->fromArray(array(
-    'key' => 'gallery.tiny.width',
-    'value' => '95%',
-    'xtype' => 'textfield',
-    'namespace' => 'gallery',
-    'area' => 'TinyMCE',
-),'',true,true);
-
-$settings['gallery.tiny.height']= $modx->newObject('modSystemSetting');
-$settings['gallery.tiny.height']->fromArray(array(
-    'key' => 'gallery.tiny.height',
-    'value' => 200,
-    'xtype' => 'textfield',
-    'namespace' => 'gallery',
-    'area' => 'TinyMCE',
-),'',true,true);
-
-$settings['gallery.tiny.buttons1']= $modx->newObject('modSystemSetting');
-$settings['gallery.tiny.buttons1']->fromArray(array(
-    'key' => 'gallery.tiny.buttons1',
-    'value' => 'undo,redo,selectall,pastetext,pasteword,charmap,separator,image,modxlink,unlink,media,separator,code,help',
-    'xtype' => 'textfield',
-    'namespace' => 'gallery',
-    'area' => 'TinyMCE',
-),'',true,true);
-
-$settings['gallery.tiny.buttons2']= $modx->newObject('modSystemSetting');
-$settings['gallery.tiny.buttons2']->fromArray(array(
-    'key' => 'gallery.tiny.buttons2',
-    'value' => 'bold,italic,underline,strikethrough,sub,sup,separator,bullist,numlist,outdent,indent,separator,justifyleft,justifycenter,justifyright,justifyfull',
-    'xtype' => 'textfield',
-    'namespace' => 'gallery',
-    'area' => 'TinyMCE',
-),'',true,true);
-
-$settings['gallery.tiny.buttons3']= $modx->newObject('modSystemSetting');
-$settings['gallery.tiny.buttons3']->fromArray(array(
-    'key' => 'gallery.tiny.buttons3',
-    'value' => 'styleselect,formatselect,separator,styleprops',
-    'xtype' => 'textfield',
-    'namespace' => 'gallery',
-    'area' => 'TinyMCE',
-),'',true,true);
-
-$settings['gallery.tiny.buttons4']= $modx->newObject('modSystemSetting');
-$settings['gallery.tiny.buttons4']->fromArray(array(
-    'key' => 'gallery.tiny.buttons4',
-    'value' => '',
-    'xtype' => 'textfield',
-    'namespace' => 'gallery',
-    'area' => 'TinyMCE',
-),'',true,true);
-
-$settings['gallery.tiny.buttons5']= $modx->newObject('modSystemSetting');
-$settings['gallery.tiny.buttons5']->fromArray(array(
-    'key' => 'gallery.tiny.buttons5',
-    'value' => '',
-    'xtype' => 'textfield',
-    'namespace' => 'gallery',
-    'area' => 'TinyMCE',
-),'',true,true);
-
-$settings['gallery.tiny.custom_plugins']= $modx->newObject('modSystemSetting');
-$settings['gallery.tiny.custom_plugins']->fromArray(array(
-    'key' => 'gallery.tiny.custom_plugins',
-    'value' => '',
-    'xtype' => 'textfield',
-    'namespace' => 'gallery',
-    'area' => 'TinyMCE',
-),'',true,true);
-
-$settings['gallery.tiny.theme']= $modx->newObject('modSystemSetting');
-$settings['gallery.tiny.theme']->fromArray(array(
-    'key' => 'gallery.tiny.theme',
-    'value' => '',
-    'xtype' => 'textfield',
-    'namespace' => 'gallery',
-    'area' => 'TinyMCE',
-),'',true,true);
-
-$settings['gallery.tiny.theme_advanced_blockformats']= $modx->newObject('modSystemSetting');
-$settings['gallery.tiny.theme_advanced_blockformats']->fromArray(array(
-    'key' => 'gallery.tiny.theme_advanced_blockformats',
-    'value' => '',
-    'xtype' => 'textfield',
-    'namespace' => 'gallery',
-    'area' => 'TinyMCE',
-),'',true,true);
-
-$settings['gallery.tiny.theme_advanced_css_selectors']= $modx->newObject('modSystemSetting');
-$settings['gallery.tiny.theme_advanced_css_selectors']->fromArray(array(
-    'key' => 'gallery.tiny.theme_advanced_css_selectors',
-    'value' => '',
-    'xtype' => 'textfield',
-    'namespace' => 'gallery',
-    'area' => 'TinyMCE',
-),'',true,true);
-
-return $settings;
\ No newline at end of file
diff --git a/_build/data/transport.snippets.php b/_build/data/transport.snippets.php
deleted file mode 100644
index 9afe83f..0000000
--- a/_build/data/transport.snippets.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/**
- * Gallery
- *
- * Copyright 2010-2012 by Shaun McCormick <shaun@modx.com>
- *
- * Gallery is free software; you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option) any later
- * version.
- *
- * Gallery is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * Gallery; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * @package gallery
- */
-/**
- * @package gallery
- * @subpackage build
- */
-$snippets = array();
-
-$snippets[0]= $modx->newObject('modSnippet');
-$snippets[0]->fromArray(array(
-    'id' => 0,
-    'name' => 'Gallery',
-    'description' => '',
-    'snippet' => getSnippetContent($sources['source_core'].'/elements/snippets/snippet.gallery.php'),
-),'',true,true);
-$properties = include $sources['build'].'properties/properties.gallery.php';
-$snippets[0]->setProperties($properties);
-unset($properties);
-
-$snippets[1]= $modx->newObject('modSnippet');
-$snippets[1]->fromArray(array(
-    'id' => 1,
-    'name' => 'GalleryAlbums',
-    'description' => '',
-    'snippet' => getSnippetContent($sources['source_core'].'/elements/snippets/snippet.galleryalbums.php'),
-),'',true,true);
-$properties = include $sources['build'].'properties/properties.galleryalbums.php';
-$snippets[1]->setProperties($properties);
-unset($properties);
-
-$snippets[2]= $modx->newObject('modSnippet');
-$snippets[2]->fromArray(array(
-    'id' => 2,
-    'name' => 'GalleryItem',
-    'description' => '',
-    'snippet' => getSnippetContent($sources['source_core'].'/elements/snippets/snippet.galleryitem.php'),
-),'',true,true);
-$properties = include $sources['build'].'properties/properties.galleryitem.php';
-$snippets[2]->setProperties($properties);
-unset($properties);
-
-return $snippets;
\ No newline at end of file
diff --git a/_build/properties/properties.gallery.php b/_build/properties/properties.gallery.php
deleted file mode 100644
index 000686f..0000000
--- a/_build/properties/properties.gallery.php
+++ /dev/null
@@ -1,303 +0,0 @@
-<?php
-/**
- * Gallery
- *
- * Copyright 2010-2012 by Shaun McCormick <shaun@modx.com>
- *
- * Gallery is free software; you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option) any later
- * version.
- *
- * Gallery is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * Gallery; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * @package gallery
- */
-/**
- * Properties for the Gallery snippet.
- *
- * @package gallery
- * @subpackage build
- */
-$properties = array(
-    array(
-        'name' => 'album',
-        'desc' => 'gallery.album_desc',
-        'type' => 'textfield',
-        'options' => '',
-        'value' => '',
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'tag',
-        'desc' => 'gallery.tag_desc',
-        'type' => 'textfield',
-        'options' => '',
-        'value' => '',
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'plugin',
-        'desc' => 'gallery.plugin_desc',
-        'type' => 'textfield',
-        'options' => '',
-        'value' => '',
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'pluginPath',
-        'desc' => 'gallery.pluginpath_desc',
-        'type' => 'textfield',
-        'options' => '',
-        'value' => '',
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'thumbTpl',
-        'desc' => 'gallery.thumbtpl_desc',
-        'type' => 'textfield',
-        'options' => '',
-        'value' => 'galItemThumb',
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'containerTpl',
-        'desc' => 'gallery.containertpl_desc',
-        'type' => 'textfield',
-        'options' => '',
-        'value' => '',
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'itemCls',
-        'desc' => 'gallery.itemcls_desc',
-        'type' => 'textfield',
-        'options' => '',
-        'value' => 'gal-item',
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'activeCls',
-        'desc' => 'gallery.activecls_desc',
-        'type' => 'textfield',
-        'options' => '',
-        'value' => 'gal-item-active',
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'toPlaceholder',
-        'desc' => 'gallery.toplaceholder_desc',
-        'type' => 'textfield',
-        'options' => '',
-        'value' => '',
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'thumbWidth',
-        'desc' => 'gallery.thumbwidth_desc',
-        'type' => 'textfield',
-        'options' => '',
-        'value' => '100',
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'thumbHeight',
-        'desc' => 'gallery.thumbheight_desc',
-        'type' => 'textfield',
-        'options' => '',
-        'value' => '100',
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'thumbZoomCrop',
-        'desc' => 'gallery.thumbzoomcrop_desc',
-        'type' => 'combo-boolean',
-        'options' => '',
-        'value' => true,
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'thumbFar',
-        'desc' => 'gallery.thumbfar_desc',
-        'type' => 'textfield',
-        'options' => '',
-        'value' => 'C',
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'thumbQuality',
-        'desc' => 'gallery.thumbquality_desc',
-        'type' => 'textfield',
-        'options' => '',
-        'value' => 90,
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'thumbProperties',
-        'desc' => 'gallery.thumbproperties_desc',
-        'type' => 'textfield',
-        'options' => '',
-        'value' => '',
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'linkToImage',
-        'desc' => 'gallery.linktoimage_desc',
-        'type' => 'combo-boolean',
-        'options' => '',
-        'value' => '',
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'imageGetParam',
-        'desc' => 'gallery.imagegetparam_desc',
-        'type' => 'textfield',
-        'options' => '',
-        'value' => 'galItem',
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'imageWidth',
-        'desc' => 'gallery.imagewidth_desc',
-        'type' => 'textfield',
-        'options' => '',
-        'value' => 500,
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'imageHeight',
-        'desc' => 'gallery.imageheight_desc',
-        'type' => 'textfield',
-        'options' => '',
-        'value' => 500,
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'imageZoomCrop',
-        'desc' => 'gallery.imagezoomcrop_desc',
-        'type' => 'combo-boolean',
-        'options' => '',
-        'value' => false,
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'imageFar',
-        'desc' => 'gallery.imagefar_desc',
-        'type' => 'textfield',
-        'options' => '',
-        'value' => '',
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'imageQuality',
-        'desc' => 'gallery.imagequality_desc',
-        'type' => 'textfield',
-        'options' => '',
-        'value' => 90,
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'imageProperties',
-        'desc' => 'gallery.imageproperties_desc',
-        'type' => 'textfield',
-        'options' => '',
-        'value' => '',
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'sort',
-        'desc' => 'gallery.sort_desc',
-        'type' => 'textfield',
-        'options' => '',
-        'value' => 'rank',
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'dir',
-        'desc' => 'gallery.dir_desc',
-        'type' => 'textfield',
-        'options' => '',
-        'value' => 'ASC',
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'limit',
-        'desc' => 'gallery.limit_desc',
-        'type' => 'textfield',
-        'options' => '',
-        'value' => 0,
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'start',
-        'desc' => 'gallery.start_desc',
-        'type' => 'textfield',
-        'options' => '',
-        'value' => 0,
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'showInactive',
-        'desc' => 'gallery.showinactive_desc',
-        'type' => 'combo-boolean',
-        'options' => '',
-        'value' => false,
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'checkForRequestAlbumVar',
-        'desc' => 'gallery.checkforrequestalbumvar_desc',
-        'type' => 'combo-boolean',
-        'options' => '',
-        'value' => true,
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'albumRequestVar',
-        'desc' => 'gallery.albumrequestvar_desc',
-        'type' => 'textfield',
-        'options' => '',
-        'value' => 'galAlbum',
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'checkForRequestTagVar',
-        'desc' => 'gallery.checkforrequesttagvar_desc',
-        'type' => 'combo-boolean',
-        'options' => '',
-        'value' => true,
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'tagRequestVar',
-        'desc' => 'gallery.tagrequestvar_desc',
-        'type' => 'textfield',
-        'options' => '',
-        'value' => 'galTag',
-    ),
-    array(
-        'name' => 'useCss',
-        'desc' => 'gallery.usecss_desc',
-        'type' => 'combo-boolean',
-        'options' => '',
-        'value' => true,
-        'lexicon' => 'gallery:properties',
-    ),
-/*
-    array(
-        'name' => '',
-        'desc' => '',
-        'type' => 'textfield',
-        'options' => '',
-        'value' => '',
-    ),
-    */
-);
-
-return $properties;
\ No newline at end of file
diff --git a/_build/properties/properties.galleryalbums.php b/_build/properties/properties.galleryalbums.php
deleted file mode 100644
index d8be563..0000000
--- a/_build/properties/properties.galleryalbums.php
+++ /dev/null
@@ -1,208 +0,0 @@
-<?php
-/**
- * Gallery
- *
- * Copyright 2010-2012 by Shaun McCormick <shaun@modx.com>
- *
- * Gallery is free software; you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option) any later
- * version.
- *
- * Gallery is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * Gallery; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * @package gallery
- */
-/**
- * Properties for the GalleryAlbums snippet.
- *
- * @package gallery
- * @subpackage build
- */
-$properties = array(
-    array(
-        'name' => 'rowTpl',
-        'desc' => 'galleryalbums.rowtpl_desc',
-        'type' => 'textfield',
-        'options' => '',
-        'value' => 'galAlbumRowTpl',
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'rowCls',
-        'desc' => 'galleryalbums.rowcls_desc',
-        'type' => 'textfield',
-        'options' => '',
-        'value' => '',
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'sort',
-        'desc' => 'galleryalbums.sort_desc',
-        'type' => 'textfield',
-        'options' => '',
-        'value' => 'rank',
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'dir',
-        'desc' => 'galleryalbums.dir_desc',
-        'type' => 'textfield',
-        'options' => '',
-        'value' => 'DESC',
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'limit',
-        'desc' => 'galleryalbums.limit_desc',
-        'type' => 'textfield',
-        'options' => '',
-        'value' => '10',
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'start',
-        'desc' => 'galleryalbums.start_desc',
-        'type' => 'textfield',
-        'options' => '',
-        'value' => '0',
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'toPlaceholder',
-        'desc' => 'galleryalbums.toplaceholder_desc',
-        'type' => 'textfield',
-        'options' => '',
-        'value' => '',
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'showInactive',
-        'desc' => 'galleryalbums.showinactive_desc',
-        'type' => 'combo-boolean',
-        'options' => '',
-        'value' => false,
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'prominentOnly',
-        'desc' => 'galleryalbums.prominentonly_desc',
-        'type' => 'combo-boolean',
-        'options' => '',
-        'value' => true,
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'parent',
-        'desc' => 'galleryalbums.parent_desc',
-        'type' => 'textfield',
-        'options' => '',
-        'value' => '0',
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'showAll',
-        'desc' => 'galleryalbums.showall_desc',
-        'type' => 'combo-boolean',
-        'options' => '',
-        'value' => true,
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'showName',
-        'desc' => 'galleryalbums.showname_desc',
-        'type' => 'combo-boolean',
-        'options' => '',
-        'value' => true,
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'albumRequestVar',
-        'desc' => 'galleryalbums.albumrequestvar_desc',
-        'type' => 'textfield',
-        'options' => '',
-        'value' => 'galAlbum',
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'albumCoverSort',
-        'desc' => 'galleryalbums.albumcoversort_desc',
-        'type' => 'textfield',
-        'options' => '',
-        'value' => 'rank',
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'albumCoverSortDir',
-        'desc' => 'galleryalbums.albumcoversortdir_desc',
-        'type' => 'textfield',
-        'options' => '',
-        'value' => 'ASC',
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'thumbWidth',
-        'desc' => 'galleryalbums.thumbwidth_desc',
-        'type' => 'textfield',
-        'options' => '',
-        'value' => '100',
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'thumbHeight',
-        'desc' => 'galleryalbums.thumbheight_desc',
-        'type' => 'textfield',
-        'options' => '',
-        'value' => '100',
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'thumbZoomCrop',
-        'desc' => 'galleryalbums.thumbzoomcrop_desc',
-        'type' => 'combo-boolean',
-        'options' => '',
-        'value' => true,
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'thumbFar',
-        'desc' => 'galleryalbums.thumbfar_desc',
-        'type' => 'textfield',
-        'options' => '',
-        'value' => 'C',
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'thumbQuality',
-        'desc' => 'galleryalbums.thumbquality_desc',
-        'type' => 'textfield',
-        'options' => '',
-        'value' => 90,
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'thumbProperties',
-        'desc' => 'galleryalbums.thumbproperties_desc',
-        'type' => 'textfield',
-        'options' => '',
-        'value' => '',
-        'lexicon' => 'gallery:properties',
-    ),
-/*
-    array(
-        'name' => '',
-        'desc' => '',
-        'type' => 'textfield',
-        'options' => '',
-        'value' => '',
-    ),
-    */
-);
-
-return $properties;
\ No newline at end of file
diff --git a/_build/properties/properties.galleryitem.php b/_build/properties/properties.galleryitem.php
deleted file mode 100644
index 6f0183e..0000000
--- a/_build/properties/properties.galleryitem.php
+++ /dev/null
@@ -1,215 +0,0 @@
-<?php
-/**
- * Gallery
- *
- * Copyright 2010-2012 by Shaun McCormick <shaun@modx.com>
- *
- * Gallery is free software; you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option) any later
- * version.
- *
- * Gallery is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * Gallery; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * @package gallery
- */
-/**
- * Properties for the GalleryItem snippet.
- *
- * @package gallery
- * @subpackage build
- */
-$properties = array(
-    array(
-        'name' => 'id',
-        'desc' => 'galleryitem.id_desc',
-        'type' => 'textfield',
-        'options' => '',
-        'value' => '',
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'toPlaceholders',
-        'desc' => 'galleryitem.toplaceholders_desc',
-        'type' => 'combo-boolean',
-        'options' => '',
-        'value' => true,
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'toPlaceholdersPrefix',
-        'desc' => 'galleryitem.toplaceholdersprefix_desc',
-        'type' => 'textfield',
-        'options' => '',
-        'value' => 'galitem',
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'tpl',
-        'desc' => 'galleryitem.tpl_desc',
-        'type' => 'textfield',
-        'options' => '',
-        'value' => 'galItem',
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'albumTpl',
-        'desc' => 'galleryitem.albumtpl_desc',
-        'type' => 'textfield',
-        'options' => '',
-        'value' => 'galItemAlbum',
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'albumSeparator',
-        'desc' => 'galleryitem.albumseparator_desc',
-        'type' => 'textfield',
-        'options' => '',
-        'value' => ',&nbsp;',
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'albumRequestVar',
-        'desc' => 'galleryitem.albumrequestvar_desc',
-        'type' => 'textfield',
-        'options' => '',
-        'value' => 'galAlbum',
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'tagTpl',
-        'desc' => 'galleryitem.tagtpl_desc',
-        'type' => 'textfield',
-        'options' => '',
-        'value' => 'galItemTag',
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'tagSeparator',
-        'desc' => 'galleryitem.tagseparator_desc',
-        'type' => 'textfield',
-        'options' => '',
-        'value' => ',&nbsp;',
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'tagSortDir',
-        'desc' => 'galleryitem.tagsortdir_desc',
-        'type' => 'textfield',
-        'options' => '',
-        'value' => 'DESC',
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'tagRequestVar',
-        'desc' => 'galleryitem.tagrequestvar_desc',
-        'type' => 'textfield',
-        'options' => '',
-        'value' => 'galTag',
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'thumbWidth',
-        'desc' => 'galleryitem.thumbwidth_desc',
-        'type' => 'textfield',
-        'options' => '',
-        'value' => '100',
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'thumbHeight',
-        'desc' => 'galleryitem.thumbheight_desc',
-        'type' => 'textfield',
-        'options' => '',
-        'value' => '100',
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'thumbZoomCrop',
-        'desc' => 'galleryitem.thumbzoomcrop_desc',
-        'type' => 'combo-boolean',
-        'options' => '',
-        'value' => true,
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'thumbFar',
-        'desc' => 'galleryitem.thumbfar_desc',
-        'type' => 'textfield',
-        'options' => '',
-        'value' => 'C',
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'thumbQuality',
-        'desc' => 'galleryitem.thumbquality_desc',
-        'type' => 'textfield',
-        'options' => '',
-        'value' => 90,
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'thumbProperties',
-        'desc' => 'galleryitem.thumbproperties_desc',
-        'type' => 'textfield',
-        'options' => '',
-        'value' => '',
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'imageWidth',
-        'desc' => 'galleryitem.imagewidth_desc',
-        'type' => 'textfield',
-        'options' => '',
-        'value' => '',
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'imageHeight',
-        'desc' => 'galleryitem.imageheight_desc',
-        'type' => 'textfield',
-        'options' => '',
-        'value' => '',
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'imageZoomCrop',
-        'desc' => 'galleryitem.imagezoomcrop_desc',
-        'type' => 'combo-boolean',
-        'options' => '',
-        'value' => 0,
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'imageFar',
-        'desc' => 'galleryitem.imagefar_desc',
-        'type' => 'textfield',
-        'options' => '',
-        'value' => '',
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'imageQuality',
-        'desc' => 'galleryitem.imagequality_desc',
-        'type' => 'textfield',
-        'options' => '',
-        'value' => 90,
-        'lexicon' => 'gallery:properties',
-    ),
-    array(
-        'name' => 'imageProperties',
-        'desc' => 'galleryitem.imageproperties_desc',
-        'type' => 'textfield',
-        'options' => '',
-        'value' => '',
-        'lexicon' => 'gallery:properties',
-    ),
-);
-
-return $properties;
\ No newline at end of file
diff --git a/_build/resolvers/resolve.dbchanges.php b/_build/resolvers/resolve.dbchanges.php
deleted file mode 100644
index cdd64ce..0000000
--- a/_build/resolvers/resolve.dbchanges.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/**
- * Gallery
- *
- * Copyright 2010-2012 by Shaun McCormick <shaun@modx.com>
- *
- * Gallery is free software; you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option) any later
- * version.
- *
- * Gallery is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * Gallery; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * @package gallery
- */
-/**
- * Resolve changes to db model
- *
- * @var xPDOObject $object
- * @var array $options
- *
- * @package gallery
- * @subpackage build
- */
-if ($object->xpdo) {
-    switch ($options[xPDOTransport::PACKAGE_ACTION]) {
-        case xPDOTransport::ACTION_INSTALL:
-        case xPDOTransport::ACTION_UPGRADE:
-            $modx =& $object->xpdo;
-            $modelPath = $modx->getOption('gallery.core_path',null,$modx->getOption('core_path').'components/gallery/').'model/';
-            $modx->addPackage('gallery',$modelPath);
-            $manager = $modx->getManager();
-            $oldLogLevel = $modx->getLogLevel();
-            $modx->setLogLevel(0);
-
-            $manager->addField('galAlbum','parent',array('after' => 'id'));
-            $manager->addIndex('galAlbum','parent');
-            $manager->addField('galItem','url',array('after' => 'mediatype'));
-
-            /* 1.6.0+ */
-            $manager->addField('galItem','slug',array('after' => 'mediatype'));
-            $manager->addIndex('galItem','slug');
-            $manager->addIndex('galItem','name');
-            $manager->addIndex('galItem','active');
-            $manager->addIndex('galItem','mediatype');
-
-            $manager->addIndex('galAlbum','rank');
-            $manager->addIndex('galAlbum','active');
-            $manager->addIndex('galAlbum','prominent');
-
-            $manager->addIndex('galAlbumItem','rank');
-            $manager->addField('galAlbum', 'year'); 
-
-            /* 1.5.3+ */
-            $manager->addField('galAlbum','cover_filename');
-
-
-            $modx->setLogLevel($oldLogLevel);
-            break;
-    }
-}
-return true;
\ No newline at end of file
diff --git a/_build/resolvers/resolve.extpack.php b/_build/resolvers/resolve.extpack.php
deleted file mode 100644
index 94d4c9b..0000000
--- a/_build/resolvers/resolve.extpack.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
- * Gallery
- *
- * Copyright 2010-2012 by Shaun McCormick <shaun@modx.com>
- *
- * Gallery is free software; you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option) any later
- * version.
- *
- * Gallery is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * Gallery; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * @package gallery
- */
-/**
- * Handles adding Gallery to Extension Packages
- *
- * @var xPDOObject $object
- * @var array $options
- * @package gallery
- * @subpackage build
- */
-if ($object->xpdo) {
-    switch ($options[xPDOTransport::PACKAGE_ACTION]) {
-        case xPDOTransport::ACTION_INSTALL:
-        case xPDOTransport::ACTION_UPGRADE:
-            /** @var modX $modx */
-            $modx =& $object->xpdo;
-            $modelPath = $modx->getOption('gallery.core_path');
-            if (empty($modelPath)) {
-                $modelPath = '[[++core_path]]components/gallery/';
-            }
-            $modelPath = rtrim($modelPath,'/').'/model/';
-            if ($modx instanceof modX) {
-                $modx->addExtensionPackage('gallery',$modelPath);
-            }
-            break;
-        case xPDOTransport::ACTION_UNINSTALL:
-            $modx =& $object->xpdo;
-            if ($modx instanceof modX) {
-                $modx->removeExtensionPackage('gallery');
-            }
-            break;
-    }
-}
-return true;
\ No newline at end of file
diff --git a/_build/resolvers/resolve.paths.php b/_build/resolvers/resolve.paths.php
index 34c8ffb..8392878 100644
--- a/_build/resolvers/resolve.paths.php
+++ b/_build/resolvers/resolve.paths.php
@@ -53,7 +53,9 @@ function createSetting(&$modx,$key,$value) {
             /* setup paths */
             createSetting($modx,'files_path','[[++assets_path]]gallery/');
 
-            @mkdir($modx->getOption('assets_path').'gallery/',0775);
+            if (!mkdir($concurrentDirectory = $modx->getOption('assets_path') . 'gallery/', 0775) && !is_dir($concurrentDirectory)) {
+                throw new \RuntimeException(sprintf('Directory "%s" was not created', $concurrentDirectory));
+            }
 
             /* setup urls */
             createSetting($modx,'files_url','[[++assets_url]]gallery/');
@@ -62,4 +64,4 @@ function createSetting(&$modx,$key,$value) {
             break;
     }
 }
-return true;
\ No newline at end of file
+return true;
diff --git a/_build/resolvers/resolve.tables.php b/_build/resolvers/resolve.tables.php
deleted file mode 100644
index 7be9bd5..0000000
--- a/_build/resolvers/resolve.tables.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/**
- * Gallery
- *
- * Copyright 2010-2012 by Shaun McCormick <shaun@modx.com>
- *
- * Gallery is free software; you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option) any later
- * version.
- *
- * Gallery is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * Gallery; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * @package gallery
- */
-/**
- * Resolve creating db tables
- *
- * @package gallery
- * @subpackage build
- */
-if ($object->xpdo) {
-    switch ($options[xPDOTransport::PACKAGE_ACTION]) {
-        case xPDOTransport::ACTION_INSTALL:
-            $modx =& $object->xpdo;
-            $modelPath = $modx->getOption('gallery.core_path',null,$modx->getOption('core_path').'components/gallery/').'model/';
-            $modx->addPackage('gallery',$modelPath);
-
-            $manager = $modx->getManager();
-
-            $manager->createObjectContainer('galItem');
-            $manager->createObjectContainer('galAlbum');
-            $manager->createObjectContainer('galAlbumItem');
-            $manager->createObjectContainer('galAlbumContext');
-            $manager->createObjectContainer('galTag');
-
-            break;
-        case xPDOTransport::ACTION_UPGRADE:
-            break;
-    }
-}
-return true;
\ No newline at end of file

From 507cce2be77740d20cd2564f3e0b743d60e52cfd Mon Sep 17 00:00:00 2001
From: matdave <mat@matdave.com>
Date: Sat, 11 Jun 2022 08:22:41 -0500
Subject: [PATCH 18/20] validating json

---
 _build/config.json | 154 ++++++++++++++++++++++-----------------------
 1 file changed, 77 insertions(+), 77 deletions(-)

diff --git a/_build/config.json b/_build/config.json
index 2d965ce..211937d 100644
--- a/_build/config.json
+++ b/_build/config.json
@@ -23,142 +23,142 @@
                     {
                         "name": "album",
                         "description": "gallery.album_desc",
-                        "value": "",
+                        "value": ""
                     },{
                         "name": "tag",
                         "description": "gallery.tag_desc",
-                        "value": "",
+                        "value": ""
                     },{
                         "name": "plugin",
                         "description": "gallery.plugin_desc",
-                        "value": "",
+                        "value": ""
                     },{
                         "name": "pluginPath",
                         "description": "gallery.pluginpath_desc",
-                        "value": "",
+                        "value": ""
                     },{
                         "name": "thumbTpl",
                         "description": "gallery.thumbtpl_desc",
-                        "value": "galItemThumb",
+                        "value": "galItemThumb"
                     },{
                         "name": "containerTpl",
                         "description": "gallery.containertpl_desc",
-                        "value": "",
+                        "value": ""
                     },{
                         "name": "itemCls",
                         "description": "gallery.itemcls_desc",
-                        "value": "gal-item",
+                        "value": "gal-item"
                     },{
                         "name": "activeCls",
                         "description": "gallery.activecls_desc",
-                        "value": "gal-item-active",
+                        "value": "gal-item-active"
                     },{
                         "name": "toPlaceholder",
                         "description": "gallery.toplaceholder_desc",
-                        "value": "",
+                        "value": ""
                     },{
                         "name": "thumbWidth",
                         "description": "gallery.thumbwidth_desc",
-                        "value": "100",
+                        "value": "100"
                     },{
                         "name": "thumbHeight",
                         "description": "gallery.thumbheight_desc",
-                        "value": "100",
+                        "value": "100"
                     },{
                         "name": "thumbZoomCrop",
                         "description": "gallery.thumbzoomcrop_desc",
                         "type": "combo-boolean",
-                        "value": true,
+                        "value": true
                     },{
                         "name": "thumbFar",
                         "description": "gallery.thumbfar_desc",
-                        "value": "C",
+                        "value": "C"
                     },{
                         "name": "thumbQuality",
                         "description": "gallery.thumbquality_desc",
-                        "value": 90,
+                        "value": 90
                     },{
                         "name": "thumbProperties",
                         "description": "gallery.thumbproperties_desc",
-                        "value": "",
+                        "value": ""
                     },{
                         "name": "linkToImage",
                         "description": "gallery.linktoimage_desc",
                         "type": "combo-boolean",
-                        "value": "",
+                        "value": ""
                     },{
                         "name": "imageGetParam",
                         "description": "gallery.imagegetparam_desc",
-                        "value": "galItem",
+                        "value": "galItem"
                     },{
                         "name": "imageWidth",
                         "description": "gallery.imagewidth_desc",
-                        "value": 500,
+                        "value": 500
                     },{
                         "name": "imageHeight",
                         "description": "gallery.imageheight_desc",
-                        "value": 500,
+                        "value": 500
                     },{
                         "name": "imageZoomCrop",
                         "description": "gallery.imagezoomcrop_desc",
                         "type": "combo-boolean",
-                        "value": false,
+                        "value": false
                     },{
                         "name": "imageFar",
                         "description": "gallery.imagefar_desc",
-                        "value": "",
+                        "value": ""
                     },{
                         "name": "imageQuality",
                         "description": "gallery.imagequality_desc",
-                        "value": 90,
+                        "value": 90
                     },{
                         "name": "imageProperties",
                         "description": "gallery.imageproperties_desc",
-                        "value": "",
+                        "value": ""
                     },{
                         "name": "sort",
                         "description": "gallery.sort_desc",
-                        "value": "rank",
+                        "value": "rank"
                     },{
                         "name": "dir",
                         "description": "gallery.dir_desc",
-                        "value": "ASC",
+                        "value": "ASC"
                     },{
                         "name": "limit",
                         "description": "gallery.limit_desc",
-                        "value": 0,
+                        "value": 0
                     },{
                         "name": "start",
                         "description": "gallery.start_desc",
-                        "value": 0,
+                        "value": 0
                     },{
                         "name": "showInactive",
                         "description": "gallery.showinactive_desc",
                         "type": "combo-boolean",
-                        "value": false,
+                        "value": false
                     },{
                         "name": "checkForRequestAlbumVar",
                         "description": "gallery.checkforrequestalbumvar_desc",
                         "type": "combo-boolean",
-                        "value": true,
+                        "value": true
                     },{
                         "name": "albumRequestVar",
                         "description": "gallery.albumrequestvar_desc",
-                        "value": "galAlbum",
+                        "value": "galAlbum"
                     },{
                         "name": "checkForRequestTagVar",
                         "description": "gallery.checkforrequesttagvar_desc",
                         "type": "combo-boolean",
-                        "value": true,
+                        "value": true
                     },{
                         "name": "tagRequestVar",
                         "description": "gallery.tagrequestvar_desc",
-                        "value": "galTag",
+                        "value": "galTag"
                     },{
                         "name": "useCss",
                         "description": "gallery.usecss_desc",
                         "type": "combo-boolean",
-                        "value": true,
+                        "value": true
                     }
                 ]
             },{
@@ -168,92 +168,92 @@
                     {
                         "name": "rowTpl",
                         "description": "galleryalbums.rowtpl_desc",
-                        "value": "galAlbumRowTpl",
+                        "value": "galAlbumRowTpl"
                     },{
                         "name": "rowCls",
                         "description": "galleryalbums.rowcls_desc",
-                        "value": "",
+                        "value": ""
                     },{
                         "name": "sort",
                         "description": "galleryalbums.sort_desc",
-                        "value": "rank",
+                        "value": "rank"
                     },{
                         "name": "dir",
                         "description": "galleryalbums.dir_desc",
-                        "value": "DESC",
+                        "value": "DESC"
                     },{
                         "name": "limit",
                         "description": "galleryalbums.limit_desc",
-                        "value": "10",
+                        "value": "10"
                     },{
                         "name": "start",
                         "description": "galleryalbums.start_desc",
-                        "value": "0",
+                        "value": "0"
                     },{
                         "name": "toPlaceholder",
                         "description": "galleryalbums.toplaceholder_desc",
-                        "value": "",
+                        "value": ""
                     },{
                         "name": "showInactive",
                         "description": "galleryalbums.showinactive_desc",
                         "type": "combo-boolean",
-                        "value": false,
+                        "value": false
                     },{
                         "name": "prominentOnly",
                         "description": "galleryalbums.prominentonly_desc",
                         "type": "combo-boolean",
-                        "value": true,
+                        "value": true
                     },{
                         "name": "parent",
                         "description": "galleryalbums.parent_desc",
-                        "value": "0",
+                        "value": "0"
                     },{
                         "name": "showAll",
                         "description": "galleryalbums.showall_desc",
                         "type": "combo-boolean",
-                        "value": true,
+                        "value": true
                     },{
                         "name": "showName",
                         "description": "galleryalbums.showname_desc",
                         "type": "combo-boolean",
-                        "value": true,
+                        "value": true
                     },{
                         "name": "albumRequestVar",
                         "description": "galleryalbums.albumrequestvar_desc",
-                        "value": "galAlbum",
+                        "value": "galAlbum"
                     },{
                         "name": "albumCoverSort",
                         "description": "galleryalbums.albumcoversort_desc",
-                        "value": "rank",
+                        "value": "rank"
                     },{
                         "name": "albumCoverSortDir",
                         "description": "galleryalbums.albumcoversortdir_desc",
-                        "value": "ASC",
+                        "value": "ASC"
                     },{
                         "name": "thumbWidth",
                         "description": "galleryalbums.thumbwidth_desc",
-                        "value": "100",
+                        "value": "100"
                     },{
                         "name": "thumbHeight",
                         "description": "galleryalbums.thumbheight_desc",
-                        "value": "100",
+                        "value": "100"
                     },{
                         "name": "thumbZoomCrop",
                         "description": "galleryalbums.thumbzoomcrop_desc",
                         "type": "combo-boolean",
-                        "value": true,
+                        "value": true
                     },{
                         "name": "thumbFar",
                         "description": "galleryalbums.thumbfar_desc",
-                        "value": "C",
+                        "value": "C"
                     },{
                         "name": "thumbQuality",
                         "description": "galleryalbums.thumbquality_desc",
-                        "value": 90,
+                        "value": 90
                     },{
                         "name": "thumbProperties",
                         "description": "galleryalbums.thumbproperties_desc",
-                        "value": "",
+                        "value": ""
                     }
                 ]
             },{
@@ -263,98 +263,98 @@
                     {
                         "name": "id",
                         "description": "galleryitem.id_desc",
-                        "value": "",
+                        "value": ""
                     },{
                         "name": "toPlaceholders",
                         "description": "galleryitem.toplaceholders_desc",
                         "type": "combo-boolean",
-                        "value": true,
+                        "value": true
                     },{
                         "name": "toPlaceholdersPrefix",
                         "description": "galleryitem.toplaceholdersprefix_desc",
-                        "value": "galitem",
+                        "value": "galitem"
                     },{
                         "name": "tpl",
                         "description": "galleryitem.tpl_desc",
-                        "value": "galItem",
+                        "value": "galItem"
                     },{
                         "name": "albumTpl",
                         "description": "galleryitem.albumtpl_desc",
-                        "value": "galItemAlbum",
+                        "value": "galItemAlbum"
                     },{
                         "name": "albumSeparator",
                         "description": "galleryitem.albumseparator_desc",
-                        "value": ",&nbsp;",
+                        "value": ",&nbsp;"
                     },{
                         "name": "albumRequestVar",
                         "description": "galleryitem.albumrequestvar_desc",
-                        "value": "galAlbum",
+                        "value": "galAlbum"
                     },{
                         "name": "tagTpl",
                         "description": "galleryitem.tagtpl_desc",
-                        "value": "galItemTag",
+                        "value": "galItemTag"
                     },{
                         "name": "tagSeparator",
                         "description": "galleryitem.tagseparator_desc",
-                        "value": ",&nbsp;",
+                        "value": ",&nbsp;"
                     },{
                         "name": "tagSortDir",
                         "description": "galleryitem.tagsortdir_desc",
-                        "value": "DESC",
+                        "value": "DESC"
                     },{
                         "name": "tagRequestVar",
                         "description": "galleryitem.tagrequestvar_desc",
-                        "value": "galTag",
+                        "value": "galTag"
                     },{
                         "name": "thumbWidth",
                         "description": "galleryitem.thumbwidth_desc",
-                        "value": "100",
+                        "value": "100"
                     },{
                         "name": "thumbHeight",
                         "description": "galleryitem.thumbheight_desc",
-                        "value": "100",
+                        "value": "100"
                     },{
                         "name": "thumbZoomCrop",
                         "description": "galleryitem.thumbzoomcrop_desc",
                         "type": "combo-boolean",
-                        "value": true,
+                        "value": true
                     },{
                         "name": "thumbFar",
                         "description": "galleryitem.thumbfar_desc",
-                        "value": "C",
+                        "value": "C"
                     },{
                         "name": "thumbQuality",
                         "description": "galleryitem.thumbquality_desc",
-                        "value": 90,
+                        "value": 90
                     },{
                         "name": "thumbProperties",
                         "description": "galleryitem.thumbproperties_desc",
-                        "value": "",
+                        "value": ""
                     },{
                         "name": "imageWidth",
                         "description": "galleryitem.imagewidth_desc",
-                        "value": "",
+                        "value": ""
                     },{
                         "name": "imageHeight",
                         "description": "galleryitem.imageheight_desc",
-                        "value": "",
+                        "value": ""
                     },{
                         "name": "imageZoomCrop",
                         "description": "galleryitem.imagezoomcrop_desc",
                         "type": "combo-boolean",
-                        "value": 0,
+                        "value": 0
                     },{
                         "name": "imageFar",
                         "description": "galleryitem.imagefar_desc",
-                        "value": "",
+                        "value": ""
                     },{
                         "name": "imageQuality",
                         "description": "galleryitem.imagequality_desc",
-                        "value": 90,
+                        "value": 90
                     },{
                         "name": "imageProperties",
                         "description": "galleryitem.imageproperties_desc",
-                        "value": "",
+                        "value": ""
                     }
                 ]
             }]

From bd86349f8d9e61d5afc5004dd04bf73e00ac7ca4 Mon Sep 17 00:00:00 2001
From: matdave <mat@matdave.com>
Date: Sat, 11 Jun 2022 09:38:17 -0500
Subject: [PATCH 19/20] fixes from testing

---
 _build/config.json                                       | 8 ++------
 core/components/gallery/model/gallery/galalbum.class.php | 3 +++
 core/components/gallery/model/gallery/galitem.class.php  | 9 ++++++---
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/_build/config.json b/_build/config.json
index 211937d..a0070cf 100644
--- a/_build/config.json
+++ b/_build/config.json
@@ -5,14 +5,10 @@
     "author": "Shaun McCormick",
     "version": "2.0.0",
     "package":{
-        "actions": [{
-            "id": 1,
-            "controller": "index"
-        }]
-        ,"menus": [{
+        "menus": [{
             "text": "gallery",
             "description": "gallery.menu_desc",
-            "action": 1,
+            "action": "home",
             "parent": "components"
         }]
         ,"elements": {
diff --git a/core/components/gallery/model/gallery/galalbum.class.php b/core/components/gallery/model/gallery/galalbum.class.php
index 4c39af3..2052559 100644
--- a/core/components/gallery/model/gallery/galalbum.class.php
+++ b/core/components/gallery/model/gallery/galalbum.class.php
@@ -224,6 +224,9 @@ public function uploadItem(galItem $item,$filePath,$name,$mediaSource)
             $target = fopen($this->getPath().$shortName, "w");
             fclose($input);
             fclose($target);
+        } else {
+            $file = array("name" => $shortName, "tmp_name" => $filePath,"error" => "0"); // emulate a $_FILES object
+            $mediaSource->uploadObjectsToContainer($targetDir,array($file));
         }
         return $fileName;
     }
diff --git a/core/components/gallery/model/gallery/galitem.class.php b/core/components/gallery/model/gallery/galitem.class.php
index b81d64c..8318ab4 100644
--- a/core/components/gallery/model/gallery/galitem.class.php
+++ b/core/components/gallery/model/gallery/galitem.class.php
@@ -179,7 +179,8 @@ public function set($k, $v= null, $vType= '') {
      * @var int $albumId
      * @return boolean
      */
-    public function upload($file,$albumId) {
+    public function upload($file,$albumId): bool
+    {
         if (empty($file) || empty($file['tmp_name']) || empty($file['name'])) return false;
         if (in_array($this->get('id'),array(0,null,''))) return false;
         /** @var galAlbum $album */
@@ -227,7 +228,8 @@ public function remove(array $ancestors = array()) {
         return parent::remove($ancestors);
     }
 
-    protected function formatFileSize($bytes, $precision = 2) {
+    protected function formatFileSize($bytes, $precision = 2): string
+    {
         $units = array('B', 'KB', 'MB', 'GB', 'TB');
 
         $bytes = max($bytes, 0);
@@ -255,7 +257,8 @@ public function getSize() {
      * @param int|galAlbum $album
      * @return boolean
      */
-    public function move($album) {
+    public function move($album): bool
+    {
         /** @var galAlbum $newAlbum */
         $newAlbum = $album instanceof galAlbum ? $album : $this->xpdo->getObject('galAlbum',$album);
         if (empty($newAlbum)) return false;

From b2d85a83b90d7567395378c1d1e1cbcaac304218 Mon Sep 17 00:00:00 2001
From: matdave <mat@matdave.com>
Date: Sat, 11 Jun 2022 10:03:16 -0500
Subject: [PATCH 20/20] Add Changelog

---
 core/components/gallery/docs/changelog.txt          | 13 ++++++++++---
 .../gallery/processors/mgr/item/getlist.class.php   |  4 +++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/core/components/gallery/docs/changelog.txt b/core/components/gallery/docs/changelog.txt
index 2f0b723..ef219b4 100755
--- a/core/components/gallery/docs/changelog.txt
+++ b/core/components/gallery/docs/changelog.txt
@@ -1,5 +1,12 @@
 Changelog for Gallery.
 
+Gallery 2.0.0
+====================================
+- Fixed to work with MODX 3
+- Fixed image upload error in log
+- Fix missing images in the manager
+- Fix nonaggregated images in the manager
+
 Gallery 1.7.1
 ====================================
 - Fixed critical vulnerability in phpthumb processor
@@ -25,7 +32,7 @@ Gallery 1.6.0
 ====================================
 - [#271] [GalleryAlbums] Added image_absolute placeholder
 - [#270] [GalleryAlbums] Added containerTpl (with navigation placeholders) and totalVar placeholder
-- [#266] Add support for selection of album cover. 
+- [#266] Add support for selection of album cover.
 - [#259] Do not cache in getList() when $sort = RAND()
 - [#252] Database Optimization
 - [#248] Fix getPage support in Gallery snippet
@@ -35,7 +42,7 @@ Gallery 1.6.0
 - [#226] German localization
 - [#151] Needed to show links to next/prev albums
 - [#91] Allow false boolean
-- [#258] Bug fix with random sorting when cached 
+- [#258] Bug fix with random sorting when cached
 - Bug fixes
 
 Gallery 1.5.3
@@ -200,4 +207,4 @@ Gallery 0.1.0
 - i18ned the code, filled out mgr UI functionality
 - Added check when removing album to delete items not in any other albums
 - Lots of dev work, got basics mostly functional
-- Initial commit
\ No newline at end of file
+- Initial commit
diff --git a/core/components/gallery/processors/mgr/item/getlist.class.php b/core/components/gallery/processors/mgr/item/getlist.class.php
index 9dc4c7e..fed3d8a 100644
--- a/core/components/gallery/processors/mgr/item/getlist.class.php
+++ b/core/components/gallery/processors/mgr/item/getlist.class.php
@@ -62,6 +62,8 @@ public function prepareQueryAfterCount(xPDOQuery $c) {
                 WHERE Tags.item = galItem.id
             ) AS tags'
         ));
+        $c->groupBy('id');
+        $c->groupBy('rank');
         return $c;
     }
 
@@ -102,4 +104,4 @@ public function prepareRow(xPDOObject $object) {
         return $itemArray;
     }
 }
-return 'GalleryItemGetListProcessor';
\ No newline at end of file
+return 'GalleryItemGetListProcessor';