From b43fc5e9886df2b9abd22e5688ffa8d74929af72 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Wed, 13 May 2009 23:53:35 +0000 Subject: [PATCH] Fix copyright to 2009 Add admin_developer/session support. --- modules/developer/config/developer.php | 2 +- .../developer/controllers/admin_developer.php | 18 +++++--- .../developer/helpers/developer_installer.php | 2 +- modules/developer/helpers/developer_menu.php | 41 +++++++++++-------- modules/developer/helpers/developer_task.php | 2 +- .../developer/views/admin_controller.txt.php | 2 +- modules/developer/views/block.txt.php | 2 +- modules/developer/views/controller.txt.php | 2 +- modules/developer/views/event.txt.php | 2 +- modules/developer/views/installer.txt.php | 2 +- modules/developer/views/menu.txt.php | 2 +- modules/developer/views/theme.txt.php | 2 +- 12 files changed, 45 insertions(+), 34 deletions(-) diff --git a/modules/developer/config/developer.php b/modules/developer/config/developer.php index 9f5919b3..665be0bf 100644 --- a/modules/developer/config/developer.php +++ b/modules/developer/config/developer.php @@ -1,7 +1,7 @@ content = new View("admin_developer.html"); $v->content->title = t("Generate Test Data"); - + list ($form, $errors) = $this->_get_module_form(); $v->content->developer_content = $this->_get_test_data_view($form, $errors); print $v; @@ -76,9 +76,15 @@ class Admin_Developer_Controller extends Admin_Controller { } } + public function session($key) { + access::verify_csrf(); + Session::instance()->set($key, Input::instance()->get("value")); + url::redirect("albums/1"); + } + public function test_data_create() { access::verify_csrf(); - + list ($form, $errors) = $this->_get_test_data_form(); $post = new Validation($_POST); @@ -90,7 +96,7 @@ class Admin_Developer_Controller extends Admin_Controller { $post->add_callbacks("photos", array($this, "_set_default")); $post->add_callbacks("comments", array($this, "_set_default")); $post->add_callbacks("tags", array($this, "_set_default")); - + if ($post->validate()) { $task_def = Task_Definition::factory() ->callback("developer_task::create_content") @@ -100,7 +106,7 @@ class Admin_Developer_Controller extends Admin_Controller { $success_msg = t("Successfully generated test data"); $error_msg = t("Problems with test data generation was encountered"); $task = task::create($task_def, array("total" => $total, "batch" => (int)ceil($total / 10), - "success_msg" => $success_msg, + "success_msg" => $success_msg, "current" => 0, "error_msg" => $error_msg, "albums" => $post->albums, "photos" => $post->photos, "comments" => $post->comments, "tags" => $post->tags)); @@ -233,7 +239,7 @@ class Admin_Developer_Controller extends Admin_Controller { $form = array("albums" => "10", "photos" => "10", "comments" => "10", "tags" => "10", "generate_albums" => ""); $errors = array_fill_keys(array_keys($form), ""); - + return array($form, $errors); } diff --git a/modules/developer/helpers/developer_installer.php b/modules/developer/helpers/developer_installer.php index 1e930a5b..a91db63d 100644 --- a/modules/developer/helpers/developer_installer.php +++ b/modules/developer/helpers/developer_installer.php @@ -1,7 +1,7 @@ id("developer_menu") ->label(t("Developer Tools")); $menu->append($developer_menu); - + $developer_menu ->append(Menu::factory("link") ->id("generate_menu") @@ -38,28 +38,33 @@ class developer_menu_Core { ->label(t("MPTT Tree")) ->url(url::site("admin/developer/mptt"))); + $csrf = access::csrf_token(); if (Session::instance()->get("profiler", false)) { - $developer_menu->append(Menu::factory("link") - ->id("scaffold_profiler") - ->label("Profiling off") - ->url(url::site("admin/developer/session/profiler?value=0"))); + $developer_menu->append( + Menu::factory("link") + ->id("scaffold_profiler") + ->label("Profiling off") + ->url(url::site("admin/developer/session/profiler?value=0&csrf=$csrf"))); } else { - $developer_menu->append(Menu::factory("link") - ->id("scaffold_profiler") - ->label("Profiling on") - ->url(url::site("admin/developer/session/profiler?value=1"))); + $developer_menu->append( + Menu::factory("link") + ->id("scaffold_profiler") + ->label("Profiling on") + ->url(url::site("admin/developer/session/profiler?value=1&csrf=$csrf"))); } if (Session::instance()->get("debug", false)) { - $developer_menu->append(Menu::factory("link") - ->id("scaffold_debugger") - ->label("Debugging off") - ->url(url::site("admin/developer/session/debug?value=0"))); + $developer_menu->append( + Menu::factory("link") + ->id("scaffold_debugger") + ->label("Debugging off") + ->url(url::site("admin/developer/session/debug?value=0&csrf=$csrf"))); } else { - $developer_menu->append(Menu::factory("link") - ->id("scaffold_debugger") - ->label("Debugging on") - ->url(url::site("admin/developer/session/debug?value=1"))); + $developer_menu->append( + Menu::factory("link") + ->id("scaffold_debugger") + ->label("Debugging on") + ->url(url::site("admin/developer/session/debug?value=1&csrf=$csrf"))); } } } diff --git a/modules/developer/helpers/developer_task.php b/modules/developer/helpers/developer_task.php index 22dedcd1..bb4d60cb 100644 --- a/modules/developer/helpers/developer_task.php +++ b/modules/developer/helpers/developer_task.php @@ -1,7 +1,7 @@ /** * Gallery - a web based photo album viewer and editor - * Copyright (C) 2000-2008 Bharat Mediratta + * 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 diff --git a/modules/developer/views/block.txt.php b/modules/developer/views/block.txt.php index fe027e97..e0f1e8e4 100644 --- a/modules/developer/views/block.txt.php +++ b/modules/developer/views/block.txt.php @@ -2,7 +2,7 @@ /** * Gallery - a web based photo album viewer and editor - * Copyright (C) 2000-2008 Bharat Mediratta + * 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 diff --git a/modules/developer/views/controller.txt.php b/modules/developer/views/controller.txt.php index a9a3aa35..8e27afc5 100644 --- a/modules/developer/views/controller.txt.php +++ b/modules/developer/views/controller.txt.php @@ -2,7 +2,7 @@ /** * Gallery - a web based photo album viewer and editor - * Copyright (C) 2000-2008 Bharat Mediratta + * 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 diff --git a/modules/developer/views/event.txt.php b/modules/developer/views/event.txt.php index fb5883a2..958dfe7a 100644 --- a/modules/developer/views/event.txt.php +++ b/modules/developer/views/event.txt.php @@ -2,7 +2,7 @@ /** * Gallery - a web based photo album viewer and editor - * Copyright (C) 2000-2008 Bharat Mediratta + * 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 diff --git a/modules/developer/views/installer.txt.php b/modules/developer/views/installer.txt.php index 3099aeed..5395fb25 100644 --- a/modules/developer/views/installer.txt.php +++ b/modules/developer/views/installer.txt.php @@ -2,7 +2,7 @@ /** * Gallery - a web based photo album viewer and editor - * Copyright (C) 2000-2008 Bharat Mediratta + * 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 diff --git a/modules/developer/views/menu.txt.php b/modules/developer/views/menu.txt.php index a338626e..89cad5ba 100644 --- a/modules/developer/views/menu.txt.php +++ b/modules/developer/views/menu.txt.php @@ -2,7 +2,7 @@ /** * Gallery - a web based photo album viewer and editor - * Copyright (C) 2000-2008 Bharat Mediratta + * 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 diff --git a/modules/developer/views/theme.txt.php b/modules/developer/views/theme.txt.php index fdad5957..04282f08 100644 --- a/modules/developer/views/theme.txt.php +++ b/modules/developer/views/theme.txt.php @@ -2,7 +2,7 @@ /** * Gallery - a web based photo album viewer and editor - * Copyright (C) 2000-2008 Bharat Mediratta + * 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