1
0

Remove carriage returns, clean up description

This commit is contained in:
Bharat Mediratta 2011-12-27 01:02:32 -08:00
parent b2078a091e
commit 94be4c4ba6
8 changed files with 283 additions and 283 deletions

View File

@ -1,62 +1,62 @@
<?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-2009 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
* the Free Software Foundation; either version 2 of the License, or (at * the Free Software Foundation; either version 2 of the License, or (at
* your option) any later version. * your option) any later version.
* *
* This program is distributed in the hope that it will be useful, but * This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of * WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details. * General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* 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_Content_Warning_Controller extends Admin_Controller { class Admin_Content_Warning_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()) { if ($form->validate()) {
module::set_var("content_warning", "title", $form->content_warning->inputs["title"]->value); module::set_var("content_warning", "title", $form->content_warning->inputs["title"]->value);
module::set_var("content_warning", "message", $form->content_warning->inputs["message"]->value); module::set_var("content_warning", "message", $form->content_warning->inputs["message"]->value);
module::set_var("content_warning", "enter_link_text", $form->content_warning->inputs["enter_link_text"]->value); module::set_var("content_warning", "enter_link_text", $form->content_warning->inputs["enter_link_text"]->value);
//module::set_var("content_warning", "enter_link_url", $form->content_warning->inputs["enter_link_url"]->value); //module::set_var("content_warning", "enter_link_url", $form->content_warning->inputs["enter_link_url"]->value);
module::set_var("content_warning", "exit_link_text", $form->content_warning->inputs["exit_link_text"]->value); module::set_var("content_warning", "exit_link_text", $form->content_warning->inputs["exit_link_text"]->value);
module::set_var("content_warning", "exit_link_url", $form->content_warning->inputs["exit_link_url"]->value); module::set_var("content_warning", "exit_link_url", $form->content_warning->inputs["exit_link_url"]->value);
url::redirect("admin/content_warning"); url::redirect("admin/content_warning");
} }
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_content_warning.html"); $v->content = new View("admin_content_warning.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/content_warning/handler", "", "post", $form = new Forge("admin/content_warning/handler", "", "post",
array("id" => "gAdminContentWerning")); array("id" => "gAdminContentWerning"));
$group = $form->group("content_warning"); $group = $form->group("content_warning");
$group->input("title")->label(t('Title (Will be displayed within H3)'))->rules("required")->value(module::get_var("content_warning", "title")); $group->input("title")->label(t('Title (Will be displayed within H3)'))->rules("required")->value(module::get_var("content_warning", "title"));
$group->textarea("message")->label(t('Message (you can use HTML tags)'))->rules("required")->value(module::get_var("content_warning", "message")); $group->textarea("message")->label(t('Message (you can use HTML tags)'))->rules("required")->value(module::get_var("content_warning", "message"));
$group->input("enter_link_text")->label(t('Enter Label'))->rules("required")->value(module::get_var("content_warning", "enter_link_text")); $group->input("enter_link_text")->label(t('Enter Label'))->rules("required")->value(module::get_var("content_warning", "enter_link_text"));
//$group->input("enter_link_url")->label(t('Enter Url (Leave empty to redirect to the previous page)'))->value(module::get_var("content_warning", "enter_link_url")); //$group->input("enter_link_url")->label(t('Enter Url (Leave empty to redirect to the previous page)'))->value(module::get_var("content_warning", "enter_link_url"));
$group->input("exit_link_text")->label(t('Exit Label'))->rules("required")->value(module::get_var("content_warning", "exit_link_text")); $group->input("exit_link_text")->label(t('Exit Label'))->rules("required")->value(module::get_var("content_warning", "exit_link_text"));
$group->input("exit_link_url")->label(t('Exit Url'))->rules("required")->value(module::get_var("content_warning", "exit_link_url")); $group->input("exit_link_url")->label(t('Exit Url'))->rules("required")->value(module::get_var("content_warning", "exit_link_url"));
$group->submit("submit")->value(t("Save")); $group->submit("submit")->value(t("Save"));
return $form; return $form;
} }
} }

View File

@ -1,27 +1,27 @@
<?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-2009 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
* the Free Software Foundation; either version 2 of the License, or (at * the Free Software Foundation; either version 2 of the License, or (at
* your option) any later version. * your option) any later version.
* *
* This program is distributed in the hope that it will be useful, but * This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of * WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details. * General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* 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 Content_Warning_Controller extends Controller { class Content_Warning_Controller extends Controller {
public function index() { public function index() {
if(isset($_GET['cw'])) { if(isset($_GET['cw'])) {
setcookie('cw_agree', '1', time() + (60 * 60 * 24), '/'); setcookie('cw_agree', '1', time() + (60 * 60 * 24), '/');
header("Location: /"); header("Location: /");
exit; exit;
} }
} }
} }

View File

@ -1,29 +1,29 @@
<?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-2009 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
* the Free Software Foundation; either version 2 of the License, or (at * the Free Software Foundation; either version 2 of the License, or (at
* your option) any later version. * your option) any later version.
* *
* This program is distributed in the hope that it will be useful, but * This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of * WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details. * General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* 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 content_warning_event_Core { class content_warning_event_Core {
static function admin_menu($menu, $theme) { static function admin_menu($menu, $theme) {
$menu->get("settings_menu") $menu->get("settings_menu")
->append(Menu::factory("link") ->append(Menu::factory("link")
->id("content_warning_menu") ->id("content_warning_menu")
->label(t("Content Warning")) ->label(t("Content Warning"))
->url(url::site("admin/content_warning"))); ->url(url::site("admin/content_warning")));
} }
} }

View File

@ -1,41 +1,41 @@
<?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-2009 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
* the Free Software Foundation; either version 2 of the License, or (at * the Free Software Foundation; either version 2 of the License, or (at
* your option) any later version. * your option) any later version.
* *
* This program is distributed in the hope that it will be useful, but * This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of * WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details. * General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* 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 content_warning_installer { class content_warning_installer {
static function install() { static function install() {
module::set_var("content_warning", "title", "Warning!"); module::set_var("content_warning", "title", "Warning!");
module::set_var("content_warning", "message", "This site contains inappropriate material"); module::set_var("content_warning", "message", "This site contains inappropriate material");
module::set_var("content_warning", "enter_link_text", "Enter"); module::set_var("content_warning", "enter_link_text", "Enter");
module::set_var("content_warning", "exit_link_text", "Exit"); module::set_var("content_warning", "exit_link_text", "Exit");
module::set_var("content_warning", "exit_link_url", "http://www.google.com"); module::set_var("content_warning", "exit_link_url", "http://www.google.com");
module::set_version("content_warning", 1); module::set_version("content_warning", 1);
} }
static function upgrade($version) { static function upgrade($version) {
//module::set_version("content_warning", 2); //module::set_version("content_warning", 2);
} }
static function uninstall() { static function uninstall() {
module::clear_var("content_warning", "title"); module::clear_var("content_warning", "title");
module::clear_var("content_warning", "message"); module::clear_var("content_warning", "message");
module::clear_var("content_warning", "enter_link_text"); module::clear_var("content_warning", "enter_link_text");
module::clear_var("content_warning", "exit_link_text"); module::clear_var("content_warning", "exit_link_text");
module::clear_var("content_warning", "exit_link_url"); module::clear_var("content_warning", "exit_link_url");
module::delete("content_warning"); module::delete("content_warning");
} }
} }

View File

@ -1,56 +1,56 @@
<?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-2009 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
* the Free Software Foundation; either version 2 of the License, or (at * the Free Software Foundation; either version 2 of the License, or (at
* your option) any later version. * your option) any later version.
* *
* This program is distributed in the hope that it will be useful, but * This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of * WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details. * General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* 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 content_warning_theme { class content_warning_theme {
static function head($theme) { static function head($theme) {
$h = ' $h = '
<script type="text/javascript" src="/lib/jquery.js"></script> <script type="text/javascript" src="/lib/jquery.js"></script>
<link type="text/css" href="/modules/content_warning/jqModal.css" rel="stylesheet" /> <link type="text/css" href="/modules/content_warning/jqModal.css" rel="stylesheet" />
<script type="text/javascript" src="/modules/content_warning/jqModal.js"></script> <script type="text/javascript" src="/modules/content_warning/jqModal.js"></script>
<script type="text/javascript"> <script type="text/javascript">
jQuery().ready(function($){ jQuery().ready(function($){
$(\'#dialog\').jqm().jqmShow({}); $(\'#dialog\').jqm().jqmShow({});
}); });
</script> </script>
'; ';
return $h; return $h;
} }
static function page_top($theme) { static function page_top($theme) {
$cw = ' $cw = '
<div class="jqmWindow" id="dialog"> <div class="jqmWindow" id="dialog">
<hr /> <hr />
<h3>'.module::get_var("content_warning", "title").'</h3> <h3>'.module::get_var("content_warning", "title").'</h3>
<br /> <br />
<p>'.nl2br(module::get_var("content_warning", "message")).'</p> <p>'.nl2br(module::get_var("content_warning", "message")).'</p>
<br /> <br />
<div id="cw_buttons_container"> <div id="cw_buttons_container">
<div class="cw_buttons" id="cw_ko"> <div class="cw_buttons" id="cw_ko">
<a href="'.module::get_var("content_warning", "exit_link_url").'">'.module::get_var("content_warning", "exit_link_text").'</a> <a href="'.module::get_var("content_warning", "exit_link_url").'">'.module::get_var("content_warning", "exit_link_text").'</a>
</div> </div>
<div class="cw_buttons" id="cw_ok"> <div class="cw_buttons" id="cw_ok">
<a href="/index.php/content_warning?cw=1">'.module::get_var("content_warning", "enter_link_text").'</a> <a href="/index.php/content_warning?cw=1">'.module::get_var("content_warning", "enter_link_text").'</a>
</div> </div>
</div> </div>
</div> </div>
'; ';
if(!isset($_COOKIE['cw_agree'])) { if(!isset($_COOKIE['cw_agree'])) {
return $cw; return $cw;
} }
} }
} }

View File

@ -1,65 +1,65 @@
/* jqModal base Styling courtesy of; /* jqModal base Styling courtesy of;
Brice Burgess <bhb@iceburg.net> */ Brice Burgess <bhb@iceburg.net> */
/* The Window's CSS z-index value is respected (takes priority). If none is supplied, /* The Window's CSS z-index value is respected (takes priority). If none is supplied,
the Window's z-index value will be set to 3000 by default (via jqModal.js). */ the Window's z-index value will be set to 3000 by default (via jqModal.js). */
.jqmWindow { .jqmWindow {
display: none; display: none;
position: fixed; position: fixed;
top: 5%; top: 5%;
left: 5%; left: 5%;
/*margin-left: -500px;*/ /*margin-left: -500px;*/
width: 90%; width: 90%;
height: 90%; height: 90%;
background-color: #EEE; background-color: #EEE;
color: #333; color: #333;
border: 1px solid black; border: 1px solid black;
padding: 12px; padding: 12px;
} }
.jqmOverlay { .jqmOverlay {
background-color: #000; background-color: #000;
} }
/* Background iframe styling for IE6. Prevents ActiveX bleed-through (<select> form elements, etc.) */ /* Background iframe styling for IE6. Prevents ActiveX bleed-through (<select> form elements, etc.) */
* iframe.jqm { * iframe.jqm {
position:absolute; position:absolute;
top:0; top:0;
left:0; left:0;
z-index:-1; z-index:-1;
width: expression(this.parentNode.offsetWidth+'px'); width: expression(this.parentNode.offsetWidth+'px');
height: expression(this.parentNode.offsetHeight+'px'); height: expression(this.parentNode.offsetHeight+'px');
} }
/* Fixed posistioning emulation for IE6 /* Fixed posistioning emulation for IE6
Star selector used to hide definition from browsers other than IE6 Star selector used to hide definition from browsers other than IE6
For valid CSS, use a conditional include instead */ For valid CSS, use a conditional include instead */
* html .jqmWindow { * html .jqmWindow {
position: absolute; position: absolute;
top: expression((document.documentElement.scrollTop || document.body.scrollTop) + Math.round(17 * (document.documentElement.offsetHeight || document.body.clientHeight) / 100) + 'px'); top: expression((document.documentElement.scrollTop || document.body.scrollTop) + Math.round(17 * (document.documentElement.offsetHeight || document.body.clientHeight) / 100) + 'px');
} }
#cw_buttons_container { #cw_buttons_container {
width: 100%; width: 100%;
height: 200px; height: 200px;
text-align:center; text-align:center;
} }
.cw_buttons { .cw_buttons {
margin:10px; margin:10px;
padding:10px; padding:10px;
width: 300px; width: 300px;
font-weight: bold; font-weight: bold;
} }
#cw_ko { #cw_ko {
margin-left: 100px; margin-left: 100px;
border:1px solid #FF0000; border:1px solid #FF0000;
float: left; float: left;
} }
#cw_ok { #cw_ok {
margin-right: 100px; margin-right: 100px;
border:1px solid #00FF00; border:1px solid #00FF00;
float:right; float:right;
} }

View File

@ -1,7 +1,7 @@
name = Content Warning name = Content Warning
description = Display a cookie based warning to prevent display inopportune content. description = "Display a cookie based warning to alert users about inappropriate content."
version = 1 version = 1
author_name = "Manuel Sechi" author_name = "Manuel Sechi"
author_url = "http://www.manuelsechi.com" author_url = "http://www.manuelsechi.com"
info_url = "http://www.manuelsechi.com/progetti/gallery3-content-warning/" info_url = "http://www.manuelsechi.com/progetti/gallery3-content-warning/"
discuss_url = "http://www.manuelsechi.com/progetti/gallery3-content-warning/" discuss_url = "http://www.manuelsechi.com/progetti/gallery3-content-warning/"

View File

@ -1,5 +1,5 @@
<?php defined("SYSPATH") or die("No direct script access.") ?> <?php defined("SYSPATH") or die("No direct script access.") ?>
<div id="gAdminContentWerning"> <div id="gAdminContentWerning">
<h2><?php echo t("Content Warning Setup") ?></h2> <h2><?php echo t("Content Warning Setup") ?></h2>
<?php echo $form ?> <?php echo $form ?>
</div> </div>