diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/auth.php | 4 | ||||
| -rw-r--r-- | include/group.php | 8 | ||||
| -rw-r--r-- | include/items.php | 2 | ||||
| -rw-r--r-- | include/nav.php | 3 |
4 files changed, 11 insertions, 6 deletions
diff --git a/include/auth.php b/include/auth.php index 4813bb45b..c0a747def 100644 --- a/include/auth.php +++ b/include/auth.php @@ -2,9 +2,9 @@ // login/logout -if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && (! ($_POST['auth-params'] === 'login'))) { +if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-params'))) || ($_POST['auth-params'] !== 'login'))) { - if($_POST['auth-params'] === 'logout' || $a->module === 'logout') { + if(((x($_POST,'auth-params')) && ($_POST['auth-params'] === 'logout')) || ($a->module === 'logout')) { // process logout request diff --git a/include/group.php b/include/group.php index 799065e27..793e854be 100644 --- a/include/group.php +++ b/include/group.php @@ -122,11 +122,13 @@ function group_get_members($gid) { function group_side($every="contacts",$each="group") { + $o = ''; + if(! local_user()) - return; + return ''; -$createtext = t('Create a new group'); -$linktext= t('Everybody'); + $createtext = t('Create a new group'); + $linktext= t('Everybody'); $o .= <<< EOT diff --git a/include/items.php b/include/items.php index 52d0bc5b6..951e5c6e3 100644 --- a/include/items.php +++ b/include/items.php @@ -146,7 +146,7 @@ function get_feed_for(&$a, $dfrn_id, $owner_id, $last_update, $direction = 0) { $atom .= replace_macros($feed_template, array( '$feed_id' => xmlify($a->get_baseurl() . '/profile/' . $owner_nick), '$feed_title' => xmlify($owner['name']), - '$feed_updated' => xmlify(datetime_convert('UTC', 'UTC', $updated . '+00:00' , ATOM_TIME)) , + '$feed_updated' => xmlify(datetime_convert('UTC', 'UTC', 'now' , ATOM_TIME)) , '$hub' => $hubxml, '$salmon' => $salmon, '$name' => xmlify($owner['name']), diff --git a/include/nav.php b/include/nav.php index 2c9d76bb3..534e29fab 100644 --- a/include/nav.php +++ b/include/nav.php @@ -1,5 +1,8 @@ <?php +if(! x($a->page,'nav')) + $a->page['nav'] = ''; + $a->page['nav'] .= '<div id="panel" style="display: none;"></div>' ; if(local_user()) { |