$vars = Horde_Variables::getDefaultVariables();
try {
- $gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($vars->get('gallery'));
+ $gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($vars->get('gallery'));
} catch (Ansel_Exception $e) {
$notification->push($gallery->getMessage());
Horde::url('view.php?view=List', true)->redirect();
/* If we have a single gallery, check perms now */
if (!empty($gallery_id)) {
- $gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($gallery_id);
+ $gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($gallery_id);
if (!$gallery->hasPermission($registry->getAuth(), Horde_Perms::EDIT)) {
$notification->push(_("You are not allowed to edit these photos."), 'horde.error');
echo Horde::wrapInlineScript(array(
$count = 0;
foreach (array_keys($images) as $image_id) {
try {
- $image = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImage($image_id);
+ $image = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImage($image_id);
if (empty($gallery_id)) {
// Images might be from different galleries
- $gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($image->gallery);
+ $gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($image->gallery);
if (!$gallery->hasPermission($registry->getAuth(), Horde_Perms::EDIT)) {
continue;
}
foreach ($keys as $key) {
$html .= '<img src="' . Ansel::getImageUrl($key, 'mini', false) . '" style="margin:2px;" alt="[thumbnail]" />';
}
-$image = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImage(array_pop($keys));
+$image = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImage(array_pop($keys));
/* Display the form */
$vars->set('image', $images);
$vars->set('gallery', $gallery_id);
$notification->push(_("Action was cancelled."), 'horde.warning');
} else {
$report = Ansel_Report::factory();
- $gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($face['gallery_id']);
+ $gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($face['gallery_id']);
$face_link = Horde::url('faces/custom.php', true)->add(
array('name' => $vars->get('person'),
$form_post = Horde::url('faces/savecustom.php')->add($urlparams);
try {
- $image = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImage($image_id);
+ $image = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImage($image_id);
} catch (Ansel_Exception $e) {
$notification->push($image);
Horde::url('list.php')->redirect();
exit;
}
-$gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($image->gallery);
+$gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($image->gallery);
if (!$gallery->hasPermission($registry->getAuth(), Horde_Perms::EDIT)) {
$notification->push(_("Access denied editing the photo."));
Ansel::getUrlFor('view', array('gallery' => $image->gallery))->redirect();
exit;
}
try {
- $gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($gallery_id);
+ $gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($gallery_id);
} catch (Ansel_Exception $e) {
$notification->push($e->getMessage(), 'horde.error');
Ansel::getUrlFor('view', array('gallery' => $gallery_id))->redirect();
// Attempt to get faces from the picture if we don't already have results,
// or if we were asked to explicitly try again.
if (($reload || empty($result))) {
- $image = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImage($image_id);
+ $image = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImage($image_id);
try {
$image->createView('screen');
$result = $faces->getFromPicture($image_id, $autocreate);
$face_id = (int)Horde_Util::getFormData('face');
$name = Horde_Util::getFormData('name');
-$image = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImage($image_id);
-$gallery = $$GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()>getGallery($image->gallery);
+$image = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImage($image_id);
+$gallery = $$GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()>getGallery($image->gallery);
if (!$gallery->hasPermission($registry->getAuth(), Horde_Perms::EDIT)) {
throw new Horde_Exception('Access denied editing the photo.');
}
} else {
require ANSEL_BASE . '/lib/Report.php';
$report = Ansel_Report::factory();
- $gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($face['gallery_id']);
+ $gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($face['gallery_id']);
$face_link = Horde::url('faces/face.php', true)->add(
array('name' => $vars->get('person'),
case 'downloadzip':
$galleryId = Horde_Util::getFormData('gallery');
- $gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($galleryId);
+ $gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($galleryId);
if (!$registry->getAuth() ||
!$gallery->hasPermission($registry->getAuth(), Horde_Perms::READ)) {
$galleryId = Horde_Util::getFormData('gallery');
if ($galleryId) {
try {
- $gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($galleryId);
+ $gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($galleryId);
require ANSEL_TEMPLATES . '/common-header.inc';
echo Horde::menu();
$notification->notify(array('listeners' => 'status'));
// Re-generate the default pretty gallery image.
$galleryId = Horde_Util::getFormData('gallery');
try {
- $gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($galleryId);
+ $gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($galleryId);
$gallery->clearStacks();
$notification->push(_("The gallery's default photo has successfully been reset."), 'horde.success');
Horde::url('view.php', true)->add('gallery', $galleryId)->redirect();
// Re-generate all of this gallery's prettythumbs.
$galleryId = Horde_Util::getFormData('gallery');
try {
- $gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($galleryId);
+ $gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($galleryId);
} catch (Ansel_Exception $e) {
$notification->push($gallery->getMessage(), 'horde.error');
Horde::url('index.php', true)->redirect();
// Delete all cached image views.
$galleryId = Horde_Util::getFormData('gallery');
try {
- $gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($galleryId);
+ $gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($galleryId);
} catch (Ansel_Exception $e) {
$notification->push($gallery->getMessage(), 'horde.error');
Horde::url('index.php', true)->redirect();
exit;
}
try {
- $gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($galleryId);
+ $gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($galleryId);
} catch (Ansel_Exception $e) {
$notification->push(sprintf(_("Error accessing %s: %s"), $galleryId, $e->getMessage()), 'horde.error');
Ansel::getUrlFor('view', array('view' => 'List'), true)->redirect();
if ($galleryId) {
try {
- $gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($galleryId);
+ $gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($galleryId);
} catch (Ansel_Exception $e) {
$notification->push($e->getMessage(), 'horde.error');
// Return to the default view.
$gallery->get('name')), 'horde.error');
} else {
try {
- $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->removeGallery($gallery);
+ $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->removeGallery($gallery);
$notification->push(sprintf(_("Successfully deleted %s."), $gallery->get('name')), 'horde.success');
} catch (Ansel_Exception $e) {
$notification->push(sprintf(
$gallery->get('name')),
'horde.error');
} else {
- $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->emptyGallery($gallery);
+ $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->emptyGallery($gallery);
$notification->push(sprintf(_("Successfully emptied \"%s\""), $gallery->get('name')));
}
Ansel::getUrlFor('view',
exit;
}
try {
- $gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($galleryId);
+ $gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($galleryId);
} catch (Ansel_Excception $e) {
$notification->push(_("There was an error accessing the gallery."), 'horde.error');
Ansel::getUrlFor('view', array('view' => 'List'), true)->redirect();
switch ($groupby) {
case 'owner':
try {
- if ($num_groups = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->shares->countOwners(Horde_Perms::SHOW, null, false)) {
+ if ($num_groups = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->shares->countOwners(Horde_Perms::SHOW, null, false)) {
- $groups = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->shares->listOwners(Horde_Perms::SHOW,
+ $groups = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->shares->listOwners(Horde_Perms::SHOW,
null,
false,
$gbpage * $groups_perpage,
/* Get the gallery object and style information */
try {
- $gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($gallery_id);
+ $gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($gallery_id);
} catch (Ansel_Exception $e) {
$notification->push(sprintf(_("Gallery %s not found."), $gallery_id), 'horde.error');
Ansel::getUrlFor('view', array('view' => 'List'), true)->redirect();
if (!is_null($tags) && strlen($tags)) {
$tags = explode(',', $tags);
if (!empty($image_id)) {
- $resource = &$GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImage($image_id);
+ $resource = &$GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImage($image_id);
} else {
$resource = $gallery;
}
case 'deletetags':
$tag = Horde_Util::getFormData('tag');
if (!empty($image_id)) {
- $resource = &$GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImage($image_id);
+ $resource = &$GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImage($image_id);
$page = Horde_Util::getFormData('page', 0);
$url = Ansel::getUrlFor('view', array_merge(
array('view' => 'Image',
case 'modify':
try {
- $image = &$GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImage($image_id);
+ $image = &$GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImage($image_id);
$ret = Horde_Util::getFormData('ret', 'gallery');
} catch (Ansel_Exception $e) {
$notification->push(_("Photo not found."), 'horde.error');
} catch (Horde_Browser_Exception $e) {}
}
- $image = &$GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImage($image_id);
+ $image = &$GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImage($image_id);
$image->caption = $vars->get('image_desc');
$image->setTags(explode(',' , $vars->get('image_tags')));
}
/* Retrieve image details. */
- $image = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImage($image_id);
+ $image = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImage($image_id);
$title = sprintf(_("Edit %s :: %s"), $gallery->get('name'),
$image->filename);
true)->redirect();
exit;
} else {
- $image = &$GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImage($image_id);
+ $image = &$GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImage($image_id);
$image->watermark('screen', $watermark, $watermark_halign,
$watermark_valign, $watermark_font);
$image->updateData($image->raw('screen'), 'screen');
'horde.error');
} else {
try {
- $image = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImage($image_id);
+ $image = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImage($image_id);
} catch (Ansel_Exception $e) {
$notification->push($e->getMessage(), 'horde.error');
Ansel::getUrlFor('view', array('view' => 'List'), true)->redirect();
case 'setwatermark':
$title = _("Watermark");
try {
- $image = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImage($image_id);
+ $image = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImage($image_id);
} catch (Ansel_Exception $e) {
$notification->push($image->getMessage(), 'horde.error');
Ansel::getUrlFor('view', array('view' => 'List'), true)->redirect();
$action = substr($actionID, 7);
/* Retrieve image details. */
- $image = &$GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImage($image_id);
+ $image = &$GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImage($image_id);
$title = sprintf(_("Preview changes for %s :: %s"),
$gallery->get('name'),
$image->filename);
case 'imagerotate270':
$view = Horde_Util::getFormData('view');
$angle = intval(substr($actionID, 11));
- $image = &$GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImage($image_id);
+ $image = &$GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImage($image_id);
$image->rotate($view, $angle);
$image->display($view);
exit;
case 'imageflip':
$view = Horde_Util::getFormData('view');
- $image = &$GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImage($image_id);
+ $image = &$GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImage($image_id);
$image->flip($view);
$image->display($view);
exit;
case 'imagemirror':
$view = Horde_Util::getFormData('view');
- $image = &$GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImage($image_id);
+ $image = &$GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImage($image_id);
$image->mirror($view);
$image->display($view);
exit;
case 'imagegrayscale':
$view = Horde_Util::getFormData('view');
- $image = &$GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImage($image_id);
+ $image = &$GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImage($image_id);
$image->grayscale($view);
$image->display($view);
exit;
case 'imagewatermark':
$view = Horde_Util::getFormData('view');
- $image = &$GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImage($image_id);
+ $image = &$GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImage($image_id);
$image->watermark($view, $watermark, $watermark_halign, $watermark_valign,
$watermark_font);
$image->display($view);
$newGallery = Horde_Util::getFormData('new_gallery');
if ($images && $newGallery) {
try {
- $newGallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($newGallery);
+ $newGallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($newGallery);
$result = $gallery->moveImagesTo($images, $newGallery);
$notification->push(
sprintf(ngettext("Moved %d photo from \"%s\" to \"%s\"",
$newGallery = Horde_Util::getFormData('new_gallery');
if ($images && $newGallery) {
try {
- $newGallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($newGallery);
+ $newGallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($newGallery);
$result = $gallery->copyImagesTo($images, $newGallery);
$notification->push(
sprintf(ngettext("Copied %d photo to %s",
case 'downloadzip':
$galleryId = Horde_Util::getFormData('gallery');
if ($galleryId) {
- $gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($galleryId);
+ $gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($galleryId);
if (!$registry->getAuth() ||
!$gallery->hasPermission($registry->getAuth(), Horde_Perms::READ) ||
$gallery->hasPasswd() || !$gallery->isOldEnough()) {
$action = substr($actionID, 7);
/* Retrieve image details. */
- $image = &$GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImage($image_id);
+ $image = &$GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImage($image_id);
$title = sprintf(_("Preview changes for %s :: %s"),
$gallery->get('name'),
$image->filename);
if ($gallery->hasPermission($registry->getAuth(), Horde_Perms::EDIT)) {
$params = Horde_Util::getFormData('params');
list($x1, $y1, $x2, $y2) = explode('.', $params);
- $image = &$GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImage($image_id);
+ $image = &$GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImage($image_id);
$image->load('full');
$image->crop($x1, $y1, $x2, $y2);
$image->display();
require_once dirname(__FILE__) . '/../lib/Application.php';
Horde_Registry::appInit('ansel');
-$image = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImage(Horde_Util::getFormData('image'));
-$gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($image->gallery);
+$image = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImage(Horde_Util::getFormData('image'));
+$gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($image->gallery);
if (!$gallery->hasPermission($registry->getAuth(), Horde_Perms::READ) || !$gallery->canDownload()) {
throw new Horde_Exception_PermissionDenied(_("Access denied viewing this photo."), __FILE__, __LINE__);
}
}
/* Get the gallery and the image, and abort if either fails. */
-$gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery(Horde_Util::getFormData('gallery'));
+$gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery(Horde_Util::getFormData('gallery'));
$image = $gallery->getImage(Horde_Util::getFormData('image'));
/* Run through the action handlers. */
require_once dirname(__FILE__) . '/../lib/Application.php';
Horde_Registry::appInit('ansel');
-$image = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImage(Horde_Util::getFormData('image'));
-$gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($image->gallery);
+$image = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImage(Horde_Util::getFormData('image'));
+$gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($image->gallery);
if (!$gallery->hasPermission($registry->getAuth(), Horde_Perms::READ) || !$gallery->canDownload()) {
throw new Horde_Exception_PermissionDenied(_("Access denied viewing this photo."));
}
require_once dirname(__FILE__) . '/../lib/Application.php';
Horde_Registry::appInit('ansel');
-$image = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImage(Horde_Util::getFormData('image'));
-$gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($image->gallery);
+$image = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImage(Horde_Util::getFormData('image'));
+$gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($image->gallery);
if (!$gallery->hasPermission($registry->getAuth(), Horde_Perms::READ)) {
throw new Horde_Exception_PermissionDenied(_("Access denied viewing this photo."));
}
require_once dirname(__FILE__) . '/../lib/Application.php';
Horde_Registry::appInit('ansel');
-$image = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImage(Horde_Util::getFormData('image'));
-$gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery(abs($image->gallery));
+$image = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImage(Horde_Util::getFormData('image'));
+$gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery(abs($image->gallery));
if (!$gallery->hasPermission($registry->getAuth(), Horde_Perms::READ)) {
throw new Horde_Exception_PermissionDenied(_("Access denied viewing this photo."));
}
} else {
$style = null;
}
-$image = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImage(Horde_Util::getFormData('image'));
-$gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery(abs($image->gallery));
+$image = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImage(Horde_Util::getFormData('image'));
+$gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery(abs($image->gallery));
if (!$gallery->hasPermission($registry->getAuth(), Horde_Perms::READ)) {
throw new Horde_Exception_PermissionDenied(_("Access denied viewing this photo."));
}
require_once dirname(__FILE__) . '/../lib/Application.php';
Horde_Registry::appInit('ansel');
-$image = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImage(Horde_Util::getFormData('image'));
-$gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($image->gallery);
+$image = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImage(Horde_Util::getFormData('image'));
+$gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($image->gallery);
if (!$gallery->hasPermission($registry->getAuth(), Horde_Perms::READ)) {
throw new Horde_Exception_PermissionDenied(_("Access denied viewing this photo."));
}
require_once dirname(__FILE__) . '/../lib/Application.php';
Horde_Registry::appInit('ansel');
-$image = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImage(Horde_Util::getFormData('image'));
-$gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery(abs($image->gallery));
+$image = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImage(Horde_Util::getFormData('image'));
+$gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery(abs($image->gallery));
if (!$gallery->hasPermission($registry->getAuth(), Horde_Perms::READ)) {
throw new Horde_Exception_PermissionDenied(_("Access denied viewing this photo."));
}
$gallery_id = Horde_Util::getFormData('gallery');
try {
- $gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($gallery_id);
+ $gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($gallery_id);
} catch (Ansel_Exception $e) {
$notification->push(sprintf(_("Gallery %s not found."), $gallery_id), 'horde.error');
Ansel::getUrlFor('view', array('view' => 'List'), true)->redirect();
require_once dirname(__FILE__) . '/../lib/Application.php';
Horde_Registry::appInit('ansel');
try {
- $gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery((int)Horde_Util::getFormData('gallery'));
+ $gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery((int)Horde_Util::getFormData('gallery'));
} catch (Ansel_Exception $e) {
echo $e->getMessage();
Horde::logMessage($e->getMessage(), 'err');
/* Are we requesting the unformatted text? */
if (!empty($args['action']) && $args['action'] == 'load') {
$id = $args['id'];
- $image = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImage($id);
+ $image = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImage($id);
$caption = $image->caption;
return $caption;
return '';
}
$id = $args['id'];
- $image = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImage($id);
- $g = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($image->gallery);
+ $image = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImage($id);
+ $g = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($image->gallery);
if ($g->hasPermission($GLOBALS['registry']->getAuth(), Horde_Perms::EDIT)) {
$image->caption = $pref_value;
try {
// Attempt to get faces from the picture if we don't already have results,
// or if we were asked to explicitly try again.
if (($reload || empty($result))) {
- $image = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImage($image_id);
+ $image = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImage($image_id);
$image->createView('screen');
$result = $faces->getFromPicture($image_id, $autocreate);
}
case 'delete':
// delete - deletes a single face from an image.
$face_id = (int)$post['face'];
- $image = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImage($image_id);
- $gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($image->gallery);
+ $image = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImage($image_id);
+ $gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($image->gallery);
if (!$gallery->hasPermission($GLOBALS['registry']->getAuth(), Horde_Perms::EDIT)) {
throw new Horde_Exception('Access denied editing the photo.');
}
}
$name = $post['facename'];
- $image = &$GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImage($image_id);
- $gallery = &$GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($image->gallery);
+ $image = &$GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImage($image_id);
+ $gallery = &$GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($image->gallery);
if (!$gallery->hasPermission($GLOBALS['registry']->getAuth(), Horde_Perms::EDIT)) {
throw new Horde_Exception('You are not allowed to edit this photo');
}
$autocreate = true;
$result = $faces->getImageFacesData($image_id);
if (empty($result)) {
- $image = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImage($this->_params['image_id']);
+ $image = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImage($this->_params['image_id']);
$image->createView('screen');
$result = $faces->getFromPicture($this->_params['image_id'], $autocreate);
}
// Attempt to get faces from the picture if we don't already have results,
// or if we were asked to explicitly try again.
if (($reload || empty($result))) {
- $image = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImage($image_id);
+ $image = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImage($image_id);
$image->createView('screen');
$result = $faces->getFromPicture($image_id, $autocreate);
}
case 'delete':
// delete - deletes a single face from an image.
$face_id = (int)$post['face'];
- $image = &$GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImage($image_id);
- $gallery = &$GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($image->gallery);
+ $image = &$GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImage($image_id);
+ $gallery = &$GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($image->gallery);
if (!$gallery->hasPermission(Horde_Auth::getAuth(), Horde_Perms::EDIT)) {
throw new Horde_Exception('Access denied editing the photo.');
}
}
$name = $post['facename'];
- $image = &$GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImage($image_id);
- $gallery = &$GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($image->gallery);
+ $image = &$GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImage($image_id);
+ $gallery = &$GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($image->gallery);
if (!$gallery->hasPermission(Horde_Auth::getAuth(), Horde_Perms::EDIT)) {
throw new Horde_Exception('You are not allowed to edit this photo');
}
return array('response' => '0');
}
- $exists = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->slugExists($slug) ? 0 : 1;
+ $exists = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->slugExists($slug) ? 0 : 1;
return array('response' => $exists);
}
// Get the image and gallery to check perms
try {
- $image = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImage((int)$img);
- $gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($image->gallery);
+ $image = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImage((int)$img);
+ $gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($image->gallery);
} catch (Ansel_Exception $e) {
return array('response' => 0);
}
// Now get the "add geotag" stuff
$addurl = Horde::url('map_edit.php')->add('image', $img);
$addLink = $addurl->link(array('onclick' => Horde::popupJs(Horde::url('map_edit.php'), array('params' => array('image' => $img), 'urlencode' => true, 'width' => '750', 'height' => '600')) . 'return false;'));
- $imgs = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getRecentImagesGeodata($GLOBALS['registry']->getAuth());
+ $imgs = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getRecentImagesGeodata($GLOBALS['registry']->getAuth());
if (count($imgs) > 0) {
$imgsrc = '<div class="ansel_location_sameas">';
foreach ($imgs as $id => $data) {
/* Use ajax? */
if (!isset($_SESSION['ansel']['ajax_locationac'])) {
- $results = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->searchLocations();
+ $results = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->searchLocations();
if ($results instanceof PEAR_Error) {
Horde::logMessage($results, 'ERR');
} else {
$ret['ajax'] = 'LocationAutoCompleter';
} else {
if (empty($results)) {
- $results = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->searchLocations();
+ $results = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->searchLocations();
}
$ret['browser'] = Horde_Serialize::serialize($results, Horde_Serialize::JSON);
}
return array();
}
try {
- $locs = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->searchLocations($input);
+ $locs = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->searchLocations($input);
if (!count($locs)) {
$locs = new StdClass();
}
/* Get the resource owner */
if ($type == 'gallery') {
- $resource = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($id);
+ $resource = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($id);
$parent = $resource;
} else {
- $resource = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImage($id);
- $parent = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($resource->gallery);
+ $resource = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImage($id);
+ $parent = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($resource->gallery);
}
switch ($action) {
{
$params = new Horde_Support_Array($params);
$galleries = $GLOBALS['injector']
- ->getInstance('Ansel_Storage')
- ->getScope()
+ ->getInstance('Ansel_Injector_Factory_Storage')
+ ->create()
->listGalleries($params);
$tree = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Tree')->create('gallery_tree', 'Select');
// Getting these objects is not ideal, but at this point
// they should already be locally cached so the cost
// is minimized.
- $i = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImage($data['image']);
- $g = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($data['gallery']);
+ $i = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImage($data['image']);
+ $g = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($data['gallery']);
if ($g->get('view_mode') == 'Date') {
$imgDate = new Horde_Date($i->originalDate);
$data['year'] = $imgDate->year;
// We have to make sure the image exists first, since we won't
// be going through img/*.php to auto-create it.
try {
- $image = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImage($imageId);
+ $image = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImage($imageId);
} catch (Ansel_Exception $e) {
Horde::logMessage($e, 'ERR');
return Horde::url((string)Ansel::getErrorImage($view), $full);
{
global $prefs;
- $ansel_storage = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope();
+ $ansel_storage = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create();
$groupby = Horde_Util::getFormData('groupby', $prefs->getValue('groupby'));
$owner = Horde_Util::getFormData('owner');
$image_id = (int)Horde_Util::getFormData('image');
$zipfiles = array();
foreach ($images as $id) {
- $image = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImage($id);
+ $image = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImage($id);
// If we didn't select an entire gallery, check the download
// size for each image.
if (!isset($view)) {
- $g = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($image->gallery);
+ $g = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($image->gallery);
$v = $g->canDownload() ? 'full' : 'screen';
} else {
$v = $view;
$path = trim($path, '/');
$parts = explode('/', $path);
- $storage = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope();
+ $storage = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create();
if (empty($path)) {
$owners = array();
$galleries = $storage->listGalleries(array('allLevels' => false));
// This request if for a certain gallery, list all sub-galleries
// and images.
$gallery_id = end($parts);
- $galleries = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGalleries(array($gallery_id));
+ $galleries = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGalleries(array($gallery_id));
if (!isset($galleries[$gallery_id]) ||
!$galleries[$gallery_id]->hasPermission($GLOBALS['registry']->getAuth(), Horde_Perms::READ)) {
} elseif (count($parts) > 2 &&
$this->galleryExists(null, $parts[count($parts) - 2]) &&
- ($image = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImage(end($parts)))) {
+ ($image = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImage(end($parts)))) {
return array('data' => $image->raw(),
'mimetype' => $image->type,
}
$image_name = array_pop($parts);
$gallery_id = end($parts);
- if (!$GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->galleryExists($gallery_id)) {
+ if (!$GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->galleryExists($gallery_id)) {
throw new Horde_Exception_NotFound("Gallery does not exist");
}
- $gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($gallery_id);
+ $gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($gallery_id);
if (!$gallery->hasPermission($GLOBALS['registry']->getAuth(), Horde_Perms::EDIT)) {
throw new Horde_Exception_PermissionDenied(_("Access denied adding photos to \"%s\"."));
}
}
try {
- if (!($image = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImage($image_id))) {
+ if (!($image = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImage($image_id))) {
return false;
}
} catch (Ansel_Exception $e) {
throw new InvalidArgumentException(_("A gallery to add this photo to is required."));
}
if (!empty($params['slug'])) {
- $gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGalleryBySlug($params['slug']);
- } elseif ($GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->galleryExists($gallery_id)) {
- $gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($gallery_id);
+ $gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGalleryBySlug($params['slug']);
+ } elseif ($GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->galleryExists($gallery_id)) {
+ $gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($gallery_id);
}
/* Check perms for requested gallery */
$GLOBALS['injector']->getInstance('Ansel_Config')->set('scope', $params['scope']);
}
- $image = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImage($image_id);
- $gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($image->gallery);
+ $image = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImage($image_id);
+ $gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($image->gallery);
if (!$gallery->hasPermission($GLOBALS['registry']->getAuth(), Horde_Perms::DELETE)) {
throw new Horde_Exception_PermissionDenied(sprintf(_("Access denied deleting photos from \"%s\"."), $gallery->get('name')));
}
}
/* Create the gallery */
- $gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->createGallery($attributes, $permobj, $parent);
+ $gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->createGallery($attributes, $permobj, $parent);
return $gallery->id;
}
}
/* Get, and check perms on the gallery */
- $gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($gallery_id);
+ $gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($gallery_id);
if (!$gallery->hasPermission($GLOBALS['registry']->getAuth(), Horde_Perms::DELETE)) {
throw new Horde_Exception_PermissionDenied(sprintf(_("Access denied deleting gallery \"%s\"."), $gallery->get('name')));
} else {
- return $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->removeGallery($gallery);
+ return $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->removeGallery($gallery);
}
}
try {
if (!empty($params['slug'])) {
- $gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGalleryBySlug($params['slug']);
+ $gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGalleryBySlug($params['slug']);
} else {
- $gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($gallery_id);
+ $gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($gallery_id);
}
return (int)$gallery->countImages();
} catch (Ansel_Exception $e) {
}
if (!empty($params['slug'])) {
- $gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGalleryBySlug($params['slug']);
+ $gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGalleryBySlug($params['slug']);
} else {
- $gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($gallery_id);
+ $gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($gallery_id);
}
return $gallery->getKeyImage(empty($params['style']) ? 'ansel_default' : $params['style']);
}
/* Get image and gallery */
- $image = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImage($image_id);
- $gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($image->gallery);
+ $image = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImage($image_id);
+ $gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($image->gallery);
/* Check age and password */
if (!$gallery->hasPasswd() || !$gallery->isOldEnough()) {
$GLOBALS['injector']->getInstance('Ansel_Config')->set('scope', $params['scope']);
}
$galleries = $GLOBALS['injector']
- ->getInstance('Ansel_Storage')
- ->getScope()
+ ->getInstance('Ansel_Injector_Factory_Storage')
+ ->create()
->listGalleries($params);
$return = array();
foreach ($galleries as $gallery) {
}
if (count($slugs)) {
- $results = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGalleriesBySlugs($slugs);
+ $results = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGalleriesBySlugs($slugs);
} else {
- $results = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGalleries($ids);
+ $results = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGalleries($ids);
}
// We can't just return the results of the getGalleries call - we need
$GLOBALS['injector']->getInstance('Ansel_Config')->set('scope', $app);
}
- $storage = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope();
+ $storage = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create();
// Determine the default gallery when none is given. The first gallery
// in the list is the default gallery.
if (is_null($gallery_id) && empty($slug)) {
if (!is_null($app)) {
$GLOBALS['injector']->getInstance('Ansel_Config')->set('scope', $app);
}
- $images = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getRecentImages($galleries, $limit, $slugs);
+ $images = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getRecentImages($galleries, $limit, $slugs);
$imagelist = array();
if ($style) {
$style = Ansel::getStyleDefinition($style);
$GLOBALS['injector']->getInstance('Ansel_Config')->set('scope', $app);
}
- return $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->countGalleries($GLOBALS['registry']->getAuth(), $perm,
+ return $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->countGalleries($GLOBALS['registry']->getAuth(), $perm,
$attributes, $parent,
$allLevels);
}
$return = array();
if (!empty($results['images'])) {
foreach ($results['images'] as $image_id) {
- $image = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImage($image_id);
+ $image = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImage($image_id);
$desc = $image->caption;
$title = $image->filename;
$view_url = Ansel::getUrlFor('view',
if (!empty($results['galleries'])) {
foreach ($results['galleries'] as $gallery) {
- $gal = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($gallery);
+ $gal = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($gallery);
$view_url = Horde::url('view.php')->add(
array('gallery' => $gallery,
'view' => 'Gallery'));
$GLOBALS['injector']->getInstance('Ansel_Config')->set('scope', $app);
}
- return $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->galleryExists($gallery_id, $slug);
+ return $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->galleryExists($gallery_id, $slug);
}
/**
throw new Horde_Exception('The Content_Tagger class could not be found. Make sure the registry entry for the Content system is present.');
}
- $binders = array(
- 'Ansel_Styles' => new Ansel_Injector_Binder_Styles(),
- 'Ansel_Faces' => new Ansel_Injector_Binder_Faces(),
- 'Ansel_Storage' => new Ansel_Injector_Binder_Storage()
+ $factories = array(
+ 'Ansel_Styles' => array('Ansel_Injector_Factory_Styles', 'create'),
+ 'Ansel_Faces' => array('Ansel_Injector_Factory_Faces', 'create'),
+ 'Ansel_Storage' => array('Ansel_Injector_Factory_Storage', 'create'),
);
- foreach ($binders as $interface => $binder) {
- $GLOBALS['injector']->addBinder($interface, $binder);
+ foreach ($factories as $interface => $v) {
+ $GLOBALS['injector']->bindFactory($interface, $v[0], $v[1]);
}
// Create db, share, and vfs instances.
'type' => 'checkbox',
'default' => true));
- $storage = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope();
+ $storage = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create();
if ($storage->countGalleries($GLOBALS['registry']->getAuth(), Horde_Perms::READ) < $GLOBALS['conf']['gallery']['listlimit']) {
foreach ($storage->listGalleries() as $gal) {
$params['gallery']['values'][$gal->id] = $gal->get('name');
// Get the gallery object and cache it.
if (isset($this->_params['gallery']) && $this->_params['gallery'] != '__random') {
- $this->_gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($this->_params['gallery']);
+ $this->_gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($this->_params['gallery']);
} else {
- $this->_gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getRandomGallery();
+ $this->_gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getRandomGallery();
}
// Protect at least a little bit against getting an empty gallery. We
/* Get the top level galleries */
try {
- $galleries = $GLOBALS['injector']->getInstance('Ansel_Storage')
- ->getScope()->listGalleries(array('perm' => Horde_Perms::EDIT,
+ $galleries = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')
+ ->create()->listGalleries(array('perm' => Horde_Perms::EDIT,
'filter' => $GLOBALS['registry']->getAuth(),
'allLevels' => false,
'count' => empty($this->_params['limit']) ? 0 : $this->_params['limit'],
*/
protected function _content()
{
- $gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getRandomGallery();
+ $gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getRandomGallery();
if (!$gallery) {
return _("There are no photo galleries available.");
}
'type' => 'enum',
'default' => '__random',
'values' => array('all' => 'All')));
- $storage = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope();
- if ($storage->getScope()->countGalleries($GLOBALS['registry']->getAuth(), Horde_Perms::READ) < $GLOBALS['conf']['gallery']['listlimit']) {
+ $storage = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create();
+ if ($storage->countGalleries($GLOBALS['registry']->getAuth(), Horde_Perms::READ) < $GLOBALS['conf']['gallery']['listlimit']) {
foreach ($storage->listGalleries(array('perm' => Horde_Perms::READ)) as $id => $gal) {
$params['gallery']['values'][$id] = $gal->get('name');
}
foreach ($results as $comment) {
try {
- $image = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImage($comment['image_id']);
+ $image = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImage($comment['image_id']);
$url = Ansel::getUrlFor('view',
array('view' => 'Image',
'gallery' => abs($image->gallery),
// Get the gallery object and cache it.
if (isset($this->_params['gallery']) &&
$this->_params['gallery'] != '__random') {
- $this->_gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($this->_params['gallery']);
+ $this->_gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($this->_params['gallery']);
} else {
- $this->_gallery =$GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getRandomGallery();
+ $this->_gallery =$GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getRandomGallery();
}
if (empty($this->_gallery)) {
'default' => 10),
);
- if ($GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->countGalleries($GLOBALS['registry']->getAuth(), Horde_Perms::READ) < $GLOBALS['conf']['gallery']['listlimit']) {
- foreach ($GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->listGalleries(array('perm' => Horde_Perms::READ)) as $id => $gal) {
+ if ($GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->countGalleries($GLOBALS['registry']->getAuth(), Horde_Perms::READ) < $GLOBALS['conf']['gallery']['listlimit']) {
+ foreach ($GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->listGalleries(array('perm' => Horde_Perms::READ)) as $id => $gal) {
if (!$gal->hasPasswd() && $gal->isOldEnough()) {
$params['gallery']['values'][$id] = $gal->get('name');
}
// Retrieve the images, but protect against very large values for limit.
try {
- $results = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getRecentImages(
+ $results = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getRecentImages(
$galleries, min($this->_params['limit'], 100));
} catch (Ansel_Exception $e) {
return $e->getMessage();
HEADER;
foreach ($results as $image) {
- $gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($image->gallery);
+ $gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($image->gallery);
// Don't show locked galleries in the block.
if (!$gallery->isOldEnough() || $gallery->hasPasswd()) {
/* Get the gallery object and cache it. */
if (isset($this->_params['gallery']) &&
$this->_params['gallery'] != '__random') {
- $this->_gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($this->_params['gallery']);
+ $this->_gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($this->_params['gallery']);
} else {
- $this->_gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getRandomGallery();
+ $this->_gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getRandomGallery();
}
if (empty($this->_gallery)) {
protected function _content()
{
try {
- $images = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getRecentImagesGeodata(null, 0, min($this->_params['limit'], 100));
+ $images = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getRecentImagesGeodata(null, 0, min($this->_params['limit'], 100));
} catch (Ansel_Exception $e) {
return $e->getMessage();
}
$images = array_reverse($images);
foreach ($images as $key => $image) {
$id = $image['image_id'];
- $gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($image['gallery_id']);
+ $gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($image['gallery_id']);
/* Don't show locked galleries in the block. */
if (!$gallery->isOldEnough() || $gallery->hasPasswd()) {
// should be encapsulated by the shares driver and not parsed from
// an internally generated query string fragment. Will need to split
// this out into two seperate operations somehow.
- $share = substr($GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->shares->getShareCriteria(
+ $share = substr($GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->shares->getShareCriteria(
$GLOBALS['registry']->getAuth(), Horde_Perms::READ), 5);
$sql = 'SELECT f.face_id, f.gallery_id, f.image_id, f.face_name FROM ansel_faces f, '
{
// add gallery permission
// FIXME: Ditto on the REALLY ugly hack comment from above!
- $share = substr($GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->shares->getShareCriteria(
+ $share = substr($GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->shares->getShareCriteria(
$GLOBALS['registry']->getAuth(), Horde_Perms::READ), 5);
$sql = 'SELECT COUNT(*) FROM ansel_faces f, '
return false;
}
$data = $this->getFaceById($face_id, true);
- $image = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImage($image_id);
+ $image = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImage($image_id);
// Actually create the image.
$this->createView(
*/
public function saveCustomFace($face_id, $image, $x1, $y1, $x2, $y2, $name = '')
{
- $image = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImage($image);
- $gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($image->gallery);
+ $image = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImage($image);
+ $gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($image->gallery);
if (!$gallery->hasPermission($GLOBALS['registry']->getAuth(), Horde_Perms::EDIT)) {
throw new Horde_Exception_PermissionDenied('Access denied editing the photo.');
}
{
// get image if ID is passed
if (!($image instanceof Ansel_Image)) {
- $image = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImage($image);
- $gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($image->gallery);
+ $image = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImage($image);
+ $gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($image->gallery);
if (!$gallery->hasPermission($GLOBALS['registry']->getAuth(), Horde_Perms::EDIT)) {
throw new Horde_Exception_PermissionDenied('Access denied editing the photo.');
}
*/
public function getFromGallery($gallery_id, $create = false, $force = false)
{
- $gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($gallery_id);
+ $gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($gallery_id);
if (!$gallery->hasPermission($GLOBALS['registry']->getAuth(), Horde_Perms::EDIT)) {
throw new Horde_Exception(sprintf("Access denied editing gallery \"%s\".", $gallery->get('name')));
}
{
/* Pass on up the chain */
parent::__construct($attributes);
- $this->setShareOb($GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->shares);
+ $this->setShareOb($GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->shares);
$mode = isset($attributes['attribute_view_mode']) ? $attributes['attribute_view_mode'] : 'Normal';
$this->_setModeHelper($mode);
}
}
// Check for slug uniqueness
- $slugGalleryId = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->slugExists($this->data['attribute_slug']);
+ $slugGalleryId = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->slugExists($this->data['attribute_slug']);
if ($slugGalleryId > 0 && $slugGalleryId <> $this->id) {
throw InvalidArgumentException(
sprintf(_("Could not save gallery, the slug, \"%s\", already exists."),
/* Check for a supported multi-page image */
if ($image->isMultiPage() === true) {
$params['name'] = $image->getImagePageCount() . ' page image: ' . $image->filename;
- $mGallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->createGallery($params, $this->getPermission(), $this->getId());
+ $mGallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->createGallery($params, $this->getPermission(), $this->getId());
$i = 1;
foreach ($image as $page) {
$page->caption = sprintf(_("Page %d"), $i++);
*/
public function getRecentImages($limit = 10)
{
- return $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getRecentImages(array($this->id),
+ return $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getRecentImages(array($this->id),
$limit);
}
*/
public function &getImage($id)
{
- return $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImage($id);
+ return $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImage($id);
}
/**
/* Fall through to a key image of a sub gallery. */
try {
$galleries = $GLOBALS['injector']
- ->getInstance('Ansel_Storage')
- ->getScope()
+ ->getInstance('Ansel_Injector_Factory_Storage')
+ ->create()
->listGalleries(array('parent' => $this, 'allLevels' => false));
foreach ($galleries as $galleryId => $gallery) {
{
/* Make sure we have a gallery object */
if (!is_null($parent) && !($parent instanceof Ansel_Gallery)) {
- $parent = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($parent);
+ $parent = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($parent);
}
/* Check this now since we don't know if we are updating the DB or not */
public function __wakeup()
{
- $this->setShareOb($GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->shares);
+ $this->setShareOb($GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->shares);
$mode = $this->get('view_mode');
$this->_setModeHelper($mode);
}
*/
public function getRecentImages($limit = 10)
{
- return $GLOBALS['injector']->getInstance('Ansel_Storage')
- ->getScope()
+ return $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')
+ ->create()
->getRecentImages(array($this->_gallery->id), $limit);
}
*/
public function getImage($id)
{
- return $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImage($id);
+ return $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImage($id);
}
/**
static $children = array();
/* Ansel Storage */
- $ansel_storage = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope();
+ $ansel_storage = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create();
$cache_key = md5($this->_gallery->id . serialize($this->_date) . $from . $to);
if (!empty($children[$cache_key])) {
*/
if ($this->_gallery->get('has_subgalleries')) {
$gallery_ids = array();
- $images = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImages(array('ids' => $ids));
+ $images = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImages(array('ids' => $ids));
foreach ($images as $image) {
if (empty($gallery_ids[$image->gallery])) {
$gallery_ids[$image->gallery] = 1;
}
/* Bulk update the images to their new gallery_id */
- $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->setImagesGallery($ids, $gallery->id);
+ $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->setImagesGallery($ids, $gallery->id);
/* Update the gallery counts for each affected gallery */
if ($this->_gallery->get('has_subgalleries')) {
foreach ($gallery_ids as $id => $count) {
- $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()
+ $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()
->getGallery($id)
->updateImageCount($count, false);
}
{
/* Make sure $image is an Ansel_Image; if not, try loading it. */
if (!($image instanceof Ansel_Image)) {
- $image = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImage($image);
+ $image = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImage($image);
}
/* Make sure the image is in this gallery. */
} catch (VFS_Exception $e) {}
/* Delete from storage */
- $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()
+ $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()
->removeImage($image->id);
if (!$isStack) {
- $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()
+ $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()
->getGallery($image_gallery)
->updateImageCount(1, false);
}
if (!is_array($this->_subGalleries)) {
/* Get a list of all the subgalleries */
$subs = $GLOBALS['injector']
- ->getInstance('Ansel_Storage')
- ->getScope()
+ ->getInstance('Ansel_Injector_Factory_Storage')
+ ->create()
->listGalleries(array('parent' => $this->_gallery));
$this->_subGalleries = array_keys($subs);
}
$galleries = array();
$num_galleries = 0;
if ($this->hasSubGalleries()) {
- $storage = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope();
+ $storage = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create();
/* Get the number of images and galleries */
$numimages = $this->countImages();
$num_galleries = $storage->countGalleries($GLOBALS['registry']->getAuth(), Horde_Perms::SHOW, null, $this->_gallery, false);
return $this->_gallery->data['attribute_images'];
}
- $gCnt = $GLOBALS['injector']->getInstance('Ansel_Storage')
- ->getScope()
+ $gCnt = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')
+ ->create()
->countGalleries($GLOBALS['registry']->getAuth(),
$perm, null,
$this->_gallery, false);
*/
public function listImages($from = 0, $count = 0)
{
- return $GLOBALS['injector']->getInstance('Ansel_Storage')
- ->getScope()
+ return $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')
+ ->create()
->listImages($this->_gallery->id, $from, $count);
}
}
}
- $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->setImagesGallery($ids, $gallery->id);
+ $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->setImagesGallery($ids, $gallery->id);
$this->_gallery->updateImageCount(count($ids), false);
$gallery->updateImageCount(count($ids), true);
} catch (VFS_Exception $e) {}
/* Delete from storage */
- $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->removeImage($image->id);
+ $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->removeImage($image->id);
if (!$isStack) {
$this->_gallery->updateImageCount(1, false);
}
*/
public function getImages($from = 0, $count = 0)
{
- $images = $GLOBALS['injector']->getInstance('Ansel_Storage')
- ->getScope()
+ $images = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')
+ ->create()
->getImages(array('gallery_id' => $this->_gallery->id,
'count' => $count,
'from' => $from));
if ($subgalleries && $this->hasSubGalleries()) {
$count = $this->countImages(false);
$galleries = $GLOBALS['injector']
- ->getInstance('Ansel_Storage')
- ->getScope()
+ ->getInstance('Ansel_Injector_Factory_Storage')
+ ->create()
->listGalleries(array('parent' => $this->_gallery));
foreach ($galleries as $galleryId => $gallery) {
/* Existing image, just save and exit */
if ($this->id) {
/* Save image details */
- return $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->saveImage($this);
+ return $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->saveImage($this);
}
/* New image, need to save the image files */
- $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->saveImage($this);
+ $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->saveImage($this);
/* The EXIF functions require a stream, so we need to save before we read */
$this->_writeData();
/* Save again if EXIF changed any values */
if (!empty($needUpdate)) {
- $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->saveImage($this);
+ $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->saveImage($this);
}
return $this->id;
/* Save attributes. */
foreach ($exif_fields as $name => $value) {
- $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->saveImageAttribute($this->id, $name, $value);
+ $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->saveImageAttribute($this->id, $name, $value);
$this->_exif[$name] = Horde_Image_Exif::getHumanReadable($name, $value);
}
if ($view == 'all' || $view == 'prettythumb') {
$styles = Horde::loadConfiguration('styles.php', 'styles', 'ansel');
- $hashes = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getHashes();
+ $hashes = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getHashes();
foreach ($hashes as $hash)
{
$GLOBALS['injector']->getInstance('Horde_Core_Factory_Vfs')
{
if ($view == 'full' && !$this->_dirty) {
// Check full photo permissions
- $gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($this->gallery);
+ $gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($this->gallery);
if ($gallery instanceof PEAR_Error) {
throw new Ansel_Exception($gallery);
}
if (count($this->_tags)) {
return $this->_tags;
}
- $gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($this->gallery);
+ $gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($this->gallery);
if ($gallery->hasPermission($GLOBALS['registry']->getAuth(), Horde_Perms::READ)) {
return $GLOBALS['injector']->getInstance('Ansel_Tagger')->getTags($this->id, 'image');
} else {
*/
public function setTags($tags)
{
- $gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery(abs($this->gallery));
+ $gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery(abs($this->gallery));
if ($gallery->hasPermission($GLOBALS['registry']->getAuth(), Horde_Perms::EDIT)) {
// Clear the local cache.
$this->_tags = array();
}
if (is_null($style)) {
- $gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery(abs($this->gallery));
+ $gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery(abs($this->gallery));
$style = $gallery->getStyle();
}
$view = md5($style->thumbstyle . '.' . $style->background);
*/
public function getAttributes($format = false)
{
- $attributes = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImageAttributes($this->id);
+ $attributes = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImageAttributes($this->id);
$exif = Horde_Image_Exif::factory($GLOBALS['conf']['exif']['driver'], !empty($GLOBALS['conf']['exif']['params']) ? $GLOBALS['conf']['exif']['params'] : array());
$fields = Horde_Image_Exif::getFields($exif);
$output = array();
protected function _getGalleryWithImages($parent)
{
$galleries = $GLOBALS['injector']
- ->getInstance('Ansel_Storage')
- ->getScope()
+ ->getInstance('Ansel_Injector_Factory_Storage')
+ ->create()
->listGalleries(array('parent' => $parent, 'allLevels' => false));
foreach ($galleries as $gallery) {
(which will have a negative gallery_id). */
if ($this->_image->gallery > 0) {
if (is_null($this->_style)) {
- $gal = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($this->_image->gallery);
+ $gal = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($this->_image->gallery);
$styleDef = $gal->getStyle();
} else {
$styleDef = $this->_style;
* (which will have a negative gallery_id). */
if ($this->_image->gallery > 0) {
if (is_null($this->_style)) {
- $gal = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($this->_image->gallery);
+ $gal = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($this->_image->gallery);
$styleDef = $gal->getStyle();
} else {
$styleDef = $this->_style;
* (which will have a negative gallery_id). */
if ($this->_image->gallery > 0) {
if (is_null($this->_style)) {
- $gal = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($this->_image->gallery);
+ $gal = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($this->_image->gallery);
$styleDef = $gal->getStyle();
} else {
$styleDef = $this->_style;
+++ /dev/null
-<?php
-/**
- * Binder for Ansel_Faces
- *
- * @author Michael J. Rubinsky <mrubinsk@horde.org>
- * @category Horde
- * @license http://www.fsf.org/copyleft/gpl.html GPL
- * @package Ansel
- */
-class Ansel_Injector_Binder_Faces Implements Horde_Injector_Binder
-{
- public function create (Horde_Injector $injector)
- {
- $driver = $GLOBALS['conf']['faces']['driver'];
- $params = $GLOBALS['conf']['faces'];
- $class_name = 'Ansel_Faces_' . ucfirst($driver);
-
- return new $class_name($params);
- }
-
- /**
- */
- public function equals(Horde_Injector_Binder $binder)
- {
- return false;
- }
-}
\ No newline at end of file
+++ /dev/null
-<?php
-/**
- * Binder for Ansel_Storage
- *
- * @author Michael J. Rubinsky <mrubinsk@horde.org>
- * @category Horde
- * @license http://www.fsf.org/copyleft/gpl.html GPL
- * @package Ansel
- */
-class Ansel_Injector_Binder_Storage Implements Horde_Injector_Binder
-{
- public function create(Horde_Injector $injector)
- {
- return new Ansel_Injector_Factory_Storage($injector);
- }
-
- /**
- */
- public function equals(Horde_Injector_Binder $binder)
- {
- return false;
- }
-}
\ No newline at end of file
+++ /dev/null
-<?php
-/**
- * Binder for getting list of all available pre-defined styles.
- *
- * @author Michael J. Rubinsky <mrubinsk@horde.org>
- * @category Horde
- * @license http://www.fsf.org/copyleft/gpl.html GPL
- * @package Ansel
- */
-class Ansel_Injector_Binder_Styles Implements Horde_Injector_Binder
-{
- public function create (Horde_Injector $injector)
- {
- /* Brings in the $styles array in this scope only */
- $styles = Horde::loadConfiguration('styles.php', 'styles', 'ansel');
-
- /* No prettythumbs allowed at all by admin choice */
- if (empty($GLOBALS['conf']['image']['prettythumbs'])) {
- $test = $styles;
- foreach ($test as $key => $style) {
- if ($style['thumbstyle'] != 'Thumb') {
- unset($styles[$key]);
- }
- }
- }
-
- /* Check if the browser / server has png support */
- if ($GLOBALS['browser']->hasQuirk('png_transparency') ||
- $GLOBALS['conf']['image']['type'] != 'png') {
-
- $test = $styles;
- foreach ($test as $key => $style) {
- if (!empty($style['requires_png'])) {
- if (!empty($style['fallback'])) {
- $styles[$key] = $styles[$style['fallback']];
- } else {
- unset($styles[$key]);
- }
- }
- }
- }
-
- return $styles;
- }
-
- /**
- */
- public function equals(Horde_Injector_Binder $binder)
- {
- return false;
- }
-}
\ No newline at end of file
--- /dev/null
+<?php
+/**
+ * Factory for Ansel_Faces
+ *
+ * @author Michael J. Rubinsky <mrubinsk@horde.org>
+ * @category Horde
+ * @license http://www.fsf.org/copyleft/gpl.html GPL
+ * @package Ansel
+ */
+class Ansel_Injector_Factory_Faces
+{
+ public function create (Horde_Injector $injector)
+ {
+ $driver = $GLOBALS['conf']['faces']['driver'];
+ $params = $GLOBALS['conf']['faces'];
+ $class_name = 'Ansel_Faces_' . ucfirst($driver);
+
+ return new $class_name($params);
+ }
+
+}
\ No newline at end of file
*
* @return Ansel_Storage
*/
- public function getScope()
+ public function create()
{
$scope = $this->_injector->getInstance('Ansel_Config')->get('scope');
if (empty($this->_instances[$scope])) {
--- /dev/null
+<?php
+/**
+ * Factory for getting list of all available pre-defined styles.
+ *
+ * @author Michael J. Rubinsky <mrubinsk@horde.org>
+ * @category Horde
+ * @license http://www.fsf.org/copyleft/gpl.html GPL
+ * @package Ansel
+ */
+class Ansel_Injector_Factory_Styles
+{
+ public function create (Horde_Injector $injector)
+ {
+ /* Brings in the $styles array in this scope only */
+ $styles = Horde::loadConfiguration('styles.php', 'styles', 'ansel');
+
+ /* No prettythumbs allowed at all by admin choice */
+ if (empty($GLOBALS['conf']['image']['prettythumbs'])) {
+ $test = $styles;
+ foreach ($test as $key => $style) {
+ if ($style['thumbstyle'] != 'Thumb') {
+ unset($styles[$key]);
+ }
+ }
+ }
+
+ /* Check if the browser / server has png support */
+ if ($GLOBALS['browser']->hasQuirk('png_transparency') ||
+ $GLOBALS['conf']['image']['type'] != 'png') {
+
+ $test = $styles;
+ foreach ($test as $key => $style) {
+ if (!empty($style['requires_png'])) {
+ if (!empty($style['fallback'])) {
+ $styles[$key] = $styles[$style['fallback']];
+ } else {
+ unset($styles[$key]);
+ }
+ }
+ }
+ }
+
+ return $styles;
+ }
+
+}
\ No newline at end of file
/* Instantiate the Gallery objects */
$galleries = array();
foreach ($gresults as $gallery) {
- $galleries[] = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($gallery);
+ $galleries[] = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($gallery);
}
/* Do we need to get images? */
$count = $perpage - count($galleries);
if ($count > 0) {
$iresults = array_slice($this->_results['images'], $istart, $count);
- $images = count($iresults) ? array_values($GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImages(array('ids' => $iresults))) : array();
+ $images = count($iresults) ? array_values($GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImages(array('ids' => $iresults))) : array();
if (($conf['comments']['allow'] == 'all' || ($conf['comments']['allow'] == 'authenticated' && $GLOBALS['registry']->getAuth())) &&
$registry->hasMethod('forums/numMessagesBatch')) {
$image = $this->getImage($id);
$gallery_id = abs($image->gallery);
if (empty($galleries[$gallery_id])) {
- $galleries[$gallery_id]['gallery'] = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($gallery_id);
+ $galleries[$gallery_id]['gallery'] = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($gallery_id);
}
// Any authentication that needs to take place for any of the
{
$args = array('typeId' => 'image', 'limit' => 1);
if ($ownerOnly) {
- $gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($image->gallery);
+ $gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($image->gallery);
$args['userId'] = $gallery->get('owner');
}
}
try {
- $images = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImages(array('ids' => array_keys($ids)));
+ $images = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImages(array('ids' => array_keys($ids)));
} catch (Horde_Exception_NotFound $e) {
$images = array();
}
{
global $conf, $registry;
- $parent = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($image->gallery);
+ $parent = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($image->gallery);
if (is_null($style)) {
$style = $parent->getStyle();
}
// If we have a slug, use it.
try {
if (!empty($slug)) {
- $gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGalleryBySlug($slug);
+ $gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGalleryBySlug($slug);
} else {
- $gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($galleryId);
+ $gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($galleryId);
}
} catch (Ansel_Exception $e) {
throw new Horde_Exception_NotFound($e->getmessage());
$images[] = $gallery->getKeyImage($gallery_style);
}
}
- $json = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImageJson($images, null, true, $thumbsize, true);
+ $json = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImageJson($images, null, true, $thumbsize, true);
/* Some paths */
$cssurl = Horde::url($GLOBALS['registry']->get('themesuri', 'ansel') . '/jsembed.css', true);
'count' => $count,
'view_links' => true));
} else {
- $json = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImageJson($images, null, true, $thumbsize, true);
- $json_full = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImageJson($images, null, true, 'screen', true);
+ $json = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImageJson($images, null, true, $thumbsize, true);
+ $json_full = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImageJson($images, null, true, 'screen', true);
}
/* Some paths */
// permissions to add to it.
$parentId = $this->_params['gallery'];
try {
- $parent = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($parentId);
+ $parent = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($parentId);
} catch (Ansel_Exception $e) {
$GLOBALS['notification']->push($e->getMessage(), 'horde.error');
Horde::url('view.php?view=List', true)->redirect();
}
try {
- $gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($this->_params['gallery']);
+ $gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($this->_params['gallery']);
$parent = $gallery->getParent();
$this->_properties = array(
'name' => $gallery->get('name'),
$gallery_parent = null;
}
if ($galleryId &&
- ($exists = ($GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->galleryExists($galleryId)) === true)) {
+ ($exists = ($GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->galleryExists($galleryId)) === true)) {
// Modifying an existing gallery.
- $gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($galleryId);
+ $gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($galleryId);
if (!$gallery->hasPermission($GLOBALS['registry']->getAuth(), Horde_Perms::EDIT)) {
$GLOBALS['notification']->push(sprintf(_("Access denied saving gallery \"%s\"."), $gallery->get('name')), 'horde.error');
} else {
}
if ($gallery_parent != $old_parent_id) {
if (!is_null($gallery_parent)) {
- $new_parent = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($gallery_parent);
+ $new_parent = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($gallery_parent);
} else {
$new_parent = null;
}
// Is this a new subgallery?
if ($gallery_parent) {
try {
- $parent = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($gallery_parent);
+ $parent = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($gallery_parent);
} catch (Ansel_Exception $e) {
$GLOBALS['notification']->push($e->getMessage(), 'horde.error');
Horde::url(Ansel::getUrlFor('view', array('view' => 'List'), true))->redirect();
$parent = (!empty($gallery_parent)) ? $gallery_parent : null;
try {
- $gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->createGallery(
+ $gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->createGallery(
array('name' => $gallery_name,
'desc' => $gallery_desc,
'tags' => explode(',', $gallery_tags),
// Make sure that the style hash is recorded, ignoring non-styled thumbs
if ($style->thumbstyle != 'Thumb') {
- $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->ensureHash($gallery->getViewHash('prettythumb'));
+ $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->ensureHash($gallery->getViewHash('prettythumb'));
}
// Clear the OtherGalleries widget cache
if (empty($this->view->api)) {
$option_edit = $this->view->gallery->hasPermission($GLOBALS['registry']->getAuth(), Horde_Perms::EDIT);
$option_select = $option_delete = $this->view->gallery->hasPermission($GLOBALS['registry']->getAuth(), Horde_Perms::DELETE);
- $option_move = ($option_delete && $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->countGalleries(Horde_Perms::EDIT));
- $option_copy = ($option_edit && $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->countGalleries(Horde_Perms::EDIT));
+ $option_move = ($option_delete && $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->countGalleries(Horde_Perms::EDIT));
+ $option_copy = ($option_edit && $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->countGalleries(Horde_Perms::EDIT));
/* See if we requested a show_actions change */
if (Horde_Util::getFormData('actionID', '') == 'show_actions') {
Horde_Perms::EDIT);
$option_select = $option_delete = $this->view->gallery->hasPermission(
$GLOBALS['registry']->getAuth(), Horde_Perms::DELETE);
- $option_move = ($option_delete && $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->countGalleries(Horde_Perms::EDIT));
- $option_copy = ($option_edit && $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->countGalleries(Horde_Perms::EDIT));
+ $option_move = ($option_delete && $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->countGalleries(Horde_Perms::EDIT));
+ $option_copy = ($option_edit && $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->countGalleries(Horde_Perms::EDIT));
/* See if we requested a show_actions change (fallback for non-js) */
if (Horde_Util::getFormData('actionID', '') == 'show_actions') {
$prefs->setValue('show_actions', (int)!$prefs->getValue('show_actions'));
parent::__construct($params);
/* Get the Ansel_Image */
- $image = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImage($params['image_id']);
+ $image = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImage($params['image_id']);
/* Get the Ansel_Gallery */
$this->gallery = $this->_getGallery();
$notification = $GLOBALS['injector']->getInstance('Horde_Notification');
/* Ansel_Storage */
- $ansel_storage = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope();
+ $ansel_storage = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create();
// We'll need this in the template.
$this->_sortBy = !empty($this->_params['sort']) ? $this->_params['sort'] : 'name';
global $prefs, $conf;
$notification = $GLOBALS['injector']->getInstance('Horde_Notification');
- $ansel_storage = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope();
+ $ansel_storage = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create();
$this->_owner = Horde_Util::getFormData('owner', '');
//@TODO: Inject the search object when we have more then just a tag search
global $conf, $prefs;
/* Ansel Storage*/
- $ansel_storage = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope();
+ $ansel_storage = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create();
// Get the slice of galleries/images to view on this page.
$results = $this->_search->getSlice($this->_page, $this->_perPage);
$cnt = count($image_ids);
for ($i = 0; $i < $conf['image']['autogen'] && $cnt > $i; $i++) {
$image_id = $image_ids[$i];
- $image = &$GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImage($image_id);
+ $image = &$GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImage($image_id);
$image->createView('screen');
$image->createView('thumb');
$image->createView('mini');
*/
public function html()
{
- $ansel_storage = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope();
+ $ansel_storage = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create();
$geodata = $ansel_storage->getImagesGeodata($this->_params['images']);
$url = Horde::url('map_edit.php', true);
$rtext = _("Relocate this image");
*/
protected function _getGalleryImagesWithGeodata()
{
- return $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImagesGeodata(array(), $this->_view->gallery->id);
+ return $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImagesGeodata(array(), $this->_view->gallery->id);
}
/**
$tree = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Tree')->create('otherAnselGalleries_' . md5($owner), 'Javascript', array('class' => 'anselWidgets'));
try {
- $galleries = $GLOBALS['injector']->getInstance('Ansel_Storage')
- ->getScope()
+ $galleries = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')
+ ->create()
->listGalleries(array('filter' => $owner));
} catch (Ansel_Exception $e) {
Horde::logMessage($e, 'ERR');
*/
public function _getRelatedImages()
{
- $ansel_storage = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope();
+ $ansel_storage = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create();
$html = '';
$args = array('typeId' => 'image',
$i = 0;
foreach ($results as $result) {
$img = $result['image'];
- $rGal = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($img->gallery);
+ $rGal = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($img->gallery);
if ($rGal->hasPermission($GLOBALS['registry']->getAuth(), Horde_Perms::READ))
$html .= Ansel::getUrlFor(
'view',
if (empty($image_id)) {
throw new Ansel_Exception(_("An error has occured retrieving the image. Details have been logged."));
}
-$image = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImage($image_id);
-$gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($image->gallery);
+$image = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImage($image_id);
+$gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($image->gallery);
if (!$gallery->hasPermission($GLOBALS['registry']->getAuth(), Horde_Perms::EDIT)) {
throw new Horde_Exception_PermissionDenied(_("Not Authorized. Details have been logged for the server administrator."));
}
$loadingImg = Horde::img('loading.gif', _("Loading..."));
/* Obtain other geotagged images to possibly locate this image at */
-$imgs = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getRecentImagesGeodata($GLOBALS['registry']->getAuth());
+$imgs = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getRecentImagesGeodata($GLOBALS['registry']->getAuth());
if (count($imgs) > 0) {
$other_images = '<div class="ansel_location_sameas">' . _("Click on a thumbnail to locate at the same point.") . '<br />';
foreach ($imgs as $id => $data) {
switch ($actionID) {
case 'edit':
try {
- $share = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery(Horde_Util::getFormData('cid'));
+ $share = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery(Horde_Util::getFormData('cid'));
$form = 'edit.inc';
$perm = &$share->getPermission();
} catch (Horde_Share_Exception $e) {
if (($share_name = Horde_Util::getFormData('share')) !== null) {
try {
- $share = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->shares->getShare($share_name);
+ $share = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->shares->getShare($share_name);
$form = 'edit.inc';
$perm = $share->getPermission();
} catch (Horde_Share_Exception $e) {
case 'editform':
case 'editforminherit':
try {
- $share = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery(Horde_Util::getFormData('cid'));
+ $share = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery(Horde_Util::getFormData('cid'));
} catch (Horde_Share_Exception $e) {
$notification->push(_("Attempt to edit a non-existent share."), 'horde.error');
}
$title = _("Edit Permissions");
} else {
$children = $GLOBALS['injector']
- ->getInstance('Ansel_Storage')
- ->getScope()
+ ->getInstance('Ansel_Injector_Factory_Storage')
+ ->create()
->listGalleries(array('perm' => Horde_Perms::READ,
'parent' => $share));
$title = sprintf(_("Edit Permissions for %s"), $share->get('name'));
$imageId = Horde_Util::getFormData('image');
try {
- $image = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImage($imageId);
- $gal = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery(abs($image->gallery));
+ $image = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImage($imageId);
+ $gal = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery(abs($image->gallery));
$img = Ansel::getImageUrl($imageId, 'thumb', false);
} catch (Ansel_Exception $e) {
Horde::logMessage($e->getMessage(), 'ERR');
$vars = Horde_Variables::getDefaultVariables();
try {
- $gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($vars->get('gallery'));
+ $gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($vars->get('gallery'));
} catch (Ansel_Exception $e) {
$notification->push($e->getMessage());
Horde::url('list.php')->redirect();
$title = _("Do you really want to report this gallery?");
$gallery_id = (int)Horde_Util::getFormData('gallery');
try {
- $gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($gallery_id);
+ $gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($gallery_id);
} catch (Ansel_Exception $e) {
$notification->push($gallery->getMessage());
Horde::url('view.php?view=List', true)->redirect();
switch ($stream_type) {
case 'all':
try {
- $images = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getRecentImages();
+ $images = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getRecentImages();
} catch (Ansel_Exception $e) {
$images = array();
}
// Retrieve latest from specified gallery
// Try a slug first.
if ($slug) {
- $gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGalleryBySlug($slug);
+ $gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGalleryBySlug($slug);
} elseif (is_numeric($id)) {
- $gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($id);
+ $gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($id);
}
if ($gallery->hasPermission($GLOBALS['registry']->getAuth(), Horde_Perms::SHOW) &&
!$gallery->hasPasswd() && $gallery->isOldEnough()) {
if (!$gallery->countImages() && $gallery->hasSubGalleries()) {
$subgalleries = $GLOBALS['injector']
- ->getInstance('Ansel_Storage')
- ->getScope()
+ ->getInstance('Ansel_Injector_Factory_Storage')
+ ->create()
->listGalleries(array('parent' => $gallery));
$subs = array();
foreach ($subgalleries as $subgallery) {
$subs[] = $subgallery->id;
}
- $images = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getRecentImages($subs);
+ $images = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getRecentImages($subs);
} else {
$images = $gallery->getRecentImages();
$owner = $gallery->getIdentity();
array('view' => 'Gallery',
'gallery' => $id),
true);
- $img = &$GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImage($gallery->getKeyImage(Ansel::getStyleDefinition('ansel_default')));
+ $img = &$GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImage($gallery->getKeyImage(Ansel::getStyleDefinition('ansel_default')));
$params = array('last_modified' => $gallery->get('last_modified'),
'name' => sprintf(_("%s on %s"),
$gallery->get('name'),
$galleries = array();
try {
$shares = $GLOBALS['injector']
- ->getInstance('Ansel_Storage')
- ->getScope()
+ ->getInstance('Ansel_Injector_Factory_Storage')
+ ->create()
->listGalleries(array('filter' => $id));
foreach ($shares as $gallery) {
if ($gallery->isOldEnough() && !$gallery->hasPasswd()) {
if (isset($galleries) && count($galleries)) {
try {
$images = $GLOBALS['injector']
- ->getInstance('Ansel_Storage')
- ->getScope()
+ ->getInstance('Ansel_Injector_Factory_Storage')
+ ->create()
->getRecentImages($galleries);
} catch (Ansel_Exception $e) {
Horde::logMessage($e->getMessage(), 'ERR');
$images = $GLOBALS['injector']->getInstance('Ansel_Tagger')->search(array($id), $filter);
try {
- $images = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImages(array('ids' => $images['images']));
+ $images = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImages(array('ids' => $images['images']));
} catch (Ansel_Exception $e) {
Horde::logMessage($e->getMessage(), 'ERR');
$images = array();
$gallery_id = $images[$i]->gallery;
if (empty($galleries[$gallery_id])) {
try {
- $galleries[$gallery_id]['gallery'] = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($gallery_id);
+ $galleries[$gallery_id]['gallery'] = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($gallery_id);
} catch (Ansel_Exception $e) {}
}
if (!isset($galleries[$gallery_id]['perm'])) {
$image_ids = $results->fetchAll(MDB2_FETCHMODE_ASSOC);
$results->free();
foreach (array_values($image_ids) as $image_id) {
- $image = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImage($image_id['image_id']);
+ $image = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImage($image_id['image_id']);
$results = $image->exifToTags($exif_fields);
$cli->message(sprintf(_("Extracted exif fields from %s"), $image->filename), 'cli.success');
}
// Choose the gallery to add to (or use the created one).
if (!empty($galleryId)) {
- if (!$GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->galleryExists($galleryId)) {
+ if (!$GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->galleryExists($galleryId)) {
$error = sprintf(_("Invalid gallery \"%s\" specified."), $galleryId);
Horde::logMessage($error, 'WARN');
$cli->fatal($error);
} else {
- $gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($galleryId);
+ $gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($galleryId);
if (!$gallery->hasPermission($GLOBALS['registry']->getAuth(), Horde_Perms::EDIT)) {
$error = sprintf(_("Access denied adding photos to \"%s\"."), $galleryId);
Horde::logMessage($error, 'WARN');
'desc' => $gallery_desc,
'owner' => $gallery_owner);
try {
- $gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->createGallery($attributes, null, $parent);
+ $gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->createGallery($attributes, null, $parent);
} catch (Ansel_Exception $e) {
$galleryId = null;
$error = sprintf(_("The gallery \"%s\" couldn't be created: %s"),
$images = array_keys($images);
foreach ($images as $id) {
- $image = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getImage($id);
+ $image = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getImage($id);
$cli->writeln(str_pad($image->filename, 30) . $image->getVFSPath() . '/' . $id);
}
} else {
- $galleries = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->listGalleries();
+ $galleries = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->listGalleries();
$cli->message(_("Listing Gallery/Name"), 'cli.success');
$cli->writeln();
foreach ($galleries as $id => $gallery) {
$gallery_id = processDirectory($dir);
if (!$keepEmpties) {
- $gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($gallery_id);
+ $gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($gallery_id);
emptyGalleryCheck($gallery);
}
exit;
{
if ($gallery->hasSubGalleries()) {
$children = $GLOBALS['injector']
- ->getInstance('Ansel_Storage')
- ->getScope()
+ ->getInstance('Ansel_Injector_Factory_Storage')
+ ->create()
->listGalleries(array('parent' => $gallery));
foreach ($children as $child) {
// First check all children to see if they are empty...
emptyGalleryCheck($child);
if (!$child->countImages() && !$child->hasSubGalleries()) {
- $result = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->removeGallery($child);
+ $result = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->removeGallery($child);
$GLOBALS['cli']->message(sprintf(_("Deleting empty gallery, \"%s\""), $child->get('name')), 'cli.success');
}
// Refresh the gallery values since we mucked around a bit with it
- $gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($gallery->getId());
+ $gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($gallery->getId());
// Now that any empty children are removed, see if we are empty
if (!$gallery->countImages() && !$gallery->hasSubGalleries()) {
- $result = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->removeGallery($gallery);
+ $result = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->removeGallery($gallery);
$GLOBALS['cli']->message(sprintf(_("Deleting empty gallery, \"%s\""), $gallery->get('name')), 'cli.success');
}
}
// Create a gallery for this directory level.
$name = basename($dir);
$cli->message(sprintf(_("Creating gallery: \"%s\""), $name), 'cli.message');
- $gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->createGallery(array('name' => $name), null, $parent);
+ $gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->createGallery(array('name' => $name), null, $parent);
$cli->message(sprintf(_("The gallery \"%s\" was created successfully."), $name), 'cli.success');
// Read all the files into an array.
{
if ($gallery->hasSubGalleries()) {
$children = $GLOBALS['injector']
- ->getInstance('Ansel_Storage')
- ->getScope()
+ ->getInstance('Ansel_Injector_Factory_Storage')
+ ->create()
->listGalleries(array('parent' => $gallery));
foreach ($children as $child) {
// First check all children to see if they are empty...
emptyGalleryCheck($child);
if (!$child->countImages() && !$child->hasSubGalleries()) {
- $result = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->removeGallery($child);
+ $result = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->removeGallery($child);
$GLOBALS['cli']->message(sprintf(_("Deleting empty gallery, \"%s\""), $child->get('name')), 'cli.success');
}
// Refresh the gallery values since we mucked around a bit with it
- $gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($gallery->getId());
+ $gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($gallery->getId());
// Now that any empty children are removed, see if we are empty
if (!$gallery->countImages() && !$gallery->hasSubGalleries()) {
- $result = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->removeGallery($gallery);
+ $result = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->removeGallery($gallery);
$GLOBALS['cli']->message(sprintf(_("Deleting empty gallery, \"%s\""), $gallery->get('name')), 'cli.success');
}
}
<h1 class="header">
- <?php $gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($galleryId);
+ <?php $gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($galleryId);
printf($actionID == 'delete' ? _("Really delete %s and all of its subgalleries?") : _("Really empty %s?"), htmlspecialchars($gallery->get('name')))
?>
</h1>
'owner' => $group,
'view' => 'List'))->link();
-$num_galleries = $GLOBALS['injector']->getInstance('Ansel_Storage')
- ->getScope()
+$num_galleries = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')
+ ->create()
->countGalleries($GLOBALS['registry']->getAuth(), Horde_Perms::SHOW, $group, null, false);
if ($num_galleries < 5) {
$mini_galleries = $GLOBALS['injector']->
- getInstance('Ansel_Storage')->
- getScope()->listGalleries(array('filter' => $group, 'allLevels' => false));
+ getInstance('Ansel_Injector_Factory_Storage')->
+ create()->listGalleries(array('filter' => $group, 'allLevels' => false));
} else {
$mini_galleries = $GLOBALS['injector']
- ->getInstance('Ansel_Storage')
- ->getScope()
+ ->getInstance('Ansel_Injector_Factory_Storage')
+ ->create()
->listGalleries(array('filter' => $group,
'from' => rand(0, $num_galleries - 4),
'count' => 4));
// Check if a gallery was selected from the list.
if ($cmd == 'select') {
- if (!$galleryId || !$GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->galleryExists($galleryId)) {
+ if (!$galleryId || !$GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->galleryExists($galleryId)) {
$error = _("Invalid gallery specified.") . "<br />\n";
} else {
try {
- $gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($galleryId);
+ $gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($galleryId);
$error = false;
} catch (Ansel_Exception $e) {
$error = _("There was an error accessing the gallery");
if ($create) {
/* Creating a new gallery. */
try {
- $gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->createGallery(
+ $gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->createGallery(
array('name' => $gallery_name, 'desc' => $gallery_desc));
$galleryId = $gallery->id;
$msg = sprintf(_("The gallery \"%s\" was created successfully."), $gallery_name);
$galleryId = Horde_Util::getFormData('gallery');
$name = isset($_FILES['imagefile']['name']) ? Horde_Util::dispelMagicQuotes($_FILES['imagefile']['name']) : null;
$file = isset($_FILES['imagefile']['tmp_name']) ? $_FILES['imagefile']['tmp_name'] : null;
- if (!$galleryId || !$GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->galleryExists($galleryId)) {
+ if (!$galleryId || !$GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->galleryExists($galleryId)) {
$error = _("Invalid gallery specified.") . "<br />\n";
} else {
try {
- $gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($galleryId);
+ $gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($galleryId);
if (!$gallery->hasPermission($GLOBALS['registry']->getAuth(), Horde_Perms::EDIT)) {
$error = sprintf(_("Access denied adding photos to \"%s\"."), $gallery->get('name'));
} else {
$error = $e->getMessage();
}
- $gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getScope()->getGallery($galleryId);
+ $gallery = $GLOBALS['injector']->getInstance('Ansel_Injector_Factory_Storage')->create()->getGallery($galleryId);
try {
$image_id = $gallery->addImage($image);
$error = false;
projects / horde.git / commitdiff