aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-05-18 21:01:02 +0000
committernickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-05-18 21:01:02 +0000
commitadf88a67474f751abe283d72dcbda3cc126ed67b (patch)
treef30fb4b483c6c1e4e07dc29c01e13c20c25758f0
parent9edaa3c385610ebb45a9e8282a002e666d7d8c91 (diff)
downloadelgg-adf88a67474f751abe283d72dcbda3cc126ed67b.tar.gz
elgg-adf88a67474f751abe283d72dcbda3cc126ed67b.tar.bz2
Removing Walled Garden plugin from trunk.
git-svn-id: http://code.elgg.org/elgg/trunk@6088 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--mod/walledgarden/graphics/background_bottom.gifbin2940 -> 0 bytes
-rw-r--r--mod/walledgarden/graphics/background_extend.gifbin199 -> 0 bytes
-rw-r--r--mod/walledgarden/graphics/background_top.gifbin10169 -> 0 bytes
-rw-r--r--mod/walledgarden/index.php21
-rw-r--r--mod/walledgarden/languages/en.php12
-rw-r--r--mod/walledgarden/manifest.xml11
-rw-r--r--mod/walledgarden/readme.txt1
-rw-r--r--mod/walledgarden/start.php73
-rw-r--r--mod/walledgarden/views/default/account/forms/login.php59
-rw-r--r--mod/walledgarden/views/default/page_shells/walled_garden_index.php39
-rw-r--r--mod/walledgarden/views/default/walledgarden/css.php83
-rw-r--r--mod/walledgarden/views/default/walledgarden/walledgarden.php15
12 files changed, 0 insertions, 314 deletions
diff --git a/mod/walledgarden/graphics/background_bottom.gif b/mod/walledgarden/graphics/background_bottom.gif
deleted file mode 100644
index 7e25fbedc..000000000
--- a/mod/walledgarden/graphics/background_bottom.gif
+++ /dev/null
Binary files differ
diff --git a/mod/walledgarden/graphics/background_extend.gif b/mod/walledgarden/graphics/background_extend.gif
deleted file mode 100644
index 09f7318e3..000000000
--- a/mod/walledgarden/graphics/background_extend.gif
+++ /dev/null
Binary files differ
diff --git a/mod/walledgarden/graphics/background_top.gif b/mod/walledgarden/graphics/background_top.gif
deleted file mode 100644
index 145bac9e9..000000000
--- a/mod/walledgarden/graphics/background_top.gif
+++ /dev/null
Binary files differ
diff --git a/mod/walledgarden/index.php b/mod/walledgarden/index.php
deleted file mode 100644
index c0ba1681c..000000000
--- a/mod/walledgarden/index.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Elgg Walled Garden
- *
- * @package WalledGarden
- * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
- * @author Curverider Ltd <info@elgg.com>
- * @copyright Curverider Ltd 2008
- * @link http://elgg.com/
- */
-
-// Get the Elgg engine
-require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
-
-//grab the login form
-$login = elgg_view("account/forms/login");
-
-//display the contents in our new canvas layout
-$body = elgg_view_layout('walled_garden',$login);
-
-page_draw_walledgarden($title, $body);
diff --git a/mod/walledgarden/languages/en.php b/mod/walledgarden/languages/en.php
deleted file mode 100644
index 4943ec94f..000000000
--- a/mod/walledgarden/languages/en.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/**
- * An English language translation file
- */
-
-$english = array(
- 'walledgarden' => 'Walled Garden',
-
- 'walledgarden:new_user:fail' => 'This site does not accept new user registration.',
-);
-
-add_translation('en', $english);
diff --git a/mod/walledgarden/manifest.xml b/mod/walledgarden/manifest.xml
deleted file mode 100644
index e81af202f..000000000
--- a/mod/walledgarden/manifest.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin_manifest>
- <field key="author" value="Curverider" />
- <field key="version" value="1.7" />
- <field key="description" value="Walled garden support for Elgg" />
- <field key="website" value="http://www.elgg.org/" />
- <field key="copyright" value="(C) Curverider 2008-2010" />
- <field key="licence" value="GNU Public License version 2" />
- <field key="elgg_version" value="2010030101" />
- <field key="admin_interface" value="advanced" />
-</plugin_manifest>
diff --git a/mod/walledgarden/readme.txt b/mod/walledgarden/readme.txt
deleted file mode 100644
index 5df459b5d..000000000
--- a/mod/walledgarden/readme.txt
+++ /dev/null
@@ -1 +0,0 @@
-Make sure the walledgarden plugin is the last one in the plugin list to ensure it works as expected. \ No newline at end of file
diff --git a/mod/walledgarden/start.php b/mod/walledgarden/start.php
deleted file mode 100644
index 9c9a2fce3..000000000
--- a/mod/walledgarden/start.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-
-/**
- * Walled garden support.
- */
-
-function walledgarden_init(){
- global $CONFIG;
-
- $CONFIG->disable_registration = true;
-
- // elgg_set_viewtype('default');
- elgg_extend_view('pageshells/pageshell', 'walledgarden/walledgarden');
- elgg_extend_view('css','walledgarden/css');
-
- // restrict external user creation
- register_plugin_hook('new_twitter_user', 'twitter_service', 'walledgarden_new_external_user');
- register_plugin_hook('new_facebook_user', 'facebook_service', 'walledgarden_new_external_user');
-
- if(!isloggedin())
- register_plugin_hook('index','system','walledgarden_index');
-}
-
-function walledgarden_pagesetup() {
-
- global $CONFIG;
- if (current_page_url() != $CONFIG->url
- && !defined('externalpage')
- && !isloggedin()) {
- forward();
- exit;
- }
-
-}
-
-function walledgarden_index() {
-
- if (!include_once(dirname(dirname(__FILE__))) . "/walledgarden/index.php") {
- return false;
- }
- return true;
-
-}
-
-function walledgarden_new_external_user($hook, $entity_type, $returnvalue, $params) {
- // do not allow new users to be created within the walled-garden
- register_error(elgg_echo('walledgarden:new_user:fail'));
- return FALSE;
-}
-
-/**
- * This is so the homepage can have its own pageshell
- **/
-
-function page_draw_walledgarden($title, $body, $sidebar = "") {
-
- // Draw the page
- $output = elgg_view('page_shells/walled_garden_index', array(
- 'title' => $title,
- 'body' => $body,
- 'sidebar' => $sidebar,
- 'sysmessages' => system_messages(null,"")
- )
- );
- $split_output = str_split($output, 1024);
-
- foreach($split_output as $chunk) {
- echo $chunk;
- }
-}
-
-register_elgg_event_handler('init','system','walledgarden_init');
-register_elgg_event_handler('pagesetup','system','walledgarden_pagesetup');
diff --git a/mod/walledgarden/views/default/account/forms/login.php b/mod/walledgarden/views/default/account/forms/login.php
deleted file mode 100644
index 3b638a2f5..000000000
--- a/mod/walledgarden/views/default/account/forms/login.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/**
-* Walled Garden Login Form
-*/
-
-global $CONFIG;
-
-$form_body = "<label>" . elgg_echo('username') . "<br />" . elgg_view('input/text', array('internalname' => 'username', 'class' => 'login_textarea username')) . "</label>";
-$form_body .= "<br />";
-$form_body .= "<label>" . elgg_echo('password') . "<br />" . elgg_view('input/password', array('internalname' => 'password', 'class' => 'login_textarea')) . "</label><br />";
-$form_body .= elgg_view('input/hidden', array('internalname' => 'returntoreferer', 'value' => 'true'));
-$form_body .= elgg_view('input/submit', array('value' => elgg_echo('login')));
-$form_body .= "<div class='remember_me'><label><input type='checkbox' name='persistent' checked value='true' />".elgg_echo('user:persistent')."</label></div>";
-$form_body .= "<p class='lost_password'><a class='forgotten_password_link' href=\"{$login_url}account/forgotten_password.php\">" . elgg_echo('user:password:lost') . "</a></p>";
-
-$login_url = $vars['url'];
-if ((isset($CONFIG->https_login)) && ($CONFIG->https_login)) {
- $login_url = str_replace("http", "https", $vars['url']);
-}
-?>
-<style type="text/css">
- body {background:white !important; text-align: center !important;}
-</style>
-<h2><?php echo elgg_echo('login'); ?></h2>
-<?php
- echo elgg_view('input/form', array('body' => $form_body, 'action' => "{$login_url}action/login"));
- echo elgg_view('login/extend'); // view for plugins to extend
-?>
-
-<div class="lostpassword_form margin_top hidden">
- <?php
- $lostpassword_form_body = "<p>" . elgg_echo('user:password:text') . "</p>";
- $lostpassword_form_body .= "<p class='margin_none'><label>". elgg_echo('username') . " "
- . elgg_view('input/text', array('internalname' => 'username', 'class' => 'login_textarea lostusername')) . "</label></p>";
- $lostpassword_form_body .= elgg_view('input/captcha');
- $lostpassword_form_body .= "<p>" . elgg_view('input/submit', array('value' => elgg_echo('request'))) . "</p>";
-
- ?>
- <h2><?php echo elgg_echo('user:password:lost'); ?></h2>
- <?php
- echo elgg_view('input/form', array(
- 'action' => "{$vars['url']}action/user/requestnewpassword",
- 'body' => $lostpassword_form_body,
- 'class' => "margin_top"
- ));
- ?>
-</div>
-
-<script type="text/javascript">
-$(document).ready(function() {
- $('input.username').focus();
-
- $('a.forgotten_password_link').click(function(e) {
- e.preventDefault();
- elgg_slide_toggle(this, '.walledgardenlogin', '.lostpassword_form');
- $('input.lostusername').focus();
- });
-});
-</script> \ No newline at end of file
diff --git a/mod/walledgarden/views/default/page_shells/walled_garden_index.php b/mod/walledgarden/views/default/page_shells/walled_garden_index.php
deleted file mode 100644
index 3be9a1e45..000000000
--- a/mod/walledgarden/views/default/page_shells/walled_garden_index.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Elgg pageshell
- * The standard HTML page shell that everything else fits into
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- *
- * @uses $vars['config'] The site configuration settings, imported
- * @uses $vars['title'] The page title
- * @uses $vars['body'] The main content of the page
- * @uses $vars['messages'] A 2d array of various message registers, passed from system_messages()
- */
-
-// Set the content type
-header("Content-type: text/html; charset=UTF-8");
-
-// Set title
-if (empty($vars['title'])) {
- $title = $vars['config']->sitename;
-} else if (empty($vars['config']->sitename)) {
- $title = $vars['title'];
-} else {
- $title = $vars['config']->sitename . ": " . $vars['title'];
-}
-echo elgg_view('page_elements/html_begin', $vars);
-echo "<div id='walledgarden_sysmessages'>".elgg_view('messages/list', array('object' => $vars['sysmessages']))."</div>";
-
-echo "<div id='walledgarden_container'><div id='walledgarden' class='clearfloat'>";
- echo "<div class='walledgardenintro clearfloat'><h1>Welcome to:<br />" . $title . "</h1></div>";
- echo "<div class='walledgardenlogin clearfloat'>".$vars['body']."</div>";
-echo "</div>";
-echo "<div id='walledgarden_bottom'></div>";
-echo "</div>";
-echo elgg_view('page_elements/html_end', $vars);
-?>
-
diff --git a/mod/walledgarden/views/default/walledgarden/css.php b/mod/walledgarden/views/default/walledgarden/css.php
deleted file mode 100644
index a648b33aa..000000000
--- a/mod/walledgarden/views/default/walledgarden/css.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-/**
-* Elgg WalledGarden CSS
-*/
-?>
-#walledgarden_container {
- margin:100px auto 0 auto;
- position:relative;
- padding:0;
- width:563px;
- background: url(<?php echo $vars['url']; ?>mod/walledgarden/graphics/background_extend.gif) repeat-y left top;
- text-align: left;
-}
-#walledgarden {
- position: relative;
- padding:0;
- width:563px;
- min-height:230px;
- background: url(<?php echo $vars['url']; ?>mod/walledgarden/graphics/background_top.gif) no-repeat left top;
-}
-#walledgarden_bottom {
- margin:0 auto;
- background: url(<?php echo $vars['url']; ?>mod/walledgarden/graphics/background_bottom.gif) no-repeat left bottom;
- width:563px;
- height:54px;
- position: relative;
-}
-.walledgardenintro {
- float:left;
- min-height:200px;
- width:223px;
- padding:15px;
- margin:19px 0 0 23px;
-}
-.walledgardenlogin {
- float:left;
- min-height:200px;
- width:223px;
- padding:15px 15px 0 15px;
- margin:19px 0 0 11px;
-}
-.walledgardenintro h1 {
- color:#666666;
- margin-top:80px;
- line-height: 1.1em;
-}
-.walledgardenlogin h2 {
- color:#666666;
- border-bottom:1px solid #CCCCCC;
- margin-bottom:5px;
- padding-bottom:5px;
-}
-.walledgardenlogin form input.login_textarea {
- margin:0 0 10px 0;
- width:210px;
-}
-.walledgardenlogin form label {
- color:#666666;
-}
-.walledgardenlogin .remember_me label {
- font-size:1em;
- font-weight:normal;
-}
-.walledgardenlogin .remember_me {
- display:block;
- float:right;
- margin-left:0;
- margin-top:-34px;
- text-align:right;
- width:100%;
-}
-.walledgardenlogin .lost_password {
- margin-bottom: 10px;
-}
-.walledgardenlogin a.forgotten_password_link {
- color:#999999;
-}
-#walledgarden_sysmessages #elgg_system_message {
- width: 523px;
- right:0;
- margin:10px auto 0 auto;
- position: relative;
-} \ No newline at end of file
diff --git a/mod/walledgarden/views/default/walledgarden/walledgarden.php b/mod/walledgarden/views/default/walledgarden/walledgarden.php
deleted file mode 100644
index 15969b3be..000000000
--- a/mod/walledgarden/views/default/walledgarden/walledgarden.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
- /**
- * Walled garden support.
- *
- * @package ElggWalledGarden
- * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
- * @author Curverider Ltd
- * @copyright Curverider Ltd 2008-2010
- * @link http://elgg.com/
- */
-
- // Forward!
- if (!defined('externalpage'))
- gatekeeper();
-?> \ No newline at end of file