diff options
Diffstat (limited to 'pages')
| -rw-r--r-- | pages/account/forgotten_password.php | 3 | ||||
| -rw-r--r-- | pages/account/register.php | 8 | ||||
| -rw-r--r-- | pages/dashboard/index.php | 2 | ||||
| -rw-r--r-- | pages/dashboard/latest.php | 5 | ||||
| -rw-r--r-- | pages/entities/index.php | 2 | ||||
| -rw-r--r-- | pages/friends/add.php | 2 | ||||
| -rw-r--r-- | pages/friends/edit.php | 3 | ||||
| -rw-r--r-- | pages/friends/index.php | 4 | ||||
| -rw-r--r-- | pages/friends/of.php | 4 | ||||
| -rw-r--r-- | pages/friends/pickercallback.php | 26 | ||||
| -rw-r--r-- | pages/settings/plugins.php | 3 |
11 files changed, 34 insertions, 28 deletions
diff --git a/pages/account/forgotten_password.php b/pages/account/forgotten_password.php index 2285e7299..546dbfd62 100644 --- a/pages/account/forgotten_password.php +++ b/pages/account/forgotten_password.php @@ -11,7 +11,8 @@ require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php"); if (!isloggedin()) { $area1 = elgg_view_title(elgg_echo("user:password:lost")); $area2 = elgg_view("account/forms/forgotten_password"); - page_draw(elgg_echo('user:password:lost'), elgg_view_layout("one_column_with_sidebar", $area1 . $area2)); + $content = elgg_view_layout("one_column_with_sidebar", $area1 . $area2); + page_draw(elgg_echo('user:password:lost'), $content); } else { forward(); }
\ No newline at end of file diff --git a/pages/account/register.php b/pages/account/register.php index cbbc40060..2500d11fc 100644 --- a/pages/account/register.php +++ b/pages/account/register.php @@ -29,16 +29,18 @@ if (!$CONFIG->allow_registration) { forward(); } -$friend_guid = (int) get_input('friend_guid',0); +$friend_guid = (int) get_input('friend_guid', 0); $invitecode = get_input('invitecode'); // If we're not logged in, display the registration page if (!isloggedin()) { $area1 = elgg_view_title(elgg_echo("register")); - $area2 = elgg_view("account/forms/register", array('friend_guid' => $friend_guid, 'invitecode' => $invitecode)); + $area2 = elgg_view("account/forms/register", + array('friend_guid' => $friend_guid, 'invitecode' => $invitecode)); + page_draw(elgg_echo("register"), elgg_view_layout("one_column_with_sidebar", $area1 . $area2)); -// Otherwise, forward to the index page + // Otherwise, forward to the index page } else { forward(); } diff --git a/pages/dashboard/index.php b/pages/dashboard/index.php index e00140e17..6fbbec035 100644 --- a/pages/dashboard/index.php +++ b/pages/dashboard/index.php @@ -18,6 +18,6 @@ $title = elgg_echo('dashboard'); $intro_message = elgg_view('dashboard/blurb'); // Try and get the user from the username and set the page body accordingly -$body = elgg_view_layout('widgets',"","",$intro_message); +$body = elgg_view_layout('widgets', "", "", $intro_message); page_draw($title, $body);
\ No newline at end of file diff --git a/pages/dashboard/latest.php b/pages/dashboard/latest.php index 2d4300593..3c81207f0 100644 --- a/pages/dashboard/latest.php +++ b/pages/dashboard/latest.php @@ -14,10 +14,11 @@ require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php"); // Load the front page global $CONFIG; -if(is_plugin_enabled('riverdashboard')) { +if (is_plugin_enabled('riverdashboard')) { $title = elgg_view_title(elgg_echo('content:latest')); set_context('search'); - $content = elgg_list_registered_entities(array('limit' => 10, 'full_view' => FALSE, 'allowed_types' => array('object','group'))); + $content = elgg_list_registered_entities(array('limit' => 10, 'full_view' => FALSE, + 'allowed_types' => array('object','group'))); set_context('latest'); } else { $content = "Riverdashboard not loaded"; diff --git a/pages/entities/index.php b/pages/entities/index.php index 2d5527e44..bbd110689 100644 --- a/pages/entities/index.php +++ b/pages/entities/index.php @@ -36,7 +36,7 @@ if ($entity = get_entity($guid)) { } else if ($entity instanceof ElggEntity) { $title = $entity->name; } - $area1 = elgg_view_entity($entity,true); + $area1 = elgg_view_entity($entity, true); if ($shell) { $body = elgg_view_layout('one_column_with_sidebar', $area1); } else { diff --git a/pages/friends/add.php b/pages/friends/add.php index e4da65237..34944d624 100644 --- a/pages/friends/add.php +++ b/pages/friends/add.php @@ -20,4 +20,4 @@ $content .= elgg_view('friends/forms/edit', array( $body = elgg_view_layout('one_column_with_sidebar', $content); -page_draw(elgg_echo('friends:collections:add'),$body); +page_draw(elgg_echo('friends:collections:add'), $body); diff --git a/pages/friends/edit.php b/pages/friends/edit.php index 0d82d210d..ddc7f9650 100644 --- a/pages/friends/edit.php +++ b/pages/friends/edit.php @@ -22,7 +22,8 @@ $collection = get_access_collection($collection_id); //get all members of the collection $collection_members = get_members_of_access_collection($collection_id); -$content .= elgg_view('friends/forms/edit', array('collection' => $collection, 'collection_members' => $collection_members)); +$content .= elgg_view('friends/forms/edit', array('collection' => $collection, + 'collection_members' => $collection_members)); $body = elgg_view_layout('one_column_with_sidebar', $content); diff --git a/pages/friends/index.php b/pages/friends/index.php index a44a08227..10128ffc7 100644 --- a/pages/friends/index.php +++ b/pages/friends/index.php @@ -17,7 +17,9 @@ $title = sprintf(elgg_echo("friends:owned"), $owner->name); $content = elgg_view_title($title); -$content .= "<div class='members_list'>" . list_entities_from_relationship('friend', $owner->getGUID(), FALSE, 'user', '', 0, 10, FALSE) . "</div>"; +$content .= "<div class='members_list'>" + . list_entities_from_relationship('friend', $owner->getGUID(), FALSE, 'user', '', 0, 10, FALSE) + . "</div>"; $body = elgg_view_layout('one_column_with_sidebar', $content); diff --git a/pages/friends/of.php b/pages/friends/of.php index 7a35e138a..b8740b88e 100644 --- a/pages/friends/of.php +++ b/pages/friends/of.php @@ -17,7 +17,9 @@ $title = sprintf(elgg_echo("friends:of:owned"), $owner->name); $content = elgg_view_title($title); -$content .= "<div class='members_list'>" . list_entities_from_relationship('friend', $owner->getGUID(), TRUE, 'user', '', 0, 10, FALSE) . "</div>"; +$content .= "<div class='members_list'>" + . list_entities_from_relationship('friend', $owner->getGUID(), TRUE, 'user', '', 0, 10, FALSE) + . "</div>"; $body = elgg_view_layout('one_column_with_sidebar', $content); diff --git a/pages/friends/pickercallback.php b/pages/friends/pickercallback.php index a5d85f1e4..c04b1d383 100644 --- a/pages/friends/pickercallback.php +++ b/pages/friends/pickercallback.php @@ -11,22 +11,15 @@ require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php"); global $CONFIG; // Get callback type (list or picker) -$type = get_input('type','picker'); +$type = get_input('type', 'picker'); -// Get list of members if applicable -/*$members = get_input('members',''); -if (!empty($members)) { - $members = explode(',',$members); -} else { - $members = array(); -}*/ -$collection = (int) get_input('collection',0); +$collection = (int) get_input('collection', 0); $members = get_members_of_access_collection($collection, true); if (!$members) { $members = array(); } -$friendspicker = (int) get_input('friendspicker',0); +$friendspicker = (int) get_input('friendspicker', 0); // Get page owner (bomb out if there isn't one) $pageowner = page_owner_entity(); @@ -38,17 +31,20 @@ if (!$pageowner) { // Depending on the view type, launch a different view switch($type) { case 'list': - $js_segment = elgg_view('friends/tablelistcountupdate',array('friendspicker' => $friendspicker, 'count' => sizeof($members))); - $content = elgg_view('friends/tablelist',array('entities' => $members, 'content' => $js_segment)); + $js_segment = elgg_view('friends/tablelistcountupdate', + array('friendspicker' => $friendspicker, 'count' => sizeof($members))); + $content = elgg_view('friends/tablelist', + array('entities' => $members, 'content' => $js_segment)); break; default: - $friends = $pageowner->getFriends('',9999); - $content = elgg_view('friends/picker',array( + $friends = $pageowner->getFriends('', 9999); + $content = elgg_view('friends/picker', array( 'entities' => $friends, 'value' => $members, 'callback' => true, 'friendspicker' => $friendspicker, - 'formcontents' => elgg_view('friends/forms/collectionfields',array('collection' => get_access_collection($collection))), + 'formcontents' => elgg_view('friends/forms/collectionfields', + array('collection' => get_access_collection($collection))), 'formtarget' => $CONFIG->wwwroot . 'action/friends/editcollection', )); break; diff --git a/pages/settings/plugins.php b/pages/settings/plugins.php index 7d176c78c..a003be644 100644 --- a/pages/settings/plugins.php +++ b/pages/settings/plugins.php @@ -15,7 +15,8 @@ if ((!page_owner_entity()) || (!page_owner_entity()->canEdit())) { } $content = elgg_view_title(elgg_echo("usersettings:plugins")); -$content .= elgg_view("usersettings/plugins", array('installed_plugins' => get_installed_plugins())); +$content .= elgg_view("usersettings/plugins", + array('installed_plugins' => get_installed_plugins())); $body = elgg_view_layout('one_column_with_sidebar', $content); |