Merge branch 'master' of git://github.com/gallery/gallery3-contrib into rawphoto
@ -71,7 +71,7 @@ class albumpassword_Controller extends Controller {
|
||||
|
||||
// Convert submitted data to local variables.
|
||||
$album_id = Input::instance()->post("item_id");
|
||||
$album_password = Input::instance()->post("assignpassword_password");
|
||||
$album_password = strtolower(Input::instance()->post("assignpassword_password"));
|
||||
|
||||
// Check for, and remove, any existing passwords and cached ids.
|
||||
$existing_password = ORM::factory("items_albumpassword")->where("album_id", "=", $album_id)->find_all();
|
||||
@ -126,7 +126,7 @@ class albumpassword_Controller extends Controller {
|
||||
access::verify_csrf();
|
||||
|
||||
// Convert submitted data to local variables.
|
||||
$album_password = Input::instance()->post("albumpassword_password");
|
||||
$album_password = strtolower(Input::instance()->post("albumpassword_password"));
|
||||
|
||||
// See if the submitted password matches any in the database.
|
||||
$existing_password = ORM::factory("items_albumpassword")
|
||||
|
@ -34,7 +34,7 @@ class albumpassword_event_Core {
|
||||
->id("albumpassword_login")
|
||||
->css_id("g-album-password-login")
|
||||
->url(url::site("albumpassword/login"))
|
||||
->label(t("Enter password")));
|
||||
->label(t("Unlock albums")));
|
||||
} else {
|
||||
// If a password has been entered already
|
||||
// display the log out link, and links to the protected albums
|
||||
|
@ -26,11 +26,70 @@ class albumpassword_task_Core {
|
||||
->join("albumpassword_idcaches", "items_albumpasswords.id", "albumpassword_idcaches.password_id", "LEFT OUTER")
|
||||
->and_where("albumpassword_idcaches.password_id", "IS", NULL)->count_all();
|
||||
|
||||
return array(Task_Definition::factory()
|
||||
->callback("albumpassword_task::update_idcaches")
|
||||
->name(t("Rebuild Album Password ID Caches DB"))
|
||||
->description(t("Logs the contents of all protected albums into the db."))
|
||||
->severity($bad_albums ? log::WARNING : log::SUCCESS));
|
||||
$tasks = array();
|
||||
|
||||
$tasks[] = Task_Definition::factory()
|
||||
->callback("albumpassword_task::update_idcaches")
|
||||
->name(t("Rebuild Album Password ID Caches DB"))
|
||||
->description(t("Logs the contents of all protected albums into the db."))
|
||||
->severity($bad_albums ? log::WARNING : log::SUCCESS);
|
||||
|
||||
$tasks[] = Task_Definition::factory()
|
||||
->callback("albumpassword_task::lowercase_passwords")
|
||||
->name(t("Fix Password DB Casing"))
|
||||
->description(t("Fixes case sensitivity issues."))
|
||||
->severity(log::SUCCESS);
|
||||
|
||||
return $tasks;
|
||||
}
|
||||
|
||||
static function lowercase_passwords($task) {
|
||||
// Converts all passwords to lower case.
|
||||
|
||||
$start = microtime(true);
|
||||
$total = $task->get("total");
|
||||
$existing_passwords = ORM::factory("items_albumpassword")->find_all();
|
||||
|
||||
if (empty($total)) {
|
||||
// Set the initial values for all variables.
|
||||
$task->set("total", count($existing_passwords));
|
||||
$total = $task->get("total");
|
||||
$task->set("last_password_id", 0);
|
||||
$task->set("completed_passwords", 0);
|
||||
}
|
||||
|
||||
// Retrieve the values for variables from the last time this
|
||||
// function was run.
|
||||
$last_password_id = $task->get("last_password_id");
|
||||
$completed_passwords = $task->get("completed_passwords");
|
||||
|
||||
foreach (ORM::factory("items_albumpassword")
|
||||
->where("id", ">", $last_password_id)
|
||||
->order_by("id")
|
||||
->find_all(100) as $one_password) {
|
||||
$one_password->password = strtolower($one_password->password);
|
||||
$one_password->save();
|
||||
|
||||
$last_password_id = $one_password->id;
|
||||
$completed_passwords++;
|
||||
|
||||
if ($completed_passwords == count($existing_passwords) || microtime(true) - $start > 1.5) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
$task->set("last_password_id", $last_password_id);
|
||||
$task->set("completed_passwords", $completed_passwords);
|
||||
|
||||
if ($completed_passwords == count($existing_passwords)) {
|
||||
$task->done = true;
|
||||
$task->state = "success";
|
||||
$task->percent_complete = 100;
|
||||
} else {
|
||||
$task->percent_complete = round(100 * $completed_passwords / count($existing_passwords));
|
||||
}
|
||||
$task->status = t2("One password fixed", "%count / %total passwords fixed", $completed_passwords,
|
||||
array("total" => count($existing_passwords)));
|
||||
}
|
||||
|
||||
static function update_idcaches($task) {
|
||||
|
@ -1,7 +1,7 @@
|
||||
name = "Album Password"
|
||||
description = "Restrict access to individual albums."
|
||||
version = 3
|
||||
author_name = ""
|
||||
author_url = ""
|
||||
author_name = "rWatcher"
|
||||
author_url = "http://codex.gallery2.org/User:RWatcher"
|
||||
info_url = "http://codex.gallery2.org/Gallery3:Modules:albumpassword"
|
||||
discuss_url = "http://gallery.menalto.com/forum_module_albumpassword"
|
||||
discuss_url = "http://gallery.menalto.com/node/98856"
|
||||
|
BIN
3.0/modules/albumtree/images/base.gif
Executable file
After Width: | Height: | Size: 1.0 KiB |
BIN
3.0/modules/albumtree/images/empty.gif
Executable file
After Width: | Height: | Size: 62 B |
BIN
3.0/modules/albumtree/images/folder.gif
Executable file
After Width: | Height: | Size: 372 B |
BIN
3.0/modules/albumtree/images/folderopen.gif
Executable file
After Width: | Height: | Size: 376 B |
BIN
3.0/modules/albumtree/images/imgfolder.gif
Executable file
After Width: | Height: | Size: 622 B |
BIN
3.0/modules/albumtree/images/join.gif
Executable file
After Width: | Height: | Size: 69 B |
BIN
3.0/modules/albumtree/images/join_rtl.gif
Executable file
After Width: | Height: | Size: 67 B |
BIN
3.0/modules/albumtree/images/joinbottom.gif
Executable file
After Width: | Height: | Size: 66 B |
BIN
3.0/modules/albumtree/images/joinbottom_rtl.gif
Executable file
After Width: | Height: | Size: 64 B |
BIN
3.0/modules/albumtree/images/line.gif
Executable file
After Width: | Height: | Size: 66 B |
BIN
3.0/modules/albumtree/images/line_rtl.gif
Executable file
After Width: | Height: | Size: 65 B |
BIN
3.0/modules/albumtree/images/minus.gif
Executable file
After Width: | Height: | Size: 86 B |
BIN
3.0/modules/albumtree/images/minus_rtl.gif
Executable file
After Width: | Height: | Size: 86 B |
BIN
3.0/modules/albumtree/images/minusbottom.gif
Executable file
After Width: | Height: | Size: 85 B |
BIN
3.0/modules/albumtree/images/minusbottom_rtl.gif
Executable file
After Width: | Height: | Size: 85 B |
BIN
3.0/modules/albumtree/images/nolines_minus.gif
Executable file
After Width: | Height: | Size: 861 B |
BIN
3.0/modules/albumtree/images/nolines_plus.gif
Executable file
After Width: | Height: | Size: 870 B |
BIN
3.0/modules/albumtree/images/plus.gif
Executable file
After Width: | Height: | Size: 89 B |
BIN
3.0/modules/albumtree/images/plus_rtl.gif
Executable file
After Width: | Height: | Size: 89 B |
BIN
3.0/modules/albumtree/images/plusbottom.gif
Executable file
After Width: | Height: | Size: 88 B |
BIN
3.0/modules/albumtree/images/plusbottom_rtl.gif
Executable file
After Width: | Height: | Size: 88 B |
414
3.0/modules/albumtree/views/albumtree_block_dtree.html.php
Normal file
@ -0,0 +1,414 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.") ?>
|
||||
<script type="text/javascript">
|
||||
/*--------------------------------------------------|
|
||||
| dTree 2.05 | www.destroydrop.com/javascript/tree/ |
|
||||
|---------------------------------------------------|
|
||||
| Copyright (c) 2002-2003 Geir Landrö |
|
||||
| |
|
||||
| This script can be used freely as long as all |
|
||||
| copyright messages are intact. |
|
||||
| |
|
||||
| Updated: 17.04.2003 |
|
||||
|--------------------------------------------------*/
|
||||
|
||||
// Node object
|
||||
function Node(id, pid, name, url, title, target, icon, iconOpen, open) {
|
||||
this.id = id;
|
||||
this.pid = pid;
|
||||
this.name = name;
|
||||
this.url = url;
|
||||
this.title = title;
|
||||
this.target = target;
|
||||
this.icon = icon;
|
||||
this.iconOpen = iconOpen;
|
||||
this._io = open || false;
|
||||
this._is = false;
|
||||
this._ls = false;
|
||||
this._hc = false;
|
||||
this._ai = 0;
|
||||
this._p;
|
||||
};
|
||||
|
||||
// Tree object
|
||||
function dTree(objName) {
|
||||
this.config = {
|
||||
target : null,
|
||||
folderLinks : true,
|
||||
useSelection : true,
|
||||
useCookies : true,
|
||||
useLines : true,
|
||||
useIcons : false,
|
||||
useStatusText : false,
|
||||
closeSameLevel : false,
|
||||
inOrder : false,
|
||||
cookiePath : null,
|
||||
cookieDomain : null
|
||||
}
|
||||
this.obj = objName;
|
||||
this.aNodes = [];
|
||||
this.aIndent = [];
|
||||
this.root = new Node(-1);
|
||||
this.selectedNode = null;
|
||||
this.selectedFound = false;
|
||||
this.completed = false;
|
||||
};
|
||||
|
||||
// Adds a new node to the node array
|
||||
dTree.prototype.add = function(id, pid, name, url, title, target, icon, iconOpen, open) {
|
||||
this.aNodes[this.aNodes.length] = new Node(id, pid, name, url, title, target, icon, iconOpen, open);
|
||||
};
|
||||
|
||||
// Open/close all nodes
|
||||
dTree.prototype.openAll = function() {
|
||||
this.oAll(true);
|
||||
};
|
||||
dTree.prototype.closeAll = function() {
|
||||
this.oAll(false);
|
||||
};
|
||||
|
||||
// Outputs the tree to the page
|
||||
dTree.prototype.toString = function() {
|
||||
var str = '<div class="dtree">\n';
|
||||
if (document.getElementById) {
|
||||
if (this.config.useCookies) this.selectedNode = this.getSelected();
|
||||
str += this.addNode(this.root);
|
||||
} else str += 'Browser not supported.';
|
||||
str += '</div>';
|
||||
if (!this.selectedFound) this.selectedNode = null;
|
||||
this.completed = true;
|
||||
return str;
|
||||
};
|
||||
|
||||
// Creates the tree structure
|
||||
dTree.prototype.addNode = function(pNode) {
|
||||
var str = '';
|
||||
var n=0;
|
||||
if (this.config.inOrder) n = pNode._ai;
|
||||
for (n; n<this.aNodes.length; n++) {
|
||||
if (this.aNodes[n].pid == pNode.id) {
|
||||
var cn = this.aNodes[n];
|
||||
cn._p = pNode;
|
||||
cn._ai = n;
|
||||
this.setCS(cn);
|
||||
if (!cn.target && this.config.target) cn.target = this.config.target;
|
||||
if (cn._hc && !cn._io && this.config.useCookies) cn._io = this.isOpen(cn.id);
|
||||
if (!this.config.folderLinks && cn._hc) cn.url = null;
|
||||
if (this.config.useSelection && cn.id == this.selectedNode && !this.selectedFound) {
|
||||
cn._is = true;
|
||||
this.selectedNode = n;
|
||||
this.selectedFound = true;
|
||||
}
|
||||
str += this.node(cn, n);
|
||||
if (cn._ls) break;
|
||||
}
|
||||
}
|
||||
return str;
|
||||
};
|
||||
|
||||
// Creates the node icon, url and text
|
||||
dTree.prototype.node = function(node, nodeId) {
|
||||
var str = '<div class="dTreeNode" title="' + node.name + '">' + this.indent(node, nodeId);
|
||||
if (this.config.useIcons) {
|
||||
if (!node.icon) node.icon = (this.root.id == node.pid) ? this.icon.root : ((node._hc) ? this.icon.folder : this.icon.node);
|
||||
if (!node.iconOpen) node.iconOpen = (node._hc) ? this.icon.folderOpen : this.icon.node;
|
||||
if (this.root.id == node.pid) {
|
||||
node.icon = this.icon.root;
|
||||
node.iconOpen = this.icon.root;
|
||||
}
|
||||
str += '<img id="i' + this.obj + nodeId + '" src="' + ((node._io) ? node.iconOpen : node.icon) + '" alt="" />';
|
||||
}
|
||||
if (node.url) {
|
||||
str += '<a id="s' + this.obj + nodeId + '" class="' + ((this.config.useSelection) ? ((node._is ? 'nodeSel' : 'node')) : 'node') + '" href="' + node.url + '"';
|
||||
if (node.title) str += ' title="' + node.title + '"';
|
||||
if (node.target) str += ' target="' + node.target + '"';
|
||||
if (this.config.useStatusText) str += ' onmouseover="window.status=\'' + node.name + '\';return true;" onmouseout="window.status=\'\';return true;" ';
|
||||
if (this.config.useSelection && ((node._hc && this.config.folderLinks) || !node._hc))
|
||||
str += ' onclick="' + this.obj + '.s(' + nodeId + ');"';
|
||||
str += '>';
|
||||
}
|
||||
else if ((!this.config.folderLinks || !node.url) && node._hc && node.pid != this.root.id)
|
||||
str += '<a href="javascript: ' + this.obj + '.o(' + nodeId + ');" class="node">';
|
||||
str += node.name;
|
||||
if (node.url || ((!this.config.folderLinks || !node.url) && node._hc)) str += '</a>';
|
||||
str += '</div>';
|
||||
if (node._hc) {
|
||||
str += '<div id="d' + this.obj + nodeId + '" class="clip" style="display:' + ((this.root.id == node.pid || node._io) ? 'block' : 'none') + ';">';
|
||||
str += this.addNode(node);
|
||||
str += '</div>';
|
||||
}
|
||||
this.aIndent.pop();
|
||||
return str;
|
||||
};
|
||||
|
||||
// Adds the empty and line icons
|
||||
dTree.prototype.indent = function(node, nodeId) {
|
||||
var str = '';
|
||||
if (this.root.id != node.pid) {
|
||||
for (var n=0; n<this.aIndent.length; n++)
|
||||
str += '<img src="' + ( (this.aIndent[n] == 1 && this.config.useLines) ? this.icon.line : this.icon.empty ) + '" alt="" />';
|
||||
(node._ls) ? this.aIndent.push(0) : this.aIndent.push(1);
|
||||
if (node._hc) {
|
||||
str += '<a href="javascript: ' + this.obj + '.o(' + nodeId + ');"><img id="j' + this.obj + nodeId + '" src="';
|
||||
if (!this.config.useLines) str += (node._io) ? this.icon.nlMinus : this.icon.nlPlus;
|
||||
else str += ( (node._io) ? ((node._ls && this.config.useLines) ? this.icon.minusBottom : this.icon.minus) : ((node._ls && this.config.useLines) ? this.icon.plusBottom : this.icon.plus ) );
|
||||
str += '" alt="" /></a>';
|
||||
} else str += '<img src="' + ( (this.config.useLines) ? ((node._ls) ? this.icon.joinBottom : this.icon.join ) : this.icon.empty) + '" alt="" />';
|
||||
}
|
||||
return str;
|
||||
};
|
||||
|
||||
// Checks if a node has any children and if it is the last sibling
|
||||
dTree.prototype.setCS = function(node) {
|
||||
var lastId;
|
||||
for (var n=0; n<this.aNodes.length; n++) {
|
||||
if (this.aNodes[n].pid == node.id) node._hc = true;
|
||||
if (this.aNodes[n].pid == node.pid) lastId = this.aNodes[n].id;
|
||||
}
|
||||
if (lastId==node.id) node._ls = true;
|
||||
};
|
||||
|
||||
// Returns the selected node
|
||||
dTree.prototype.getSelected = function() {
|
||||
var sn = this.getCookie('cs' + this.obj);
|
||||
return (sn) ? sn : null;
|
||||
};
|
||||
|
||||
// Highlights the selected node
|
||||
dTree.prototype.s = function(id) {
|
||||
if (!this.config.useSelection) return;
|
||||
var cn = this.aNodes[id];
|
||||
if (cn._hc && !this.config.folderLinks) return;
|
||||
if (this.selectedNode != id) {
|
||||
if (this.selectedNode || this.selectedNode==0) {
|
||||
eOld = document.getElementById("s" + this.obj + this.selectedNode);
|
||||
eOld.className = "node";
|
||||
}
|
||||
eNew = document.getElementById("s" + this.obj + id);
|
||||
eNew.className = "nodeSel";
|
||||
this.selectedNode = id;
|
||||
if (this.config.useCookies) this.setCookie('cs' + this.obj, cn.id);
|
||||
}
|
||||
};
|
||||
|
||||
// Toggle Open or close
|
||||
dTree.prototype.o = function(id) {
|
||||
var cn = this.aNodes[id];
|
||||
this.nodeStatus(!cn._io, id, cn._ls);
|
||||
cn._io = !cn._io;
|
||||
if (this.config.closeSameLevel) this.closeLevel(cn);
|
||||
if (this.config.useCookies) this.updateCookie();
|
||||
};
|
||||
|
||||
// Open or close all nodes
|
||||
dTree.prototype.oAll = function(status) {
|
||||
for (var n=0; n<this.aNodes.length; n++) {
|
||||
if (this.aNodes[n]._hc && this.aNodes[n].pid != this.root.id) {
|
||||
this.nodeStatus(status, n, this.aNodes[n]._ls)
|
||||
this.aNodes[n]._io = status;
|
||||
}
|
||||
}
|
||||
if (this.config.useCookies) this.updateCookie();
|
||||
};
|
||||
|
||||
// Opens the tree to a specific node
|
||||
dTree.prototype.openTo = function(nId, bSelect, bFirst) {
|
||||
if (!bFirst) {
|
||||
for (var n=0; n<this.aNodes.length; n++) {
|
||||
if (this.aNodes[n].id == nId) {
|
||||
nId=n;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
var cn=this.aNodes[nId];
|
||||
if (cn.pid==this.root.id || !cn._p) return;
|
||||
cn._io = true;
|
||||
cn._is = bSelect;
|
||||
if (this.completed && cn._hc) this.nodeStatus(true, cn._ai, cn._ls);
|
||||
if (this.completed && bSelect) this.s(cn._ai);
|
||||
else if (bSelect) this._sn=cn._ai;
|
||||
this.openTo(cn._p._ai, false, true);
|
||||
};
|
||||
|
||||
// Closes all nodes on the same level as certain node
|
||||
dTree.prototype.closeLevel = function(node) {
|
||||
for (var n=0; n<this.aNodes.length; n++) {
|
||||
if (this.aNodes[n].pid == node.pid && this.aNodes[n].id != node.id && this.aNodes[n]._hc) {
|
||||
this.nodeStatus(false, n, this.aNodes[n]._ls);
|
||||
this.aNodes[n]._io = false;
|
||||
this.closeAllChildren(this.aNodes[n]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Closes all children of a node
|
||||
dTree.prototype.closeAllChildren = function(node) {
|
||||
for (var n=0; n<this.aNodes.length; n++) {
|
||||
if (this.aNodes[n].pid == node.id && this.aNodes[n]._hc) {
|
||||
if (this.aNodes[n]._io) this.nodeStatus(false, n, this.aNodes[n]._ls);
|
||||
this.aNodes[n]._io = false;
|
||||
this.closeAllChildren(this.aNodes[n]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Change the status of a node(open or closed)
|
||||
dTree.prototype.nodeStatus = function(status, id, bottom) {
|
||||
eDiv = document.getElementById('d' + this.obj + id);
|
||||
eJoin = document.getElementById('j' + this.obj + id);
|
||||
if (this.config.useIcons) {
|
||||
eIcon = document.getElementById('i' + this.obj + id);
|
||||
eIcon.src = (status) ? this.aNodes[id].iconOpen : this.aNodes[id].icon;
|
||||
}
|
||||
eJoin.src = (this.config.useLines)?
|
||||
((status)?((bottom)?this.icon.minusBottom:this.icon.minus):((bottom)?this.icon.plusBottom:this.icon.plus)):
|
||||
((status)?this.icon.nlMinus:this.icon.nlPlus);
|
||||
eDiv.style.display = (status) ? 'block': 'none';
|
||||
};
|
||||
|
||||
|
||||
// [Cookie] Clears a cookie
|
||||
dTree.prototype.clearCookie = function() {
|
||||
var now = new Date();
|
||||
var yesterday = new Date(now.getTime() - 1000 * 60 * 60 * 24);
|
||||
this.setCookie('co'+this.obj, 'cookieValue', yesterday);
|
||||
this.setCookie('cs'+this.obj, 'cookieValue', yesterday);
|
||||
};
|
||||
|
||||
// [Cookie] Sets value in a cookie
|
||||
dTree.prototype.setCookie = function(cookieName, cookieValue, expires, path, domain, secure) {
|
||||
path = path || this.config.cookiePath;
|
||||
domain = domain || this.config.cookieDomain;
|
||||
document.cookie =
|
||||
escape(cookieName) + '=' + escape(cookieValue)
|
||||
+ (expires ? '; expires=' + expires.toGMTString() : '')
|
||||
+ (path ? '; path=' + path : '')
|
||||
+ (domain ? '; domain=' + domain : '')
|
||||
+ (secure ? '; secure' : '');
|
||||
};
|
||||
|
||||
// [Cookie] Gets a value from a cookie
|
||||
dTree.prototype.getCookie = function(cookieName) {
|
||||
var cookieValue = '';
|
||||
var posName = document.cookie.indexOf(escape(cookieName) + '=');
|
||||
if (posName != -1) {
|
||||
var posValue = posName + (escape(cookieName) + '=').length;
|
||||
var endPos = document.cookie.indexOf(';', posValue);
|
||||
if (endPos != -1) cookieValue = unescape(document.cookie.substring(posValue, endPos));
|
||||
else cookieValue = unescape(document.cookie.substring(posValue));
|
||||
}
|
||||
return (cookieValue);
|
||||
};
|
||||
|
||||
// [Cookie] Returns ids of open nodes as a string
|
||||
dTree.prototype.updateCookie = function() {
|
||||
var str = '';
|
||||
for (var n=0; n<this.aNodes.length; n++) {
|
||||
if (this.aNodes[n]._io && this.aNodes[n].pid != this.root.id) {
|
||||
if (str) str += '.';
|
||||
str += this.aNodes[n].id;
|
||||
}
|
||||
}
|
||||
this.setCookie('co' + this.obj, str);
|
||||
};
|
||||
|
||||
// [Cookie] Checks if a node id is in a cookie
|
||||
dTree.prototype.isOpen = function(id) {
|
||||
var aOpen = this.getCookie('co' + this.obj).split('.');
|
||||
for (var n=0; n<aOpen.length; n++)
|
||||
if (aOpen[n] == id) return true;
|
||||
return false;
|
||||
};
|
||||
|
||||
// If Push and pop is not implemented by the browser
|
||||
if (!Array.prototype.push) {
|
||||
Array.prototype.push = function array_push() {
|
||||
for(var i=0;i<arguments.length;i++)
|
||||
this[this.length]=arguments[i];
|
||||
return this.length;
|
||||
}
|
||||
};
|
||||
if (!Array.prototype.pop) {
|
||||
Array.prototype.pop = function array_pop() {
|
||||
lastElement = this[this.length-1];
|
||||
this.length = Math.max(this.length-1,0);
|
||||
return lastElement;
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
||||
<style type="text/css">
|
||||
/*--------------------------------------------------|
|
||||
| dTree 2.05 | www.destroydrop.com/javascript/tree/ |
|
||||
|---------------------------------------------------|
|
||||
| Copyright (c) 2002-2003 Geir Landrö |
|
||||
|--------------------------------------------------*/
|
||||
|
||||
.dtree {
|
||||
font-size: 1.05em;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.dtree img {
|
||||
border: 0px;
|
||||
vertical-align: middle;
|
||||
}
|
||||
.dtree a.node, .dtree a.nodeSel {
|
||||
white-space: nowrap;
|
||||
padding: 1px 2px 1px 2px;
|
||||
}
|
||||
.dtree a.nodeSel {
|
||||
font-style: italic;
|
||||
}
|
||||
.dtree .clip {
|
||||
overflow: hidden;
|
||||
}
|
||||
</style>
|
||||
<div class="block-albumselect-AlbumTree gbBlock">
|
||||
<div class="dtree">
|
||||
<script type="text/javascript">
|
||||
// <![CDATA[
|
||||
function albumSelect_goToNode(nodeId) {
|
||||
document.location = new String('main.php?g2_itemId=__ID__').replace('__ID__', nodeId);
|
||||
}
|
||||
var albumTree = new dTree('albumTree');
|
||||
var albumTree_images = '<?= item::root()->url() ?>modules/albumtree/images/'
|
||||
albumTree.icon = {
|
||||
root : albumTree_images + 'base.gif',
|
||||
folder : albumTree_images + 'folder.gif',
|
||||
folderOpen : albumTree_images + 'imgfolder.gif',
|
||||
node : albumTree_images + 'imgfolder.gif',
|
||||
empty : albumTree_images + 'empty.gif',
|
||||
line : albumTree_images + 'line.gif',
|
||||
join : albumTree_images + 'join.gif',
|
||||
joinBottom : albumTree_images + 'joinbottom.gif',
|
||||
plus : albumTree_images + 'plus.gif',
|
||||
plusBottom : albumTree_images + 'plusbottom.gif',
|
||||
minus : albumTree_images + 'minus.gif',
|
||||
minusBottom : albumTree_images + 'minusbottom.gif',
|
||||
nlPlus : albumTree_images + 'nolines_plus.gif',
|
||||
nlMinus : albumTree_images + 'nolines_minus.gif'
|
||||
};
|
||||
albumTree.config.useLines = true;
|
||||
albumTree.config.useIcons = false;
|
||||
albumTree.config.useCookies = false;
|
||||
albumTree.config.closeSameLevel = false;
|
||||
albumTree.config.cookiePath = '<?= item::root()->url() ?>';
|
||||
albumTree.config.cookieDomain = '';
|
||||
{ var pf = '<?= item::root()->url() ?>';
|
||||
<?
|
||||
function addtree($album){
|
||||
?>
|
||||
albumTree.add(<?= $album->id -1 ?>, <?= $album->parent_id -1 ?>, "<?= $album->title ?>", pf+'<?= $album->relative_url_cache ?>');
|
||||
<?
|
||||
foreach ($album->viewable()->children(null, null, array(array("type", "=", "album"))) as $child){
|
||||
addtree($child);
|
||||
}
|
||||
}
|
||||
addtree($root);
|
||||
?>
|
||||
}
|
||||
document.write(albumTree);
|
||||
// ]]>
|
||||
</script>
|
||||
</div>
|
||||
</div>
|
@ -1,7 +1,7 @@
|
||||
name = "Exif GPS Data"
|
||||
description = "Extract Exif GPS data from photos."
|
||||
version = 2
|
||||
author_name = ""
|
||||
author_url = ""
|
||||
author_name = "rWatcher"
|
||||
author_url = "http://codex.gallery2.org/User:RWatcher"
|
||||
info_url = "http://codex.gallery2.org/Gallery3:Modules:exif_gps"
|
||||
discuss_url = "http://gallery.menalto.com/forum_module_exif_gps"
|
||||
discuss_url = "http://gallery.menalto.com/node/94762"
|
||||
|
@ -1,4 +1,8 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.") ?>
|
||||
<?
|
||||
$latitude = 0;
|
||||
$longitude = 0;
|
||||
?>
|
||||
<script type="text/javascript" src="http://www.google.com/jsapi?key=<?= module::get_var("exif_gps", "googlemap_api_key"); ?>"></script>
|
||||
<script type="text/javascript">
|
||||
google.load("maps", "3",{"other_params":"sensor=false"});
|
||||
@ -20,6 +24,8 @@
|
||||
<? if (!isset($currLat)) { ?>
|
||||
<? $currLat = $item_coordinates->latitude; ?>
|
||||
<? $currLong = $item_coordinates->longitude; ?>
|
||||
<? $latitude = $item_coordinates->latitude; ?>
|
||||
<? $longitude = $item_coordinates->longitude; ?>
|
||||
var marker<?=$counter; ?> = new google.maps.Marker({
|
||||
position: new google.maps.LatLng(<?=$item_coordinates->latitude; ?>,<?=$item_coordinates->longitude; ?>),
|
||||
map: map
|
||||
@ -35,14 +41,14 @@
|
||||
<? } else { ?>
|
||||
<? } ?>
|
||||
<? } ?>
|
||||
<? if (module::get_var("exif_gps", "googlemap_max_autozoom") != "") : ?>
|
||||
<? if (($max_autozoom = module::get_var("exif_gps", "googlemap_max_autozoom")) != "") : ?>
|
||||
// If there is a maximum auto-zoom value, then set up an event to check the zoom
|
||||
// level the first time it is changed, and adjust it if necessary.
|
||||
// (if we call map.getZoom right after .fitBounds, getZoom will return the initial
|
||||
// zoom level, not the auto zoom level, this way we get the auto zoomed value).
|
||||
google.maps.event.addListener(map, 'zoom_changed', function() {
|
||||
if (google_zoom_hack) {
|
||||
if (map.getZoom() > 18) map.setZoom(18);
|
||||
if (map.getZoom() > <?= $max_autozoom ?>) map.setZoom(<?= $max_autozoom ?>);
|
||||
google_zoom_hack = false;
|
||||
}
|
||||
});
|
||||
@ -56,4 +62,4 @@
|
||||
|
||||
</script>
|
||||
|
||||
<div id="sidebar_map_canvas" style="width:205px; height:214px"></div>
|
||||
<div id="sidebar_map_canvas" style="width:205px; height:214px"><img src="http://maps.google.com/maps/api/staticmap?center=<?=$latitude; ?>,<?=$longitude; ?>&zoom=<?= module::get_var("exif_gps", "sidebar_zoom"); ?>&size=205x214&maptype=<?=$sidebar_map_type ?>&markers=color:red|color:red|<?=$latitude; ?>,<?=$longitude; ?>&sensor=false"></div>
|
||||
|
@ -19,4 +19,4 @@
|
||||
google.setOnLoadCallback(initialize);
|
||||
|
||||
</script>
|
||||
<div id="sidebar_map_canvas" style="width:205px; height:214px"></div>
|
||||
<div id="sidebar_map_canvas" style="width:205px; height:214px"><img src="http://maps.google.com/maps/api/staticmap?center=<?=$latitude; ?>,<?=$longitude; ?>&zoom=<?= module::get_var("exif_gps", "sidebar_zoom"); ?>&size=205x214&maptype=<?=$sidebar_map_type ?>&markers=color:red|color:red|<?=$latitude; ?>,<?=$longitude; ?>&sensor=false"></div>
|
||||
|
@ -62,14 +62,14 @@
|
||||
infowindow<?=$counter; ?>.open(map,marker<?=$counter; ?>);
|
||||
});
|
||||
|
||||
<? if (module::get_var("exif_gps", "googlemap_max_autozoom") != "") : ?>
|
||||
<? if (($max_autozoom = module::get_var("exif_gps", "googlemap_max_autozoom")) != "") : ?>
|
||||
// If there is a maximum auto-zoom value, then set up an event to check the zoom
|
||||
// level the first time it is changed, and adjust it if necessary.
|
||||
// (if we call map.getZoom right after .fitBounds, getZoom will return the initial
|
||||
// zoom level, not the auto zoom level, this way we get the auto zoomed value).
|
||||
google.maps.event.addListener(map, 'zoom_changed', function() {
|
||||
if (google_zoom_hack) {
|
||||
if (map.getZoom() > 18) map.setZoom(18);
|
||||
if (map.getZoom() > <?= $max_autozoom ?>) map.setZoom(<?= $max_autozoom ?>);
|
||||
google_zoom_hack = false;
|
||||
}
|
||||
});
|
||||
|
@ -36,18 +36,28 @@ class Admin_PHPMailer_Controller extends Admin_Controller {
|
||||
$str_phpmailer_from_addr = Input::instance()->post("phpmailer_from_address");
|
||||
$str_phpmailer_from_name = Input::instance()->post("phpmailer_from_name");
|
||||
$str_smtp_server = Input::instance()->post("phpmailer_smtp_server");
|
||||
$str_use_ssl = Input::instance()->post("phpmailer_use_ssl");
|
||||
$str_smtp_login = Input::instance()->post("phpmailer_smtp_login");
|
||||
$str_smtp_pass = Input::instance()->post("phpmailer_smtp_password");
|
||||
|
||||
$str_smtp_port = Input::instance()->post("phpmailer_smtp_port");
|
||||
|
||||
if (count($str_use_ssl) > 0) {
|
||||
$str_use_ssl = true;
|
||||
} else {
|
||||
$str_use_ssl = false;
|
||||
}
|
||||
|
||||
// Save Settings.
|
||||
module::set_var("phpmailer", "phpmailer_path", $str_phpmailer_path);
|
||||
module::set_var("phpmailer", "phpmailer_from_address", $str_phpmailer_from_addr);
|
||||
module::set_var("phpmailer", "phpmailer_from_name", $str_phpmailer_from_name);
|
||||
module::set_var("phpmailer", "smtp_server", $str_smtp_server);
|
||||
module::set_var("phpmailer", "use_ssl", $str_use_ssl);
|
||||
module::set_var("phpmailer", "smtp_login", $str_smtp_login);
|
||||
module::set_var("phpmailer", "smtp_password", $str_smtp_pass);
|
||||
module::set_var("phpmailer", "smtp_port", $str_smtp_port);
|
||||
message::success(t("Your Settings Have Been Saved."));
|
||||
|
||||
|
||||
// Load Admin page.
|
||||
$view = new Admin_View("admin.html");
|
||||
$view->content = new View("admin_phpmailer.html");
|
||||
@ -80,9 +90,15 @@ class Admin_PHPMailer_Controller extends Admin_Controller {
|
||||
$phpmailerSMTP->input("phpmailer_smtp_login")
|
||||
->label(t("SMTP Login Name"))
|
||||
->value(module::get_var("phpmailer", "smtp_login"));
|
||||
$phpmailerSMTP->input("phpmailer_smtp_password")
|
||||
$phpmailerSMTP->password("phpmailer_smtp_password")
|
||||
->label(t("SMTP Password"))
|
||||
->value(module::get_var("phpmailer", "smtp_password"));
|
||||
$phpmailerSMTP->input("phpmailer_smtp_port")
|
||||
->label(t("SMTP Port"))
|
||||
->value(module::get_var("phpmailer", "smtp_port"));
|
||||
$phpmailer_checklist["use_ssl_checkbox"] = array(t("Use SSL?"), module::get_var("phpmailer", "use_ssl"));
|
||||
$phpmailerSMTP->checklist("phpmailer_use_ssl")
|
||||
->options($phpmailer_checklist);
|
||||
|
||||
// Add a save button to the form.
|
||||
$form->submit("SaveSettings")->value(t("Save"));
|
||||
@ -90,4 +106,4 @@ class Admin_PHPMailer_Controller extends Admin_Controller {
|
||||
// Return the newly generated form.
|
||||
return $form;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
41
3.0/modules/phpmailer/helpers/phpmailer_installer.php
Normal file
@ -0,0 +1,41 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 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 phpmailer_installer {
|
||||
static function install() {
|
||||
// Set the default value for this module's behavior.
|
||||
module::set_var("phpmailer", "phpmailer_path", "/path/to/class.phpmailer.php");
|
||||
module::set_var("phpmailer", "phpmailer_from_address", "example@gallery.com");
|
||||
module::set_var("phpmailer", "phpmailer_from_name", "Gallery Administrator");
|
||||
module::set_var("phpmailer", "smtp_server", "smtp.example.com");
|
||||
module::set_var("phpmailer", "use_ssl", false);
|
||||
module::set_var("phpmailer", "smtp_login", "");
|
||||
module::set_var("phpmailer", "smtp_password", "");
|
||||
module::set_var("phpmailer", "smtp_port", "25");
|
||||
|
||||
// Set the module's version number.
|
||||
module::set_version("phpmailer", 2);
|
||||
}
|
||||
|
||||
static function upgrade($version) {
|
||||
module::set_var("phpmailer", "use_ssl", false);
|
||||
module::set_var("phpmailer", "smtp_port", "25");
|
||||
module::set_version("phpmailer", 2);
|
||||
}
|
||||
}
|
@ -102,9 +102,13 @@ class Sendmail_Core {
|
||||
|
||||
$mail->IsSMTP();
|
||||
$mail->Host = module::get_var("phpmailer", "smtp_server");
|
||||
$mail->Port = module::get_var("phpmailer", "smtp_port");
|
||||
|
||||
if (module::get_var("phpmailer", "smtp_login") != "") {
|
||||
$mail->SMTPAuth = true;
|
||||
if (module::get_var("phpmailer", "use_ssl") == true) {
|
||||
$mail->SMTPSecure = "ssl";
|
||||
}
|
||||
$mail->Username = module::get_var("phpmailer", "smtp_login");
|
||||
$mail->Password = module::get_var("phpmailer", "smtp_password");
|
||||
} else {
|
||||
@ -115,9 +119,20 @@ class Sendmail_Core {
|
||||
$mail->FromName = module::get_var("phpmailer", "phpmailer_from_name");
|
||||
$mail->AddAddress($to);
|
||||
$mail->IsHTML(true);
|
||||
|
||||
// demdel's fix for the ecard module.
|
||||
$boundaryLine = explode("\n", $message, -1);
|
||||
$newboundary = substr($boundaryLine[0],2);
|
||||
if (preg_match("/--/", $boundaryLine[0])) {
|
||||
if (preg_match("/--".$newboundary."--/", end($boundaryLine))) {
|
||||
$mail->CharSet = "UTF-8";
|
||||
$mail->ContentType = "multipart/related; boundary=\"".$newboundary."\"";
|
||||
}
|
||||
}
|
||||
|
||||
$mail->Subject = $subject;
|
||||
$mail->Body = $message;
|
||||
|
||||
return $mail->Send();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -1,7 +1,7 @@
|
||||
name = "PHPMailer"
|
||||
description = "Use PHPMailer when sending email messages."
|
||||
version = 1
|
||||
author_name = ""
|
||||
author_url = ""
|
||||
version = 2
|
||||
author_name = "rWatcher"
|
||||
author_url = "http://codex.gallery2.org/User:RWatcher"
|
||||
info_url = "http://codex.gallery2.org/Gallery3:Modules:phpmailer"
|
||||
discuss_url = "http://gallery.menalto.com/forum_module_phpmailer"
|
||||
discuss_url = "http://gallery.menalto.com/node/89279"
|
||||
|
@ -206,8 +206,12 @@ class Admin_TagsMap_Controller extends Admin_Controller {
|
||||
$startingmap_group->dropdown("google_default_type")
|
||||
->label(t("Default Map Type"))
|
||||
->options(
|
||||
array("G_NORMAL_MAP", "G_SATELLITE_MAP", "G_HYBRID_MAP",
|
||||
"G_PHYSICAL_MAP", "G_SATELLITE_3D_MAP"));
|
||||
array("G_NORMAL_MAP" => "Normal",
|
||||
"G_SATELLITE_MAP" => "Satellite",
|
||||
"G_HYBRID_MAP" => "Hybrid",
|
||||
"G_PHYSICAL_MAP" => "Physical",
|
||||
"G_SATELLITE_3D_MAP" => "Google Earth"))
|
||||
->selected(module::get_var("tagsmap", "googlemap_type"));
|
||||
|
||||
// Add a save button to the form.
|
||||
$form->submit("SaveSettings")->value(t("Save"));
|
||||
|
@ -1,7 +1,7 @@
|
||||
name = "TagsMap"
|
||||
description = "Assign GPS coordinates to existing tags and display them on a map."
|
||||
version = 2
|
||||
author_name = ""
|
||||
author_url = ""
|
||||
author_name = "rWatcher"
|
||||
author_url = "http://codex.gallery2.org/User:RWatcher"
|
||||
info_url = "http://codex.gallery2.org/Gallery3:Modules:tagsmap"
|
||||
discuss_url = "http://gallery.menalto.com/forum_module_tagsmap"
|
||||
discuss_url = "http://gallery.menalto.com/node/89338"
|
||||
|
@ -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-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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 @@
|
||||
name = "Videos"
|
||||
description = "Allows authorized users to load videos directly from your web server"
|
||||
version = 4
|
||||
author_name = ""
|
||||
author_url = ""
|
||||
author_name = "rWatcher"
|
||||
author_url = "http://codex.gallery2.org/User:RWatcher"
|
||||
info_url = "http://codex.gallery2.org/Gallery3:Modules:videos"
|
||||
discuss_url = "http://gallery.menalto.com/forum_module_videos"
|
||||
discuss_url = "http://gallery.menalto.com/node/98149"
|
||||
|
@ -71,7 +71,7 @@ class albumpassword_Controller extends Controller {
|
||||
|
||||
// Convert submitted data to local variables.
|
||||
$album_id = Input::instance()->post("item_id");
|
||||
$album_password = Input::instance()->post("assignpassword_password");
|
||||
$album_password = strtolower(Input::instance()->post("assignpassword_password"));
|
||||
|
||||
// Check for, and remove, any existing passwords and cached ids.
|
||||
$existing_password = ORM::factory("items_albumpassword")->where("album_id", "=", $album_id)->find_all();
|
||||
@ -126,7 +126,7 @@ class albumpassword_Controller extends Controller {
|
||||
access::verify_csrf();
|
||||
|
||||
// Convert submitted data to local variables.
|
||||
$album_password = Input::instance()->post("albumpassword_password");
|
||||
$album_password = strtolower(Input::instance()->post("albumpassword_password"));
|
||||
|
||||
// See if the submitted password matches any in the database.
|
||||
$existing_password = ORM::factory("items_albumpassword")
|
||||
|
@ -34,7 +34,7 @@ class albumpassword_event_Core {
|
||||
->id("albumpassword_login")
|
||||
->css_id("g-album-password-login")
|
||||
->url(url::site("albumpassword/login"))
|
||||
->label(t("Enter password")));
|
||||
->label(t("Unlock albums")));
|
||||
} else {
|
||||
// If a password has been entered already
|
||||
// display the log out link, and links to the protected albums
|
||||
|
@ -26,11 +26,70 @@ class albumpassword_task_Core {
|
||||
->join("albumpassword_idcaches", "items_albumpasswords.id", "albumpassword_idcaches.password_id", "LEFT OUTER")
|
||||
->and_where("albumpassword_idcaches.password_id", "IS", NULL)->count_all();
|
||||
|
||||
return array(Task_Definition::factory()
|
||||
->callback("albumpassword_task::update_idcaches")
|
||||
->name(t("Rebuild Album Password ID Caches DB"))
|
||||
->description(t("Logs the contents of all protected albums into the db."))
|
||||
->severity($bad_albums ? log::WARNING : log::SUCCESS));
|
||||
$tasks = array();
|
||||
|
||||
$tasks[] = Task_Definition::factory()
|
||||
->callback("albumpassword_task::update_idcaches")
|
||||
->name(t("Rebuild Album Password ID Caches DB"))
|
||||
->description(t("Logs the contents of all protected albums into the db."))
|
||||
->severity($bad_albums ? log::WARNING : log::SUCCESS);
|
||||
|
||||
$tasks[] = Task_Definition::factory()
|
||||
->callback("albumpassword_task::lowercase_passwords")
|
||||
->name(t("Fix Password DB Casing"))
|
||||
->description(t("Fixes case sensitivity issues."))
|
||||
->severity(log::SUCCESS);
|
||||
|
||||
return $tasks;
|
||||
}
|
||||
|
||||
static function lowercase_passwords($task) {
|
||||
// Converts all passwords to lower case.
|
||||
|
||||
$start = microtime(true);
|
||||
$total = $task->get("total");
|
||||
$existing_passwords = ORM::factory("items_albumpassword")->find_all();
|
||||
|
||||
if (empty($total)) {
|
||||
// Set the initial values for all variables.
|
||||
$task->set("total", count($existing_passwords));
|
||||
$total = $task->get("total");
|
||||
$task->set("last_password_id", 0);
|
||||
$task->set("completed_passwords", 0);
|
||||
}
|
||||
|
||||
// Retrieve the values for variables from the last time this
|
||||
// function was run.
|
||||
$last_password_id = $task->get("last_password_id");
|
||||
$completed_passwords = $task->get("completed_passwords");
|
||||
|
||||
foreach (ORM::factory("items_albumpassword")
|
||||
->where("id", ">", $last_password_id)
|
||||
->order_by("id")
|
||||
->find_all(100) as $one_password) {
|
||||
$one_password->password = strtolower($one_password->password);
|
||||
$one_password->save();
|
||||
|
||||
$last_password_id = $one_password->id;
|
||||
$completed_passwords++;
|
||||
|
||||
if ($completed_passwords == count($existing_passwords) || microtime(true) - $start > 1.5) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
$task->set("last_password_id", $last_password_id);
|
||||
$task->set("completed_passwords", $completed_passwords);
|
||||
|
||||
if ($completed_passwords == count($existing_passwords)) {
|
||||
$task->done = true;
|
||||
$task->state = "success";
|
||||
$task->percent_complete = 100;
|
||||
} else {
|
||||
$task->percent_complete = round(100 * $completed_passwords / count($existing_passwords));
|
||||
}
|
||||
$task->status = t2("One password fixed", "%count / %total passwords fixed", $completed_passwords,
|
||||
array("total" => count($existing_passwords)));
|
||||
}
|
||||
|
||||
static function update_idcaches($task) {
|
||||
|
@ -1,7 +1,7 @@
|
||||
name = "Album Password"
|
||||
description = "Restrict access to individual albums."
|
||||
version = 3
|
||||
author_name = ""
|
||||
author_url = ""
|
||||
author_name = "rWatcher"
|
||||
author_url = "http://codex.gallery2.org/User:RWatcher"
|
||||
info_url = "http://codex.gallery2.org/Gallery3:Modules:albumpassword"
|
||||
discuss_url = "http://gallery.menalto.com/forum_module_albumpassword"
|
||||
discuss_url = "http://gallery.menalto.com/node/98856"
|
||||
|
BIN
3.1/modules/albumtree/images/base.gif
Executable file
After Width: | Height: | Size: 1.0 KiB |
BIN
3.1/modules/albumtree/images/empty.gif
Executable file
After Width: | Height: | Size: 62 B |
BIN
3.1/modules/albumtree/images/folder.gif
Executable file
After Width: | Height: | Size: 372 B |
BIN
3.1/modules/albumtree/images/folderopen.gif
Executable file
After Width: | Height: | Size: 376 B |
BIN
3.1/modules/albumtree/images/imgfolder.gif
Executable file
After Width: | Height: | Size: 622 B |
BIN
3.1/modules/albumtree/images/join.gif
Executable file
After Width: | Height: | Size: 69 B |
BIN
3.1/modules/albumtree/images/join_rtl.gif
Executable file
After Width: | Height: | Size: 67 B |
BIN
3.1/modules/albumtree/images/joinbottom.gif
Executable file
After Width: | Height: | Size: 66 B |
BIN
3.1/modules/albumtree/images/joinbottom_rtl.gif
Executable file
After Width: | Height: | Size: 64 B |
BIN
3.1/modules/albumtree/images/line.gif
Executable file
After Width: | Height: | Size: 66 B |
BIN
3.1/modules/albumtree/images/line_rtl.gif
Executable file
After Width: | Height: | Size: 65 B |
BIN
3.1/modules/albumtree/images/minus.gif
Executable file
After Width: | Height: | Size: 86 B |
BIN
3.1/modules/albumtree/images/minus_rtl.gif
Executable file
After Width: | Height: | Size: 86 B |
BIN
3.1/modules/albumtree/images/minusbottom.gif
Executable file
After Width: | Height: | Size: 85 B |
BIN
3.1/modules/albumtree/images/minusbottom_rtl.gif
Executable file
After Width: | Height: | Size: 85 B |
BIN
3.1/modules/albumtree/images/nolines_minus.gif
Executable file
After Width: | Height: | Size: 861 B |
BIN
3.1/modules/albumtree/images/nolines_plus.gif
Executable file
After Width: | Height: | Size: 870 B |
BIN
3.1/modules/albumtree/images/plus.gif
Executable file
After Width: | Height: | Size: 89 B |
BIN
3.1/modules/albumtree/images/plus_rtl.gif
Executable file
After Width: | Height: | Size: 89 B |
BIN
3.1/modules/albumtree/images/plusbottom.gif
Executable file
After Width: | Height: | Size: 88 B |
BIN
3.1/modules/albumtree/images/plusbottom_rtl.gif
Executable file
After Width: | Height: | Size: 88 B |
414
3.1/modules/albumtree/views/albumtree_block_dtree.html.php
Normal file
@ -0,0 +1,414 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.") ?>
|
||||
<script type="text/javascript">
|
||||
/*--------------------------------------------------|
|
||||
| dTree 2.05 | www.destroydrop.com/javascript/tree/ |
|
||||
|---------------------------------------------------|
|
||||
| Copyright (c) 2002-2003 Geir Landrö |
|
||||
| |
|
||||
| This script can be used freely as long as all |
|
||||
| copyright messages are intact. |
|
||||
| |
|
||||
| Updated: 17.04.2003 |
|
||||
|--------------------------------------------------*/
|
||||
|
||||
// Node object
|
||||
function Node(id, pid, name, url, title, target, icon, iconOpen, open) {
|
||||
this.id = id;
|
||||
this.pid = pid;
|
||||
this.name = name;
|
||||
this.url = url;
|
||||
this.title = title;
|
||||
this.target = target;
|
||||
this.icon = icon;
|
||||
this.iconOpen = iconOpen;
|
||||
this._io = open || false;
|
||||
this._is = false;
|
||||
this._ls = false;
|
||||
this._hc = false;
|
||||
this._ai = 0;
|
||||
this._p;
|
||||
};
|
||||
|
||||
// Tree object
|
||||
function dTree(objName) {
|
||||
this.config = {
|
||||
target : null,
|
||||
folderLinks : true,
|
||||
useSelection : true,
|
||||
useCookies : true,
|
||||
useLines : true,
|
||||
useIcons : false,
|
||||
useStatusText : false,
|
||||
closeSameLevel : false,
|
||||
inOrder : false,
|
||||
cookiePath : null,
|
||||
cookieDomain : null
|
||||
}
|
||||
this.obj = objName;
|
||||
this.aNodes = [];
|
||||
this.aIndent = [];
|
||||
this.root = new Node(-1);
|
||||
this.selectedNode = null;
|
||||
this.selectedFound = false;
|
||||
this.completed = false;
|
||||
};
|
||||
|
||||
// Adds a new node to the node array
|
||||
dTree.prototype.add = function(id, pid, name, url, title, target, icon, iconOpen, open) {
|
||||
this.aNodes[this.aNodes.length] = new Node(id, pid, name, url, title, target, icon, iconOpen, open);
|
||||
};
|
||||
|
||||
// Open/close all nodes
|
||||
dTree.prototype.openAll = function() {
|
||||
this.oAll(true);
|
||||
};
|
||||
dTree.prototype.closeAll = function() {
|
||||
this.oAll(false);
|
||||
};
|
||||
|
||||
// Outputs the tree to the page
|
||||
dTree.prototype.toString = function() {
|
||||
var str = '<div class="dtree">\n';
|
||||
if (document.getElementById) {
|
||||
if (this.config.useCookies) this.selectedNode = this.getSelected();
|
||||
str += this.addNode(this.root);
|
||||
} else str += 'Browser not supported.';
|
||||
str += '</div>';
|
||||
if (!this.selectedFound) this.selectedNode = null;
|
||||
this.completed = true;
|
||||
return str;
|
||||
};
|
||||
|
||||
// Creates the tree structure
|
||||
dTree.prototype.addNode = function(pNode) {
|
||||
var str = '';
|
||||
var n=0;
|
||||
if (this.config.inOrder) n = pNode._ai;
|
||||
for (n; n<this.aNodes.length; n++) {
|
||||
if (this.aNodes[n].pid == pNode.id) {
|
||||
var cn = this.aNodes[n];
|
||||
cn._p = pNode;
|
||||
cn._ai = n;
|
||||
this.setCS(cn);
|
||||
if (!cn.target && this.config.target) cn.target = this.config.target;
|
||||
if (cn._hc && !cn._io && this.config.useCookies) cn._io = this.isOpen(cn.id);
|
||||
if (!this.config.folderLinks && cn._hc) cn.url = null;
|
||||
if (this.config.useSelection && cn.id == this.selectedNode && !this.selectedFound) {
|
||||
cn._is = true;
|
||||
this.selectedNode = n;
|
||||
this.selectedFound = true;
|
||||
}
|
||||
str += this.node(cn, n);
|
||||
if (cn._ls) break;
|
||||
}
|
||||
}
|
||||
return str;
|
||||
};
|
||||
|
||||
// Creates the node icon, url and text
|
||||
dTree.prototype.node = function(node, nodeId) {
|
||||
var str = '<div class="dTreeNode" title="' + node.name + '">' + this.indent(node, nodeId);
|
||||
if (this.config.useIcons) {
|
||||
if (!node.icon) node.icon = (this.root.id == node.pid) ? this.icon.root : ((node._hc) ? this.icon.folder : this.icon.node);
|
||||
if (!node.iconOpen) node.iconOpen = (node._hc) ? this.icon.folderOpen : this.icon.node;
|
||||
if (this.root.id == node.pid) {
|
||||
node.icon = this.icon.root;
|
||||
node.iconOpen = this.icon.root;
|
||||
}
|
||||
str += '<img id="i' + this.obj + nodeId + '" src="' + ((node._io) ? node.iconOpen : node.icon) + '" alt="" />';
|
||||
}
|
||||
if (node.url) {
|
||||
str += '<a id="s' + this.obj + nodeId + '" class="' + ((this.config.useSelection) ? ((node._is ? 'nodeSel' : 'node')) : 'node') + '" href="' + node.url + '"';
|
||||
if (node.title) str += ' title="' + node.title + '"';
|
||||
if (node.target) str += ' target="' + node.target + '"';
|
||||
if (this.config.useStatusText) str += ' onmouseover="window.status=\'' + node.name + '\';return true;" onmouseout="window.status=\'\';return true;" ';
|
||||
if (this.config.useSelection && ((node._hc && this.config.folderLinks) || !node._hc))
|
||||
str += ' onclick="' + this.obj + '.s(' + nodeId + ');"';
|
||||
str += '>';
|
||||
}
|
||||
else if ((!this.config.folderLinks || !node.url) && node._hc && node.pid != this.root.id)
|
||||
str += '<a href="javascript: ' + this.obj + '.o(' + nodeId + ');" class="node">';
|
||||
str += node.name;
|
||||
if (node.url || ((!this.config.folderLinks || !node.url) && node._hc)) str += '</a>';
|
||||
str += '</div>';
|
||||
if (node._hc) {
|
||||
str += '<div id="d' + this.obj + nodeId + '" class="clip" style="display:' + ((this.root.id == node.pid || node._io) ? 'block' : 'none') + ';">';
|
||||
str += this.addNode(node);
|
||||
str += '</div>';
|
||||
}
|
||||
this.aIndent.pop();
|
||||
return str;
|
||||
};
|
||||
|
||||
// Adds the empty and line icons
|
||||
dTree.prototype.indent = function(node, nodeId) {
|
||||
var str = '';
|
||||
if (this.root.id != node.pid) {
|
||||
for (var n=0; n<this.aIndent.length; n++)
|
||||
str += '<img src="' + ( (this.aIndent[n] == 1 && this.config.useLines) ? this.icon.line : this.icon.empty ) + '" alt="" />';
|
||||
(node._ls) ? this.aIndent.push(0) : this.aIndent.push(1);
|
||||
if (node._hc) {
|
||||
str += '<a href="javascript: ' + this.obj + '.o(' + nodeId + ');"><img id="j' + this.obj + nodeId + '" src="';
|
||||
if (!this.config.useLines) str += (node._io) ? this.icon.nlMinus : this.icon.nlPlus;
|
||||
else str += ( (node._io) ? ((node._ls && this.config.useLines) ? this.icon.minusBottom : this.icon.minus) : ((node._ls && this.config.useLines) ? this.icon.plusBottom : this.icon.plus ) );
|
||||
str += '" alt="" /></a>';
|
||||
} else str += '<img src="' + ( (this.config.useLines) ? ((node._ls) ? this.icon.joinBottom : this.icon.join ) : this.icon.empty) + '" alt="" />';
|
||||
}
|
||||
return str;
|
||||
};
|
||||
|
||||
// Checks if a node has any children and if it is the last sibling
|
||||
dTree.prototype.setCS = function(node) {
|
||||
var lastId;
|
||||
for (var n=0; n<this.aNodes.length; n++) {
|
||||
if (this.aNodes[n].pid == node.id) node._hc = true;
|
||||
if (this.aNodes[n].pid == node.pid) lastId = this.aNodes[n].id;
|
||||
}
|
||||
if (lastId==node.id) node._ls = true;
|
||||
};
|
||||
|
||||
// Returns the selected node
|
||||
dTree.prototype.getSelected = function() {
|
||||
var sn = this.getCookie('cs' + this.obj);
|
||||
return (sn) ? sn : null;
|
||||
};
|
||||
|
||||
// Highlights the selected node
|
||||
dTree.prototype.s = function(id) {
|
||||
if (!this.config.useSelection) return;
|
||||
var cn = this.aNodes[id];
|
||||
if (cn._hc && !this.config.folderLinks) return;
|
||||
if (this.selectedNode != id) {
|
||||
if (this.selectedNode || this.selectedNode==0) {
|
||||
eOld = document.getElementById("s" + this.obj + this.selectedNode);
|
||||
eOld.className = "node";
|
||||
}
|
||||
eNew = document.getElementById("s" + this.obj + id);
|
||||
eNew.className = "nodeSel";
|
||||
this.selectedNode = id;
|
||||
if (this.config.useCookies) this.setCookie('cs' + this.obj, cn.id);
|
||||
}
|
||||
};
|
||||
|
||||
// Toggle Open or close
|
||||
dTree.prototype.o = function(id) {
|
||||
var cn = this.aNodes[id];
|
||||
this.nodeStatus(!cn._io, id, cn._ls);
|
||||
cn._io = !cn._io;
|
||||
if (this.config.closeSameLevel) this.closeLevel(cn);
|
||||
if (this.config.useCookies) this.updateCookie();
|
||||
};
|
||||
|
||||
// Open or close all nodes
|
||||
dTree.prototype.oAll = function(status) {
|
||||
for (var n=0; n<this.aNodes.length; n++) {
|
||||
if (this.aNodes[n]._hc && this.aNodes[n].pid != this.root.id) {
|
||||
this.nodeStatus(status, n, this.aNodes[n]._ls)
|
||||
this.aNodes[n]._io = status;
|
||||
}
|
||||
}
|
||||
if (this.config.useCookies) this.updateCookie();
|
||||
};
|
||||
|
||||
// Opens the tree to a specific node
|
||||
dTree.prototype.openTo = function(nId, bSelect, bFirst) {
|
||||
if (!bFirst) {
|
||||
for (var n=0; n<this.aNodes.length; n++) {
|
||||
if (this.aNodes[n].id == nId) {
|
||||
nId=n;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
var cn=this.aNodes[nId];
|
||||
if (cn.pid==this.root.id || !cn._p) return;
|
||||
cn._io = true;
|
||||
cn._is = bSelect;
|
||||
if (this.completed && cn._hc) this.nodeStatus(true, cn._ai, cn._ls);
|
||||
if (this.completed && bSelect) this.s(cn._ai);
|
||||
else if (bSelect) this._sn=cn._ai;
|
||||
this.openTo(cn._p._ai, false, true);
|
||||
};
|
||||
|
||||
// Closes all nodes on the same level as certain node
|
||||
dTree.prototype.closeLevel = function(node) {
|
||||
for (var n=0; n<this.aNodes.length; n++) {
|
||||
if (this.aNodes[n].pid == node.pid && this.aNodes[n].id != node.id && this.aNodes[n]._hc) {
|
||||
this.nodeStatus(false, n, this.aNodes[n]._ls);
|
||||
this.aNodes[n]._io = false;
|
||||
this.closeAllChildren(this.aNodes[n]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Closes all children of a node
|
||||
dTree.prototype.closeAllChildren = function(node) {
|
||||
for (var n=0; n<this.aNodes.length; n++) {
|
||||
if (this.aNodes[n].pid == node.id && this.aNodes[n]._hc) {
|
||||
if (this.aNodes[n]._io) this.nodeStatus(false, n, this.aNodes[n]._ls);
|
||||
this.aNodes[n]._io = false;
|
||||
this.closeAllChildren(this.aNodes[n]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Change the status of a node(open or closed)
|
||||
dTree.prototype.nodeStatus = function(status, id, bottom) {
|
||||
eDiv = document.getElementById('d' + this.obj + id);
|
||||
eJoin = document.getElementById('j' + this.obj + id);
|
||||
if (this.config.useIcons) {
|
||||
eIcon = document.getElementById('i' + this.obj + id);
|
||||
eIcon.src = (status) ? this.aNodes[id].iconOpen : this.aNodes[id].icon;
|
||||
}
|
||||
eJoin.src = (this.config.useLines)?
|
||||
((status)?((bottom)?this.icon.minusBottom:this.icon.minus):((bottom)?this.icon.plusBottom:this.icon.plus)):
|
||||
((status)?this.icon.nlMinus:this.icon.nlPlus);
|
||||
eDiv.style.display = (status) ? 'block': 'none';
|
||||
};
|
||||
|
||||
|
||||
// [Cookie] Clears a cookie
|
||||
dTree.prototype.clearCookie = function() {
|
||||
var now = new Date();
|
||||
var yesterday = new Date(now.getTime() - 1000 * 60 * 60 * 24);
|
||||
this.setCookie('co'+this.obj, 'cookieValue', yesterday);
|
||||
this.setCookie('cs'+this.obj, 'cookieValue', yesterday);
|
||||
};
|
||||
|
||||
// [Cookie] Sets value in a cookie
|
||||
dTree.prototype.setCookie = function(cookieName, cookieValue, expires, path, domain, secure) {
|
||||
path = path || this.config.cookiePath;
|
||||
domain = domain || this.config.cookieDomain;
|
||||
document.cookie =
|
||||
escape(cookieName) + '=' + escape(cookieValue)
|
||||
+ (expires ? '; expires=' + expires.toGMTString() : '')
|
||||
+ (path ? '; path=' + path : '')
|
||||
+ (domain ? '; domain=' + domain : '')
|
||||
+ (secure ? '; secure' : '');
|
||||
};
|
||||
|
||||
// [Cookie] Gets a value from a cookie
|
||||
dTree.prototype.getCookie = function(cookieName) {
|
||||
var cookieValue = '';
|
||||
var posName = document.cookie.indexOf(escape(cookieName) + '=');
|
||||
if (posName != -1) {
|
||||
var posValue = posName + (escape(cookieName) + '=').length;
|
||||
var endPos = document.cookie.indexOf(';', posValue);
|
||||
if (endPos != -1) cookieValue = unescape(document.cookie.substring(posValue, endPos));
|
||||
else cookieValue = unescape(document.cookie.substring(posValue));
|
||||
}
|
||||
return (cookieValue);
|
||||
};
|
||||
|
||||
// [Cookie] Returns ids of open nodes as a string
|
||||
dTree.prototype.updateCookie = function() {
|
||||
var str = '';
|
||||
for (var n=0; n<this.aNodes.length; n++) {
|
||||
if (this.aNodes[n]._io && this.aNodes[n].pid != this.root.id) {
|
||||
if (str) str += '.';
|
||||
str += this.aNodes[n].id;
|
||||
}
|
||||
}
|
||||
this.setCookie('co' + this.obj, str);
|
||||
};
|
||||
|
||||
// [Cookie] Checks if a node id is in a cookie
|
||||
dTree.prototype.isOpen = function(id) {
|
||||
var aOpen = this.getCookie('co' + this.obj).split('.');
|
||||
for (var n=0; n<aOpen.length; n++)
|
||||
if (aOpen[n] == id) return true;
|
||||
return false;
|
||||
};
|
||||
|
||||
// If Push and pop is not implemented by the browser
|
||||
if (!Array.prototype.push) {
|
||||
Array.prototype.push = function array_push() {
|
||||
for(var i=0;i<arguments.length;i++)
|
||||
this[this.length]=arguments[i];
|
||||
return this.length;
|
||||
}
|
||||
};
|
||||
if (!Array.prototype.pop) {
|
||||
Array.prototype.pop = function array_pop() {
|
||||
lastElement = this[this.length-1];
|
||||
this.length = Math.max(this.length-1,0);
|
||||
return lastElement;
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
||||
<style type="text/css">
|
||||
/*--------------------------------------------------|
|
||||
| dTree 2.05 | www.destroydrop.com/javascript/tree/ |
|
||||
|---------------------------------------------------|
|
||||
| Copyright (c) 2002-2003 Geir Landrö |
|
||||
|--------------------------------------------------*/
|
||||
|
||||
.dtree {
|
||||
font-size: 1.05em;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.dtree img {
|
||||
border: 0px;
|
||||
vertical-align: middle;
|
||||
}
|
||||
.dtree a.node, .dtree a.nodeSel {
|
||||
white-space: nowrap;
|
||||
padding: 1px 2px 1px 2px;
|
||||
}
|
||||
.dtree a.nodeSel {
|
||||
font-style: italic;
|
||||
}
|
||||
.dtree .clip {
|
||||
overflow: hidden;
|
||||
}
|
||||
</style>
|
||||
<div class="block-albumselect-AlbumTree gbBlock">
|
||||
<div class="dtree">
|
||||
<script type="text/javascript">
|
||||
// <![CDATA[
|
||||
function albumSelect_goToNode(nodeId) {
|
||||
document.location = new String('main.php?g2_itemId=__ID__').replace('__ID__', nodeId);
|
||||
}
|
||||
var albumTree = new dTree('albumTree');
|
||||
var albumTree_images = '<?= item::root()->url() ?>modules/albumtree/images/'
|
||||
albumTree.icon = {
|
||||
root : albumTree_images + 'base.gif',
|
||||
folder : albumTree_images + 'folder.gif',
|
||||
folderOpen : albumTree_images + 'imgfolder.gif',
|
||||
node : albumTree_images + 'imgfolder.gif',
|
||||
empty : albumTree_images + 'empty.gif',
|
||||
line : albumTree_images + 'line.gif',
|
||||
join : albumTree_images + 'join.gif',
|
||||
joinBottom : albumTree_images + 'joinbottom.gif',
|
||||
plus : albumTree_images + 'plus.gif',
|
||||
plusBottom : albumTree_images + 'plusbottom.gif',
|
||||
minus : albumTree_images + 'minus.gif',
|
||||
minusBottom : albumTree_images + 'minusbottom.gif',
|
||||
nlPlus : albumTree_images + 'nolines_plus.gif',
|
||||
nlMinus : albumTree_images + 'nolines_minus.gif'
|
||||
};
|
||||
albumTree.config.useLines = true;
|
||||
albumTree.config.useIcons = false;
|
||||
albumTree.config.useCookies = false;
|
||||
albumTree.config.closeSameLevel = false;
|
||||
albumTree.config.cookiePath = '<?= item::root()->url() ?>';
|
||||
albumTree.config.cookieDomain = '';
|
||||
{ var pf = '<?= item::root()->url() ?>';
|
||||
<?
|
||||
function addtree($album){
|
||||
?>
|
||||
albumTree.add(<?= $album->id -1 ?>, <?= $album->parent_id -1 ?>, "<?= $album->title ?>", pf+'<?= $album->relative_url_cache ?>');
|
||||
<?
|
||||
foreach ($album->viewable()->children(null, null, array(array("type", "=", "album"))) as $child){
|
||||
addtree($child);
|
||||
}
|
||||
}
|
||||
addtree($root);
|
||||
?>
|
||||
}
|
||||
document.write(albumTree);
|
||||
// ]]>
|
||||
</script>
|
||||
</div>
|
||||
</div>
|
@ -1,7 +1,7 @@
|
||||
name = "Exif GPS Data"
|
||||
description = "Extract Exif GPS data from photos."
|
||||
version = 2
|
||||
author_name = ""
|
||||
author_url = ""
|
||||
author_name = "rWatcher"
|
||||
author_url = "http://codex.gallery2.org/User:RWatcher"
|
||||
info_url = "http://codex.gallery2.org/Gallery3:Modules:exif_gps"
|
||||
discuss_url = "http://gallery.menalto.com/forum_module_exif_gps"
|
||||
discuss_url = "http://gallery.menalto.com/node/94762"
|
||||
|
@ -1,4 +1,8 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.") ?>
|
||||
<?
|
||||
$latitude = 0;
|
||||
$longitude = 0;
|
||||
?>
|
||||
<script type="text/javascript" src="http://www.google.com/jsapi?key=<?= module::get_var("exif_gps", "googlemap_api_key"); ?>"></script>
|
||||
<script type="text/javascript">
|
||||
google.load("maps", "3",{"other_params":"sensor=false"});
|
||||
@ -20,6 +24,8 @@
|
||||
<? if (!isset($currLat)) { ?>
|
||||
<? $currLat = $item_coordinates->latitude; ?>
|
||||
<? $currLong = $item_coordinates->longitude; ?>
|
||||
<? $latitude = $item_coordinates->latitude; ?>
|
||||
<? $longitude = $item_coordinates->longitude; ?>
|
||||
var marker<?=$counter; ?> = new google.maps.Marker({
|
||||
position: new google.maps.LatLng(<?=$item_coordinates->latitude; ?>,<?=$item_coordinates->longitude; ?>),
|
||||
map: map
|
||||
@ -35,14 +41,14 @@
|
||||
<? } else { ?>
|
||||
<? } ?>
|
||||
<? } ?>
|
||||
<? if (module::get_var("exif_gps", "googlemap_max_autozoom") != "") : ?>
|
||||
<? if (($max_autozoom = module::get_var("exif_gps", "googlemap_max_autozoom")) != "") : ?>
|
||||
// If there is a maximum auto-zoom value, then set up an event to check the zoom
|
||||
// level the first time it is changed, and adjust it if necessary.
|
||||
// (if we call map.getZoom right after .fitBounds, getZoom will return the initial
|
||||
// zoom level, not the auto zoom level, this way we get the auto zoomed value).
|
||||
google.maps.event.addListener(map, 'zoom_changed', function() {
|
||||
if (google_zoom_hack) {
|
||||
if (map.getZoom() > 18) map.setZoom(18);
|
||||
if (map.getZoom() > <?= $max_autozoom ?>) map.setZoom(<?= $max_autozoom ?>);
|
||||
google_zoom_hack = false;
|
||||
}
|
||||
});
|
||||
@ -56,4 +62,4 @@
|
||||
|
||||
</script>
|
||||
|
||||
<div id="sidebar_map_canvas" style="width:205px; height:214px"></div>
|
||||
<div id="sidebar_map_canvas" style="width:205px; height:214px"><img src="http://maps.google.com/maps/api/staticmap?center=<?=$latitude; ?>,<?=$longitude; ?>&zoom=<?= module::get_var("exif_gps", "sidebar_zoom"); ?>&size=205x214&maptype=<?=$sidebar_map_type ?>&markers=color:red|color:red|<?=$latitude; ?>,<?=$longitude; ?>&sensor=false"></div>
|
||||
|
@ -19,4 +19,4 @@
|
||||
google.setOnLoadCallback(initialize);
|
||||
|
||||
</script>
|
||||
<div id="sidebar_map_canvas" style="width:205px; height:214px"></div>
|
||||
<div id="sidebar_map_canvas" style="width:205px; height:214px"><img src="http://maps.google.com/maps/api/staticmap?center=<?=$latitude; ?>,<?=$longitude; ?>&zoom=<?= module::get_var("exif_gps", "sidebar_zoom"); ?>&size=205x214&maptype=<?=$sidebar_map_type ?>&markers=color:red|color:red|<?=$latitude; ?>,<?=$longitude; ?>&sensor=false"></div>
|
||||
|
@ -62,14 +62,14 @@
|
||||
infowindow<?=$counter; ?>.open(map,marker<?=$counter; ?>);
|
||||
});
|
||||
|
||||
<? if (module::get_var("exif_gps", "googlemap_max_autozoom") != "") : ?>
|
||||
<? if (($max_autozoom = module::get_var("exif_gps", "googlemap_max_autozoom")) != "") : ?>
|
||||
// If there is a maximum auto-zoom value, then set up an event to check the zoom
|
||||
// level the first time it is changed, and adjust it if necessary.
|
||||
// (if we call map.getZoom right after .fitBounds, getZoom will return the initial
|
||||
// zoom level, not the auto zoom level, this way we get the auto zoomed value).
|
||||
google.maps.event.addListener(map, 'zoom_changed', function() {
|
||||
if (google_zoom_hack) {
|
||||
if (map.getZoom() > 18) map.setZoom(18);
|
||||
if (map.getZoom() > <?= $max_autozoom ?>) map.setZoom(<?= $max_autozoom ?>);
|
||||
google_zoom_hack = false;
|
||||
}
|
||||
});
|
||||
|
@ -36,18 +36,28 @@ class Admin_PHPMailer_Controller extends Admin_Controller {
|
||||
$str_phpmailer_from_addr = Input::instance()->post("phpmailer_from_address");
|
||||
$str_phpmailer_from_name = Input::instance()->post("phpmailer_from_name");
|
||||
$str_smtp_server = Input::instance()->post("phpmailer_smtp_server");
|
||||
$str_use_ssl = Input::instance()->post("phpmailer_use_ssl");
|
||||
$str_smtp_login = Input::instance()->post("phpmailer_smtp_login");
|
||||
$str_smtp_pass = Input::instance()->post("phpmailer_smtp_password");
|
||||
|
||||
$str_smtp_port = Input::instance()->post("phpmailer_smtp_port");
|
||||
|
||||
if (count($str_use_ssl) > 0) {
|
||||
$str_use_ssl = true;
|
||||
} else {
|
||||
$str_use_ssl = false;
|
||||
}
|
||||
|
||||
// Save Settings.
|
||||
module::set_var("phpmailer", "phpmailer_path", $str_phpmailer_path);
|
||||
module::set_var("phpmailer", "phpmailer_from_address", $str_phpmailer_from_addr);
|
||||
module::set_var("phpmailer", "phpmailer_from_name", $str_phpmailer_from_name);
|
||||
module::set_var("phpmailer", "smtp_server", $str_smtp_server);
|
||||
module::set_var("phpmailer", "use_ssl", $str_use_ssl);
|
||||
module::set_var("phpmailer", "smtp_login", $str_smtp_login);
|
||||
module::set_var("phpmailer", "smtp_password", $str_smtp_pass);
|
||||
module::set_var("phpmailer", "smtp_port", $str_smtp_port);
|
||||
message::success(t("Your Settings Have Been Saved."));
|
||||
|
||||
|
||||
// Load Admin page.
|
||||
$view = new Admin_View("admin.html");
|
||||
$view->content = new View("admin_phpmailer.html");
|
||||
@ -80,9 +90,15 @@ class Admin_PHPMailer_Controller extends Admin_Controller {
|
||||
$phpmailerSMTP->input("phpmailer_smtp_login")
|
||||
->label(t("SMTP Login Name"))
|
||||
->value(module::get_var("phpmailer", "smtp_login"));
|
||||
$phpmailerSMTP->input("phpmailer_smtp_password")
|
||||
$phpmailerSMTP->password("phpmailer_smtp_password")
|
||||
->label(t("SMTP Password"))
|
||||
->value(module::get_var("phpmailer", "smtp_password"));
|
||||
$phpmailerSMTP->input("phpmailer_smtp_port")
|
||||
->label(t("SMTP Port"))
|
||||
->value(module::get_var("phpmailer", "smtp_port"));
|
||||
$phpmailer_checklist["use_ssl_checkbox"] = array(t("Use SSL?"), module::get_var("phpmailer", "use_ssl"));
|
||||
$phpmailerSMTP->checklist("phpmailer_use_ssl")
|
||||
->options($phpmailer_checklist);
|
||||
|
||||
// Add a save button to the form.
|
||||
$form->submit("SaveSettings")->value(t("Save"));
|
||||
@ -90,4 +106,4 @@ class Admin_PHPMailer_Controller extends Admin_Controller {
|
||||
// Return the newly generated form.
|
||||
return $form;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
41
3.1/modules/phpmailer/helpers/phpmailer_installer.php
Normal file
@ -0,0 +1,41 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2011 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 phpmailer_installer {
|
||||
static function install() {
|
||||
// Set the default value for this module's behavior.
|
||||
module::set_var("phpmailer", "phpmailer_path", "/path/to/class.phpmailer.php");
|
||||
module::set_var("phpmailer", "phpmailer_from_address", "example@gallery.com");
|
||||
module::set_var("phpmailer", "phpmailer_from_name", "Gallery Administrator");
|
||||
module::set_var("phpmailer", "smtp_server", "smtp.example.com");
|
||||
module::set_var("phpmailer", "use_ssl", false);
|
||||
module::set_var("phpmailer", "smtp_login", "");
|
||||
module::set_var("phpmailer", "smtp_password", "");
|
||||
module::set_var("phpmailer", "smtp_port", "25");
|
||||
|
||||
// Set the module's version number.
|
||||
module::set_version("phpmailer", 2);
|
||||
}
|
||||
|
||||
static function upgrade($version) {
|
||||
module::set_var("phpmailer", "use_ssl", false);
|
||||
module::set_var("phpmailer", "smtp_port", "25");
|
||||
module::set_version("phpmailer", 2);
|
||||
}
|
||||
}
|
@ -102,9 +102,13 @@ class Sendmail_Core {
|
||||
|
||||
$mail->IsSMTP();
|
||||
$mail->Host = module::get_var("phpmailer", "smtp_server");
|
||||
$mail->Port = module::get_var("phpmailer", "smtp_port");
|
||||
|
||||
if (module::get_var("phpmailer", "smtp_login") != "") {
|
||||
$mail->SMTPAuth = true;
|
||||
if (module::get_var("phpmailer", "use_ssl") == true) {
|
||||
$mail->SMTPSecure = "ssl";
|
||||
}
|
||||
$mail->Username = module::get_var("phpmailer", "smtp_login");
|
||||
$mail->Password = module::get_var("phpmailer", "smtp_password");
|
||||
} else {
|
||||
@ -115,9 +119,20 @@ class Sendmail_Core {
|
||||
$mail->FromName = module::get_var("phpmailer", "phpmailer_from_name");
|
||||
$mail->AddAddress($to);
|
||||
$mail->IsHTML(true);
|
||||
|
||||
// demdel's fix for the ecard module.
|
||||
$boundaryLine = explode("\n", $message, -1);
|
||||
$newboundary = substr($boundaryLine[0],2);
|
||||
if (preg_match("/--/", $boundaryLine[0])) {
|
||||
if (preg_match("/--".$newboundary."--/", end($boundaryLine))) {
|
||||
$mail->CharSet = "UTF-8";
|
||||
$mail->ContentType = "multipart/related; boundary=\"".$newboundary."\"";
|
||||
}
|
||||
}
|
||||
|
||||
$mail->Subject = $subject;
|
||||
$mail->Body = $message;
|
||||
|
||||
return $mail->Send();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -1,7 +1,7 @@
|
||||
name = "PHPMailer"
|
||||
description = "Use PHPMailer when sending email messages."
|
||||
version = 1
|
||||
author_name = ""
|
||||
author_url = ""
|
||||
version = 2
|
||||
author_name = "rWatcher"
|
||||
author_url = "http://codex.gallery2.org/User:RWatcher"
|
||||
info_url = "http://codex.gallery2.org/Gallery3:Modules:phpmailer"
|
||||
discuss_url = "http://gallery.menalto.com/forum_module_phpmailer"
|
||||
discuss_url = "http://gallery.menalto.com/node/89279"
|
||||
|
@ -206,8 +206,12 @@ class Admin_TagsMap_Controller extends Admin_Controller {
|
||||
$startingmap_group->dropdown("google_default_type")
|
||||
->label(t("Default Map Type"))
|
||||
->options(
|
||||
array("G_NORMAL_MAP", "G_SATELLITE_MAP", "G_HYBRID_MAP",
|
||||
"G_PHYSICAL_MAP", "G_SATELLITE_3D_MAP"));
|
||||
array("G_NORMAL_MAP" => "Normal",
|
||||
"G_SATELLITE_MAP" => "Satellite",
|
||||
"G_HYBRID_MAP" => "Hybrid",
|
||||
"G_PHYSICAL_MAP" => "Physical",
|
||||
"G_SATELLITE_3D_MAP" => "Google Earth"))
|
||||
->selected(module::get_var("tagsmap", "googlemap_type"));
|
||||
|
||||
// Add a save button to the form.
|
||||
$form->submit("SaveSettings")->value(t("Save"));
|
||||
|
@ -1,7 +1,7 @@
|
||||
name = "TagsMap"
|
||||
description = "Assign GPS coordinates to existing tags and display them on a map."
|
||||
version = 2
|
||||
author_name = ""
|
||||
author_url = ""
|
||||
author_name = "rWatcher"
|
||||
author_url = "http://codex.gallery2.org/User:RWatcher"
|
||||
info_url = "http://codex.gallery2.org/Gallery3:Modules:tagsmap"
|
||||
discuss_url = "http://gallery.menalto.com/forum_module_tagsmap"
|
||||
discuss_url = "http://gallery.menalto.com/node/89338"
|
||||
|
@ -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-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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-2010 Bharat Mediratta
|
||||
* Copyright (C) 2000-2011 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 @@
|
||||
name = "Videos"
|
||||
description = "Allows authorized users to load videos directly from your web server"
|
||||
version = 4
|
||||
author_name = ""
|
||||
author_url = ""
|
||||
author_name = "rWatcher"
|
||||
author_url = "http://codex.gallery2.org/User:RWatcher"
|
||||
info_url = "http://codex.gallery2.org/Gallery3:Modules:videos"
|
||||
discuss_url = "http://gallery.menalto.com/forum_module_videos"
|
||||
discuss_url = "http://gallery.menalto.com/node/98149"
|
||||
|