From c1c2563fc1cd451afaf735350eb1c576740be2f4 Mon Sep 17 00:00:00 2001 From: cash Date: Sun, 13 Feb 2011 22:19:14 +0000 Subject: swapping sitepages for externalpages since the external pages is easier to integrate into 1.8 . sitepages needs more work before it is ready for release (plus we would need an upgrade script) git-svn-id: http://code.elgg.org/elgg/trunk@8206 36083f99-b078-4883-b0ff-0f9b5a30f544 --- mod/externalpages/actions/add.php | 54 +++++ mod/externalpages/actions/addfront.php | 48 +++++ mod/externalpages/index.php | 30 +++ mod/externalpages/languages/en.php | 42 ++++ mod/externalpages/manifest.xml | 10 + mod/externalpages/read.php | 35 ++++ mod/externalpages/start.php | 74 +++++++ .../views/default/expages/analytics.php | 21 ++ mod/externalpages/views/default/expages/css.php | 13 ++ .../views/default/expages/footer_menu.php | 17 ++ .../views/default/expages/forms/edit.php | 82 ++++++++ .../views/default/expages/forms/editfront.php | 75 +++++++ .../views/default/expages/front_left.php | 23 +++ .../views/default/expages/front_right.php | 36 ++++ mod/externalpages/views/default/expages/menu.php | 25 +++ mod/externalpages/views/default/object/expages.php | 10 + mod/sitepages/README.txt | 50 ----- mod/sitepages/actions/edit_settings.php | 50 ----- mod/sitepages/index.php | 45 ----- mod/sitepages/languages/en.php | 82 -------- mod/sitepages/manifest.xml | 19 -- mod/sitepages/sitepages_functions.php | 113 ----------- mod/sitepages/start.php | 223 --------------------- .../views/default/admin/site/sitepages.php | 13 -- .../views/default/canvas/layouts/frontpage.php | 17 -- mod/sitepages/views/default/sitepages/css.php | 20 -- .../views/default/sitepages/custom_frontpage.php | 17 -- .../views/default/sitepages/forms/edit.php | 51 ----- .../default/sitepages/forms/editfrontsimple.php | 87 -------- .../views/default/sitepages/forms/editmeta.php | 40 ---- .../views/default/sitepages/keywords/sitestats.php | 8 - .../views/default/sitepages/keywords/userlist.php | 45 ----- mod/sitepages/views/default/sitepages/members.php | 11 - mod/sitepages/views/default/sitepages/menu.php | 24 --- mod/sitepages/views/default/sitepages/metatags.php | 35 ---- mod/sitepages/views/default/sitepages/sidebar.php | 13 -- mod/sitepages/views/default/sitepages/welcome.php | 13 -- 37 files changed, 595 insertions(+), 976 deletions(-) create mode 100644 mod/externalpages/actions/add.php create mode 100644 mod/externalpages/actions/addfront.php create mode 100644 mod/externalpages/index.php create mode 100644 mod/externalpages/languages/en.php create mode 100644 mod/externalpages/manifest.xml create mode 100644 mod/externalpages/read.php create mode 100644 mod/externalpages/start.php create mode 100644 mod/externalpages/views/default/expages/analytics.php create mode 100644 mod/externalpages/views/default/expages/css.php create mode 100644 mod/externalpages/views/default/expages/footer_menu.php create mode 100644 mod/externalpages/views/default/expages/forms/edit.php create mode 100644 mod/externalpages/views/default/expages/forms/editfront.php create mode 100644 mod/externalpages/views/default/expages/front_left.php create mode 100644 mod/externalpages/views/default/expages/front_right.php create mode 100644 mod/externalpages/views/default/expages/menu.php create mode 100644 mod/externalpages/views/default/object/expages.php delete mode 100644 mod/sitepages/README.txt delete mode 100644 mod/sitepages/actions/edit_settings.php delete mode 100644 mod/sitepages/index.php delete mode 100644 mod/sitepages/languages/en.php delete mode 100644 mod/sitepages/manifest.xml delete mode 100644 mod/sitepages/sitepages_functions.php delete mode 100644 mod/sitepages/start.php delete mode 100644 mod/sitepages/views/default/admin/site/sitepages.php delete mode 100644 mod/sitepages/views/default/canvas/layouts/frontpage.php delete mode 100644 mod/sitepages/views/default/sitepages/css.php delete mode 100644 mod/sitepages/views/default/sitepages/custom_frontpage.php delete mode 100644 mod/sitepages/views/default/sitepages/forms/edit.php delete mode 100644 mod/sitepages/views/default/sitepages/forms/editfrontsimple.php delete mode 100644 mod/sitepages/views/default/sitepages/forms/editmeta.php delete mode 100644 mod/sitepages/views/default/sitepages/keywords/sitestats.php delete mode 100644 mod/sitepages/views/default/sitepages/keywords/userlist.php delete mode 100644 mod/sitepages/views/default/sitepages/members.php delete mode 100644 mod/sitepages/views/default/sitepages/menu.php delete mode 100644 mod/sitepages/views/default/sitepages/metatags.php delete mode 100644 mod/sitepages/views/default/sitepages/sidebar.php delete mode 100644 mod/sitepages/views/default/sitepages/welcome.php diff --git a/mod/externalpages/actions/add.php b/mod/externalpages/actions/add.php new file mode 100644 index 000000000..fed637c55 --- /dev/null +++ b/mod/externalpages/actions/add.php @@ -0,0 +1,54 @@ +subtype = $type; + // Set its owner to the current user + $expages->owner_guid = get_loggedin_userid(); + // For now, set its access to public + $expages->access_id = ACCESS_PUBLIC; + // Set its title and description appropriately + $expages->title = $type; + $expages->description = $contents; + // Before we can set metadata, save + if (!$expages->save()) { + register_error(elgg_echo("expages:error")); + forward(REFERER); + } + + // Success message + system_message(elgg_echo("expages:posted")); + // add to river + add_to_river('river/expages/create','create',get_loggedin_userid(),$expages->guid); + // Remove the cache + unset($_SESSION['expages_content']); unset($_SESSION['expagestitle']); + + + // Forward back to the page + forward("pg/expages/index.php?type={$type}"); + +?> \ No newline at end of file diff --git a/mod/externalpages/actions/addfront.php b/mod/externalpages/actions/addfront.php new file mode 100644 index 000000000..f0a457df9 --- /dev/null +++ b/mod/externalpages/actions/addfront.php @@ -0,0 +1,48 @@ +subtype = "front"; + // Set its owner to the current user + $frontpage->owner_guid = get_loggedin_userid(); + // For now, set its access to public + $frontpage->access_id = ACCESS_PUBLIC; + // Set its title and description appropriately + $frontpage->title = $contents_left; + $frontpage->description = $contents_right; + + // Before we can set metadata, save + if (!$frontpage->save()) { + register_error(elgg_echo("expages:error")); + forward("pg/expages/index.php?type=front"); + } + + // Success message + system_message(elgg_echo("expages:posted")); + + + // Forward back to the page + forward("pg/expages/index.php?type=front"); + +?> diff --git a/mod/externalpages/index.php b/mod/externalpages/index.php new file mode 100644 index 000000000..78a0bb1a3 --- /dev/null +++ b/mod/externalpages/index.php @@ -0,0 +1,30 @@ + $type)); + + // Display the menu + $body = elgg_view('page_elements/contentwrapper',array('body' => elgg_view('expages/menu', array('type' => $type)).$edit)); + + // Display + page_draw(elgg_echo('expages'),elgg_view_layout("two_column_left_sidebar", '', $title . $body)); +?> \ No newline at end of file diff --git a/mod/externalpages/languages/en.php b/mod/externalpages/languages/en.php new file mode 100644 index 000000000..8d80ee9f2 --- /dev/null +++ b/mod/externalpages/languages/en.php @@ -0,0 +1,42 @@ + "External pages", + 'expages:frontpage' => "Frontpage", + 'expages:about' => "About", + 'expages:terms' => "Terms", + 'expages:privacy' => "Privacy", + 'expages:analytics' => "Analytics", + 'expages:contact' => "Contact", + 'expages:nopreview' => "No preview yet available", + 'expages:preview' => "Preview", + 'expages:notset' => "This page has not been set up yet.", + 'expages:lefthand' => "The lefthand information pane", + 'expages:righthand' => "The righthand information pane", + 'expages:addcontent' => "You can add content here via your admin tools. Look for the external pages link under admin.", + 'item:object:front' => 'Front page items', + + /** + * Status messages + */ + + 'expages:posted' => "Your page was successfully updated.", + 'expages:deleted' => "Your page post was successfully deleted.", + + /** + * Error messages + */ + + 'expages:deleteerror' => "There was a problem deleting the old page", + 'expages:error' => "There has been an error, please try again and if the problem persists, contact the administrator", + + ); + + add_translation("en",$english); + +?> \ No newline at end of file diff --git a/mod/externalpages/manifest.xml b/mod/externalpages/manifest.xml new file mode 100644 index 000000000..3793d7803 --- /dev/null +++ b/mod/externalpages/manifest.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/mod/externalpages/read.php b/mod/externalpages/read.php new file mode 100644 index 000000000..3faceb083 --- /dev/null +++ b/mod/externalpages/read.php @@ -0,0 +1,35 @@ + 'object', 'subtype' => $type, 'limit' => 1)); + + if($contents){ + foreach($contents as $c){ + $area1 .= elgg_view('page_elements/contentwrapper',array('body' => $c->description)); + } + }else + $area1 .= elgg_view('page_elements/contentwrapper',array('body' => elgg_echo("expages:notset"))); + + // Display through the correct canvas area + $body = elgg_view_layout("one_column", $area1); + + // Display page + page_draw($title,$body); + +?> \ No newline at end of file diff --git a/mod/externalpages/start.php b/mod/externalpages/start.php new file mode 100644 index 000000000..33bd7e189 --- /dev/null +++ b/mod/externalpages/start.php @@ -0,0 +1,74 @@ +wwwroot . 'pg/expages/'); + } + } + + function expages_url($expage) { + + global $CONFIG; + return $CONFIG->url . "pg/expages/"; + + } + + + function expages_page_handler($page) + { + global $CONFIG; + + if ($page[0]) + { + switch ($page[0]) + { + case "read": set_input('expages',$page[1]); + include(dirname(__FILE__) . "/read.php"); + break; + default : include($CONFIG->pluginspath . "externalpages/index.php"); + } + } + else + include($CONFIG->pluginspath . "externalpages/index.php"); + } + + // Initialise log browser + register_elgg_event_handler('init','system','expages_init'); + register_elgg_event_handler('pagesetup','system','expages_pagesetup'); + + // Register actions + global $CONFIG; + register_action("expages/add",false,$CONFIG->pluginspath . "externalpages/actions/add.php"); + register_action("expages/addfront",false,$CONFIG->pluginspath . "externalpages/actions/addfront.php"); + register_action("expages/edit",false,$CONFIG->pluginspath . "externalpages/actions/edit.php"); + register_action("expages/delete",false,$CONFIG->pluginspath . "externalpages/actions/delete.php"); + +?> \ No newline at end of file diff --git a/mod/externalpages/views/default/expages/analytics.php b/mod/externalpages/views/default/expages/analytics.php new file mode 100644 index 000000000..40f7b6a8d --- /dev/null +++ b/mod/externalpages/views/default/expages/analytics.php @@ -0,0 +1,21 @@ + 'object', 'subtype' => 'analytics', 'limit' => 1)); + + if($contents){ + foreach($contents as $c){ + echo $c->description; + } + } + +?> + diff --git a/mod/externalpages/views/default/expages/css.php b/mod/externalpages/views/default/expages/css.php new file mode 100644 index 000000000..609f77f69 --- /dev/null +++ b/mod/externalpages/views/default/expages/css.php @@ -0,0 +1,13 @@ + + +/* IE6 */ +* html #front_left_tbl { width:676px !important; } +* html #front_right_tbl { width:676px !important; } \ No newline at end of file diff --git a/mod/externalpages/views/default/expages/footer_menu.php b/mod/externalpages/views/default/expages/footer_menu.php new file mode 100644 index 000000000..a2e1616d2 --- /dev/null +++ b/mod/externalpages/views/default/expages/footer_menu.php @@ -0,0 +1,17 @@ + + + \ No newline at end of file diff --git a/mod/externalpages/views/default/expages/forms/edit.php b/mod/externalpages/views/default/expages/forms/edit.php new file mode 100644 index 000000000..1cdec4198 --- /dev/null +++ b/mod/externalpages/views/default/expages/forms/edit.php @@ -0,0 +1,82 @@ + 'object', 'subtype' => $type, 'limit' => 1)); + + if($page_contents){ + foreach($page_contents as $pc){ + $description = $pc->description; + $guid = $pc->guid; + } + }else { + $description = ""; + } + + // set the required form variables + $input_area = elgg_view('input/longtext', array('internalname' => 'expagescontent', 'value' => $description)); + $submit_input = elgg_view('input/submit', array('internalname' => 'submit', 'value' => elgg_echo('save'))); + $hidden_value = elgg_view('input/hidden', array('internalname' => 'content_type', 'value' => $type)); + $hidden_guid = elgg_view('input/hidden', array('internalname' => 'expage_guid', 'value' => $guid)); + + //type + $type = $vars['type']; + //set the url + $url = $vars['url'] . "pg/expages/index.php?type="; + + if($type == 'about') { + $external_page_title = elgg_echo('expages:about'); + } + else if($type == 'terms') { + $external_page_title = elgg_echo('expages:terms'); + } + else if($type == 'privacy') { + $external_page_title = elgg_echo('expages:privacy'); + } + //preview link + // echo "
" . elgg_echo('expages:preview') . "
"; + + //construct the form + $form_body = <<$external_page_title +

$input_area

+ $hidden_value + $hidden_guid +
+ $submit_input + +EOT; +?> + "{$vars['url']}action/$action", 'body' => $form_body)); +?> + + + \ No newline at end of file diff --git a/mod/externalpages/views/default/expages/forms/editfront.php b/mod/externalpages/views/default/expages/forms/editfront.php new file mode 100644 index 000000000..3e7e8c83b --- /dev/null +++ b/mod/externalpages/views/default/expages/forms/editfront.php @@ -0,0 +1,75 @@ + 'object', 'subtype' => 'front', 'limit' => 1)); + + if($page_contents){ + foreach($page_contents as $pc){ + $description_right = $pc->description; + $description_left = $pc->title; + $guid = $pc->guid; + } + }else { + $description = ""; + } + + // set the required form variables + $input_area_left = elgg_view('input/longtext', array('internalname' => 'front_left', 'value' => $description_left)); + $input_area_right = elgg_view('input/longtext', array('internalname' => 'front_right', 'value' => $description_right)); + $submit_input = elgg_view('input/submit', array('internalname' => 'submit', 'value' => elgg_echo('save'))); + $hidden_guid = elgg_view('input/hidden', array('internalname' => 'front_guid', 'value' => $guid)); + $lefthand = elgg_echo("expages:lefthand"); + $righthand = elgg_echo("expages:righthand"); + + //preview link + // echo ""; + + //construct the form + $form_body = <<$lefthand +

$input_area_left


+

$righthand

+

$input_area_right

+ + $hidden_guid +
+ $submit_input + +EOT; +?> + "{$vars['url']}action/$action", 'body' => $form_body)); +?> + + + \ No newline at end of file diff --git a/mod/externalpages/views/default/expages/front_left.php b/mod/externalpages/views/default/expages/front_left.php new file mode 100644 index 000000000..14d999ead --- /dev/null +++ b/mod/externalpages/views/default/expages/front_left.php @@ -0,0 +1,23 @@ + 'object', 'subtype' => 'front', 'limit' => 1)); + + if($contents){ + foreach($contents as $c){ + echo $c->title; // title is the left hand content + } + }else{ + echo "

" . elgg_echo("expages:addcontent") . "

"; + } + +?> + diff --git a/mod/externalpages/views/default/expages/front_right.php b/mod/externalpages/views/default/expages/front_right.php new file mode 100644 index 000000000..ab999f890 --- /dev/null +++ b/mod/externalpages/views/default/expages/front_right.php @@ -0,0 +1,36 @@ + 'object', 'subtype' => 'front', 'limit' => 1)); + + // nothing to show so we return TRUE to indicate the view was valid + if ($contents == FALSE) { + return TRUE; + } + + $show = ''; + foreach($contents as $cont){ + $show = $cont->description; + } + + if($show != ''){ + echo "
"; + + if($contents){ + foreach($contents as $c){ + echo $c->description; + } + }else{ + echo elgg_echo("expages:addcontent"); + } + echo "
"; + } + +?> \ No newline at end of file diff --git a/mod/externalpages/views/default/expages/menu.php b/mod/externalpages/views/default/expages/menu.php new file mode 100644 index 000000000..d91418065 --- /dev/null +++ b/mod/externalpages/views/default/expages/menu.php @@ -0,0 +1,25 @@ + + +
+
    +
  • >
  • +
  • >
  • +
  • >
  • +
  • >
  • +
+
\ No newline at end of file diff --git a/mod/externalpages/views/default/object/expages.php b/mod/externalpages/views/default/object/expages.php new file mode 100644 index 000000000..69ec7233e --- /dev/null +++ b/mod/externalpages/views/default/object/expages.php @@ -0,0 +1,10 @@ + \ No newline at end of file diff --git a/mod/sitepages/README.txt b/mod/sitepages/README.txt deleted file mode 100644 index 2c15bdd74..000000000 --- a/mod/sitepages/README.txt +++ /dev/null @@ -1,50 +0,0 @@ -Site pages - Quickly generate static pages and customize the front page, CSS, and -HTML metatags. - -CONTENTS: - 1. Overview - 2. Using ECML on the front pages - 2.1 [loginbox] - 2.2 [sitestats] - 2.3 [userlist] - - -1. OVERVIEW - - Site Pages provides a simple way to create static content for About, Terms, - and Privacy pages, and also allows simple modifications of the logged in - and logged out views, as well as CSS and meta description and tags for SEO. - - -2. USING ECML ON THE FRONT PAGES - - Site Pages supports ECML on the front page and provides the following - ECML keywords: - - [loginbox] -- A login box. Required on the logged out front page. - [sitestats] -- Simple site statistics. - [userlist] -- A list of users. - - To learn more about ECML, click the ECML icon below the input fields. - - -2.1 [loginbox] - The Login Box keyword displays a box to let users log in. This view - is required on the logged out front page. - - -2.2 [sitestats] - The Site Stats keyword doesn't do anything yet. - - -2.3 [userlist] - The User List keyword displays a list of users and takes the following - optional arguments (*default if not passed): - - list_type=*new|online|random -- Show new users, users active in the - last 10 minutes, or a random selection. - - only_with_avatars=*true|false -- Only show users who have uploaded an - avatar - - limit=*10 -- Show this many users. diff --git a/mod/sitepages/actions/edit_settings.php b/mod/sitepages/actions/edit_settings.php deleted file mode 100644 index 8f328eb76..000000000 --- a/mod/sitepages/actions/edit_settings.php +++ /dev/null @@ -1,50 +0,0 @@ -title = $page_type; - $sitepage->description = $content; - $sitepage->tags = string_to_tag_array(get_input('sitepages_tags')); - - break; - case 'seo': - $sitepage->title = get_input('metatags', '', FALSE);; - $sitepage->description = get_input('description', '', FALSE); - - break; - case 'frontsimple': - default: - $params = get_input('params', array()); - set_plugin_setting('ownfrontpage', $params['ownfrontpage'], 'sitepages'); - - $sitepage->welcometitle = get_input('welcometitle', '', FALSE); - $sitepage->welcomemessage = get_input('welcomemessage', '', FALSE); - $sitepage->sidebartitle = get_input('sidebartitle', '', FALSE); - $sitepage->sidebarmessage = get_input('sidebarmessage', '', FALSE); - - break; -} - -if ($sitepage->save()) { - system_message(elgg_echo('sitepages:posted')); -} else { - register_error(elgg_echo('sitepages:error')); -} - -forward(REFERER); diff --git a/mod/sitepages/index.php b/mod/sitepages/index.php deleted file mode 100644 index 56463a8d8..000000000 --- a/mod/sitepages/index.php +++ /dev/null @@ -1,45 +0,0 @@ - $items . elgg_view('riverdashboard/js'))); -}else{ - $content .= elgg_list_registered_entities(array('limit' => 10, 'offset' => $offset, 'full_view' => FALSE, 'allowed_types' => array('object','group'))); -} -elgg_set_context('main'); - -global $autofeed; -$autofeed = FALSE; - -$members = elgg_get_entities_from_metadata(array( - 'metadata_names' => 'icontime', - 'types' => 'user', - 'owner_guid' => 0, - 'limit' => 10 -)); -//include sidebar free text -$sidebar = elgg_view('sitepages/sidebar'); -$sidebar .= elgg_view('sitepages/members', array('members' => $members)); - -$params = array( - 'content' => $content, - 'sidebar' => $sidebar -); -$content = elgg_view_layout('frontpage', $params); -echo elgg_view_page(null, $content); diff --git a/mod/sitepages/languages/en.php b/mod/sitepages/languages/en.php deleted file mode 100644 index e85c3f456..000000000 --- a/mod/sitepages/languages/en.php +++ /dev/null @@ -1,82 +0,0 @@ - "Site pages", - 'sitepages:front' => "Front Page", - 'sitepages:about' => "About", - 'sitepages:terms' => "Terms", - 'sitepages:privacy' => "Privacy", - 'sitepages:analytics' => "Analytics", - 'sitepages:contact' => "Contact", - 'sitepages:nopreview' => "No preview yet available", - 'sitepages:preview' => "Preview", - 'sitepages:notset' => "This page has not been set up yet.", - 'sitepages:new' => "New page", - 'sitepages:css' => "CSS", - 'sitepages:seo' => "Metatags", - 'sitepages:metadescription' => "Meta description for search engines", - 'sitepages:metatags' => "Meta tags for search engines (use a comma)", - 'sitepages:seocreated' => "Your search engine information has been added", - 'sitepages:logged_in_front_content' => "Logged in front page content", - 'sitepages:logged_out_front_content' => "Logged out front page content", - 'sitepages:ownfront' => "Turn on the custom frontpage for this network.", - 'sitepages:addcontent' => "You can add content here via your admin tools. Look for the external pages link under admin.", - 'item:object:front' => 'Front page items', - - 'sitepages:error:no_login' => 'The logged out view for the front page must contain a [login_box] or your users can\'t login!', - - /** - * Status messages - */ - 'sitepages:posted' => "Your page was successfully posted.", - 'sitepages:deleted' => "Your page was successfully deleted.", - - /** - * Frontpage form - **/ - - 'sitepages:welcometitle' => 'Welcome title', - 'sitepages:welcomemessage' => 'Welcome message.', - 'sitepages:welcomeintro' => 'Use the following fields to construct a welcome title and message for your users.', - 'sitepages:sidebarintro' => 'Use the following input boxes to set a title and some content for the sidebar freeform content area.', - 'sitepages:sidebartitle' => 'Title', - 'sitepages:sidebarmessage' => 'Message.', - 'sitepages:warning' => 'We recommend that you keep this to less than 300 characters.', - 'sitepagessimple:posted' => 'The frontpage has successfully updated.', - - /** - * Error messages - */ - 'sitepages:deleteerror' => "There was a problem deleting the old page", - 'sitepages:error' => "There has been an error, please try again and if the problem persists, contact the administrator", - - /** - * ECML - */ - 'sitepages:ecml:keywords:loginbox:desc' => 'A standard login box.', - 'sitepages:ecml:keywords:loginbox:usage' => '[loginbox] Useful for the logged out content area.', - - 'sitepages:ecml:keywords:sitestats:desc' => 'This does not exist yet.', - 'sitepages:ecml:keywords:sitestats:usage' => 'This does not exist yet.', - - 'sitepages:ecml:keywords:userlist:desc' => "Lists users.", - 'sitepages:ecml:keywords:userlist:usage' => "[userlist OPTIONS] Supports only_with_avatars=TRUE|FALSE, list_type=newest|online|random, limit", - - 'sitepages:ecml:keywords:entity:desc' => 'Displays a list of any Elgg entity.', - 'sitepages:ecml:keywords:entity:usage' => '[entity] supports all options in elgg_get_entities()', - - 'sitepages:ecml:keywords:view:desc' => 'Displays any Elgg view.', - 'sitepages:ecml:keywords:view:usage' => '[view src="valid/view" arg1=value1 arg2=value2]', - - 'sitepages:ecml:views:custom_frontpage' => "Custom Front Page", -); - -add_translation('en', $english); diff --git a/mod/sitepages/manifest.xml b/mod/sitepages/manifest.xml deleted file mode 100644 index 86b6e92f7..000000000 --- a/mod/sitepages/manifest.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - Site Pages - Curverider - 1.8 - Create about, terms and privacy pages. You can also edit the frontpage if you know a little html/css. - - plugin - ecml2 - - http://www.elgg.org/ - (C) Curverider 2008-2010 - GNU Public License version 2 - - elgg_version - 2009030702 - - advanced - diff --git a/mod/sitepages/sitepages_functions.php b/mod/sitepages/sitepages_functions.php deleted file mode 100644 index 5a2fcd8ee..000000000 --- a/mod/sitepages/sitepages_functions.php +++ /dev/null @@ -1,113 +0,0 @@ -guid, "sitepages:$page_type"); - $sitepage = get_entity($page_guid); - - if ($sitepage instanceof ElggSitePage || $sitepage->page_type == $page_type) { - return $sitepage; - } - - return FALSE; -} - -/** - * Creates a site page object. - * - * @param str $page_type - * @return mixed ElggSitePage on success, FALSE on fail. - */ -function sitepages_create_sitepage_object($page_type) { - - $sitepage = new ElggSitePage(); - $sitepage->page_type = $page_type; - $sitepage->access_id = ACCESS_PUBLIC; - $sitepage->save(); - - $site = elgg_get_site_entity(); - - if ($sitepage->save() && set_private_setting($site->getGUID(), "sitepages:$page_type", $sitepage->getGUID())) { - return $sitepage; - } - - return FALSE; -} - -/** - * Assembles html for edit sections of site pages. - * - * @param str $section - * @return str html - */ -function sitepages_get_edit_section_content($page_type, $entity=NULL) { - $menu = elgg_view('sitepages/menu', array('page_type' => $page_type)); - - switch ($page_type) { - case 'front': - $view = 'sitepages/forms/editfrontsimple'; - break; - - case 'seo': - $view = 'sitepages/forms/editmeta'; - break; - - default: - $view = 'sitepages/forms/edit'; - break; - - } - - $form .= elgg_view($view, array( - 'page_type' => $page_type, - 'entity' => $entity, - )); - return $menu . $form; -} - -/** - * Assembles html for displaying site pages - * - * @param string $page_type - * @return string Formatted html - */ -function sitepages_get_page_content($page_type) { - $body = elgg_view_title(elgg_echo("sitepages:". strtolower($page_type))); - - $sitepage = sitepages_get_sitepage_object($page_type); - - if ($sitepage) { - $body .= $sitepage->description; - } else { - $body .= elgg_echo('sitepages:notset'); - } - - $content = elgg_view_layout('one_sidebar', array('content' => $body)); - return $content; -} - -/** - * Utility object to store site page information. - */ -class ElggSitePage extends ElggObject { - public function initializeAttributes() { - parent::initializeAttributes(); - - $this->attributes['subtype'] = 'sitepages_page'; - } -} \ No newline at end of file diff --git a/mod/sitepages/start.php b/mod/sitepages/start.php deleted file mode 100644 index 93b6c196e..000000000 --- a/mod/sitepages/start.php +++ /dev/null @@ -1,223 +0,0 @@ -view to redirect to url of page. - * The tool settings view is probably not needed as it can be added to the front page edit tab. - * You can say pg/sitepages/read/any_page_i_want and it will let you. - */ - -/** - * Start the site pages plugin. - */ -function sitepages_init() { - require_once(dirname(__FILE__) . '/sitepages_functions.php'); - - // Extend CSS - elgg_extend_view('css/screen', 'sitepages/css'); - - elgg_add_admin_menu_item('sitepages', elgg_echo('sitepages'), 'site'); - - sitepages_setup_footer_menu(); - - // register our subtype - run_function_once('sitepages_runonce'); - - // Register a page handler, so we can have nice URLs - register_page_handler('sitepages', 'sitepages_page_handler'); - - // Register a URL handler for external pages - register_entity_url_handler('sitepages_url', 'object', 'sitepages'); - - elgg_extend_view('html_head/extend', 'sitepages/metatags'); - - // Replace the default index page if user has requested and the site is not running walled garden - if (elgg_get_plugin_setting('ownfrontpage', 'sitepages') == 'yes') { - elgg_register_plugin_hook_handler('index', 'system', 'sitepages_custom_index'); - } - - // define our own ecml keywords and views - elgg_register_plugin_hook_handler('get_keywords', 'ecml', 'sitepages_ecml_keyword_hook'); - elgg_register_plugin_hook_handler('get_views', 'ecml', 'sitepages_ecml_views_hook'); - - // hook into the walled garden pages - elgg_register_plugin_hook_handler('public_pages', 'walled_garden', 'sitepages_public_pages'); - - $action_path = elgg_get_plugins_path() . 'sitepages/actions'; - elgg_register_action('settings/sitepages/save', "$action_path/edit_settings.php"); - -} - -/** - * Registers the sitepages subtype to the right class. - * - * @return bool - */ -function sitepages_runonce() { - return add_subtype('object', 'sitepages_page', 'ElggSitePage'); -} - -/** - * Override the index if requested. - * - * @return TRUE on override - */ -function sitepages_custom_index() { - // context is checked by the extended metatags view to print out its custom CSS - //$context = elgg_get_context(); - //elgg_set_context('sitepages:front'); - - //if ($contents = elgg_view('sitepages/custom_frontpage')) { - // echo elgg_view_page(FALSE, $contents); - - // elgg_set_context($context); - // return TRUE to tell index.php we've got its content right here. - // return TRUE; - //} - - //elgg_set_context($context); - - // return NULL to pass this to next in chain, or back to standard index.php. - //return NULL; - if (!include_once(dirname(dirname(__FILE__))) . "/sitepages/index.php") { - return false; - } - return true; -} - -/** - * - * @param unknown_type $expage - * @return unknown_type - * - * //@todo is this needed? - */ -function sitepages_url($expage) { - return 'pg/sitepages/'; -} - -/** - * Serve out views for site pages. - * - * @param unknown_type $page - * @return unknown_type - */ -function sitepages_page_handler($page) { - - // for the owner block. - if ($logged_in_guid = elgg_get_logged_in_user_guid()) { - set_page_owner($logged_in_guid); - } - - // sanity checking. - // on bad params we'll forward so people will bookmark the correct URLs - // @todo valid page names need to be pulled out into some sort of config var or admin option. - $default_page = 'About'; - - $action = isset($page[0]) ? $page[0] : FALSE; - $page_type = isset($page[1]) ? $page[1] : FALSE; - - switch ($action) { - case 'read': - $title = elgg_echo('sitepages:' . strtolower($page_type)); - $content = sitepages_get_page_content($page_type); - - break; - - default: - forward("pg/sitepages/read/$default_page"); - break; - } - - echo elgg_view_page($title, $content); -} - -/** - * Setup the links to site pages - */ -function sitepages_setup_footer_menu() { - $pages = array('about', 'terms', 'privacy'); - foreach ($pages as $page) { - $url = "pg/sitepages/read/$page"; - $item = new ElggMenuItem($page, elgg_echo("sitepages:$page"), $url); - elgg_register_menu_item('footer', $item); - } -} - -/** - * Register some default keywords. - * - * @param unknown_type $hook - * @param unknown_type $entity_type - * @param unknown_type $return_value - * @param unknown_type $params - * @return unknown_type - */ -function sitepages_ecml_keyword_hook($hook, $entity_type, $return_value, $params) { - $return_value['loginbox'] = array( - 'view' => 'core/account/login_box', - 'description' => elgg_echo('sitepages:ecml:keywords:loginbox:desc'), - 'usage' => elgg_echo('sitepages:ecml:keywords:loginbox:usage'), - 'restricted' => array('sitepages/custom_frontpage') - ); - - $return_value['userlist'] = array( - 'view' => 'sitepages/keywords/userlist', - 'description' => elgg_echo('sitepages:ecml:keywords:userlist:desc'), - 'usage' => elgg_echo('sitepages:ecml:keywords:userlist:usage'), - 'restricted' => array('sitepages/custom_frontpage') - ); - -// $return_value['sitestats'] = array( -// 'view' => 'sitepages/keywords/sitestats', -// 'description' => elgg_echo('sitepages:ecml:keywords:sitestats:desc'), -// 'usage' => elgg_echo('sitepages:ecml:keywords:sitestats:usage'), -// 'restricted' => array('sitepages/custom_frontpage') -// ); - - $return_value['entities'] = array( - 'description' => elgg_echo('sitepages:ecml:keywords:entity:desc'), - 'usage' => elgg_echo('sitepages:ecml:keywords:entity:usage'), - 'restricted' => array('sitepages/custom_frontpage') - ); - - $return_value['view'] = array( - 'description' => elgg_echo('sitepages:ecml:keywords:view:desc'), - 'usage' => elgg_echo('sitepages:ecml:keywords:view:usage'), - 'restricted' => array('sitepages/custom_frontpage') - ); - - return $return_value; -} - -/** - * Register the frontpage with ECML. - * - * @param unknown_type $hook - * @param unknown_type $entity_type - * @param unknown_type $return_value - * @param unknown_type $params - */ -function sitepages_ecml_views_hook($hook, $entity_type, $return_value, $params) { - $return_value['sitepages/custom_frontpage'] = elgg_echo('sitepages:ecml:views:custom_frontpage'); - - return $return_value; -} - -function sitepages_public_pages($hook, $type, $return_value, $params) { - $return_value[] = 'pg/sitepages/read/About'; - $return_value[] = 'pg/sitepages/read/Terms'; - $return_value[] = 'pg/sitepages/read/Privacy'; - - return $return_value; -} - -elgg_register_event_handler('init', 'system', 'sitepages_init'); diff --git a/mod/sitepages/views/default/admin/site/sitepages.php b/mod/sitepages/views/default/admin/site/sitepages.php deleted file mode 100644 index c323eb875..000000000 --- a/mod/sitepages/views/default/admin/site/sitepages.php +++ /dev/null @@ -1,13 +0,0 @@ - -
-
- -
- -
- -
-
diff --git a/mod/sitepages/views/default/sitepages/css.php b/mod/sitepages/views/default/sitepages/css.php deleted file mode 100644 index 0034e2fba..000000000 --- a/mod/sitepages/views/default/sitepages/css.php +++ /dev/null @@ -1,20 +0,0 @@ - -#elgg-sidebar.frontpage { - margin-top:0; -} -#elgg-sidebar.frontpage .sitepages_sidebar_object { - margin-bottom: 30px; -} -#elgg-sidebar.frontpage .sitepages_sidebar_object h3 { - margin-top:12px; -} -#elgg-page-contents.frontpage .sitepages_welcome { - margin-bottom: 20px; -} -#elgg-page-contents.frontpage .sitepages_message { - margin-top: 10px; -} \ No newline at end of file diff --git a/mod/sitepages/views/default/sitepages/custom_frontpage.php b/mod/sitepages/views/default/sitepages/custom_frontpage.php deleted file mode 100644 index 95310e1e5..000000000 --- a/mod/sitepages/views/default/sitepages/custom_frontpage.php +++ /dev/null @@ -1,17 +0,0 @@ -logged_in_content; - } else { - echo $sitepage->logged_out_content; - } -} \ No newline at end of file diff --git a/mod/sitepages/views/default/sitepages/forms/edit.php b/mod/sitepages/views/default/sitepages/forms/edit.php deleted file mode 100644 index 83373ad80..000000000 --- a/mod/sitepages/views/default/sitepages/forms/edit.php +++ /dev/null @@ -1,51 +0,0 @@ -tags; - $description = $sitepages_object->description; - $guid = $sitepages_object->getGUID(); -} else { - $tags = array(); - $description = ''; - $guid = ''; -} - -// set the required form variables -$input_area = elgg_view('input/longtext', array( - 'internalname' => 'sitepages_content', - 'value' => $description -)); -$tag_input = elgg_view('input/tags', array( - 'internalname' => 'sitepages_tags', - 'value' => $tags -)); - -$hidden_value = elgg_view('input/hidden', array( - 'internalname' => 'page_type', - 'value' => $page_type -)); - -$tag_label = elgg_echo('tags'); -$external_page_title = elgg_echo("sitepages:$page_type"); - -$form_body = <<<___EOT - -

- -

- -$hidden_value - -___EOT; - -echo $form_body; diff --git a/mod/sitepages/views/default/sitepages/forms/editfrontsimple.php b/mod/sitepages/views/default/sitepages/forms/editfrontsimple.php deleted file mode 100644 index c01c13f23..000000000 --- a/mod/sitepages/views/default/sitepages/forms/editfrontsimple.php +++ /dev/null @@ -1,87 +0,0 @@ -welcometitle; - $welcomemessage = $sitepages_object->welcomemessage; - $sidebartitle = $sitepages_object->sidebartitle; - $sidebarmessage = $sitepages_object->sidebarmessage; -}else{ - $welcometitle = ''; - $welcomemessage = ''; - $sidebartitle = ''; - $sidebarmessage = ''; -} - - -// set the required form variables -$welcometitle_form = elgg_view('input/text', array( - 'internalname' => 'welcometitle', - 'value' => $welcometitle -)); -$welcomemessage_form = elgg_view('input/longtext', array( - 'internalname' => 'welcomemessage', - 'value' => $welcomemessage, - 'class' => 'elgg-input-textarea monospace' -)); -$sidebartitle_form = elgg_view('input/text', array( - 'internalname' => 'sidebartitle', - 'value' => $sidebartitle -)); -$sidebarmessage_form = elgg_view('input/longtext', array( - 'internalname' => 'sidebarmessage', - 'value' => $sidebarmessage, - 'class' => 'elgg-input-textarea monospace' -));; - -$page_type = elgg_view('input/hidden', array( - 'internalname' => 'page_type', - 'value' => 'frontsimple', -)); - -$welcomemessage_title = elgg_echo('sitepages:welcomemessage'); -$sidebarmessage_title = elgg_echo('sitepages:sidebarmessage'); -$welcometitle_title = elgg_echo('sitepages:welcometitle'); -$sidebartitle_title = elgg_echo('sitepages:sidebartitle'); -$welcome_intro = elgg_echo('sitepages:welcomeintro'); -$sidebar_intro = elgg_echo('sitepages:sidebarintro'); - -$ownfrontpage_message = elgg_echo('sitepages:ownfront'); -$ownfrontpage = elgg_view('input/dropdown', array( - 'internalname' => 'params[ownfrontpage]', - 'value' => isset($vars['entity']->ownfrontpage) ? $vars['entity']->ownfrontpage : 'no', - 'options_values' => array( - 'yes' => elgg_echo('option:yes'), - 'no' => elgg_echo('option:no'), - ), -)); - -//construct the form -$form_body = <<<___EOT - -

- $ownfrontpage_message - $ownfrontpage -

- -

$welcome_intro

-

-

- -

$sidebar_intro

-

-

- - $page_type - -___EOT; - -echo $form_body; diff --git a/mod/sitepages/views/default/sitepages/forms/editmeta.php b/mod/sitepages/views/default/sitepages/forms/editmeta.php deleted file mode 100644 index 999624153..000000000 --- a/mod/sitepages/views/default/sitepages/forms/editmeta.php +++ /dev/null @@ -1,40 +0,0 @@ -title; - $meta_description = $sitepages_object->description; -} else { - $meta_tags = ''; - $meta_description = ''; -} - -$description = elgg_echo('sitepages:metadescription'); -$input_description = elgg_view('input/plaintext', array( - 'internalname' => 'description', - 'value' => $meta_description -)); - -$metatags = elgg_echo('sitepages:metatags'); -$input_keywords = elgg_view('input/text', array( - 'internalname' => 'metatags', - 'value' => $meta_tags -)); - -$page_type = elgg_view('input/hidden', array( - 'internalname' => 'page_type', - 'value' => 'seo', -)); - -$form_body = <<<___EOT -

-

-$page_type -___EOT; - -//display the form -echo $form_body; \ No newline at end of file diff --git a/mod/sitepages/views/default/sitepages/keywords/sitestats.php b/mod/sitepages/views/default/sitepages/keywords/sitestats.php deleted file mode 100644 index 689c2282a..000000000 --- a/mod/sitepages/views/default/sitepages/keywords/sitestats.php +++ /dev/null @@ -1,8 +0,0 @@ - 'user', - 'limit' => $limit -); - -if ($only_with_avatars == TRUE) { - $options['metadata_name_value_pairs'] = array('name' => 'icontime', 'operand' => '!=', 'value' => 0); -} - -switch ($list_type) { - case 'new': - $options['order_by'] = 'e.time_created DESC'; - break; - - case 'online': - // show people with a last action of < 10 minutes. - $last_action = time() - 10 * 60; - $options['joins'] = array("JOIN {$db_prefix}users_entity ue on ue.guid = e.guid"); - $options['wheres'] = array("ue.last_action > $last_action"); - break; - - case 'random': - $options['order_by'] = 'RAND()'; - break; - - default: - break; -} - -$users = elgg_get_entities_from_metadata($options); - -echo elgg_view_entity_list($users, count($users), 0, $limit, FALSE, FALSE, FALSE); \ No newline at end of file diff --git a/mod/sitepages/views/default/sitepages/members.php b/mod/sitepages/views/default/sitepages/members.php deleted file mode 100644 index 9ca33064e..000000000 --- a/mod/sitepages/views/default/sitepages/members.php +++ /dev/null @@ -1,11 +0,0 @@ -"; - } -?> - \ No newline at end of file diff --git a/mod/sitepages/views/default/sitepages/menu.php b/mod/sitepages/views/default/sitepages/menu.php deleted file mode 100644 index aed424af7..000000000 --- a/mod/sitepages/views/default/sitepages/menu.php +++ /dev/null @@ -1,24 +0,0 @@ - - - \ No newline at end of file diff --git a/mod/sitepages/views/default/sitepages/metatags.php b/mod/sitepages/views/default/sitepages/metatags.php deleted file mode 100644 index 6213dde52..000000000 --- a/mod/sitepages/views/default/sitepages/metatags.php +++ /dev/null @@ -1,35 +0,0 @@ -title; - $description = $meta_details->description; - - echo <<<___END - - - - -___END; -} - -// only show on the custom front page. -if (elgg_get_context() == 'sitepages:front') { - $custom_css = sitepages_get_sitepage_object('front'); - - if ($custom_css && $custom_css->css) { - echo <<<___END - - - -___END; - } -} \ No newline at end of file diff --git a/mod/sitepages/views/default/sitepages/sidebar.php b/mod/sitepages/views/default/sitepages/sidebar.php deleted file mode 100644 index 8326a3087..000000000 --- a/mod/sitepages/views/default/sitepages/sidebar.php +++ /dev/null @@ -1,13 +0,0 @@ -sidebartitle; -$sidebarmessage = $sitepages_object->sidebarmessage; - -if($sidebarmessage){ - echo ""; -} \ No newline at end of file diff --git a/mod/sitepages/views/default/sitepages/welcome.php b/mod/sitepages/views/default/sitepages/welcome.php deleted file mode 100644 index 584dd1c0b..000000000 --- a/mod/sitepages/views/default/sitepages/welcome.php +++ /dev/null @@ -1,13 +0,0 @@ -welcometitle; -$welcomemessage = $sitepages_object->welcomemessage; - -if($welcomemessage){ - echo "

" . $welcometitle . "

"; - echo "
".$welcomemessage."
"; -} \ No newline at end of file -- cgit v1.2.3