Imported Debian patch 3.0.4-1
This commit is contained in:
commit
2ef5947890
2
README
2
README
@ -1,4 +1,4 @@
|
||||
Gallery 3.0.2
|
||||
Gallery 3.0.4 ("Ricochet")
|
||||
|
||||
ABOUT:
|
||||
Gallery 3 is a web based software product that lets you manage your
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
@ -37,10 +37,13 @@
|
||||
* So dirname doesn't work. So we do a tricky workaround where we look up the SCRIPT_FILENAME (in
|
||||
* this case it'd be "index.php" and we delete from that part onwards. If you work at 1and1 and
|
||||
* you're reading this, please fix this bug!
|
||||
*
|
||||
* Rawurlencode each of the elements to avoid breaking the page layout.
|
||||
*/
|
||||
$config["site_domain"] =
|
||||
implode("/", array_map("rawurlencode", explode("/",
|
||||
substr($_SERVER["SCRIPT_NAME"], 0,
|
||||
strpos($_SERVER["SCRIPT_NAME"], basename($_SERVER["SCRIPT_FILENAME"])));
|
||||
strpos($_SERVER["SCRIPT_NAME"], basename($_SERVER["SCRIPT_FILENAME"]))))));
|
||||
|
||||
/**
|
||||
* Force a default protocol to be used by the site. If no site_protocol is
|
||||
|
6
debian/changelog
vendored
6
debian/changelog
vendored
@ -1,3 +1,9 @@
|
||||
gallery3 (3.0.4-1) unstable; urgency=low
|
||||
|
||||
* New upstream release
|
||||
|
||||
-- Michael C. Schultheiss <schultmc@debian.org> Mon, 02 Jul 2012 00:57:05 +0000
|
||||
|
||||
gallery3 (3.0.2-1) unstable; urgency=low
|
||||
|
||||
* New upstream release
|
||||
|
13
index.php
13
index.php
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
@ -24,6 +24,17 @@ define("IN_PRODUCTION", true);
|
||||
version_compare(PHP_VERSION, "5.2.3", "<") and
|
||||
exit("Gallery requires PHP 5.2.3 or newer (you're using " . PHP_VERSION . ")");
|
||||
|
||||
// Gallery is not supported on Windows.
|
||||
if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
|
||||
exit("Gallery is not supported on Windows (PHP reports that you're using: " . PHP_OS . ")");
|
||||
}
|
||||
|
||||
// PHP 5.4 requires a timezone - if one isn't set date functions aren't going to work properly.
|
||||
// We'll log this once the logging system is initialized (in the gallery_event::gallery_ready).
|
||||
if (!ini_get("date.timezone")) {
|
||||
ini_set("date.timezone", "UTC");
|
||||
}
|
||||
|
||||
// Gallery requires short_tags to be on
|
||||
!ini_get("short_open_tag") and exit("Gallery requires short_open_tag to be on.");
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -31,7 +31,7 @@ $config['default'] = array(
|
||||
'connection' => array(
|
||||
'type' => '<?php print $type ?>',
|
||||
'user' => '<?php print $user ?>',
|
||||
'pass' => '<?php print str_replace("'", "\\'", $password) ?>',
|
||||
'pass' => '<?php print $password ?>',
|
||||
'host' => '<?php print $host ?>',
|
||||
'port' => <?php if (!empty($port)): ?>'<?php print $port ?>' <?php else: ?>false<?php endif ?>,
|
||||
'socket' => false,
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -246,7 +246,7 @@ CREATE TABLE {modules} (
|
||||
/*!40101 SET character_set_client = @saved_cs_client */;
|
||||
INSERT INTO {modules} VALUES (1,1,'gallery',49,1);
|
||||
INSERT INTO {modules} VALUES (2,1,'user',4,2);
|
||||
INSERT INTO {modules} VALUES (3,1,'comment',4,3);
|
||||
INSERT INTO {modules} VALUES (3,1,'comment',6,3);
|
||||
INSERT INTO {modules} VALUES (4,1,'organize',4,4);
|
||||
INSERT INTO {modules} VALUES (5,1,'info',2,5);
|
||||
INSERT INTO {modules} VALUES (6,1,'rss',1,6);
|
||||
@ -382,7 +382,7 @@ CREATE TABLE {vars} (
|
||||
`value` text,
|
||||
PRIMARY KEY (`id`),
|
||||
UNIQUE KEY `module_name` (`module_name`,`name`)
|
||||
) AUTO_INCREMENT=43 DEFAULT CHARSET=utf8;
|
||||
) AUTO_INCREMENT=44 DEFAULT CHARSET=utf8;
|
||||
/*!40101 SET character_set_client = @saved_cs_client */;
|
||||
INSERT INTO {vars} VALUES (NULL,'gallery','active_site_theme','wind');
|
||||
INSERT INTO {vars} VALUES (NULL,'gallery','active_admin_theme','admin_wind');
|
||||
@ -419,6 +419,7 @@ INSERT INTO {vars} VALUES (NULL,'gallery','identity_provider','user');
|
||||
INSERT INTO {vars} VALUES (NULL,'user','minimum_password_length','5');
|
||||
INSERT INTO {vars} VALUES (NULL,'comment','spam_caught','0');
|
||||
INSERT INTO {vars} VALUES (NULL,'comment','access_permissions','everybody');
|
||||
INSERT INTO {vars} VALUES (NULL,'comment','rss_visible','both');
|
||||
INSERT INTO {vars} VALUES (NULL,'info','show_title','1');
|
||||
INSERT INTO {vars} VALUES (NULL,'info','show_description','1');
|
||||
INSERT INTO {vars} VALUES (NULL,'info','show_owner','1');
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
@ -183,7 +183,7 @@ class installer {
|
||||
}
|
||||
|
||||
static function prepend_prefix($prefix, $sql) {
|
||||
return preg_replace("#{([a-zA-Z0-9_]+)}#", "{$prefix}$1", $sql);
|
||||
return preg_replace("#{([a-zA-Z0-9_]+)}#", "`{$prefix}$1`", $sql);
|
||||
}
|
||||
|
||||
static function check_environment() {
|
||||
|
@ -23,7 +23,7 @@
|
||||
<?php else: ?>
|
||||
<p>
|
||||
We've found a place to store your photos:
|
||||
<code class="location"> <?= VARPATH ?> </code>
|
||||
<code class="location"> <?= htmlspecialchars(VARPATH, ENT_QUOTES, 'UTF-8', true) ?> </code>
|
||||
</p>
|
||||
<?php endif ?>
|
||||
</fieldset>
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
@ -39,6 +39,13 @@ if (installer::already_installed()) {
|
||||
"prefix" => $_POST["prefix"],
|
||||
"type" => function_exists("mysqli_set_charset") ? "mysqli" : "mysql");
|
||||
list ($config["host"], $config["port"]) = explode(":", $config["host"] . ":");
|
||||
foreach ($config as $k => $v) {
|
||||
if ($k == "password") {
|
||||
$config[$k] = str_replace("'", "\\'", $v);
|
||||
} else {
|
||||
$config[$k] = strtr($v, "'`", "__");
|
||||
}
|
||||
}
|
||||
|
||||
if (!installer::connect($config)) {
|
||||
$content = render("invalid_db_info.html.php");
|
||||
|
@ -33,6 +33,7 @@
|
||||
var elh = $(el).height();
|
||||
var ph = $(this).height();
|
||||
var nh = (ph - elh) / 2;
|
||||
if (nh < 1) { var nh = 0; }
|
||||
$(el).css('margin-top', nh);
|
||||
});
|
||||
};
|
||||
@ -221,4 +222,32 @@
|
||||
});
|
||||
};
|
||||
|
||||
// Augment jQuery autocomplete to expect the first response line to
|
||||
// be a <meta> tag that protects against UTF-7 attacks.
|
||||
$.fn.gallery_autocomplete = function(url, options) {
|
||||
// Drop the first response - it should be a meta tag
|
||||
options.parse = function(data) {
|
||||
var parsed = [];
|
||||
var rows = data.split("\n");
|
||||
if (rows[0].indexOf("<meta") == -1) {
|
||||
throw 'Missing <meta> tag in first line of autocomplete response';
|
||||
}
|
||||
rows.shift(); // drop <META> tag
|
||||
for (var i=0; i < rows.length; i++) {
|
||||
var row = $.trim(rows[i]);
|
||||
if (row) {
|
||||
row = row.split("|");
|
||||
parsed[parsed.length] = {
|
||||
data: row,
|
||||
value: row[0],
|
||||
result: row[0]
|
||||
};
|
||||
}
|
||||
}
|
||||
return parsed;
|
||||
};
|
||||
|
||||
$(this).autocomplete(url, options);
|
||||
};
|
||||
|
||||
})(jQuery);
|
||||
|
@ -71,6 +71,12 @@
|
||||
$("#g-dialog").dialog("option", "self", self);
|
||||
},
|
||||
|
||||
error: function(xhr, textStatus, errorThrown) {
|
||||
$("#g-dialog").html(xhr.responseText);
|
||||
self._set_title();
|
||||
self._layout();
|
||||
},
|
||||
|
||||
_layout: function() {
|
||||
var dialogWidth;
|
||||
var dialogHeight = $("#g-dialog").height();
|
||||
@ -178,6 +184,11 @@
|
||||
window.location.reload();
|
||||
}
|
||||
}
|
||||
},
|
||||
error: function(xhr, textStatus, errorThrown) {
|
||||
$("#g-dialog").html(xhr.responseText);
|
||||
self._set_title();
|
||||
self._layout();
|
||||
}
|
||||
});
|
||||
},
|
||||
|
51
lib/uploadify/jquery.uploadify.min.js
vendored
51
lib/uploadify/jquery.uploadify.min.js
vendored
File diff suppressed because one or more lines are too long
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
@ -32,6 +32,8 @@ class Admin_Comments_Controller extends Admin_Controller {
|
||||
$form->validate();
|
||||
module::set_var("comment", "access_permissions",
|
||||
$form->comment_settings->access_permissions->value);
|
||||
module::set_var("comment", "rss_visible",
|
||||
$form->comment_settings->rss_visible->value);
|
||||
message::success(t("Comment settings updated"));
|
||||
url::redirect("admin/comments");
|
||||
}
|
||||
@ -45,6 +47,12 @@ class Admin_Comments_Controller extends Admin_Controller {
|
||||
->options(array("everybody" => t("Everybody"),
|
||||
"registered_users" => t("Only registered users")))
|
||||
->selected(module::get_var("comment", "access_permissions"));
|
||||
$comment_settings->dropdown("rss_visible")
|
||||
->label(t("Which RSS feeds can users see?"))
|
||||
->options(array("all" => t("All comment feeds"),
|
||||
"newest" => t("New comments feed only"),
|
||||
"per_item" => t("Comments on photos, movies and albums only")))
|
||||
->selected(module::get_var("comment", "rss_visible"));
|
||||
$comment_settings->submit("save")->value(t("Save"));
|
||||
return $form;
|
||||
}
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
@ -48,7 +48,8 @@ class comment_installer {
|
||||
|
||||
module::set_var("comment", "spam_caught", 0);
|
||||
module::set_var("comment", "access_permissions", "everybody");
|
||||
module::set_version("comment", 4);
|
||||
module::set_var("comment", "rss_visible", "both");
|
||||
module::set_version("comment", 6);
|
||||
}
|
||||
|
||||
static function upgrade($version) {
|
||||
@ -75,6 +76,21 @@ class comment_installer {
|
||||
"ALTER TABLE {comments} CHANGE `server_remote_host` `server_remote_host` varchar(255)");
|
||||
module::set_version("comment", $version = 4);
|
||||
}
|
||||
|
||||
if ($version == 4) {
|
||||
module::set_var("comment", "rss_visible", "all");
|
||||
module::set_version("comment", $version = 5);
|
||||
}
|
||||
|
||||
// In version 5 we accidentally set the installer variable to rss_available when it should
|
||||
// have been rss_visible. Migrate it over now, if necessary.
|
||||
if ($version == 5) {
|
||||
if (!module::get_var("comment", "rss_visible")) {
|
||||
module::set_var("comment", "rss_visible", module::get_var("comment", "rss_available"));
|
||||
}
|
||||
module::clear_var("comment", "rss_available");
|
||||
module::set_version("comment", $version = 6);
|
||||
}
|
||||
}
|
||||
|
||||
static function uninstall() {
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
@ -19,9 +19,23 @@
|
||||
*/
|
||||
|
||||
class comment_rss_Core {
|
||||
static function feed_visible($feed_id) {
|
||||
$visible = module::get_var("comment", "rss_visible");
|
||||
if (!in_array($feed_id, array("newest", "per_item"))) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return ($visible == "all" || $visible == $feed_id);
|
||||
}
|
||||
|
||||
static function available_feeds($item, $tag) {
|
||||
$feeds = array();
|
||||
|
||||
if (comment_rss::feed_visible("newest")) {
|
||||
$feeds["comment/newest"] = t("All new comments");
|
||||
if ($item) {
|
||||
}
|
||||
|
||||
if ($item && comment_rss::feed_visible("per_item")) {
|
||||
$feeds["comment/item/$item->id"] =
|
||||
t("Comments on %title", array("title" => html::purify($item->title)));
|
||||
}
|
||||
@ -29,7 +43,7 @@ class comment_rss_Core {
|
||||
}
|
||||
|
||||
static function feed($feed_id, $offset, $limit, $id) {
|
||||
if ($feed_id != "newest" && $feed_id != "item") {
|
||||
if (!comment_rss::feed_visible($feed_id)) {
|
||||
return;
|
||||
}
|
||||
|
||||
@ -51,7 +65,7 @@ class comment_rss_Core {
|
||||
foreach ($comments->find_all($limit, $offset) as $comment) {
|
||||
$item = $comment->item();
|
||||
$feed->comments[] = new ArrayObject(
|
||||
array("pub_date" => date("D, d M Y H:i:s T", $comment->created),
|
||||
array("pub_date" => date("D, d M Y H:i:s O", $comment->created),
|
||||
"text" => nl2br(html::purify($comment->text)),
|
||||
"thumb_url" => $item->thumb_url(),
|
||||
"thumb_height" => $item->thumb_height,
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -1,6 +1,6 @@
|
||||
name = "Comments"
|
||||
description = "Allows users and guests to leave comments on photos and albums."
|
||||
version = 4
|
||||
version = 6
|
||||
author_name = "Gallery Team"
|
||||
author_url = "http://codex.gallery2.org/Gallery:Team"
|
||||
info_url = "http://codex.gallery2.org/Gallery3:Modules:comment"
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
@ -104,6 +104,7 @@ class Admin_g2_import_Controller extends Admin_Controller {
|
||||
$path_prefix = Input::instance()->get("q");
|
||||
foreach (glob("{$path_prefix}*") as $file) {
|
||||
if (is_dir($file) && !is_link($file)) {
|
||||
$file = html::clean($file);
|
||||
$directories[] = $file;
|
||||
|
||||
// If we find an embed.php, include it as well
|
||||
@ -113,7 +114,7 @@ class Admin_g2_import_Controller extends Admin_Controller {
|
||||
}
|
||||
}
|
||||
|
||||
print implode("\n", $directories);
|
||||
ajax::response(implode("\n", $directories));
|
||||
}
|
||||
|
||||
private function _get_import_form() {
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
@ -34,7 +34,7 @@ class G2_Controller extends Controller {
|
||||
$path = $input->get("path");
|
||||
$id = $input->get("g2_itemId");
|
||||
|
||||
if ($path || $id) {
|
||||
if (($path && $path != 'index.php' && $path != 'main.php') || $id) {
|
||||
if ($id) {
|
||||
// Requests by id are either core.DownloadItem or core.ShowItem requests. Later versions of
|
||||
// Gallery 2 don't specify g2_view if it's the default (core.ShowItem). And in some cases
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -1,4 +1,4 @@
|
||||
name = "Gallery2 Import"
|
||||
name = "Gallery 2 Import"
|
||||
description = "Import your Gallery 2 content into Gallery 3"
|
||||
version = 2
|
||||
author_name = "Gallery Team"
|
||||
|
@ -3,7 +3,7 @@
|
||||
<?= $theme->script("jquery.autocomplete.js") ?>
|
||||
<script type="text/javascript">
|
||||
$("document").ready(function() {
|
||||
$("form input[name=embed_path]").autocomplete(
|
||||
$("form input[name=embed_path]").gallery_autocomplete(
|
||||
"<?= url::site("__ARGS__") ?>".replace("__ARGS__", "admin/g2_import/autocomplete"),
|
||||
{
|
||||
max: 256,
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
@ -20,3 +20,6 @@
|
||||
include(SYSPATH . "config/user_agents.php");
|
||||
$config["robot"]["mj12bot"] = "MJ12bot";
|
||||
$config["robot"]["speedy spider"] = "Speedy Spider";
|
||||
$config["robot"]["baidu"] = "Baiduspider";
|
||||
$config["robot"]["bing"] = "Ezooms";
|
||||
$config["robot"]["yandex"] = "YandexBot";
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
@ -32,9 +32,7 @@ class Admin_Advanced_Settings_Controller extends Admin_Controller {
|
||||
public function edit($module_name, $var_name) {
|
||||
$value = module::get_var($module_name, $var_name);
|
||||
$form = new Forge("admin/advanced_settings/save/$module_name/$var_name", "", "post");
|
||||
$group = $form->group("edit_var")->label(
|
||||
t("Edit %var (%module_name)",
|
||||
array("module_name" => $module_name, "var" => $var_name)));
|
||||
$group = $form->group("edit_var")->label(t("Edit setting"));
|
||||
$group->input("module_name")->label(t("Module"))->value($module_name)->disabled(1);
|
||||
$group->input("var_name")->label(t("Setting"))->value($var_name)->disabled(1);
|
||||
$group->textarea("value")->label(t("Value"))->value($value);
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
@ -40,6 +40,8 @@ class Admin_Graphics_Controller extends Admin_Controller {
|
||||
$msg = t("Changed graphics toolkit to: %toolkit", array("toolkit" => $tk->$toolkit_id->name));
|
||||
message::success($msg);
|
||||
log::success("graphics", $msg);
|
||||
|
||||
module::event("graphics_toolkit_change", $toolkit_id);
|
||||
}
|
||||
|
||||
url::redirect("admin/graphics");
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
@ -69,12 +69,32 @@ class Albums_Controller extends Items_Controller {
|
||||
"item" => $album,
|
||||
"children" => $album->viewable()->children($page_size, $offset),
|
||||
"parents" => $album->parents()->as_array(), // view calls empty() on this
|
||||
"breadcrumbs" => Breadcrumb::array_from_item_parents($album),
|
||||
"children_count" => $children_count));
|
||||
$template->content = new View("album.html");
|
||||
|
||||
$album->increment_view_count();
|
||||
|
||||
print $template;
|
||||
item::set_display_context_callback("Albums_Controller::get_display_context");
|
||||
}
|
||||
|
||||
static function get_display_context($item) {
|
||||
$where = array(array("type", "!=", "album"));
|
||||
$position = item::get_position($item, $where);
|
||||
if ($position > 1) {
|
||||
list ($previous_item, $ignore, $next_item) =
|
||||
$item->parent()->viewable()->children(3, $position - 2, $where);
|
||||
} else {
|
||||
$previous_item = null;
|
||||
list ($next_item) = $item->parent()->viewable()->children(1, $position, $where);
|
||||
}
|
||||
|
||||
return array("position" => $position,
|
||||
"previous_item" => $previous_item,
|
||||
"next_item" => $next_item,
|
||||
"sibling_count" => $item->parent()->viewable()->children_count($where),
|
||||
"parents" => $item->parents()->as_array(),
|
||||
"breadcrumbs" => Breadcrumb::array_from_item_parents($item));
|
||||
}
|
||||
|
||||
public function create($parent_id) {
|
||||
@ -113,7 +133,7 @@ class Albums_Controller extends Items_Controller {
|
||||
|
||||
json::reply(array("result" => "success", "location" => $album->url()));
|
||||
} else {
|
||||
print $form;
|
||||
json::reply(array("result" => "error", "html" => (string)$form));
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
@ -67,6 +67,7 @@ class Combined_Controller extends Controller {
|
||||
|
||||
if ($use_gzip && $content = $cache->get("{$key}_gz")) {
|
||||
header("Content-Encoding: gzip");
|
||||
header("Vary: Accept-Encoding");
|
||||
} else {
|
||||
// Fall back to non-gzipped if we have to
|
||||
$content = $cache->get($key);
|
||||
@ -83,8 +84,9 @@ class Combined_Controller extends Controller {
|
||||
}
|
||||
header("Expires: Tue, 19 Jan 2038 00:00:00 GMT");
|
||||
header("Cache-Control: max-age=2678400");
|
||||
header('Pragma: public');
|
||||
header("Pragma: public");
|
||||
header("Last-Modified: " . gmdate("D, d M Y H:i:s T", time()));
|
||||
header("Content-Length: " . strlen($content));
|
||||
|
||||
Kohana::close_buffers(false);
|
||||
print $content;
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
@ -29,6 +29,13 @@
|
||||
class File_Proxy_Controller extends Controller {
|
||||
const ALLOW_PRIVATE_GALLERY = true;
|
||||
public function __call($function, $args) {
|
||||
|
||||
// Force zlib compression off. Image and movie files are already compressed and
|
||||
// recompressing them is CPU intensive.
|
||||
if (ini_get("zlib.output_compression")) {
|
||||
ini_set("zlib.output_compression", "Off");
|
||||
}
|
||||
|
||||
// request_uri: gallery3/var/albums/foo/bar.jpg?m=1234
|
||||
$request_uri = rawurldecode(Input::instance()->server("REQUEST_URI"));
|
||||
|
||||
@ -122,7 +129,20 @@ class File_Proxy_Controller extends Controller {
|
||||
} else {
|
||||
header("Content-Type: $item->mime_type");
|
||||
}
|
||||
Kohana::close_buffers(false);
|
||||
|
||||
// Don't use Kohana::close_buffers(false) here because that only closes all the buffers
|
||||
// that Kohana started. We want to close *all* buffers at this point because otherwise we're
|
||||
// going to buffer up whatever file we're proxying (and it may be very large). This may
|
||||
// affect embedding or systems with PHP's output_buffering enabled.
|
||||
while (ob_get_level()) {
|
||||
Kohana_Log::add("error","".print_r(ob_get_level(),1));
|
||||
if (!@ob_end_clean()) {
|
||||
// ob_end_clean() can return false if the buffer can't be removed for some reason
|
||||
// (zlib output compression buffers sometimes cause problems).
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
readfile($file);
|
||||
}
|
||||
}
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
@ -24,15 +24,15 @@ class Items_Controller extends Controller {
|
||||
throw new Kohana_404_Exception();
|
||||
}
|
||||
|
||||
// Redirect to the more specific resource type, since it will render
|
||||
// differently. We can't delegate here because we may have gotten to this
|
||||
// page via /items/<id> which means that we don't have a type-specific controller. Also, we
|
||||
// want to drive a single canonical resource mapping where possible.
|
||||
// Redirect to the more specific resource type, since it will render differently. We can't
|
||||
// delegate here because we may have gotten to this page via /items/<id> which means that we
|
||||
// don't have a type-specific controller. Also, we want to drive a single canonical resource
|
||||
// mapping where possible.
|
||||
access::required("view", $item);
|
||||
url::redirect($item->abs_url());
|
||||
}
|
||||
|
||||
// Return the width/height dimensinons for the given item
|
||||
// Return the width/height dimensions for the given item
|
||||
public function dimensions($id) {
|
||||
$item = ORM::factory("item", $id);
|
||||
access::required("view", $item);
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
@ -27,27 +27,11 @@ class Movies_Controller extends Items_Controller {
|
||||
|
||||
access::required("view", $movie);
|
||||
|
||||
$where = array(array("type", "!=", "album"));
|
||||
$position = item::get_position($movie, $where);
|
||||
if ($position > 1) {
|
||||
list ($previous_item, $ignore, $next_item) =
|
||||
$movie->parent()->viewable()->children(3, $position - 2, $where);
|
||||
} else {
|
||||
$previous_item = null;
|
||||
list ($next_item) = $movie->parent()->viewable()->children(1, $position, $where);
|
||||
}
|
||||
|
||||
$template = new Theme_View("page.html", "item", "movie");
|
||||
$template->set_global(
|
||||
array("item" => $movie,
|
||||
$template->set_global(array("item" => $movie,
|
||||
"children" => array(),
|
||||
"children_count" => 0,
|
||||
"parents" => $movie->parents()->as_array(),
|
||||
"next_item" => $next_item,
|
||||
"previous_item" => $previous_item,
|
||||
"sibling_count" => $movie->parent()->viewable()->children_count($where),
|
||||
"position" => $position));
|
||||
|
||||
"children_count" => 0));
|
||||
$template->set_global(item::get_display_context($movie));
|
||||
$template->content = new View("movie.html");
|
||||
|
||||
$movie->increment_view_count();
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
@ -27,27 +27,11 @@ class Photos_Controller extends Items_Controller {
|
||||
|
||||
access::required("view", $photo);
|
||||
|
||||
$where = array(array("type", "!=", "album"));
|
||||
$position = item::get_position($photo, $where);
|
||||
if ($position > 1) {
|
||||
list ($previous_item, $ignore, $next_item) =
|
||||
$photo->parent()->viewable()->children(3, $position - 2, $where);
|
||||
} else {
|
||||
$previous_item = null;
|
||||
list ($next_item) = $photo->parent()->viewable()->children(1, $position, $where);
|
||||
}
|
||||
|
||||
$template = new Theme_View("page.html", "item", "photo");
|
||||
$template->set_global(
|
||||
array("item" => $photo,
|
||||
$template->set_global(array("item" => $photo,
|
||||
"children" => array(),
|
||||
"children_count" => 0,
|
||||
"parents" => $photo->parents()->as_array(),
|
||||
"next_item" => $next_item,
|
||||
"previous_item" => $previous_item,
|
||||
"sibling_count" => $photo->parent()->viewable()->children_count($where),
|
||||
"position" => $position));
|
||||
|
||||
"children_count" => 0));
|
||||
$template->set_global(item::get_display_context($photo));
|
||||
$template->content = new View("photo.html");
|
||||
|
||||
$photo->increment_view_count();
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
@ -51,10 +51,11 @@ class Uploader_Controller extends Controller {
|
||||
$file_validation = new Validation($_FILES);
|
||||
$file_validation->add_rules(
|
||||
"Filedata", "upload::valid", "upload::required",
|
||||
"upload::type[gif,jpg,jpeg,png,flv,mp4,m4v]");
|
||||
"upload::type[" . implode(",", legal_file::get_extensions()) . "]");
|
||||
|
||||
if ($form->validate() && $file_validation->validate()) {
|
||||
$temp_filename = upload::save("Filedata");
|
||||
Event::add("system.shutdown", create_function("", "unlink(\"$temp_filename\");"));
|
||||
try {
|
||||
$item = ORM::factory("item");
|
||||
$item->name = substr(basename($temp_filename), 10); // Skip unique identifier Kohana adds
|
||||
@ -62,6 +63,10 @@ class Uploader_Controller extends Controller {
|
||||
$item->parent_id = $album->id;
|
||||
$item->set_data_file($temp_filename);
|
||||
|
||||
// Remove double extensions from the filename - they'll be disallowed in the model but if
|
||||
// we don't do it here then it'll result in a failed upload.
|
||||
$item->name = legal_file::smash_extensions($item->name);
|
||||
|
||||
$path_info = @pathinfo($temp_filename);
|
||||
if (array_key_exists("extension", $path_info) &&
|
||||
in_array(strtolower($path_info["extension"]), array("flv", "mp4", "m4v"))) {
|
||||
@ -87,14 +92,10 @@ class Uploader_Controller extends Controller {
|
||||
Kohana_Log::add("error", "Validation errors: " . print_r($e->validation->errors(), 1));
|
||||
}
|
||||
|
||||
if (file_exists($temp_filename)) {
|
||||
unlink($temp_filename);
|
||||
}
|
||||
header("HTTP/1.1 500 Internal Server Error");
|
||||
print "ERROR: " . $e->getMessage();
|
||||
return;
|
||||
}
|
||||
unlink($temp_filename);
|
||||
print "FILEID: $item->id";
|
||||
} else {
|
||||
header("HTTP/1.1 400 Bad Request");
|
||||
@ -107,8 +108,8 @@ class Uploader_Controller extends Controller {
|
||||
// The "errors" won't be properly pluralized :-/
|
||||
print t2("Uploaded %count photo (%error errors)",
|
||||
"Uploaded %count photos (%error errors)",
|
||||
$success_count,
|
||||
array("error" => $error_count));
|
||||
(int)$success_count,
|
||||
array("error" => (int)$error_count));
|
||||
} else {
|
||||
print t2("Uploaded %count photo", "Uploaded %count photos", $success_count);}
|
||||
}
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 Bharat Mediratta
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
26
modules/gallery/helpers/MY_valid.php
Normal file
26
modules/gallery/helpers/MY_valid.php
Normal file
@ -0,0 +1,26 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or (at
|
||||
* your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but
|
||||
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
*/
|
||||
class valid extends valid_Core {
|
||||
static function url($url) {
|
||||
return valid_Core::url($url) &&
|
||||
(!strncasecmp($url, "http://", strlen("http://")) ||
|
||||
!strncasecmp($url, "https://", strlen("https://")));
|
||||
}
|
||||
}
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user