Merge remote branch 'upstream/master'
This commit is contained in:
Michael Vogel
commit
0353410cd4
4
boot.php
4
boot.php
|
|
@ -9,9 +9,9 @@ require_once('include/nav.php');
|
||||||
require_once('include/cache.php');
|
require_once('include/cache.php');
|
||||||
|
|
||||||
define ( 'FRIENDICA_PLATFORM', 'Friendica');
|
define ( 'FRIENDICA_PLATFORM', 'Friendica');
|
||||||
define ( 'FRIENDICA_VERSION', '3.0.1357' );
|
define ( 'FRIENDICA_VERSION', '3.0.1363' );
|
||||||
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
|
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
|
||||||
define ( 'DB_UPDATE_VERSION', 1144 );
|
define ( 'DB_UPDATE_VERSION', 1148 );
|
||||||
|
|
||||||
define ( 'EOL', "<br />\r\n" );
|
define ( 'EOL', "<br />\r\n" );
|
||||||
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );
|
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );
|
||||||
|
|
|
||||||
|
|
@ -173,6 +173,7 @@ CREATE TABLE IF NOT EXISTS `contact` (
|
||||||
`readonly` tinyint(1) NOT NULL DEFAULT '0',
|
`readonly` tinyint(1) NOT NULL DEFAULT '0',
|
||||||
`writable` tinyint(1) NOT NULL DEFAULT '0',
|
`writable` tinyint(1) NOT NULL DEFAULT '0',
|
||||||
`forum` tinyint(1) NOT NULL DEFAULT '0',
|
`forum` tinyint(1) NOT NULL DEFAULT '0',
|
||||||
|
`prv` tinyint(1) NOT NULL DEFAULT '0',
|
||||||
`hidden` tinyint(1) NOT NULL DEFAULT '0',
|
`hidden` tinyint(1) NOT NULL DEFAULT '0',
|
||||||
`archive` tinyint(1) NOT NULL DEFAULT '0',
|
`archive` tinyint(1) NOT NULL DEFAULT '0',
|
||||||
`pending` tinyint(1) NOT NULL DEFAULT '1',
|
`pending` tinyint(1) NOT NULL DEFAULT '1',
|
||||||
|
|
@ -819,9 +820,11 @@ 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,
|
||||||
|
`hometown` char(255) NOT NULL,
|
||||||
`gender` char(32) NOT NULL,
|
`gender` char(32) NOT NULL,
|
||||||
`marital` char(255) NOT NULL,
|
`marital` char(255) NOT NULL,
|
||||||
`with` text NOT NULL,
|
`with` text NOT NULL,
|
||||||
|
`howlong` datetime NOT NULL default '0000-00-00 00:00:00',
|
||||||
`sexual` char(255) NOT NULL,
|
`sexual` char(255) NOT NULL,
|
||||||
`politic` char(255) NOT NULL,
|
`politic` char(255) NOT NULL,
|
||||||
`religion` char(255) NOT NULL,
|
`religion` char(255) NOT NULL,
|
||||||
|
|
@ -941,12 +944,14 @@ CREATE TABLE IF NOT EXISTS `session` (
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS `sign` (
|
CREATE TABLE IF NOT EXISTS `sign` (
|
||||||
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
|
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
|
||||||
`iid` int(10) unsigned NOT NULL,
|
`iid` int(10) unsigned NOT NULL DEFAULT '0',
|
||||||
|
`retract_iid` int(10) unsigned NOT NULL DEFAULT '0',
|
||||||
`signed_text` mediumtext NOT NULL,
|
`signed_text` mediumtext NOT NULL,
|
||||||
`signature` text NOT NULL,
|
`signature` text NOT NULL,
|
||||||
`signer` char(255) NOT NULL,
|
`signer` char(255) NOT NULL,
|
||||||
PRIMARY KEY (`id`),
|
PRIMARY KEY (`id`),
|
||||||
KEY `iid` (`iid`)
|
KEY `iid` (`iid`),
|
||||||
|
KEY `retract_iid` (`retract_iid`)
|
||||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||||
|
|
||||||
-- --------------------------------------------------------
|
-- --------------------------------------------------------
|
||||||
|
|
|
||||||
|
|
@ -997,8 +997,8 @@
|
||||||
else
|
else
|
||||||
$sql_extra .= sprintf(" AND `item`.`parent` IN (SELECT distinct(`parent`) from item where ( `author-link` like '%s' or `tag` like '%s' or tag like '%s' )) ",
|
$sql_extra .= sprintf(" AND `item`.`parent` IN (SELECT distinct(`parent`) from item where ( `author-link` like '%s' or `tag` like '%s' or tag like '%s' )) ",
|
||||||
dbesc(protect_sprintf('%' . $myurl)),
|
dbesc(protect_sprintf('%' . $myurl)),
|
||||||
dbesc(protect_sprintf('%' . $myurl . '\\]%')),
|
dbesc(protect_sprintf('%' . $myurl . ']%')),
|
||||||
dbesc(protect_sprintf('%' . $diasp_url . '\\]%'))
|
dbesc(protect_sprintf('%' . $diasp_url . ']%'))
|
||||||
);
|
);
|
||||||
|
|
||||||
if ($max_id > 0)
|
if ($max_id > 0)
|
||||||
|
|
|
||||||
|
|
@ -52,6 +52,8 @@ function bb_unspacefy_and_trim($st) {
|
||||||
|
|
||||||
function bbcode($Text,$preserve_nl = false) {
|
function bbcode($Text,$preserve_nl = false) {
|
||||||
|
|
||||||
|
$a = get_app();
|
||||||
|
|
||||||
// Hide all [noparse] contained bbtags spacefying them
|
// Hide all [noparse] contained bbtags spacefying them
|
||||||
|
|
||||||
$Text = preg_replace_callback("/\[noparse\](.*?)\[\/noparse\]/ism", 'bb_spacefy',$Text);
|
$Text = preg_replace_callback("/\[noparse\](.*?)\[\/noparse\]/ism", 'bb_spacefy',$Text);
|
||||||
|
|
@ -114,6 +116,11 @@ function bbcode($Text,$preserve_nl = false) {
|
||||||
$Text = preg_replace("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '<a href="$1" target="external-link">$2</a>', $Text);
|
$Text = preg_replace("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '<a href="$1" target="external-link">$2</a>', $Text);
|
||||||
//$Text = preg_replace("/\[url\=([$URLSearchString]*)\]([$URLSearchString]*)\[\/url\]/ism", '<a href="$1" target="_blank">$2</a>', $Text);
|
//$Text = preg_replace("/\[url\=([$URLSearchString]*)\]([$URLSearchString]*)\[\/url\]/ism", '<a href="$1" target="_blank">$2</a>', $Text);
|
||||||
|
|
||||||
|
// we may need to restrict this further if it picks up too many strays
|
||||||
|
// link acct:user@host to a webfinger profile redirector
|
||||||
|
|
||||||
|
$Text = preg_replace('/acct:(.*?)@(.*?)([ ,])/', '<a href="' . $a->get_baseurl() . '/acctlink?addr=' . "$1@$2"
|
||||||
|
. '" target="extlink" >acct:' . "$1@$2$3" . '</a>',$Text);
|
||||||
|
|
||||||
// Perform MAIL Search
|
// Perform MAIL Search
|
||||||
$Text = preg_replace("/\[mail\]([$MAILSearchString]*)\[\/mail\]/", '<a href="mailto:$1">$1</a>', $Text);
|
$Text = preg_replace("/\[mail\]([$MAILSearchString]*)\[\/mail\]/", '<a href="mailto:$1">$1</a>', $Text);
|
||||||
|
|
@ -226,7 +233,7 @@ function bbcode($Text,$preserve_nl = false) {
|
||||||
$endlessloop = 0;
|
$endlessloop = 0;
|
||||||
while ((strpos($Text, "[/quote]")!== false) and (strpos($Text, "[quote=") !== false) and (++$endlessloop < 20))
|
while ((strpos($Text, "[/quote]")!== false) and (strpos($Text, "[quote=") !== false) and (++$endlessloop < 20))
|
||||||
$Text = preg_replace("/\[quote=[\"\']*(.*?)[\"\']*\](.*?)\[\/quote\]/ism",
|
$Text = preg_replace("/\[quote=[\"\']*(.*?)[\"\']*\](.*?)\[\/quote\]/ism",
|
||||||
"<br /><strong class=".'"author"'.">" . $t_wrote . "</strong><blockquote class=".'"author"'.">$2</blockquote>",
|
"<br /><strong class=".'"author"'.">" . $t_wrote . "</strong><blockquote>$2</blockquote>",
|
||||||
$Text);
|
$Text);
|
||||||
|
|
||||||
// [img=widthxheight]image source[/img]
|
// [img=widthxheight]image source[/img]
|
||||||
|
|
|
||||||
|
|
@ -173,6 +173,12 @@ function localize_item(&$item){
|
||||||
$item['body'] = str_replace($mtch[0],'@[url=' . zrl($mtch[1]). ']',$item['body']);
|
$item['body'] = str_replace($mtch[0],'@[url=' . zrl($mtch[1]). ']',$item['body']);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if(preg_match_all('/\[url=(.*?)\/photos\/(.*?)\/image\/(.*?)\]\[img(.*?)\]h(.*?)\[\/img\]\[\/url\]/is',$item['body'],$matches,PREG_SET_ORDER)) {
|
||||||
|
logger('matched');
|
||||||
|
foreach($matches as $mtch) {
|
||||||
|
$item['body'] = str_replace($mtch[0],'[url=' . zrl($mtch[1] . '/photos/' . $mtch[2] . '/image/' . $mtch[3] ,true) . '][img' . $mtch[4] . ']h' . $mtch[5] . '[/img][/url]',$item['body']);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
@ -496,7 +502,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
|
||||||
|
|
||||||
// On the network page, I am the owner. On the display page it will be the profile owner.
|
// On the network page, I am the owner. On the display page it will be the profile owner.
|
||||||
// This will have been stored in $a->page_contact by our calling page.
|
// This will have been stored in $a->page_contact by our calling page.
|
||||||
// Put this person on the left of the wall-to-wall notice.
|
// Put this person as the wall owner of the wall-to-wall notice.
|
||||||
|
|
||||||
$owner_url = zrl($a->page_contact['url']);
|
$owner_url = zrl($a->page_contact['url']);
|
||||||
$owner_photo = $a->page_contact['thumb'];
|
$owner_photo = $a->page_contact['thumb'];
|
||||||
|
|
@ -504,23 +510,38 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
|
||||||
$template = $wallwall;
|
$template = $wallwall;
|
||||||
$commentww = 'ww';
|
$commentww = 'ww';
|
||||||
}
|
}
|
||||||
if((! $item['wall']) && (strlen($item['owner-link'])) && (! link_compare($item['owner-link'],$item['author-link']))) {
|
|
||||||
|
|
||||||
// Could be anybody.
|
if((! $item['wall']) && $item['owner-link']) {
|
||||||
|
|
||||||
$owner_url = $item['owner-link'];
|
$owner_linkmatch = (($item['owner-link']) && link_compare($item['owner-link'],$item['author-link']));
|
||||||
$owner_photo = $item['owner-avatar'];
|
$alias_linkmatch = (($item['alias']) && link_compare($item['alias'],$item['author-link']));
|
||||||
$owner_name = $item['owner-name'];
|
$owner_namematch = (($item['owner-name']) && $item['owner-name'] == $item['author-name']);
|
||||||
$template = $wallwall;
|
if((! $owner_linkmatch) && (! $alias_linkmatch) && (! $owner_namematch)) {
|
||||||
$commentww = 'ww';
|
|
||||||
// If it is our contact, use a friendly redirect link
|
// The author url doesn't match the owner (typically the contact)
|
||||||
if((link_compare($item['owner-link'],$item['url']))
|
// and also doesn't match the contact alias.
|
||||||
&& ($item['network'] === NETWORK_DFRN)) {
|
// The name match is a hack to catch several weird cases where URLs are
|
||||||
$owner_url = $redirect_url;
|
// all over the park. It can be tricked, but this prevents you from
|
||||||
$osparkle = ' sparkle';
|
// seeing "Bob Smith to Bob Smith via Wall-to-wall" and you know darn
|
||||||
|
// well that it's the same Bob Smith.
|
||||||
|
|
||||||
|
// But it could be somebody else with the same name. It just isn't highly likely.
|
||||||
|
|
||||||
|
|
||||||
|
$owner_url = $item['owner-link'];
|
||||||
|
$owner_photo = $item['owner-avatar'];
|
||||||
|
$owner_name = $item['owner-name'];
|
||||||
|
$template = $wallwall;
|
||||||
|
$commentww = 'ww';
|
||||||
|
// If it is our contact, use a friendly redirect link
|
||||||
|
if((link_compare($item['owner-link'],$item['url']))
|
||||||
|
&& ($item['network'] === NETWORK_DFRN)) {
|
||||||
|
$owner_url = $redirect_url;
|
||||||
|
$osparkle = ' sparkle';
|
||||||
|
}
|
||||||
|
else
|
||||||
|
$owner_url = zrl($owner_url);
|
||||||
}
|
}
|
||||||
else
|
|
||||||
$owner_url = zrl($owner_url);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -244,7 +244,7 @@ function timesel($pre,$h,$m) {
|
||||||
// Limited to range of timestamps
|
// Limited to range of timestamps
|
||||||
|
|
||||||
if(! function_exists('relative_date')) {
|
if(! function_exists('relative_date')) {
|
||||||
function relative_date($posted_date) {
|
function relative_date($posted_date,$format = null) {
|
||||||
|
|
||||||
$localtime = datetime_convert('UTC',date_default_timezone_get(),$posted_date);
|
$localtime = datetime_convert('UTC',date_default_timezone_get(),$posted_date);
|
||||||
|
|
||||||
|
|
@ -274,7 +274,9 @@ function relative_date($posted_date) {
|
||||||
if ($d >= 1) {
|
if ($d >= 1) {
|
||||||
$r = round($d);
|
$r = round($d);
|
||||||
// translators - e.g. 22 hours ago, 1 minute ago
|
// translators - e.g. 22 hours ago, 1 minute ago
|
||||||
return sprintf( t('%1$d %2$s ago'),$r, (($r == 1) ? $str[0] : $str[1]));
|
if(! $format)
|
||||||
|
$format = t('%1$d %2$s ago');
|
||||||
|
return sprintf( $format,$r, (($r == 1) ? $str[0] : $str[1]));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}}
|
}}
|
||||||
|
|
|
||||||
|
|
@ -113,6 +113,7 @@ function delivery_run($argv, $argc){
|
||||||
$uid = $r[0]['uid'];
|
$uid = $r[0]['uid'];
|
||||||
$updated = $r[0]['edited'];
|
$updated = $r[0]['edited'];
|
||||||
|
|
||||||
|
// The following seems superfluous. We've already checked for "if (! intval($r[0]['parent']))" a few lines up
|
||||||
if(! $parent_id)
|
if(! $parent_id)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
|
@ -508,17 +509,17 @@ function delivery_run($argv, $argc){
|
||||||
// unsupported
|
// unsupported
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
elseif(($target_item['deleted']) && ($target_item['verb'] !== ACTIVITY_LIKE)) {
|
elseif(($target_item['deleted']) && ($target_item['uri'] === $target_item['parent-uri'])) {
|
||||||
logger('delivery: diaspora retract: ' . $loc);
|
// top-level retraction
|
||||||
// diaspora delete,
|
logger('delivery: diaspora retract: ' . $loc);
|
||||||
|
|
||||||
diaspora_send_retraction($target_item,$owner,$contact,$public_message);
|
diaspora_send_retraction($target_item,$owner,$contact,$public_message);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
elseif($target_item['parent'] != $target_item['id']) {
|
elseif($target_item['uri'] !== $target_item['parent-uri']) {
|
||||||
|
// we are the relay - send comments, likes and relayable_retractions to our conversants
|
||||||
|
logger('delivery: diaspora relay: ' . $loc);
|
||||||
|
|
||||||
logger('delivery: diaspora relay: ' . $loc);
|
|
||||||
|
|
||||||
// we are the relay - send comments, likes and unlikes to our conversants
|
|
||||||
diaspora_send_relay($target_item,$owner,$contact,$public_message);
|
diaspora_send_relay($target_item,$owner,$contact,$public_message);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
209
include/diaspora.php
Normal file → Executable file
209
include/diaspora.php
Normal file → Executable file
|
|
@ -83,6 +83,9 @@ function diaspora_dispatch($importer,$msg) {
|
||||||
elseif($xmlbase->signed_retraction) {
|
elseif($xmlbase->signed_retraction) {
|
||||||
$ret = diaspora_signed_retraction($importer,$xmlbase->signed_retraction,$msg);
|
$ret = diaspora_signed_retraction($importer,$xmlbase->signed_retraction,$msg);
|
||||||
}
|
}
|
||||||
|
elseif($xmlbase->relayable_retraction) {
|
||||||
|
$ret = diaspora_signed_retraction($importer,$xmlbase->relayable_retraction,$msg);
|
||||||
|
}
|
||||||
elseif($xmlbase->photo) {
|
elseif($xmlbase->photo) {
|
||||||
$ret = diaspora_photo($importer,$xmlbase->photo,$msg);
|
$ret = diaspora_photo($importer,$xmlbase->photo,$msg);
|
||||||
}
|
}
|
||||||
|
|
@ -677,7 +680,7 @@ function diaspora_post($importer,$xml) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// allocate a guid on our system - we aren't fixing any collisions.
|
// allocate a guid on our system - we aren't fixing any collisions.
|
||||||
// we're ignoring them
|
// we're ignoring them
|
||||||
|
|
||||||
$g = q("select * from guid where guid = '%s' limit 1",
|
$g = q("select * from guid where guid = '%s' limit 1",
|
||||||
|
|
@ -844,7 +847,7 @@ function diaspora_reshare($importer,$xml) {
|
||||||
$prefix = '♲ ' . $details . "\n";
|
$prefix = '♲ ' . $details . "\n";
|
||||||
|
|
||||||
|
|
||||||
// allocate a guid on our system - we aren't fixing any collisions.
|
// allocate a guid on our system - we aren't fixing any collisions.
|
||||||
// we're ignoring them
|
// we're ignoring them
|
||||||
|
|
||||||
$g = q("select * from guid where guid = '%s' limit 1",
|
$g = q("select * from guid where guid = '%s' limit 1",
|
||||||
|
|
@ -948,7 +951,7 @@ function diaspora_asphoto($importer,$xml) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// allocate a guid on our system - we aren't fixing any collisions.
|
// allocate a guid on our system - we aren't fixing any collisions.
|
||||||
// we're ignoring them
|
// we're ignoring them
|
||||||
|
|
||||||
$g = q("select * from guid where guid = '%s' limit 1",
|
$g = q("select * from guid where guid = '%s' limit 1",
|
||||||
|
|
@ -1602,22 +1605,28 @@ function diaspora_like($importer,$xml,$msg) {
|
||||||
logger('diaspora_like: duplicate like: ' . $guid);
|
logger('diaspora_like: duplicate like: ' . $guid);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
// Note: I don't think "Like" objects with positive = "false" are ever actually used
|
||||||
|
// It looks like "RelayableRetractions" are used for "unlike" instead
|
||||||
if($positive === 'false') {
|
if($positive === 'false') {
|
||||||
q("UPDATE `item` SET `deleted` = 1 WHERE `id` = %d AND `uid` = %d LIMIT 1",
|
logger('diaspora_like: received a like with positive set to "false"...ignoring');
|
||||||
|
/* q("UPDATE `item` SET `deleted` = 1 WHERE `id` = %d AND `uid` = %d LIMIT 1",
|
||||||
intval($r[0]['id']),
|
intval($r[0]['id']),
|
||||||
intval($importer['uid'])
|
intval($importer['uid'])
|
||||||
);
|
);*/
|
||||||
// FIXME
|
// FIXME
|
||||||
// send notification via proc_run()
|
// send notification via proc_run()
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// Note: I don't think "Like" objects with positive = "false" are ever actually used
|
||||||
|
// It looks like "RelayableRetractions" are used for "unlike" instead
|
||||||
if($positive === 'false') {
|
if($positive === 'false') {
|
||||||
logger('diaspora_like: unlike received with no corresponding like');
|
logger('diaspora_like: received a like with positive set to "false"');
|
||||||
|
logger('diaspora_like: unlike received with no corresponding like...ignoring');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$author_signed_data = $guid . ';' . $target_type . ';' . $parent_guid . ';' . $positive . ';' . $diaspora_handle;
|
$signed_data = $guid . ';' . $target_type . ';' . $parent_guid . ';' . $positive . ';' . $diaspora_handle;
|
||||||
|
|
||||||
$author_signature = base64_decode($author_signature);
|
$author_signature = base64_decode($author_signature);
|
||||||
|
|
||||||
|
|
@ -1635,20 +1644,20 @@ function diaspora_like($importer,$xml,$msg) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(! rsa_verify($author_signed_data,$author_signature,$key,'sha256')) {
|
if(! rsa_verify($signed_data,$author_signature,$key,'sha256')) {
|
||||||
logger('diaspora_like: verification failed.');
|
logger('diaspora_like: verification failed.');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if($parent_author_signature) {
|
if($parent_author_signature) {
|
||||||
|
|
||||||
$owner_signed_data = $guid . ';' . $target_type . ';' . $parent_guid . ';' . $positive . ';' . $diaspora_handle;
|
//$owner_signed_data = $guid . ';' . $target_type . ';' . $parent_guid . ';' . $positive . ';' . $diaspora_handle;
|
||||||
|
|
||||||
$parent_author_signature = base64_decode($parent_author_signature);
|
$parent_author_signature = base64_decode($parent_author_signature);
|
||||||
|
|
||||||
$key = $msg['key'];
|
$key = $msg['key'];
|
||||||
|
|
||||||
if(! rsa_verify($owner_signed_data,$parent_author_signature,$key,'sha256')) {
|
if(! rsa_verify($signed_data,$parent_author_signature,$key,'sha256')) {
|
||||||
logger('diaspora_like: owner verification failed.');
|
logger('diaspora_like: owner verification failed.');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
@ -1783,38 +1792,89 @@ function diaspora_signed_retraction($importer,$xml,$msg) {
|
||||||
$type = notags(unxmlify($xml->target_type));
|
$type = notags(unxmlify($xml->target_type));
|
||||||
$sig = notags(unxmlify($xml->target_author_signature));
|
$sig = notags(unxmlify($xml->target_author_signature));
|
||||||
|
|
||||||
|
$parent_author_signature = (($xml->parent_author_signature) ? notags(unxmlify($xml->parent_author_signature)) : '');
|
||||||
|
|
||||||
$contact = diaspora_get_contact_by_handle($importer['uid'],$diaspora_handle);
|
$contact = diaspora_get_contact_by_handle($importer['uid'],$diaspora_handle);
|
||||||
if(! $contact) {
|
if(! $contact) {
|
||||||
logger('diaspora_signed_retraction: no contact');
|
logger('diaspora_signed_retraction: no contact');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// this may not yet work for comments. Need to see how the relaying works
|
|
||||||
// and figure out who signs it.
|
|
||||||
|
|
||||||
|
|
||||||
$signed_data = $guid . ';' . $type ;
|
$signed_data = $guid . ';' . $type ;
|
||||||
|
|
||||||
$sig = base64_decode($sig);
|
$sig_decode = base64_decode($sig);
|
||||||
|
|
||||||
$key = $msg['key'];
|
if(strcasecmp($diaspora_handle,$msg['author']) == 0) {
|
||||||
|
$person = $contact;
|
||||||
|
$key = $msg['key'];
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
$person = find_diaspora_person_by_handle($diaspora_handle);
|
||||||
|
|
||||||
if(! rsa_verify($signed_data,$sig,$key,'sha256')) {
|
if(is_array($person) && x($person,'pubkey'))
|
||||||
logger('diaspora_signed_retraction: owner verification failed.' . print_r($msg,true));
|
$key = $person['pubkey'];
|
||||||
|
else {
|
||||||
|
logger('diaspora_signed_retraction: unable to find author details');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if(! rsa_verify($signed_data,$sig_decode,$key,'sha256')) {
|
||||||
|
logger('diaspora_signed_retraction: retraction-owner verification failed.' . print_r($msg,true));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if($type === 'StatusMessage') {
|
if($parent_author_signature) {
|
||||||
|
$parent_author_signature = base64_decode($parent_author_signature);
|
||||||
|
|
||||||
|
$key = $msg['key'];
|
||||||
|
|
||||||
|
if(! rsa_verify($signed_data,$parent_author_signature,$key,'sha256')) {
|
||||||
|
logger('diaspora_signed_retraction: failed to verify person relaying the retraction (e.g. owner of a post relaying a retracted comment');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
if($type === 'StatusMessage' || $type === 'Comment' || $type === 'Like') {
|
||||||
$r = q("select * from item where guid = '%s' and uid = %d and not file like '%%[%%' limit 1",
|
$r = q("select * from item where guid = '%s' and uid = %d and not file like '%%[%%' limit 1",
|
||||||
dbesc($guid),
|
dbesc($guid),
|
||||||
intval($importer['uid'])
|
intval($importer['uid'])
|
||||||
);
|
);
|
||||||
if(count($r)) {
|
if(count($r)) {
|
||||||
if(link_compare($r[0]['author-link'],$contact['url'])) {
|
if(link_compare($r[0]['author-link'],$contact['url'])) {
|
||||||
q("update item set `deleted` = 1, `changed` = '%s' where `id` = %d limit 1",
|
q("update item set `deleted` = 1, `edited` = '%s', `changed` = '%s', `body` = '' , `title` = '' where `id` = %d limit 1",
|
||||||
|
dbesc(datetime_convert()),
|
||||||
dbesc(datetime_convert()),
|
dbesc(datetime_convert()),
|
||||||
intval($r[0]['id'])
|
intval($r[0]['id'])
|
||||||
);
|
);
|
||||||
|
|
||||||
|
// Now check if the retraction needs to be relayed by us
|
||||||
|
//
|
||||||
|
// The first item in the `item` table with the parent id is the parent. However, MySQL doesn't always
|
||||||
|
// return the items ordered by `item`.`id`, in which case the wrong item is chosen as the parent.
|
||||||
|
// The only item with `parent` and `id` as the parent id is the parent item.
|
||||||
|
$p = q("select origin from item where parent = %d and id = %d limit 1",
|
||||||
|
$r[0]['parent'],
|
||||||
|
$r[0]['parent']
|
||||||
|
);
|
||||||
|
if(count($p)) {
|
||||||
|
if(($p[0]['origin']) && (! $parent_author_signature)) {
|
||||||
|
q("insert into sign (`retract_iid`,`signed_text`,`signature`,`signer`) values (%d,'%s','%s','%s') ",
|
||||||
|
$r[0]['id'],
|
||||||
|
dbesc($signed_data),
|
||||||
|
dbesc($sig),
|
||||||
|
dbesc($diaspora_handle)
|
||||||
|
);
|
||||||
|
|
||||||
|
// the existence of parent_author_signature would have meant the parent_author or owner
|
||||||
|
// is already relaying.
|
||||||
|
logger('diaspora_signed_retraction: relaying relayable_retraction');
|
||||||
|
|
||||||
|
proc_run('php','include/notifier.php','relayable_retraction',$r[0]['id']);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -2055,8 +2115,12 @@ function diaspora_send_followup($item,$owner,$contact,$public_batch = false) {
|
||||||
$myaddr = $owner['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3);
|
$myaddr = $owner['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3);
|
||||||
$theiraddr = $contact['addr'];
|
$theiraddr = $contact['addr'];
|
||||||
|
|
||||||
$p = q("select guid from item where parent = %d limit 1",
|
// The first item in the `item` table with the parent id is the parent. However, MySQL doesn't always
|
||||||
$item['parent']
|
// return the items ordered by `item`.`id`, in which case the wrong item is chosen as the parent.
|
||||||
|
// The only item with `parent` and `id` as the parent id is the parent item.
|
||||||
|
$p = q("select guid from item where parent = %d and id = %d limit 1",
|
||||||
|
intval($item['parent']),
|
||||||
|
intval($item['parent'])
|
||||||
);
|
);
|
||||||
if(count($p))
|
if(count($p))
|
||||||
$parent_guid = $p[0]['guid'];
|
$parent_guid = $p[0]['guid'];
|
||||||
|
|
@ -2067,7 +2131,11 @@ function diaspora_send_followup($item,$owner,$contact,$public_batch = false) {
|
||||||
$tpl = get_markup_template('diaspora_like.tpl');
|
$tpl = get_markup_template('diaspora_like.tpl');
|
||||||
$like = true;
|
$like = true;
|
||||||
$target_type = 'Post';
|
$target_type = 'Post';
|
||||||
$positive = (($item['deleted']) ? 'false' : 'true');
|
// $positive = (($item['deleted']) ? 'false' : 'true');
|
||||||
|
$positive = 'true';
|
||||||
|
|
||||||
|
if(($item['deleted']))
|
||||||
|
logger('diaspora_send_followup: received deleted "like". Those should go to diaspora_send_retraction');
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$tpl = get_markup_template('diaspora_comment.tpl');
|
$tpl = get_markup_template('diaspora_comment.tpl');
|
||||||
|
|
@ -2107,41 +2175,51 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) {
|
||||||
|
|
||||||
|
|
||||||
$a = get_app();
|
$a = get_app();
|
||||||
$myaddr = $owner['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3);
|
$myaddr = $owner['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3);
|
||||||
$theiraddr = $contact['addr'];
|
$theiraddr = $contact['addr'];
|
||||||
|
|
||||||
|
|
||||||
$p = q("select guid from item where parent = %d limit 1",
|
// The first item in the `item` table with the parent id is the parent. However, MySQL doesn't always
|
||||||
$item['parent']
|
// return the items ordered by `item`.`id`, in which case the wrong item is chosen as the parent.
|
||||||
|
// The only item with `parent` and `id` as the parent id is the parent item.
|
||||||
|
$p = q("select guid from item where parent = %d and id = %d limit 1",
|
||||||
|
intval($item['parent']),
|
||||||
|
intval($item['parent'])
|
||||||
);
|
);
|
||||||
if(count($p))
|
if(count($p))
|
||||||
$parent_guid = $p[0]['guid'];
|
$parent_guid = $p[0]['guid'];
|
||||||
else
|
else
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if($item['verb'] === ACTIVITY_LIKE) {
|
$like = false;
|
||||||
|
$relay_retract = false;
|
||||||
|
$sql_sign_id = 'iid';
|
||||||
|
if( $item['deleted']) {
|
||||||
|
$tpl = get_markup_template('diaspora_relayable_retraction.tpl');
|
||||||
|
$relay_retract = true;
|
||||||
|
$sql_sign_id = 'retract_iid';
|
||||||
|
$target_type = ( ($item['verb'] === ACTIVITY_LIKE) ? 'Like' : 'Comment');
|
||||||
|
}
|
||||||
|
elseif($item['verb'] === ACTIVITY_LIKE) {
|
||||||
$tpl = get_markup_template('diaspora_like_relay.tpl');
|
$tpl = get_markup_template('diaspora_like_relay.tpl');
|
||||||
$like = true;
|
$like = true;
|
||||||
$target_type = 'Post';
|
$target_type = 'Post';
|
||||||
$positive = (($item['deleted']) ? 'false' : 'true');
|
// $positive = (($item['deleted']) ? 'false' : 'true');
|
||||||
|
$positive = 'true';
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$tpl = get_markup_template('diaspora_comment_relay.tpl');
|
$tpl = get_markup_template('diaspora_comment_relay.tpl');
|
||||||
$like = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$body = $item['body'];
|
$body = $item['body'];
|
||||||
|
|
||||||
$text = html_entity_decode(bb2diaspora($body));
|
$text = html_entity_decode(bb2diaspora($body));
|
||||||
|
|
||||||
// fetch the original signature if somebody sent the post to us to relay
|
|
||||||
// If we are relaying for a reply originating on our own account, there wasn't a 'send to relay'
|
|
||||||
// action. It wasn't needed. In that case create the original signature and the
|
|
||||||
// owner (parent author) signature
|
|
||||||
// comments from other networks will be relayed under our name, with a brief
|
|
||||||
// preamble to describe what's happening and noting the real author
|
|
||||||
|
|
||||||
$r = q("select * from sign where iid = %d limit 1",
|
// fetch the original signature if the relayable was created by a Diaspora
|
||||||
|
// or DFRN user. Relayables for other networks are not supported.
|
||||||
|
|
||||||
|
$r = q("select * from sign where " . $sql_sign_id . " = %d limit 1",
|
||||||
intval($item['id'])
|
intval($item['id'])
|
||||||
);
|
);
|
||||||
if(count($r)) {
|
if(count($r)) {
|
||||||
|
|
@ -2152,6 +2230,12 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) {
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
|
||||||
|
// Author signature information (for likes, comments, and retractions of likes or comments,
|
||||||
|
// whether from Diaspora or Friendica) must be placed in the `sign` table before this
|
||||||
|
// function is called
|
||||||
|
logger('diaspora_send_relay: original author signature not found, cannot send relayable');
|
||||||
|
return;
|
||||||
|
/*
|
||||||
$itemcontact = q("select * from contact where `id` = %d limit 1",
|
$itemcontact = q("select * from contact where `id` = %d limit 1",
|
||||||
intval($item['contact-id'])
|
intval($item['contact-id'])
|
||||||
);
|
);
|
||||||
|
|
@ -2160,29 +2244,40 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) {
|
||||||
$prefix = sprintf( t('[Relayed] Comment authored by %s from network %s'),
|
$prefix = sprintf( t('[Relayed] Comment authored by %s from network %s'),
|
||||||
'['. $item['author-name'] . ']' . '(' . $item['author-link'] . ')',
|
'['. $item['author-name'] . ']' . '(' . $item['author-link'] . ')',
|
||||||
network_to_name($itemcontact['network'])) . "\n";
|
network_to_name($itemcontact['network'])) . "\n";
|
||||||
|
// "$body" was assigned to "$text" above. It isn't used after that, so I don't think
|
||||||
|
// the following change will do anything
|
||||||
$body = $prefix . $body;
|
$body = $prefix . $body;
|
||||||
|
|
||||||
|
// I think this comment will fail upon reaching Diaspora, because "$signed_text" is not defined
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
// I'm confused about this "else." Since it sets "$handle = $myaddr," it seems like it should be for the case
|
||||||
|
// where the top-level post owner commented on his own post, i.e. "$itemcontact[0]['self']" is true. But it's
|
||||||
|
// positioned to be for the case where "count($itemcontact)" is 0.
|
||||||
|
|
||||||
|
$handle = $myaddr;
|
||||||
|
|
||||||
if($like)
|
if($like)
|
||||||
$signed_text = $item['guid'] . ';' . $target_type . ';' . $parent_guid . ';' . $positive . ';' . $myaddr;
|
$signed_text = $item['guid'] . ';' . $target_type . ';' . $parent_guid . ';' . $positive . ';' . $handle;
|
||||||
|
elseif($relay_retract)
|
||||||
|
$signed_text = $item['guid'] . ';' . $target_type;
|
||||||
else
|
else
|
||||||
$signed_text = $item['guid'] . ';' . $parent_guid . ';' . $text . ';' . $myaddr;
|
$signed_text = $item['guid'] . ';' . $parent_guid . ';' . $text . ';' . $handle;
|
||||||
|
|
||||||
$authorsig = base64_encode(rsa_sign($signed_text,$owner['uprvkey'],'sha256'));
|
$authorsig = base64_encode(rsa_sign($signed_text,$owner['uprvkey'],'sha256'));
|
||||||
|
|
||||||
q("insert into sign (`iid`,`signed_text`,`signature`,`signer`) values (%d,'%s','%s','%s') ",
|
q("insert into sign (`" . $sql_sign_id . "`,`signed_text`,`signature`,`signer`) values (%d,'%s','%s','%s') ",
|
||||||
intval($item['id']),
|
intval($item['id']),
|
||||||
dbesc($signed_text),
|
dbesc($signed_text),
|
||||||
dbesc(base64_encode($authorsig)),
|
dbesc($authorsig),
|
||||||
dbesc($myaddr)
|
dbesc($handle)
|
||||||
);
|
);
|
||||||
$handle = $myaddr;
|
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
}
|
}
|
||||||
|
|
||||||
// sign it
|
// sign it with the top-level owner's signature
|
||||||
|
|
||||||
$parentauthorsig = base64_encode(rsa_sign($signed_text,$owner['uprvkey'],'sha256'));
|
$parentauthorsig = base64_encode(rsa_sign($signed_text,$owner['uprvkey'],'sha256'));
|
||||||
|
|
||||||
|
|
@ -2190,14 +2285,15 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) {
|
||||||
'$guid' => xmlify($item['guid']),
|
'$guid' => xmlify($item['guid']),
|
||||||
'$parent_guid' => xmlify($parent_guid),
|
'$parent_guid' => xmlify($parent_guid),
|
||||||
'$target_type' =>xmlify($target_type),
|
'$target_type' =>xmlify($target_type),
|
||||||
'$authorsig' => xmlify($orig_sign['signature']),
|
'$authorsig' => xmlify($authorsig),
|
||||||
'$parentsig' => xmlify($parentauthorsig),
|
'$parentsig' => xmlify($parentauthorsig),
|
||||||
'$body' => xmlify($text),
|
'$body' => xmlify($text),
|
||||||
'$positive' => xmlify($positive),
|
'$positive' => xmlify($positive),
|
||||||
'$handle' => xmlify($handle)
|
'$handle' => xmlify($handle)
|
||||||
));
|
));
|
||||||
|
|
||||||
logger('diaspora_relay_comment: base message: ' . $msg, LOGGER_DATA);
|
logger('diaspora_send_relay: base message: ' . $msg, LOGGER_DATA);
|
||||||
|
|
||||||
|
|
||||||
$slap = 'xml=' . urlencode(urlencode(diaspora_msg_build($msg,$owner,$contact,$owner['uprvkey'],$contact['pubkey'],$public_batch)));
|
$slap = 'xml=' . urlencode(urlencode(diaspora_msg_build($msg,$owner,$contact,$owner['uprvkey'],$contact['pubkey'],$public_batch)));
|
||||||
|
|
||||||
|
|
@ -2212,14 +2308,25 @@ function diaspora_send_retraction($item,$owner,$contact,$public_batch = false) {
|
||||||
$a = get_app();
|
$a = get_app();
|
||||||
$myaddr = $owner['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3);
|
$myaddr = $owner['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3);
|
||||||
|
|
||||||
$signed_text = $item['guid'] . ';' . 'StatusMessage';
|
// Check whether the retraction is for a top-level post or whether it's a relayable
|
||||||
|
if( $item['uri'] !== $item['parent-uri'] ) {
|
||||||
|
|
||||||
|
$tpl = get_markup_template('diaspora_relay_retraction.tpl');
|
||||||
|
$target_type = (($item['verb'] === ACTIVITY_LIKE) ? 'Like' : 'Comment');
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
|
||||||
|
$tpl = get_markup_template('diaspora_signed_retract.tpl');
|
||||||
|
$target_type = 'StatusMessage';
|
||||||
|
}
|
||||||
|
|
||||||
|
$signed_text = $item['guid'] . ';' . $target_type;
|
||||||
|
|
||||||
$tpl = get_markup_template('diaspora_signed_retract.tpl');
|
|
||||||
$msg = replace_macros($tpl, array(
|
$msg = replace_macros($tpl, array(
|
||||||
'$guid' => $item['guid'],
|
'$guid' => xmlify($item['guid']),
|
||||||
'$type' => 'StatusMessage',
|
'$type' => xmlify($target_type),
|
||||||
'$handle' => $myaddr,
|
'$handle' => xmlify($myaddr),
|
||||||
'$signature' => base64_encode(rsa_sign($signed_text,$owner['uprvkey'],'sha256'))
|
'$signature' => xmlify(base64_encode(rsa_sign($signed_text,$owner['uprvkey'],'sha256')))
|
||||||
));
|
));
|
||||||
|
|
||||||
$slap = 'xml=' . urlencode(urlencode(diaspora_msg_build($msg,$owner,$contact,$owner['uprvkey'],$contact['pubkey'],$public_batch)));
|
$slap = 'xml=' . urlencode(urlencode(diaspora_msg_build($msg,$owner,$contact,$owner['uprvkey'],$contact['pubkey'],$public_batch)));
|
||||||
|
|
@ -2343,3 +2450,5 @@ function diaspora_transmit($owner,$contact,$slap,$public_batch) {
|
||||||
|
|
||||||
return(($return_code) ? $return_code : (-1));
|
return(($return_code) ? $return_code : (-1));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -20,6 +20,9 @@ function notification($params) {
|
||||||
|
|
||||||
$sender_name = $product;
|
$sender_name = $product;
|
||||||
$hostname = $a->get_hostname();
|
$hostname = $a->get_hostname();
|
||||||
|
if(strpos($hostname,':'))
|
||||||
|
$hostname = substr($hostname,0,strpos($hostname,':'));
|
||||||
|
|
||||||
$sender_email = t('noreply') . '@' . $hostname;
|
$sender_email = t('noreply') . '@' . $hostname;
|
||||||
$additional_mail_header = "";
|
$additional_mail_header = "";
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -42,7 +42,7 @@ function format_event_html($ev) {
|
||||||
return $o;
|
return $o;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
function parse_event($h) {
|
function parse_event($h) {
|
||||||
|
|
||||||
require_once('include/Scrape.php');
|
require_once('include/Scrape.php');
|
||||||
|
|
@ -108,7 +108,7 @@ function parse_event($h) {
|
||||||
|
|
||||||
return $ret;
|
return $ret;
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
function format_event_bbcode($ev) {
|
function format_event_bbcode($ev) {
|
||||||
|
|
||||||
|
|
@ -162,7 +162,6 @@ function bbtoevent($s) {
|
||||||
$match = '';
|
$match = '';
|
||||||
if(preg_match("/\[event\-adjust\](.*?)\[\/event\-adjust\]/is",$s,$match))
|
if(preg_match("/\[event\-adjust\](.*?)\[\/event\-adjust\]/is",$s,$match))
|
||||||
$ev['adjust'] = $match[1];
|
$ev['adjust'] = $match[1];
|
||||||
$match = '';
|
|
||||||
$ev['nofinish'] = (((x($ev, 'start') && $ev['start']) && (!x($ev, 'finish') || !$ev['finish'])) ? 1 : 0);
|
$ev['nofinish'] = (((x($ev, 'start') && $ev['start']) && (!x($ev, 'finish') || !$ev['finish'])) ? 1 : 0);
|
||||||
return $ev;
|
return $ev;
|
||||||
|
|
||||||
|
|
@ -294,10 +293,14 @@ function event_store($arr) {
|
||||||
intval($arr['uid'])
|
intval($arr['uid'])
|
||||||
);
|
);
|
||||||
|
|
||||||
return $r[0]['id'];
|
$item_id = $r[0]['id'];
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
return 0;
|
$item_id = 0;
|
||||||
|
|
||||||
|
call_hooks("event_updated", $arr['id']);
|
||||||
|
|
||||||
|
return $item_id;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
|
||||||
|
|
@ -361,7 +364,7 @@ function event_store($arr) {
|
||||||
$item_arr['body'] = format_event_bbcode($event);
|
$item_arr['body'] = format_event_bbcode($event);
|
||||||
|
|
||||||
|
|
||||||
$item_arr['object'] = '<object><type>' . xmlify(ACTIVITY_OBJ_EVENT) . '</type><title></title><id>' . xmlify($uri) . '</id>';
|
$item_arr['object'] = '<object><type>' . xmlify(ACTIVITY_OBJ_EVENT) . '</type><title></title><id>' . xmlify($arr['uri']) . '</id>';
|
||||||
$item_arr['object'] .= '<content>' . xmlify(format_event_bbcode($event)) . '</content>';
|
$item_arr['object'] .= '<content>' . xmlify(format_event_bbcode($event)) . '</content>';
|
||||||
$item_arr['object'] .= '</object>' . "\n";
|
$item_arr['object'] .= '</object>' . "\n";
|
||||||
|
|
||||||
|
|
@ -383,6 +386,8 @@ function event_store($arr) {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
call_hooks("event_created", $event['id']);
|
||||||
|
|
||||||
return $item_id;
|
return $item_id;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
243
include/follow.php
Normal file
243
include/follow.php
Normal file
|
|
@ -0,0 +1,243 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
|
||||||
|
//
|
||||||
|
// Takes a $uid and a url/handle and adds a new contact
|
||||||
|
// Currently if the contact is DFRN, interactive needs to be true, to redirect to the
|
||||||
|
// dfrn_request page.
|
||||||
|
|
||||||
|
// Otherwise this can be used to bulk add statusnet contacts, twitter contacts, etc.
|
||||||
|
// Returns an array
|
||||||
|
// $return['success'] boolean true if successful
|
||||||
|
// $return['message'] error text if success is false.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
function new_contact($uid,$url,$interactive = false) {
|
||||||
|
|
||||||
|
$result = array('success' => false,'message' => '');
|
||||||
|
|
||||||
|
$a = get_app();
|
||||||
|
|
||||||
|
// remove ajax junk, e.g. Twitter
|
||||||
|
|
||||||
|
$url = str_replace('/#!/','/',$url);
|
||||||
|
|
||||||
|
if(! allowed_url($url)) {
|
||||||
|
$result['message'] = t('Disallowed profile URL.');
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(! $url) {
|
||||||
|
$result['message'] = t('Connect URL missing.');
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
|
|
||||||
|
$arr = array('url' => $url, 'contact' => array());
|
||||||
|
|
||||||
|
call_hooks('follow', $arr);
|
||||||
|
|
||||||
|
if(x($arr['contact'],'name'))
|
||||||
|
$ret = $arr['contact'];
|
||||||
|
else
|
||||||
|
$ret = probe_url($url);
|
||||||
|
|
||||||
|
if($ret['network'] === NETWORK_DFRN) {
|
||||||
|
if($interactive) {
|
||||||
|
if(strlen($a->path))
|
||||||
|
$myaddr = bin2hex($a->get_baseurl() . '/profile/' . $a->user['nickname']);
|
||||||
|
else
|
||||||
|
$myaddr = bin2hex($a->user['nickname'] . '@' . $a->get_hostname());
|
||||||
|
|
||||||
|
goaway($ret['request'] . "&addr=$myaddr");
|
||||||
|
|
||||||
|
// NOTREACHED
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
if(get_config('system','dfrn_only')) {
|
||||||
|
$result['message'] = t('This site is not configured to allow communications with other networks.') . EOL;
|
||||||
|
$result['message'] != t('No compatible communication protocols or feeds were discovered.') . EOL;
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// This extra param just confuses things, remove it
|
||||||
|
if($ret['network'] === NETWORK_DIASPORA)
|
||||||
|
$ret['url'] = str_replace('?absolute=true','',$ret['url']);
|
||||||
|
|
||||||
|
|
||||||
|
// do we have enough information?
|
||||||
|
|
||||||
|
if(! ((x($ret,'name')) && (x($ret,'poll')) && ((x($ret,'url')) || (x($ret,'addr'))))) {
|
||||||
|
$result['message'] .= t('The profile address specified does not provide adequate information.') . EOL;
|
||||||
|
if(! x($ret,'poll'))
|
||||||
|
$result['message'] .= t('No compatible communication protocols or feeds were discovered.') . EOL;
|
||||||
|
if(! x($ret,'name'))
|
||||||
|
$result['message'] .= t('An author or name was not found.') . EOL;
|
||||||
|
if(! x($ret,'url'))
|
||||||
|
$result['message'] .= t('No browser URL could be matched to this address.') . EOL;
|
||||||
|
if(strpos($url,'@') !== false) {
|
||||||
|
$result['message'] .= t('Unable to match @-style Identity Address with a known protocol or email contact.') . EOL;
|
||||||
|
$result['message'] .= t('Use mailto: in front of address to force email check.') . EOL;
|
||||||
|
}
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
|
|
||||||
|
if($ret['network'] === NETWORK_OSTATUS && get_config('system','ostatus_disabled')) {
|
||||||
|
$result['message'] .= t('The profile address specified belongs to a network which has been disabled on this site.') . EOL;
|
||||||
|
$ret['notify'] = '';
|
||||||
|
}
|
||||||
|
|
||||||
|
if(! $ret['notify']) {
|
||||||
|
$result['message'] .= t('Limited profile. This person will be unable to receive direct/personal notifications from you.') . EOL;
|
||||||
|
}
|
||||||
|
|
||||||
|
$writeable = ((($ret['network'] === NETWORK_OSTATUS) && ($ret['notify'])) ? 1 : 0);
|
||||||
|
$hidden = (($ret['network'] === NETWORK_MAIL) ? 1 : 0);
|
||||||
|
|
||||||
|
if($ret['network'] === NETWORK_MAIL) {
|
||||||
|
$writeable = 1;
|
||||||
|
|
||||||
|
}
|
||||||
|
if($ret['network'] === NETWORK_DIASPORA)
|
||||||
|
$writeable = 1;
|
||||||
|
|
||||||
|
// check if we already have a contact
|
||||||
|
// the poll url is more reliable than the profile url, as we may have
|
||||||
|
// indirect links or webfinger links
|
||||||
|
|
||||||
|
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `poll` = '%s' LIMIT 1",
|
||||||
|
intval($uid),
|
||||||
|
dbesc($ret['poll'])
|
||||||
|
);
|
||||||
|
|
||||||
|
|
||||||
|
if(count($r)) {
|
||||||
|
// update contact
|
||||||
|
if($r[0]['rel'] == CONTACT_IS_FOLLOWER || ($network === NETWORK_DIASPORA && $r[0]['rel'] == CONTACT_IS_SHARING)) {
|
||||||
|
q("UPDATE `contact` SET `rel` = %d , `readonly` = 0 WHERE `id` = %d AND `uid` = %d LIMIT 1",
|
||||||
|
intval(CONTACT_IS_FRIEND),
|
||||||
|
intval($r[0]['id']),
|
||||||
|
intval($uid)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
|
||||||
|
$new_relation = (($ret['network'] === NETWORK_MAIL) ? CONTACT_IS_FRIEND : CONTACT_IS_SHARING);
|
||||||
|
if($ret['network'] === NETWORK_DIASPORA)
|
||||||
|
$new_relation = CONTACT_IS_FOLLOWER;
|
||||||
|
|
||||||
|
// create contact record
|
||||||
|
$r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`, `addr`, `alias`, `batch`, `notify`, `poll`, `poco`, `name`, `nick`, `photo`, `network`, `pubkey`, `rel`, `priority`,
|
||||||
|
`writable`, `hidden`, `blocked`, `readonly`, `pending` )
|
||||||
|
VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, %d, 0, 0, 0 ) ",
|
||||||
|
intval($uid),
|
||||||
|
dbesc(datetime_convert()),
|
||||||
|
dbesc($ret['url']),
|
||||||
|
dbesc(normalise_link($ret['url'])),
|
||||||
|
dbesc($ret['addr']),
|
||||||
|
dbesc($ret['alias']),
|
||||||
|
dbesc($ret['batch']),
|
||||||
|
dbesc($ret['notify']),
|
||||||
|
dbesc($ret['poll']),
|
||||||
|
dbesc($ret['poco']),
|
||||||
|
dbesc($ret['name']),
|
||||||
|
dbesc($ret['nick']),
|
||||||
|
dbesc($ret['photo']),
|
||||||
|
dbesc($ret['network']),
|
||||||
|
dbesc($ret['pubkey']),
|
||||||
|
intval($new_relation),
|
||||||
|
intval($ret['priority']),
|
||||||
|
intval($writeable),
|
||||||
|
intval($hidden)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
$r = q("SELECT * FROM `contact` WHERE `url` = '%s' AND `uid` = %d LIMIT 1",
|
||||||
|
dbesc($ret['url']),
|
||||||
|
intval($uid)
|
||||||
|
);
|
||||||
|
|
||||||
|
if(! count($r)) {
|
||||||
|
$result['message'] .= t('Unable to retrieve contact information.') . EOL;
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
|
|
||||||
|
$contact = $r[0];
|
||||||
|
$contact_id = $r[0]['id'];
|
||||||
|
|
||||||
|
|
||||||
|
$g = q("select def_gid from user where uid = %d limit 1",
|
||||||
|
intval($uid)
|
||||||
|
);
|
||||||
|
if($g && intval($g[0]['def_gid'])) {
|
||||||
|
require_once('include/group.php');
|
||||||
|
group_add_member($uid,'',$contact_id,$g[0]['def_gid']);
|
||||||
|
}
|
||||||
|
|
||||||
|
require_once("Photo.php");
|
||||||
|
|
||||||
|
$photos = import_profile_photo($ret['photo'],$uid,$contact_id);
|
||||||
|
|
||||||
|
$r = q("UPDATE `contact` SET `photo` = '%s',
|
||||||
|
`thumb` = '%s',
|
||||||
|
`micro` = '%s',
|
||||||
|
`name-date` = '%s',
|
||||||
|
`uri-date` = '%s',
|
||||||
|
`avatar-date` = '%s'
|
||||||
|
WHERE `id` = %d LIMIT 1
|
||||||
|
",
|
||||||
|
dbesc($photos[0]),
|
||||||
|
dbesc($photos[1]),
|
||||||
|
dbesc($photos[2]),
|
||||||
|
dbesc(datetime_convert()),
|
||||||
|
dbesc(datetime_convert()),
|
||||||
|
dbesc(datetime_convert()),
|
||||||
|
intval($contact_id)
|
||||||
|
);
|
||||||
|
|
||||||
|
|
||||||
|
// pull feed and consume it, which should subscribe to the hub.
|
||||||
|
|
||||||
|
proc_run('php',"include/poller.php","$contact_id");
|
||||||
|
|
||||||
|
// create a follow slap
|
||||||
|
|
||||||
|
$tpl = get_markup_template('follow_slap.tpl');
|
||||||
|
$slap = replace_macros($tpl, array(
|
||||||
|
'$name' => $a->user['username'],
|
||||||
|
'$profile_page' => $a->get_baseurl() . '/profile/' . $a->user['nickname'],
|
||||||
|
'$photo' => $a->contact['photo'],
|
||||||
|
'$thumb' => $a->contact['thumb'],
|
||||||
|
'$published' => datetime_convert('UTC','UTC', 'now', ATOM_TIME),
|
||||||
|
'$item_id' => 'urn:X-dfrn:' . $a->get_hostname() . ':follow:' . random_string(),
|
||||||
|
'$title' => '',
|
||||||
|
'$type' => 'text',
|
||||||
|
'$content' => t('following'),
|
||||||
|
'$nick' => $a->user['nickname'],
|
||||||
|
'$verb' => ACTIVITY_FOLLOW,
|
||||||
|
'$ostat_follow' => ''
|
||||||
|
));
|
||||||
|
|
||||||
|
$r = q("SELECT `contact`.*, `user`.* FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
|
||||||
|
WHERE `user`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1",
|
||||||
|
intval($uid)
|
||||||
|
);
|
||||||
|
|
||||||
|
if(count($r)) {
|
||||||
|
if(($contact['network'] == NETWORK_OSTATUS) && (strlen($contact['notify']))) {
|
||||||
|
require_once('include/salmon.php');
|
||||||
|
slapper($r[0],$contact['notify'],$slap);
|
||||||
|
}
|
||||||
|
if($contact['network'] == NETWORK_DIASPORA) {
|
||||||
|
require_once('include/diaspora.php');
|
||||||
|
$ret = diaspora_share($a->user,$contact);
|
||||||
|
logger('mod_follow: diaspora_share returns: ' . $ret);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$result['success'] = true;
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
55
include/items.php
Normal file → Executable file
55
include/items.php
Normal file → Executable file
|
|
@ -180,6 +180,10 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0)
|
||||||
|
|
||||||
foreach($items as $item) {
|
foreach($items as $item) {
|
||||||
|
|
||||||
|
// prevent private email from leaking.
|
||||||
|
if($item['network'] === NETWORK_MAIL)
|
||||||
|
continue;
|
||||||
|
|
||||||
// public feeds get html, our own nodes use bbcode
|
// public feeds get html, our own nodes use bbcode
|
||||||
|
|
||||||
if($public_feed) {
|
if($public_feed) {
|
||||||
|
|
@ -1063,9 +1067,6 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
|
||||||
|
|
||||||
$a = get_app();
|
$a = get_app();
|
||||||
|
|
||||||
// if((! strlen($contact['issued-id'])) && (! $contact['duplex']) && (! ($owner['page-flags'] == PAGE_COMMUNITY)))
|
|
||||||
// return 3;
|
|
||||||
|
|
||||||
$idtosend = $orig_id = (($contact['dfrn-id']) ? $contact['dfrn-id'] : $contact['issued-id']);
|
$idtosend = $orig_id = (($contact['dfrn-id']) ? $contact['dfrn-id'] : $contact['issued-id']);
|
||||||
|
|
||||||
if($contact['duplex'] && $contact['dfrn-id'])
|
if($contact['duplex'] && $contact['dfrn-id'])
|
||||||
|
|
@ -1130,6 +1131,9 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
|
||||||
$rino_allowed = ((intval($res->rino) === 1) ? 1 : 0);
|
$rino_allowed = ((intval($res->rino) === 1) ? 1 : 0);
|
||||||
$page = (($owner['page-flags'] == PAGE_COMMUNITY) ? 1 : 0);
|
$page = (($owner['page-flags'] == PAGE_COMMUNITY) ? 1 : 0);
|
||||||
|
|
||||||
|
if($owner['page-flags'] == PAGE_PRVGROUP)
|
||||||
|
$page = 2;
|
||||||
|
|
||||||
$final_dfrn_id = '';
|
$final_dfrn_id = '';
|
||||||
|
|
||||||
if($perm) {
|
if($perm) {
|
||||||
|
|
@ -1183,7 +1187,7 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
|
||||||
$postvars['ssl_policy'] = $ssl_policy;
|
$postvars['ssl_policy'] = $ssl_policy;
|
||||||
|
|
||||||
if($page)
|
if($page)
|
||||||
$postvars['page'] = '1';
|
$postvars['page'] = $page;
|
||||||
|
|
||||||
if($rino && $rino_allowed && (! $dissolve)) {
|
if($rino && $rino_allowed && (! $dissolve)) {
|
||||||
$key = substr(random_string(),0,16);
|
$key = substr(random_string(),0,16);
|
||||||
|
|
@ -2931,10 +2935,10 @@ function fix_private_photos($s,$uid, $item = null, $cid = 0) {
|
||||||
$a = get_app();
|
$a = get_app();
|
||||||
|
|
||||||
logger('fix_private_photos', LOGGER_DEBUG);
|
logger('fix_private_photos', LOGGER_DEBUG);
|
||||||
$site = substr($a->get_baseurl(),strpos($a->get_baseurl,'://'));
|
$site = substr($a->get_baseurl(),strpos($a->get_baseurl(),'://'));
|
||||||
|
|
||||||
if(preg_match("/\[img\](.*?)\[\/img\]/is",$s,$matches)) {
|
if(preg_match("/\[img(.*?)\](.*?)\[\/img\]/is",$s,$matches)) {
|
||||||
$image = $matches[1];
|
$image = $matches[2];
|
||||||
logger('fix_private_photos: found photo ' . $image, LOGGER_DEBUG);
|
logger('fix_private_photos: found photo ' . $image, LOGGER_DEBUG);
|
||||||
if(stristr($image , $site . '/photo/')) {
|
if(stristr($image , $site . '/photo/')) {
|
||||||
$replace = false;
|
$replace = false;
|
||||||
|
|
@ -3274,7 +3278,42 @@ function drop_item($id,$interactive = true) {
|
||||||
q("UPDATE `item` SET `last-child` = 1 WHERE `id` = %d LIMIT 1",
|
q("UPDATE `item` SET `last-child` = 1 WHERE `id` = %d LIMIT 1",
|
||||||
intval($r[0]['id'])
|
intval($r[0]['id'])
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Add a relayable_retraction signature for Diaspora. Note that we can't add a target_author_signature
|
||||||
|
// if the comment was deleted by a remote user. That should be ok, because if a remote user is deleting
|
||||||
|
// the comment, that means we're the home of the post, and Diaspora will only
|
||||||
|
// check the parent_author_signature of retractions that it doesn't have to relay further
|
||||||
|
//
|
||||||
|
// I don't think this function gets called for an "unlike," but I'll check anyway
|
||||||
|
$signed_text = $item['guid'] . ';' . ( ($item['verb'] === ACTIVITY_LIKE) ? 'Like' : 'Comment');
|
||||||
|
|
||||||
|
if(local_user() == $item['uid']) {
|
||||||
|
|
||||||
|
$handle = $a->user['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3);
|
||||||
|
$authorsig = base64_encode(rsa_sign($signed_text,$a->user['prvkey'],'sha256'));
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
$r = q("SELECT `nick`, `url` FROM `contact` WHERE `id` = '%d' LIMIT 1",
|
||||||
|
$item['contact-id']
|
||||||
|
);
|
||||||
|
if(count($r)) {
|
||||||
|
// The below handle only works for NETWORK_DFRN. I think that's ok, because this function
|
||||||
|
// only handles DFRN deletes
|
||||||
|
$handle_baseurl_start = strpos($r['url'],'://') + 3;
|
||||||
|
$handle_baseurl_length = strpos($r['url'],'/profile') - $handle_baseurl_start;
|
||||||
|
$handle = $r['nick'] . '@' . substr($r['url'], $handle_baseurl_start, $handle_baseurl_length);
|
||||||
|
$authorsig = '';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if(isset($handle))
|
||||||
|
q("insert into sign (`retract_iid`,`signed_text`,`signature`,`signer`) values (%d,'%s','%s','%s') ",
|
||||||
|
intval($item['id']),
|
||||||
|
dbesc($signed_text),
|
||||||
|
dbesc($authorsig),
|
||||||
|
dbesc($handle)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
$drop_id = intval($item['id']);
|
$drop_id = intval($item['id']);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -117,7 +117,7 @@ function nav(&$a) {
|
||||||
|
|
||||||
/* only show friend requests for normal pages. Other page types have automatic friendship. */
|
/* only show friend requests for normal pages. Other page types have automatic friendship. */
|
||||||
|
|
||||||
if($_SESSION['page_flags'] == PAGE_NORMAL) {
|
if($_SESSION['page_flags'] == PAGE_NORMAL || $_SESSION['page_flags'] == PAGE_PRVGROUP) {
|
||||||
$nav['introductions'] = array('notifications/intros', t('Introductions'), "", t('Friend Requests'));
|
$nav['introductions'] = array('notifications/intros', t('Introductions'), "", t('Friend Requests'));
|
||||||
$nav['notifications'] = array('notifications', t('Notifications'), "", t('Notifications'));
|
$nav['notifications'] = array('notifications', t('Notifications'), "", t('Notifications'));
|
||||||
$nav['notifications']['all']=array('notifications/system', t('See all notifications'), "", "");
|
$nav['notifications']['all']=array('notifications/system', t('See all notifications'), "", "");
|
||||||
|
|
|
||||||
|
|
@ -125,6 +125,7 @@ function notifier_run($argv, $argc){
|
||||||
$uid = $r[0]['uid'];
|
$uid = $r[0]['uid'];
|
||||||
$updated = $r[0]['edited'];
|
$updated = $r[0]['edited'];
|
||||||
|
|
||||||
|
// The following seems superfluous. We've already checked for "if (! intval($r[0]['parent']))" a few lines up
|
||||||
if(! $parent_id)
|
if(! $parent_id)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
|
@ -596,7 +597,7 @@ function notifier_run($argv, $argc){
|
||||||
break;
|
break;
|
||||||
case NETWORK_OSTATUS:
|
case NETWORK_OSTATUS:
|
||||||
|
|
||||||
// Do not send to otatus if we are not configured to send to public networks
|
// Do not send to ostatus if we are not configured to send to public networks
|
||||||
if($owner['prvnets'])
|
if($owner['prvnets'])
|
||||||
break;
|
break;
|
||||||
if(get_config('system','ostatus_disabled') || get_config('system','dfrn_only'))
|
if(get_config('system','ostatus_disabled') || get_config('system','dfrn_only'))
|
||||||
|
|
@ -737,18 +738,19 @@ function notifier_run($argv, $argc){
|
||||||
// unsupported
|
// unsupported
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
elseif(($target_item['deleted']) && ($target_item['verb'] !== ACTIVITY_LIKE)) {
|
elseif(($target_item['deleted']) && (($target_item['uri'] === $target_item['parent-uri']) || $followup)) {
|
||||||
// diaspora delete,
|
// send both top-level retractions and relayable retractions for owner to relay
|
||||||
diaspora_send_retraction($target_item,$owner,$contact);
|
diaspora_send_retraction($target_item,$owner,$contact);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
elseif($followup) {
|
elseif($followup) {
|
||||||
// send comments, likes and retractions of likes to owner to relay
|
// send comments and likes to owner to relay
|
||||||
diaspora_send_followup($target_item,$owner,$contact);
|
diaspora_send_followup($target_item,$owner,$contact);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
elseif($target_item['parent'] != $target_item['id']) {
|
elseif($target_item['uri'] !== $target_item['parent-uri']) {
|
||||||
// we are the relay - send comments, likes and unlikes to our conversants
|
// we are the relay - send comments, likes and relayable_retractions
|
||||||
|
// (of comments and likes) to our conversants
|
||||||
diaspora_send_relay($target_item,$owner,$contact);
|
diaspora_send_relay($target_item,$owner,$contact);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
@ -858,6 +860,13 @@ function notifier_run($argv, $argc){
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// If the item was deleted, clean up the `sign` table
|
||||||
|
if($target_item['deleted']) {
|
||||||
|
$r = q("DELETE FROM sign where `retract_iid` = %d",
|
||||||
|
intval($target_item['id'])
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
logger('notifier: calling hooks', LOGGER_DEBUG);
|
logger('notifier: calling hooks', LOGGER_DEBUG);
|
||||||
|
|
||||||
if($normal_mode)
|
if($normal_mode)
|
||||||
|
|
|
||||||
|
|
@ -39,11 +39,16 @@ function advanced_profile(&$a) {
|
||||||
|
|
||||||
if($a->profile['with']) $profile['marital']['with'] = $a->profile['with'];
|
if($a->profile['with']) $profile['marital']['with'] = $a->profile['with'];
|
||||||
|
|
||||||
|
if(strlen($a->profile['howlong']) && $a->profile['howlong'] !== '0000-00-00 00:00:00') {
|
||||||
|
$profile['howlong'] = relative_date($a->profile['howlong'], t('for %1$d %2$s'));
|
||||||
|
}
|
||||||
|
|
||||||
if($a->profile['sexual']) $profile['sexual'] = array( t('Sexual Preference:'), $a->profile['sexual'] );
|
if($a->profile['sexual']) $profile['sexual'] = array( t('Sexual Preference:'), $a->profile['sexual'] );
|
||||||
|
|
||||||
if($a->profile['homepage']) $profile['homepage'] = array( t('Homepage:'), linkify($a->profile['homepage']) );
|
if($a->profile['homepage']) $profile['homepage'] = array( t('Homepage:'), linkify($a->profile['homepage']) );
|
||||||
|
|
||||||
|
if($a->profile['hometown']) $profile['hometown'] = array( t('Hometown:'), linkify($a->profile['hometown']) );
|
||||||
|
|
||||||
if($a->profile['pub_keywords']) $profile['pub_keywords'] = array( t('Tags:'), $a->profile['pub_keywords']);
|
if($a->profile['pub_keywords']) $profile['pub_keywords'] = array( t('Tags:'), $a->profile['pub_keywords']);
|
||||||
|
|
||||||
if($a->profile['politic']) $profile['politic'] = array( t('Political Views:'), $a->profile['politic']);
|
if($a->profile['politic']) $profile['politic'] = array( t('Political Views:'), $a->profile['politic']);
|
||||||
|
|
|
||||||
|
|
@ -742,6 +742,8 @@ function smilies($s, $sample = false) {
|
||||||
':homebrew',
|
':homebrew',
|
||||||
':coffee',
|
':coffee',
|
||||||
':facepalm',
|
':facepalm',
|
||||||
|
':like',
|
||||||
|
':dislike',
|
||||||
'~friendika',
|
'~friendika',
|
||||||
'~friendica'
|
'~friendica'
|
||||||
|
|
||||||
|
|
@ -778,6 +780,8 @@ function smilies($s, $sample = false) {
|
||||||
'<img src="' . $a->get_baseurl() . '/images/beer_mug.gif" alt=":homebrew" />',
|
'<img src="' . $a->get_baseurl() . '/images/beer_mug.gif" alt=":homebrew" />',
|
||||||
'<img src="' . $a->get_baseurl() . '/images/coffee.gif" alt=":coffee" />',
|
'<img src="' . $a->get_baseurl() . '/images/coffee.gif" alt=":coffee" />',
|
||||||
'<img src="' . $a->get_baseurl() . '/images/smiley-facepalm.gif" alt=":facepalm" />',
|
'<img src="' . $a->get_baseurl() . '/images/smiley-facepalm.gif" alt=":facepalm" />',
|
||||||
|
'<img src="' . $a->get_baseurl() . '/images/like.gif" alt=":like" />',
|
||||||
|
'<img src="' . $a->get_baseurl() . '/images/dislike.gif" alt=":dislike" />',
|
||||||
'<a href="http://project.friendika.com">~friendika <img src="' . $a->get_baseurl() . '/images/friendika-16.png" alt="~friendika" /></a>',
|
'<a href="http://project.friendika.com">~friendika <img src="' . $a->get_baseurl() . '/images/friendika-16.png" alt="~friendika" /></a>',
|
||||||
'<a href="http://friendica.com">~friendica <img src="' . $a->get_baseurl() . '/images/friendica-16.png" alt="~friendica" /></a>'
|
'<a href="http://friendica.com">~friendica <img src="' . $a->get_baseurl() . '/images/friendica-16.png" alt="~friendica" /></a>'
|
||||||
);
|
);
|
||||||
|
|
@ -887,6 +891,7 @@ function prepare_body($item,$attach = false) {
|
||||||
} else
|
} else
|
||||||
$s = prepare_text($item['body']);
|
$s = prepare_text($item['body']);
|
||||||
|
|
||||||
|
|
||||||
$prep_arr = array('item' => $item, 'html' => $s);
|
$prep_arr = array('item' => $item, 'html' => $s);
|
||||||
call_hooks('prepare_body', $prep_arr);
|
call_hooks('prepare_body', $prep_arr);
|
||||||
$s = $prep_arr['html'];
|
$s = $prep_arr['html'];
|
||||||
|
|
|
||||||
327
include/user.php
Normal file
327
include/user.php
Normal file
|
|
@ -0,0 +1,327 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
require_once('include/config.php');
|
||||||
|
require_once('include/network.php');
|
||||||
|
require_once('include/plugin.php');
|
||||||
|
require_once('include/text.php');
|
||||||
|
require_once('include/pgettext.php');
|
||||||
|
require_once('include/datetime.php');
|
||||||
|
|
||||||
|
function create_user($arr) {
|
||||||
|
|
||||||
|
// Required: { username, nickname, email } or { openid_url }
|
||||||
|
|
||||||
|
$a = get_app();
|
||||||
|
$result = array('success' => false, 'user' => null, 'password' => '', 'message' => '');
|
||||||
|
|
||||||
|
$using_invites = get_config('system','invitation_only');
|
||||||
|
$num_invites = get_config('system','number_invites');
|
||||||
|
|
||||||
|
|
||||||
|
$invite_id = ((x($arr,'invite_id')) ? notags(trim($arr['invite_id'])) : '');
|
||||||
|
$username = ((x($arr,'username')) ? notags(trim($arr['username'])) : '');
|
||||||
|
$nickname = ((x($arr,'nickname')) ? notags(trim($arr['nickname'])) : '');
|
||||||
|
$email = ((x($arr,'email')) ? notags(trim($arr['email'])) : '');
|
||||||
|
$openid_url = ((x($arr,'openid_url')) ? notags(trim($arr['openid_url'])) : '');
|
||||||
|
$photo = ((x($arr,'photo')) ? notags(trim($arr['photo'])) : '');
|
||||||
|
$password = ((x($arr,'password')) ? trim($arr['password']) : '');
|
||||||
|
$blocked = ((x($arr,'blocked')) ? intval($arr['blocked']) : 0);
|
||||||
|
$verified = ((x($arr,'verified')) ? intval($arr['verified']) : 0);
|
||||||
|
|
||||||
|
$publish = ((x($arr,'profile_publish_reg') && intval($arr['profile_publish_reg'])) ? 1 : 0);
|
||||||
|
$netpublish = ((strlen(get_config('system','directory_submit_url'))) ? $publish : 0);
|
||||||
|
|
||||||
|
$tmp_str = $openid_url;
|
||||||
|
|
||||||
|
if($using_invites) {
|
||||||
|
if(! $invite_id) {
|
||||||
|
$result['message'] .= t('An invitation is required.') . EOL;
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
|
$r = q("select * from register where `hash` = '%s' limit 1", dbesc($invite_id));
|
||||||
|
if(! results($r)) {
|
||||||
|
$result['message'] .= t('Invitation could not be verified.') . EOL;
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if((! x($username)) || (! x($email)) || (! x($nickname))) {
|
||||||
|
if($openid_url) {
|
||||||
|
if(! validate_url($tmp_str)) {
|
||||||
|
$result['message'] .= t('Invalid OpenID url') . EOL;
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
|
$_SESSION['register'] = 1;
|
||||||
|
$_SESSION['openid'] = $openid_url;
|
||||||
|
require_once('library/openid.php');
|
||||||
|
$openid = new LightOpenID;
|
||||||
|
$openid->identity = $openid_url;
|
||||||
|
$openid->returnUrl = $a->get_baseurl() . '/openid';
|
||||||
|
$openid->required = array('namePerson/friendly', 'contact/email', 'namePerson');
|
||||||
|
$openid->optional = array('namePerson/first','media/image/aspect11','media/image/default');
|
||||||
|
goaway($openid->authUrl());
|
||||||
|
// NOTREACHED
|
||||||
|
}
|
||||||
|
|
||||||
|
notice( t('Please enter the required information.') . EOL );
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(! validate_url($tmp_str))
|
||||||
|
$openid_url = '';
|
||||||
|
|
||||||
|
|
||||||
|
$err = '';
|
||||||
|
|
||||||
|
// collapse multiple spaces in name
|
||||||
|
$username = preg_replace('/ +/',' ',$username);
|
||||||
|
|
||||||
|
if(mb_strlen($username) > 48)
|
||||||
|
$result['message'] .= t('Please use a shorter name.') . EOL;
|
||||||
|
if(mb_strlen($username) < 3)
|
||||||
|
$result['message'] .= t('Name too short.') . EOL;
|
||||||
|
|
||||||
|
// I don't really like having this rule, but it cuts down
|
||||||
|
// on the number of auto-registrations by Russian spammers
|
||||||
|
|
||||||
|
// Using preg_match was completely unreliable, due to mixed UTF-8 regex support
|
||||||
|
// $no_utf = get_config('system','no_utf');
|
||||||
|
// $pat = (($no_utf) ? '/^[a-zA-Z]* [a-zA-Z]*$/' : '/^\p{L}* \p{L}*$/u' );
|
||||||
|
|
||||||
|
// So now we are just looking for a space in the full name.
|
||||||
|
|
||||||
|
$loose_reg = get_config('system','no_regfullname');
|
||||||
|
if(! $loose_reg) {
|
||||||
|
$username = mb_convert_case($username,MB_CASE_TITLE,'UTF-8');
|
||||||
|
if(! strpos($username,' '))
|
||||||
|
$result['message'] .= t("That doesn't appear to be your full \x28First Last\x29 name.") . EOL;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
if(! allowed_email($email))
|
||||||
|
$result['message'] .= t('Your email domain is not among those allowed on this site.') . EOL;
|
||||||
|
|
||||||
|
if((! valid_email($email)) || (! validate_email($email)))
|
||||||
|
$result['message'] .= t('Not a valid email address.') . EOL;
|
||||||
|
|
||||||
|
// Disallow somebody creating an account using openid that uses the admin email address,
|
||||||
|
// since openid bypasses email verification. We'll allow it if there is not yet an admin account.
|
||||||
|
|
||||||
|
if((x($a->config,'admin_email')) && (strcasecmp($email,$a->config['admin_email']) == 0) && strlen($openid_url)) {
|
||||||
|
$r = q("SELECT * FROM `user` WHERE `email` = '%s' LIMIT 1",
|
||||||
|
dbesc($email)
|
||||||
|
);
|
||||||
|
if(count($r))
|
||||||
|
$result['message'] .= t('Cannot use that email.') . EOL;
|
||||||
|
}
|
||||||
|
|
||||||
|
$nickname = $arr['nickname'] = strtolower($nickname);
|
||||||
|
|
||||||
|
if(! preg_match("/^[a-z][a-z0-9\-\_]*$/",$nickname))
|
||||||
|
$result['message'] .= t('Your "nickname" can only contain "a-z", "0-9", "-", and "_", and must also begin with a letter.') . EOL;
|
||||||
|
$r = q("SELECT `uid` FROM `user`
|
||||||
|
WHERE `nickname` = '%s' LIMIT 1",
|
||||||
|
dbesc($nickname)
|
||||||
|
);
|
||||||
|
if(count($r))
|
||||||
|
$result['message'] .= t('Nickname is already registered. Please choose another.') . EOL;
|
||||||
|
|
||||||
|
// Check deleted accounts that had this nickname. Doesn't matter to us,
|
||||||
|
// but could be a security issue for federated platforms.
|
||||||
|
|
||||||
|
$r = q("SELECT * FROM `userd`
|
||||||
|
WHERE `username` = '%s' LIMIT 1",
|
||||||
|
dbesc($nickname)
|
||||||
|
);
|
||||||
|
if(count($r))
|
||||||
|
$result['message'] .= t('Nickname was once registered here and may not be re-used. Please choose another.') . EOL;
|
||||||
|
|
||||||
|
if(strlen($result['message'])) {
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
|
|
||||||
|
$new_password = ((strlen($password)) ? $password : autoname(6) . mt_rand(100,9999));
|
||||||
|
$new_password_encoded = hash('whirlpool',$new_password);
|
||||||
|
|
||||||
|
$result['password'] = $new_password;
|
||||||
|
|
||||||
|
require_once('include/crypto.php');
|
||||||
|
|
||||||
|
$keys = new_keypair(1024);
|
||||||
|
|
||||||
|
if($keys === false) {
|
||||||
|
$result['message'] .= t('SERIOUS ERROR: Generation of security keys failed.') . EOL;
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
|
|
||||||
|
$prvkey = $keys['prvkey'];
|
||||||
|
$pubkey = $keys['pubkey'];
|
||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
* Create another keypair for signing/verifying
|
||||||
|
* salmon protocol messages. We have to use a slightly
|
||||||
|
* less robust key because this won't be using openssl
|
||||||
|
* but the phpseclib. Since it is PHP interpreted code
|
||||||
|
* it is not nearly as efficient, and the larger keys
|
||||||
|
* will take several minutes each to process.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
$sres = new_keypair(512);
|
||||||
|
$sprvkey = $sres['prvkey'];
|
||||||
|
$spubkey = $sres['pubkey'];
|
||||||
|
|
||||||
|
$r = q("INSERT INTO `user` ( `guid`, `username`, `password`, `email`, `openid`, `nickname`,
|
||||||
|
`pubkey`, `prvkey`, `spubkey`, `sprvkey`, `register_date`, `verified`, `blocked`, `timezone` )
|
||||||
|
VALUES ( '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, 'UTC' )",
|
||||||
|
dbesc(generate_user_guid()),
|
||||||
|
dbesc($username),
|
||||||
|
dbesc($new_password_encoded),
|
||||||
|
dbesc($email),
|
||||||
|
dbesc($openid_url),
|
||||||
|
dbesc($nickname),
|
||||||
|
dbesc($pubkey),
|
||||||
|
dbesc($prvkey),
|
||||||
|
dbesc($spubkey),
|
||||||
|
dbesc($sprvkey),
|
||||||
|
dbesc(datetime_convert()),
|
||||||
|
intval($verified),
|
||||||
|
intval($blocked)
|
||||||
|
);
|
||||||
|
|
||||||
|
if($r) {
|
||||||
|
$r = q("SELECT * FROM `user`
|
||||||
|
WHERE `username` = '%s' AND `password` = '%s' LIMIT 1",
|
||||||
|
dbesc($username),
|
||||||
|
dbesc($new_password_encoded)
|
||||||
|
);
|
||||||
|
if($r !== false && count($r)) {
|
||||||
|
$u = $r[0];
|
||||||
|
$newuid = intval($r[0]['uid']);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
$result['message'] .= t('An error occurred during registration. Please try again.') . EOL ;
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* if somebody clicked submit twice very quickly, they could end up with two accounts
|
||||||
|
* due to race condition. Remove this one.
|
||||||
|
*/
|
||||||
|
|
||||||
|
$r = q("SELECT `uid` FROM `user`
|
||||||
|
WHERE `nickname` = '%s' ",
|
||||||
|
dbesc($nickname)
|
||||||
|
);
|
||||||
|
if((count($r) > 1) && $newuid) {
|
||||||
|
$result['message'] .= t('Nickname is already registered. Please choose another.') . EOL;
|
||||||
|
q("DELETE FROM `user` WHERE `uid` = %d LIMIT 1",
|
||||||
|
intval($newuid)
|
||||||
|
);
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(x($newuid) !== false) {
|
||||||
|
$r = q("INSERT INTO `profile` ( `uid`, `profile-name`, `is-default`, `name`, `photo`, `thumb`, `publish`, `net-publish` )
|
||||||
|
VALUES ( %d, '%s', %d, '%s', '%s', '%s', %d, %d ) ",
|
||||||
|
intval($newuid),
|
||||||
|
t('default'),
|
||||||
|
1,
|
||||||
|
dbesc($username),
|
||||||
|
dbesc($a->get_baseurl() . "/photo/profile/{$newuid}.jpg"),
|
||||||
|
dbesc($a->get_baseurl() . "/photo/avatar/{$newuid}.jpg"),
|
||||||
|
intval($publish),
|
||||||
|
intval($netpublish)
|
||||||
|
|
||||||
|
);
|
||||||
|
if($r === false) {
|
||||||
|
$result['message'] .= t('An error occurred creating your default profile. Please try again.') . EOL;
|
||||||
|
// Start fresh next time.
|
||||||
|
$r = q("DELETE FROM `user` WHERE `uid` = %d",
|
||||||
|
intval($newuid));
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
|
$r = q("INSERT INTO `contact` ( `uid`, `created`, `self`, `name`, `nick`, `photo`, `thumb`, `micro`, `blocked`, `pending`, `url`, `nurl`,
|
||||||
|
`request`, `notify`, `poll`, `confirm`, `poco`, `name-date`, `uri-date`, `avatar-date`, `closeness` )
|
||||||
|
VALUES ( %d, '%s', 1, '%s', '%s', '%s', '%s', '%s', 0, 0, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', 0 ) ",
|
||||||
|
intval($newuid),
|
||||||
|
datetime_convert(),
|
||||||
|
dbesc($username),
|
||||||
|
dbesc($nickname),
|
||||||
|
dbesc($a->get_baseurl() . "/photo/profile/{$newuid}.jpg"),
|
||||||
|
dbesc($a->get_baseurl() . "/photo/avatar/{$newuid}.jpg"),
|
||||||
|
dbesc($a->get_baseurl() . "/photo/micro/{$newuid}.jpg"),
|
||||||
|
dbesc($a->get_baseurl() . "/profile/$nickname"),
|
||||||
|
dbesc(normalise_link($a->get_baseurl() . "/profile/$nickname")),
|
||||||
|
dbesc($a->get_baseurl() . "/dfrn_request/$nickname"),
|
||||||
|
dbesc($a->get_baseurl() . "/dfrn_notify/$nickname"),
|
||||||
|
dbesc($a->get_baseurl() . "/dfrn_poll/$nickname"),
|
||||||
|
dbesc($a->get_baseurl() . "/dfrn_confirm/$nickname"),
|
||||||
|
dbesc($a->get_baseurl() . "/poco/$nickname"),
|
||||||
|
dbesc(datetime_convert()),
|
||||||
|
dbesc(datetime_convert()),
|
||||||
|
dbesc(datetime_convert())
|
||||||
|
);
|
||||||
|
|
||||||
|
// Create a group with no members. This allows somebody to use it
|
||||||
|
// right away as a default group for new contacts.
|
||||||
|
|
||||||
|
require_once('include/group.php');
|
||||||
|
group_add($newuid, t('Friends'));
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
// if we have no OpenID photo try to look up an avatar
|
||||||
|
if(! strlen($photo))
|
||||||
|
$photo = avatar_img($email);
|
||||||
|
|
||||||
|
// unless there is no avatar-plugin loaded
|
||||||
|
if(strlen($photo)) {
|
||||||
|
require_once('include/Photo.php');
|
||||||
|
$photo_failure = false;
|
||||||
|
|
||||||
|
$filename = basename($photo);
|
||||||
|
$img_str = fetch_url($photo,true);
|
||||||
|
$img = new Photo($img_str);
|
||||||
|
if($img->is_valid()) {
|
||||||
|
|
||||||
|
$img->scaleImageSquare(175);
|
||||||
|
|
||||||
|
$hash = photo_new_resource();
|
||||||
|
|
||||||
|
$r = $img->store($newuid, 0, $hash, $filename, t('Profile Photos'), 4 );
|
||||||
|
|
||||||
|
if($r === false)
|
||||||
|
$photo_failure = true;
|
||||||
|
|
||||||
|
$img->scaleImage(80);
|
||||||
|
|
||||||
|
$r = $img->store($newuid, 0, $hash, $filename, t('Profile Photos'), 5 );
|
||||||
|
|
||||||
|
if($r === false)
|
||||||
|
$photo_failure = true;
|
||||||
|
|
||||||
|
$img->scaleImage(48);
|
||||||
|
|
||||||
|
$r = $img->store($newuid, 0, $hash, $filename, t('Profile Photos'), 6 );
|
||||||
|
|
||||||
|
if($r === false)
|
||||||
|
$photo_failure = true;
|
||||||
|
|
||||||
|
if(! $photo_failure) {
|
||||||
|
q("UPDATE `photo` SET `profile` = 1 WHERE `resource-id` = '%s' ",
|
||||||
|
dbesc($hash)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
call_hooks('register_account', $newuid);
|
||||||
|
|
||||||
|
$result['success'] = true;
|
||||||
|
$result['user'] = $u;
|
||||||
|
return $result;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -275,7 +275,7 @@ aStates[249]="|'Adan|'Ataq|Abyan|Al Bayda'|Al Hudaydah|Al Jawf|Al Mahrah|Al Mahw
|
||||||
aStates[250]="|Kosovo|Montenegro|Serbia|Vojvodina";
|
aStates[250]="|Kosovo|Montenegro|Serbia|Vojvodina";
|
||||||
aStates[251]="|Central|Copperbelt|Eastern|Luapula|Lusaka|North-Western|Northern|Southern|Western";
|
aStates[251]="|Central|Copperbelt|Eastern|Luapula|Lusaka|North-Western|Northern|Southern|Western";
|
||||||
aStates[252]="|Bulawayo|Harare|ManicalandMashonaland Central|Mashonaland East|Mashonaland West|Masvingo|Matabeleland North|Matabeleland South|Midlands";
|
aStates[252]="|Bulawayo|Harare|ManicalandMashonaland Central|Mashonaland East|Mashonaland West|Masvingo|Matabeleland North|Matabeleland South|Midlands";
|
||||||
aStates[253]="Self Hosted|Private Server|Architects Of Sleep|DFRN|Distributed Friend Network|Free-Beer.ch|Foojbook|Free-Haven|Friendica.eu|Friendika.me.4.it|Friendika - I Ask Questions|Frndc.com|Hipatia|Hungerfreunde|Kaluguran Community|Kak Ste?|Karl.Markx.pm|Loozah Social Club|MyFriendica.net|MyFriendNetwork|Oi!|OpenMindSpace|Oradons Friendica|Recolutionari.es|Sysfu Social Club|theshi.re|Tumpambae|Uzmiac|Other";
|
aStates[253]="|Self Hosted|Private Server|Architects Of Sleep|DFRN|Distributed Friend Network|Free-Beer.ch|Foojbook|Free-Haven|Friendica.eu|Friendika.me.4.it|Friendika - I Ask Questions|Frndc.com|Hipatia|Hungerfreunde|Kaluguran Community|Kak Ste?|Karl.Markx.pm|Loozah Social Club|MyFriendica.net|MyFriendNetwork|Oi!|OpenMindSpace|Recolutionari.es|Sysfu Social Club|theshi.re|Tumpambae|Uzmiac|Other";
|
||||||
/*
|
/*
|
||||||
* gArCountryInfo
|
* gArCountryInfo
|
||||||
* (0) Country name
|
* (0) Country name
|
||||||
|
|
|
||||||
16
mod/acctlink.php
Normal file
16
mod/acctlink.php
Normal file
|
|
@ -0,0 +1,16 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
require_once('include/Scrape.php');
|
||||||
|
|
||||||
|
function acctlink_init(&$a) {
|
||||||
|
|
||||||
|
if(x($_GET,'addr')) {
|
||||||
|
$addr = trim($_GET['addr']);
|
||||||
|
$res = probe_url($addr);
|
||||||
|
//logger('acctlink: ' . print_r($res,true));
|
||||||
|
if($res['url']) {
|
||||||
|
goaway($res['url']);
|
||||||
|
killme();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -135,7 +135,7 @@ function acl_init(&$a){
|
||||||
foreach($r as $g) {
|
foreach($r as $g) {
|
||||||
$x['photos'][] = $g['micro'];
|
$x['photos'][] = $g['micro'];
|
||||||
$x['links'][] = $g['url'];
|
$x['links'][] = $g['url'];
|
||||||
$x['suggestions'][] = $g['name']; // sprintf( t('%s [%s]'),$g['name'],$g['url']);
|
$x['suggestions'][] = $g['name'];
|
||||||
$x['data'][] = intval($g['id']);
|
$x['data'][] = intval($g['id']);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -98,7 +98,7 @@ function admin_content(&$a) {
|
||||||
'plugins'=> Array($a->get_baseurl(true)."/admin/plugins/", t("Plugins") , "plugins"),
|
'plugins'=> Array($a->get_baseurl(true)."/admin/plugins/", t("Plugins") , "plugins"),
|
||||||
'themes' => Array($a->get_baseurl(true)."/admin/themes/", t("Themes") , "themes"),
|
'themes' => Array($a->get_baseurl(true)."/admin/themes/", t("Themes") , "themes"),
|
||||||
'dbsync' => Array($a->get_baseurl(true)."/admin/dbsync/", t('DB updates'), "dbsync"),
|
'dbsync' => Array($a->get_baseurl(true)."/admin/dbsync/", t('DB updates'), "dbsync"),
|
||||||
'update' => Array($a->get_baseurl(true)."/admin/update/", t("Software Update") , "update")
|
//'update' => Array($a->get_baseurl(true)."/admin/update/", t("Software Update") , "update")
|
||||||
);
|
);
|
||||||
|
|
||||||
/* get plugins admin page */
|
/* get plugins admin page */
|
||||||
|
|
|
||||||
|
|
@ -63,7 +63,7 @@ function community_content(&$a, $update = 0) {
|
||||||
}
|
}
|
||||||
|
|
||||||
$r = q("SELECT distinct(`item`.`uri`), `item`.*, `item`.`id` AS `item_id`,
|
$r = q("SELECT distinct(`item`.`uri`), `item`.*, `item`.`id` AS `item_id`,
|
||||||
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
|
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`alias`, `contact`.`rel`,
|
||||||
`contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`,
|
`contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`,
|
||||||
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`,
|
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`,
|
||||||
`user`.`nickname`, `user`.`hidewall`
|
`user`.`nickname`, `user`.`hidewall`
|
||||||
|
|
|
||||||
|
|
@ -202,6 +202,8 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
|
||||||
|
|
||||||
if($user[0]['page-flags'] == PAGE_COMMUNITY)
|
if($user[0]['page-flags'] == PAGE_COMMUNITY)
|
||||||
$params['page'] = 1;
|
$params['page'] = 1;
|
||||||
|
if($user[0]['page-flags'] == PAGE_PRVGROUP)
|
||||||
|
$params['page'] = 2;
|
||||||
|
|
||||||
logger('dfrn_confirm: Confirm: posting data to ' . $dfrn_confirm . ': ' . print_r($params,true), LOGGER_DATA);
|
logger('dfrn_confirm: Confirm: posting data to ' . $dfrn_confirm . ': ' . print_r($params,true), LOGGER_DATA);
|
||||||
|
|
||||||
|
|
@ -537,6 +539,9 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
|
||||||
$page = ((x($_POST,'page')) ? intval($_POST['page']) : 0 );
|
$page = ((x($_POST,'page')) ? intval($_POST['page']) : 0 );
|
||||||
$version_id = ((x($_POST,'dfrn_version')) ? (float) $_POST['dfrn_version'] : 2.0);
|
$version_id = ((x($_POST,'dfrn_version')) ? (float) $_POST['dfrn_version'] : 2.0);
|
||||||
|
|
||||||
|
$forum = (($page == 1) ? 1 : 0);
|
||||||
|
$prv = (($page == 2) ? 1 : 0);
|
||||||
|
|
||||||
logger('dfrn_confirm: requestee contacted: ' . $node);
|
logger('dfrn_confirm: requestee contacted: ' . $node);
|
||||||
|
|
||||||
logger('dfrn_confirm: request: POST=' . print_r($_POST,true), LOGGER_DATA);
|
logger('dfrn_confirm: request: POST=' . print_r($_POST,true), LOGGER_DATA);
|
||||||
|
|
@ -691,6 +696,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
|
||||||
`pending` = 0,
|
`pending` = 0,
|
||||||
`duplex` = %d,
|
`duplex` = %d,
|
||||||
`forum` = %d,
|
`forum` = %d,
|
||||||
|
`prv` = %d,
|
||||||
`network` = '%s' WHERE `id` = %d LIMIT 1
|
`network` = '%s' WHERE `id` = %d LIMIT 1
|
||||||
",
|
",
|
||||||
dbesc($photos[0]),
|
dbesc($photos[0]),
|
||||||
|
|
@ -701,7 +707,8 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
|
||||||
dbesc(datetime_convert()),
|
dbesc(datetime_convert()),
|
||||||
dbesc(datetime_convert()),
|
dbesc(datetime_convert()),
|
||||||
intval($duplex),
|
intval($duplex),
|
||||||
intval($page),
|
intval($forum),
|
||||||
|
intval($prv),
|
||||||
dbesc(NETWORK_DFRN),
|
dbesc(NETWORK_DFRN),
|
||||||
intval($dfrn_record)
|
intval($dfrn_record)
|
||||||
);
|
);
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,9 @@ function dfrn_notify_post(&$a) {
|
||||||
$ssl_policy = ((x($_POST,'ssl_policy')) ? notags(trim($_POST['ssl_policy'])): 'none');
|
$ssl_policy = ((x($_POST,'ssl_policy')) ? notags(trim($_POST['ssl_policy'])): 'none');
|
||||||
$page = ((x($_POST,'page')) ? intval($_POST['page']) : 0);
|
$page = ((x($_POST,'page')) ? intval($_POST['page']) : 0);
|
||||||
|
|
||||||
|
$forum = (($page == 1) ? 1 : 0);
|
||||||
|
$prv = (($page == 2) ? 1 : 0);
|
||||||
|
|
||||||
$writable = (-1);
|
$writable = (-1);
|
||||||
if($dfrn_version >= 2.21) {
|
if($dfrn_version >= 2.21) {
|
||||||
$writable = (($perm === 'rw') ? 1 : 0);
|
$writable = (($perm === 'rw') ? 1 : 0);
|
||||||
|
|
@ -88,10 +91,11 @@ function dfrn_notify_post(&$a) {
|
||||||
|
|
||||||
$importer = $r[0];
|
$importer = $r[0];
|
||||||
|
|
||||||
if((($writable != (-1)) && ($writable != $importer['writable'])) || ($importer['forum'] != $page)) {
|
if((($writable != (-1)) && ($writable != $importer['writable'])) || ($importer['forum'] != $forum) || ($importer['prv'] != $prv)) {
|
||||||
q("UPDATE `contact` SET `writable` = %d, forum = %d WHERE `id` = %d LIMIT 1",
|
q("UPDATE `contact` SET `writable` = %d, forum = %d, prv = %d WHERE `id` = %d LIMIT 1",
|
||||||
intval(($writable == (-1)) ? $importer['writable'] : $writable),
|
intval(($writable == (-1)) ? $importer['writable'] : $writable),
|
||||||
intval($page),
|
intval($forum),
|
||||||
|
intval($prv),
|
||||||
intval($importer['id'])
|
intval($importer['id'])
|
||||||
);
|
);
|
||||||
if($writable != (-1))
|
if($writable != (-1))
|
||||||
|
|
|
||||||
|
|
@ -68,7 +68,7 @@ function dfrn_request_post(&$a) {
|
||||||
$dfrn_url = notags(trim($_POST['dfrn_url']));
|
$dfrn_url = notags(trim($_POST['dfrn_url']));
|
||||||
$aes_allow = (((x($_POST,'aes_allow')) && ($_POST['aes_allow'] == 1)) ? 1 : 0);
|
$aes_allow = (((x($_POST,'aes_allow')) && ($_POST['aes_allow'] == 1)) ? 1 : 0);
|
||||||
$confirm_key = ((x($_POST,'confirm_key')) ? $_POST['confirm_key'] : "");
|
$confirm_key = ((x($_POST,'confirm_key')) ? $_POST['confirm_key'] : "");
|
||||||
|
$hidden = ((x($_POST,'hidden-contact')) ? intval($_POST['hidden-contact']) : 0);
|
||||||
$contact_record = null;
|
$contact_record = null;
|
||||||
|
|
||||||
if(x($dfrn_url)) {
|
if(x($dfrn_url)) {
|
||||||
|
|
@ -98,8 +98,9 @@ function dfrn_request_post(&$a) {
|
||||||
}
|
}
|
||||||
|
|
||||||
if(is_array($contact_record)) {
|
if(is_array($contact_record)) {
|
||||||
$r = q("UPDATE `contact` SET `ret-aes` = %d WHERE `id` = %d LIMIT 1",
|
$r = q("UPDATE `contact` SET `ret-aes` = %d, hidden = %d WHERE `id` = %d LIMIT 1",
|
||||||
intval($aes_allow),
|
intval($aes_allow),
|
||||||
|
intval($hidden),
|
||||||
intval($contact_record['id'])
|
intval($contact_record['id'])
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
@ -144,8 +145,8 @@ function dfrn_request_post(&$a) {
|
||||||
*/
|
*/
|
||||||
|
|
||||||
$r = q("INSERT INTO `contact` ( `uid`, `created`,`url`, `nurl`, `name`, `nick`, `photo`, `site-pubkey`,
|
$r = q("INSERT INTO `contact` ( `uid`, `created`,`url`, `nurl`, `name`, `nick`, `photo`, `site-pubkey`,
|
||||||
`request`, `confirm`, `notify`, `poll`, `poco`, `network`, `aes_allow`)
|
`request`, `confirm`, `notify`, `poll`, `poco`, `network`, `aes_allow`, `hidden`)
|
||||||
VALUES ( %d, '%s', '%s', '%s', '%s' , '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d)",
|
VALUES ( %d, '%s', '%s', '%s', '%s' , '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d)",
|
||||||
intval(local_user()),
|
intval(local_user()),
|
||||||
datetime_convert(),
|
datetime_convert(),
|
||||||
dbesc($dfrn_url),
|
dbesc($dfrn_url),
|
||||||
|
|
@ -160,7 +161,8 @@ function dfrn_request_post(&$a) {
|
||||||
$parms['dfrn-poll'],
|
$parms['dfrn-poll'],
|
||||||
$parms['dfrn-poco'],
|
$parms['dfrn-poco'],
|
||||||
dbesc(NETWORK_DFRN),
|
dbesc(NETWORK_DFRN),
|
||||||
intval($aes_allow)
|
intval($aes_allow),
|
||||||
|
intval($hidden)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -649,6 +651,8 @@ function dfrn_request_content(&$a) {
|
||||||
$o = replace_macros($tpl,array(
|
$o = replace_macros($tpl,array(
|
||||||
'$dfrn_url' => $dfrn_url,
|
'$dfrn_url' => $dfrn_url,
|
||||||
'$aes_allow' => (($aes_allow) ? '<input type="hidden" name="aes_allow" value="1" />' : "" ),
|
'$aes_allow' => (($aes_allow) ? '<input type="hidden" name="aes_allow" value="1" />' : "" ),
|
||||||
|
'$hidethem' => t('Hide this contact'),
|
||||||
|
'$hidechecked' => '',
|
||||||
'$confirm_key' => $confirm_key,
|
'$confirm_key' => $confirm_key,
|
||||||
'$welcome' => sprintf( t('Welcome home %s.'), $a->user['username']),
|
'$welcome' => sprintf( t('Welcome home %s.'), $a->user['username']),
|
||||||
'$please' => sprintf( t('Please confirm your introduction/connection request to %s.'), $dfrn_url),
|
'$please' => sprintf( t('Please confirm your introduction/connection request to %s.'), $dfrn_url),
|
||||||
|
|
@ -680,7 +684,7 @@ function dfrn_request_content(&$a) {
|
||||||
$auto_confirm = false;
|
$auto_confirm = false;
|
||||||
|
|
||||||
if(count($r)) {
|
if(count($r)) {
|
||||||
if($r[0]['page-flags'] != PAGE_NORMAL)
|
if(($r[0]['page-flags'] != PAGE_NORMAL) && ($r[0]['page-flags'] != PAGE_PRVGROUP))
|
||||||
$auto_confirm = true;
|
$auto_confirm = true;
|
||||||
|
|
||||||
if(! $auto_confirm) {
|
if(! $auto_confirm) {
|
||||||
|
|
|
||||||
224
mod/follow.php
224
mod/follow.php
|
|
@ -1,6 +1,7 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
require_once('Scrape.php');
|
require_once('Scrape.php');
|
||||||
|
require_once('include/follow.php');
|
||||||
|
|
||||||
function follow_init(&$a) {
|
function follow_init(&$a) {
|
||||||
|
|
||||||
|
|
@ -11,230 +12,19 @@ function follow_init(&$a) {
|
||||||
}
|
}
|
||||||
|
|
||||||
$uid = local_user();
|
$uid = local_user();
|
||||||
$url = $orig_url = notags(trim($_REQUEST['url']));
|
$url = notags(trim($_REQUEST['url']));
|
||||||
$return_url = $_SESSION['return_url'];
|
$return_url = $_SESSION['return_url'];
|
||||||
|
|
||||||
|
|
||||||
// remove ajax junk, e.g. Twitter
|
$result = new_contact($uid,$url,true);
|
||||||
|
|
||||||
$url = str_replace('/#!/','/',$url);
|
if($result['success'] == false) {
|
||||||
|
if($result['message'])
|
||||||
if(! allowed_url($url)) {
|
notice($result['message']);
|
||||||
notice( t('Disallowed profile URL.') . EOL);
|
|
||||||
goaway($return_url);
|
|
||||||
// NOTREACHED
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
if(! $url) {
|
|
||||||
notice( t('Connect URL missing.') . EOL);
|
|
||||||
goaway($return_url);
|
|
||||||
// NOTREACHED
|
|
||||||
}
|
|
||||||
|
|
||||||
$arr = array('url' => $url, 'contact' => array());
|
|
||||||
|
|
||||||
call_hooks('follow', $arr);
|
|
||||||
|
|
||||||
if(x($arr['contact'],'name'))
|
|
||||||
$ret = $arr['contact'];
|
|
||||||
else
|
|
||||||
$ret = probe_url($url);
|
|
||||||
|
|
||||||
if($ret['network'] === NETWORK_DFRN) {
|
|
||||||
if(strlen($a->path))
|
|
||||||
$myaddr = bin2hex($a->get_baseurl() . '/profile/' . $a->user['nickname']);
|
|
||||||
else
|
|
||||||
$myaddr = bin2hex($a->user['nickname'] . '@' . $a->get_hostname());
|
|
||||||
|
|
||||||
goaway($ret['request'] . "&addr=$myaddr");
|
|
||||||
|
|
||||||
// NOTREACHED
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
if(get_config('system','dfrn_only')) {
|
|
||||||
notice( t('This site is not configured to allow communications with other networks.') . EOL);
|
|
||||||
notice( t('No compatible communication protocols or feeds were discovered.') . EOL);
|
|
||||||
goaway($return_url);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// This extra param just confuses things, remove it
|
|
||||||
if($ret['network'] === NETWORK_DIASPORA)
|
|
||||||
$ret['url'] = str_replace('?absolute=true','',$ret['url']);
|
|
||||||
|
|
||||||
|
|
||||||
// do we have enough information?
|
|
||||||
|
|
||||||
if(! ((x($ret,'name')) && (x($ret,'poll')) && ((x($ret,'url')) || (x($ret,'addr'))))) {
|
|
||||||
notice( t('The profile address specified does not provide adequate information.') . EOL);
|
|
||||||
if(! x($ret,'poll'))
|
|
||||||
notice( t('No compatible communication protocols or feeds were discovered.') . EOL);
|
|
||||||
if(! x($ret,'name'))
|
|
||||||
notice( t('An author or name was not found.') . EOL);
|
|
||||||
if(! x($ret,'url'))
|
|
||||||
notice( t('No browser URL could be matched to this address.') . EOL);
|
|
||||||
if(strpos($url,'@') !== false) {
|
|
||||||
notice( t('Unable to match @-style Identity Address with a known protocol or email contact.') . EOL);
|
|
||||||
notice( t('Use mailto: in front of address to force email check.') . EOL);
|
|
||||||
}
|
|
||||||
goaway($return_url);
|
goaway($return_url);
|
||||||
}
|
}
|
||||||
|
|
||||||
if($ret['network'] === NETWORK_OSTATUS && get_config('system','ostatus_disabled')) {
|
info( t('Contact added') . EOL);
|
||||||
notice( t('The profile address specified belongs to a network which has been disabled on this site.') . EOL);
|
|
||||||
$ret['notify'] = '';
|
|
||||||
}
|
|
||||||
|
|
||||||
if(! $ret['notify']) {
|
|
||||||
notice( t('Limited profile. This person will be unable to receive direct/personal notifications from you.') . EOL);
|
|
||||||
}
|
|
||||||
|
|
||||||
$writeable = ((($ret['network'] === NETWORK_OSTATUS) && ($ret['notify'])) ? 1 : 0);
|
|
||||||
$hidden = (($ret['network'] === NETWORK_MAIL) ? 1 : 0);
|
|
||||||
|
|
||||||
if($ret['network'] === NETWORK_MAIL) {
|
|
||||||
$writeable = 1;
|
|
||||||
|
|
||||||
}
|
|
||||||
if($ret['network'] === NETWORK_DIASPORA)
|
|
||||||
$writeable = 1;
|
|
||||||
|
|
||||||
// check if we already have a contact
|
|
||||||
// the poll url is more reliable than the profile url, as we may have
|
|
||||||
// indirect links or webfinger links
|
|
||||||
|
|
||||||
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `poll` = '%s' LIMIT 1",
|
|
||||||
intval($uid),
|
|
||||||
dbesc($ret['poll'])
|
|
||||||
);
|
|
||||||
|
|
||||||
|
|
||||||
if(count($r)) {
|
|
||||||
// update contact
|
|
||||||
if($r[0]['rel'] == CONTACT_IS_FOLLOWER || ($network === NETWORK_DIASPORA && $r[0]['rel'] == CONTACT_IS_SHARING)) {
|
|
||||||
q("UPDATE `contact` SET `rel` = %d , `readonly` = 0 WHERE `id` = %d AND `uid` = %d LIMIT 1",
|
|
||||||
intval(CONTACT_IS_FRIEND),
|
|
||||||
intval($r[0]['id']),
|
|
||||||
intval($uid)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
|
|
||||||
$new_relation = (($ret['network'] === NETWORK_MAIL) ? CONTACT_IS_FRIEND : CONTACT_IS_SHARING);
|
|
||||||
if($ret['network'] === NETWORK_DIASPORA)
|
|
||||||
$new_relation = CONTACT_IS_FOLLOWER;
|
|
||||||
|
|
||||||
// create contact record
|
|
||||||
$r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`, `addr`, `alias`, `batch`, `notify`, `poll`, `poco`, `name`, `nick`, `photo`, `network`, `pubkey`, `rel`, `priority`,
|
|
||||||
`writable`, `hidden`, `blocked`, `readonly`, `pending` )
|
|
||||||
VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, %d, 0, 0, 0 ) ",
|
|
||||||
intval($uid),
|
|
||||||
dbesc(datetime_convert()),
|
|
||||||
dbesc($ret['url']),
|
|
||||||
dbesc(normalise_link($ret['url'])),
|
|
||||||
dbesc($ret['addr']),
|
|
||||||
dbesc($ret['alias']),
|
|
||||||
dbesc($ret['batch']),
|
|
||||||
dbesc($ret['notify']),
|
|
||||||
dbesc($ret['poll']),
|
|
||||||
dbesc($ret['poco']),
|
|
||||||
dbesc($ret['name']),
|
|
||||||
dbesc($ret['nick']),
|
|
||||||
dbesc($ret['photo']),
|
|
||||||
dbesc($ret['network']),
|
|
||||||
dbesc($ret['pubkey']),
|
|
||||||
intval($new_relation),
|
|
||||||
intval($ret['priority']),
|
|
||||||
intval($writeable),
|
|
||||||
intval($hidden)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
$r = q("SELECT * FROM `contact` WHERE `url` = '%s' AND `uid` = %d LIMIT 1",
|
|
||||||
dbesc($ret['url']),
|
|
||||||
intval($uid)
|
|
||||||
);
|
|
||||||
|
|
||||||
if(! count($r)) {
|
|
||||||
notice( t('Unable to retrieve contact information.') . EOL);
|
|
||||||
goaway($return_url);
|
|
||||||
// NOTREACHED
|
|
||||||
}
|
|
||||||
|
|
||||||
$contact = $r[0];
|
|
||||||
$contact_id = $r[0]['id'];
|
|
||||||
|
|
||||||
|
|
||||||
$g = q("select def_gid from user where uid = %d limit 1",
|
|
||||||
intval($uid)
|
|
||||||
);
|
|
||||||
if($g && intval($g[0]['def_gid'])) {
|
|
||||||
require_once('include/group.php');
|
|
||||||
group_add_member($uid,'',$contact_id,$g[0]['def_gid']);
|
|
||||||
}
|
|
||||||
|
|
||||||
require_once("Photo.php");
|
|
||||||
|
|
||||||
$photos = import_profile_photo($ret['photo'],$uid,$contact_id);
|
|
||||||
|
|
||||||
$r = q("UPDATE `contact` SET `photo` = '%s',
|
|
||||||
`thumb` = '%s',
|
|
||||||
`micro` = '%s',
|
|
||||||
`name-date` = '%s',
|
|
||||||
`uri-date` = '%s',
|
|
||||||
`avatar-date` = '%s'
|
|
||||||
WHERE `id` = %d LIMIT 1
|
|
||||||
",
|
|
||||||
dbesc($photos[0]),
|
|
||||||
dbesc($photos[1]),
|
|
||||||
dbesc($photos[2]),
|
|
||||||
dbesc(datetime_convert()),
|
|
||||||
dbesc(datetime_convert()),
|
|
||||||
dbesc(datetime_convert()),
|
|
||||||
intval($contact_id)
|
|
||||||
);
|
|
||||||
|
|
||||||
|
|
||||||
// pull feed and consume it, which should subscribe to the hub.
|
|
||||||
|
|
||||||
proc_run('php',"include/poller.php","$contact_id");
|
|
||||||
|
|
||||||
// create a follow slap
|
|
||||||
|
|
||||||
$tpl = get_markup_template('follow_slap.tpl');
|
|
||||||
$slap = replace_macros($tpl, array(
|
|
||||||
'$name' => $a->user['username'],
|
|
||||||
'$profile_page' => $a->get_baseurl() . '/profile/' . $a->user['nickname'],
|
|
||||||
'$photo' => $a->contact['photo'],
|
|
||||||
'$thumb' => $a->contact['thumb'],
|
|
||||||
'$published' => datetime_convert('UTC','UTC', 'now', ATOM_TIME),
|
|
||||||
'$item_id' => 'urn:X-dfrn:' . $a->get_hostname() . ':follow:' . random_string(),
|
|
||||||
'$title' => '',
|
|
||||||
'$type' => 'text',
|
|
||||||
'$content' => t('following'),
|
|
||||||
'$nick' => $a->user['nickname'],
|
|
||||||
'$verb' => ACTIVITY_FOLLOW,
|
|
||||||
'$ostat_follow' => ''
|
|
||||||
));
|
|
||||||
|
|
||||||
$r = q("SELECT `contact`.*, `user`.* FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
|
|
||||||
WHERE `user`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1",
|
|
||||||
intval($uid)
|
|
||||||
);
|
|
||||||
|
|
||||||
if(count($r)) {
|
|
||||||
if(($contact['network'] == NETWORK_OSTATUS) && (strlen($contact['notify']))) {
|
|
||||||
require_once('include/salmon.php');
|
|
||||||
slapper($r[0],$contact['notify'],$slap);
|
|
||||||
}
|
|
||||||
if($contact['network'] == NETWORK_DIASPORA) {
|
|
||||||
require_once('include/diaspora.php');
|
|
||||||
$ret = diaspora_share($a->user,$contact);
|
|
||||||
logger('mod_follow: diaspora_share returns: ' . $ret);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if(strstr($return_url,'contacts'))
|
if(strstr($return_url,'contacts'))
|
||||||
goaway($a->get_baseurl() . '/contacts/' . $contact_id);
|
goaway($a->get_baseurl() . '/contacts/' . $contact_id);
|
||||||
|
|
|
||||||
29
mod/install.php
Normal file → Executable file
29
mod/install.php
Normal file → Executable file
|
|
@ -184,15 +184,16 @@ function install_content(&$a) {
|
||||||
|
|
||||||
check_php($phpath, $checks);
|
check_php($phpath, $checks);
|
||||||
|
|
||||||
check_htaccess($checks);
|
check_htaccess($checks);
|
||||||
|
|
||||||
function check_passed($v, $c){
|
function check_passed($v, $c){
|
||||||
if ($c['required'])
|
if ($c['required'])
|
||||||
$v = $v && $c['status'];
|
$v = $v && $c['status'];
|
||||||
return $v;
|
return $v;
|
||||||
}
|
}
|
||||||
$checkspassed = array_reduce($checks, "check_passed", true);
|
$checkspassed = array_reduce($checks, "check_passed", true);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
$tpl = get_markup_template('install_checks.tpl');
|
$tpl = get_markup_template('install_checks.tpl');
|
||||||
$o .= replace_macros($tpl, array(
|
$o .= replace_macros($tpl, array(
|
||||||
|
|
@ -381,6 +382,7 @@ function check_funcs(&$checks) {
|
||||||
check_add($ck_funcs, t('Apache mod_rewrite module'), true, true, "");
|
check_add($ck_funcs, t('Apache mod_rewrite module'), true, true, "");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(! function_exists('curl_init')){
|
if(! function_exists('curl_init')){
|
||||||
$ck_funcs[0]['status']= false;
|
$ck_funcs[0]['status']= false;
|
||||||
$ck_funcs[0]['help']= t('Error: libCURL PHP module required but not installed.');
|
$ck_funcs[0]['help']= t('Error: libCURL PHP module required but not installed.');
|
||||||
|
|
@ -421,21 +423,26 @@ function check_htconfig(&$checks) {
|
||||||
$help .= t('At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Friendica top folder.').EOL;
|
$help .= t('At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Friendica top folder.').EOL;
|
||||||
$help .= t('You can alternatively skip this procedure and perform a manual installation. Please see the file "INSTALL.txt" for instructions.').EOL;
|
$help .= t('You can alternatively skip this procedure and perform a manual installation. Please see the file "INSTALL.txt" for instructions.').EOL;
|
||||||
}
|
}
|
||||||
|
|
||||||
check_add($checks, t('.htconfig.php is writable'), $status, false, $help);
|
check_add($checks, t('.htconfig.php is writable'), $status, false, $help);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function check_htaccess(&$checks) {
|
function check_htaccess(&$checks) {
|
||||||
$a = get_app();
|
$a = get_app();
|
||||||
$status = true;
|
$status = true;
|
||||||
$help = "";
|
$help = "";
|
||||||
$test = fetch_url($a->get_baseurl()."/install/testrewrite");
|
if (function_exists('curl_init')){
|
||||||
if ($test!="ok") {
|
$test = fetch_url($a->get_baseurl()."/install/testrewrite");
|
||||||
$status = false;
|
if ($test!="ok") {
|
||||||
$help = t('Url rewrite in .htconfig is not working. Check your server configuration.');
|
$status = false;
|
||||||
}
|
$help = t('Url rewrite in .htaccess is not working. Check your server configuration.');
|
||||||
check_add($checks, t('Url rewrite is working'), $status, true, $help);
|
}
|
||||||
|
check_add($checks, t('Url rewrite is working'), $status, true, $help);
|
||||||
|
} else {
|
||||||
|
// cannot check modrewrite if libcurl is not installed
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
47
mod/item.php
47
mod/item.php
|
|
@ -262,17 +262,17 @@ function item_post(&$a) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(strlen($categories)) {
|
if(strlen($categories)) {
|
||||||
// get the "fileas" tags for this post
|
// get the "fileas" tags for this post
|
||||||
$filedas = file_tag_file_to_list($categories, 'file');
|
$filedas = file_tag_file_to_list($categories, 'file');
|
||||||
}
|
}
|
||||||
// save old and new categories, so we can determine what needs to be deleted from pconfig
|
// save old and new categories, so we can determine what needs to be deleted from pconfig
|
||||||
$categories_old = $categories;
|
$categories_old = $categories;
|
||||||
$categories = file_tag_list_to_file(trim($_REQUEST['category']), 'category');
|
$categories = file_tag_list_to_file(trim($_REQUEST['category']), 'category');
|
||||||
$categories_new = $categories;
|
$categories_new = $categories;
|
||||||
if(strlen($filedas)) {
|
if(strlen($filedas)) {
|
||||||
// append the fileas stuff to the new categories list
|
// append the fileas stuff to the new categories list
|
||||||
$categories .= file_tag_list_to_file($filedas, 'file');
|
$categories .= file_tag_list_to_file($filedas, 'file');
|
||||||
}
|
}
|
||||||
|
|
||||||
// Work around doubled linefeeds in Tinymce 3.5b2
|
// Work around doubled linefeeds in Tinymce 3.5b2
|
||||||
|
|
@ -453,6 +453,7 @@ function item_post(&$a) {
|
||||||
|
|
||||||
$tagged = array();
|
$tagged = array();
|
||||||
|
|
||||||
|
$private_forum = false;
|
||||||
|
|
||||||
if(count($tags)) {
|
if(count($tags)) {
|
||||||
foreach($tags as $tag) {
|
foreach($tags as $tag) {
|
||||||
|
|
@ -471,11 +472,22 @@ function item_post(&$a) {
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
$success = handle_tag($a, $body, $inform, $str_tags, (local_user()) ? local_user() : $profile_uid , $tag);
|
$success = handle_tag($a, $body, $inform, $str_tags, (local_user()) ? local_user() : $profile_uid , $tag);
|
||||||
if($success)
|
if($success['replaced'])
|
||||||
$tagged[] = $tag;
|
$tagged[] = $tag;
|
||||||
|
if(is_array($success['contact']) && intval($success['contact']['prv'])) {
|
||||||
|
$private_forum = true;
|
||||||
|
$private_id = $success['contact']['id'];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(($private_forum) && (! $parent) && (! $private)) {
|
||||||
|
// we tagged a private forum in a top level post and the message was public.
|
||||||
|
// Restrict it.
|
||||||
|
$private = 1;
|
||||||
|
$str_contact_allow = '<' . $private_id . '>';
|
||||||
|
}
|
||||||
|
|
||||||
$attachments = '';
|
$attachments = '';
|
||||||
$match = false;
|
$match = false;
|
||||||
|
|
||||||
|
|
@ -725,16 +737,16 @@ function item_post(&$a) {
|
||||||
if($datarray['verb'] === ACTIVITY_LIKE)
|
if($datarray['verb'] === ACTIVITY_LIKE)
|
||||||
$signed_text = $datarray['guid'] . ';' . 'Post' . ';' . $parent_item['guid'] . ';' . 'true' . ';' . $myaddr;
|
$signed_text = $datarray['guid'] . ';' . 'Post' . ';' . $parent_item['guid'] . ';' . 'true' . ';' . $myaddr;
|
||||||
else
|
else
|
||||||
$signed_text = $datarray['guid'] . ';' . $parent_item['guid'] . ';' . $signed_body . ';' . $myaddr;
|
$signed_text = $datarray['guid'] . ';' . $parent_item['guid'] . ';' . $signed_body . ';' . $myaddr;
|
||||||
|
|
||||||
$authorsig = base64_encode(rsa_sign($signed_text,$a->user['prvkey'],'sha256'));
|
$authorsig = base64_encode(rsa_sign($signed_text,$a->user['prvkey'],'sha256'));
|
||||||
|
|
||||||
q("insert into sign (`iid`,`signed_text`,`signature`,`signer`) values (%d,'%s','%s','%s') ",
|
q("insert into sign (`iid`,`signed_text`,`signature`,`signer`) values (%d,'%s','%s','%s') ",
|
||||||
intval($post_id),
|
intval($post_id),
|
||||||
dbesc($signed_text),
|
dbesc($signed_text),
|
||||||
dbesc(base64_encode($authorsig)),
|
dbesc(base64_encode($authorsig)),
|
||||||
dbesc($myaddr)
|
dbesc($myaddr)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
|
@ -893,6 +905,7 @@ function item_content(&$a) {
|
||||||
function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag) {
|
function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag) {
|
||||||
|
|
||||||
$replaced = false;
|
$replaced = false;
|
||||||
|
$r = null;
|
||||||
|
|
||||||
//is it a hash tag?
|
//is it a hash tag?
|
||||||
if(strpos($tag,'#') === 0) {
|
if(strpos($tag,'#') === 0) {
|
||||||
|
|
@ -1023,5 +1036,5 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return $replaced;
|
return array('replaced' => $replaced, 'contact' => $r[0]);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
125
mod/like.php
Normal file → Executable file
125
mod/like.php
Normal file → Executable file
|
|
@ -104,7 +104,8 @@ function like_content(&$a) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$r = q("SELECT `id` FROM `item` WHERE `verb` = '%s' AND `deleted` = 0
|
|
||||||
|
$r = q("SELECT * FROM `item` WHERE `verb` = '%s' AND `deleted` = 0
|
||||||
AND `contact-id` = %d AND ( `parent` = '%s' OR `parent-uri` = '%s') LIMIT 1",
|
AND `contact-id` = %d AND ( `parent` = '%s' OR `parent-uri` = '%s') LIMIT 1",
|
||||||
dbesc($activity),
|
dbesc($activity),
|
||||||
intval($contact['id']),
|
intval($contact['id']),
|
||||||
|
|
@ -112,13 +113,70 @@ function like_content(&$a) {
|
||||||
dbesc($item_id)
|
dbesc($item_id)
|
||||||
);
|
);
|
||||||
if(count($r)) {
|
if(count($r)) {
|
||||||
|
$like_item = $r[0];
|
||||||
|
|
||||||
// Already voted, undo it
|
// Already voted, undo it
|
||||||
$r = q("UPDATE `item` SET `deleted` = 1, `changed` = '%s' WHERE `id` = %d LIMIT 1",
|
$r = q("UPDATE `item` SET `deleted` = 1, `changed` = '%s' WHERE `id` = %d LIMIT 1",
|
||||||
dbesc(datetime_convert()),
|
dbesc(datetime_convert()),
|
||||||
intval($r[0]['id'])
|
intval($like_item['id'])
|
||||||
);
|
);
|
||||||
|
|
||||||
proc_run('php',"include/notifier.php","like","$post_id");
|
// Clean up the `sign` table
|
||||||
|
$r = q("DELETE FROM `sign` WHERE `iid` = %d",
|
||||||
|
intval($like_item['id'])
|
||||||
|
);
|
||||||
|
|
||||||
|
// Save the author information for the unlike in case we need to relay to Diaspora
|
||||||
|
// Note that we can only create a signature for a user of the local server. We don't have
|
||||||
|
// a key for remote users. That is ok, because if a remote user is "unlike"ing a post, it
|
||||||
|
// means we are the relay, and for relayable_retractions, Diaspora
|
||||||
|
// only checks the parent_author_signature if it doesn't have to relay further
|
||||||
|
//
|
||||||
|
// If $item['resource-id'] exists, it means the item is a photo. Diaspora doesn't support
|
||||||
|
// likes on photos, so don't bother.
|
||||||
|
|
||||||
|
if(($activity === ACTIVITY_LIKE) && (! $item['resource-id'])) {
|
||||||
|
$signed_text = $like_item['guid'] . ';' . 'Like';
|
||||||
|
|
||||||
|
if( $contact['network'] === NETWORK_DIASPORA)
|
||||||
|
$diaspora_handle = $contact['addr'];
|
||||||
|
else { // Only works for NETWORK_DFRN
|
||||||
|
$contact_baseurl_start = strpos($contact['url'],'://') + 3;
|
||||||
|
$contact_baseurl_length = strpos($contact['url'],'/profile') - $contact_baseurl_start;
|
||||||
|
$contact_baseurl = substr($contact['url'], $contact_baseurl_start, $contact_baseurl_length);
|
||||||
|
$diaspora_handle = $contact['nick'] . '@' . $contact_baseurl;
|
||||||
|
|
||||||
|
// Get contact's private key if he's a user of the local Friendica server
|
||||||
|
$r = q("SELECT `contact`.`uid` FROM `contact` WHERE `url` = '%s' AND `self` = 1 LIMIT 1",
|
||||||
|
dbesc($contact['url'])
|
||||||
|
);
|
||||||
|
|
||||||
|
if( $r) {
|
||||||
|
$contact_uid = $r['uid'];
|
||||||
|
$r = q("SELECT prvkey FROM user WHERE uid = %d LIMIT 1",
|
||||||
|
intval($contact_uid)
|
||||||
|
);
|
||||||
|
|
||||||
|
if( $r)
|
||||||
|
$authorsig = base64_encode(rsa_sign($signed_text,$r['prvkey'],'sha256'));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if(! isset($authorsig))
|
||||||
|
$authorsig = '';
|
||||||
|
|
||||||
|
q("insert into sign (`retract_iid`,`signed_text`,`signature`,`signer`) values (%d,'%s','%s','%s') ",
|
||||||
|
intval($like_item['id']),
|
||||||
|
dbesc($signed_text),
|
||||||
|
dbesc($authorsig),
|
||||||
|
dbesc($diaspora_handle)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// proc_run('php',"include/notifier.php","like","$post_id"); // $post_id isn't defined here!
|
||||||
|
$like_item_id = $like_item['id'];
|
||||||
|
proc_run('php',"include/notifier.php","like","$like_item_id");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -191,6 +249,65 @@ EOT;
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// Save the author information for the like in case we need to relay to Diaspora
|
||||||
|
// Note that we can only create a signature for a user of the local server. We don't have
|
||||||
|
// a key for remote users. That is ok, because if a remote user is "unlike"ing a post, it
|
||||||
|
// means we are the relay, and for relayable_retractions, Diaspora
|
||||||
|
// only checks the parent_author_signature if it doesn't have to relay further
|
||||||
|
|
||||||
|
if(($activity === ACTIVITY_LIKE) && ($post_type === t('status'))) {
|
||||||
|
if( $contact['network'] === NETWORK_DIASPORA)
|
||||||
|
$diaspora_handle = $contact['addr'];
|
||||||
|
else { // Only works for NETWORK_DFRN
|
||||||
|
$contact_baseurl_start = strpos($contact['url'],'://') + 3;
|
||||||
|
$contact_baseurl_length = strpos($contact['url'],'/profile') - $contact_baseurl_start;
|
||||||
|
$contact_baseurl = substr($contact['url'], $contact_baseurl_start, $contact_baseurl_length);
|
||||||
|
$diaspora_handle = $contact['nick'] . '@' . $contact_baseurl;
|
||||||
|
|
||||||
|
// Get contact's private key if he's a user of the local Friendica server
|
||||||
|
$r = q("SELECT `contact`.`uid` FROM `contact` WHERE `url` = '%s' AND `self` = 1 LIMIT 1",
|
||||||
|
dbesc($contact['url'])
|
||||||
|
);
|
||||||
|
|
||||||
|
if( $r) {
|
||||||
|
$contact_uid = $r['uid'];
|
||||||
|
$r = q("SELECT prvkey FROM user WHERE uid = %d LIMIT 1",
|
||||||
|
intval($contact_uid)
|
||||||
|
);
|
||||||
|
|
||||||
|
if( $r)
|
||||||
|
$contact_uprvkey = $r['prvkey'];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$r = q("SELECT guid, parent FROM `item` WHERE id = %d LIMIT 1",
|
||||||
|
intval($post_id)
|
||||||
|
);
|
||||||
|
if( $r) {
|
||||||
|
$p = q("SELECT guid FROM `item` WHERE id = %d AND parent = %d LIMIT 1",
|
||||||
|
intval($r[0]['parent']),
|
||||||
|
intval($r[0]['parent'])
|
||||||
|
);
|
||||||
|
if( $p) {
|
||||||
|
$signed_text = $r[0]['guid'] . ';Post;' . $p[0]['guid'] . ';true;' . $diaspora_handle;
|
||||||
|
|
||||||
|
if(isset($contact_uprvkey))
|
||||||
|
$authorsig = base64_encode(rsa_sign($signed_text,$contact_uprvkey,'sha256'));
|
||||||
|
else
|
||||||
|
$authorsig = '';
|
||||||
|
|
||||||
|
q("insert into sign (`iid`,`signed_text`,`signature`,`signer`) values (%d,'%s','%s','%s') ",
|
||||||
|
intval($post_id),
|
||||||
|
dbesc($signed_text),
|
||||||
|
dbesc($authorsig),
|
||||||
|
dbesc($diaspora_handle)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
$arr['id'] = $post_id;
|
$arr['id'] = $post_id;
|
||||||
|
|
||||||
call_hooks('post_local_end', $arr);
|
call_hooks('post_local_end', $arr);
|
||||||
|
|
@ -199,4 +316,4 @@ EOT;
|
||||||
|
|
||||||
killme();
|
killme();
|
||||||
// return; // NOTREACHED
|
// return; // NOTREACHED
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -211,7 +211,8 @@ function message_content(&$a) {
|
||||||
'$parent' => '',
|
'$parent' => '',
|
||||||
'$upload' => t('Upload photo'),
|
'$upload' => t('Upload photo'),
|
||||||
'$insert' => t('Insert web link'),
|
'$insert' => t('Insert web link'),
|
||||||
'$wait' => t('Please wait')
|
'$wait' => t('Please wait'),
|
||||||
|
'$submit' => t('Submit')
|
||||||
));
|
));
|
||||||
|
|
||||||
return $o;
|
return $o;
|
||||||
|
|
|
||||||
|
|
@ -437,8 +437,8 @@ function network_content(&$a, $update = 0) {
|
||||||
else
|
else
|
||||||
$sql_extra .= sprintf(" AND `item`.`parent` IN (SELECT distinct(`parent`) from item where ( `author-link` like '%s' or `tag` like '%s' or tag like '%s' )) ",
|
$sql_extra .= sprintf(" AND `item`.`parent` IN (SELECT distinct(`parent`) from item where ( `author-link` like '%s' or `tag` like '%s' or tag like '%s' )) ",
|
||||||
dbesc(protect_sprintf('%' . $myurl)),
|
dbesc(protect_sprintf('%' . $myurl)),
|
||||||
dbesc(protect_sprintf('%' . $myurl . '\\]%')),
|
dbesc(protect_sprintf('%' . $myurl . ']%')),
|
||||||
dbesc(protect_sprintf('%' . $diasp_url . '\\]%'))
|
dbesc(protect_sprintf('%' . $diasp_url . ']%'))
|
||||||
);
|
);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
@ -534,7 +534,7 @@ function network_content(&$a, $update = 0) {
|
||||||
$parents_str = implode(', ', $parents_arr);
|
$parents_str = implode(', ', $parents_arr);
|
||||||
|
|
||||||
$items = q("SELECT `item`.*, `item`.`id` AS `item_id`,
|
$items = q("SELECT `item`.*, `item`.`id` AS `item_id`,
|
||||||
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, `contact`.`writable`,
|
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`alias`, `contact`.`rel`, `contact`.`writable`,
|
||||||
`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
|
`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
|
||||||
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
|
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
|
||||||
FROM `item`, `contact`
|
FROM `item`, `contact`
|
||||||
|
|
|
||||||
|
|
@ -117,7 +117,7 @@ function notes_content(&$a,$update = false) {
|
||||||
$parents_str = implode(', ', $parents_arr);
|
$parents_str = implode(', ', $parents_arr);
|
||||||
|
|
||||||
$r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
|
$r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
|
||||||
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`network`, `contact`.`rel`,
|
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`alias`, `contact`.`network`, `contact`.`rel`,
|
||||||
`contact`.`thumb`, `contact`.`self`, `contact`.`writable`,
|
`contact`.`thumb`, `contact`.`self`, `contact`.`writable`,
|
||||||
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
|
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
|
||||||
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
|
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
|
||||||
|
|
|
||||||
|
|
@ -242,7 +242,7 @@ function profile_content(&$a, $update = 0) {
|
||||||
$parents_str = implode(', ', $parents_arr);
|
$parents_str = implode(', ', $parents_arr);
|
||||||
|
|
||||||
$items = q("SELECT `item`.*, `item`.`id` AS `item_id`,
|
$items = q("SELECT `item`.*, `item`.`id` AS `item_id`,
|
||||||
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`network`, `contact`.`rel`,
|
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`alias`, `contact`.`network`, `contact`.`rel`,
|
||||||
`contact`.`thumb`, `contact`.`self`, `contact`.`writable`,
|
`contact`.`thumb`, `contact`.`self`, `contact`.`writable`,
|
||||||
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
|
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
|
||||||
FROM `item`, `contact`
|
FROM `item`, `contact`
|
||||||
|
|
|
||||||
|
|
@ -62,9 +62,15 @@ function profiles_post(&$a) {
|
||||||
$pub_keywords = notags(trim($_POST['pub_keywords']));
|
$pub_keywords = notags(trim($_POST['pub_keywords']));
|
||||||
$prv_keywords = notags(trim($_POST['prv_keywords']));
|
$prv_keywords = notags(trim($_POST['prv_keywords']));
|
||||||
$marital = notags(trim($_POST['marital']));
|
$marital = notags(trim($_POST['marital']));
|
||||||
|
$howlong = notags(trim($_POST['howlong']));
|
||||||
|
|
||||||
$with = ((x($_POST,'with')) ? notags(trim($_POST['with'])) : '');
|
$with = ((x($_POST,'with')) ? notags(trim($_POST['with'])) : '');
|
||||||
|
|
||||||
|
if(! strlen($howlong))
|
||||||
|
$howlong = '0000-00-00 00:00:00';
|
||||||
|
else
|
||||||
|
$howlong = datetime_convert(date_default_timezone_get(),'UTC',$howlong);
|
||||||
|
|
||||||
// linkify the relationship target if applicable
|
// linkify the relationship target if applicable
|
||||||
|
|
||||||
$withchanged = false;
|
$withchanged = false;
|
||||||
|
|
@ -120,6 +126,7 @@ function profiles_post(&$a) {
|
||||||
|
|
||||||
$sexual = notags(trim($_POST['sexual']));
|
$sexual = notags(trim($_POST['sexual']));
|
||||||
$homepage = notags(trim($_POST['homepage']));
|
$homepage = notags(trim($_POST['homepage']));
|
||||||
|
$hometown = notags(trim($_POST['hometown']));
|
||||||
$politic = notags(trim($_POST['politic']));
|
$politic = notags(trim($_POST['politic']));
|
||||||
$religion = notags(trim($_POST['religion']));
|
$religion = notags(trim($_POST['religion']));
|
||||||
|
|
||||||
|
|
@ -207,8 +214,10 @@ function profiles_post(&$a) {
|
||||||
`country-name` = '%s',
|
`country-name` = '%s',
|
||||||
`marital` = '%s',
|
`marital` = '%s',
|
||||||
`with` = '%s',
|
`with` = '%s',
|
||||||
|
`howlong` = '%s',
|
||||||
`sexual` = '%s',
|
`sexual` = '%s',
|
||||||
`homepage` = '%s',
|
`homepage` = '%s',
|
||||||
|
`hometown` = '%s',
|
||||||
`politic` = '%s',
|
`politic` = '%s',
|
||||||
`religion` = '%s',
|
`religion` = '%s',
|
||||||
`pub_keywords` = '%s',
|
`pub_keywords` = '%s',
|
||||||
|
|
@ -237,8 +246,10 @@ function profiles_post(&$a) {
|
||||||
dbesc($country_name),
|
dbesc($country_name),
|
||||||
dbesc($marital),
|
dbesc($marital),
|
||||||
dbesc($with),
|
dbesc($with),
|
||||||
|
dbesc($howlong),
|
||||||
dbesc($sexual),
|
dbesc($sexual),
|
||||||
dbesc($homepage),
|
dbesc($homepage),
|
||||||
|
dbesc($hometown),
|
||||||
dbesc($politic),
|
dbesc($politic),
|
||||||
dbesc($religion),
|
dbesc($religion),
|
||||||
dbesc($pub_keywords),
|
dbesc($pub_keywords),
|
||||||
|
|
@ -558,8 +569,10 @@ function profiles_content(&$a) {
|
||||||
'$lbl_marital' => t('<span class="heart">♥</span> Marital Status:'),
|
'$lbl_marital' => t('<span class="heart">♥</span> Marital Status:'),
|
||||||
'$lbl_with' => t("Who: \x28if applicable\x29"),
|
'$lbl_with' => t("Who: \x28if applicable\x29"),
|
||||||
'$lbl_ex1' => t('Examples: cathy123, Cathy Williams, cathy@example.com'),
|
'$lbl_ex1' => t('Examples: cathy123, Cathy Williams, cathy@example.com'),
|
||||||
|
'$lbl_howlong' => t('Since [date]:'),
|
||||||
'$lbl_sexual' => t('Sexual Preference:'),
|
'$lbl_sexual' => t('Sexual Preference:'),
|
||||||
'$lbl_homepage' => t('Homepage URL:'),
|
'$lbl_homepage' => t('Homepage URL:'),
|
||||||
|
'$lbl_hometown' => t('Hometown:'),
|
||||||
'$lbl_politic' => t('Political Views:'),
|
'$lbl_politic' => t('Political Views:'),
|
||||||
'$lbl_religion' => t('Religious Views:'),
|
'$lbl_religion' => t('Religious Views:'),
|
||||||
'$lbl_pubkey' => t('Public Keywords:'),
|
'$lbl_pubkey' => t('Public Keywords:'),
|
||||||
|
|
@ -595,9 +608,11 @@ function profiles_content(&$a) {
|
||||||
'$gender' => gender_selector($r[0]['gender']),
|
'$gender' => gender_selector($r[0]['gender']),
|
||||||
'$marital' => marital_selector($r[0]['marital']),
|
'$marital' => marital_selector($r[0]['marital']),
|
||||||
'$with' => strip_tags($r[0]['with']),
|
'$with' => strip_tags($r[0]['with']),
|
||||||
|
'$howlong' => ($r[0]['howlong'] === '0000-00-00 00:00:00' ? '' : datetime_convert('UTC',date_default_timezone_get(),$r[0]['howlong'])),
|
||||||
'$sexual' => sexpref_selector($r[0]['sexual']),
|
'$sexual' => sexpref_selector($r[0]['sexual']),
|
||||||
'$about' => $r[0]['about'],
|
'$about' => $r[0]['about'],
|
||||||
'$homepage' => $r[0]['homepage'],
|
'$homepage' => $r[0]['homepage'],
|
||||||
|
'$hometown' => $r[0]['hometown'],
|
||||||
'$politic' => $r[0]['politic'],
|
'$politic' => $r[0]['politic'],
|
||||||
'$religion' => $r[0]['religion'],
|
'$religion' => $r[0]['religion'],
|
||||||
'$pub_keywords' => $r[0]['pub_keywords'],
|
'$pub_keywords' => $r[0]['pub_keywords'],
|
||||||
|
|
|
||||||
329
mod/register.php
329
mod/register.php
|
|
@ -43,326 +43,49 @@ function register_post(&$a) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
$using_invites = get_config('system','invitation_only');
|
require_once('include/user.php');
|
||||||
$num_invites = get_config('system','number_invites');
|
|
||||||
|
|
||||||
|
$arr = $_POST;
|
||||||
|
|
||||||
$invite_id = ((x($_POST,'invite_id')) ? notags(trim($_POST['invite_id'])) : '');
|
$arr['blocked'] = $blocked;
|
||||||
$username = ((x($_POST,'username')) ? notags(trim($_POST['username'])) : '');
|
$arr['verified'] = $verified;
|
||||||
$nickname = ((x($_POST,'nickname')) ? notags(trim($_POST['nickname'])) : '');
|
|
||||||
$email = ((x($_POST,'email')) ? notags(trim($_POST['email'])) : '');
|
|
||||||
$openid_url = ((x($_POST,'openid_url')) ? notags(trim($_POST['openid_url'])) : '');
|
|
||||||
$photo = ((x($_POST,'photo')) ? notags(trim($_POST['photo'])) : '');
|
|
||||||
$publish = ((x($_POST,'profile_publish_reg') && intval($_POST['profile_publish_reg'])) ? 1 : 0);
|
|
||||||
|
|
||||||
$netpublish = ((strlen(get_config('system','directory_submit_url'))) ? $publish : 0);
|
$result = create_user($arr);
|
||||||
|
|
||||||
$tmp_str = $openid_url;
|
|
||||||
|
|
||||||
if($using_invites) {
|
if(! $result['success']) {
|
||||||
if(! $invite_id) {
|
notice($result['message']);
|
||||||
notice( t('An invitation is required.') . EOL);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
$r = q("select * from register where `hash` = '%s' limit 1", dbesc($invite_id));
|
|
||||||
if(! results($r)) {
|
|
||||||
notice( t('Invitation could not be verified.') . EOL);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if((! x($username)) || (! x($email)) || (! x($nickname))) {
|
|
||||||
if($openid_url) {
|
|
||||||
if(! validate_url($tmp_str)) {
|
|
||||||
notice( t('Invalid OpenID url') . EOL);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
$_SESSION['register'] = 1;
|
|
||||||
$_SESSION['openid'] = $openid_url;
|
|
||||||
require_once('library/openid.php');
|
|
||||||
$openid = new LightOpenID;
|
|
||||||
$openid->identity = $openid_url;
|
|
||||||
$openid->returnUrl = $a->get_baseurl() . '/openid';
|
|
||||||
$openid->required = array('namePerson/friendly', 'contact/email', 'namePerson');
|
|
||||||
$openid->optional = array('namePerson/first','media/image/aspect11','media/image/default');
|
|
||||||
goaway($openid->authUrl());
|
|
||||||
// NOTREACHED
|
|
||||||
}
|
|
||||||
|
|
||||||
notice( t('Please enter the required information.') . EOL );
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(! validate_url($tmp_str))
|
$user = $result['user'];
|
||||||
$openid_url = '';
|
|
||||||
|
|
||||||
|
|
||||||
$err = '';
|
|
||||||
|
|
||||||
// collapse multiple spaces in name
|
|
||||||
$username = preg_replace('/ +/',' ',$username);
|
|
||||||
|
|
||||||
if(mb_strlen($username) > 48)
|
|
||||||
$err .= t('Please use a shorter name.') . EOL;
|
|
||||||
if(mb_strlen($username) < 3)
|
|
||||||
$err .= t('Name too short.') . EOL;
|
|
||||||
|
|
||||||
// I don't really like having this rule, but it cuts down
|
|
||||||
// on the number of auto-registrations by Russian spammers
|
|
||||||
|
|
||||||
// Using preg_match was completely unreliable, due to mixed UTF-8 regex support
|
|
||||||
// $no_utf = get_config('system','no_utf');
|
|
||||||
// $pat = (($no_utf) ? '/^[a-zA-Z]* [a-zA-Z]*$/' : '/^\p{L}* \p{L}*$/u' );
|
|
||||||
|
|
||||||
// So now we are just looking for a space in the full name.
|
|
||||||
|
|
||||||
$loose_reg = get_config('system','no_regfullname');
|
|
||||||
if(! $loose_reg) {
|
|
||||||
$username = mb_convert_case($username,MB_CASE_TITLE,'UTF-8');
|
|
||||||
if(! strpos($username,' '))
|
|
||||||
$err .= t("That doesn't appear to be your full \x28First Last\x29 name.") . EOL;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
if(! allowed_email($email))
|
|
||||||
$err .= t('Your email domain is not among those allowed on this site.') . EOL;
|
|
||||||
|
|
||||||
if((! valid_email($email)) || (! validate_email($email)))
|
|
||||||
$err .= t('Not a valid email address.') . EOL;
|
|
||||||
|
|
||||||
// Disallow somebody creating an account using openid that uses the admin email address,
|
|
||||||
// since openid bypasses email verification. We'll allow it if there is not yet an admin account.
|
|
||||||
|
|
||||||
if((x($a->config,'admin_email')) && (strcasecmp($email,$a->config['admin_email']) == 0) && strlen($openid_url)) {
|
|
||||||
$r = q("SELECT * FROM `user` WHERE `email` = '%s' LIMIT 1",
|
|
||||||
dbesc($email)
|
|
||||||
);
|
|
||||||
if(count($r))
|
|
||||||
$err .= t('Cannot use that email.') . EOL;
|
|
||||||
}
|
|
||||||
|
|
||||||
$nickname = $_POST['nickname'] = strtolower($nickname);
|
|
||||||
|
|
||||||
if(! preg_match("/^[a-z][a-z0-9\-\_]*$/",$nickname))
|
|
||||||
$err .= t('Your "nickname" can only contain "a-z", "0-9", "-", and "_", and must also begin with a letter.') . EOL;
|
|
||||||
$r = q("SELECT `uid` FROM `user`
|
|
||||||
WHERE `nickname` = '%s' LIMIT 1",
|
|
||||||
dbesc($nickname)
|
|
||||||
);
|
|
||||||
if(count($r))
|
|
||||||
$err .= t('Nickname is already registered. Please choose another.') . EOL;
|
|
||||||
|
|
||||||
// Check deleted accounts that had this nickname. Doesn't matter to us,
|
|
||||||
// but could be a security issue for federated platforms.
|
|
||||||
|
|
||||||
$r = q("SELECT * FROM `userd`
|
|
||||||
WHERE `username` = '%s' LIMIT 1",
|
|
||||||
dbesc($nickname)
|
|
||||||
);
|
|
||||||
if(count($r))
|
|
||||||
$err .= t('Nickname was once registered here and may not be re-used. Please choose another.') . EOL;
|
|
||||||
|
|
||||||
if(strlen($err)) {
|
|
||||||
notice( $err );
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
$new_password = autoname(6) . mt_rand(100,9999);
|
|
||||||
$new_password_encoded = hash('whirlpool',$new_password);
|
|
||||||
|
|
||||||
require_once('include/crypto.php');
|
|
||||||
|
|
||||||
$result = new_keypair(1024);
|
|
||||||
|
|
||||||
if($result === false) {
|
|
||||||
notice( t('SERIOUS ERROR: Generation of security keys failed.') . EOL);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
$prvkey = $result['prvkey'];
|
|
||||||
$pubkey = $result['pubkey'];
|
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
* Create another keypair for signing/verifying
|
|
||||||
* salmon protocol messages. We have to use a slightly
|
|
||||||
* less robust key because this won't be using openssl
|
|
||||||
* but the phpseclib. Since it is PHP interpreted code
|
|
||||||
* it is not nearly as efficient, and the larger keys
|
|
||||||
* will take several minutes each to process.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
$sres = new_keypair(512);
|
|
||||||
$sprvkey = $sres['prvkey'];
|
|
||||||
$spubkey = $sres['pubkey'];
|
|
||||||
|
|
||||||
$r = q("INSERT INTO `user` ( `guid`, `username`, `password`, `email`, `openid`, `nickname`,
|
|
||||||
`pubkey`, `prvkey`, `spubkey`, `sprvkey`, `register_date`, `verified`, `blocked`, `timezone` )
|
|
||||||
VALUES ( '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, 'UTC' )",
|
|
||||||
dbesc(generate_user_guid()),
|
|
||||||
dbesc($username),
|
|
||||||
dbesc($new_password_encoded),
|
|
||||||
dbesc($email),
|
|
||||||
dbesc($openid_url),
|
|
||||||
dbesc($nickname),
|
|
||||||
dbesc($pubkey),
|
|
||||||
dbesc($prvkey),
|
|
||||||
dbesc($spubkey),
|
|
||||||
dbesc($sprvkey),
|
|
||||||
dbesc(datetime_convert()),
|
|
||||||
intval($verified),
|
|
||||||
intval($blocked)
|
|
||||||
);
|
|
||||||
|
|
||||||
if($r) {
|
|
||||||
$r = q("SELECT `uid` FROM `user`
|
|
||||||
WHERE `username` = '%s' AND `password` = '%s' LIMIT 1",
|
|
||||||
dbesc($username),
|
|
||||||
dbesc($new_password_encoded)
|
|
||||||
);
|
|
||||||
if($r !== false && count($r))
|
|
||||||
$newuid = intval($r[0]['uid']);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
notice( t('An error occurred during registration. Please try again.') . EOL );
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* if somebody clicked submit twice very quickly, they could end up with two accounts
|
|
||||||
* due to race condition. Remove this one.
|
|
||||||
*/
|
|
||||||
|
|
||||||
$r = q("SELECT `uid` FROM `user`
|
|
||||||
WHERE `nickname` = '%s' ",
|
|
||||||
dbesc($nickname)
|
|
||||||
);
|
|
||||||
if((count($r) > 1) && $newuid) {
|
|
||||||
$err .= t('Nickname is already registered. Please choose another.') . EOL;
|
|
||||||
q("DELETE FROM `user` WHERE `uid` = %d LIMIT 1",
|
|
||||||
intval($newuid)
|
|
||||||
);
|
|
||||||
notice ($err);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(x($newuid) !== false) {
|
|
||||||
$r = q("INSERT INTO `profile` ( `uid`, `profile-name`, `is-default`, `name`, `photo`, `thumb`, `publish`, `net-publish` )
|
|
||||||
VALUES ( %d, '%s', %d, '%s', '%s', '%s', %d, %d ) ",
|
|
||||||
intval($newuid),
|
|
||||||
'default',
|
|
||||||
1,
|
|
||||||
dbesc($username),
|
|
||||||
dbesc($a->get_baseurl() . "/photo/profile/{$newuid}.jpg"),
|
|
||||||
dbesc($a->get_baseurl() . "/photo/avatar/{$newuid}.jpg"),
|
|
||||||
intval($publish),
|
|
||||||
intval($netpublish)
|
|
||||||
|
|
||||||
);
|
|
||||||
if($r === false) {
|
|
||||||
notice( t('An error occurred creating your default profile. Please try again.') . EOL );
|
|
||||||
// Start fresh next time.
|
|
||||||
$r = q("DELETE FROM `user` WHERE `uid` = %d",
|
|
||||||
intval($newuid));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
$r = q("INSERT INTO `contact` ( `uid`, `created`, `self`, `name`, `nick`, `photo`, `thumb`, `micro`, `blocked`, `pending`, `url`, `nurl`,
|
|
||||||
`request`, `notify`, `poll`, `confirm`, `poco`, `name-date`, `uri-date`, `avatar-date`, `closeness` )
|
|
||||||
VALUES ( %d, '%s', 1, '%s', '%s', '%s', '%s', '%s', 0, 0, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', 0 ) ",
|
|
||||||
intval($newuid),
|
|
||||||
datetime_convert(),
|
|
||||||
dbesc($username),
|
|
||||||
dbesc($nickname),
|
|
||||||
dbesc($a->get_baseurl() . "/photo/profile/{$newuid}.jpg"),
|
|
||||||
dbesc($a->get_baseurl() . "/photo/avatar/{$newuid}.jpg"),
|
|
||||||
dbesc($a->get_baseurl() . "/photo/micro/{$newuid}.jpg"),
|
|
||||||
dbesc($a->get_baseurl() . "/profile/$nickname"),
|
|
||||||
dbesc(normalise_link($a->get_baseurl() . "/profile/$nickname")),
|
|
||||||
dbesc($a->get_baseurl() . "/dfrn_request/$nickname"),
|
|
||||||
dbesc($a->get_baseurl() . "/dfrn_notify/$nickname"),
|
|
||||||
dbesc($a->get_baseurl() . "/dfrn_poll/$nickname"),
|
|
||||||
dbesc($a->get_baseurl() . "/dfrn_confirm/$nickname"),
|
|
||||||
dbesc($a->get_baseurl() . "/poco/$nickname"),
|
|
||||||
dbesc(datetime_convert()),
|
|
||||||
dbesc(datetime_convert()),
|
|
||||||
dbesc(datetime_convert())
|
|
||||||
);
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
// if we have no OpenID photo try to look up an avatar
|
|
||||||
if(! strlen($photo))
|
|
||||||
$photo = avatar_img($email);
|
|
||||||
|
|
||||||
// unless there is no avatar-plugin loaded
|
|
||||||
if(strlen($photo)) {
|
|
||||||
require_once('include/Photo.php');
|
|
||||||
$photo_failure = false;
|
|
||||||
|
|
||||||
$filename = basename($photo);
|
|
||||||
$img_str = fetch_url($photo,true);
|
|
||||||
$img = new Photo($img_str);
|
|
||||||
if($img->is_valid()) {
|
|
||||||
|
|
||||||
$img->scaleImageSquare(175);
|
|
||||||
|
|
||||||
$hash = photo_new_resource();
|
|
||||||
|
|
||||||
$r = $img->store($newuid, 0, $hash, $filename, t('Profile Photos'), 4 );
|
|
||||||
|
|
||||||
if($r === false)
|
|
||||||
$photo_failure = true;
|
|
||||||
|
|
||||||
$img->scaleImage(80);
|
|
||||||
|
|
||||||
$r = $img->store($newuid, 0, $hash, $filename, t('Profile Photos'), 5 );
|
|
||||||
|
|
||||||
if($r === false)
|
|
||||||
$photo_failure = true;
|
|
||||||
|
|
||||||
$img->scaleImage(48);
|
|
||||||
|
|
||||||
$r = $img->store($newuid, 0, $hash, $filename, t('Profile Photos'), 6 );
|
|
||||||
|
|
||||||
if($r === false)
|
|
||||||
$photo_failure = true;
|
|
||||||
|
|
||||||
if(! $photo_failure) {
|
|
||||||
q("UPDATE `photo` SET `profile` = 1 WHERE `resource-id` = '%s' ",
|
|
||||||
dbesc($hash)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if($netpublish && $a->config['register_policy'] != REGISTER_APPROVE) {
|
if($netpublish && $a->config['register_policy'] != REGISTER_APPROVE) {
|
||||||
$url = $a->get_baseurl() . "/profile/$nickname";
|
$url = $a->get_baseurl() . '/profile/' . $user['nickname'];
|
||||||
proc_run('php',"include/directory.php","$url");
|
proc_run('php',"include/directory.php","$url");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$using_invites = get_config('system','invitation_only');
|
||||||
|
$num_invites = get_config('system','number_invites');
|
||||||
|
$invite_id = ((x($_POST,'invite_id')) ? notags(trim($_POST['invite_id'])) : '');
|
||||||
|
|
||||||
call_hooks('register_account', $newuid);
|
|
||||||
|
|
||||||
if( $a->config['register_policy'] == REGISTER_OPEN ) {
|
if( $a->config['register_policy'] == REGISTER_OPEN ) {
|
||||||
|
|
||||||
if($using_invites && $invite_id) {
|
if($using_invites && $invite_id) {
|
||||||
q("delete * from register where hash = '%s' limit 1", dbesc($invite_id));
|
q("delete * from register where hash = '%s' limit 1", dbesc($invite_id));
|
||||||
set_pconfig($newuid,'system','invites_remaining',$num_invites);
|
set_pconfig($user['uid'],'system','invites_remaining',$num_invites);
|
||||||
}
|
}
|
||||||
|
|
||||||
$email_tpl = get_intltext_template("register_open_eml.tpl");
|
$email_tpl = get_intltext_template("register_open_eml.tpl");
|
||||||
$email_tpl = replace_macros($email_tpl, array(
|
$email_tpl = replace_macros($email_tpl, array(
|
||||||
'$sitename' => $a->config['sitename'],
|
'$sitename' => $a->config['sitename'],
|
||||||
'$siteurl' => $a->get_baseurl(),
|
'$siteurl' => $a->get_baseurl(),
|
||||||
'$username' => $username,
|
'$username' => $user['username'],
|
||||||
'$email' => $email,
|
'$email' => $user['email'],
|
||||||
'$password' => $new_password,
|
'$password' => $result['password'],
|
||||||
'$uid' => $newuid ));
|
'$uid' => $user['uid'] ));
|
||||||
|
|
||||||
$res = mail($email, sprintf(t('Registration details for %s'), $a->config['sitename']),
|
$res = mail($user['email'], sprintf(t('Registration details for %s'), $a->config['sitename']),
|
||||||
$email_tpl,
|
$email_tpl,
|
||||||
'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
|
'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
|
||||||
. 'Content-type: text/plain; charset=UTF-8' . "\n"
|
. 'Content-type: text/plain; charset=UTF-8' . "\n"
|
||||||
|
|
@ -387,8 +110,8 @@ function register_post(&$a) {
|
||||||
$r = q("INSERT INTO `register` ( `hash`, `created`, `uid`, `password`, `language` ) VALUES ( '%s', '%s', %d, '%s', '%s' ) ",
|
$r = q("INSERT INTO `register` ( `hash`, `created`, `uid`, `password`, `language` ) VALUES ( '%s', '%s', %d, '%s', '%s' ) ",
|
||||||
dbesc($hash),
|
dbesc($hash),
|
||||||
dbesc(datetime_convert()),
|
dbesc(datetime_convert()),
|
||||||
intval($newuid),
|
intval($user['uid']),
|
||||||
dbesc($new_password),
|
dbesc($result['password']),
|
||||||
dbesc($lang)
|
dbesc($lang)
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
@ -402,17 +125,17 @@ function register_post(&$a) {
|
||||||
|
|
||||||
if($using_invites && $invite_id) {
|
if($using_invites && $invite_id) {
|
||||||
q("delete * from register where hash = '%s' limit 1", dbesc($invite_id));
|
q("delete * from register where hash = '%s' limit 1", dbesc($invite_id));
|
||||||
set_pconfig($newuid,'system','invites_remaining',$num_invites);
|
set_pconfig($user['uid'],'system','invites_remaining',$num_invites);
|
||||||
}
|
}
|
||||||
|
|
||||||
$email_tpl = get_intltext_template("register_verify_eml.tpl");
|
$email_tpl = get_intltext_template("register_verify_eml.tpl");
|
||||||
$email_tpl = replace_macros($email_tpl, array(
|
$email_tpl = replace_macros($email_tpl, array(
|
||||||
'$sitename' => $a->config['sitename'],
|
'$sitename' => $a->config['sitename'],
|
||||||
'$siteurl' => $a->get_baseurl(),
|
'$siteurl' => $a->get_baseurl(),
|
||||||
'$username' => $username,
|
'$username' => $user['username'],
|
||||||
'$email' => $email,
|
'$email' => $user['email'],
|
||||||
'$password' => $new_password,
|
'$password' => $result['password'],
|
||||||
'$uid' => $newuid,
|
'$uid' => $user['uid'],
|
||||||
'$hash' => $hash
|
'$hash' => $hash
|
||||||
));
|
));
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -110,18 +110,19 @@ function search_content(&$a) {
|
||||||
|
|
||||||
if (get_config('system','use_fulltext_engine')) {
|
if (get_config('system','use_fulltext_engine')) {
|
||||||
if($tag)
|
if($tag)
|
||||||
$sql_extra = sprintf(" AND MATCH (`item`.`tag`) AGAINST ('".'"%s"'."' in boolean mode) ", '#'.preg_quote($search));
|
$sql_extra = sprintf(" AND MATCH (`item`.`tag`) AGAINST ('".'"%s"'."' in boolean mode) ", '#'.dbesc(protect_sprintf($search)));
|
||||||
else
|
else
|
||||||
$sql_extra = sprintf(" AND MATCH (`item`.`body`) AGAINST ('".'"%s"'."' in boolean mode) ", dbesc(preg_quote($search)));
|
$sql_extra = sprintf(" AND MATCH (`item`.`body`) AGAINST ('".'"%s"'."' in boolean mode) ", dbesc(protect_sprintf($search)));
|
||||||
} else {
|
} else {
|
||||||
if($tag)
|
if($tag)
|
||||||
$sql_extra = sprintf(" AND `item`.`tag` REGEXP '%s' ", dbesc('\\]' . preg_quote($search) . '\\['));
|
$sql_extra = sprintf(" AND `item`.`tag` REGEXP '%s' ", dbesc('\\]' . protect_sprintf(preg_quote($search)) . '\\['));
|
||||||
else
|
else
|
||||||
$sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(preg_quote($search)));
|
$sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(protect_sprintf(preg_quote($search))));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// Here is the way permissions work in the search module...
|
// Here is the way permissions work in the search module...
|
||||||
// Only public posts can be shown
|
// Only public posts can be shown
|
||||||
// OR your own posts if you are a logged in member
|
// OR your own posts if you are a logged in member
|
||||||
|
|
@ -145,7 +146,7 @@ function search_content(&$a) {
|
||||||
}
|
}
|
||||||
|
|
||||||
$r = q("SELECT distinct(`item`.`uri`), `item`.*, `item`.`id` AS `item_id`,
|
$r = q("SELECT distinct(`item`.`uri`), `item`.*, `item`.`id` AS `item_id`,
|
||||||
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
|
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`alias`, `contact`.`rel`,
|
||||||
`contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`,
|
`contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`,
|
||||||
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`,
|
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`,
|
||||||
`user`.`nickname`
|
`user`.`nickname`
|
||||||
|
|
|
||||||
|
|
@ -445,7 +445,7 @@ function settings_post(&$a) {
|
||||||
|
|
||||||
if($page_flags == PAGE_PRVGROUP) {
|
if($page_flags == PAGE_PRVGROUP) {
|
||||||
$hidewall = 1;
|
$hidewall = 1;
|
||||||
if((! str_contact_allow) && (! str_group_allow) && (! str_contact_deny) && (! $str_group_deny)) {
|
if((! $str_contact_allow) && (! $str_group_allow) && (! $str_contact_deny) && (! $str_group_deny)) {
|
||||||
if($def_gid) {
|
if($def_gid) {
|
||||||
info( t('Private forum has no privacy permissions. Using default privacy group.'). EOL);
|
info( t('Private forum has no privacy permissions. Using default privacy group.'). EOL);
|
||||||
$str_group_allow = '<' . $def_gid . '>';
|
$str_group_allow = '<' . $def_gid . '>';
|
||||||
|
|
@ -837,27 +837,26 @@ function settings_content(&$a) {
|
||||||
|
|
||||||
$pageset_tpl = get_markup_template('pagetypes.tpl');
|
$pageset_tpl = get_markup_template('pagetypes.tpl');
|
||||||
$pagetype = replace_macros($pageset_tpl,array(
|
$pagetype = replace_macros($pageset_tpl,array(
|
||||||
'$page_normal' => array('page-flags', t('Normal Account'), PAGE_NORMAL,
|
'$page_normal' => array('page-flags', t('Normal Account Page'), PAGE_NORMAL,
|
||||||
t('This account is a normal personal profile'),
|
t('This account is a normal personal profile'),
|
||||||
($a->user['page-flags'] == PAGE_NORMAL)),
|
($a->user['page-flags'] == PAGE_NORMAL)),
|
||||||
|
|
||||||
'$page_soapbox' => array('page-flags', t('Soapbox Account'), PAGE_SOAPBOX,
|
'$page_soapbox' => array('page-flags', t('Soapbox Page'), PAGE_SOAPBOX,
|
||||||
t('Automatically approve all connection/friend requests as read-only fans'),
|
t('Automatically approve all connection/friend requests as read-only fans'),
|
||||||
($a->user['page-flags'] == PAGE_SOAPBOX)),
|
($a->user['page-flags'] == PAGE_SOAPBOX)),
|
||||||
|
|
||||||
'$page_community' => array('page-flags', t('Community/Celebrity Account'), PAGE_COMMUNITY,
|
'$page_community' => array('page-flags', t('Community Forum/Celebrity Account'), PAGE_COMMUNITY,
|
||||||
t('Automatically approve all connection/friend requests as read-write fans'),
|
t('Automatically approve all connection/friend requests as read-write fans'),
|
||||||
($a->user['page-flags'] == PAGE_COMMUNITY)),
|
($a->user['page-flags'] == PAGE_COMMUNITY)),
|
||||||
|
|
||||||
'$page_freelove' => array('page-flags', t('Automatic Friend Account'), PAGE_FREELOVE,
|
'$page_freelove' => array('page-flags', t('Automatic Friend Page'), PAGE_FREELOVE,
|
||||||
t('Automatically approve all connection/friend requests as friends'),
|
t('Automatically approve all connection/friend requests as friends'),
|
||||||
($a->user['page-flags'] == PAGE_FREELOVE)),
|
($a->user['page-flags'] == PAGE_FREELOVE)),
|
||||||
|
|
||||||
'$page_prvgroup' => array('page-flags', t('Private Forum'), PAGE_PRVGROUP,
|
'$page_prvgroup' => array('page-flags', t('Private Forum [Experimental]'), PAGE_PRVGROUP,
|
||||||
t('Private forum - approved members only [Experimental]'),
|
t('Private forum - approved members only'),
|
||||||
($a->user['page-flags'] == PAGE_PRVGROUP)),
|
($a->user['page-flags'] == PAGE_PRVGROUP)),
|
||||||
|
|
||||||
'$experimental' => ( (intval(get_config('system','prvgroup_testing'))) ? 'true' : ''),
|
|
||||||
|
|
||||||
));
|
));
|
||||||
|
|
||||||
|
|
@ -1026,7 +1025,8 @@ function settings_content(&$a) {
|
||||||
'$notify7' => array('notify7', t('You are tagged in a post'), ($notify & NOTIFY_TAGSELF), NOTIFY_TAGSELF, ''),
|
'$notify7' => array('notify7', t('You are tagged in a post'), ($notify & NOTIFY_TAGSELF), NOTIFY_TAGSELF, ''),
|
||||||
|
|
||||||
|
|
||||||
'$h_advn' => t('Advanced Page Settings'),
|
'$h_advn' => t('Advanced Account/Page Type Settings'),
|
||||||
|
'$h_descadvn' => t('Change the behaviour of this account for special situations'),
|
||||||
'$pagetype' => $pagetype,
|
'$pagetype' => $pagetype,
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
34
update.php
34
update.php
|
|
@ -1,6 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
define( 'UPDATE_VERSION' , 1144 );
|
define( 'UPDATE_VERSION' , 1148 );
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
|
|
@ -1137,8 +1137,8 @@ INDEX ( `username` )
|
||||||
}
|
}
|
||||||
|
|
||||||
function update_1133() {
|
function update_1133() {
|
||||||
q("ALTER TABLE `user` ADD `unkmail` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `blocktags` , ADD INDEX ( `unkmail` ) ");
|
q("ALTER TABLE `user` ADD `unkmail` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `blocktags` , ADD INDEX ( `unkmail` ) ");
|
||||||
q("ALTER TABLE `user` ADD `cntunkmail` INT NOT NULL DEFAULT '10' AFTER `unkmail` , ADD INDEX ( `cntunkmail` ) ");
|
q("ALTER TABLE `user` ADD `cntunkmail` INT NOT NULL DEFAULT '10' AFTER `unkmail` , ADD INDEX ( `cntunkmail` ) ");
|
||||||
q("ALTER TABLE `mail` ADD `unknown` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `replied` , ADD INDEX ( `unknown` ) ");
|
q("ALTER TABLE `mail` ADD `unknown` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `replied` , ADD INDEX ( `unknown` ) ");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1253,5 +1253,33 @@ function update_1143() {
|
||||||
return UPDATE_SUCCESS ;
|
return UPDATE_SUCCESS ;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function update_1144() {
|
||||||
|
$r = q("alter table contact add prv tinyint(1) not null default '0' after forum");
|
||||||
|
if(! $r)
|
||||||
|
return UPDATE_FAILED ;
|
||||||
|
return UPDATE_SUCCESS ;
|
||||||
|
}
|
||||||
|
|
||||||
|
function update_1145() {
|
||||||
|
$r = q("alter table profile add howlong datetime not null default '0000-00-00 00:00:00' after `with`");
|
||||||
|
if(! $r)
|
||||||
|
return UPDATE_FAILED ;
|
||||||
|
return UPDATE_SUCCESS ;
|
||||||
|
}
|
||||||
|
|
||||||
|
function update_1146() {
|
||||||
|
$r = q("alter table profile add hometown char(255) not null after `country-name`, add index ( `hometown` ) ");
|
||||||
|
if(! $r)
|
||||||
|
return UPDATE_FAILED ;
|
||||||
|
return UPDATE_SUCCESS ;
|
||||||
|
}
|
||||||
|
|
||||||
|
function update_1147() {
|
||||||
|
$r1 = q("ALTER TABLE `sign` ALTER `iid` SET DEFAULT '0'");
|
||||||
|
$r2 = q("ALTER TABLE `sign` ADD `retract_iid` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `iid`");
|
||||||
|
$r3 = q("ALTER TABLE `sign` ADD INDEX ( `retract_iid` )");
|
||||||
|
if((! $r1) || (! $r2) || (! $r3))
|
||||||
|
return UPDATE_FAILED ;
|
||||||
|
return UPDATE_SUCCESS ;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
|
||||||
1527
util/messages.po
1527
util/messages.po
File diff suppressed because it is too large
Load diff
1655
view/de/messages.po
1655
view/de/messages.po
File diff suppressed because it is too large
Load diff
|
|
@ -98,6 +98,7 @@ $a->strings["Private Message"] = "Private Nachricht";
|
||||||
$a->strings["View Full Size"] = "Betrachte Originalgröße";
|
$a->strings["View Full Size"] = "Betrachte Originalgröße";
|
||||||
$a->strings["Tags: "] = "Tags: ";
|
$a->strings["Tags: "] = "Tags: ";
|
||||||
$a->strings["[Remove any tag]"] = "[Tag entfernen]";
|
$a->strings["[Remove any tag]"] = "[Tag entfernen]";
|
||||||
|
$a->strings["Rotate CW"] = "Im Uhrzeigersinn rotieren";
|
||||||
$a->strings["New album name"] = "Name des neuen Albums";
|
$a->strings["New album name"] = "Name des neuen Albums";
|
||||||
$a->strings["Caption"] = "Bildunterschrift";
|
$a->strings["Caption"] = "Bildunterschrift";
|
||||||
$a->strings["Add a Tag"] = "Tag hinzufügen";
|
$a->strings["Add a Tag"] = "Tag hinzufügen";
|
||||||
|
|
@ -166,6 +167,7 @@ $a->strings["Failed to update contact record."] = "Aktualisierung der Kontaktdat
|
||||||
$a->strings["Your introduction has been sent."] = "Deine Kontaktanfrage wurde gesendet.";
|
$a->strings["Your introduction has been sent."] = "Deine Kontaktanfrage wurde gesendet.";
|
||||||
$a->strings["Please login to confirm introduction."] = "Bitte melde dich an, um die Kontaktanfrage zu bestätigen.";
|
$a->strings["Please login to confirm introduction."] = "Bitte melde dich an, um die Kontaktanfrage zu bestätigen.";
|
||||||
$a->strings["Incorrect identity currently logged in. Please login to <strong>this</strong> profile."] = "Momentan bist du mit einer anderen Identität angemeldet. Bitte melde Dich mit <strong>diesem</strong> Profil an.";
|
$a->strings["Incorrect identity currently logged in. Please login to <strong>this</strong> profile."] = "Momentan bist du mit einer anderen Identität angemeldet. Bitte melde Dich mit <strong>diesem</strong> Profil an.";
|
||||||
|
$a->strings["Hide this contact"] = "Verberge diese Kontakt";
|
||||||
$a->strings["Welcome home %s."] = "Willkommen zurück %s.";
|
$a->strings["Welcome home %s."] = "Willkommen zurück %s.";
|
||||||
$a->strings["Please confirm your introduction/connection request to %s."] = "Bitte bestätige deine Kontaktanfrage bei %s.";
|
$a->strings["Please confirm your introduction/connection request to %s."] = "Bitte bestätige deine Kontaktanfrage bei %s.";
|
||||||
$a->strings["Confirm"] = "Bestätigen";
|
$a->strings["Confirm"] = "Bestätigen";
|
||||||
|
|
@ -185,18 +187,14 @@ $a->strings[" - please do not use this form. Instead, enter %s into your Diaspo
|
||||||
$a->strings["Your Identity Address:"] = "Adresse deines Profils:";
|
$a->strings["Your Identity Address:"] = "Adresse deines Profils:";
|
||||||
$a->strings["Submit Request"] = "Anfrage abschicken";
|
$a->strings["Submit Request"] = "Anfrage abschicken";
|
||||||
$a->strings["Friendica Social Communications Server - Setup"] = "Friendica-Server für soziale Netzwerke – Setup";
|
$a->strings["Friendica Social Communications Server - Setup"] = "Friendica-Server für soziale Netzwerke – Setup";
|
||||||
$a->strings["Database connection"] = "Datenbankverbindung";
|
|
||||||
$a->strings["Could not connect to database."] = "Verbindung zur Datenbank gescheitert";
|
$a->strings["Could not connect to database."] = "Verbindung zur Datenbank gescheitert";
|
||||||
$a->strings["Could not create table."] = "Konnte Tabelle nicht erstellen.";
|
$a->strings["Could not create table."] = "Konnte Tabelle nicht erstellen.";
|
||||||
$a->strings["Your Friendica site database has been installed."] = "Die Datenbank deiner Friendica Seite wurde installiert.";
|
$a->strings["Your Friendica site database has been installed."] = "Die Datenbank deiner Friendica Seite wurde installiert.";
|
||||||
$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "WICHTIG: Du musst [manuell] einen Cronjob (o.ä.) für den Poller einrichten.";
|
|
||||||
$a->strings["Please see the file \"INSTALL.txt\"."] = "Lies bitte die \"INSTALL.txt\".";
|
|
||||||
$a->strings["Proceed to registration"] = "Mit der Registrierung fortfahren";
|
|
||||||
$a->strings["Proceed with Installation"] = "Mit der Installation fortfahren";
|
|
||||||
$a->strings["You may need to import the file \"database.sql\" manually using phpmyadmin or mysql."] = "Möglicherweise musst du die Datei \"database.sql\" manuell mit phpmyadmin oder mysql importieren.";
|
$a->strings["You may need to import the file \"database.sql\" manually using phpmyadmin or mysql."] = "Möglicherweise musst du die Datei \"database.sql\" manuell mit phpmyadmin oder mysql importieren.";
|
||||||
$a->strings["Database import failed."] = "Import der Datenbank schlug fehl.";
|
$a->strings["Please see the file \"INSTALL.txt\"."] = "Lies bitte die \"INSTALL.txt\".";
|
||||||
$a->strings["System check"] = "Systemtest";
|
$a->strings["System check"] = "Systemtest";
|
||||||
$a->strings["Check again"] = "Noch einmal testen";
|
$a->strings["Check again"] = "Noch einmal testen";
|
||||||
|
$a->strings["Database connection"] = "Datenbankverbindung";
|
||||||
$a->strings["In order to install Friendica we need to know how to connect to your database."] = "Um Friendica installieren zu können, müssen wir wissen, wie wir zu deiner Datenbank Kontakt aufnehmen können.";
|
$a->strings["In order to install Friendica we need to know how to connect to your database."] = "Um Friendica installieren zu können, müssen wir wissen, wie wir zu deiner Datenbank Kontakt aufnehmen können.";
|
||||||
$a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Bitte kontaktiere den Hosting Provider oder den Administrator der Seite, falls du Fragen zu diesen Einstellungen haben solltest.";
|
$a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Bitte kontaktiere den Hosting Provider oder den Administrator der Seite, falls du Fragen zu diesen Einstellungen haben solltest.";
|
||||||
$a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "Die Datenbank, die du unten angibst, sollte bereits existieren. Ist dies noch nicht der Fall, erzeuge sie bitte bevor du mit der Installation fortfährst.";
|
$a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "Die Datenbank, die du unten angibst, sollte bereits existieren. Ist dies noch nicht der Fall, erzeuge sie bitte bevor du mit der Installation fortfährst.";
|
||||||
|
|
@ -209,8 +207,9 @@ $a->strings["Your account email address must match this in order to use the web
|
||||||
$a->strings["Please select a default timezone for your website"] = "Bitte wähle die Standardzeitzone deiner Webseite";
|
$a->strings["Please select a default timezone for your website"] = "Bitte wähle die Standardzeitzone deiner Webseite";
|
||||||
$a->strings["Site settings"] = "Server-Einstellungen";
|
$a->strings["Site settings"] = "Server-Einstellungen";
|
||||||
$a->strings["Could not find a command line version of PHP in the web server PATH."] = "Konnte keine Kommandozeilenversion von PHP im PATH des Servers finden.";
|
$a->strings["Could not find a command line version of PHP in the web server PATH."] = "Konnte keine Kommandozeilenversion von PHP im PATH des Servers finden.";
|
||||||
|
$a->strings["If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron. See <a href='http://friendica.com/node/27'>'Activating scheduled tasks'</a>"] = "Wenn du keine Kommandozeilen Version von PHP auf deinem Server installiert hast, kannst du keine Hintergrundprozesse via cron starten. Siehe <a href='http://friendica.com/node/27'>'Activating scheduled tasks'</a>";
|
||||||
$a->strings["PHP executable path"] = "Pfad zu PHP";
|
$a->strings["PHP executable path"] = "Pfad zu PHP";
|
||||||
$a->strings["Enter full path to php executable"] = "Kompletter Pfad zum PHP-Executable";
|
$a->strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "Gib den kompletten Pfad zur ausführbaren Datei von PHP an. Du kannst diesen Feld auch frei lassen und mit der Installation fortfahren.";
|
||||||
$a->strings["Command line PHP"] = "Kommandozeilen-PHP";
|
$a->strings["Command line PHP"] = "Kommandozeilen-PHP";
|
||||||
$a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "Die Kommandozeilenversion von PHP auf deinem System hat \"register_argc_argv\" nicht aktiviert.";
|
$a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "Die Kommandozeilenversion von PHP auf deinem System hat \"register_argc_argv\" nicht aktiviert.";
|
||||||
$a->strings["This is required for message delivery to work."] = "Dies wird für die Auslieferung von Nachrichten benötigt.";
|
$a->strings["This is required for message delivery to work."] = "Dies wird für die Auslieferung von Nachrichten benötigt.";
|
||||||
|
|
@ -232,11 +231,15 @@ $a->strings["Error: mysqli PHP module required but not installed."] = "Fehler: D
|
||||||
$a->strings["Error: mb_string PHP module required but not installed."] = "Fehler: mb_string PHP Module wird benötigt ist aber nicht installiert.";
|
$a->strings["Error: mb_string PHP module required but not installed."] = "Fehler: mb_string PHP Module wird benötigt ist aber nicht installiert.";
|
||||||
$a->strings["The web installer needs to be able to create a file called \".htconfig.php\ in the top folder of your web server and it is unable to do so."] = "Der Installationswizard muss in der Lage sein, eine Datei im Stammverzeichnis deines Webservers anzulegen, ist allerdings derzeit nicht in der Lage, dies zu tun.";
|
$a->strings["The web installer needs to be able to create a file called \".htconfig.php\ in the top folder of your web server and it is unable to do so."] = "Der Installationswizard muss in der Lage sein, eine Datei im Stammverzeichnis deines Webservers anzulegen, ist allerdings derzeit nicht in der Lage, dies zu tun.";
|
||||||
$a->strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "In den meisten Fällen ist dies ein Problem mit den Schreibrechten, der Webserver könnte keine Schreiberlaubnis haben, selbst wenn du sie hast.";
|
$a->strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "In den meisten Fällen ist dies ein Problem mit den Schreibrechten, der Webserver könnte keine Schreiberlaubnis haben, selbst wenn du sie hast.";
|
||||||
$a->strings["Please check with your site documentation or support people to see if this situation can be corrected."] = "Bitte überprüfe die Einstellungen und frage im Zweifelsfall dein Support Team, um diese Situation zu beheben.";
|
$a->strings["At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Friendica top folder."] = "Nachdem du alles ausgefüllt hast, erhältst du einen Text, den du in eine Datei namens .htconfig.php in deinem Friendica-Wurzelverzeichnis kopieren musst.";
|
||||||
$a->strings["If not, you may be required to perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "Sollte dies nicht möglich sein, musst du die Installation manuell durchführen. Lies dazu bitte in der Datei \"INSTALL.txt\".";
|
$a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "Alternativ kannst du diesen Schritt aber auch überspringen und die Installation manuell durchführen. Eine Anleitung dazu (Englisch) findest du in der Datei INSTALL.txt.";
|
||||||
$a->strings[".htconfig.php is writable"] = "Schreibrechte auf .htconfig.php";
|
$a->strings[".htconfig.php is writable"] = "Schreibrechte auf .htconfig.php";
|
||||||
|
$a->strings["Url rewrite in .htaccess is not working. Check your server configuration."] = "Umschreiben der URLs in der .htaccess funktioniert nicht. Überprüfe die Konfiguration des Servers.";
|
||||||
|
$a->strings["Url rewrite is working"] = "URL rewrite funktioniert";
|
||||||
$a->strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "Die Konfigurationsdatei \".htconfig.php\" konnte nicht angelegt werden. Bitte verwende den angefügten Text, um die Datei im Stammverzeichnis deiner Friendica-Installation zu erzeugen.";
|
$a->strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "Die Konfigurationsdatei \".htconfig.php\" konnte nicht angelegt werden. Bitte verwende den angefügten Text, um die Datei im Stammverzeichnis deiner Friendica-Installation zu erzeugen.";
|
||||||
$a->strings["Errors encountered creating database tables."] = "Fehler aufgetreten während der Erzeugung der Datenbanktabellen.";
|
$a->strings["Errors encountered creating database tables."] = "Fehler aufgetreten während der Erzeugung der Datenbanktabellen.";
|
||||||
|
$a->strings["<h1>What next</h1>"] = "<h1>Wie geht es weiter?</h1>";
|
||||||
|
$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "WICHTIG: Du musst [manuell] einen Cronjob (o.ä.) für den Poller einrichten.";
|
||||||
$a->strings["l F d, Y \\@ g:i A"] = "l F d, Y \\@ g:i A";
|
$a->strings["l F d, Y \\@ g:i A"] = "l F d, Y \\@ g:i A";
|
||||||
$a->strings["Time Conversion"] = "Zeitumrechnung";
|
$a->strings["Time Conversion"] = "Zeitumrechnung";
|
||||||
$a->strings["Friendika provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica bietet diese Funktion an, um das Teilen von Events mit den Kontakten zu vereinfachen, deren Zeitzone nicht ermittelt werden kann.";
|
$a->strings["Friendika provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica bietet diese Funktion an, um das Teilen von Events mit den Kontakten zu vereinfachen, deren Zeitzone nicht ermittelt werden kann.";
|
||||||
|
|
@ -403,8 +406,8 @@ $a->strings[" Please use a shorter name."] = " Bitte verwende einen kürzeren Na
|
||||||
$a->strings[" Name too short."] = " Name ist zu kurz.";
|
$a->strings[" Name too short."] = " Name ist zu kurz.";
|
||||||
$a->strings[" Not valid email."] = " Keine gültige E-Mail.";
|
$a->strings[" Not valid email."] = " Keine gültige E-Mail.";
|
||||||
$a->strings[" Cannot change to that email."] = "Ändern der E-Mail nicht möglich. ";
|
$a->strings[" Cannot change to that email."] = "Ändern der E-Mail nicht möglich. ";
|
||||||
$a->strings["Private forum has no privacy permissions. Using default privacy group."] = "";
|
$a->strings["Private forum has no privacy permissions. Using default privacy group."] = "Für das private Forum sind keine Zugriffsrechte eingestellt. Die voreingestellte Gruppe für neue Kontakte wird benutzt.";
|
||||||
$a->strings["Private forum has no privacy permissions and no default privacy group."] = "";
|
$a->strings["Private forum has no privacy permissions and no default privacy group."] = "Für das private Forum sind keine Zugriffsrechte eingestellt, und es gibt keine voreingestellte Gruppe für neue Kontakte.";
|
||||||
$a->strings["Settings updated."] = "Einstellungen aktualisiert.";
|
$a->strings["Settings updated."] = "Einstellungen aktualisiert.";
|
||||||
$a->strings["Add application"] = "Programm hinzufügen";
|
$a->strings["Add application"] = "Programm hinzufügen";
|
||||||
$a->strings["Consumer Key"] = "Consumer Key";
|
$a->strings["Consumer Key"] = "Consumer Key";
|
||||||
|
|
@ -446,16 +449,16 @@ $a->strings["Minimum of 10 seconds, no maximum"] = "Minimal 10 Sekunden, kein Ma
|
||||||
$a->strings["Number of items to display on the network page:"] = "Zahl der Beiträge, die pro Netzwerkseite angezeigt werden sollen: ";
|
$a->strings["Number of items to display on the network page:"] = "Zahl der Beiträge, die pro Netzwerkseite angezeigt werden sollen: ";
|
||||||
$a->strings["Maximum of 100 items"] = "Maximal 100 Beiträge";
|
$a->strings["Maximum of 100 items"] = "Maximal 100 Beiträge";
|
||||||
$a->strings["Don't show emoticons"] = "Keine Smilies anzeigen";
|
$a->strings["Don't show emoticons"] = "Keine Smilies anzeigen";
|
||||||
$a->strings["Normal Account"] = "Normaler Account";
|
$a->strings["Normal Account Page"] = "Normale Account Seite";
|
||||||
$a->strings["This account is a normal personal profile"] = "Dieser Account ist ein normales persönliches Profil";
|
$a->strings["This account is a normal personal profile"] = "Dieser Account ist ein normales persönliches Profil";
|
||||||
$a->strings["Soapbox Account"] = "Sandkasten-Account";
|
$a->strings["Soapbox Page"] = "Sandkasten Seite";
|
||||||
$a->strings["Automatically approve all connection/friend requests as read-only fans"] = "Kontaktanfragen werden automatisch als Nurlese-Fans akzeptiert";
|
$a->strings["Automatically approve all connection/friend requests as read-only fans"] = "Kontaktanfragen werden automatisch als Nurlese-Fans akzeptiert";
|
||||||
$a->strings["Community/Celebrity Account"] = "Gemeinschafts-/Promi-Account";
|
$a->strings["Community Forum/Celebrity Account"] = "Gemeinschafts Forum / Promi Konto";
|
||||||
$a->strings["Automatically approve all connection/friend requests as read-write fans"] = "Kontaktanfragen werden automatisch als Lese-und-Schreib-Fans akzeptiert";
|
$a->strings["Automatically approve all connection/friend requests as read-write fans"] = "Kontaktanfragen werden automatisch als Lese-und-Schreib-Fans akzeptiert";
|
||||||
$a->strings["Automatic Friend Account"] = "Automatischer Freundesaccount";
|
$a->strings["Automatic Friend Page"] = "Automatische Freunde Seite";
|
||||||
$a->strings["Automatically approve all connection/friend requests as friends"] = "Kontaktanfragen werden automatisch als Freund akzeptiert";
|
$a->strings["Automatically approve all connection/friend requests as friends"] = "Kontaktanfragen werden automatisch als Freund akzeptiert";
|
||||||
$a->strings["Private Forum"] = "";
|
$a->strings["Private Forum [Experimental]"] = "Privates Forum [Versuchsstadium]";
|
||||||
$a->strings["Private forum - approved members only [Experimental]"] = "";
|
$a->strings["Private forum - approved members only"] = "Privates Forum - Ausschließlich für Mitglieder";
|
||||||
$a->strings["OpenID:"] = "OpenID:";
|
$a->strings["OpenID:"] = "OpenID:";
|
||||||
$a->strings["(Optional) Allow this OpenID to login to this account."] = "(Optional) Erlaube die Anmeldung für diesen Account mit dieser OpenID.";
|
$a->strings["(Optional) Allow this OpenID to login to this account."] = "(Optional) Erlaube die Anmeldung für diesen Account mit dieser OpenID.";
|
||||||
$a->strings["Publish your default profile in your local site directory?"] = "Veröffentliche dein Standardprofil im Verzeichnis der lokalen Seite?";
|
$a->strings["Publish your default profile in your local site directory?"] = "Veröffentliche dein Standardprofil im Verzeichnis der lokalen Seite?";
|
||||||
|
|
@ -477,6 +480,7 @@ $a->strings["Expire posts:"] = "Beiträge verfallen lassen:";
|
||||||
$a->strings["Expire personal notes:"] = "Persönliche Notizen verfallen lassen:";
|
$a->strings["Expire personal notes:"] = "Persönliche Notizen verfallen lassen:";
|
||||||
$a->strings["Expire starred posts:"] = "Markierte Beiträge verfallen lassen:";
|
$a->strings["Expire starred posts:"] = "Markierte Beiträge verfallen lassen:";
|
||||||
$a->strings["Expire photos:"] = "Fotos verfallen lassen:";
|
$a->strings["Expire photos:"] = "Fotos verfallen lassen:";
|
||||||
|
$a->strings["Only expire posts by others:"] = "Nur Beiträge anderer verfallen";
|
||||||
$a->strings["Account Settings"] = "Account-Einstellungen";
|
$a->strings["Account Settings"] = "Account-Einstellungen";
|
||||||
$a->strings["Password Settings"] = "Passwort-Einstellungen";
|
$a->strings["Password Settings"] = "Passwort-Einstellungen";
|
||||||
$a->strings["New Password:"] = "Neues Passwort:";
|
$a->strings["New Password:"] = "Neues Passwort:";
|
||||||
|
|
@ -507,7 +511,8 @@ $a->strings["Someone writes a followup comment"] = "– jemand auch einen Kommen
|
||||||
$a->strings["You receive a private message"] = "– du eine private Nachricht erhältst";
|
$a->strings["You receive a private message"] = "– du eine private Nachricht erhältst";
|
||||||
$a->strings["You receive a friend suggestion"] = "- du eine Empfehlung erhältst";
|
$a->strings["You receive a friend suggestion"] = "- du eine Empfehlung erhältst";
|
||||||
$a->strings["You are tagged in a post"] = "- du in einem Beitrag erwähnt wurdest";
|
$a->strings["You are tagged in a post"] = "- du in einem Beitrag erwähnt wurdest";
|
||||||
$a->strings["Advanced Page Settings"] = "Erweiterte Seiten-Einstellungen";
|
$a->strings["Advanced Account/Page Type Settings"] = "";
|
||||||
|
$a->strings["Change the behaviour of this account for special situations"] = "Ändere das Verhalten deines Accounts für spezielle Situationen.";
|
||||||
$a->strings["Manage Identities and/or Pages"] = "Verwalte Identitäten und/oder Seiten";
|
$a->strings["Manage Identities and/or Pages"] = "Verwalte Identitäten und/oder Seiten";
|
||||||
$a->strings["Toggle between different identities or community/group pages which share your account details or which you have been granted \"manage\" permissions"] = "Wechsle zwischen verschiedenen Identitäten oder Gemeinschafts-/Gruppen-Seiten, die deine Zugangsdetails teilen oder zu denen du \"Manage\" Befugnisse bekommen hast.";
|
$a->strings["Toggle between different identities or community/group pages which share your account details or which you have been granted \"manage\" permissions"] = "Wechsle zwischen verschiedenen Identitäten oder Gemeinschafts-/Gruppen-Seiten, die deine Zugangsdetails teilen oder zu denen du \"Manage\" Befugnisse bekommen hast.";
|
||||||
$a->strings["Select an identity to manage: "] = "Wähle eine Identität zum Verwalten: ";
|
$a->strings["Select an identity to manage: "] = "Wähle eine Identität zum Verwalten: ";
|
||||||
|
|
@ -590,22 +595,6 @@ $a->strings["Visible To"] = "Sichtbar für";
|
||||||
$a->strings["All Contacts (with secure profile access)"] = "Alle Kontakte (mit gesichertem Profilzugriff)";
|
$a->strings["All Contacts (with secure profile access)"] = "Alle Kontakte (mit gesichertem Profilzugriff)";
|
||||||
$a->strings["No contacts."] = "Keine Kontakte.";
|
$a->strings["No contacts."] = "Keine Kontakte.";
|
||||||
$a->strings["View Contacts"] = "Kontakte anzeigen";
|
$a->strings["View Contacts"] = "Kontakte anzeigen";
|
||||||
$a->strings["An invitation is required."] = "Du benötigst eine Einladung.";
|
|
||||||
$a->strings["Invitation could not be verified."] = "Die Einladung konnte nicht überprüft werden.";
|
|
||||||
$a->strings["Invalid OpenID url"] = "Ungültige OpenID URL";
|
|
||||||
$a->strings["Please enter the required information."] = "Bitte trage die erforderlichen Informationen ein.";
|
|
||||||
$a->strings["Please use a shorter name."] = "Bitte verwende einen kürzeren Namen.";
|
|
||||||
$a->strings["Name too short."] = "Der Name ist zu kurz.";
|
|
||||||
$a->strings["That doesn't appear to be your full (First Last) name."] = "Das scheint nicht dein kompletter Name (Vor- und Nachname) zu sein.";
|
|
||||||
$a->strings["Your email domain is not among those allowed on this site."] = "Die Domain deiner E-Mail Adresse ist auf dieser Seite nicht erlaubt.";
|
|
||||||
$a->strings["Not a valid email address."] = "Keine gültige E-Mail-Adresse.";
|
|
||||||
$a->strings["Cannot use that email."] = "Konnte diese E-Mail-Adresse nicht verwenden.";
|
|
||||||
$a->strings["Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and must also begin with a letter."] = "Dein Spitzname darf nur aus Buchstaben und Zahlen (\"a-z\",\"0-9\", \"_\" und \"-\") bestehen, außerdem muss er mit einem Buchstaben beginnen.";
|
|
||||||
$a->strings["Nickname is already registered. Please choose another."] = "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen.";
|
|
||||||
$a->strings["Nickname was once registered here and may not be re-used. Please choose another."] = "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen.";
|
|
||||||
$a->strings["SERIOUS ERROR: Generation of security keys failed."] = "FATALER FEHLER: Sicherheitsschlüssel konnten nicht erzeugt werden.";
|
|
||||||
$a->strings["An error occurred during registration. Please try again."] = "Wärend der Anmeldung ist ein Fehler aufgetreten. Bitte versuche es noch einmal.";
|
|
||||||
$a->strings["An error occurred creating your default profile. Please try again."] = "Bei der Erstellung des Standardprofils ist ein Fehler aufgetreten. Bitte versuche es noch einmal.";
|
|
||||||
$a->strings["Registration details for %s"] = "Details der Registration von %s";
|
$a->strings["Registration details for %s"] = "Details der Registration von %s";
|
||||||
$a->strings["Registration successful. Please check your email for further instructions."] = "Registrierung erfolgreich. Eine E-Mail mit weiteren Anweisungen wurde an dich gesendet.";
|
$a->strings["Registration successful. Please check your email for further instructions."] = "Registrierung erfolgreich. Eine E-Mail mit weiteren Anweisungen wurde an dich gesendet.";
|
||||||
$a->strings["Failed to send email message. Here is the message that failed."] = "Konnte die E-Mail nicht versenden. Hier ist die Nachricht, die nicht gesendet werden konnte.";
|
$a->strings["Failed to send email message. Here is the message that failed."] = "Konnte die E-Mail nicht versenden. Hier ist die Nachricht, die nicht gesendet werden konnte.";
|
||||||
|
|
@ -688,9 +677,13 @@ $a->strings["Users"] = "Nutzer";
|
||||||
$a->strings["Plugins"] = "Plugins";
|
$a->strings["Plugins"] = "Plugins";
|
||||||
$a->strings["Themes"] = "Themen";
|
$a->strings["Themes"] = "Themen";
|
||||||
$a->strings["DB updates"] = "DB Updates";
|
$a->strings["DB updates"] = "DB Updates";
|
||||||
$a->strings["Software Update"] = "Software Update";
|
|
||||||
$a->strings["Logs"] = "Protokolle";
|
$a->strings["Logs"] = "Protokolle";
|
||||||
$a->strings["User registrations waiting for confirmation"] = "Nutzeranmeldungen die auf Bestätigung warten";
|
$a->strings["User registrations waiting for confirmation"] = "Nutzeranmeldungen die auf Bestätigung warten";
|
||||||
|
$a->strings["Normal Account"] = "Normaler Account";
|
||||||
|
$a->strings["Soapbox Account"] = "Sandkasten-Account";
|
||||||
|
$a->strings["Community/Celebrity Account"] = "Gemeinschafts-/Promi-Account";
|
||||||
|
$a->strings["Automatic Friend Account"] = "Automatischer Freundesaccount";
|
||||||
|
$a->strings["Message queues"] = "Nachrichten-Warteschlangen";
|
||||||
$a->strings["Administration"] = "Administration";
|
$a->strings["Administration"] = "Administration";
|
||||||
$a->strings["Summary"] = "Zusammenfassung";
|
$a->strings["Summary"] = "Zusammenfassung";
|
||||||
$a->strings["Registered users"] = "Registrierte Nutzer";
|
$a->strings["Registered users"] = "Registrierte Nutzer";
|
||||||
|
|
@ -830,7 +823,7 @@ $a->strings["{0} mentioned you in a post"] = "{0} hat dich in einem Beitrag erw
|
||||||
$a->strings["Contacts who are not members of a group"] = "Kontakte, die keiner Gruppe zugewiesen sind";
|
$a->strings["Contacts who are not members of a group"] = "Kontakte, die keiner Gruppe zugewiesen sind";
|
||||||
$a->strings["OpenID protocol error. No ID returned."] = "OpenID Protokollfehler. Keine ID zurückgegeben.";
|
$a->strings["OpenID protocol error. No ID returned."] = "OpenID Protokollfehler. Keine ID zurückgegeben.";
|
||||||
$a->strings["Account not found and OpenID registration is not permitted on this site."] = "Account wurde nicht gefunden und OpenID Registrierung auf diesem Server nicht gestattet.";
|
$a->strings["Account not found and OpenID registration is not permitted on this site."] = "Account wurde nicht gefunden und OpenID Registrierung auf diesem Server nicht gestattet.";
|
||||||
$a->strings["Login failed."] = "Annmeldung fehlgeschlagen.";
|
$a->strings["Login failed."] = "Anmeldung fehlgeschlagen.";
|
||||||
$a->strings["Connect URL missing."] = "Connect-URL fehlt";
|
$a->strings["Connect URL missing."] = "Connect-URL fehlt";
|
||||||
$a->strings["This site is not configured to allow communications with other networks."] = "Diese Seite ist so konfiguriert, dass keine Kommunikation mit anderen Netzwerken erfolgen kann.";
|
$a->strings["This site is not configured to allow communications with other networks."] = "Diese Seite ist so konfiguriert, dass keine Kommunikation mit anderen Netzwerken erfolgen kann.";
|
||||||
$a->strings["No compatible communication protocols or feeds were discovered."] = "Es wurden keine kompatiblen Kommunikationsprotokolle oder Feeds gefunden.";
|
$a->strings["No compatible communication protocols or feeds were discovered."] = "Es wurden keine kompatiblen Kommunikationsprotokolle oder Feeds gefunden.";
|
||||||
|
|
@ -860,12 +853,13 @@ $a->strings["Gender"] = "Geschlecht";
|
||||||
$a->strings["Sexual Preference"] = "Sexuelle Vorlieben";
|
$a->strings["Sexual Preference"] = "Sexuelle Vorlieben";
|
||||||
$a->strings["Homepage"] = "Webseite";
|
$a->strings["Homepage"] = "Webseite";
|
||||||
$a->strings["Interests"] = "Interessen";
|
$a->strings["Interests"] = "Interessen";
|
||||||
|
$a->strings["Address"] = "Adresse";
|
||||||
$a->strings["Location"] = "Wohnort";
|
$a->strings["Location"] = "Wohnort";
|
||||||
$a->strings["Profile updated."] = "Profil aktualisiert.";
|
$a->strings["Profile updated."] = "Profil aktualisiert.";
|
||||||
$a->strings[" and "] = " und ";
|
$a->strings[" and "] = " und ";
|
||||||
$a->strings["public profile"] = "öffentliches Profil";
|
$a->strings["public profile"] = "öffentliches Profil";
|
||||||
$a->strings["%1\$s changed %2\$s to “%3\$s”"] = "%1\$s hat %2\$s geändert auf “%3\$s”";
|
$a->strings["%1\$s changed %2\$s to “%3\$s”"] = "%1\$s hat %2\$s geändert auf “%3\$s”";
|
||||||
$a->strings[" - Visit %1\$s's %2\$s"] = "";
|
$a->strings[" - Visit %1\$s's %2\$s"] = " – %1\$ss %2\$s besuchen";
|
||||||
$a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s hat folgendes aktualisiert %2\$s, verändert wurde %3\$s.";
|
$a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s hat folgendes aktualisiert %2\$s, verändert wurde %3\$s.";
|
||||||
$a->strings["Profile deleted."] = "Profil gelöscht.";
|
$a->strings["Profile deleted."] = "Profil gelöscht.";
|
||||||
$a->strings["Profile-"] = "Profil-";
|
$a->strings["Profile-"] = "Profil-";
|
||||||
|
|
@ -890,6 +884,7 @@ $a->strings["Region/State:"] = "Region/Bundesstaat:";
|
||||||
$a->strings["<span class=\"heart\">♥</span> Marital Status:"] = "<span class=\"heart\">♥</span> Beziehungsstatus:";
|
$a->strings["<span class=\"heart\">♥</span> Marital Status:"] = "<span class=\"heart\">♥</span> Beziehungsstatus:";
|
||||||
$a->strings["Who: (if applicable)"] = "Wer: (falls anwendbar)";
|
$a->strings["Who: (if applicable)"] = "Wer: (falls anwendbar)";
|
||||||
$a->strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Beispiele: cathy123, Cathy Williams, cathy@example.com";
|
$a->strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Beispiele: cathy123, Cathy Williams, cathy@example.com";
|
||||||
|
$a->strings["Since [date]:"] = "Seit [Datum]:";
|
||||||
$a->strings["Sexual Preference:"] = "Sexuelle Vorlieben:";
|
$a->strings["Sexual Preference:"] = "Sexuelle Vorlieben:";
|
||||||
$a->strings["Homepage URL:"] = "Adresse der Homepage:";
|
$a->strings["Homepage URL:"] = "Adresse der Homepage:";
|
||||||
$a->strings["Political Views:"] = "Politische Ansichten:";
|
$a->strings["Political Views:"] = "Politische Ansichten:";
|
||||||
|
|
@ -1099,12 +1094,15 @@ $a->strings["Drupal site URL"] = "URL der Drupal Seite";
|
||||||
$a->strings["Drupal site uses clean URLS"] = "Drupal Seite verwendet bereinigte URLs";
|
$a->strings["Drupal site uses clean URLS"] = "Drupal Seite verwendet bereinigte URLs";
|
||||||
$a->strings["Post to Drupal by default"] = "Veröffentliche öffentliche Beiträge standardmäßig bei Drupal";
|
$a->strings["Post to Drupal by default"] = "Veröffentliche öffentliche Beiträge standardmäßig bei Drupal";
|
||||||
$a->strings["Post from Friendica"] = "Beitrag via Friendica";
|
$a->strings["Post from Friendica"] = "Beitrag via Friendica";
|
||||||
|
$a->strings["Startpage Settings"] = "Startseiten-Einstellungen";
|
||||||
|
$a->strings["Home page to load after login - leave blank for profile wall"] = "Seite, die nach dem Anmelden geladen werden soll. Leer = Pinnwand";
|
||||||
|
$a->strings["Examples: "network" or "notifications/system""] = "Beispiele: network, notifications/system";
|
||||||
$a->strings["Geonames settings updated."] = "Geonames Einstellungen aktualisiert";
|
$a->strings["Geonames settings updated."] = "Geonames Einstellungen aktualisiert";
|
||||||
$a->strings["Geonames Settings"] = "Geonames Einstellungen";
|
$a->strings["Geonames Settings"] = "Geonames Einstellungen";
|
||||||
$a->strings["Enable Geonames Plugin"] = "Geonames Plugin aktivieren";
|
$a->strings["Enable Geonames Plugin"] = "Geonames Plugin aktivieren";
|
||||||
$a->strings["Your account on %s will expire in a few days."] = "Dein Konto auf %s wird in ein paar Tagen verfallen.";
|
$a->strings["Your account on %s will expire in a few days."] = "Dein Konto auf %s wird in ein paar Tagen verfallen.";
|
||||||
$a->strings["Your Friendica account is about to expire."] = "";
|
$a->strings["Your Friendica account is about to expire."] = "Dein Friendica-Account wird in Kürze auslaufen.";
|
||||||
$a->strings["Hi %1\$s,\n\nYour account on %2\$s will expire in less than five days. You may keep your account by logging in at least once every 30 days"] = "";
|
$a->strings["Hi %1\$s,\n\nYour account on %2\$s will expire in less than five days. You may keep your account by logging in at least once every 30 days"] = "Hallo %1\$s,\n\ndein Account auf %2\$s wird in weniger als fünf Tagen auslaufen. Du kannst das verhindern, indem du dich mindestens einmal alle 30 Tage anmeldest.";
|
||||||
$a->strings["Upload a file"] = "Datei hochladen";
|
$a->strings["Upload a file"] = "Datei hochladen";
|
||||||
$a->strings["Drop files here to upload"] = "Ziehe Dateien hierher, um sie hochzuladen";
|
$a->strings["Drop files here to upload"] = "Ziehe Dateien hierher, um sie hochzuladen";
|
||||||
$a->strings["Failed"] = "Fehlgeschlagen";
|
$a->strings["Failed"] = "Fehlgeschlagen";
|
||||||
|
|
@ -1223,8 +1221,8 @@ $a->strings["WordPress username"] = "WordPress-Benutzername";
|
||||||
$a->strings["WordPress password"] = "WordPress-Passwort";
|
$a->strings["WordPress password"] = "WordPress-Passwort";
|
||||||
$a->strings["WordPress API URL"] = "WordPress-API-URL";
|
$a->strings["WordPress API URL"] = "WordPress-API-URL";
|
||||||
$a->strings["Post to WordPress by default"] = "Standardmäßig auf WordPress veröffentlichen";
|
$a->strings["Post to WordPress by default"] = "Standardmäßig auf WordPress veröffentlichen";
|
||||||
$a->strings["Provide a backlink to the Friendica post"] = "";
|
$a->strings["Provide a backlink to the Friendica post"] = "Einen zurück zum Friendica-Beitrag hinzufügen";
|
||||||
$a->strings["Read the original post and comment stream on Friendica"] = "";
|
$a->strings["Read the original post and comment stream on Friendica"] = "Den Original-Beitrag samt Kommentaren bei Friendica lesen";
|
||||||
$a->strings["\"Show more\" Settings"] = "\"Mehr zeigen\" Einstellungen";
|
$a->strings["\"Show more\" Settings"] = "\"Mehr zeigen\" Einstellungen";
|
||||||
$a->strings["Enable Show More"] = "Aktiviere \"Mehr zeigen\"";
|
$a->strings["Enable Show More"] = "Aktiviere \"Mehr zeigen\"";
|
||||||
$a->strings["Cutting posts after how much characters"] = "Begrenze Beiträge nach einer bestimmten Anzahl an Buchstaben";
|
$a->strings["Cutting posts after how much characters"] = "Begrenze Beiträge nach einer bestimmten Anzahl an Buchstaben";
|
||||||
|
|
@ -1318,6 +1316,7 @@ $a->strings["j F"] = "j F";
|
||||||
$a->strings["Birthday:"] = "Geburtstag:";
|
$a->strings["Birthday:"] = "Geburtstag:";
|
||||||
$a->strings["Age:"] = "Alter:";
|
$a->strings["Age:"] = "Alter:";
|
||||||
$a->strings["Status:"] = "Status:";
|
$a->strings["Status:"] = "Status:";
|
||||||
|
$a->strings["for %1\$d %2\$s"] = "für %1\$d %2\$s";
|
||||||
$a->strings["Homepage:"] = "Homepage:";
|
$a->strings["Homepage:"] = "Homepage:";
|
||||||
$a->strings["Tags:"] = "Tags";
|
$a->strings["Tags:"] = "Tags";
|
||||||
$a->strings["Religion:"] = "Religion:";
|
$a->strings["Religion:"] = "Religion:";
|
||||||
|
|
@ -1458,7 +1457,7 @@ $a->strings["view full size"] = "Volle Größe anzeigen";
|
||||||
$a->strings["Embedded content"] = "Eingebetteter Inhalt";
|
$a->strings["Embedded content"] = "Eingebetteter Inhalt";
|
||||||
$a->strings["Embedding disabled"] = "Einbettungen deaktiviert";
|
$a->strings["Embedding disabled"] = "Einbettungen deaktiviert";
|
||||||
$a->strings["A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Eine gelöschte Gruppe mit diesem Namen wurde wiederbelebt. Bestehende Berechtigungseinstellungen <strong>könnten</strong> auf diese Gruppe oder zukünftige Mitglieder angewandt werden. Falls du dies nicht möchtest, erstelle bitte eine andere Gruppe mit einem anderen Namen.";
|
$a->strings["A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Eine gelöschte Gruppe mit diesem Namen wurde wiederbelebt. Bestehende Berechtigungseinstellungen <strong>könnten</strong> auf diese Gruppe oder zukünftige Mitglieder angewandt werden. Falls du dies nicht möchtest, erstelle bitte eine andere Gruppe mit einem anderen Namen.";
|
||||||
$a->strings["Default privacy group for new contacts"] = "";
|
$a->strings["Default privacy group for new contacts"] = "Voreingestellte Gruppe für neue Kontakte";
|
||||||
$a->strings["Everybody"] = "Alle Kontakte";
|
$a->strings["Everybody"] = "Alle Kontakte";
|
||||||
$a->strings["edit"] = "bearbeiten";
|
$a->strings["edit"] = "bearbeiten";
|
||||||
$a->strings["Groups"] = "Gruppen";
|
$a->strings["Groups"] = "Gruppen";
|
||||||
|
|
@ -1581,6 +1580,22 @@ $a->strings["A new person is sharing with you at "] = "Eine neue Person teilt mi
|
||||||
$a->strings["You have a new follower at "] = "Du hast einen neuen Kontakt auf ";
|
$a->strings["You have a new follower at "] = "Du hast einen neuen Kontakt auf ";
|
||||||
$a->strings["image/photo"] = "Bild/Foto";
|
$a->strings["image/photo"] = "Bild/Foto";
|
||||||
$a->strings["link"] = "Verweis";
|
$a->strings["link"] = "Verweis";
|
||||||
|
$a->strings["An invitation is required."] = "Du benötigst eine Einladung.";
|
||||||
|
$a->strings["Invitation could not be verified."] = "Die Einladung konnte nicht überprüft werden.";
|
||||||
|
$a->strings["Invalid OpenID url"] = "Ungültige OpenID URL";
|
||||||
|
$a->strings["Please enter the required information."] = "Bitte trage die erforderlichen Informationen ein.";
|
||||||
|
$a->strings["Please use a shorter name."] = "Bitte verwende einen kürzeren Namen.";
|
||||||
|
$a->strings["Name too short."] = "Der Name ist zu kurz.";
|
||||||
|
$a->strings["That doesn't appear to be your full (First Last) name."] = "Das scheint nicht dein kompletter Name (Vor- und Nachname) zu sein.";
|
||||||
|
$a->strings["Your email domain is not among those allowed on this site."] = "Die Domain deiner E-Mail Adresse ist auf dieser Seite nicht erlaubt.";
|
||||||
|
$a->strings["Not a valid email address."] = "Keine gültige E-Mail-Adresse.";
|
||||||
|
$a->strings["Cannot use that email."] = "Konnte diese E-Mail-Adresse nicht verwenden.";
|
||||||
|
$a->strings["Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and must also begin with a letter."] = "Dein Spitzname darf nur aus Buchstaben und Zahlen (\"a-z\",\"0-9\", \"_\" und \"-\") bestehen, außerdem muss er mit einem Buchstaben beginnen.";
|
||||||
|
$a->strings["Nickname is already registered. Please choose another."] = "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen.";
|
||||||
|
$a->strings["Nickname was once registered here and may not be re-used. Please choose another."] = "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen.";
|
||||||
|
$a->strings["SERIOUS ERROR: Generation of security keys failed."] = "FATALER FEHLER: Sicherheitsschlüssel konnten nicht erzeugt werden.";
|
||||||
|
$a->strings["An error occurred during registration. Please try again."] = "Wärend der Anmeldung ist ein Fehler aufgetreten. Bitte versuche es noch einmal.";
|
||||||
|
$a->strings["An error occurred creating your default profile. Please try again."] = "Bei der Erstellung des Standardprofils ist ein Fehler aufgetreten. Bitte versuche es noch einmal.";
|
||||||
$a->strings["Welcome "] = "Willkommen ";
|
$a->strings["Welcome "] = "Willkommen ";
|
||||||
$a->strings["Please upload a profile photo."] = "Bitte lade ein Profilbild hoch.";
|
$a->strings["Please upload a profile photo."] = "Bitte lade ein Profilbild hoch.";
|
||||||
$a->strings["Welcome back "] = "Willkommen zurück ";
|
$a->strings["Welcome back "] = "Willkommen zurück ";
|
||||||
|
|
|
||||||
|
|
@ -11,6 +11,10 @@ $please
|
||||||
<input type="hidden" name="localconfirm" value="1" />
|
<input type="hidden" name="localconfirm" value="1" />
|
||||||
$aes_allow
|
$aes_allow
|
||||||
|
|
||||||
|
<label id="dfrn-request-homecoming-hide-label" for="dfrn-request-homecoming-hide">$hidethem</label>
|
||||||
|
<input type="checkbox" name="hidden-contact" value="1" {{ if $hidechecked }}checked="checked" {{ endif }} />
|
||||||
|
|
||||||
|
|
||||||
<div id="dfrn-request-homecoming-submit-wrapper" >
|
<div id="dfrn-request-homecoming-submit-wrapper" >
|
||||||
<input id="dfrn-request-homecoming-submit" type="submit" name="submit" value="$submit" />
|
<input id="dfrn-request-homecoming-submit" type="submit" name="submit" value="$submit" />
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
4
view/diaspora_like_relay.tpl
Normal file → Executable file
4
view/diaspora_like_relay.tpl
Normal file → Executable file
|
|
@ -5,9 +5,9 @@
|
||||||
<target_type>$target_type</target_type>
|
<target_type>$target_type</target_type>
|
||||||
<parent_guid>$parent_guid</parent_guid>
|
<parent_guid>$parent_guid</parent_guid>
|
||||||
<parent_author_signature>$parentsig</parent_author_signature>
|
<parent_author_signature>$parentsig</parent_author_signature>
|
||||||
<author_signature>$authrosig</author_signature>
|
<author_signature>$authorsig</author_signature>
|
||||||
<positive>$positive</positive>
|
<positive>$positive</positive>
|
||||||
<diaspora_handle>$handle</diaspora_handle>
|
<diaspora_handle>$handle</diaspora_handle>
|
||||||
</like>
|
</like>
|
||||||
</post>
|
</post>
|
||||||
</XML>
|
</XML>
|
||||||
|
|
|
||||||
10
view/diaspora_relay_retraction.tpl
Normal file
10
view/diaspora_relay_retraction.tpl
Normal file
|
|
@ -0,0 +1,10 @@
|
||||||
|
<XML>
|
||||||
|
<post>
|
||||||
|
<relayable_retraction>
|
||||||
|
<target_type>$type</target_type>
|
||||||
|
<target_guid>$guid</target_guid>
|
||||||
|
<target_author_signature>$signature</target_author_signature>
|
||||||
|
<sender_handle>$handle</sender_handle>
|
||||||
|
</relayable_retraction>
|
||||||
|
</post>
|
||||||
|
</XML>
|
||||||
11
view/diaspora_relayable_retraction.tpl
Executable file
11
view/diaspora_relayable_retraction.tpl
Executable file
|
|
@ -0,0 +1,11 @@
|
||||||
|
<XML>
|
||||||
|
<post>
|
||||||
|
<relayable_retraction>
|
||||||
|
<target_type>$target_type</target_type>
|
||||||
|
<target_guid>$guid</target_guid>
|
||||||
|
<parent_author_signature>$parentsig</parent_author_signature>
|
||||||
|
<target_author_signature>$authorsig</target_author_signature>
|
||||||
|
<sender_handle>$handle</sender_handle>
|
||||||
|
</relayable_retraction>
|
||||||
|
</post>
|
||||||
|
</XML>
|
||||||
|
|
@ -1,7 +1,5 @@
|
||||||
{{inc field_radio.tpl with $field=$page_normal }}{{endinc}}
|
{{inc field_radio.tpl with $field=$page_normal }}{{endinc}}
|
||||||
{{inc field_radio.tpl with $field=$page_soapbox }}{{endinc}}
|
|
||||||
{{inc field_radio.tpl with $field=$page_community }}{{endinc}}
|
{{inc field_radio.tpl with $field=$page_community }}{{endinc}}
|
||||||
{{inc field_radio.tpl with $field=$page_freelove }}{{endinc}}
|
|
||||||
{{ if $experimental }}
|
|
||||||
{{inc field_radio.tpl with $field=$page_prvgroup }}{{endinc}}
|
{{inc field_radio.tpl with $field=$page_prvgroup }}{{endinc}}
|
||||||
{{ endif }}
|
{{inc field_radio.tpl with $field=$page_soapbox }}{{endinc}}
|
||||||
|
{{inc field_radio.tpl with $field=$page_freelove }}{{endinc}}
|
||||||
|
|
|
||||||
|
|
@ -29,7 +29,7 @@
|
||||||
{{ if $profile.marital }}
|
{{ if $profile.marital }}
|
||||||
<dl id="aprofile-marital" class="aprofile">
|
<dl id="aprofile-marital" class="aprofile">
|
||||||
<dt><span class="heart">♥</span> $profile.marital.0</dt>
|
<dt><span class="heart">♥</span> $profile.marital.0</dt>
|
||||||
<dd>$profile.marital.1 {{ if $profile.marital.with }}($profile.marital.with){{ endif }}</dd>
|
<dd>$profile.marital.1{{ if $profile.marital.with }} ($profile.marital.with){{ endif }}{{ if $profile.howlong }} $profile.howlong{{ endif }}</dd>
|
||||||
</dl>
|
</dl>
|
||||||
{{ endif }}
|
{{ endif }}
|
||||||
|
|
||||||
|
|
@ -54,6 +54,13 @@
|
||||||
</dl>
|
</dl>
|
||||||
{{ endif }}
|
{{ endif }}
|
||||||
|
|
||||||
|
{{ if $profile.hometown }}
|
||||||
|
<dl id="aprofile-hometown" class="aprofile">
|
||||||
|
<dt>$profile.hometown.0</dt>
|
||||||
|
<dd>$profile.hometown.1</dd>
|
||||||
|
</dl>
|
||||||
|
{{ endif }}
|
||||||
|
|
||||||
{{ if $profile.politic }}
|
{{ if $profile.politic }}
|
||||||
<dl id="aprofile-politic" class="aprofile">
|
<dl id="aprofile-politic" class="aprofile">
|
||||||
<dt>$profile.politic.0</dt>
|
<dt>$profile.politic.0</dt>
|
||||||
|
|
|
||||||
|
|
@ -97,6 +97,12 @@ $hide_friends
|
||||||
</div>
|
</div>
|
||||||
<div id="profile-edit-region-end"></div>
|
<div id="profile-edit-region-end"></div>
|
||||||
|
|
||||||
|
<div id="profile-edit-hometown-wrapper" >
|
||||||
|
<label id="profile-edit-hometown-label" for="profile-edit-hometown" >$lbl_hometown </label>
|
||||||
|
<input type="text" size="32" name="hometown" id="profile-edit-hometown" value="$hometown" />
|
||||||
|
</div>
|
||||||
|
<div id="profile-edit-hometown-end"></div>
|
||||||
|
|
||||||
<div class="profile-edit-submit-wrapper" >
|
<div class="profile-edit-submit-wrapper" >
|
||||||
<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
|
<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -108,6 +114,9 @@ $marital
|
||||||
</div>
|
</div>
|
||||||
<label id="profile-edit-with-label" for="profile-edit-with" > $lbl_with </label>
|
<label id="profile-edit-with-label" for="profile-edit-with" > $lbl_with </label>
|
||||||
<input type="text" size="32" name="with" id="profile-edit-with" title="$lbl_ex1" value="$with" />
|
<input type="text" size="32" name="with" id="profile-edit-with" title="$lbl_ex1" value="$with" />
|
||||||
|
<label id="profile-edit-howlong-label" for="profile-edit-howlong" > $lbl_howlong </label>
|
||||||
|
<input type="text" size="32" name="howlong" id="profile-edit-howlong" title="$lbl_howlong" value="$howlong" />
|
||||||
|
|
||||||
<div id="profile-edit-marital-end"></div>
|
<div id="profile-edit-marital-end"></div>
|
||||||
|
|
||||||
<div id="profile-edit-sexual-wrapper" >
|
<div id="profile-edit-sexual-wrapper" >
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,7 @@ $select
|
||||||
|
|
||||||
|
|
||||||
<div id="prvmail-submit-wrapper" >
|
<div id="prvmail-submit-wrapper" >
|
||||||
<input type="submit" id="prvmail-submit" name="submit" value="Submit" tabindex="13" />
|
<input type="submit" id="prvmail-submit" name="submit" value="$submit" tabindex="13" />
|
||||||
<div id="prvmail-upload-wrapper" >
|
<div id="prvmail-upload-wrapper" >
|
||||||
<div id="prvmail-upload" class="icon border camera" title="$upload" ></div>
|
<div id="prvmail-upload" class="icon border camera" title="$upload" ></div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -98,21 +98,22 @@ $group_select
|
||||||
|
|
||||||
|
|
||||||
<div class="settings-submit-wrapper" >
|
<div class="settings-submit-wrapper" >
|
||||||
<input type="submit" name="submit" class="settings-submit" value="Submit" />
|
<input type="submit" name="submit" class="settings-submit" value="$submit" />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<h3 class="settings-heading">$h_not</h3>
|
<h3 class="settings-heading">$h_not</h3>
|
||||||
|
<div id="settings-notifications">
|
||||||
|
|
||||||
<strong>$activity_options</strong>
|
<div id="settings-activity-desc">$activity_options</div>
|
||||||
|
|
||||||
{{inc field_checkbox.tpl with $field=$post_newfriend }}{{endinc}}
|
{{inc field_checkbox.tpl with $field=$post_newfriend }}{{endinc}}
|
||||||
{{inc field_checkbox.tpl with $field=$post_joingroup }}{{endinc}}
|
{{inc field_checkbox.tpl with $field=$post_joingroup }}{{endinc}}
|
||||||
{{inc field_checkbox.tpl with $field=$post_profilechange }}{{endinc}}
|
{{inc field_checkbox.tpl with $field=$post_profilechange }}{{endinc}}
|
||||||
|
|
||||||
|
|
||||||
<div id="settings-notify-desc"><strong>$lbl_not </strong></div>
|
<div id="settings-notify-desc">$lbl_not</div>
|
||||||
|
|
||||||
<div class="group">
|
<div class="group">
|
||||||
{{inc field_intcheckbox.tpl with $field=$notify1 }}{{endinc}}
|
{{inc field_intcheckbox.tpl with $field=$notify1 }}{{endinc}}
|
||||||
|
|
@ -124,6 +125,7 @@ $group_select
|
||||||
{{inc field_intcheckbox.tpl with $field=$notify7 }}{{endinc}}
|
{{inc field_intcheckbox.tpl with $field=$notify7 }}{{endinc}}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
<div class="settings-submit-wrapper" >
|
<div class="settings-submit-wrapper" >
|
||||||
<input type="submit" name="submit" class="settings-submit" value="$submit" />
|
<input type="submit" name="submit" class="settings-submit" value="$submit" />
|
||||||
|
|
@ -131,6 +133,7 @@ $group_select
|
||||||
|
|
||||||
|
|
||||||
<h3 class="settings-heading">$h_advn</h3>
|
<h3 class="settings-heading">$h_advn</h3>
|
||||||
|
<div id="settings-pagetype-desc">$h_descadvn</div>
|
||||||
|
|
||||||
$pagetype
|
$pagetype
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -18,6 +18,7 @@
|
||||||
|
|
||||||
{{ if $dropping }}
|
{{ if $dropping }}
|
||||||
<div class="delete-checked">
|
<div class="delete-checked">
|
||||||
<a href="#" onclick="deleteCheckedItems();return false;"><span class="icon delete"></span><span class="s22 text">$dropping</span></a>
|
<a href="#" onclick="deleteCheckedItems();return false;"><span class="icon delete"></span><span class="s22 text" onmouseover="imgbright(this);" onmouseout="imgdull(this);">$dropping</span></a>
|
||||||
</div>
|
</div>
|
||||||
|
<div id="item-delete-selected-end"></div>
|
||||||
{{ endif }}
|
{{ endif }}
|
||||||
|
|
|
||||||
|
|
@ -103,7 +103,7 @@ div.jGrowl div.info{background:#1353b1 url("../../../images/icons/48/info.png")
|
||||||
nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkmenu.selected .icon.s22.notify{background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAQAAABuvaSwAAAAAmJLR0QA/4ePzL8AAAAJcEhZcwAAUJcAAFCXAZtv64UAAAHuSURBVCjPbZPbTlNBFIYHLixXRIhEQGNRMUopJAJyAyZ4Z2l8B+XwEBqKtjwOp8oDIAJKIJFUjdFIQCUYrRytdyb0459ht8wG9rrYs9b618y/TsYEH4ZK4qRYYIdDybZOI7TKakIfVhrJ8J2i5IBNyV93/kaaBuv3oV3MgwCTPKGHPkkPA0xRUMBrOgN4AP0o6BseEpF2m3es0qJTFQneyvMhgDsC9tZprnEcGuOPeMcDLUpW3jlLxlDBmJTFY6gLvsVv8tyh9G7U3Z6mwtCuJAoiECSh/w1+8otmTjLqF2KDNsNzRY1bruV0o6rFFtc9S5USh5RRWvAYv4xX9dYPS8ur1oBQC4Y99m2uHriRNda5ErLdU1l3jCI2xdJ3XOYLX6kP2W6K2OF54Et84jN154F31d6ukKOG92pSbcjWLRrbRhVGLTZeOtXqX46LoQSHhJo3jOo3ESrdBQbljIRKNyXUiKHNNSXhTdbZiUzyT/WJ23Zn3BBFy+2u4ZHc1eV2N7EkxAvbbqMRmZOSlbE0g/uajRgl6Iy8r1wpnaFTQ4ji+8XOEsuxYmdDWpJleXJ0+BPdoduL4p5Vavd5IOllmJfiWmSWu6d3pV4jteFWqaAGbLkdKSqtUXXUnN3DSvF8phfy/JfkxfOp9sVb2COz+hY/T0qkwwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxMS0wOS0xNlQwOTozOTowMCswMjowMC9Oi90AAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTEtMDktMTZUMDk6Mzk6MDArMDI6MDBeEzNhAAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAAABJRU5ErkJggg==");}
|
nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkmenu.selected .icon.s22.notify{background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAQAAABuvaSwAAAAAmJLR0QA/4ePzL8AAAAJcEhZcwAAUJcAAFCXAZtv64UAAAHuSURBVCjPbZPbTlNBFIYHLixXRIhEQGNRMUopJAJyAyZ4Z2l8B+XwEBqKtjwOp8oDIAJKIJFUjdFIQCUYrRytdyb0459ht8wG9rrYs9b618y/TsYEH4ZK4qRYYIdDybZOI7TKakIfVhrJ8J2i5IBNyV93/kaaBuv3oV3MgwCTPKGHPkkPA0xRUMBrOgN4AP0o6BseEpF2m3es0qJTFQneyvMhgDsC9tZprnEcGuOPeMcDLUpW3jlLxlDBmJTFY6gLvsVv8tyh9G7U3Z6mwtCuJAoiECSh/w1+8otmTjLqF2KDNsNzRY1bruV0o6rFFtc9S5USh5RRWvAYv4xX9dYPS8ur1oBQC4Y99m2uHriRNda5ErLdU1l3jCI2xdJ3XOYLX6kP2W6K2OF54Et84jN154F31d6ukKOG92pSbcjWLRrbRhVGLTZeOtXqX46LoQSHhJo3jOo3ESrdBQbljIRKNyXUiKHNNSXhTdbZiUzyT/WJ23Zn3BBFy+2u4ZHc1eV2N7EkxAvbbqMRmZOSlbE0g/uajRgl6Iy8r1wpnaFTQ4ji+8XOEsuxYmdDWpJleXJ0+BPdoduL4p5Vavd5IOllmJfiWmSWu6d3pV4jteFWqaAGbLkdKSqtUXXUnN3DSvF8phfy/JfkxfOp9sVb2COz+hY/T0qkwwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxMS0wOS0xNlQwOTozOTowMCswMjowMC9Oi90AAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTEtMDktMTZUMDk6Mzk6MDArMDI6MDBeEzNhAAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAAABJRU5ErkJggg==");}
|
||||||
.show{display:block;}
|
.show{display:block;}
|
||||||
#notifications{width:170px;height:20px;font-size:small;top:-19px;left:4px;position:absolute;}
|
#notifications{width:170px;height:20px;font-size:small;top:-19px;left:4px;position:absolute;}
|
||||||
#nav-floater{position:fixed;top:20px;right:1%;padding:5px;background:#1d1f1d;color:transparent;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;z-index:100;width:300px;height:60px;}
|
#nav-floater{position:fixed;top:20px;right:1%;padding:5px;background:#1d1f1d;color:transparent;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;z-index:100;width:270px;height:60px;}
|
||||||
#nav-buttons{clear:both;list-style:none;padding:0px;margin:0px;height:25px;}#nav-buttons>li{padding:0;display:inline-block;margin:0px -4px 0px 0px;}
|
#nav-buttons{clear:both;list-style:none;padding:0px;margin:0px;height:25px;}#nav-buttons>li{padding:0;display:inline-block;margin:0px -4px 0px 0px;}
|
||||||
.floaterflip{display:block;position:fixed;z-index:110;top:56px;right:19px;width:22px;height:22px;overflow:hidden;margin:0px;background:transparent url(dark/icons.png) -190px -60px no-repeat;}
|
.floaterflip{display:block;position:fixed;z-index:110;top:56px;right:19px;width:22px;height:22px;overflow:hidden;margin:0px;background:transparent url(dark/icons.png) -190px -60px no-repeat;}
|
||||||
.search-box{display:inline-block;margin:5px;position:fixed;right:0px;bottom:0px;z-index:100;background:#1d1f1d;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}
|
.search-box{display:inline-block;margin:5px;position:fixed;right:0px;bottom:0px;z-index:100;background:#1d1f1d;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}
|
||||||
|
|
@ -111,7 +111,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
|
||||||
#search-text{border:1px solid #eeeeee;margin:5px 0;}
|
#search-text{border:1px solid #eeeeee;margin:5px 0;}
|
||||||
#mini-search-text{font-size:8pt;height:14px;width:10em;margin:5px;}
|
#mini-search-text{font-size:8pt;height:14px;width:10em;margin:5px;}
|
||||||
#scrollup{position:fixed;right:5px;bottom:40px;z-index:100;}#scrollup a:hover{text-decoration:none;border:0;}
|
#scrollup{position:fixed;right:5px;bottom:40px;z-index:100;}#scrollup a:hover{text-decoration:none;border:0;}
|
||||||
#user-menu{-moz-box-shadow:5px 0 10px 0 #111111;-o-box-shadow:5px 0 10px 0 #111111;-webkit-box-shadow:5px 0 10px 0 #111111;-ms-box-shadow:5px 0 10px 0 #111111;box-shadow:5px 0 10px 0 #111111;display:block;width:75%;margin:3px 0 0 0;position:relative;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;background-color:#555753;background-image:url("data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAARCAAIAAwDASIAAhEBAxEB/8QAFgABAQEAAAAAAAAAAAAAAAAAAAMH/8QAIhAAAQMEAgIDAAAAAAAAAAAAAQIDBAAFBhESIQdBMVFh/8QAFQEBAQAAAAAAAAAAAAAAAAAAAgP/xAAXEQEBAQEAAAAAAAAAAAAAAAABAAIR/9oADAMBAAIRAxEAPwCXiHO8dbsEi35BEhIehNlbUhxhBU82O+G9bKgToD2D+VlmZX9OWZBJuAiMxGlni0w0gJCED4HXv7pSi6eFML//2Q==");background-position:98% center;background-repeat:no-repeat;clear:both;top:4px;left:10px;padding:2px;}#user-menu>a{vertical-align:top;outline:0 none;}
|
#user-menu{-moz-box-shadow:5px 0 10px 0 #111111;-o-box-shadow:5px 0 10px 0 #111111;-webkit-box-shadow:5px 0 10px 0 #111111;-ms-box-shadow:5px 0 10px 0 #111111;box-shadow:5px 0 10px 0 #111111;display:block;width:80%;margin:3px 0 0 0;position:relative;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;background-color:#555753;background-image:url("data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAARCAAIAAwDASIAAhEBAxEB/8QAFgABAQEAAAAAAAAAAAAAAAAAAAMH/8QAIhAAAQMEAgIDAAAAAAAAAAAAAQIDBAAFBhESIQdBMVFh/8QAFQEBAQAAAAAAAAAAAAAAAAAAAgP/xAAXEQEBAQEAAAAAAAAAAAAAAAABAAIR/9oADAMBAAIRAxEAPwCXiHO8dbsEi35BEhIehNlbUhxhBU82O+G9bKgToD2D+VlmZX9OWZBJuAiMxGlni0w0gJCED4HXv7pSi6eFML//2Q==");background-position:98% center;background-repeat:no-repeat;clear:both;top:4px;left:10px;padding:2px;}#user-menu>a{vertical-align:top;outline:0 none;}
|
||||||
#user-menu-label{font-size:small;padding:3px 20px 9px 5px;height:10px;}
|
#user-menu-label{font-size:small;padding:3px 20px 9px 5px;height:10px;}
|
||||||
.nav-ajax-update,.nav-ajax-left{width:30px;height:19px;background:transparent url(dark/notifications.png) 0 0 no-repeat;color:#111111;font-weight:bold;font-size:0.8em;padding-top:0.2em;text-align:center;float:left;margin:0 -1px 0 3px;display:block;visibility:hidden;}
|
.nav-ajax-update,.nav-ajax-left{width:30px;height:19px;background:transparent url(dark/notifications.png) 0 0 no-repeat;color:#111111;font-weight:bold;font-size:0.8em;padding-top:0.2em;text-align:center;float:left;margin:0 -1px 0 3px;display:block;visibility:hidden;}
|
||||||
.nav-ajax-update.show,.nav-ajax-left.show{visibility:visible;}
|
.nav-ajax-update.show,.nav-ajax-left.show{visibility:visible;}
|
||||||
|
|
@ -227,11 +227,12 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
|
||||||
#connect-services,#extra-help{margin:0px;padding:0px;list-style:none;list-style-position:inside;margin:1em 0 0 0;}#connect-services li,#extra-help li{display:inline;}
|
#connect-services,#extra-help{margin:0px;padding:0px;list-style:none;list-style-position:inside;margin:1em 0 0 0;}#connect-services li,#extra-help li{display:inline;}
|
||||||
.ccollapse-wrapper{font-size:0.9em;margin-left:5em;}
|
.ccollapse-wrapper{font-size:0.9em;margin-left:5em;}
|
||||||
.hide-comments-outer{font-size:small;}
|
.hide-comments-outer{font-size:small;}
|
||||||
.wall-item-outside-wrapper.comment{margin-left:5em;}.wall-item-outside-wrapper.comment .wall-item-photo{width:40px !important;height:40px !important;}
|
.wall-item-outside-wrapper.comment{margin-left:5em;}.wall-item-outside-wrapper.comment .wall-item-info{width:5em;}
|
||||||
|
.wall-item-outside-wrapper.comment .wall-item-photo{width:40px !important;height:40px !important;}
|
||||||
.wall-item-outside-wrapper.comment .wall-item-photo-wrapper{width:40px;height:40px;}
|
.wall-item-outside-wrapper.comment .wall-item-photo-wrapper{width:40px;height:40px;}
|
||||||
.wall-item-outside-wrapper.comment .wall-item-photo-menu-button{width:50px;top:45px;background-position:35px center;}
|
.wall-item-outside-wrapper.comment .wall-item-photo-menu-button{width:3.35em;top:3.2em;background-position:35px center;}
|
||||||
.wall-item-outside-wrapper.comment .wall-item-author{margin-left:0.2em;}
|
.wall-item-outside-wrapper.comment .wall-item-author{margin-left:0.2em;}
|
||||||
.wall-item-outside-wrapper.comment .wall-item-photo-menu{min-width:50px;top:60px;}
|
.wall-item-outside-wrapper.comment .wall-item-photo-menu{min-width:4.5em;top:5.5em;}
|
||||||
.comment-wwedit-wrapper{border:1px solid #eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:5px;}
|
.comment-wwedit-wrapper{border:1px solid #eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:5px;}
|
||||||
.comment-edit-wrapper{border-top:1px #aaa solid;}
|
.comment-edit-wrapper{border-top:1px #aaa solid;}
|
||||||
[class^="comment-edit-bb"]{margin:0px;padding:0px;list-style:none;list-style-position:inside;display:none;margin:-40px 0 5px 60px;width:75%;}[class^="comment-edit-bb"]>li{display:inline-block;margin:0 10px 0 0;visibility:none;}
|
[class^="comment-edit-bb"]{margin:0px;padding:0px;list-style:none;list-style-position:inside;display:none;margin:-40px 0 5px 60px;width:75%;}[class^="comment-edit-bb"]>li{display:inline-block;margin:0 10px 0 0;visibility:none;}
|
||||||
|
|
|
||||||
|
|
@ -639,7 +639,7 @@ nav #nav-notifications-linkmenu {
|
||||||
color: transparent;
|
color: transparent;
|
||||||
.rounded_corners;
|
.rounded_corners;
|
||||||
z-index: 100;
|
z-index: 100;
|
||||||
.box(300px, 60px);
|
.box(270px, 60px);
|
||||||
}
|
}
|
||||||
#nav-buttons {
|
#nav-buttons {
|
||||||
clear: both;
|
clear: both;
|
||||||
|
|
@ -702,7 +702,7 @@ nav #nav-notifications-linkmenu {
|
||||||
#user-menu {
|
#user-menu {
|
||||||
.box_shadow(5px, 0, 10px, 0);
|
.box_shadow(5px, 0, 10px, 0);
|
||||||
display: block;
|
display: block;
|
||||||
width: 75%;
|
width: 80%;
|
||||||
margin: 3px 0 0 0;
|
margin: 3px 0 0 0;
|
||||||
position: relative;
|
position: relative;
|
||||||
.rounded_corners;
|
.rounded_corners;
|
||||||
|
|
@ -1526,6 +1526,9 @@ nav #nav-notifications-linkmenu {
|
||||||
}
|
}
|
||||||
.wall-item-outside-wrapper.comment {
|
.wall-item-outside-wrapper.comment {
|
||||||
margin-left: 5em;
|
margin-left: 5em;
|
||||||
|
.wall-item-info {
|
||||||
|
width: 5em;
|
||||||
|
}
|
||||||
.wall-item-photo {
|
.wall-item-photo {
|
||||||
width: 40px !important;
|
width: 40px !important;
|
||||||
height: 40px !important;
|
height: 40px !important;
|
||||||
|
|
@ -1534,16 +1537,16 @@ nav #nav-notifications-linkmenu {
|
||||||
.box(40px, 40px);
|
.box(40px, 40px);
|
||||||
}
|
}
|
||||||
.wall-item-photo-menu-button {
|
.wall-item-photo-menu-button {
|
||||||
width: 50px;
|
width: 3.35em;
|
||||||
top: 45px;
|
top: 3.2em;
|
||||||
background-position: 35px center;
|
background-position: 35px center;
|
||||||
}
|
}
|
||||||
.wall-item-author {
|
.wall-item-author {
|
||||||
margin-left: 0.2em;
|
margin-left: 0.2em;
|
||||||
}
|
}
|
||||||
.wall-item-photo-menu {
|
.wall-item-photo-menu {
|
||||||
min-width: 50px;
|
min-width: 4.5em;
|
||||||
top: 60px;
|
top: 5.5em;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.comment-wwedit-wrapper {
|
.comment-wwedit-wrapper {
|
||||||
|
|
|
||||||
|
|
@ -58,7 +58,7 @@ h6{font-size:xx-small;}
|
||||||
#articlemain{width:100%;height:100%;margin:0 auto;}
|
#articlemain{width:100%;height:100%;margin:0 auto;}
|
||||||
.button{color:#111111;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;padding:5px;cursor:pointer;}.button a{color:#111111;font-weight:bold;}
|
.button{color:#111111;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;padding:5px;cursor:pointer;}.button a{color:#111111;font-weight:bold;}
|
||||||
#profile-listing-desc a{color:#eeeeec;font-weight:bold;}
|
#profile-listing-desc a{color:#eeeeec;font-weight:bold;}
|
||||||
[class$="-desc"],[id$="-desc"]{color:#eeeeec;background:#2e3436;border:3px ridge #111111;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:3px 10px 7px 0;padding:5px;font-weight:bold;font-size:smaller;}
|
[class$="-desc"],[id$="-desc"]{color:#eeeeec;background:#2e3436;border:2px outset #111111;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:3px 10px 7px 0;padding:5px;font-weight:bold;font-size:smaller;}
|
||||||
#item-delete-selected-desc{float:left;margin-right:5px;}#item-delete-selected-desc:hover{text-decoration:underline;}
|
#item-delete-selected-desc{float:left;margin-right:5px;}#item-delete-selected-desc:hover{text-decoration:underline;}
|
||||||
.intro-approve-as-friend-desc{margin-top:10px;}
|
.intro-approve-as-friend-desc{margin-top:10px;}
|
||||||
.intro-desc{margin-bottom:20px;font-weight:bold;}
|
.intro-desc{margin-bottom:20px;font-weight:bold;}
|
||||||
|
|
@ -103,7 +103,7 @@ div.jGrowl div.info{background:#364e59 url("../../../images/icons/48/info.png")
|
||||||
nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkmenu.selected .icon.s22.notify{background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAQAAABuvaSwAAAAAmJLR0QA/4ePzL8AAAAJcEhZcwAAUJcAAFCXAZtv64UAAAHuSURBVCjPbZPbTlNBFIYHLixXRIhEQGNRMUopJAJyAyZ4Z2l8B+XwEBqKtjwOp8oDIAJKIJFUjdFIQCUYrRytdyb0459ht8wG9rrYs9b618y/TsYEH4ZK4qRYYIdDybZOI7TKakIfVhrJ8J2i5IBNyV93/kaaBuv3oV3MgwCTPKGHPkkPA0xRUMBrOgN4AP0o6BseEpF2m3es0qJTFQneyvMhgDsC9tZprnEcGuOPeMcDLUpW3jlLxlDBmJTFY6gLvsVv8tyh9G7U3Z6mwtCuJAoiECSh/w1+8otmTjLqF2KDNsNzRY1bruV0o6rFFtc9S5USh5RRWvAYv4xX9dYPS8ur1oBQC4Y99m2uHriRNda5ErLdU1l3jCI2xdJ3XOYLX6kP2W6K2OF54Et84jN154F31d6ukKOG92pSbcjWLRrbRhVGLTZeOtXqX46LoQSHhJo3jOo3ESrdBQbljIRKNyXUiKHNNSXhTdbZiUzyT/WJ23Zn3BBFy+2u4ZHc1eV2N7EkxAvbbqMRmZOSlbE0g/uajRgl6Iy8r1wpnaFTQ4ji+8XOEsuxYmdDWpJleXJ0+BPdoduL4p5Vavd5IOllmJfiWmSWu6d3pV4jteFWqaAGbLkdKSqtUXXUnN3DSvF8phfy/JfkxfOp9sVb2COz+hY/T0qkwwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxMS0wOS0xNlQwOTozOTowMCswMjowMC9Oi90AAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTEtMDktMTZUMDk6Mzk6MDArMDI6MDBeEzNhAAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAAABJRU5ErkJggg==");}
|
nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkmenu.selected .icon.s22.notify{background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAQAAABuvaSwAAAAAmJLR0QA/4ePzL8AAAAJcEhZcwAAUJcAAFCXAZtv64UAAAHuSURBVCjPbZPbTlNBFIYHLixXRIhEQGNRMUopJAJyAyZ4Z2l8B+XwEBqKtjwOp8oDIAJKIJFUjdFIQCUYrRytdyb0459ht8wG9rrYs9b618y/TsYEH4ZK4qRYYIdDybZOI7TKakIfVhrJ8J2i5IBNyV93/kaaBuv3oV3MgwCTPKGHPkkPA0xRUMBrOgN4AP0o6BseEpF2m3es0qJTFQneyvMhgDsC9tZprnEcGuOPeMcDLUpW3jlLxlDBmJTFY6gLvsVv8tyh9G7U3Z6mwtCuJAoiECSh/w1+8otmTjLqF2KDNsNzRY1bruV0o6rFFtc9S5USh5RRWvAYv4xX9dYPS8ur1oBQC4Y99m2uHriRNda5ErLdU1l3jCI2xdJ3XOYLX6kP2W6K2OF54Et84jN154F31d6ukKOG92pSbcjWLRrbRhVGLTZeOtXqX46LoQSHhJo3jOo3ESrdBQbljIRKNyXUiKHNNSXhTdbZiUzyT/WJ23Zn3BBFy+2u4ZHc1eV2N7EkxAvbbqMRmZOSlbE0g/uajRgl6Iy8r1wpnaFTQ4ji+8XOEsuxYmdDWpJleXJ0+BPdoduL4p5Vavd5IOllmJfiWmSWu6d3pV4jteFWqaAGbLkdKSqtUXXUnN3DSvF8phfy/JfkxfOp9sVb2COz+hY/T0qkwwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxMS0wOS0xNlQwOTozOTowMCswMjowMC9Oi90AAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTEtMDktMTZUMDk6Mzk6MDArMDI6MDBeEzNhAAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAAABJRU5ErkJggg==");}
|
||||||
.show{display:block;}
|
.show{display:block;}
|
||||||
#notifications{width:170px;height:20px;font-size:small;top:-19px;left:4px;position:absolute;}
|
#notifications{width:170px;height:20px;font-size:small;top:-19px;left:4px;position:absolute;}
|
||||||
#nav-floater{position:fixed;top:20px;right:1%;padding:5px;background:#2e3436;color:transparent;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;z-index:100;width:300px;height:60px;}
|
#nav-floater{position:fixed;top:20px;right:1%;padding:5px;background:#2e3436;color:transparent;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;z-index:100;width:270px;height:60px;}
|
||||||
#nav-buttons{clear:both;list-style:none;padding:0px;margin:0px;height:25px;}#nav-buttons>li{padding:0;display:inline-block;margin:0px -4px 0px 0px;}
|
#nav-buttons{clear:both;list-style:none;padding:0px;margin:0px;height:25px;}#nav-buttons>li{padding:0;display:inline-block;margin:0px -4px 0px 0px;}
|
||||||
.floaterflip{display:block;position:fixed;z-index:110;top:56px;right:19px;width:22px;height:22px;overflow:hidden;margin:0px;background:transparent url(light/icons.png) -190px -60px no-repeat;}
|
.floaterflip{display:block;position:fixed;z-index:110;top:56px;right:19px;width:22px;height:22px;overflow:hidden;margin:0px;background:transparent url(light/icons.png) -190px -60px no-repeat;}
|
||||||
.search-box{display:inline-block;margin:5px;position:fixed;right:0px;bottom:0px;z-index:100;background:#2e3436;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}
|
.search-box{display:inline-block;margin:5px;position:fixed;right:0px;bottom:0px;z-index:100;background:#2e3436;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}
|
||||||
|
|
@ -111,7 +111,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
|
||||||
#search-text{border:1px solid #999999;margin:5px 0;}
|
#search-text{border:1px solid #999999;margin:5px 0;}
|
||||||
#mini-search-text{font-size:8pt;height:14px;width:10em;margin:5px;}
|
#mini-search-text{font-size:8pt;height:14px;width:10em;margin:5px;}
|
||||||
#scrollup{position:fixed;right:5px;bottom:40px;z-index:100;}#scrollup a:hover{text-decoration:none;border:0;}
|
#scrollup{position:fixed;right:5px;bottom:40px;z-index:100;}#scrollup a:hover{text-decoration:none;border:0;}
|
||||||
#user-menu{-moz-box-shadow:5px 0 10px 0 #111111;-o-box-shadow:5px 0 10px 0 #111111;-webkit-box-shadow:5px 0 10px 0 #111111;-ms-box-shadow:5px 0 10px 0 #111111;box-shadow:5px 0 10px 0 #111111;display:block;width:75%;margin:3px 0 0 0;position:relative;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;background-color:#555753;background-image:url("data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAARCAAIAAwDASIAAhEBAxEB/8QAFgABAQEAAAAAAAAAAAAAAAAAAAMH/8QAIhAAAQMEAgIDAAAAAAAAAAAAAQIDBAAFBhESIQdBMVFh/8QAFQEBAQAAAAAAAAAAAAAAAAAAAgP/xAAXEQEBAQEAAAAAAAAAAAAAAAABAAIR/9oADAMBAAIRAxEAPwCXiHO8dbsEi35BEhIehNlbUhxhBU82O+G9bKgToD2D+VlmZX9OWZBJuAiMxGlni0w0gJCED4HXv7pSi6eFML//2Q==");background-position:98% center;background-repeat:no-repeat;clear:both;top:4px;left:10px;padding:2px;}#user-menu>a{vertical-align:top;outline:0 none;}
|
#user-menu{-moz-box-shadow:5px 0 10px 0 #111111;-o-box-shadow:5px 0 10px 0 #111111;-webkit-box-shadow:5px 0 10px 0 #111111;-ms-box-shadow:5px 0 10px 0 #111111;box-shadow:5px 0 10px 0 #111111;display:block;width:80%;margin:3px 0 0 0;position:relative;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;background-color:#555753;background-image:url("data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAARCAAIAAwDASIAAhEBAxEB/8QAFgABAQEAAAAAAAAAAAAAAAAAAAMH/8QAIhAAAQMEAgIDAAAAAAAAAAAAAQIDBAAFBhESIQdBMVFh/8QAFQEBAQAAAAAAAAAAAAAAAAAAAgP/xAAXEQEBAQEAAAAAAAAAAAAAAAABAAIR/9oADAMBAAIRAxEAPwCXiHO8dbsEi35BEhIehNlbUhxhBU82O+G9bKgToD2D+VlmZX9OWZBJuAiMxGlni0w0gJCED4HXv7pSi6eFML//2Q==");background-position:98% center;background-repeat:no-repeat;clear:both;top:4px;left:10px;padding:2px;}#user-menu>a{vertical-align:top;outline:0 none;}
|
||||||
#user-menu-label{font-size:small;padding:3px 20px 9px 5px;height:10px;}
|
#user-menu-label{font-size:small;padding:3px 20px 9px 5px;height:10px;}
|
||||||
.nav-ajax-update,.nav-ajax-left{width:30px;height:19px;background:transparent url(light/notifications.png) 0 0 no-repeat;color:#111111;font-weight:bold;font-size:0.8em;padding-top:0.2em;text-align:center;float:left;margin:0 -1px 0 3px;display:block;visibility:hidden;}
|
.nav-ajax-update,.nav-ajax-left{width:30px;height:19px;background:transparent url(light/notifications.png) 0 0 no-repeat;color:#111111;font-weight:bold;font-size:0.8em;padding-top:0.2em;text-align:center;float:left;margin:0 -1px 0 3px;display:block;visibility:hidden;}
|
||||||
.nav-ajax-update.show,.nav-ajax-left.show{visibility:visible;}
|
.nav-ajax-update.show,.nav-ajax-left.show{visibility:visible;}
|
||||||
|
|
@ -133,7 +133,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
|
||||||
#sysmsg_info{position:fixed;bottom:0;-moz-box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;-o-box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;-webkit-box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;-ms-box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;padding:10px;background-color:#fcaf3e;border:2px solid #f8911b;border-bottom:0;padding-bottom:50px;z-index:1000;}
|
#sysmsg_info{position:fixed;bottom:0;-moz-box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;-o-box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;-webkit-box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;-ms-box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;padding:10px;background-color:#fcaf3e;border:2px solid #f8911b;border-bottom:0;padding-bottom:50px;z-index:1000;}
|
||||||
#sysmsg{position:fixed;bottom:0;-moz-box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;-o-box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;-webkit-box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;-ms-box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;padding:10px;background-color:#fcaf3e;border:2px solid #f8911b;border-bottom:0;padding-bottom:50px;z-index:1000;}
|
#sysmsg{position:fixed;bottom:0;-moz-box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;-o-box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;-webkit-box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;-ms-box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;padding:10px;background-color:#fcaf3e;border:2px solid #f8911b;border-bottom:0;padding-bottom:50px;z-index:1000;}
|
||||||
#sysmsg_info br,#sysmsg br{display:block;margin:2px 0px;border-top:1px solid #eeeeec;}
|
#sysmsg_info br,#sysmsg br{display:block;margin:2px 0px;border-top:1px solid #eeeeec;}
|
||||||
#asidemain{float:left;font-size:small;margin:20px 0 20px 35px;width:25%;display:inline;}
|
#asidemain{float:left;font-size:small;margin:1em;width:25%;display:inline;}
|
||||||
#asideright,#asideleft{display:none;}
|
#asideright,#asideleft{display:none;}
|
||||||
.vcard .fn{font-size:1.5em;font-weight:bold;border-bottom:1px solid #284d7d;padding-bottom:3px;}
|
.vcard .fn{font-size:1.5em;font-weight:bold;border-bottom:1px solid #284d7d;padding-bottom:3px;}
|
||||||
.vcard #profile-photo-wrapper{margin:20px 0;background-color:#555753;padding:5px;width:175px;height:175px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:3px 3px 10px 0 #111111;-o-box-shadow:3px 3px 10px 0 #111111;-webkit-box-shadow:3px 3px 10px 0 #111111;-ms-box-shadow:3px 3px 10px 0 #111111;box-shadow:3px 3px 10px 0 #111111;}
|
.vcard #profile-photo-wrapper{margin:20px 0;background-color:#555753;padding:5px;width:175px;height:175px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:3px 3px 10px 0 #111111;-o-box-shadow:3px 3px 10px 0 #111111;-webkit-box-shadow:3px 3px 10px 0 #111111;-ms-box-shadow:3px 3px 10px 0 #111111;box-shadow:3px 3px 10px 0 #111111;}
|
||||||
|
|
@ -187,7 +187,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
|
||||||
#jot-title-display{font-weight:bold;}
|
#jot-title-display{font-weight:bold;}
|
||||||
.jothidden{display:none;}
|
.jothidden{display:none;}
|
||||||
#jot-preview-content{background-color:#f2f2c3;color:#111111;border:1px solid #111111;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:5px 0 10px 0px #111111;-o-box-shadow:5px 0 10px 0px #111111;-webkit-box-shadow:5px 0 10px 0px #111111;-ms-box-shadow:5px 0 10px 0px #111111;box-shadow:5px 0 10px 0px #111111;padding:3px 3px 6px 10px;}#jot-preview-content .wall-item-outside-wrapper{border:0;-o-border-radius:0px 0px 0px 0px;-webkit-border-radius:0px 0px 0px 0px;-moz-border-radius:0px 0px 0px 0px;-ms-border-radius:0px 0px 0px 0px;border-radius:0px 0px 0px 0px;-moz-box-shadow:0 0 0 0 #111111;-o-box-shadow:0 0 0 0 #111111;-webkit-box-shadow:0 0 0 0 #111111;-ms-box-shadow:0 0 0 0 #111111;box-shadow:0 0 0 0 #111111;}
|
#jot-preview-content{background-color:#f2f2c3;color:#111111;border:1px solid #111111;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:5px 0 10px 0px #111111;-o-box-shadow:5px 0 10px 0px #111111;-webkit-box-shadow:5px 0 10px 0px #111111;-ms-box-shadow:5px 0 10px 0px #111111;box-shadow:5px 0 10px 0px #111111;padding:3px 3px 6px 10px;}#jot-preview-content .wall-item-outside-wrapper{border:0;-o-border-radius:0px 0px 0px 0px;-webkit-border-radius:0px 0px 0px 0px;-moz-border-radius:0px 0px 0px 0px;-ms-border-radius:0px 0px 0px 0px;border-radius:0px 0px 0px 0px;-moz-box-shadow:0 0 0 0 #111111;-o-box-shadow:0 0 0 0 #111111;-webkit-box-shadow:0 0 0 0 #111111;-ms-box-shadow:0 0 0 0 #111111;box-shadow:0 0 0 0 #111111;}
|
||||||
#sectionmain{margin:20px;font-size:0.8em;min-width:475px;width:67%;float:left;display:inline;}
|
#sectionmain{margin:1em;font-size:0.8em;min-width:475px;width:69%;float:left;display:inline;}
|
||||||
.tabs{margin:0px;padding:0px;list-style:none;list-style-position:inside;margin:10px 0;}.tabs li{display:inline;font-size:smaller;}
|
.tabs{margin:0px;padding:0px;list-style:none;list-style-position:inside;margin:10px 0;}.tabs li{display:inline;font-size:smaller;}
|
||||||
.tab{border:1px solid #284d7d;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.tab:active,.tab:hover{background:#f2f2c3;color:#111111;border:1px solid #284d7d;}
|
.tab{border:1px solid #284d7d;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.tab:active,.tab:hover{background:#f2f2c3;color:#111111;border:1px solid #284d7d;}
|
||||||
.tab a{border:0;text-decoration:none;}
|
.tab a{border:0;text-decoration:none;}
|
||||||
|
|
@ -203,7 +203,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
|
||||||
[id^="tread-wrapper"],[class^="tread-wrapper"]{margin:1.2em 0 0 0;padding:0px;}
|
[id^="tread-wrapper"],[class^="tread-wrapper"]{margin:1.2em 0 0 0;padding:0px;}
|
||||||
.wall-item-photo-menu{display:none;}
|
.wall-item-photo-menu{display:none;}
|
||||||
.wall-item-photo-menu-button{display:none;text-indent:-99999px;background:#555753 url(light/menu-user-pin.jpg) no-repeat 75px center;position:absolute;overflow:hidden;width:90px;height:20px;top:85px;left:0;-o-border-radius:0 0 5px 5px;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;-ms-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;}
|
.wall-item-photo-menu-button{display:none;text-indent:-99999px;background:#555753 url(light/menu-user-pin.jpg) no-repeat 75px center;position:absolute;overflow:hidden;width:90px;height:20px;top:85px;left:0;-o-border-radius:0 0 5px 5px;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;-ms-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;}
|
||||||
.wall-item-info{float:left;width:8em;position:relative;}
|
.wall-item-info{float:left;width:7em;position:relative;}
|
||||||
.wall-item-photo-wrapper{width:80px;height:80px;position:relative;padding:5px;background-color:#555753;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}
|
.wall-item-photo-wrapper{width:80px;height:80px;position:relative;padding:5px;background-color:#555753;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}
|
||||||
[class^="wall-item-tools"] *{}[class^="wall-item-tools"] *>*{}
|
[class^="wall-item-tools"] *{}[class^="wall-item-tools"] *>*{}
|
||||||
.wall-item-tools{float:right;opacity:0.4;-webkit-transition:all 0.75s ease-in-out;-moz-transition:all 0.75s ease-in-out;-o-transition:all 0.75s ease-in-out;-ms-transition:all 0.75s ease-in-out;transition:all 0.75s ease-in-out;}.wall-item-tools:hover{opacity:1;-webkit-transition:all 0.75s ease-in-out;-moz-transition:all 0.75s ease-in-out;-o-transition:all 0.75s ease-in-out;-ms-transition:all 0.75s ease-in-out;transition:all 0.75s ease-in-out;}
|
.wall-item-tools{float:right;opacity:0.4;-webkit-transition:all 0.75s ease-in-out;-moz-transition:all 0.75s ease-in-out;-o-transition:all 0.75s ease-in-out;-ms-transition:all 0.75s ease-in-out;transition:all 0.75s ease-in-out;}.wall-item-tools:hover{opacity:1;-webkit-transition:all 0.75s ease-in-out;-moz-transition:all 0.75s ease-in-out;-o-transition:all 0.75s ease-in-out;-ms-transition:all 0.75s ease-in-out;transition:all 0.75s ease-in-out;}
|
||||||
|
|
@ -223,14 +223,16 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
|
||||||
.wall-item-arrowphoto-wrapper{position:absolute;left:35px;top:80px;z-index:10002;}
|
.wall-item-arrowphoto-wrapper{position:absolute;left:35px;top:80px;z-index:10002;}
|
||||||
.wall-item-photo-menu{min-width:92px;font-size:0.75em;border:2px solid #555753;border-top:0px;background:#555753;position:absolute;left:-2px;top:101px;display:none;z-index:10003;-o-border-radius:0 5px 5px 5px;-webkit-border-radius:0 5px 5px 5px;-moz-border-radius:0 5px 5px 5px;-ms-border-radius:0 5px 5px 5px;border-radius:0 5px 5px 5px;}.wall-item-photo-menu li a{white-space:nowrap;display:block;padding:5px 6px;color:#eeeeec;}.wall-item-photo-menu li a:hover{color:#555753;background:#eeeeec;}
|
.wall-item-photo-menu{min-width:92px;font-size:0.75em;border:2px solid #555753;border-top:0px;background:#555753;position:absolute;left:-2px;top:101px;display:none;z-index:10003;-o-border-radius:0 5px 5px 5px;-webkit-border-radius:0 5px 5px 5px;-moz-border-radius:0 5px 5px 5px;-ms-border-radius:0 5px 5px 5px;border-radius:0 5px 5px 5px;}.wall-item-photo-menu li a{white-space:nowrap;display:block;padding:5px 6px;color:#eeeeec;}.wall-item-photo-menu li a:hover{color:#555753;background:#eeeeec;}
|
||||||
#item-delete-selected{overflow:auto;width:100%;}
|
#item-delete-selected{overflow:auto;width:100%;}
|
||||||
#connect-services-header,#connect-services,#extra-help-header,#extra-help,#postit-header,#postit{margin:5px 0 0 0;}
|
#connect-services-header,#extra-help-header{margin:1.5em 0 0 0;}
|
||||||
|
#connect-services,#extra-help{margin:0px;padding:0px;list-style:none;list-style-position:inside;margin:1em 0 0 0;}#connect-services li,#extra-help li{display:inline;}
|
||||||
.ccollapse-wrapper{font-size:0.9em;margin-left:5em;}
|
.ccollapse-wrapper{font-size:0.9em;margin-left:5em;}
|
||||||
.hide-comments-outer{font-size:small;}
|
.hide-comments-outer{font-size:small;}
|
||||||
.wall-item-outside-wrapper.comment{margin-left:5em;}.wall-item-outside-wrapper.comment .wall-item-photo{width:40px !important;height:40px !important;}
|
.wall-item-outside-wrapper.comment{margin-left:5em;}.wall-item-outside-wrapper.comment .wall-item-info{width:5em;}
|
||||||
|
.wall-item-outside-wrapper.comment .wall-item-photo{width:40px !important;height:40px !important;}
|
||||||
.wall-item-outside-wrapper.comment .wall-item-photo-wrapper{width:40px;height:40px;}
|
.wall-item-outside-wrapper.comment .wall-item-photo-wrapper{width:40px;height:40px;}
|
||||||
.wall-item-outside-wrapper.comment .wall-item-photo-menu-button{width:50px;top:45px;background-position:35px center;}
|
.wall-item-outside-wrapper.comment .wall-item-photo-menu-button{width:3.35em;top:3.2em;background-position:35px center;}
|
||||||
.wall-item-outside-wrapper.comment .wall-item-author{margin-left:0.2em;}
|
.wall-item-outside-wrapper.comment .wall-item-author{margin-left:0.2em;}
|
||||||
.wall-item-outside-wrapper.comment .wall-item-photo-menu{min-width:50px;top:60px;}
|
.wall-item-outside-wrapper.comment .wall-item-photo-menu{min-width:4.5em;top:5.5em;}
|
||||||
.comment-wwedit-wrapper{border:1px solid #111111;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:5px;}
|
.comment-wwedit-wrapper{border:1px solid #111111;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:5px;}
|
||||||
.comment-edit-wrapper{border-top:1px #aaa solid;}
|
.comment-edit-wrapper{border-top:1px #aaa solid;}
|
||||||
[class^="comment-edit-bb"]{margin:0px;padding:0px;list-style:none;list-style-position:inside;display:none;margin:-40px 0 5px 60px;width:75%;}[class^="comment-edit-bb"]>li{display:inline-block;margin:0 10px 0 0;visibility:none;}
|
[class^="comment-edit-bb"]{margin:0px;padding:0px;list-style:none;list-style-position:inside;display:none;margin:-40px 0 5px 60px;width:75%;}[class^="comment-edit-bb"]>li{display:inline-block;margin:0 10px 0 0;visibility:none;}
|
||||||
|
|
|
||||||
|
|
@ -640,7 +640,7 @@ nav #nav-notifications-linkmenu {
|
||||||
color: transparent;
|
color: transparent;
|
||||||
.rounded_corners;
|
.rounded_corners;
|
||||||
z-index: 100;
|
z-index: 100;
|
||||||
.box(300px, 60px);
|
.box(270px, 60px);
|
||||||
}
|
}
|
||||||
#nav-buttons {
|
#nav-buttons {
|
||||||
clear: both;
|
clear: both;
|
||||||
|
|
@ -703,7 +703,7 @@ nav #nav-notifications-linkmenu {
|
||||||
#user-menu {
|
#user-menu {
|
||||||
.box_shadow(5px, 0, 10px, 0);
|
.box_shadow(5px, 0, 10px, 0);
|
||||||
display: block;
|
display: block;
|
||||||
width: 75%;
|
width: 80%;
|
||||||
margin: 3px 0 0 0;
|
margin: 3px 0 0 0;
|
||||||
position: relative;
|
position: relative;
|
||||||
.rounded_corners;
|
.rounded_corners;
|
||||||
|
|
@ -1527,6 +1527,9 @@ nav #nav-notifications-linkmenu {
|
||||||
}
|
}
|
||||||
.wall-item-outside-wrapper.comment {
|
.wall-item-outside-wrapper.comment {
|
||||||
margin-left: 5em;
|
margin-left: 5em;
|
||||||
|
.wall-item-info {
|
||||||
|
width: 5em;
|
||||||
|
}
|
||||||
.wall-item-photo {
|
.wall-item-photo {
|
||||||
width: 40px !important;
|
width: 40px !important;
|
||||||
height: 40px !important;
|
height: 40px !important;
|
||||||
|
|
@ -1535,16 +1538,16 @@ nav #nav-notifications-linkmenu {
|
||||||
.box(40px, 40px);
|
.box(40px, 40px);
|
||||||
}
|
}
|
||||||
.wall-item-photo-menu-button {
|
.wall-item-photo-menu-button {
|
||||||
width: 50px;
|
width: 3.35em;
|
||||||
top: 45px;
|
top: 3.2em;
|
||||||
background-position: 35px center;
|
background-position: 35px center;
|
||||||
}
|
}
|
||||||
.wall-item-author {
|
.wall-item-author {
|
||||||
margin-left: 0.2em;
|
margin-left: 0.2em;
|
||||||
}
|
}
|
||||||
.wall-item-photo-menu {
|
.wall-item-photo-menu {
|
||||||
min-width: 50px;
|
min-width: 4.5em;
|
||||||
top: 60px;
|
top: 5.5em;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.comment-wwedit-wrapper {
|
.comment-wwedit-wrapper {
|
||||||
|
|
|
||||||
|
|
@ -80,6 +80,7 @@ blockquote {
|
||||||
.heart {
|
.heart {
|
||||||
color: #FF0000;
|
color: #FF0000;
|
||||||
font-size: 100%;
|
font-size: 100%;
|
||||||
|
margin-right: 5px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -678,7 +679,8 @@ input#dfrn-url {
|
||||||
#profile-edit-religion-label,
|
#profile-edit-religion-label,
|
||||||
#profile-edit-pubkeywords-label,
|
#profile-edit-pubkeywords-label,
|
||||||
#profile-edit-prvkeywords-label,
|
#profile-edit-prvkeywords-label,
|
||||||
#profile-edit-homepage-label {
|
#profile-edit-homepage-label,
|
||||||
|
#profile-edit-hometown-label {
|
||||||
float: left;
|
float: left;
|
||||||
width: 175px;
|
width: 175px;
|
||||||
}
|
}
|
||||||
|
|
@ -716,7 +718,17 @@ input#dfrn-url {
|
||||||
#settings-community {
|
#settings-community {
|
||||||
float: left;
|
float: left;
|
||||||
}
|
}
|
||||||
|
#settings-notifications label {
|
||||||
|
margin-left: 20px;
|
||||||
|
}
|
||||||
|
#settings-notify-desc, #settings-activity-desc {
|
||||||
|
font-weight: bold;
|
||||||
|
margin-bottom: 15px;
|
||||||
|
}
|
||||||
|
#settings-pagetype-desc {
|
||||||
|
color: #666666;
|
||||||
|
margin-bottom: 15px;
|
||||||
|
}
|
||||||
|
|
||||||
#profile-in-dir-yes-label,
|
#profile-in-dir-yes-label,
|
||||||
#profile-in-dir-no-label,
|
#profile-in-dir-no-label,
|
||||||
|
|
@ -763,7 +775,7 @@ input#dfrn-url {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#profile-edit-homepage {
|
#profile-edit-homepage, #profile-edit-hometown {
|
||||||
float: left;
|
float: left;
|
||||||
margin-bottom: 35px;
|
margin-bottom: 35px;
|
||||||
}
|
}
|
||||||
|
|
@ -803,6 +815,7 @@ input#dfrn-url {
|
||||||
#profile-edit-pubkeywords-end,
|
#profile-edit-pubkeywords-end,
|
||||||
#profile-edit-prvkeywords-end,
|
#profile-edit-prvkeywords-end,
|
||||||
#profile-edit-homepage-end,
|
#profile-edit-homepage-end,
|
||||||
|
#profile-edit-hometown-end,
|
||||||
#profile-in-dir-break,
|
#profile-in-dir-break,
|
||||||
#profile-in-dir-end,
|
#profile-in-dir-end,
|
||||||
#profile-in-netdir-break,
|
#profile-in-netdir-break,
|
||||||
|
|
|
||||||
|
|
@ -243,6 +243,18 @@
|
||||||
.icon.s48.language {
|
.icon.s48.language {
|
||||||
background-image: url("icons/language.png");
|
background-image: url("icons/language.png");
|
||||||
}
|
}
|
||||||
|
.icon.on {
|
||||||
|
background-image: url("icons/addon_on.png");
|
||||||
|
min-width: 16px;
|
||||||
|
height: 16px;
|
||||||
|
background-position: 0px 0px;
|
||||||
|
}
|
||||||
|
.icon.off {
|
||||||
|
background-image: url("icons/addon_off.png");
|
||||||
|
width: 16px;
|
||||||
|
height: 16px;
|
||||||
|
background-position: 0px 0px;
|
||||||
|
}
|
||||||
/* global */
|
/* global */
|
||||||
body {
|
body {
|
||||||
font-family: Liberation Sans, helvetica, arial, clean, sans-serif;
|
font-family: Liberation Sans, helvetica, arial, clean, sans-serif;
|
||||||
|
|
@ -255,8 +267,7 @@ body {
|
||||||
h4 {
|
h4 {
|
||||||
font-size: 1.1em;
|
font-size: 1.1em;
|
||||||
}
|
}
|
||||||
a,
|
a, a:link {
|
||||||
a:link {
|
|
||||||
color: #005c94;
|
color: #005c94;
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
}
|
}
|
||||||
|
|
@ -478,8 +489,7 @@ nav #nav-site-linkmenu .menu-popup {
|
||||||
right: 0px;
|
right: 0px;
|
||||||
left: auto;
|
left: auto;
|
||||||
}
|
}
|
||||||
nav #nav-notifications-linkmenu.on .icon.s22.notify,
|
nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-linkmenu.selected .icon.s22.notify {
|
||||||
nav #nav-notifications-linkmenu.selected .icon.s22.notify {
|
|
||||||
background-image: url("../../../images/icons/22/notify_on.png");
|
background-image: url("../../../images/icons/22/notify_on.png");
|
||||||
}
|
}
|
||||||
nav #nav-apps-link.selected {
|
nav #nav-apps-link.selected {
|
||||||
|
|
@ -668,15 +678,11 @@ aside #profiles-menu {
|
||||||
height: 48px;
|
height: 48px;
|
||||||
}
|
}
|
||||||
/* group member */
|
/* group member */
|
||||||
#contact-edit-drop-link,
|
#contact-edit-drop-link, .mail-list-delete-wrapper, .group-delete-wrapper {
|
||||||
.mail-list-delete-wrapper,
|
|
||||||
.group-delete-wrapper {
|
|
||||||
float: right;
|
float: right;
|
||||||
margin-right: 50px;
|
margin-right: 50px;
|
||||||
}
|
}
|
||||||
#contact-edit-drop-link .drophide,
|
#contact-edit-drop-link .drophide, .mail-list-delete-wrapper .drophide, .group-delete-wrapper .drophide {
|
||||||
.mail-list-delete-wrapper .drophide,
|
|
||||||
.group-delete-wrapper .drophide {
|
|
||||||
background-image: url('../../../images/icons/22/delete.png');
|
background-image: url('../../../images/icons/22/delete.png');
|
||||||
display: block;
|
display: block;
|
||||||
width: 22px;
|
width: 22px;
|
||||||
|
|
@ -685,9 +691,7 @@ aside #profiles-menu {
|
||||||
position: relative;
|
position: relative;
|
||||||
top: -50px;
|
top: -50px;
|
||||||
}
|
}
|
||||||
#contact-edit-drop-link .drop,
|
#contact-edit-drop-link .drop, .mail-list-delete-wrapper .drop, .group-delete-wrapper .drop {
|
||||||
.mail-list-delete-wrapper .drop,
|
|
||||||
.group-delete-wrapper .drop {
|
|
||||||
background-image: url('../../../images/icons/22/delete.png');
|
background-image: url('../../../images/icons/22/delete.png');
|
||||||
display: block;
|
display: block;
|
||||||
width: 22px;
|
width: 22px;
|
||||||
|
|
@ -817,8 +821,7 @@ section {
|
||||||
display: table;
|
display: table;
|
||||||
width: 750px;
|
width: 750px;
|
||||||
}
|
}
|
||||||
.wall-item-container .wall-item-item,
|
.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
|
||||||
.wall-item-container .wall-item-bottom {
|
|
||||||
display: table-row;
|
display: table-row;
|
||||||
}
|
}
|
||||||
.wall-item-container .wall-item-bottom {
|
.wall-item-container .wall-item-bottom {
|
||||||
|
|
@ -856,13 +859,11 @@ section {
|
||||||
.wall-item-container .wall-item-content img {
|
.wall-item-container .wall-item-content img {
|
||||||
max-width: 710px;
|
max-width: 710px;
|
||||||
}
|
}
|
||||||
.wall-item-container .wall-item-links,
|
.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
|
||||||
.wall-item-container .wall-item-actions {
|
|
||||||
display: table-cell;
|
display: table-cell;
|
||||||
vertical-align: middle;
|
vertical-align: middle;
|
||||||
}
|
}
|
||||||
.wall-item-container .wall-item-links .icon,
|
.wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon {
|
||||||
.wall-item-container .wall-item-actions .icon {
|
|
||||||
opacity: 0.5;
|
opacity: 0.5;
|
||||||
-webkit-transition: all 0.2s ease-in-out;
|
-webkit-transition: all 0.2s ease-in-out;
|
||||||
-moz-transition: all 0.2s ease-in-out;
|
-moz-transition: all 0.2s ease-in-out;
|
||||||
|
|
@ -870,8 +871,7 @@ section {
|
||||||
-ms-transition: all 0.2s ease-in-out;
|
-ms-transition: all 0.2s ease-in-out;
|
||||||
transition: all 0.2s ease-in-out;
|
transition: all 0.2s ease-in-out;
|
||||||
}
|
}
|
||||||
.wall-item-container .wall-item-links .icon:hover,
|
.wall-item-container .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon:hover {
|
||||||
.wall-item-container .wall-item-actions .icon:hover {
|
|
||||||
opacity: 1;
|
opacity: 1;
|
||||||
-webkit-transition: all 0.2s ease-in-out;
|
-webkit-transition: all 0.2s ease-in-out;
|
||||||
-moz-transition: all 0.2s ease-in-out;
|
-moz-transition: all 0.2s ease-in-out;
|
||||||
|
|
@ -1015,6 +1015,9 @@ section {
|
||||||
opacity: 0.5;
|
opacity: 0.5;
|
||||||
}
|
}
|
||||||
.wwto {
|
.wwto {
|
||||||
|
position: absolute !important;
|
||||||
|
width: 25px;
|
||||||
|
height: 25px;
|
||||||
background: #FFFFFF;
|
background: #FFFFFF;
|
||||||
border: 2px solid #364e59;
|
border: 2px solid #364e59;
|
||||||
height: 25px;
|
height: 25px;
|
||||||
|
|
@ -1245,9 +1248,7 @@ section {
|
||||||
height: 18px;
|
height: 18px;
|
||||||
}*/
|
}*/
|
||||||
/** acl **/
|
/** acl **/
|
||||||
#photo-edit-perms-select,
|
#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper {
|
||||||
#photos-upload-permissions-wrapper,
|
|
||||||
#profile-jot-acl-wrapper {
|
|
||||||
display: block!important;
|
display: block!important;
|
||||||
}
|
}
|
||||||
#acl-wrapper {
|
#acl-wrapper {
|
||||||
|
|
@ -1406,12 +1407,10 @@ ul.tabs li .active {
|
||||||
float: left;
|
float: left;
|
||||||
width: 200px;
|
width: 200px;
|
||||||
}
|
}
|
||||||
.field input,
|
.field input, .field textarea {
|
||||||
.field textarea {
|
|
||||||
width: 400px;
|
width: 400px;
|
||||||
}
|
}
|
||||||
.field input[type="checkbox"],
|
.field input[type="checkbox"], .field input[type="radio"] {
|
||||||
.field input[type="radio"] {
|
|
||||||
width: auto;
|
width: auto;
|
||||||
}
|
}
|
||||||
.field textarea {
|
.field textarea {
|
||||||
|
|
@ -1642,15 +1641,13 @@ ul.tabs li .active {
|
||||||
transition: all 0.2s ease-in-out;
|
transition: all 0.2s ease-in-out;
|
||||||
}
|
}
|
||||||
/* theme screenshot */
|
/* theme screenshot */
|
||||||
.screenshot,
|
.screenshot, #theme-preview {
|
||||||
#theme-preview {
|
|
||||||
position: absolute;
|
position: absolute;
|
||||||
width: 202px;
|
width: 202px;
|
||||||
left: 70%;
|
left: 70%;
|
||||||
top: 50px;
|
top: 50px;
|
||||||
}
|
}
|
||||||
.screenshot img,
|
.screenshot img, #theme-preview img {
|
||||||
#theme-preview img {
|
|
||||||
width: 200px;
|
width: 200px;
|
||||||
height: 150px;
|
height: 150px;
|
||||||
}
|
}
|
||||||
|
|
@ -1663,3 +1660,77 @@ footer {
|
||||||
margin-top: 25px;
|
margin-top: 25px;
|
||||||
clear: both;
|
clear: both;
|
||||||
}
|
}
|
||||||
|
/**
|
||||||
|
* ADMIN
|
||||||
|
*/
|
||||||
|
#pending-update {
|
||||||
|
float: right;
|
||||||
|
color: #ffffff;
|
||||||
|
font-weight: bold;
|
||||||
|
background-color: #FF0000;
|
||||||
|
padding: 0em 0.3em;
|
||||||
|
}
|
||||||
|
#adminpage dl {
|
||||||
|
clear: left;
|
||||||
|
margin-bottom: 2px;
|
||||||
|
padding-bottom: 2px;
|
||||||
|
border-bottom: 1px solid black;
|
||||||
|
}
|
||||||
|
#adminpage dt {
|
||||||
|
width: 200px;
|
||||||
|
float: left;
|
||||||
|
font-weight: bold;
|
||||||
|
}
|
||||||
|
#adminpage dd {
|
||||||
|
margin-left: 200px;
|
||||||
|
}
|
||||||
|
#adminpage h3 {
|
||||||
|
border-bottom: 1px solid #cccccc;
|
||||||
|
}
|
||||||
|
#adminpage .field label {
|
||||||
|
font-weight: bold;
|
||||||
|
}
|
||||||
|
#adminpage .submit {
|
||||||
|
clear: left;
|
||||||
|
text-align: right;
|
||||||
|
}
|
||||||
|
#adminpage #pluginslist {
|
||||||
|
margin: 0px;
|
||||||
|
padding: 0px;
|
||||||
|
}
|
||||||
|
#adminpage .plugin {
|
||||||
|
list-style: none;
|
||||||
|
display: block;
|
||||||
|
border: 1px solid #888888;
|
||||||
|
padding: 1em;
|
||||||
|
margin-bottom: 5px;
|
||||||
|
clear: left;
|
||||||
|
}
|
||||||
|
#adminpage .plugin desc {
|
||||||
|
margin-left: 2.5em;
|
||||||
|
}
|
||||||
|
#adminpage .toggleplugin {
|
||||||
|
float: left;
|
||||||
|
margin-right: 1em;
|
||||||
|
}
|
||||||
|
#adminpage table {
|
||||||
|
width: 100%;
|
||||||
|
border-bottom: 1px solid #000000;
|
||||||
|
margin: 5px 0px;
|
||||||
|
}
|
||||||
|
#adminpage table th {
|
||||||
|
text-align: left;
|
||||||
|
}
|
||||||
|
#adminpage table td .icon {
|
||||||
|
float: left;
|
||||||
|
}
|
||||||
|
#adminpage table tr:hover {
|
||||||
|
background-color: #bbc7d7;
|
||||||
|
}
|
||||||
|
#adminpage table#users img {
|
||||||
|
width: 16px;
|
||||||
|
height: 16px;
|
||||||
|
}
|
||||||
|
#adminpage .selectall {
|
||||||
|
text-align: right;
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -243,6 +243,18 @@
|
||||||
.icon.s48.language {
|
.icon.s48.language {
|
||||||
background-image: url("icons/language.png");
|
background-image: url("icons/language.png");
|
||||||
}
|
}
|
||||||
|
.icon.on {
|
||||||
|
background-image: url("icons/addon_on.png");
|
||||||
|
min-width: 16px;
|
||||||
|
height: 16px;
|
||||||
|
background-position: 0px 0px;
|
||||||
|
}
|
||||||
|
.icon.off {
|
||||||
|
background-image: url("icons/addon_off.png");
|
||||||
|
width: 16px;
|
||||||
|
height: 16px;
|
||||||
|
background-position: 0px 0px;
|
||||||
|
}
|
||||||
/* global */
|
/* global */
|
||||||
body {
|
body {
|
||||||
font-family: Liberation Sans, helvetica, arial, clean, sans-serif;
|
font-family: Liberation Sans, helvetica, arial, clean, sans-serif;
|
||||||
|
|
@ -255,8 +267,7 @@ body {
|
||||||
h4 {
|
h4 {
|
||||||
font-size: 1.1em;
|
font-size: 1.1em;
|
||||||
}
|
}
|
||||||
a,
|
a, a:link {
|
||||||
a:link {
|
|
||||||
color: #009100;
|
color: #009100;
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
}
|
}
|
||||||
|
|
@ -478,8 +489,7 @@ nav #nav-site-linkmenu .menu-popup {
|
||||||
right: 0px;
|
right: 0px;
|
||||||
left: auto;
|
left: auto;
|
||||||
}
|
}
|
||||||
nav #nav-notifications-linkmenu.on .icon.s22.notify,
|
nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-linkmenu.selected .icon.s22.notify {
|
||||||
nav #nav-notifications-linkmenu.selected .icon.s22.notify {
|
|
||||||
background-image: url("../../../images/icons/22/notify_on.png");
|
background-image: url("../../../images/icons/22/notify_on.png");
|
||||||
}
|
}
|
||||||
nav #nav-apps-link.selected {
|
nav #nav-apps-link.selected {
|
||||||
|
|
@ -668,15 +678,11 @@ aside #profiles-menu {
|
||||||
height: 48px;
|
height: 48px;
|
||||||
}
|
}
|
||||||
/* group member */
|
/* group member */
|
||||||
#contact-edit-drop-link,
|
#contact-edit-drop-link, .mail-list-delete-wrapper, .group-delete-wrapper {
|
||||||
.mail-list-delete-wrapper,
|
|
||||||
.group-delete-wrapper {
|
|
||||||
float: right;
|
float: right;
|
||||||
margin-right: 50px;
|
margin-right: 50px;
|
||||||
}
|
}
|
||||||
#contact-edit-drop-link .drophide,
|
#contact-edit-drop-link .drophide, .mail-list-delete-wrapper .drophide, .group-delete-wrapper .drophide {
|
||||||
.mail-list-delete-wrapper .drophide,
|
|
||||||
.group-delete-wrapper .drophide {
|
|
||||||
background-image: url('../../../images/icons/22/delete.png');
|
background-image: url('../../../images/icons/22/delete.png');
|
||||||
display: block;
|
display: block;
|
||||||
width: 22px;
|
width: 22px;
|
||||||
|
|
@ -685,9 +691,7 @@ aside #profiles-menu {
|
||||||
position: relative;
|
position: relative;
|
||||||
top: -50px;
|
top: -50px;
|
||||||
}
|
}
|
||||||
#contact-edit-drop-link .drop,
|
#contact-edit-drop-link .drop, .mail-list-delete-wrapper .drop, .group-delete-wrapper .drop {
|
||||||
.mail-list-delete-wrapper .drop,
|
|
||||||
.group-delete-wrapper .drop {
|
|
||||||
background-image: url('../../../images/icons/22/delete.png');
|
background-image: url('../../../images/icons/22/delete.png');
|
||||||
display: block;
|
display: block;
|
||||||
width: 22px;
|
width: 22px;
|
||||||
|
|
@ -817,8 +821,7 @@ section {
|
||||||
display: table;
|
display: table;
|
||||||
width: 750px;
|
width: 750px;
|
||||||
}
|
}
|
||||||
.wall-item-container .wall-item-item,
|
.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
|
||||||
.wall-item-container .wall-item-bottom {
|
|
||||||
display: table-row;
|
display: table-row;
|
||||||
}
|
}
|
||||||
.wall-item-container .wall-item-bottom {
|
.wall-item-container .wall-item-bottom {
|
||||||
|
|
@ -856,13 +859,11 @@ section {
|
||||||
.wall-item-container .wall-item-content img {
|
.wall-item-container .wall-item-content img {
|
||||||
max-width: 710px;
|
max-width: 710px;
|
||||||
}
|
}
|
||||||
.wall-item-container .wall-item-links,
|
.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
|
||||||
.wall-item-container .wall-item-actions {
|
|
||||||
display: table-cell;
|
display: table-cell;
|
||||||
vertical-align: middle;
|
vertical-align: middle;
|
||||||
}
|
}
|
||||||
.wall-item-container .wall-item-links .icon,
|
.wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon {
|
||||||
.wall-item-container .wall-item-actions .icon {
|
|
||||||
opacity: 0.5;
|
opacity: 0.5;
|
||||||
-webkit-transition: all 0.2s ease-in-out;
|
-webkit-transition: all 0.2s ease-in-out;
|
||||||
-moz-transition: all 0.2s ease-in-out;
|
-moz-transition: all 0.2s ease-in-out;
|
||||||
|
|
@ -870,8 +871,7 @@ section {
|
||||||
-ms-transition: all 0.2s ease-in-out;
|
-ms-transition: all 0.2s ease-in-out;
|
||||||
transition: all 0.2s ease-in-out;
|
transition: all 0.2s ease-in-out;
|
||||||
}
|
}
|
||||||
.wall-item-container .wall-item-links .icon:hover,
|
.wall-item-container .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon:hover {
|
||||||
.wall-item-container .wall-item-actions .icon:hover {
|
|
||||||
opacity: 1;
|
opacity: 1;
|
||||||
-webkit-transition: all 0.2s ease-in-out;
|
-webkit-transition: all 0.2s ease-in-out;
|
||||||
-moz-transition: all 0.2s ease-in-out;
|
-moz-transition: all 0.2s ease-in-out;
|
||||||
|
|
@ -1015,6 +1015,9 @@ section {
|
||||||
opacity: 0.5;
|
opacity: 0.5;
|
||||||
}
|
}
|
||||||
.wwto {
|
.wwto {
|
||||||
|
position: absolute !important;
|
||||||
|
width: 25px;
|
||||||
|
height: 25px;
|
||||||
background: #FFFFFF;
|
background: #FFFFFF;
|
||||||
border: 2px solid #364e59;
|
border: 2px solid #364e59;
|
||||||
height: 25px;
|
height: 25px;
|
||||||
|
|
@ -1245,9 +1248,7 @@ section {
|
||||||
height: 18px;
|
height: 18px;
|
||||||
}*/
|
}*/
|
||||||
/** acl **/
|
/** acl **/
|
||||||
#photo-edit-perms-select,
|
#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper {
|
||||||
#photos-upload-permissions-wrapper,
|
|
||||||
#profile-jot-acl-wrapper {
|
|
||||||
display: block!important;
|
display: block!important;
|
||||||
}
|
}
|
||||||
#acl-wrapper {
|
#acl-wrapper {
|
||||||
|
|
@ -1406,12 +1407,10 @@ ul.tabs li .active {
|
||||||
float: left;
|
float: left;
|
||||||
width: 200px;
|
width: 200px;
|
||||||
}
|
}
|
||||||
.field input,
|
.field input, .field textarea {
|
||||||
.field textarea {
|
|
||||||
width: 400px;
|
width: 400px;
|
||||||
}
|
}
|
||||||
.field input[type="checkbox"],
|
.field input[type="checkbox"], .field input[type="radio"] {
|
||||||
.field input[type="radio"] {
|
|
||||||
width: auto;
|
width: auto;
|
||||||
}
|
}
|
||||||
.field textarea {
|
.field textarea {
|
||||||
|
|
@ -1642,15 +1641,13 @@ ul.tabs li .active {
|
||||||
transition: all 0.2s ease-in-out;
|
transition: all 0.2s ease-in-out;
|
||||||
}
|
}
|
||||||
/* theme screenshot */
|
/* theme screenshot */
|
||||||
.screenshot,
|
.screenshot, #theme-preview {
|
||||||
#theme-preview {
|
|
||||||
position: absolute;
|
position: absolute;
|
||||||
width: 202px;
|
width: 202px;
|
||||||
left: 70%;
|
left: 70%;
|
||||||
top: 50px;
|
top: 50px;
|
||||||
}
|
}
|
||||||
.screenshot img,
|
.screenshot img, #theme-preview img {
|
||||||
#theme-preview img {
|
|
||||||
width: 200px;
|
width: 200px;
|
||||||
height: 150px;
|
height: 150px;
|
||||||
}
|
}
|
||||||
|
|
@ -1663,3 +1660,77 @@ footer {
|
||||||
margin-top: 25px;
|
margin-top: 25px;
|
||||||
clear: both;
|
clear: both;
|
||||||
}
|
}
|
||||||
|
/**
|
||||||
|
* ADMIN
|
||||||
|
*/
|
||||||
|
#pending-update {
|
||||||
|
float: right;
|
||||||
|
color: #ffffff;
|
||||||
|
font-weight: bold;
|
||||||
|
background-color: #FF0000;
|
||||||
|
padding: 0em 0.3em;
|
||||||
|
}
|
||||||
|
#adminpage dl {
|
||||||
|
clear: left;
|
||||||
|
margin-bottom: 2px;
|
||||||
|
padding-bottom: 2px;
|
||||||
|
border-bottom: 1px solid black;
|
||||||
|
}
|
||||||
|
#adminpage dt {
|
||||||
|
width: 200px;
|
||||||
|
float: left;
|
||||||
|
font-weight: bold;
|
||||||
|
}
|
||||||
|
#adminpage dd {
|
||||||
|
margin-left: 200px;
|
||||||
|
}
|
||||||
|
#adminpage h3 {
|
||||||
|
border-bottom: 1px solid #cccccc;
|
||||||
|
}
|
||||||
|
#adminpage .field label {
|
||||||
|
font-weight: bold;
|
||||||
|
}
|
||||||
|
#adminpage .submit {
|
||||||
|
clear: left;
|
||||||
|
text-align: right;
|
||||||
|
}
|
||||||
|
#adminpage #pluginslist {
|
||||||
|
margin: 0px;
|
||||||
|
padding: 0px;
|
||||||
|
}
|
||||||
|
#adminpage .plugin {
|
||||||
|
list-style: none;
|
||||||
|
display: block;
|
||||||
|
border: 1px solid #888888;
|
||||||
|
padding: 1em;
|
||||||
|
margin-bottom: 5px;
|
||||||
|
clear: left;
|
||||||
|
}
|
||||||
|
#adminpage .plugin desc {
|
||||||
|
margin-left: 2.5em;
|
||||||
|
}
|
||||||
|
#adminpage .toggleplugin {
|
||||||
|
float: left;
|
||||||
|
margin-right: 1em;
|
||||||
|
}
|
||||||
|
#adminpage table {
|
||||||
|
width: 100%;
|
||||||
|
border-bottom: 1px solid #000000;
|
||||||
|
margin: 5px 0px;
|
||||||
|
}
|
||||||
|
#adminpage table th {
|
||||||
|
text-align: left;
|
||||||
|
}
|
||||||
|
#adminpage table td .icon {
|
||||||
|
float: left;
|
||||||
|
}
|
||||||
|
#adminpage table tr:hover {
|
||||||
|
background-color: #bbc7d7;
|
||||||
|
}
|
||||||
|
#adminpage table#users img {
|
||||||
|
width: 16px;
|
||||||
|
height: 16px;
|
||||||
|
}
|
||||||
|
#adminpage .selectall {
|
||||||
|
text-align: right;
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,8 @@
|
||||||
&.type-text { background-image: url("../../../images/icons/@{size}/text.png"); }
|
&.type-text { background-image: url("../../../images/icons/@{size}/text.png"); }
|
||||||
|
|
||||||
&.language { background-image: url("icons/language.png"); }
|
&.language { background-image: url("icons/language.png"); }
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -59,5 +60,17 @@
|
||||||
.icons(48);
|
.icons(48);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
&.on {
|
||||||
|
background-image: url("icons/addon_on.png");
|
||||||
|
min-width:16px;
|
||||||
|
height: 16px;
|
||||||
|
background-position: 0px 0px;
|
||||||
|
}
|
||||||
|
&.off {
|
||||||
|
background-image: url("icons/addon_off.png");
|
||||||
|
width: 16px;
|
||||||
|
height: 16px;
|
||||||
|
background-position: 0px 0px;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
BIN
view/theme/quattro/icons/addon_off.png
Normal file
BIN
view/theme/quattro/icons/addon_off.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 438 B |
BIN
view/theme/quattro/icons/addon_on.png
Normal file
BIN
view/theme/quattro/icons/addon_on.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 428 B |
|
|
@ -1152,3 +1152,76 @@ footer { height: 100px; display: table-row; }
|
||||||
clear: both;
|
clear: both;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ADMIN
|
||||||
|
*/
|
||||||
|
#pending-update {
|
||||||
|
float:right;
|
||||||
|
color: #ffffff;
|
||||||
|
font-weight: bold;
|
||||||
|
background-color: #FF0000;
|
||||||
|
padding: 0em 0.3em;
|
||||||
|
|
||||||
|
}
|
||||||
|
#adminpage {
|
||||||
|
dl {
|
||||||
|
clear: left;
|
||||||
|
margin-bottom: 2px;
|
||||||
|
padding-bottom: 2px;
|
||||||
|
border-bottom: 1px solid black;
|
||||||
|
}
|
||||||
|
dt {
|
||||||
|
width: 200px;
|
||||||
|
float: left;
|
||||||
|
font-weight: bold;
|
||||||
|
}
|
||||||
|
dd {
|
||||||
|
margin-left: 200px;
|
||||||
|
}
|
||||||
|
h3 {
|
||||||
|
border-bottom: 1px solid #cccccc;
|
||||||
|
}
|
||||||
|
.field label {
|
||||||
|
font-weight: bold;
|
||||||
|
}
|
||||||
|
.submit {
|
||||||
|
clear:left;
|
||||||
|
text-align: right;
|
||||||
|
}
|
||||||
|
#pluginslist {
|
||||||
|
margin: 0px; padding: 0px;
|
||||||
|
}
|
||||||
|
.plugin {
|
||||||
|
list-style: none;
|
||||||
|
display: block;
|
||||||
|
border: 1px solid #888888;
|
||||||
|
padding: 1em;
|
||||||
|
margin-bottom: 5px;
|
||||||
|
clear: left;
|
||||||
|
desc {
|
||||||
|
margin-left: 2.5em;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.toggleplugin {
|
||||||
|
float:left;
|
||||||
|
margin-right: 1em;
|
||||||
|
}
|
||||||
|
table {
|
||||||
|
width:100%;
|
||||||
|
border-bottom: 1px solid #000000;
|
||||||
|
margin: 5px 0px;
|
||||||
|
th {
|
||||||
|
text-align: left;
|
||||||
|
}
|
||||||
|
td .icon {
|
||||||
|
float: left;
|
||||||
|
}
|
||||||
|
tr:hover {
|
||||||
|
background-color: #bbc7d7;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
table#users img {
|
||||||
|
width: 16px; height: 16px;
|
||||||
|
}
|
||||||
|
.selectall { text-align: right; }
|
||||||
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue