From c2e2d3ae222a55086bed95d897c6e8c50b066c37 Mon Sep 17 00:00:00 2001 From: brettp Date: Thu, 25 Mar 2010 22:00:44 +0000 Subject: Converting all line endings to unix style. git-svn-id: http://code.elgg.org/elgg/trunk@5512 36083f99-b078-4883-b0ff-0f9b5a30f544 --- mod/bookmarks/actions/edit.php | 68 ++-- mod/bookmarks/actions/reference.php | 66 +-- mod/bookmarks/actions/remove.php | 66 +-- mod/bookmarks/views/default/bookmarks/stats.php | 20 +- .../views/default/members/members_navigation.php | 44 +- mod/riverdashboard/endpoint/ping.php | 140 +++---- mod/riverdashboard/index.php | 122 +++--- mod/riverdashboard/languages/en.php | 78 ++-- mod/riverdashboard/start.php | 102 ++--- .../views/default/riverdashboard/container.php | 104 ++--- .../views/default/riverdashboard/menu.php | 54 +-- .../views/default/riverdashboard/nav.php | 102 ++--- .../views/default/riverdashboard/rivercomment.php | 28 +- .../views/default/riverdashboard/welcome.php | 14 +- mod/sitepages/actions/addmeta.php | 70 ++-- mod/sitepages/sitepages_functions.php | 448 ++++++++++----------- .../views/default/settings/sitepages/edit.php | 36 +- .../views/default/sitepages/forms/editmeta.php | 84 ++-- mod/sitepages/views/default/sitepages/keywords.php | 58 +-- mod/sitepages/views/default/sitepages/metatags.php | 76 ++-- 20 files changed, 890 insertions(+), 890 deletions(-) (limited to 'mod') diff --git a/mod/bookmarks/actions/edit.php b/mod/bookmarks/actions/edit.php index 16e324154..dd0330b2d 100755 --- a/mod/bookmarks/actions/edit.php +++ b/mod/bookmarks/actions/edit.php @@ -1,35 +1,35 @@ -getSubtype() == "bookmarks" && $bookmark->canEdit()) { - $bookmark->title = $title; - $bookmark->description = $notes; - $bookmark->address = $address; - $bookmark->access_id = $access; - $bookmark->tags = $tagarray; - if ($bookmark->save()) { - system_message(elgg_echo('bookmarks:edit:success')); - } else { - system_message(elgg_echo('bookmarks:edit:fail')); - } -}else{ - system_message(elgg_echo('bookmarks:edit:fail')); -} -$account = get_entity($bookmark->container_guid); +getSubtype() == "bookmarks" && $bookmark->canEdit()) { + $bookmark->title = $title; + $bookmark->description = $notes; + $bookmark->address = $address; + $bookmark->access_id = $access; + $bookmark->tags = $tagarray; + if ($bookmark->save()) { + system_message(elgg_echo('bookmarks:edit:success')); + } else { + system_message(elgg_echo('bookmarks:edit:fail')); + } +}else{ + system_message(elgg_echo('bookmarks:edit:fail')); +} +$account = get_entity($bookmark->container_guid); forward("pg/bookmarks/" . $account->username); \ No newline at end of file diff --git a/mod/bookmarks/actions/reference.php b/mod/bookmarks/actions/reference.php index ae79b78cd..515ac1ed1 100755 --- a/mod/bookmarks/actions/reference.php +++ b/mod/bookmarks/actions/reference.php @@ -1,34 +1,34 @@ -canEdit()){ - //create a relationship between the object and bookmark - if(add_entity_relationship($object_guid, "reference", $bookmark_guid)){ - // Success message - system_message(elgg_echo("bookmarks:referenceadded")); - }else{ - // Failure message - system_message(elgg_echo("bookmarks:referenceerror")); - } - }else{ - // Failure message - system_message(elgg_echo("bookmarks:referenceerror")); - } -}else{ - // Failure message - system_message(elgg_echo("bookmarks:referenceerror")); -} - +canEdit()){ + //create a relationship between the object and bookmark + if(add_entity_relationship($object_guid, "reference", $bookmark_guid)){ + // Success message + system_message(elgg_echo("bookmarks:referenceadded")); + }else{ + // Failure message + system_message(elgg_echo("bookmarks:referenceerror")); + } + }else{ + // Failure message + system_message(elgg_echo("bookmarks:referenceerror")); + } +}else{ + // Failure message + system_message(elgg_echo("bookmarks:referenceerror")); +} + forward($object->getURL()); \ No newline at end of file diff --git a/mod/bookmarks/actions/remove.php b/mod/bookmarks/actions/remove.php index b8b1ad6a3..f704a5cc3 100755 --- a/mod/bookmarks/actions/remove.php +++ b/mod/bookmarks/actions/remove.php @@ -1,34 +1,34 @@ -canEdit()){ - //remove the relationship between the object and bookmark - if(remove_entity_relationship($object_guid, "reference", $bookmark_guid)){ - // Success message - system_message(elgg_echo("bookmarks:removed")); - }else{ - // Failure message - system_message(elgg_echo("bookmarks:removederror")); - } - }else{ - // Failure message - system_message(elgg_echo("bookmarks:removederror")); - } -}else{ - // Failure message - system_message(elgg_echo("bookmarks:removederror")); -} - +canEdit()){ + //remove the relationship between the object and bookmark + if(remove_entity_relationship($object_guid, "reference", $bookmark_guid)){ + // Success message + system_message(elgg_echo("bookmarks:removed")); + }else{ + // Failure message + system_message(elgg_echo("bookmarks:removederror")); + } + }else{ + // Failure message + system_message(elgg_echo("bookmarks:removederror")); + } +}else{ + // Failure message + system_message(elgg_echo("bookmarks:removederror")); +} + forward($object->getURL()); \ No newline at end of file diff --git a/mod/bookmarks/views/default/bookmarks/stats.php b/mod/bookmarks/views/default/bookmarks/stats.php index 07450fd2e..a9cad12b3 100755 --- a/mod/bookmarks/views/default/bookmarks/stats.php +++ b/mod/bookmarks/views/default/bookmarks/stats.php @@ -1,10 +1,10 @@ -Bookmark stats"; -echo "

".$count_bookmarks . " resources bookmarked.

"; +Bookmark stats"; +echo "

".$count_bookmarks . " resources bookmarked.

"; diff --git a/mod/members/views/default/members/members_navigation.php b/mod/members/views/default/members/members_navigation.php index 6abe6f348..1a79c3cfd 100644 --- a/mod/members/views/default/members/members_navigation.php +++ b/mod/members/views/default/members/members_navigation.php @@ -1,23 +1,23 @@ - -
- + +
+
    +
  • >
    • +
  • >
    • +
  • >
    • +
\ No newline at end of file diff --git a/mod/riverdashboard/endpoint/ping.php b/mod/riverdashboard/endpoint/ping.php index c5613dd0c..d41128e1f 100644 --- a/mod/riverdashboard/endpoint/ping.php +++ b/mod/riverdashboard/endpoint/ping.php @@ -1,70 +1,70 @@ - TRUE, - 'created_time_lower' => $last_reload, - 'wheres' => array('e.type != \'user\'') -)); -if(!$entity_creation) - $entity_creation = 0; -//grab any entities updated -$entity_update = elgg_get_entities(array( - 'count' => TRUE, - 'modified_time_lower' => $last_reload, - 'wheres' => array('e.type != \'user\'') -)); -if(!$entity_update) - $entity_update = 0; -//get any relationships, such as friending - this is not working quite right yet -//$relationship_action = elgg_get_entities_from_relationship(array('count' => TRUE)); -//if(!$relationship_action) -// $relationship_action = 0; - -//sum all totals -$all_activity = $annotations + $entity_creation + $entity_update; - -if ($all_activity > 0) { - $s = ($all_activity == 1) ? '' : 's'; - echo "$all_activity update$s!"; -?> - - - TRUE, + 'created_time_lower' => $last_reload, + 'wheres' => array('e.type != \'user\'') +)); +if(!$entity_creation) + $entity_creation = 0; +//grab any entities updated +$entity_update = elgg_get_entities(array( + 'count' => TRUE, + 'modified_time_lower' => $last_reload, + 'wheres' => array('e.type != \'user\'') +)); +if(!$entity_update) + $entity_update = 0; +//get any relationships, such as friending - this is not working quite right yet +//$relationship_action = elgg_get_entities_from_relationship(array('count' => TRUE)); +//if(!$relationship_action) +// $relationship_action = 0; + +//sum all totals +$all_activity = $annotations + $entity_creation + $entity_update; + +if ($all_activity > 0) { + $s = ($all_activity == 1) ? '' : 's'; + echo "$all_activity update$s!"; +?> + + +guid; - $relationship_type = ''; - $title_wording = elgg_echo('river:mine'); - break; - case 'friends': $subject_guid = $_SESSION['user']->guid; - $relationship_type = 'friend'; - $title_wording = elgg_echo('river:friends'); - break; - default: $subject_guid = 0; - $relationship_type = ''; - $title_wording = elgg_echo('river:all'); - break; -} - - -$title = elgg_view_title($title_wording); - -$river = elgg_view_river_items($subject_guid, 0, $relationship_type, $type, $subtype, '', 20, 0, 0, true, false) . "
"; -// Replacing callback calls in the nav with something meaningless -$river = str_replace('callback=true','replaced=88,334',$river); - -$nav = elgg_view('riverdashboard/nav',array('type' => $type,'subtype' => $subtype,'orient' => $orient)); -if(isloggedin()){ - $sidebar = elgg_view("riverdashboard/menu",array('type' => $type,'subtype' => $subtype,'orient' => $orient)); - $sidebar .= elgg_view("riverdashboard/sidebar", array("object_type" => 'riverdashboard')); -}else{ - $sidebar = ''; -} -set_context('riverdashboard'); -if (empty($callback)) { - $body .= elgg_view('riverdashboard/container', array('body' => $nav . $river . elgg_view('riverdashboard/js'))); - page_draw($title_wording,elgg_view_layout('one_column_with_sidebar',$title . $body, $sidebar)); -} else { - header("Content-type: text/html; charset=UTF-8"); - echo $nav . $river . elgg_view('riverdashboard/js'); +guid; + $relationship_type = ''; + $title_wording = elgg_echo('river:mine'); + break; + case 'friends': $subject_guid = $_SESSION['user']->guid; + $relationship_type = 'friend'; + $title_wording = elgg_echo('river:friends'); + break; + default: $subject_guid = 0; + $relationship_type = ''; + $title_wording = elgg_echo('river:all'); + break; +} + + +$title = elgg_view_title($title_wording); + +$river = elgg_view_river_items($subject_guid, 0, $relationship_type, $type, $subtype, '', 20, 0, 0, true, false) . ""; +// Replacing callback calls in the nav with something meaningless +$river = str_replace('callback=true','replaced=88,334',$river); + +$nav = elgg_view('riverdashboard/nav',array('type' => $type,'subtype' => $subtype,'orient' => $orient)); +if(isloggedin()){ + $sidebar = elgg_view("riverdashboard/menu",array('type' => $type,'subtype' => $subtype,'orient' => $orient)); + $sidebar .= elgg_view("riverdashboard/sidebar", array("object_type" => 'riverdashboard')); +}else{ + $sidebar = ''; +} +set_context('riverdashboard'); +if (empty($callback)) { + $body .= elgg_view('riverdashboard/container', array('body' => $nav . $river . elgg_view('riverdashboard/js'))); + page_draw($title_wording,elgg_view_layout('one_column_with_sidebar',$title . $body, $sidebar)); +} else { + header("Content-type: text/html; charset=UTF-8"); + echo $nav . $river . elgg_view('riverdashboard/js'); } \ No newline at end of file diff --git a/mod/riverdashboard/languages/en.php b/mod/riverdashboard/languages/en.php index 64aabf745..864a8d7a9 100644 --- a/mod/riverdashboard/languages/en.php +++ b/mod/riverdashboard/languages/en.php @@ -1,40 +1,40 @@ - 'Mine', - 'filter' => 'Filter', - 'riverdashboard:useasdashboard' => "Replace the default dashboard with this activity river?", - 'activity' => 'Activity', - 'riverdashboard:recentmembers' => 'Recent members', - - /** - * Site messages - **/ - - 'sitemessages:announcements' => "Site announcements", - 'sitemessages:posted' => "Posted", - 'sitemessages:river:created' => "Site admin, %s,", - 'sitemessages:river:create' => "posted a new site wide message", - 'sitemessages:add' => "Add a site-wide message to the river page", - 'sitemessage:deleted' => "Site message deleted", - - 'river:widget:noactivity' => 'We could not find any activity.', - 'river:widget:title' => "Activity", - 'river:all' => "All activity", - 'river:mine' => "My activity", - 'river:friends' => "Friends' activity", - 'river:widget:description' => "Show your latest activity.", - 'river:widget:title:friends' => "Friends' activity", - 'river:widget:description:friends' => "Show what your friends are up to.", - 'river:widgets:friends' => "Friends", - 'river:widgets:mine' => "Mine", - 'river:friends' => "My friends' activity", - 'river:mine' => "My activity", - 'river:widget:label:displaynum' => "Number of entries to display:", - 'river:widget:type' => "Which river would you like to display? One that shows your activity or one that shows your friends activity?", - 'item:object:sitemessage' => "Site messages", - 'riverdashboard:avataricon' => "Would you like to use user avatars or icons on your site activity stream?", - 'option:icon' => 'Icons', - 'option:avatar' => 'Avatars', -); - + 'Mine', + 'filter' => 'Filter', + 'riverdashboard:useasdashboard' => "Replace the default dashboard with this activity river?", + 'activity' => 'Activity', + 'riverdashboard:recentmembers' => 'Recent members', + + /** + * Site messages + **/ + + 'sitemessages:announcements' => "Site announcements", + 'sitemessages:posted' => "Posted", + 'sitemessages:river:created' => "Site admin, %s,", + 'sitemessages:river:create' => "posted a new site wide message", + 'sitemessages:add' => "Add a site-wide message to the river page", + 'sitemessage:deleted' => "Site message deleted", + + 'river:widget:noactivity' => 'We could not find any activity.', + 'river:widget:title' => "Activity", + 'river:all' => "All activity", + 'river:mine' => "My activity", + 'river:friends' => "Friends' activity", + 'river:widget:description' => "Show your latest activity.", + 'river:widget:title:friends' => "Friends' activity", + 'river:widget:description:friends' => "Show what your friends are up to.", + 'river:widgets:friends' => "Friends", + 'river:widgets:mine' => "Mine", + 'river:friends' => "My friends' activity", + 'river:mine' => "My activity", + 'river:widget:label:displaynum' => "Number of entries to display:", + 'river:widget:type' => "Which river would you like to display? One that shows your activity or one that shows your friends activity?", + 'item:object:sitemessage' => "Site messages", + 'riverdashboard:avataricon' => "Would you like to use user avatars or icons on your site activity stream?", + 'option:icon' => 'Icons', + 'option:avatar' => 'Avatars', +); + add_translation("en",$english); \ No newline at end of file diff --git a/mod/riverdashboard/start.php b/mod/riverdashboard/start.php index 6badd8393..1377afc37 100644 --- a/mod/riverdashboard/start.php +++ b/mod/riverdashboard/start.php @@ -1,51 +1,51 @@ -wwwroot . "mod/riverdashboard/"); - } - // Page handler - register_page_handler('riverdashboard','riverdashboard_page_handler'); - elgg_extend_view('css','riverdashboard/css'); -} - -/** - * Page handler for riverdash - * - * @param unknown_type $page - */ -function riverdashboard_page_handler($page){ - global $CONFIG; - include(dirname(__FILE__) . "/index.php"); - return true; -} - -function riverdashboard_dashboard() { - include(dirname(__FILE__) . '/index.php'); -} - -/** - * For users to make a comment on a river item - * - * @param ElggEntity $entity The entity to comment on - * @return string|false The HTML (etc) for the comment form, or false on failure - */ -function elgg_make_river_comment($entity){ - if (!($entity instanceof ElggEntity)) { - return false; - } else { - //display the comment form - $comments = elgg_view('riverdashboard/rivercomment',array('entity' => $entity)); - return $comments; - } -} - -register_elgg_event_handler('init','system','riverdashboard_init'); +wwwroot . "mod/riverdashboard/"); + } + // Page handler + register_page_handler('riverdashboard','riverdashboard_page_handler'); + elgg_extend_view('css','riverdashboard/css'); +} + +/** + * Page handler for riverdash + * + * @param unknown_type $page + */ +function riverdashboard_page_handler($page){ + global $CONFIG; + include(dirname(__FILE__) . "/index.php"); + return true; +} + +function riverdashboard_dashboard() { + include(dirname(__FILE__) . '/index.php'); +} + +/** + * For users to make a comment on a river item + * + * @param ElggEntity $entity The entity to comment on + * @return string|false The HTML (etc) for the comment form, or false on failure + */ +function elgg_make_river_comment($entity){ + if (!($entity instanceof ElggEntity)) { + return false; + } else { + //display the comment form + $comments = elgg_view('riverdashboard/rivercomment',array('entity' => $entity)); + return $comments; + } +} + +register_elgg_event_handler('init','system','riverdashboard_init'); diff --git a/mod/riverdashboard/views/default/riverdashboard/container.php b/mod/riverdashboard/views/default/riverdashboard/container.php index 2d2d5b069..67e277e99 100644 --- a/mod/riverdashboard/views/default/riverdashboard/container.php +++ b/mod/riverdashboard/views/default/riverdashboard/container.php @@ -1,52 +1,52 @@ - - - + + + diff --git a/mod/riverdashboard/views/default/riverdashboard/menu.php b/mod/riverdashboard/views/default/riverdashboard/menu.php index bfb0f4172..c5c49f0a3 100644 --- a/mod/riverdashboard/views/default/riverdashboard/menu.php +++ b/mod/riverdashboard/views/default/riverdashboard/menu.php @@ -1,28 +1,28 @@ - -