Merge remote-tracking branch 'gallery3-contrib/master'
This commit is contained in:
commit
7484b49eb1
@ -1,7 +1,6 @@
|
|||||||
<?php defined("SYSPATH") or die("No direct script access.");
|
<?php defined("SYSPATH") or die("No direct script access.");/**
|
||||||
/**
|
|
||||||
* Gallery - a web based photo album viewer and editor
|
* Gallery - a web based photo album viewer and editor
|
||||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
* Copyright (C) 2000-2009 Bharat Mediratta
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or modify
|
* 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
|
* it under the terms of the GNU General Public License as published by
|
||||||
@ -17,35 +16,45 @@
|
|||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
*/
|
*/
|
||||||
class Admin_Google_Analytics_Controller extends Admin_Controller {
|
class Admin_Google_Analytics_Controller extends Admin_Controller
|
||||||
public function index() {
|
{
|
||||||
|
public function index()
|
||||||
|
{
|
||||||
print $this->_get_view();
|
print $this->_get_view();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function handler() {
|
public function handler()
|
||||||
|
{
|
||||||
access::verify_csrf();
|
access::verify_csrf();
|
||||||
|
|
||||||
$form = $this->_get_form();
|
$form = $this->_get_form();
|
||||||
if ($form->validate()) {
|
|
||||||
module::set_var(
|
if ($form->validate())
|
||||||
"google_analytics", "code", $form->google_analytics_code->analytics_code->value);
|
{
|
||||||
|
module::set_var("google_analytics", "code", $form->google_analytics_code->inputs["analytics_code"]->value);
|
||||||
|
module::set_var("google_analytics", "owneradmin_hidden", $form->google_analytics_code->inputs["analytics_owneradmin_hidden"]->value);
|
||||||
url::redirect("admin/google_analytics");
|
url::redirect("admin/google_analytics");
|
||||||
}
|
}
|
||||||
|
|
||||||
print $this->_get_view($form);
|
print $this->_get_view($form);
|
||||||
}
|
}
|
||||||
|
|
||||||
private function _get_view($form=null) {
|
private function _get_view($form=null)
|
||||||
|
{
|
||||||
$v = new Admin_View("admin.html");
|
$v = new Admin_View("admin.html");
|
||||||
$v->content = new View("admin_google_analytics.html");
|
$v->content = new View("admin_google_analytics.html");
|
||||||
$v->content->form = empty($form) ? $this->_get_form() : $form;
|
$v->content->form = empty($form) ? $this->_get_form() : $form;
|
||||||
return $v;
|
return $v;
|
||||||
}
|
}
|
||||||
|
|
||||||
private function _get_form() {
|
private function _get_form()
|
||||||
$form = new Forge("admin/google_analytics/handler", "", "post", array("id" => "g-admin-form"));
|
{
|
||||||
|
$form = new Forge("admin/google_analytics/handler", "", "post",
|
||||||
|
array("id" => "gAdminForm"));
|
||||||
$group = $form->group("google_analytics_code");
|
$group = $form->group("google_analytics_code");
|
||||||
$group->input("analytics_code")->label(t('Enter the <a href="http://www.google.com/support/googleanalytics/bin/answer.py?answer=113500" target="_blank">Web-Property-ID</a> given by Google.'))->rules("required")->value(module::get_var("google_analytics", "code"));
|
$group->input("analytics_code")->label(t('Enter the <a href="http://www.google.com/support/googleanalytics/bin/answer.py?answer=113500" target="_blank">Web-Property-ID</a> given by Google.'))->rules("required")->value(module::get_var("google_analytics", "code"));
|
||||||
|
$group->checkbox("analytics_owneradmin_hidden")->label(t("Omit code for owner and admin"))
|
||||||
|
->checked(module::get_var("google_analytics", "owneradmin_hidden", false) == 1);
|
||||||
$group->submit("submit")->value(t("Save"));
|
$group->submit("submit")->value(t("Save"));
|
||||||
|
|
||||||
return $form;
|
return $form;
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
<?php defined("SYSPATH") or die("No direct script access.");
|
<?php defined("SYSPATH") or die("No direct script access.");
|
||||||
/**
|
/**
|
||||||
* Gallery - a web based photo album viewer and editor
|
* Gallery - a web based photo album viewer and editor
|
||||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
* Copyright (C) 2000-2009 Bharat Mediratta
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or modify
|
* 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
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
@ -0,0 +1,45 @@
|
|||||||
|
<?php defined("SYSPATH") or die("No direct script access.");/**
|
||||||
|
* Gallery - a web based photo album viewer and editor
|
||||||
|
* Copyright (C) 2000-2009 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 google_analytics_installer
|
||||||
|
{
|
||||||
|
static function install()
|
||||||
|
{
|
||||||
|
module::set_var("google_analytics", "code", "");
|
||||||
|
module::set_var("google_analytics", "owneradmin_hidden", "");
|
||||||
|
module::set_version("google_analytics", 4);
|
||||||
|
}
|
||||||
|
|
||||||
|
static function upgrade($version)
|
||||||
|
{
|
||||||
|
module::set_version("google_analytics", 4);
|
||||||
|
}
|
||||||
|
|
||||||
|
static function deactivate()
|
||||||
|
{
|
||||||
|
module::clear_var("google_analytics", "code");
|
||||||
|
module::clear_var("google_analytics", "owneradmin_hidden");
|
||||||
|
}
|
||||||
|
|
||||||
|
static function uninstall()
|
||||||
|
{
|
||||||
|
module::clear_var("google_analytics", "code");
|
||||||
|
module::clear_var("google_analytics", "owneradmin_hidden");
|
||||||
|
module::delete("google_analytics");
|
||||||
|
}
|
||||||
|
}
|
@ -1,7 +1,6 @@
|
|||||||
<?php defined("SYSPATH") or die("No direct script access.");
|
<?php defined("SYSPATH") or die("No direct script access.");/**
|
||||||
/**
|
|
||||||
* Gallery - a web based photo album viewer and editor
|
* Gallery - a web based photo album viewer and editor
|
||||||
* Copyright (C) 2000-2012 Bharat Mediratta
|
* Copyright (C) 2000-2009 Bharat Mediratta
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or modify
|
* 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
|
* it under the terms of the GNU General Public License as published by
|
||||||
@ -17,30 +16,38 @@
|
|||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
*/
|
*/
|
||||||
class google_analytics_theme {
|
class google_analytics_theme
|
||||||
static function page_bottom($theme) {
|
{
|
||||||
$code = module::get_var("google_analytics", "code");
|
static function head($theme)
|
||||||
if (!$code) {
|
{
|
||||||
return;
|
$u_o = 1;
|
||||||
|
if ( ($theme->item->owner_id != identity::active_user()->id) && (identity::active_user()->admin == 0) ) {
|
||||||
|
$u_o = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ( $u_o == 0 || ( ($u_o == 1) && (module::get_var("google_analytics", "owneradmin_hidden") == 0) ) ) {
|
||||||
$google_code = '
|
$google_code = '
|
||||||
<!-- Begin Google Analytics -->
|
<!-- Begin Google Analytics -->
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
var gaJsHost = (("https:" == document.location.protocol) ?
|
|
||||||
"https://ssl." : "http://www.");
|
var _gaq = _gaq || [];
|
||||||
document.write(unescape("%3Cscript src=\'" + gaJsHost + "google-analytics.com/ga.js\' type=\'text/javascript\'%3E%3C/script%3E"));
|
_gaq.push(["_setAccount", "'.module::get_var("google_analytics", "code").'"]);
|
||||||
</script>
|
_gaq.push(["_trackPageview"]);
|
||||||
<script type="text/javascript">
|
|
||||||
try
|
(function() {
|
||||||
{
|
var ga = document.createElement("script"); ga.type = "text/javascript"; ga.async = true;
|
||||||
var pageTracker = _gat._getTracker("' . $code . '");
|
ga.src = ("https:" == document.location.protocol ? "https://ssl" : "http://www") + ".google-analytics.com/ga.js";
|
||||||
pageTracker._trackPageview();
|
var s = document.getElementsByTagName("script")[0]; s.parentNode.insertBefore(ga, s);
|
||||||
}
|
})();
|
||||||
catch(err){}
|
|
||||||
</script>
|
</script>
|
||||||
<!-- End Google Analytics -->';
|
<!-- End Google Analytics -->';
|
||||||
|
|
||||||
return $google_code;
|
return $google_code;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
name = "Google Analytics"
|
name = Google Analytics
|
||||||
description = "Renders the Google Analytics Code at the end of the page. Written by 'mcp'."
|
description = Renders the Google Analytics Code in the head of the page.
|
||||||
version = 2
|
version = 4
|
||||||
author_name = ""
|
author_name = ""
|
||||||
author_url = ""
|
author_url = ""
|
||||||
info_url = "http://codex.gallery2.org/Gallery3:Modules:google_analytics"
|
info_url = "http://codex.gallery2.org/Gallery3:Modules:google_analytics"
|
||||||
discuss_url = "http://gallery.menalto.com/forum_module_google_analytics"
|
discuss_url = "http://gallery.menalto.com/node/88884"
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
<?php defined("SYSPATH") or die("No direct script access.") ?>
|
<?php defined("SYSPATH") or die("No direct script access.") ?>
|
||||||
<div id="g-admin-google-analytics">
|
<div id="gAdminGoogleAnalytics">
|
||||||
<h2>
|
<h2>
|
||||||
<?= t("Google Analytics Adminstration") ?> </h2>
|
<?= t("Google Analytics Adminstration") ?> </h2>
|
||||||
<?= $form ?>
|
<?= $form ?>
|
||||||
|
Reference in New Issue
Block a user