aboutsummaryrefslogtreecommitdiff
path: root/mod
diff options
context:
space:
mode:
Diffstat (limited to 'mod')
-rw-r--r--mod/diagnostics/start.php16
-rw-r--r--mod/file/friends.php1
-rw-r--r--mod/file/index.php3
-rw-r--r--mod/file/search.php5
-rw-r--r--mod/file/world.php2
-rw-r--r--mod/groups/all.php17
-rw-r--r--mod/groups/index.php2
-rw-r--r--mod/groups/membership.php3
-rw-r--r--mod/groups/views/default/forms/forums/addpost.php4
-rw-r--r--mod/groups/views/default/forms/forums/addtopic.php2
-rw-r--r--mod/groups/views/default/forms/groups/edit.php9
-rw-r--r--mod/pages/actions/pages/edit.php12
-rw-r--r--mod/pages/index.php2
-rw-r--r--mod/pages/languages/en.php2
-rw-r--r--mod/pages/views/default/forms/pages/edit.php14
-rw-r--r--mod/pages/views/default/pages/welcome.php2
-rw-r--r--mod/pages/world.php2
-rw-r--r--mod/reportedcontent/actions/add.php22
-rw-r--r--mod/reportedcontent/actions/archive.php8
-rw-r--r--mod/reportedcontent/actions/delete.php8
-rw-r--r--mod/search/search_hooks.php2
-rw-r--r--mod/thewire/everyone.php7
-rw-r--r--mod/uservalidationbyemail/start.php2
23 files changed, 92 insertions, 55 deletions
diff --git a/mod/diagnostics/start.php b/mod/diagnostics/start.php
index c114c054e..12795ebc8 100644
--- a/mod/diagnostics/start.php
+++ b/mod/diagnostics/start.php
@@ -91,22 +91,22 @@ function diagnostics_plugins_hook($hook, $entity_type, $returnvalue, $params)
*/
function diagnostics_md5_dir($dir)
{
- //if (is_file(trim($dir, "/"))) {
- $extensions_allowed = array('.php', '.gif', '.png', '.jpg');
+ $extensions_allowed = array('.php', '.js', '.css');
$buffer = "";
- if (in_array(strrchr(trim($dir, "/"), '.'), $extensions_allowed))
- {
- //$dir = trim($dir, "/");
- $buffer .= md5_file($dir). " " . trim($dir, "/") . "\n";
- } else if ($handle = opendir($dir)) {
+ if (in_array(strrchr(trim($dir, "/"), '.'), $extensions_allowed)) {
+ $dir = rtrim($dir, "/");
+ $buffer .= md5_file($dir). " " . $dir . "\n";
+ } else if (is_dir($dir)) {
+ $handle = opendir($dir);
while ($file = readdir($handle)) {
-
if (($file != '.') && ($file != '..')) {
$buffer .= diagnostics_md5_dir($dir . $file. "/", $buffer);
}
}
+
+ closedir($handle);
}
return $buffer;
diff --git a/mod/file/friends.php b/mod/file/friends.php
index 0693991d9..71dd2b10a 100644
--- a/mod/file/friends.php
+++ b/mod/file/friends.php
@@ -21,6 +21,7 @@
$area2 = elgg_view_title($title);
set_context('search');
+ // offset is grabbed in list_user_friends_objects
$content = list_user_friends_objects($owner->guid, 'file', 10, false);
set_context('file');
$area1 = get_filetype_cloud($owner->guid, true);
diff --git a/mod/file/index.php b/mod/file/index.php
index e76583f0f..af3d4c471 100644
--- a/mod/file/index.php
+++ b/mod/file/index.php
@@ -28,7 +28,8 @@
// Get objects
set_context('search');
- $area2 .= elgg_list_entities(array('types' => 'object', 'subtypes' => 'file', 'container_guid' => page_owner(), 'limit' => 10, 'full_view' => FALSE));
+ $offset = (int)get_input('offset', 0);
+ $area2 .= elgg_list_entities(array('types' => 'object', 'subtypes' => 'file', 'container_guid' => page_owner(), 'limit' => 10, 'offset' => $offset, 'full_view' => FALSE));
set_context('file');
$get_filter = get_filetype_cloud(page_owner());
if ($get_filter) {
diff --git a/mod/file/search.php b/mod/file/search.php
index ed8846514..ea85e862d 100644
--- a/mod/file/search.php
+++ b/mod/file/search.php
@@ -70,13 +70,14 @@
// Set context
set_context('search');
-
+
+ $offset = (int)get_input('offset', 0);
$limit = 10;
if ($search_viewtype == "gallery") $limit = 12;
if (!empty($tag)) {
$area2 .= list_entities_from_metadata($md_type, $tag, 'object', 'file', $owner_guid, $limit);
} else {
- $area2 .= elgg_list_entities(array('types' => 'object', 'subtypes' => 'file', 'owner_guid' => $owner_guid, 'limit' => $limit));
+ $area2 .= elgg_list_entities(array('types' => 'object', 'subtypes' => 'file', 'owner_guid' => $owner_guid, 'limit' => $limit, 'offset' => $offset));
}
set_context("file");
diff --git a/mod/file/world.php b/mod/file/world.php
index 8b5e2cb0c..9f2ae5ee4 100644
--- a/mod/file/world.php
+++ b/mod/file/world.php
@@ -30,7 +30,7 @@
if ($tag != "")
$area2 .= list_entities_from_metadata('tags',$tag,'object','file',0,10,false);
else
- $area2 .= elgg_list_entities(array('types' => 'object', 'subtypes' => 'file', 'limit' => 10, 'full_view' => FALSE));
+ $area2 .= elgg_list_entities(array('types' => 'object', 'subtypes' => 'file', 'limit' => 10, 'offset' => $offset, 'full_view' => FALSE));
set_context('file');
$body = elgg_view_layout('two_column_left_sidebar',$area1, $area2);
diff --git a/mod/groups/all.php b/mod/groups/all.php
index 1d9f36dc5..c4347c1e4 100644
--- a/mod/groups/all.php
+++ b/mod/groups/all.php
@@ -15,29 +15,30 @@
$offset = get_input("offset", 0);
$tag = get_input("tag");
$filter = get_input("filter");
- if(!$filter)
+ if (!$filter) {
+ // active discussions is the default
$filter = "active";
+ }
// Get objects
$context = get_context();
set_context('search');
- if ($tag != "")
- $objects = list_entities_from_metadata('tags',$tag,'group',"","", $limit, false);
- else{
+ if ($tag != "") {
+ // groups plugin saves tags as "interests" - see groups_fields_setup() in start.php
+ $objects = list_entities_from_metadata('interests',$tag,'group',"","", $limit, false);
+ } else {
switch($filter){
case "newest":
- $objects = elgg_list_entities(array('types' => 'group', 'owner_guid' => 0, 'limit' => $limit, 'full_view' => false));
+ $objects = elgg_list_entities(array('types' => 'group', 'owner_guid' => 0, 'limit' => $limit, 'offset' => $offset, 'full_view' => false));
break;
case "pop":
$objects = list_entities_by_relationship_count('member', true, "", "", 0, $limit, false);
break;
case "active":
- $objects = list_entities_from_annotations("object", "groupforumtopic", "group_topic_post", "", 40, 0, 0, false, true);
- break;
case 'default':
- $objects = elgg_list_entities(array('types' => 'group', 'limit' => $limit, 'full_view' => FALSE));
+ $objects = list_entities_from_annotations("object", "groupforumtopic", "group_topic_post", "", 40, 0, 0, false, true);
break;
}
}
diff --git a/mod/groups/index.php b/mod/groups/index.php
index d23fe7360..501e6e288 100644
--- a/mod/groups/index.php
+++ b/mod/groups/index.php
@@ -20,7 +20,7 @@
$area1 = elgg_view('page_elements/content_header', array('context' => "everyone", 'type' => 'groups'));
set_context('search');
- $objects = elgg_list_entities(array('types' => 'group', 'owner_guid' => page_owner(), 'limit' => $limit, 'full_view' => FALSE));
+ $objects = elgg_list_entities(array('types' => 'group', 'owner_guid' => page_owner(), 'limit' => $limit, 'offset' => $offset, 'full_view' => FALSE));
set_context('groups');
$area1 .= $objects;
diff --git a/mod/groups/membership.php b/mod/groups/membership.php
index 4b5d6b89f..ac3ad7439 100644
--- a/mod/groups/membership.php
+++ b/mod/groups/membership.php
@@ -26,6 +26,7 @@
$area2 = elgg_view('page_elements/content_header', array('context' => "mine", 'type' => 'groups'));
set_context('search');
+ // offset is grabbed in the list_entities_from_relationship() function
$objects = list_entities_from_relationship('member',page_owner(),false,'group','',0, $limit,false, false);
set_context('groups');
@@ -34,4 +35,4 @@
// Finally draw the page
page_draw($title, $body);
-?> \ No newline at end of file
+?>
diff --git a/mod/groups/views/default/forms/forums/addpost.php b/mod/groups/views/default/forms/forums/addpost.php
index 8aa316caa..3ad3de0ff 100644
--- a/mod/groups/views/default/forms/forums/addpost.php
+++ b/mod/groups/views/default/forms/forums/addpost.php
@@ -29,6 +29,6 @@
<input type="hidden" name="group_guid" value="<?php echo $vars['entity']->container_guid; ?>" />
<?php echo elgg_view('input/securitytoken'); ?>
- <!-- display the save button -->
+ <!-- display the post button -->
<input type="submit" class="submit_button" value="<?php echo elgg_echo('post'); ?>" />
-</form> \ No newline at end of file
+</form>
diff --git a/mod/groups/views/default/forms/forums/addtopic.php b/mod/groups/views/default/forms/forums/addtopic.php
index e3bc3e1c6..9dd70d7a8 100644
--- a/mod/groups/views/default/forms/forums/addtopic.php
+++ b/mod/groups/views/default/forms/forums/addtopic.php
@@ -99,7 +99,7 @@
<!-- required hidden info and submit button -->
<p>
<input type="hidden" name="group_guid" value="<?php echo $group_guid; ?>" />
- <input type="submit" class="submit_button" value="<?php echo elgg_echo('save'); ?>" />
+ <input type="submit" class="submit_button" value="<?php echo elgg_echo('post'); ?>" />
</p>
</form>
diff --git a/mod/groups/views/default/forms/groups/edit.php b/mod/groups/views/default/forms/groups/edit.php
index 810c29bc9..3712add82 100644
--- a/mod/groups/views/default/forms/groups/edit.php
+++ b/mod/groups/views/default/forms/groups/edit.php
@@ -138,19 +138,22 @@
</form>
+<?php
+if ($vars['entity']) {
+?>
<div class="delete_group">
<form action="<?php echo $vars['url'] . "action/groups/delete"; ?>">
<?php
echo elgg_view('input/securitytoken');
- if ($vars['entity']) {
$warning = elgg_echo("groups:deletewarning");
?>
<input type="hidden" name="group_guid" value="<?php echo $vars['entity']->getGUID(); ?>" />
<input type="submit" class="action_button disabled" name="delete" value="<?php echo elgg_echo('groups:delete'); ?>" onclick="javascript:return confirm('<?php echo $warning; ?>')"/><?php
- }
?>
</form>
</div>
-
+<?php
+}
+?>
diff --git a/mod/pages/actions/pages/edit.php b/mod/pages/actions/pages/edit.php
index 84aed61d6..a966232a8 100644
--- a/mod/pages/actions/pages/edit.php
+++ b/mod/pages/actions/pages/edit.php
@@ -52,6 +52,12 @@
// New instance, so set container_guid
$container_guid = get_input('container_guid', $_SESSION['user']->getGUID());
$page->container_guid = $container_guid;
+
+ // cache data in session in case data from form does not validate
+ $_SESSION['page_description'] = $input['description'];
+ $_SESSION['page_tags'] = get_input('tags');
+ $_SESSION['page_read_access'] = (int)get_input('access_id');
+ $_SESSION['page_write_access'] = (int)get_input('write_access_id');
}
// Have we got it? Can we edit it?
@@ -96,6 +102,12 @@
// Now save description as an annotation
$page->annotate('page', $page->description, $page->access_id);
+
+ // clear cache
+ unset($_SESSION['page_description']);
+ unset($_SESSION['page_tags']);
+ unset($_SESSION['page_read_access']);
+ unset($_SESSION['page_write_access']);
system_message(elgg_echo("pages:saved"));
diff --git a/mod/pages/index.php b/mod/pages/index.php
index 0e4601cef..5b31c6347 100644
--- a/mod/pages/index.php
+++ b/mod/pages/index.php
@@ -41,7 +41,7 @@
set_context('search');
- $objects = elgg_list_entities(array('types' => 'object', 'subtypes' => 'page_top', 'container_guid' => page_owner(), 'limit' => $limit, 'full_view' => FALSE));
+ $objects = elgg_list_entities(array('types' => 'object', 'subtypes' => 'page_top', 'container_guid' => page_owner(), 'limit' => $limit, 'offset' => $offset, 'full_view' => FALSE));
set_context($context);
diff --git a/mod/pages/languages/en.php b/mod/pages/languages/en.php
index d94ca8431..75d1bba9b 100644
--- a/mod/pages/languages/en.php
+++ b/mod/pages/languages/en.php
@@ -27,7 +27,7 @@
'pages:history' => "Page history",
'pages:view' => "View page",
'pages:welcome' => "Edit welcome message",
- 'pages:welcomemessage' => "Welcome to this Elgg pages plugin. This feature allows you to create pages on any topic and select who can view them and edit them.",
+ 'pages:welcomemessage' => "Welcome to the pages tool of %s. This tool allows you to create pages on any topic and select who can view them and edit them.",
'pages:welcomeerror' => "There was a problem saving your welcome message",
'pages:welcomeposted' => "Your welcome message has been posted",
'pages:navigation' => "Page navigation",
diff --git a/mod/pages/views/default/forms/pages/edit.php b/mod/pages/views/default/forms/pages/edit.php
index 2b57fe814..2ad454073 100644
--- a/mod/pages/views/default/forms/pages/edit.php
+++ b/mod/pages/views/default/forms/pages/edit.php
@@ -25,6 +25,20 @@
$vars['entity']->access_id = 0;
$vars['entity']->write_access_id = 0;
}
+
+ // pull in sticky values from session
+ if (isset($_SESSION['page_description'])) {
+ $vars['entity']->description = $_SESSION['page_description'];
+ $vars['entity']->tags = $_SESSION['page_tags'];
+ $vars['entity']->access_id = $_SESSION['page_read_access'];
+ $vars['entity']->write_access_id = $_SESSION['page_write_access'];
+
+ // clear them
+ unset($_SESSION['page_description']);
+ unset($_SESSION['page_tags']);
+ unset($_SESSION['page_read_access']);
+ unset($_SESSION['page_write_access']);
+ }
}
?>
<div class="contentWrapper">
diff --git a/mod/pages/views/default/pages/welcome.php b/mod/pages/views/default/pages/welcome.php
index deefdba30..e4a465fdd 100644
--- a/mod/pages/views/default/pages/welcome.php
+++ b/mod/pages/views/default/pages/welcome.php
@@ -22,7 +22,7 @@
?>
-<div class="contentWrapper pageswelcome"><p><?php elgg_echo('pages:welcomemessage'); ?></p></div>
+<div class="contentWrapper pageswelcome"><p><?php echo sprintf(elgg_echo('pages:welcomemessage'), $vars['config']->sitename); ?></p></div>
<?php
}
diff --git a/mod/pages/world.php b/mod/pages/world.php
index d47212f27..72433e8ec 100644
--- a/mod/pages/world.php
+++ b/mod/pages/world.php
@@ -41,7 +41,7 @@
set_context('search');
- $objects = elgg_list_entities(array('types' => 'object', 'subtypes' => 'page_top', 'limit' => $limit, 'full_view' => FALSE));
+ $objects = elgg_list_entities(array('types' => 'object', 'subtypes' => 'page_top', 'limit' => $limit, 'offset' => $offset, 'full_view' => FALSE));
set_context($context);
diff --git a/mod/reportedcontent/actions/add.php b/mod/reportedcontent/actions/add.php
index 76cefa4c8..80f67eab4 100644
--- a/mod/reportedcontent/actions/add.php
+++ b/mod/reportedcontent/actions/add.php
@@ -17,21 +17,21 @@
if ($title && $address) {
- $entity = new ElggObject;
- $entity->subtype = "reported_content";
- $entity->owner_guid = $_SESSION['user']->getGUID();
- $entity->title = $title;
- $entity->address = $address;
- $entity->description = $description;
- $entity->access_id = $access;
+ $report = new ElggObject;
+ $report->subtype = "reported_content";
+ $report->owner_guid = $_SESSION['user']->getGUID();
+ $report->title = $title;
+ $report->address = $address;
+ $report->description = $description;
+ $report->access_id = $access;
- if ($entity->save()) {
- if (!trigger_plugin_hook('reportedcontent:add', $reported->type, array('entity'=>$reported), true)) {
- $entity->delete();
+ if ($report->save()) {
+ if (!trigger_plugin_hook('reportedcontent:add', 'system', array('report'=>$report), true)) {
+ $report->delete();
register_error(elgg_echo('reportedcontent:failed'));
} else {
system_message(elgg_echo('reportedcontent:success'));
- $entity->state = "active";
+ $report->state = "active";
}
forward($address);
} else {
diff --git a/mod/reportedcontent/actions/archive.php b/mod/reportedcontent/actions/archive.php
index a550abc2a..ca4ad2c41 100644
--- a/mod/reportedcontent/actions/archive.php
+++ b/mod/reportedcontent/actions/archive.php
@@ -17,15 +17,15 @@
$guid = (int) get_input('item');
// Make sure we actually have permission to edit
- $reported = get_entity($guid);
- if ($reported->getSubtype() == "reported_content" && $reported->canEdit()) {
+ $report = get_entity($guid);
+ if ($report->getSubtype() == "reported_content" && $report->canEdit()) {
// change the state
- if (!trigger_plugin_hook('reportedcontent:archive', $reported->type, array('entity'=>$reported), true)) {
+ if (!trigger_plugin_hook('reportedcontent:archive', 'system', array('report'=>$report), true)) {
system_message(elgg_echo("reportedcontent:notarchived"));
forward("pg/reportedcontent/");
}
- $reported->state = "archived";
+ $report->state = "archived";
// Success message
system_message(elgg_echo("reportedcontent:archived"));
diff --git a/mod/reportedcontent/actions/delete.php b/mod/reportedcontent/actions/delete.php
index cff42b025..b2e9c7acd 100644
--- a/mod/reportedcontent/actions/delete.php
+++ b/mod/reportedcontent/actions/delete.php
@@ -17,15 +17,15 @@
$guid = (int) get_input('item');
// Make sure we actually have permission to edit
- $reported = get_entity($guid);
- if ($reported->getSubtype() == "reported_content" && $reported->canEdit()) {
+ $report = get_entity($guid);
+ if ($report->getSubtype() == "reported_content" && $report->canEdit()) {
// Delete it!
- if (!trigger_plugin_hook('reportedcontent:delete', $reported->type, array('entity'=>$reported), true)) {
+ if (!trigger_plugin_hook('reportedcontent:delete', '$system', array('report'=>$report), true)) {
register_error(elgg_echo("reportedcontent:notdeleted"));
forward("pg/reportedcontent/");
}
- $rowsaffected = $reported->delete();
+ $rowsaffected = $report->delete();
if ($rowsaffected > 0) {
// Success message
system_message(elgg_echo("reportedcontent:deleted"));
diff --git a/mod/search/search_hooks.php b/mod/search/search_hooks.php
index cc70f43ea..0b606ac66 100644
--- a/mod/search/search_hooks.php
+++ b/mod/search/search_hooks.php
@@ -232,7 +232,7 @@ function search_tags_hook($hook, $type, $value, $params) {
// @todo make one long tag string and run this through the highlight
// function. This might be confusing as it could chop off
// the tag labels.
- if (in_array($query, $tags)) {
+ if (in_array(strtolower($query), array_map('strtolower', $tags))) {
if (is_array($tags)) {
$tag_name_str = elgg_echo("tag_names:$tag_name");
$matched_tags_strs[] = "$tag_name_str: " . implode(', ', $tags);
diff --git a/mod/thewire/everyone.php b/mod/thewire/everyone.php
index 1f0913ab3..b49c1d9fc 100644
--- a/mod/thewire/everyone.php
+++ b/mod/thewire/everyone.php
@@ -17,11 +17,12 @@
//add form
$area2 .= elgg_view("thewire/forms/add");
- $area2 .= elgg_list_entities(array('types' => 'object', 'subtypes' => 'thewire'));
+ $offset = (int)get_input('offset', 0);
+ $area2 .= elgg_list_entities(array('types' => 'object', 'subtypes' => 'thewire', 'offset' => $offset));
- $body = elgg_view_layout("one_column_with_sidebar", $area2);
+ $body = elgg_view_layout("two_column_left_sidebar", '', $area2);
// Display page
page_draw(elgg_echo('thewire:everyone'),$body);
-?> \ No newline at end of file
+?>
diff --git a/mod/uservalidationbyemail/start.php b/mod/uservalidationbyemail/start.php
index 7010fa4b8..fcfcb899d 100644
--- a/mod/uservalidationbyemail/start.php
+++ b/mod/uservalidationbyemail/start.php
@@ -26,6 +26,8 @@ function uservalidationbyemail_init() {
* @return unknown_type
*/
function uservalidationbyemail_page_handler($page) {
+ global $CONFIG;
+
if (isset($page[0]) && $page[0] == 'confirm') {
$code = sanitise_string(get_input('c', FALSE));
$user_guid = get_input('u', FALSE);
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-24 08:46:56 +0000