public/gallery3-contrib
Archived
1
0
Fork 0
Code Releases Activity

Merge commit 'upstream/master'

Browse Source
This commit is contained in:
Matt Blythe 2011-04-29 00:10:17 -06:00
commit 9f2c5df92e
44 changed files with 370 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
3.0/modules/albumpassword/controllers/albumpassword.php
View File

@ -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")

2
3.0/modules/albumpassword/helpers/albumpassword_event.php
View File

@ -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

69
3.0/modules/albumpassword/helpers/albumpassword_task.php
View File

@ -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) {

6
3.0/modules/albumpassword/module.info
View File

@ -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"

6
3.0/modules/exif_gps/module.info
View File

@ -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"

12
3.0/modules/exif_gps/views/exif_gps_dynamic2_sidebar.html.php
View File

@ -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>

2
3.0/modules/exif_gps/views/exif_gps_dynamic_sidebar.html.php
View File

@ -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>

4
3.0/modules/exif_gps/views/exif_gps_map.html.php
View File

@ -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;
}
});

24
3.0/modules/phpmailer/controllers/admin_phpmailer.php
View File

@ -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
View 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);
}
}

17
3.0/modules/phpmailer/libraries/Sendmail.php
View File

@ -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();
}
}
}

8
3.0/modules/phpmailer/module.info
View File

@ -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"

8
3.0/modules/tagsmap/controllers/admin_tagsmap.php
View File

@ -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"));

6
3.0/modules/tagsmap/module.info
View File

@ -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"

2
3.0/modules/videos/controllers/admin_videos.php
View 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-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

2
3.0/modules/videos/controllers/videos.php
View 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-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

2
3.0/modules/videos/helpers/videos.php
View 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-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

2
3.0/modules/videos/helpers/videos_event.php
View 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-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

2
3.0/modules/videos/helpers/videos_installer.php
View 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-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

2
3.0/modules/videos/helpers/videos_theme.php
View 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-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

2
3.0/modules/videos/models/videos_entry.php
View 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-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

6
3.0/modules/videos/module.info
View File

@ -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"

4
3.1/modules/albumpassword/controllers/albumpassword.php
View File

@ -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")

2
3.1/modules/albumpassword/helpers/albumpassword_event.php
View File

@ -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

69
3.1/modules/albumpassword/helpers/albumpassword_task.php
View File

@ -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) {

6
3.1/modules/albumpassword/module.info
View File

@ -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"

6
3.1/modules/exif_gps/module.info
View File

@ -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"

12
3.1/modules/exif_gps/views/exif_gps_dynamic2_sidebar.html.php
View File

@ -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>

2
3.1/modules/exif_gps/views/exif_gps_dynamic_sidebar.html.php
View File

@ -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>

4
3.1/modules/exif_gps/views/exif_gps_map.html.php
View File

@ -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;
}
});

24
3.1/modules/phpmailer/controllers/admin_phpmailer.php
View File

@ -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
View 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);
}
}

17
3.1/modules/phpmailer/libraries/Sendmail.php
View File

@ -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();
}
}
}

8
3.1/modules/phpmailer/module.info
View File

@ -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"

8
3.1/modules/tagsmap/controllers/admin_tagsmap.php
View File

@ -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"));

6
3.1/modules/tagsmap/module.info
View File

@ -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"

2
3.1/modules/videos/controllers/admin_videos.php
View 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-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

2
3.1/modules/videos/controllers/videos.php
View 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-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

2
3.1/modules/videos/helpers/videos.php
View 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-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

2
3.1/modules/videos/helpers/videos_event.php
View 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-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

2
3.1/modules/videos/helpers/videos_installer.php
View 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-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

2
3.1/modules/videos/helpers/videos_theme.php
View 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-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

2
3.1/modules/videos/models/videos_entry.php
View 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-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

6
3.1/modules/videos/module.info
View File

@ -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"