aboutsummaryrefslogtreecommitdiff
path: root/mod
diff options
context:
space:
mode:
Diffstat (limited to 'mod')
-rw-r--r--mod/blog/manifest.xml10
-rw-r--r--mod/riverdashboard/index.php10
-rw-r--r--mod/riverdashboard/manifest.xml16
-rw-r--r--mod/riverdashboard/start.php5
-rw-r--r--mod/riverdashboard/views/default/river/item/list.php1
5 files changed, 24 insertions, 18 deletions
diff --git a/mod/blog/manifest.xml b/mod/blog/manifest.xml
index 483e83fab..a2ef59d0a 100644
--- a/mod/blog/manifest.xml
+++ b/mod/blog/manifest.xml
@@ -1,5 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<plugin_manifest>
+ <field key="name" value="Blogs" />
+ <field key="category" value="utilities" />
+ <field key="screenshot" value="graphics/ss1.png" />
+ <field key="screenshot" value="graphics/ss2.png" />
+ <field key="provides" value="blog" />
+<!--
+ <field key="provides" value="pingbacks" />
+-->
+ <field key="conflicts" value="blog1" />
+ <field key="conflicts" value="blog2" />
<field key="author" value="Curverider" />
<field key="version" value="1.8" />
<field key="description" value="Elgg blog plugin" />
diff --git a/mod/riverdashboard/index.php b/mod/riverdashboard/index.php
index 758aa4018..371845213 100644
--- a/mod/riverdashboard/index.php
+++ b/mod/riverdashboard/index.php
@@ -7,25 +7,25 @@
require_once(dirname(dirname(dirname(__FILE__))) . '/engine/start.php');
gatekeeper();
-
+
$type = get_input('type');
$subtype = get_input('subtype');
$orient = get_input('display');
if(!$orient)
$orient = 'all';
$callback = get_input('callback');
-
+
if ($type == 'all') {
$type = '';
$subtype = '';
}
$body = '';
-
+
switch($orient) {
case 'mine':
$subject_guid = $_SESSION['user']->guid;
- $relationship_type = '';
+ $relationship_type = '';
$title_wording = elgg_echo('river:mine');
break;
case 'friends': $subject_guid = $_SESSION['user']->guid;
@@ -49,7 +49,7 @@ else
// 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));
diff --git a/mod/riverdashboard/manifest.xml b/mod/riverdashboard/manifest.xml
index a29af8a61..24133b7d4 100644
--- a/mod/riverdashboard/manifest.xml
+++ b/mod/riverdashboard/manifest.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin_manifest>
- <field key="author" value="Curverider Ltd" />
- <field key="version" value="1.0" />
- <field key="description" value="Elgg river for use with v1.7 onward." />
- <field key="website" value="http://www.elgg.org/" />
- <field key="copyright" value="(C) Curverider 2010" />
- <field key="licence" value="GNU Public License version 2" />
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin_manifest>
+ <field key="author" value="Curverider Ltd" />
+ <field key="version" value="1.0" />
+ <field key="description" value="Elgg river for use with v1.7 onward." />
+ <field key="website" value="http://www.elgg.org/" />
+ <field key="copyright" value="(C) Curverider 2010" />
+ <field key="licence" value="GNU Public License version 2" />
</plugin_manifest> \ No newline at end of file
diff --git a/mod/riverdashboard/start.php b/mod/riverdashboard/start.php
index b95c2654d..9f64f4c9d 100644
--- a/mod/riverdashboard/start.php
+++ b/mod/riverdashboard/start.php
@@ -26,15 +26,10 @@ function riverdashboard_init() {
* @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
*
diff --git a/mod/riverdashboard/views/default/river/item/list.php b/mod/riverdashboard/views/default/river/item/list.php
index 0c0d7a4db..e7e1a9c07 100644
--- a/mod/riverdashboard/views/default/river/item/list.php
+++ b/mod/riverdashboard/views/default/river/item/list.php
@@ -1,4 +1,5 @@
<?php
+
if (isset($vars['items']) && is_array($vars['items'])) {
$i = 0;