more lint

diff --git a/boot.php b/boot.php
index 6cac527eb5b94a8a6474ffc5ee1672e94c8a3bd0..2e3ae0e6594f31b2cb509587cb66c51ea6309149 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -608,8 +608,7 @@ function goaway($s) {
 if(! function_exists('xml_status')) {
 function xml_status($st, $message = '') {
 
-       if(strlen($message))
-               $xml_message = "\t<message>" . xmlify($message) . "</message>\r\n";
+       $xml_message = ((strlen($message)) ? "\t<message>" . xmlify($message) . "</message>\r\n" : '');
 
        header( "Content-type: text/xml" );
        echo '<?xml version="1.0" encoding="UTF-8"?>'."\r\n";
@@ -1334,3 +1333,28 @@ function qp($s) {
 return str_replace ("%","=",rawurlencode($s));
 }} 
 
+
+if(! function_exists('like_puller')) {
+function like_puller($a,$item,&$arr,$mode) {
+
+       $url = '';
+       $sparkle = '';
+       $verb = (($mode === 'like') ? ACTIVITY_LIKE : ACTIVITY_DISLIKE);
+
+       if((activity_match($item['verb'],$verb)) && ($item['id'] != $item['parent'])) {
+               $url = $item['url'];
+               if(($item['network'] === 'dfrn') && (! $item['self'])) {
+                       $url = $a->get_baseurl() . '/redir/' . $item['contact-id'];
+                       $sparkle = ' class="sparkle" ';
+               }
+               if(! ((isset($arr[$item['parent'] . '-l'])) && (is_array($arr[$item['parent'] . '-l']))))
+                       $arr[$item['parent'] . '-l'] = array();
+               if(! isset($arr[$item['parent']]))
+                       $arr[$item['parent']] = 1;
+               else    
+                       $arr[$item['parent']] ++;
+               $arr[$item['parent'] . '-l'][] = '<a href="'. $url . '"'. $sparkle .'>' . $item['name'] . '</a>';
+       }
+       return;
+}}
+

diff --git a/include/auth.php b/include/auth.php
index 4813bb45bd70cf75098e4eae65c98ed4e9fa14ad..c0a747def8dc3578cb3447a80e58b35f2e160528 100644 (file)
--- 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 799065e27dd34e5e780fa47eff07c4ae46f44169..793e854be046bc7f43db7572b249621e2dc19e8d 100644 (file)
--- 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 52d0bc5b65b986e1418c89c2fb8435391b7f4e69..951e5c6e395e2e958abb7d33879b62baf8bf78e0 100644 (file)
--- 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 2c9d76bb35f9f2de647fe8ab74f294bacd54ac15..534e29fabda0599de6b779c50ffca15c69bc10f5 100644 (file)
--- 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()) {

diff --git a/index.php b/index.php
index 81d089dfb3aa4ed2cfcc6ce8f9f0fc275d31b416..895e439eaff26054ca67693560beeb74e55ecb47 100644 (file)
--- a/index.php
+++ b/index.php
@@ -31,9 +31,12 @@ $a->init_pagehead();
 session_start();
 
 
-if((x($_SESSION,'authenticated')) || (x($_POST['auth-params'])))
+if((x($_SESSION,'authenticated')) || (x($_POST,'auth-params')))
        require("auth.php");
 
+if(! x($_SESSION,'sysmsg'))
+       $_SESSION['sysmsg'] = '';
+
 if($install)
        $a->module = 'install';
 else
@@ -71,7 +74,9 @@ if($a->module_loaded) {
 
        if((! $a->error) && (function_exists($a->module . '_content'))) {
                $func = $a->module . '_content';
-               $a->page['content'] .= $func($a);
+               if(! x($a->page,'content'))
+                       $a->page['content'] = '';
+               $a->page['content'] .= $func($a);
        }
 
 }

diff --git a/mod/contacts.php b/mod/contacts.php
index beb1f1ecb82c29f46a7045263e1e264bf1f759af..02c75c7755c6d9d28942ed420803847f5f12944b 100644 (file)
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -4,6 +4,8 @@ require_once('include/Contact.php');
 
 function contacts_init(&$a) {
        require_once('include/group.php');
+       if(! x($a->page,'aside'))
+               $a->page['aside'] = '';
        $a->page['aside'] .= group_side();
 
        if($a->config['register_policy'] != REGISTER_CLOSED)
@@ -84,7 +86,11 @@ function contacts_post(&$a) {
 
 function contacts_content(&$a) {
 
+       $sort_type = 0;
+       $o = '';
        $o .= '<script> $(document).ready(function() { $(\'#nav-contacts-link\').addClass(\'nav-selected\'); });</script>';
+
+
        if(! local_user()) {
                notice( t('Permission denied.') . EOL);
                return;

diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php
index 84c249a58ddfc42a72441de009bc18829475ced6..8a573c9565ddeef689e89e6f0264fecf1a07023f 100644 (file)
--- a/mod/dfrn_poll.php
+++ b/mod/dfrn_poll.php
@@ -6,16 +6,11 @@ require_once('include/auth.php');
 
 function dfrn_poll_init(&$a) {
 
-       $dfrn_id = '';
-
-       if(x($_GET,'dfrn_id'))
-               $dfrn_id = $_GET['dfrn_id'];
-       if(x($_GET,'type'))
-               $type = $_GET['type'];
-       if(x($_GET,'last_update'))
-               $last_update = $_GET['last_update'];
-       $dfrn_version    = (float) $_GET['dfrn_version'] ;
-       $destination_url = ((x($_GET,'destination_url')) ? $_GET['destination_url'] : '');
+       $dfrn_id         = ((x($_GET,'dfrn_id'))         ? $_GET['dfrn_id']              : '');
+       $type            = ((x($_GET,'type'))            ? $_GET['type']                 : '');
+       $last_update     = ((x($_GET,'last_update'))     ? $_GET['last_update']          : '');
+       $destination_url = ((x($_GET,'destination_url')) ? $_GET['destination_url']      : '');
+       $dfrn_version    = ((x($_GET,'dfrn_version'))    ? (float) $_GET['dfrn_version'] : 0);
 
 
        $direction = (-1);
@@ -23,7 +18,7 @@ function dfrn_poll_init(&$a) {
 
        if(strpos($dfrn_id,':') == 1) {
                $direction = intval(substr($dfrn_id,0,1));
-               $dfrn_id = substr($dfrn_id,2);
+               $dfrn_id   = substr($dfrn_id,2);
        }
 
        if(($dfrn_id === '') && (! x($_POST,'dfrn_id')) && ($a->argc > 1)) {
@@ -33,7 +28,7 @@ function dfrn_poll_init(&$a) {
                killme();
        }
 
-       if((x($type)) && ($type === 'profile')) {
+       if((isset($type)) && ($type === 'profile')) {
 
                $sql_extra = '';
                switch($direction) {
@@ -89,7 +84,7 @@ function dfrn_poll_init(&$a) {
 
        }
 
-       if((x($type)) && ($type === 'profile-check')) {
+       if((isset($type)) && ($type === 'profile-check')) {
 
                switch($direction) {
                        case 1:
@@ -119,15 +114,15 @@ function dfrn_poll_init(&$a) {
 
 function dfrn_poll_post(&$a) {
 
-       $dfrn_id      = $_POST['dfrn_id'];
-       $challenge    = $_POST['challenge'];
-       $url          = $_POST['url'];
-       $dfrn_version = (float) $_POST['dfrn_version'];
+       $dfrn_id      = ((x($_POST,'dfrn_id'))      ? $_POST['dfrn_id']              : '');
+       $challenge    = ((x($_POST,'challenge'))    ? $_POST['challenge']            : '');
+       $url          = ((x($_POST,'url'))          ? $_POST['url']                  : '');
+       $dfrn_version = ((x($_POST,'dfrn_version')) ? (float) $_POST['dfrn_version'] : 0);
 
        $direction    = (-1);
        if(strpos($dfrn_id,':') == 1) {
                $direction = intval(substr($dfrn_id,0,1));
-               $dfrn_id = substr($dfrn_id,2);
+               $dfrn_id   = substr($dfrn_id,2);
        }
 
 

diff --git a/mod/directory.php b/mod/directory.php
index 01cb1a3ffb03db1524fb2c3b698e4372bdbb8d44..703c08ce1bec37bfdd1add92c130fd5b812f05e4 100644 (file)
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -4,11 +4,12 @@ function directory_init(&$a) {
 }
 
 function directory_content(&$a) {
+       $o = '';
        $o .= '<script> $(document).ready(function() { $(\'#nav-directory-link\').addClass(\'nav-selected\'); });</script>';
 
        $search = ((x($_GET,'search')) ? notags(trim($_GET['search'])) : '');
 
-       $tpl .= load_view_file('view/directory_header.tpl');
+       $tpl = load_view_file('view/directory_header.tpl');
 
        $globaldir = '';
        $gdirpath = dirname(get_config('system','directory_submit_url'));

diff --git a/mod/display.php b/mod/display.php
index 84176d293423d94e783d24d86eb6599676db274c..2e35cd6acc5f2fc4c15015f468068424aba72913 100644 (file)
--- a/mod/display.php
+++ b/mod/display.php
@@ -113,40 +113,18 @@ function display_content(&$a) {
        if(count($r)) {
 
                foreach($r as $item) {
-                       $sparkle = '';
-                       if(($item['verb'] == ACTIVITY_LIKE) && ($item['id'] != $item['parent'])) {
-                               $url = $item['url'];
-                               if(($item['network'] === 'dfrn') && (! $item['self'])) {
-                                       $url = $a->get_baseurl() . '/redir/' . $item['contact-id'];
-                                       $sparkle = ' class="sparkle"';
-                               }
-                               if(! is_array($alike[$item['parent'] . '-l']))
-                                       $alike[$item['parent'] . '-l'] = array();
-                               $alike[$item['parent']] ++;
-                               $alike[$item['parent'] . '-l'][] = '<a href="'. $url . '"' . $sparkle . '>' . $item['name'] . '</a>';
-                       }
-                       if(($item['verb'] == ACTIVITY_DISLIKE) && ($item['id'] != $item['parent'])) {
-                               $url = $item['url'];
-                               if(($item['network'] === 'dfrn') && (! $item['self'])) { 
-                                       $url = $a->get_baseurl() . '/redir/' . $item['contact-id'];
-                                       $sparkle = ' class="sparkle"';
-                               }
-                               if(! is_array($dlike[$item['parent'] . '-l']))
-                                       $dlike[$item['parent'] . '-l'] = array();
-                               $dlike[$item['parent']] ++;
-                               $dlike[$item['parent'] . '-l'][] = '<a href="'. $url . '"' . $sparkle . '>' . $item['name'] . '</a>';
-                       }
+                       like_puller($a,$item,$alike,'like');
+                       like_puller($a,$item,$dlike,'dislike');
                }
 
-
-
                foreach($r as $item) {
                        $comment = '';
                        $template = $tpl;
                        
                        $redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
                        
-                       if((($item['verb'] == ACTIVITY_LIKE) || ($item['verb'] == ACTIVITY_DISLIKE)) && ($item['id'] != $item['parent'])) 
+                       if(((activity_match($item['verb'],ACTIVITY_LIKE)) || (activity_match($item['verb'],ACTIVITY_DISLIKE))) 
+                               && ($item['id'] != $item['parent']))
                                continue;
 
                        $lock = (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid']) 

diff --git a/mod/home.php b/mod/home.php
index 4406576a34f5e08744f26fdaee9c9d56e1228edb..b04c728968eea9f226a50e1efd19b0fbcd0a98ce 100644 (file)
--- a/mod/home.php
+++ b/mod/home.php
@@ -13,6 +13,9 @@ function home_init(&$a) {
 if(! function_exists('home_content')) {
 function home_content(&$a) {
 
+       $o = '';
+       if(! (x($a->page,'footer')))
+               $a->page['footer'] = '';
        $a->page['footer'] .= "<div class=\"powered\" >Powered by <a href=\"http://mistpark.com\" name=\"mistpark\" >mistpark</a></div>";
        $o .= '<h1>Welcome' . ((x($a->config,'sitename')) ? " to {$a->config['sitename']}" : "" ) . '</h1>';
        if(file_exists('home.html'))

diff --git a/mod/message.php b/mod/message.php
index b847f31dcb746fcabec2f974d02ed3dcbd7fb3d4..1524bfd369e9012e42b131ba36a5f009743c24b4 100644 (file)
--- a/mod/message.php
+++ b/mod/message.php
@@ -86,6 +86,8 @@ function message_post(&$a) {
 }
 
 function message_content(&$a) {
+
+       $o = '';
        $o .= '<script> $(document).ready(function() { $(\'#nav-messages-link\').addClass(\'nav-selected\'); });</script>';
 
        if(! local_user()) {
@@ -156,7 +158,7 @@ function message_content(&$a) {
        
                $a->page['htmlhead'] .= replace_macros($tpl, array('$baseurl' => $a->get_baseurl()));
 
-               $select .= contact_select('messageto','message-to-select', false, 4, true);
+               $select = contact_select('messageto','message-to-select', false, 4, true);
                $tpl = load_view_file('view/prv_message.tpl');
                $o .= replace_macros($tpl,array(
                        '$header' => t('Send Private Message'),

diff --git a/mod/network.php b/mod/network.php
index cbd8b6bc32399aaa1ec16597abb557add2500d0e..a6e03440b42fb8d15d5f4def1f21f59da883646c 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -3,6 +3,8 @@
 
 function network_init(&$a) {
        require_once('include/group.php');
+       if(! x($a->page,'aside'))
+               $a->page['aside'] = '';
        $a->page['aside'] .= group_side('network','network');
 }
 
@@ -10,7 +12,9 @@ function network_init(&$a) {
 function network_content(&$a, $update = 0) {
 
        if(! local_user())
-               return;
+               return '';
+
+       $o = '';
 
        require_once("include/bbcode.php");
 
@@ -140,32 +144,10 @@ function network_content(&$a, $update = 0) {
        $dlike = array();
        
        if(count($r)) {
-               foreach($r as $item) {
 
-                       $sparkle = '';
-
-                       if(($item['verb'] == ACTIVITY_LIKE) && ($item['id'] != $item['parent'])) {
-                               $url = $item['url'];
-                               if(($item['network'] === 'dfrn') && (! $item['self'])) { 
-                                       $url = $a->get_baseurl() . '/redir/' . $item['contact-id'];
-                                       $sparkle = ' class="sparkle"';
-                               }
-                               if(! is_array($alike[$item['parent'] . '-l']))
-                                       $alike[$item['parent'] . '-l'] = array();
-                               $alike[$item['parent']] ++;
-                               $alike[$item['parent'] . '-l'][] = '<a href="'. $url . '"' . $sparkle . '>' . $item['name'] . '</a>';
-                       }
-                       if(($item['verb'] == ACTIVITY_DISLIKE) && ($item['id'] != $item['parent'])) {
-                               $url = $item['url'];
-                               if(($item['network'] === 'dfrn') && (! $item['self'])) { 
-                                       $url = $a->get_baseurl() . '/redir/' . $item['contact-id'];
-                                       $sparkle = ' class="sparkle"';
-                               }
-                               if(! is_array($dlike[$item['parent'] . '-l']))
-                                       $dlike[$item['parent'] . '-l'] = array();
-                               $dlike[$item['parent']] ++;
-                               $dlike[$item['parent'] . '-l'][] = '<a href="'. $url . '"' . $sparkle . '>' . $item['name'] . '</a>';
-                       }
+               foreach($r as $item) {
+                       like_puller($a,$item,$alike,'like');
+                       like_puller($a,$item,$dlike,'dislike');
                }
 
                foreach($r as $item) {
@@ -177,7 +159,7 @@ function network_content(&$a, $update = 0) {
                        $profile_url = $item['url'];
                        $redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
 
-                       if((($item['verb'] == ACTIVITY_LIKE) || ($item['verb'] == ACTIVITY_DISLIKE)) && ($item['id'] != $item['parent'])) 
+                       if(((activity_match($item['verb'],ACTIVITY_LIKE)) || (activity_match($item['verb'],ACTIVITY_DISLIKE))) && ($item['id'] != $item['parent']))
                                continue;
 
                        $lock = (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid']) 
@@ -274,8 +256,8 @@ function network_content(&$a, $update = 0) {
                        }
 
 
-                       $like    = (($alike[$item['id']]) ? format_like($alike[$item['id']],$alike[$item['id'] . '-l'],'like',$item['id']) : '');
-                       $dislike = (($dlike[$item['id']]) ? format_like($dlike[$item['id']],$dlike[$item['id'] . '-l'],'dislike',$item['id']) : '');
+                       $like    = ((x($alike,$item['id'])) ? format_like($alike[$item['id']],$alike[$item['id'] . '-l'],'like',$item['id']) : '');
+                       $dislike = ((x($dlike,$item['id'])) ? format_like($dlike[$item['id']],$dlike[$item['id'] . '-l'],'dislike',$item['id']) : '');
 
                        $location = (($item['location']) ? '<a target="map" href="http://maps.google.com/?q=' . urlencode($item['location']) . '">' . $item['location'] . '</a>' : '');
                        $coord = (($item['coord']) ? '<a target="map" href="http://maps.google.com/?q=' . urlencode($item['coord']) . '">' . $item['coord'] . '</a>' : '');

diff --git a/mod/photo.php b/mod/photo.php
index 653ca81c27ede3eae17f6633de6232dcdd73ddd7..4e0b85b451f03085c914226890d7ed9c9b3269d0 100644 (file)
--- a/mod/photo.php
+++ b/mod/photo.php
@@ -16,7 +16,7 @@ function photo_init(&$a) {
                        return; // NOTREACHED
        }
 
-       if(x($type)) {
+       if(isset($type)) {
                switch($type) {
 
                        case 'profile':
@@ -37,7 +37,7 @@ function photo_init(&$a) {
                if(count($r)) {
                        $data = $r[0]['data'];
                }
-               if(x($data) === false) {
+               if(! isset($data)) {
                        $data = file_get_contents(($resolution == 5) 
                                ? 'images/default-profile-sm.jpg' 
                                : 'images/default-profile.jpg');

diff --git a/mod/profile.php b/mod/profile.php
index 3ab77a0940ef9efc5728dbfbacf3145530897ad0..a3148eea3de8a5e2efe0f3fe8312e9ebc3b8b128 100644 (file)
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -276,31 +276,8 @@ function profile_content(&$a, $update = 0) {
        if(count($r)) {
 
                foreach($r as $item) {
-
-                       $sparkle = '';
-                       
-                       if(($item['verb'] == ACTIVITY_LIKE) && ($item['id'] != $item['parent'])) {
-                               $url = $item['url'];
-                               if(($item['network'] === 'dfrn') && (! $item['self'])) {
-                                       $url = $a->get_baseurl() . '/redir/' . $item['contact-id'];
-                                       $sparkle = ' class="sparkle" ';
-                               }
-                               if(! is_array($alike[$item['parent'] . '-l']))
-                                       $alike[$item['parent'] . '-l'] = array();
-                               $alike[$item['parent']] ++;
-                               $alike[$item['parent'] . '-l'][] = '<a href="'. $url . '"'. $sparkle .'>' . $item['name'] . '</a>';
-                       }
-                       if(($item['verb'] == ACTIVITY_DISLIKE) && ($item['id'] != $item['parent'])) {
-                               $url = $item['url'];
-                               if(($item['network'] === 'dfrn') && (! $item['self'])) { 
-                                       $url = $a->get_baseurl() . '/redir/' . $item['contact-id'];
-                                       $sparkle = ' class="sparkle" ';
-                               }
-                               if(! is_array($dlike[$item['parent'] . '-l']))
-                                       $dlike[$item['parent'] . '-l'] = array();
-                               $dlike[$item['parent']] ++;
-                               $dlike[$item['parent'] . '-l'][] = '<a href="'. $url . '"'. $sparkle .'>' . $item['name'] . '</a>';
-                       }
+                       like_puller($a,$item,$alike,'like');
+                       like_puller($a,$item,$dlike,'dislike');
                }
 
                foreach($r as $item) {
@@ -313,7 +290,8 @@ function profile_content(&$a, $update = 0) {
                        
                        $redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
 
-                       if((($item['verb'] == ACTIVITY_LIKE) || ($item['verb'] == ACTIVITY_DISLIKE)) && ($item['id'] != $item['parent'])) 
+                       if(((activity_match($item['verb'],ACTIVITY_LIKE)) || (activity_match($item['verb'],ACTIVITY_DISLIKE))) 
+                               && ($item['id'] != $item['parent']))
                                continue;
 
                        $lock = (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid']) 

diff --git a/mod/profiles.php b/mod/profiles.php
index ce7e616ead79c0102b8b28bcf0004145fc5d7b2b..81678a1513e74d161a12160a9be0b4aa8c93030d 100644 (file)
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -157,6 +157,7 @@ function profiles_post(&$a) {
 
 
 function profiles_content(&$a) {
+       $o = '';
        $o .= '<script> $(document).ready(function() { $(\'#nav-profiles-link\').addClass(\'nav-selected\'); });</script>';
        if(! local_user()) {
                notice( t('Permission denied.') . EOL);
@@ -266,7 +267,7 @@ function profiles_content(&$a) {
        }                
 
 
-       if(intval($a->argv[1])) {
+       if(($a->argc > 1 && intval($a->argv[1])) {
                $r = q("SELECT * FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1",
                        intval($a->argv[1]),
                        intval($_SESSION['uid'])

diff --git a/mod/settings.php b/mod/settings.php
index 863da44d5e8d494c10208caa3a6b60fd6effa8a3..eab4ac52e7c7906cd5905b3d774efdec93c635d4 100644 (file)
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -155,6 +155,7 @@ function settings_post(&$a) {
 if(! function_exists('settings_content')) {
 function settings_content(&$a) {
 
+       $o = '';
        $o .= '<script> $(document).ready(function() { $(\'#nav-settings-link\').addClass(\'nav-selected\'); });</script>';
 
        if(! local_user()) {

diff --git a/view/default.php b/view/default.php
index 2d45d946a820d6853290d3f1778c6303776259e9..60bda26695bc634672094d384cdebe6b4ea13ba6 100644 (file)
--- a/view/default.php
+++ b/view/default.php
@@ -1,17 +1,17 @@
 <!DOCTYPE html >\r
 <html>\r
 <head>\r
-  <title><?php echo $page['title'] ?></title>\r
-  <?php echo $page['htmlhead'] ?>\r
+  <title><?php if(x($page,'title')) echo $page['title'] ?></title>\r
+  <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>\r
 </head>\r
 <body>\r
-       <header><?php echo $page['header']; ?></header>\r
-       <nav><div id="top-margin"></div><?php echo $page['nav']; ?></nav>\r
-       <aside><?php echo $page['aside']; ?></aside>\r
-       <section><?php echo $page['content']; ?>\r
+       <header><?php if(x($page,'header')) echo $page['header']; ?></header>\r
+       <nav><div id="top-margin"></div><?php if(x($page,'nav')) echo $page['nav']; ?></nav>\r
+       <aside><?php if(x($page,'aside')) echo $page['aside']; ?></aside>\r
+       <section><?php if(x($page,'content')) echo $page['content']; ?>\r
                <div id="page-footer"></div>\r
        </section>\r
-       <footer><?php echo $page['footer']; ?></footer>\r
+       <footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>\r
 </body>\r
 </html>\r
 \r

diff --git a/view/profile.php b/view/profile.php
index 5b092d1dc9cb9b8bf86d3ae42c45af7dabfb763e..1d036dc5cd383de9c1fcd599e0459f021be1ec95 100644 (file)
--- a/view/profile.php
+++ b/view/profile.php
@@ -1,12 +1,12 @@
 <!DOCTYPE html ><?php // This is a perfect example of why I prefer to use template files rather than mixed PHP/HTML ?>\r
 <html>\r
 <head>\r
-  <title><?php echo $page['title']; ?></title>\r
-  <?php echo $page['htmlhead']; ?>\r
+  <title><?php if(x($page,'title')) echo $page['title']; ?></title>\r
+  <?php if(x($page,'htmlhead')) echo $page['htmlhead']; ?>\r
 </head>\r
 <body>\r
-<header><?php echo $page['header']; ?></header>\r
-<nav><div id="top-margin"></div><?php echo $page['nav']; ?></nav>\r
+<header><?php if(x($page,'header')) echo $page['header']; ?></header>\r
+<nav><div id="top-margin"></div><?php if(x($page,'nav')) echo $page['nav']; ?></nav>\r
 <aside>\r
 <?php if((is_array($profile)) && count($profile)) { ?>\r
 <div class="vcard">\r
@@ -57,17 +57,17 @@
 <?php if(strlen($profile['marital'])) { ?>\r
 <div class="marital"><span class="marital-label"><span class="heart">&hearts;</span> Status: </span><span class="marital-text"><?php echo $profile['marital']; ?></span></div>\r
 <?php } ?>\r
-<?php if(strlen($profile['url'])) { ?>\r
+<?php if(strlen($profile['homepage'])) { ?>\r
 <div class="homepage"><span class="homepage-label">Homepage: </span><span class="homepage-url"><?php echo $profile['homepage']; ?></span></div>\r
 <?php } ?>\r
-<?php echo $page['aside'] ?>\r
+<?php if(x($page,'aside')) echo $page['aside'] ?>\r
 </aside>\r
 <section>\r
-<?php echo $page['content']; ?>\r
+<?php if(x($page,'content')) echo $page['content']; ?>\r
 <div id="page-footer"></div>\r
 </section>\r
 <footer>\r
-<?php echo $page['footer']; ?>\r
+<?php if(x($page,'footer')) echo $page['footer']; ?>\r
 </footer>\r
 </body>\r
 </html>\r

diff --git a/view/profile_selectors.php b/view/profile_selectors.php
index 46f5c8b68acd802b56cb01b2f9ffd1b7f7d3fb0a..335f292dcfb23125e57fc3ceede3be45ece8c0d7 100644 (file)
--- a/view/profile_selectors.php
+++ b/view/profile_selectors.php
@@ -2,6 +2,7 @@
 
 
 function gender_selector($current="",$suffix="") {
+       $o = '';
        $select = array('', t('Male'), t('Female'), t('Transsexual'), t('Hermaphrodite'), t('Neuter'), t('Other'), t('Undecided'));
 
        $o .= "<select name=\"gender$suffix\" id=\"gender-select$suffix\" size=\"1\" >";
@@ -14,6 +15,7 @@ function gender_selector($current="",$suffix="") {
 }      
 
 function sexpref_selector($current="",$suffix="") {
+       $o = '';
        $select = array('', t('Males'), t('Females'), t('Bisexual'), t('Autosexual'), t('Abstinent'), t('Virgin'), t('Nonsexual'));
 
        $o .= "<select name=\"sexual$suffix\" id=\"sexual-select$suffix\" size=\"1\" >";
@@ -27,6 +29,7 @@ function sexpref_selector($current="",$suffix="") {
 
 
 function marital_selector($current="",$suffix="") {
+       $o = '';
        $select = array('', t('Single'), t('Lonely'), t('Available'), t('Unavailable'), t('Dating'), t('Unfaithful'), t('Sex Addict'), t('Friends'), t('Friends/Benefits'), t('Casual'), t('Engaged'), t('Married'), t('Partners'), t('Cohabiting'), t('Happy'), t('Not Looking'), t('Swinger'), t('Betrayed'), t('Separated'), t('Unstable'), t('Divorced'), t('Widowed'), t('Uncertain'), t('Complicated'), t('Don\'t care'), t('Ask me') );
 
        $o .= "<select name=\"marital\" id=\"marital-select\" size=\"1\" >";