tobias/friendica
1
0
Fork 0
Code Pull requests Activity

mongo checkin, global directory, redir rework, location basics

Browse source
This commit is contained in:
Mike Macgirvin 2010-08-19 04:59:31 -07:00
parent 6ed5b642a4
commit e0045a43e2
27 changed files with 266 additions and 144 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
boot.php
View file

@ -170,6 +170,8 @@ function system_unavailable() {
if(! function_exists('check_config')) { if(! function_exists('check_config')) {
function check_config(&$a) { function check_config(&$a) {
load_config('system');
$build = get_config('system','build'); $build = get_config('system','build');
if(! x($build)) if(! x($build))
$build = set_config('system','build',BUILD_ID); $build = set_config('system','build',BUILD_ID);
@ -560,19 +562,45 @@ function sanitise_acl(&$item) {
unset($item); unset($item);
}} }}
if(! function_exists('load_config')) {
function load_config($family) {
global $a;
$r = q("SELECT * FROM `config` WHERE `cat` = '%s'",
dbesc($family)
);
if(count($r)) {
foreach($r as $rr) {
$k = $rr['k'];
$a->config[$family][$k] = $rr['v'];
}
}
}}
if(! function_exists('get_config')) { if(! function_exists('get_config')) {
function get_config($family,$key) { function get_config($family,$key) {
global $a;
if(isset($a->config[$family][$key]))
return $a->config[$family][$key];
$ret = q("SELECT `v` FROM `config` WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1", $ret = q("SELECT `v` FROM `config` WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1",
dbesc($family), dbesc($family),
dbesc($key) dbesc($key)
); );
if(count($ret)) if(count($ret)) {
$a->config[$family][$key] = $ret[0]['v'];
return $ret[0]['v']; return $ret[0]['v'];
}
return false; return false;
}} }}
if(! function_exists('set_config')) { if(! function_exists('set_config')) {
function set_config($family,$key,$value) { function set_config($family,$key,$value) {
global $a;
$a->config[$family][$key] = $value;
if(get_config($family,$key) === false) { if(get_config($family,$key) === false) {
$ret = q("INSERT INTO `config` ( `cat`, `k`, `v` ) VALUES ( '%s', '%s', '%s' ) ", $ret = q("INSERT INTO `config` ( `cat`, `k`, `v` ) VALUES ( '%s', '%s', '%s' ) ",
dbesc($family), dbesc($family),

3
database.sql
View file

@ -264,7 +264,7 @@ CREATE TABLE IF NOT EXISTS `profile` (
`region` char(255) NOT NULL, `region` char(255) NOT NULL,
`postal-code` char(32) NOT NULL, `postal-code` char(32) NOT NULL,
`country-name` char(255) NOT NULL, `country-name` char(255) NOT NULL,
`gender` char(8) NOT NULL, `gender` char(32) NOT NULL,
`marital` char(255) NOT NULL, `marital` char(255) NOT NULL,
`sexual` char(255) NOT NULL, `sexual` char(255) NOT NULL,
`politic` char(255) NOT NULL, `politic` char(255) NOT NULL,
@ -284,6 +284,7 @@ CREATE TABLE IF NOT EXISTS `profile` (
`photo` char(255) NOT NULL, `photo` char(255) NOT NULL,
`thumb` char(255) NOT NULL, `thumb` char(255) NOT NULL,
`publish` tinyint(1) NOT NULL DEFAULT '0', `publish` tinyint(1) NOT NULL DEFAULT '0',
`net-publish` tinyint(1) NOT NULL DEFAULT '0',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8; ) ENGINE=MyISAM DEFAULT CHARSET=utf8;

8
htconfig.php
View file

@ -31,3 +31,11 @@ $a->config['admin_email'] = '';
// Maximum size of an imported message, 0 is unlimited (but our database 'text' element is limited to 65535). // Maximum size of an imported message, 0 is unlimited (but our database 'text' element is limited to 65535).
$a->config['max_import_size'] = 10000; $a->config['max_import_size'] = 10000;
// Location of PHP command line processor
$a->config['php_path'] = 'php';
// Location of global directory submission page.
$a->config['system']['directory_submit_url'] = 'http://dir.dfrn.org/submit';

BIN
images/mapicon.gif Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1 KiB

BIN
images/youtube_icon.gif Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 924 B

28
include/directory.php Normal file
View file

@ -0,0 +1,28 @@
<?php
require_once("boot.php");
$a = new App;
@include(".htconfig.php");
require_once("dba.php");
$db = new dba($db_host, $db_user, $db_pass, $db_data);
unset($db_host, $db_user, $db_pass, $db_data);
if($argc != 2)
exit;
load_config('system');
$a->set_baseurl(get_config('system','url'));
$dir = get_config('system','directory_submit_url');
if(! strlen($dir))
exit;
fetch_url($dir . '?url=' . bin2hex($argv[1]));
exit;

87
include/main.js
View file

@ -31,3 +31,90 @@
} }
} }
var src = null;
var prev = null;
var livetime = null;
var msie = false;
$(document).ready(function() {
$.ajaxSetup({cache: false});
msie = $.browser.msie ;
NavUpdate();
});
function NavUpdate() {
if($('#live-network').length) { src = 'network'; liveUpdate(); }
if($('#live-profile').length) { src = 'profile'; liveUpdate(); }
$.get("ping",function(data) {
$(data).find('result').each(function() {
var net = $(this).find('net').text();
if(net == 0) { net = ''; }
$('#net-update').html(net);
var home = $(this).find('home').text();
if(home == 0) { home = ''; }
$('#home-update').html(home);
var mail = $(this).find('mail').text();
if(mail == 0) { mail = ''; }
$('#mail-update').html(mail);
var intro = $(this).find('intro').text();
if(intro == 0) { intro = ''; }
$('#notify-update').html(intro);
});
}) ;
setTimeout(NavUpdate,30000);
}
function liveUpdate() {
if(src == null) { return; }
if($('.comment-edit-text-full').length) {
livetime = setTimeout(liveUpdate, 10000);
return;
}
prev = 'live-' + src;
$.get('update_' + src + '?msie=' + ((msie) ? 1 : 0),function(data) {
$('.wall-item-outside-wrapper',data).each(function() {
var ident = $(this).attr('id');
if($('#' + ident).length == 0) {
$('img',this).each(function() {
$(this).attr('src',$(this).attr('dst'));
});
$('#' + prev).after($(this));
}
else {
$('#' + ident + ' ' + '.wall-item-ago').replaceWith($(this).find('.wall-item-ago'));
$('#' + ident + ' ' + '.wall-item-comment-wrapper').replaceWith($(this).find('.wall-item-comment-wrapper'));
$('#' + ident + ' ' + '.my-comment-photo').each(function() {
$(this).attr('src',$(this).attr('dst'));
});
}
prev = ident;
});
});
}
function confirmDelete() {
return confirm("Delete this item?");
}
function imgbright(node) {
$(node).attr("src",$(node).attr("src").replace('hide','show'));
$(node).css('width',24);
$(node).css('height',24);
}
function imgdull(node) {
$(node).attr("src",$(node).attr("src").replace('show','hide'));
$(node).css('width',16);
$(node).css('height',16);
}

2
include/nav.php
View file

@ -12,7 +12,7 @@ if(x($_SESSION['uid'])) {
$a->page['nav'] .= '<a id="nav-register-link" class="nav-commlink" href="register" >' $a->page['nav'] .= '<a id="nav-register-link" class="nav-commlink" href="register" >'
. t('Register') . "</a>\r\n"; . t('Register') . "</a>\r\n";
$a->page['nav'] .= '<a id="nav-directory-link" class="nav-link" href="directory">' . t('Site Directory') . "</a>\r\n"; $a->page['nav'] .= '<a id="nav-directory-link" class="nav-link" href="directory">' . t('Directory') . "</a>\r\n";
if(x($_SESSION,'uid')) { if(x($_SESSION,'uid')) {

2
include/notifier.php
View file

@ -8,7 +8,7 @@
@include(".htconfig.php"); @include(".htconfig.php");
require_once("dba.php"); require_once("dba.php");
$db = new dba($db_host, $db_user, $db_pass, $db_data, $install); $db = new dba($db_host, $db_user, $db_pass, $db_data);
unset($db_host, $db_user, $db_pass, $db_data); unset($db_host, $db_user, $db_pass, $db_data);
require_once("session.php"); require_once("session.php");

2
include/poller.php
View file

@ -7,7 +7,7 @@ $a = new App;
@include('.htconfig.php'); @include('.htconfig.php');
require_once('dba.php'); require_once('dba.php');
$db = new dba($db_host, $db_user, $db_pass, $db_data, $install); $db = new dba($db_host, $db_user, $db_pass, $db_data);
unset($db_host, $db_user, $db_pass, $db_data); unset($db_host, $db_user, $db_pass, $db_data);
require_once('session.php'); require_once('session.php');

7
include/security.php
View file

@ -6,9 +6,12 @@ function can_write_wall(&$a,$owner) {
if((local_user()) && ($_SESSION['uid'] == $owner)) if((local_user()) && ($_SESSION['uid'] == $owner))
return true; return true;
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `id` = %d AND `blocked` = 0 AND `pending` = 0 LIMIT 1", $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `id` = %d AND `blocked` = 0 AND `pending` = 0
AND `readonly` = 0 AND `rel` IN ( %d , %d ) LIMIT 1",
intval($owner), intval($owner),
intval($_SESSION['visitor_id']) intval($_SESSION['visitor_id']),
intval(DIRECTION_OUT),
intval(DIRECTION_BOTH)
); );
if(count($r)) if(count($r))
return true; return true;

4
mod/contacts.php
View file

@ -201,7 +201,7 @@ function contacts_content(&$a) {
'$name' => $r[0]['name'], '$name' => $r[0]['name'],
'$dir_icon' => $dir_icon, '$dir_icon' => $dir_icon,
'$alt_text' => $alt_text, '$alt_text' => $alt_text,
'$url' => (($direction != DIRECTION_IN) ? "redir/{$r[0]['id']}" : $r[0]['url'] ) '$url' => (($direction != DIRECTION_OUT) ? "redir/{$r[0]['id']}" : $r[0]['url'] )
)); ));
@ -296,7 +296,7 @@ function contacts_content(&$a) {
'$dir_icon' => $dir_icon, '$dir_icon' => $dir_icon,
'$thumb' => $rr['thumb'], '$thumb' => $rr['thumb'],
'$name' => $rr['name'], '$name' => $rr['name'],
'$url' => (($direction != DIRECTION_IN) ? "redir/{$rr['id']}" : $rr['url'] ) '$url' => (($direction != DIRECTION_OUT) ? "redir/{$rr['id']}" : $rr['url'] )
)); ));
} }
$o .= '<div id="contact-edit-end"></div>'; $o .= '<div id="contact-edit-end"></div>';

2
mod/dfrn_poll.php
View file

@ -25,7 +25,7 @@ function dfrn_poll_init(&$a) {
$r = q("SELECT `contact`.*, `user`.`nickname` $r = q("SELECT `contact`.*, `user`.`nickname`
FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid` FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
WHERE `issued-id` = '%s' LIMIT 1", WHERE `dfrn-id` = '%s' LIMIT 1",
dbesc($dfrn_id)); dbesc($dfrn_id));
if(count($r)) { if(count($r)) {
$s = fetch_url($r[0]['poll'] . '?dfrn_id=' . $dfrn_id . '&type=profile-check'); $s = fetch_url($r[0]['poll'] . '?dfrn_id=' . $dfrn_id . '&type=profile-check');

2
mod/directory.php
View file

@ -9,6 +9,8 @@ function directory_content(&$a) {
$tpl .= file_get_contents('view/directory_header.tpl'); $tpl .= file_get_contents('view/directory_header.tpl');
$o .= replace_macros($tpl, array( $o .= replace_macros($tpl, array(
'$search' => $search, '$search' => $search,
'$finding' => (strlen($search) ? '<h4>' . t('Finding: ') . "'" . $search . "'" . '</h4>' : "") '$finding' => (strlen($search) ? '<h4>' . t('Finding: ') . "'" . $search . "'" . '</h4>' : "")

6
mod/network.php
View file

@ -148,7 +148,8 @@ function network_content(&$a, $update = false) {
$template = $wallwall; $template = $wallwall;
$commentww = 'ww'; $commentww = 'ww';
// If it is our contact, use a friendly redirect link // If it is our contact, use a friendly redirect link
if($item['owner-link'] == $item['url']) if(($item['owner-link'] == $item['url']) && ($item['rel'] == DIRECTION_IN || $item['rel'] == DIRECTION_BOTH))
$owner_url = $redirect_url;
$owner_url = $redirect_url; $owner_url = $redirect_url;
} }
@ -179,7 +180,7 @@ function network_content(&$a, $update = false) {
if(($item['contact-uid'] == $_SESSION['uid']) && (strlen($item['dfrn-id'])) && (! $item['self'] )) if(($item['contact-uid'] == $_SESSION['uid']) && ($item['rel] == DIRECTION_IN || $item['rel'] == DIRECTION_BOTH) && (! $item['self'] ))
$profile_url = $redirect_url; $profile_url = $redirect_url;
$photo = $item['photo']; $photo = $item['photo'];
@ -211,6 +212,7 @@ function network_content(&$a, $update = false) {
'$title' => $item['title'], '$title' => $item['title'],
'$body' => bbcode($item['body']), '$body' => bbcode($item['body']),
'$ago' => relative_date($item['created']), '$ago' => relative_date($item['created']),
'$location' => (($item['location']) ? '<a target="map" href="http://maps.google.com/?q=' . urlencode($item['location']) . '">' . $item['location'] . '</a>' : ''),
'$indent' => (($item['parent'] != $item['item_id']) ? ' comment' : ''), '$indent' => (($item['parent'] != $item['item_id']) ? ' comment' : ''),
'$owner_url' => $owner_url, '$owner_url' => $owner_url,
'$owner_photo' => $owner_photo, '$owner_photo' => $owner_photo,

5
mod/photos.php
View file

@ -766,11 +766,10 @@ function photos_content(&$a) {
$profile_url = $item['url']; $profile_url = $item['url'];
if(local_user() && ($item['contact-uid'] == $_SESSION['uid'])
if(local_user() && ($item['contact-uid'] == $_SESSION['uid']) && (strlen($item['dfrn-id'])) && (! $item['self'] )) && ($item['rel'] == DIRECTION_IN || $item['rel'] == DIRECTION_BOTH) && (! $item['self'] ))
$profile_url = $redirect_url; $profile_url = $redirect_url;
$profile_name = ((strlen($item['author-name'])) ? $item['author-name'] : $item['name']); $profile_name = ((strlen($item['author-name'])) ? $item['author-name'] : $item['name']);
$profile_avatar = ((strlen($item['author-avatar'])) ? $item['author-avatar'] : $item['thumb']); $profile_avatar = ((strlen($item['author-avatar'])) ? $item['author-avatar'] : $item['thumb']);
$profile_link = $profile_url; $profile_link = $profile_url;

12
mod/profile.php
View file

@ -64,9 +64,11 @@ function profile_init(&$a) {
$profile = $a->argv[1]; $profile = $a->argv[1];
} }
profile_load($a,$which,$profile); profile_load($a,$which,$profile);
$a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . $a->get_baseurl() . '/dfrn_poll/' . $which .'" />'; $a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . $a->get_baseurl() . '/dfrn_poll/' . $which .'" />' . "\r\n" ;
$a->page['htmlhead'] .= '<meta name="dfrn-template" content="' . $a->get_baseurl() . "/profile/%s" . '" />' . "\r\n" ;
$a->page['htmlhead'] .= '<meta name="dfrn-global-visibility" content="' . (($a->profile['net-publish']) ? 'true' : 'false') . '" />' . "\r\n" ;
$a->page['htmlhead'] .= "<meta name=\"dfrn-template\" content=\"" . $a->get_baseurl() . "/profile/%s" . "\" />\r\n";
$dfrn_pages = array('request', 'confirm', 'notify', 'poll'); $dfrn_pages = array('request', 'confirm', 'notify', 'poll');
foreach($dfrn_pages as $dfrn) foreach($dfrn_pages as $dfrn)
@ -99,10 +101,12 @@ function profile_content(&$a, $update = false) {
if(count($r)) if(count($r))
$contact = $r[0]; $contact = $r[0];
} }
else {
if(local_user()) { if(local_user()) {
$contact_id = $_SESSION['cid']; $contact_id = $_SESSION['cid'];
$contact = $a->contact; $contact = $a->contact;
} }
}
if($update) { if($update) {
// Ensure we've got a profile owner if updating. // Ensure we've got a profile owner if updating.
@ -261,7 +265,8 @@ function profile_content(&$a, $update = false) {
// This is my profile but I'm not the author of this post/comment. If it's somebody that's a fan or mutual friend, // This is my profile but I'm not the author of this post/comment. If it's somebody that's a fan or mutual friend,
// I can go directly to their profile as an authenticated guest. // I can go directly to their profile as an authenticated guest.
if(local_user() && ($item['contact-uid'] == $_SESSION['uid']) && (strlen($item['dfrn-id'])) && (! $item['self'] )) if(local_user() && ($item['contact-uid'] == $_SESSION['uid'])
&& ($item['rel'] == DIRECTION_IN || $item['rel'] == DIRECTION_BOTH) && (! $item['self'] ))
$profile_url = $redirect_url; $profile_url = $redirect_url;
// FIXME tryng to solve the mishmash of profile photos. // FIXME tryng to solve the mishmash of profile photos.
@ -294,6 +299,7 @@ function profile_content(&$a, $update = false) {
'$title' => $item['title'], '$title' => $item['title'],
'$body' => bbcode($item['body']), '$body' => bbcode($item['body']),
'$ago' => relative_date($item['created']), '$ago' => relative_date($item['created']),
'$location' => (($item['location']) ? '<a target="map" href="http://maps.google.com/?q=' . urlencode($item['location']) . '">' . $item['location'] . '</a>' : ''),
'$indent' => (($item['parent'] != $item['item_id']) ? ' comment' : ''), '$indent' => (($item['parent'] != $item['item_id']) ? ' comment' : ''),
'$drop' => $drop, '$drop' => $drop,
'$comment' => $comment '$comment' => $comment

63
mod/profiles.php
View file

@ -4,7 +4,7 @@
function profiles_post(&$a) { function profiles_post(&$a) {
if(! local_user()) { if(! local_user()) {
notice( "Permission denied." . EOL); notice( t('Permission denied.') . EOL);
return; return;
} }
@ -16,14 +16,14 @@ function profiles_post(&$a) {
intval($_SESSION['uid']) intval($_SESSION['uid'])
); );
if(! count($orig)) { if(! count($orig)) {
$_SESSION['sysmsg'] .= "Profile not found." . EOL; notice( t('Profile not found.') . EOL);
return; return;
} }
$is_default = (($orig[0]['is-default']) ? 1 : 0); $is_default = (($orig[0]['is-default']) ? 1 : 0);
$profile_name = notags(trim($_POST['profile_name'])); $profile_name = notags(trim($_POST['profile_name']));
if(! strlen($profile_name)) { if(! strlen($profile_name)) {
$a->$_SESSION['sysmsg'] .= "Profile Name is required." . EOL; notify( t('Profile Name is required.') . EOL);
return; return;
} }
@ -74,6 +74,9 @@ function profiles_post(&$a) {
$education = escape_tags(trim($_POST['education'])); $education = escape_tags(trim($_POST['education']));
if(x($_POST,'profile_in_directory')) if(x($_POST,'profile_in_directory'))
$publish = (($_POST['profile_in_directory'] == 1) ? 1: 0); $publish = (($_POST['profile_in_directory'] == 1) ? 1: 0);
if(x($_POST,'profile_in_netdirectory'))
$net_publish = (($_POST['profile_in_netdirectory'] == 1) ? 1: 0);
$r = q("UPDATE `profile` $r = q("UPDATE `profile`
SET `profile-name` = '%s', SET `profile-name` = '%s',
@ -130,14 +133,15 @@ function profiles_post(&$a) {
); );
if($r) if($r)
$_SESSION['sysmsg'] .= "Profile updated." . EOL; notice( t('Profile updated.') . EOL);
if($is_default) { if($is_default) {
$r = q("UPDATE `profile` $r = q("UPDATE `profile`
SET `publish` = %d SET `publish` = %d, `net-publish` = %d
WHERE `id` = %d AND `uid` = %d LIMIT 1", WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($publish), intval($publish),
intval($net_publish),
intval($a->argv[1]), intval($a->argv[1]),
intval($_SESSION['uid']) intval($_SESSION['uid'])
@ -149,11 +153,15 @@ function profiles_post(&$a) {
intval($_SESSION['uid']) intval($_SESSION['uid'])
); );
} }
if($is_default) {
// Update global directory in background
$php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
$url = $_SESSION['my_url'];
if($url && strlen(get_config('system','directory_submit_url')))
proc_close(proc_open("\"$php_path\" \"include/directory.php\" \"$url\" &",
array(),$foo));
}
} }
} }
@ -161,7 +169,7 @@ function profiles_post(&$a) {
function profiles_content(&$a) { function profiles_content(&$a) {
if(! local_user()) { if(! local_user()) {
$_SESSION['sysmsg'] .= "Unauthorised." . EOL; notice( t('Permission denied.') . EOL);
return; return;
} }
@ -171,7 +179,7 @@ function profiles_content(&$a) {
intval($_SESSION['uid']) intval($_SESSION['uid'])
); );
if(! count($r)) { if(! count($r)) {
$_SESSION['sysmsg'] .= "Profile not found." . EOL; notice( t('Profile not found.') . EOL);
goaway($a->get_baseurl() . '/profiles'); goaway($a->get_baseurl() . '/profiles');
return; // NOTREACHED return; // NOTREACHED
} }
@ -187,7 +195,7 @@ function profiles_content(&$a) {
intval($a->argv[2]) intval($a->argv[2])
); );
if($r) if($r)
notice("Profile deleted." . EOL); notice( t('Profile deleted.') . EOL);
goaway($a->get_baseurl() . '/profiles'); goaway($a->get_baseurl() . '/profiles');
return; // NOTREACHED return; // NOTREACHED
@ -203,7 +211,7 @@ function profiles_content(&$a) {
intval($_SESSION['uid'])); intval($_SESSION['uid']));
$num_profiles = count($r0); $num_profiles = count($r0);
$name = "Profile-" . ($num_profiles + 1); $name = t('Profile-') . ($num_profiles + 1);
$r1 = q("SELECT `name`, `photo`, `thumb` FROM `profile` WHERE `uid` = %d AND `is-default` = 1 LIMIT 1", $r1 = q("SELECT `name`, `photo`, `thumb` FROM `profile` WHERE `uid` = %d AND `is-default` = 1 LIMIT 1",
intval($_SESSION['uid'])); intval($_SESSION['uid']));
@ -221,7 +229,7 @@ function profiles_content(&$a) {
intval($_SESSION['uid']), intval($_SESSION['uid']),
dbesc($name) dbesc($name)
); );
$_SESSION['sysmsg'] .= "New profile created." . EOL; notice( t('New profile created.') . EOL);
if(count($r3) == 1) if(count($r3) == 1)
goaway($a->get_baseurl() . '/profiles/' . $r3[0]['id']); goaway($a->get_baseurl() . '/profiles/' . $r3[0]['id']);
goaway($a->get_baseurl() . '/profiles'); goaway($a->get_baseurl() . '/profiles');
@ -233,13 +241,13 @@ function profiles_content(&$a) {
intval($_SESSION['uid'])); intval($_SESSION['uid']));
$num_profiles = count($r0); $num_profiles = count($r0);
$name = "Profile-" . ($num_profiles + 1); $name = t('Profile-') . ($num_profiles + 1);
$r1 = q("SELECT * FROM `profile` WHERE `uid` = %d AND `id` = %d LIMIT 1", $r1 = q("SELECT * FROM `profile` WHERE `uid` = %d AND `id` = %d LIMIT 1",
intval($_SESSION['uid']), intval($_SESSION['uid']),
intval($a->argv[2]) intval($a->argv[2])
); );
if(! count($r1)) { if(! count($r1)) {
notice("Profile unavailable to clone." . EOL); notice( t('Profile unavailable to clone.') . EOL);
return; return;
} }
unset($r1[0]['id']); unset($r1[0]['id']);
@ -259,7 +267,7 @@ function profiles_content(&$a) {
intval($_SESSION['uid']), intval($_SESSION['uid']),
dbesc($name) dbesc($name)
); );
$_SESSION['sysmsg'] .= "New profile created." . EOL; notice( t('New profile created.') . EOL);
if(count($r3) == 1) if(count($r3) == 1)
goaway($a->get_baseurl() . '/profiles/' . $r3[0]['id']); goaway($a->get_baseurl() . '/profiles/' . $r3[0]['id']);
goaway($a->get_baseurl() . '/profiles'); goaway($a->get_baseurl() . '/profiles');
@ -273,7 +281,7 @@ function profiles_content(&$a) {
intval($_SESSION['uid']) intval($_SESSION['uid'])
); );
if(! count($r)) { if(! count($r)) {
$_SESSION['sysmsg'] .= "Profile not found." . EOL; notice( t('Profile not found.') . EOL);
return; return;
} }
@ -289,6 +297,18 @@ function profiles_content(&$a) {
'$no_selected' => (($r[0]['publish'] == 0) ? " checked=\"checked\" " : "") '$no_selected' => (($r[0]['publish'] == 0) ? " checked=\"checked\" " : "")
)); ));
if(strlen(get_config('system','directory_submit_url'))) {
$opt_tpl = file_get_contents("view/profile-in-netdir.tpl");
$profile_in_net_dir = replace_macros($opt_tpl,array(
'$yes_selected' => (($r[0]['net-publish']) ? " checked=\"checked\" " : ""),
'$no_selected' => (($r[0]['net-publish'] == 0) ? " checked=\"checked\" " : "")
));
}
else
$profile_in_net_dir = '';
$opt_tpl = file_get_contents("view/profile-hide-friends.tpl"); $opt_tpl = file_get_contents("view/profile-hide-friends.tpl");
$hide_friends = replace_macros($opt_tpl,array( $hide_friends = replace_macros($opt_tpl,array(
'$yes_selected' => (($r[0]['hide-friends']) ? " checked=\"checked\" " : ""), '$yes_selected' => (($r[0]['hide-friends']) ? " checked=\"checked\" " : ""),
@ -310,7 +330,7 @@ function profiles_content(&$a) {
'$baseurl' => $a->get_baseurl(), '$baseurl' => $a->get_baseurl(),
'$profile_id' => $r[0]['id'], '$profile_id' => $r[0]['id'],
'$profile_name' => $r[0]['profile-name'], '$profile_name' => $r[0]['profile-name'],
'$default' => (($is_default) ? "<p id=\"profile-edit-default-desc\">This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet.</p>" : ""), '$default' => (($is_default) ? '<p id="profile-edit-default-desc">' . t('This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet.') . '</p>' : ""),
'$name' => $r[0]['name'], '$name' => $r[0]['name'],
'$dob' => dob($r[0]['dob']), '$dob' => dob($r[0]['dob']),
'$hide_friends' => $hide_friends, '$hide_friends' => $hide_friends,
@ -319,7 +339,7 @@ function profiles_content(&$a) {
'$region' => $r[0]['region'], '$region' => $r[0]['region'],
'$postal_code' => $r[0]['postal-code'], '$postal_code' => $r[0]['postal-code'],
'$country_name' => $r[0]['country-name'], '$country_name' => $r[0]['country-name'],
'$age' => ((intval($r[0]['dob'])) ? '(Age: '. age($r[0]['dob'],$a->user['timezone'],$a->user['timezone']) . ')' : ''), '$age' => ((intval($r[0]['dob'])) ? '(' . t('Age: ') . age($r[0]['dob'],$a->user['timezone'],$a->user['timezone']) . ')' : ''),
'$gender' => gender_selector($r[0]['gender']), '$gender' => gender_selector($r[0]['gender']),
'$marital' => marital_selector($r[0]['marital']), '$marital' => marital_selector($r[0]['marital']),
'$sexual' => sexpref_selector($r[0]['sexual']), '$sexual' => sexpref_selector($r[0]['sexual']),
@ -336,7 +356,8 @@ function profiles_content(&$a) {
'$work' => $r[0]['work'], '$work' => $r[0]['work'],
'$education' => $r[0]['education'], '$education' => $r[0]['education'],
'$contact' => $r[0]['contact'], '$contact' => $r[0]['contact'],
'$profile_in_dir' => (($is_default) ? $profile_in_dir : '') '$profile_in_dir' => (($is_default) ? $profile_in_dir : ''),
'$profile_in_net_dir' => (($is_default) ? $profile_in_net_dir : '')
)); ));
return $o; return $o;

8
mod/redir.php
View file

@ -4,7 +4,7 @@ function redir_init(&$a) {
if((! local_user()) || (! ($a->argc == 2)) || (! intval($a->argv[1]))) if((! local_user()) || (! ($a->argc == 2)) || (! intval($a->argv[1])))
goaway($a->get_baseurl()); goaway($a->get_baseurl());
$r = q("SELECT `dfrn-id`, `poll` FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1", $r = q("SELECT `issued-id`, `poll` FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($a->argv[1]), intval($a->argv[1]),
intval($_SESSION['uid'])); intval($_SESSION['uid']));
if(! count($r)) if(! count($r))
@ -12,9 +12,9 @@ function redir_init(&$a) {
q("INSERT INTO `profile_check` ( `uid`, `dfrn_id`, `expire`) q("INSERT INTO `profile_check` ( `uid`, `dfrn_id`, `expire`)
VALUES( %d, '%s', %d )", VALUES( %d, '%s', %d )",
intval($_SESSION['uid']), intval($_SESSION['uid']),
dbesc($r[0]['dfrn-id']), dbesc($r[0]['issued-id']),
intval(time() + 30)); intval(time() + 45));
goaway ($r[0]['poll'] . '?dfrn_id=' . $r[0]['dfrn-id'] . '&type=profile'); goaway ($r[0]['poll'] . '?dfrn_id=' . $r[0]['issued-id'] . '&type=profile');

2
view/directory_header.tpl
View file

@ -1,5 +1,7 @@
<h1>Site Directory</h1> <h1>Site Directory</h1>
<ul><li><div id="global-directory-link"><a href="http://dir.dfrn.org">Global Community Directory</a></div></li></ul>
$finding $finding
<div id="directory-search-wrapper"> <div id="directory-search-wrapper">

96
view/head.tpl
View file

@ -8,100 +8,4 @@
<script type="text/javascript" src="$baseurl/include/jquery.js" ></script> <script type="text/javascript" src="$baseurl/include/jquery.js" ></script>
<script type="text/javascript" src="$baseurl/include/main.js" ></script> <script type="text/javascript" src="$baseurl/include/main.js" ></script>
<script type="text/javascript">
var src = null;
var prev = null;
var livetime = null;
var msie = false;
$(document).ready(function() {
$.ajaxSetup({cache: false});
msie = $.browser.msie ;
NavUpdate();
});
function NavUpdate() {
if($('#live-network').length) { src = 'network'; liveUpdate(); }
if($('#live-profile').length) { src = 'profile'; liveUpdate(); }
$.get("ping",function(data) {
$(data).find('result').each(function() {
var net = $(this).find('net').text();
if(net == 0) { net = ''; }
$('#net-update').html(net);
var home = $(this).find('home').text();
if(home == 0) { home = ''; }
$('#home-update').html(home);
var mail = $(this).find('mail').text();
if(mail == 0) { mail = ''; }
$('#mail-update').html(mail);
var intro = $(this).find('intro').text();
if(intro == 0) { intro = ''; }
$('#notify-update').html(intro);
});
}) ;
setTimeout(NavUpdate,30000);
}
function liveUpdate() {
if(src == null) { return; }
if($('.comment-edit-text-full').length) {
livetime = setTimeout(liveUpdate, 10000);
return;
}
prev = 'live-' + src;
$.get('update_' + src + '?msie=' + ((msie) ? 1 : 0),function(data) {
$('.wall-item-outside-wrapper',data).each(function() {
var ident = $(this).attr('id');
if($('#' + ident).length == 0) {
$('img',this).each(function() {
$(this).attr('src',$(this).attr('dst'));
});
$('#' + prev).after($(this));
}
else {
$('#' + ident + ' ' + '.wall-item-ago').replaceWith($(this).find('.wall-item-ago'));
$('#' + ident + ' ' + '.wall-item-comment-wrapper').replaceWith($(this).find('.wall-item-comment-wrapper'));
$('#' + ident + ' ' + '.my-comment-photo').each(function() {
$(this).attr('src',$(this).attr('dst'));
});
}
prev = ident;
});
});
}
function confirmDelete() {
return confirm("Delete this item?");
}
function imgbright(node) {
$(node).attr("src",$(node).attr("src").replace('hide','show'));
$(node).css('width',24);
$(node).css('height',24);
}
function imgdull(node) {
$(node).attr("src",$(node).attr("src").replace('show','hide'));
$(node).css('width',16);
$(node).css('height',16);
}
</script>

4
view/htconfig.tpl
View file

@ -42,3 +42,7 @@ $a->config['max_import_size'] = 65535;
// Location of PHP command line processor // Location of PHP command line processor
$a->config['php_path'] = '$phpath'; $a->config['php_path'] = '$phpath';
// Location of global directory submission page.
$a->config['system']['directory_submit_url'] = 'http://dir.dfrn.org/submit';

16
view/profile-in-netdir.tpl Normal file
View file

@ -0,0 +1,16 @@
<p id="profile-in-directory">
Publish this profile in global social directory?
</p>
<div id="profile-in-netdir-yes-wrapper">
<label id="profile-in-netdir-yes-label" for="profile-in-netdir-yes">Yes</label>
<input type="radio" name="profile_in_netdirectory" id="profile-in-netdir-yes" $yes_selected value="1" />
<div id="profile-in-netdir-break" ></div>
</div>
<div id="profile-in-netdir-no-wrapper">
<label id="profile-in-netdir-no-label" for="profile-in-netdir-no">No</label>
<input type="radio" name="profile_in_netdirectory" id="profile-in-netdir-no" $no_selected value="0" />
<div id="profile-in-netdir-end"></div>
</div>

2
view/profile_edit.tpl
View file

@ -44,6 +44,8 @@ $dob $age
$profile_in_dir $profile_in_dir
$profile_in_net_dir
$hide_friends $hide_friends
<div class="profile-edit-submit-wrapper" > <div class="profile-edit-submit-wrapper" >

8
view/theme/default/style.css
View file

@ -501,6 +501,8 @@ input#dfrn-url {
#profile-edit-religion, #profile-edit-religion,
#profile-in-dir-yes, #profile-in-dir-yes,
#profile-in-dir-no, #profile-in-dir-no,
#profile-in-netdir-yes,
#profile-in-netdir-no,
#hide-friends-yes, #hide-friends-yes,
#hide-friends-no { #hide-friends-no {
float: left; float: left;
@ -509,6 +511,8 @@ input#dfrn-url {
#profile-in-dir-yes-label, #profile-in-dir-yes-label,
#profile-in-dir-no-label, #profile-in-dir-no-label,
#profile-in-netdir-yes-label,
#profile-in-netdir-no-label,
#hide-friends-yes-label, #hide-friends-yes-label,
#hide-friends-no-label { #hide-friends-no-label {
margin-left: 125px; margin-left: 125px;
@ -537,6 +541,8 @@ input#dfrn-url {
#profile-edit-homepage-end, #profile-edit-homepage-end,
#profile-in-dir-break, #profile-in-dir-break,
#profile-in-dir-end, #profile-in-dir-end,
#profile-in-netdir-break,
#profile-in-netdir-end,
#hide-friends-break, #hide-friends-break,
#hide-friends-end { #hide-friends-end {
clear: both; clear: both;
@ -829,7 +835,7 @@ input#dfrn-url {
} }
#directory-search-wrapper { #directory-search-wrapper {
margin-left: 350px; margin-top: 20px;
margin-right: 20px; margin-right: 20px;
margin-bottom: 50px; margin-bottom: 50px;
} }

1
view/wall_item.tpl
View file

@ -8,6 +8,7 @@
<div class="wall-item-wrapper" id="wall-item-wrapper-$id" > <div class="wall-item-wrapper" id="wall-item-wrapper-$id" >
<a href="$profile_url" title="View $name's profile" class="wall-item-name-link"><span class="wall-item-name" id="wall-item-name-$id" >$name</span></a> <a href="$profile_url" title="View $name's profile" class="wall-item-name-link"><span class="wall-item-name" id="wall-item-name-$id" >$name</span></a>
<div class="wall-item-ago" id="wall-item-ago-$id">$ago</div> <div class="wall-item-ago" id="wall-item-ago-$id">$ago</div>
<div class="wall-item-location" id="wall-item-location-$id">$location</div>
</div> </div>
<div class="wall-item-content" id="wall-item-content-$id" > <div class="wall-item-content" id="wall-item-content-$id" >
<div class="wall-item-title" id="wall-item-title-$id">$title</div> <div class="wall-item-title" id="wall-item-title-$id">$title</div>

2
view/wallwall_item.tpl
View file

@ -11,6 +11,8 @@
<div class="wall-item-wrapper" id="wall-item-wrapper-$id" > <div class="wall-item-wrapper" id="wall-item-wrapper-$id" >
<a href="$profile_url" title="View $name's profile" class="wall-item-name-link"><span class="wall-item-name" id="wall-item-name-$id" >$name</span></a> to <a href="$owner_url" title="View $owner_name's profile" class="wall-item-name-link"><span class="wall-item-name" id="wall-item-ownername-$id">$owner_name</span></a> via Wall-To-Wall:<br /> <a href="$profile_url" title="View $name's profile" class="wall-item-name-link"><span class="wall-item-name" id="wall-item-name-$id" >$name</span></a> to <a href="$owner_url" title="View $owner_name's profile" class="wall-item-name-link"><span class="wall-item-name" id="wall-item-ownername-$id">$owner_name</span></a> via Wall-To-Wall:<br />
<div class="wall-item-ago" id="wall-item-ago-$id">$ago</div> <div class="wall-item-ago" id="wall-item-ago-$id">$ago</div>
<div class="wall-item-location" id="wall-item-location-$id">$location</div>
</div> </div>
<div class="wall-item-content" id="wall-item-content-$id" > <div class="wall-item-content" id="wall-item-content-$id" >
<div class="wall-item-title" id="wall-item-title-$id">$title</div> <div class="wall-item-title" id="wall-item-title-$id">$title</div>