diff --git a/boot.php b/boot.php index 85b571c82..471231820 100644 --- a/boot.php +++ b/boot.php @@ -8,9 +8,9 @@ require_once("include/pgettext.php"); require_once('include/nav.php'); define ( 'FRIENDIKA_PLATFORM', 'Free Friendika'); -define ( 'FRIENDIKA_VERSION', '2.3.1119' ); +define ( 'FRIENDIKA_VERSION', '2.3.1122' ); define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); -define ( 'DB_UPDATE_VERSION', 1093 ); +define ( 'DB_UPDATE_VERSION', 1094 ); define ( 'EOL', "
\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); @@ -152,6 +152,8 @@ define ( 'ACTIVITY_DISLIKE', NAMESPACE_DFRN . '/dislike' ); define ( 'ACTIVITY_OBJ_HEART', NAMESPACE_DFRN . '/heart' ); define ( 'ACTIVITY_FRIEND', NAMESPACE_ACTIVITY_SCHEMA . 'make-friend' ); +define ( 'ACTIVITY_REQ_FRIEND', NAMESPACE_ACTIVITY_SCHEMA . 'request-friend' ); +define ( 'ACTIVITY_UNFRIEND', NAMESPACE_ACTIVITY_SCHEMA . 'remove-friend' ); define ( 'ACTIVITY_FOLLOW', NAMESPACE_ACTIVITY_SCHEMA . 'follow' ); define ( 'ACTIVITY_UNFOLLOW', NAMESPACE_ACTIVITY_SCHEMA . 'stop-following' ); define ( 'ACTIVITY_POST', NAMESPACE_ACTIVITY_SCHEMA . 'post' ); diff --git a/database.sql b/database.sql index f39728a33..15e2f2cca 100644 --- a/database.sql +++ b/database.sql @@ -114,6 +114,7 @@ CREATE TABLE IF NOT EXISTS `contact` ( CREATE TABLE IF NOT EXISTS `group` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `uid` int(10) unsigned NOT NULL, + `visible` tinyint(1) NOT NULL DEFAULT '0', `deleted` tinyint(1) NOT NULL DEFAULT '0', `name` char(255) NOT NULL, PRIMARY KEY (`id`) @@ -632,3 +633,12 @@ CREATE TABLE IF NOT EXISTS `search` ( INDEX ( `uid` ), INDEX ( `term` ) ) ENGINE = MyISAM DEFAULT CHARSET=utf8; + +CREATE TABLE IF NOT EXISTS `fserver` ( +`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY , +`server` CHAR( 255 ) NOT NULL , +`posturl` CHAR( 255 ) NOT NULL , +`key` TEXT NOT NULL, +INDEX ( `server` ) +) ENGINE = MyISAM DEFAULT CHARSET=utf8; + diff --git a/include/delivery.php b/include/delivery.php index 3ab820b62..46112d78e 100644 --- a/include/delivery.php +++ b/include/delivery.php @@ -96,6 +96,8 @@ function delivery_run($argv, $argc){ $uid = $r[0]['uid']; $updated = $r[0]['edited']; + if(! $parent_id) + return; $items = q("SELECT `item`.*, `sign`.`signed_text`,`sign`.`signature`,`sign`.`signer` diff --git a/include/items.php b/include/items.php index a1baf7471..32f0728c3 100644 --- a/include/items.php +++ b/include/items.php @@ -1491,6 +1491,20 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $secure_fee lose_follower($importer,$contact,$datarray,$item); return; } + + if(activity_match($datarray['verb'],ACTIVITY_REQ_FRIEND)) { + logger('consume-feed: New friend request'); + new_follower($importer,$contact,$datarray,$item,true); + return; + } + if(activity_match($datarray['verb'],ACTIVITY_UNFRIEND)) { + lose_sharer($importer,$contact,$datarray,$item); + return; + } + + + + if(! is_array($contact)) return; @@ -1522,7 +1536,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $secure_fee } } -function new_follower($importer,$contact,$datarray,$item) { +function new_follower($importer,$contact,$datarray,$item,$sharing = false) { $url = notags(trim($datarray['author-link'])); $name = notags(trim($datarray['author-name'])); $photo = notags(trim($datarray['author-avatar'])); @@ -1532,14 +1546,14 @@ function new_follower($importer,$contact,$datarray,$item) { $nick = $rawtag[0]['child'][NAMESPACE_POCO]['preferredUsername'][0]['data']; if(is_array($contact)) { - if($contact['network'] == 'stat' && $contact['rel'] == CONTACT_IS_SHARING) { + if(($contact['network'] == NETWORK_OSTATUS && $contact['rel'] == CONTACT_IS_SHARING) + || ($sharing && $contact['rel'] == CONTACT_IS_FOLLOWER)) { $r = q("UPDATE `contact` SET `rel` = %d WHERE `id` = %d AND `uid` = %d LIMIT 1", intval(CONTACT_IS_FRIEND), intval($contact['id']), intval($importer['uid']) ); } - // send email notification to owner? } else { @@ -1555,13 +1569,12 @@ function new_follower($importer,$contact,$datarray,$item) { dbesc($name), dbesc($nick), dbesc($photo), - dbesc('stat'), - intval(CONTACT_IS_FOLLOWER) + dbesc(($sharing) ? NETWORK_ZOT : NETWORK_OSTATUS), + intval(($sharing) ? CONTACT_IS_SHARING : CONTACT_IS_FOLLOWER) ); - $r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `pending` = 1 AND `rel` = %d LIMIT 1", + $r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `pending` = 1 LIMIT 1", intval($importer['uid']), - dbesc($url), - intval(CONTACT_IS_FOLLOWER) + dbesc($url) ); if(count($r)) $contact_record = $r[0]; @@ -1593,7 +1606,7 @@ function new_follower($importer,$contact,$datarray,$item) { '$sitename' => $a->config['sitename'] )); $res = mail($r[0]['email'], - t("You have a new follower at ") . $a->config['sitename'], + (($sharing) ? t('A new person is sharing with you at ') : t("You have a new follower at ")) . $a->config['sitename'], $email, 'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n" . 'Content-type: text/plain; charset=UTF-8' . "\n" @@ -1617,6 +1630,19 @@ function lose_follower($importer,$contact,$datarray,$item) { } } +function lose_sharer($importer,$contact,$datarray,$item) { + + if(($contact['rel'] == CONTACT_IS_FRIEND) || ($contact['rel'] == CONTACT_IS_FOLLOWER)) { + q("UPDATE `contact` SET `rel` = %d WHERE `id` = %d LIMIT 1", + intval(CONTACT_IS_FOLLOWER), + intval($contact['id']) + ); + } + else { + contact_remove($contact['id']); + } +} + function subscribe_to_hub($url,$importer,$contact,$submode = 'subscribe') { diff --git a/include/notifier.php b/include/notifier.php index 864fa517b..d1cd1cc73 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -123,6 +123,9 @@ function notifier_run($argv, $argc){ $uid = $r[0]['uid']; $updated = $r[0]['edited']; + if(! $parent_id) + return; + $items = q("SELECT `item`.*, `sign`.`signed_text`,`sign`.`signature`,`sign`.`signer` FROM `item` LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id` WHERE `parent` = %d ORDER BY `id` ASC", intval($parent_id) diff --git a/js/main.js b/js/main.js index 896cbeb56..e0694e47f 100644 --- a/js/main.js +++ b/js/main.js @@ -95,6 +95,16 @@ if(home == 0) { home = ''; $('#home-update').removeClass('show') } else { $('#home-update').addClass('show') } $('#home-update').html(home); + var intro = $(data).find('intro').text(); + if(intro == 0) { intro = ''; $('#intro-update').removeClass('show') } else { $('#intro-update').addClass('show') } + $('#intro-update').html(intro); + + var mail = $(data).find('mail').text(); + if(mail == 0) { mail = ''; $('#mail-update').removeClass('show') } else { $('#mail-update').addClass('show') } + $('#mail-update').html(mail); + + + var eNotif = $(data).find('notif') notif = eNotif.attr('count'); if (notif>0){ diff --git a/mod/message.php b/mod/message.php index 1bee45d48..d4772d026 100644 --- a/mod/message.php +++ b/mod/message.php @@ -45,13 +45,21 @@ function message_content(&$a) { $myprofile = $a->get_baseurl() . '/profile/' . $a->user['nickname']; - + if (($a->argc > 1) && ($a->argv[1] === 'new')) { + $tab = 'new'; + } else if ($a->argc == 2 && $a->argv[1] === 'sent') { + $tab = 'sent'; + } else { + $tab = 'inbox'; + } + $tpl = get_markup_template('mail_head.tpl'); $header = replace_macros($tpl, array( '$messages' => t('Messages'), '$inbox' => t('Inbox'), '$outbox' => t('Outbox'), - '$new' => t('New Message') + '$new' => t('New Message'), + '$activetab' => $tab )); @@ -90,6 +98,8 @@ function message_content(&$a) { if(($a->argc > 1) && ($a->argv[1] === 'new')) { + $o .= $header; + $tpl = get_markup_template('msg-header.tpl'); $a->page['htmlhead'] .= replace_macros($tpl, array( @@ -114,7 +124,6 @@ function message_content(&$a) { '$upload' => t('Upload photo'), '$insert' => t('Insert web link'), '$wait' => t('Please wait') - )); return $o; @@ -248,7 +257,6 @@ function message_content(&$a) { '$upload' => t('Upload photo'), '$insert' => t('Insert web link'), '$wait' => t('Please wait') - )); return $o; diff --git a/mod/photo.php b/mod/photo.php index 3994620f8..a5a5a1dc1 100644 --- a/mod/photo.php +++ b/mod/photo.php @@ -128,7 +128,14 @@ function photo_init(&$a) { } } + if(function_exists('header_remove')) { + header_remove('Pragma'); + header_remove('pragma'); + } + header("Content-type: image/jpeg"); + header("Expires: " . gmdate("D, d M Y H:i:s", time() + (3600*24)) . " GMT"); + header("Cache-Control: max-age=" . (3600*24)); echo $data; killme(); // NOTREACHED diff --git a/mod/photos.php b/mod/photos.php index 90d51000e..1321af192 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -92,15 +92,11 @@ EOT; function photos_post(&$a) { - logger('mod/photos.php: photos_post(): begin' , 'LOGGER_DEBUG'); + logger('mod-photos: photos_post(): begin' , 'LOGGER_DEBUG'); - foreach($_REQUEST AS $key => $val) { - logger('mod/photos.php: photos_post(): $_REQUEST key: ' . $key . ' val: ' . $val , 'LOGGER_DEBUG'); - } - foreach($_FILES AS $key => $val) { - logger('mod/photos.php: photos_post(): $_FILES key: ' . $key . ' val: ' . $val , 'LOGGER_DEBUG'); - } + logger('mod_photos: REQUEST ' . print_r($_REQUEST,true), LOGGER_DATA); + logger('mod_photos: FILES ' . print_r($_FILES,true), LOGGER_DATA); $can_post = false; $visitor = 0; @@ -585,6 +581,9 @@ function photos_post(&$a) { else $visible = 0; + if(intval($_REQUEST['not_visible'])) + $visible = 0; + $str_group_allow = perms2str(((is_array($_REQUEST['group_allow'])) ? $_REQUEST['group_allow'] : explode(',',$_REQUEST['group_allow']))); $str_contact_allow = perms2str(((is_array($_REQUEST['contact_allow'])) ? $_REQUEST['contact_allow'] : explode(',',$_REQUEST['contact_allow']))); $str_group_deny = perms2str(((is_array($_REQUEST['group_deny'])) ? $_REQUEST['group_deny'] : explode(',',$_REQUEST['group_deny']))); @@ -892,6 +891,7 @@ function photos_content(&$a) { '$nickname' => $a->data['user']['nickname'], '$newalbum' => t('New album name: '), '$existalbumtext' => t('or existing album name: '), + '$nosharetext' => t('Do not show a status post for this upload'), '$albumselect' => template_escape($albumselect), '$permissions' => t('Permissions'), '$aclselect' => (($visitor) ? '' : template_escape(populate_acl($a->user, $celeb))), diff --git a/mod/ping.php b/mod/ping.php index 30f1dc837..544a42e14 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -114,7 +114,7 @@ function ping_init(&$a) { function xmlize($href, $name, $url, $photo, $date, $message){ $notsxml = '%s'; return sprintf ( $notsxml, - $href, $name, $url, $photo, $date, $message + xmlify($href), xmlify($name), xmlify($url), xmlify($photo), xmlify($date), xmlify($message) ); } diff --git a/update.php b/update.php index 0dd599e83..723f12c1a 100644 --- a/update.php +++ b/update.php @@ -1,6 +1,6 @@

$desc

-
diff --git a/view/photos_upload.tpl b/view/photos_upload.tpl index c7c61c6db..318a92427 100644 --- a/view/photos_upload.tpl +++ b/view/photos_upload.tpl @@ -13,6 +13,11 @@
+
+ + +
+
diff --git a/view/theme/darkbubble/calendar.png b/view/theme/darkbubble/calendar.png deleted file mode 100644 index 705a75b8a..000000000 Binary files a/view/theme/darkbubble/calendar.png and /dev/null differ diff --git a/view/theme/darkbubble/connect.png b/view/theme/darkbubble/connect.png deleted file mode 100644 index b76fc13dc..000000000 Binary files a/view/theme/darkbubble/connect.png and /dev/null differ diff --git a/view/theme/darkbubble/contact_edit.tpl b/view/theme/darkbubble/contact_edit.tpl deleted file mode 100644 index 59747c62d..000000000 --- a/view/theme/darkbubble/contact_edit.tpl +++ /dev/null @@ -1,67 +0,0 @@ - -

$header

- -
$name
- -$nettype - -
- - -
- - -
- - -
- - {{ if $poll_enabled }} -
-
$lastupdtext$last_update
-
$updpub
- $poll_interval - -
- {{ endif }} -
-
- -$insecure -$blocked -$ignored - - -$lblsuggest - -
-

$lbl_info1

- -
-
- - - -
-

$lbl_vis1

-

$lbl_vis2 -

-
-$profile_select -
- - - - -
diff --git a/view/theme/darkbubble/dbicons.png b/view/theme/darkbubble/dbicons.png new file mode 100644 index 000000000..696ef779c Binary files /dev/null and b/view/theme/darkbubble/dbicons.png differ diff --git a/view/theme/darkbubble/group_drop.tpl b/view/theme/darkbubble/group_drop.tpl deleted file mode 100644 index f088fc06f..000000000 --- a/view/theme/darkbubble/group_drop.tpl +++ /dev/null @@ -1,8 +0,0 @@ -
- Delete Group -
-
diff --git a/view/theme/darkbubble/group_edit.tpl b/view/theme/darkbubble/group_edit.tpl deleted file mode 100644 index a8b3f92a0..000000000 --- a/view/theme/darkbubble/group_edit.tpl +++ /dev/null @@ -1,16 +0,0 @@ -

$title

- - -
-
-
- - - - $drop -
-
-
$desc
-
-
-
diff --git a/view/theme/darkbubble/groups.png b/view/theme/darkbubble/groups.png deleted file mode 100644 index a65a7218c..000000000 Binary files a/view/theme/darkbubble/groups.png and /dev/null differ diff --git a/view/theme/darkbubble/icons.png b/view/theme/darkbubble/icons.png deleted file mode 100644 index 57c4bfb05..000000000 Binary files a/view/theme/darkbubble/icons.png and /dev/null differ diff --git a/view/theme/darkbubble/icons.svg b/view/theme/darkbubble/icons.svg deleted file mode 100644 index b435ba665..000000000 --- a/view/theme/darkbubble/icons.svg +++ /dev/null @@ -1,1442 +0,0 @@ - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - YouTube - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Lorem Ip - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ? - ? - - diff --git a/view/theme/darkbubble/jot-header.tpl b/view/theme/darkbubble/jot-header.tpl deleted file mode 100644 index 0093bf82a..000000000 --- a/view/theme/darkbubble/jot-header.tpl +++ /dev/null @@ -1,251 +0,0 @@ - - - - - - diff --git a/view/theme/darkbubble/jot.tpl b/view/theme/darkbubble/jot.tpl deleted file mode 100644 index d60e8adc2..000000000 --- a/view/theme/darkbubble/jot.tpl +++ /dev/null @@ -1,75 +0,0 @@ - -
-
-
 
- -
- -
-
- -
- - - - - - - - - - - {{ if $content }}{{ endif }} - - - - - - - - - - - - - - -
- -
-
- $acl -
-
$emailcc
-
- $jotnets -
-
- -
-
-
diff --git a/view/theme/darkbubble/login-bg.gif b/view/theme/darkbubble/login-bg.gif deleted file mode 100644 index cde836c89..000000000 Binary files a/view/theme/darkbubble/login-bg.gif and /dev/null differ diff --git a/view/theme/darkbubble/login.tpl b/view/theme/darkbubble/login.tpl deleted file mode 100644 index 2c879d69a..000000000 --- a/view/theme/darkbubble/login.tpl +++ /dev/null @@ -1,25 +0,0 @@ - -
- -
- - -
-
-
- - -
-
-
- - $lostlink -
-
- -
-
- diff --git a/view/theme/darkbubble/lrarrow.gif b/view/theme/darkbubble/lrarrow.gif deleted file mode 100644 index fa2676944..000000000 Binary files a/view/theme/darkbubble/lrarrow.gif and /dev/null differ diff --git a/view/theme/darkbubble/mail_head.tpl b/view/theme/darkbubble/mail_head.tpl deleted file mode 100644 index 89615cbd0..000000000 --- a/view/theme/darkbubble/mail_head.tpl +++ /dev/null @@ -1,7 +0,0 @@ -

$messages

- - diff --git a/view/theme/darkbubble/menu-user-pin.png b/view/theme/darkbubble/menu-user-pin.png deleted file mode 100644 index 6becfbb66..000000000 Binary files a/view/theme/darkbubble/menu-user-pin.png and /dev/null differ diff --git a/view/theme/darkbubble/nav.tpl b/view/theme/darkbubble/nav.tpl deleted file mode 100644 index a2171d431..000000000 --- a/view/theme/darkbubble/nav.tpl +++ /dev/null @@ -1,55 +0,0 @@ - - diff --git a/view/theme/darkbubble/next.png b/view/theme/darkbubble/next.png deleted file mode 100644 index 353e2e72a..000000000 Binary files a/view/theme/darkbubble/next.png and /dev/null differ diff --git a/view/theme/darkbubble/notifications.png b/view/theme/darkbubble/notifications.png deleted file mode 100644 index 803257fec..000000000 Binary files a/view/theme/darkbubble/notifications.png and /dev/null differ diff --git a/view/theme/darkbubble/photo_view.tpl b/view/theme/darkbubble/photo_view.tpl deleted file mode 100644 index 4582751c6..000000000 --- a/view/theme/darkbubble/photo_view.tpl +++ /dev/null @@ -1,40 +0,0 @@ -
-

$album.1

- - - -
- {{ if $prevlink }}{{ endif }} - - {{ if $nextlink }}{{ endif }} -
- -
-
$desc
-{{ if $tags }} -
$tags.0
-
$tags.1
-{{ endif }} -{{ if $tags.2 }}
$tags.3
{{ endif }} - -{{ if $edit }}$edit{{ endif }} - -{{ if $likebuttons }} -
- $likebuttons - $like - $dislike -
-{{ endif }} - -$comments - -$paginate - diff --git a/view/theme/darkbubble/photography.png b/view/theme/darkbubble/photography.png deleted file mode 100644 index 7ec919f2b..000000000 Binary files a/view/theme/darkbubble/photography.png and /dev/null differ diff --git a/view/theme/darkbubble/premium.png b/view/theme/darkbubble/premium.png deleted file mode 100644 index 1ad601c0f..000000000 Binary files a/view/theme/darkbubble/premium.png and /dev/null differ diff --git a/view/theme/darkbubble/prev.png b/view/theme/darkbubble/prev.png deleted file mode 100644 index 0ae6022af..000000000 Binary files a/view/theme/darkbubble/prev.png and /dev/null differ diff --git a/view/theme/darkbubble/profile_entry.tpl b/view/theme/darkbubble/profile_entry.tpl deleted file mode 100644 index 82c04cc20..000000000 --- a/view/theme/darkbubble/profile_entry.tpl +++ /dev/null @@ -1,11 +0,0 @@ - -
-
-$alt -
-
- -
$visible
-
-
- diff --git a/view/theme/darkbubble/profile_tabs.tpl b/view/theme/darkbubble/profile_tabs.tpl deleted file mode 100644 index c236490b2..000000000 --- a/view/theme/darkbubble/profile_tabs.tpl +++ /dev/null @@ -1,9 +0,0 @@ - -
- $status - $profile - $photos - {{ if $events }}$events{{ endif }} - {{ if $notes }}$notes{{ endif }} -
-
diff --git a/view/theme/darkbubble/profile_vcard.tpl b/view/theme/darkbubble/profile_vcard.tpl deleted file mode 100644 index 0ee6919bc..000000000 --- a/view/theme/darkbubble/profile_vcard.tpl +++ /dev/null @@ -1,45 +0,0 @@ -
-
$profile.name
- - - {{ if $pdesc }}
$profile.pdesc
{{ endif }} -
$profile.name
- - - - {{ if $location }} -
$location
-
- {{ if $profile.address }}
$profile.address
{{ endif }} - - $profile.locality{{ if $profile.locality }}, {{ endif }} - $profile.region - $profile.postal-code - - {{ if $profile.country-name }}$profile.country-name{{ endif }} -
-
- {{ endif }} - - {{ if $gender }}
$gender
$profile.gender
{{ endif }} - - {{ if $profile.pubkey }}{{ endif }} - - {{ if $marital }}
♥$marital
$profile.marital
{{ endif }} - - {{ if $homepage }}
$homepage
$profile.homepage
{{ endif }} - - {{ inc diaspora_vcard.tpl }}{{ endinc }} - - -
- -$contact_block - - diff --git a/view/theme/darkbubble/search.png b/view/theme/darkbubble/search.png deleted file mode 100644 index 51c428594..000000000 Binary files a/view/theme/darkbubble/search.png and /dev/null differ diff --git a/view/theme/darkbubble/search_item.tpl b/view/theme/darkbubble/search_item.tpl deleted file mode 100644 index 7e5bfbe71..000000000 --- a/view/theme/darkbubble/search_item.tpl +++ /dev/null @@ -1,48 +0,0 @@ -
-
-
-
- - $name - menu -
-
    - $item_photo_menu -
-
-
-
-
{{ if $location }}$location {{ endif }}
-
-
- {{ if $lock }}
$lock
- {{ else }}
{{ endif }} -
-
-
- {{ if $drop.dropping }}{{ endif }} -
- {{ if $drop.dropping }}{{ endif }} -
-
-
-
$title
-
-
$body
-
-
- $name -
$ago
- -
- -
-
- {{ if $conv }}$conv.title{{ endif }} -
-
-
- -
diff --git a/view/theme/darkbubble/star.png b/view/theme/darkbubble/star.png deleted file mode 100644 index a327ba14e..000000000 Binary files a/view/theme/darkbubble/star.png and /dev/null differ diff --git a/view/theme/darkbubble/style.css b/view/theme/darkbubble/style.css index 03434d7f8..9336dc01b 100644 --- a/view/theme/darkbubble/style.css +++ b/view/theme/darkbubble/style.css @@ -1,7 +1,33 @@ @import url('../testbubble/style.css'); +.icon { + background-image: url('dbicons.png'); +} + body { background: #000000; color: #dddddd; } +.info-message { + color: #444444; +} + +#id_openid_url { + background: url(../testbubble/login-bg.gif) no-repeat #ffffff; + background-position: 0 50%; + padding-left: 18px; + width: 385px; + color: #000000; +} + +.vevent, .eventcal { + color: #000000; +} +.event-list-date { + color: #DDDDDD; +} + +.fortunate { + color: #8888FF !important; +} \ No newline at end of file diff --git a/view/theme/darkbubble/theme.php b/view/theme/darkbubble/theme.php new file mode 100644 index 000000000..326c98bbd --- /dev/null +++ b/view/theme/darkbubble/theme.php @@ -0,0 +1,4 @@ +theme_info = array( + 'extends' => 'testbubble', +); diff --git a/view/theme/darkbubble/user.png b/view/theme/darkbubble/user.png deleted file mode 100644 index df899e7e0..000000000 Binary files a/view/theme/darkbubble/user.png and /dev/null differ diff --git a/view/theme/darkbubble/wall_item.tpl b/view/theme/darkbubble/wall_item.tpl deleted file mode 100644 index 70ec00dd9..000000000 --- a/view/theme/darkbubble/wall_item.tpl +++ /dev/null @@ -1,75 +0,0 @@ - -
-
-
-
- - $name - - menu -
-
    - $item_photo_menu -
-
-
-
-
{{ if $location }}$location {{ endif }}
-
-
- {{ if $lock }}
$lock
- {{ else }}
{{ endif }} -
-
-
$title
-
-
$body
-
- -
- {{ if $vote }} - - {{ endif }} - {{ if $plink }} -
- {{ endif }} - {{ if $edpost }} - - {{ endif }} - - {{ if $star }} - - {{ endif }} - -
- {{ if $drop.dropping }}{{ endif }} -
- {{ if $drop.dropping }}{{ endif }} -
- - -
- -
- $name -
$ago
- -
-
-
- -
$dislike
-
- $comment -
-
- -
- diff --git a/view/theme/darkbubble/wallwall_item.tpl b/view/theme/darkbubble/wallwall_item.tpl deleted file mode 100644 index 8819103a3..000000000 --- a/view/theme/darkbubble/wallwall_item.tpl +++ /dev/null @@ -1,74 +0,0 @@ -
-
-
-
- - $owner_name -
-
$wall
-
- - $name - menu -
-
    - $item_photo_menu -
-
- -
-
-
{{ if $location }}$location {{ endif }}
-
-
- {{ if $lock }}
$lock
- {{ else }}
{{ endif }} -
-
- {{ if $vote }} - - {{ endif }} - {{ if $plink }} -
- {{ endif }} - {{ if $edpost }} - - {{ endif }} - - {{ if $star }} - - {{ endif }} - -
- {{ if $drop.dropping }}{{ endif }} -
- {{ if $drop.dropping }}{{ endif }} -
-
-
-
$title
-
-
$body
-
-
- $name -
$ago
-
-
-
- -
$dislike
-
- $comment -
-
- -
- diff --git a/view/theme/duepuntozero/nav.tpl b/view/theme/duepuntozero/nav.tpl index 82ac178e8..efc95bde1 100644 --- a/view/theme/duepuntozero/nav.tpl +++ b/view/theme/duepuntozero/nav.tpl @@ -32,7 +32,7 @@ {{ endif }} {{ if $nav.notifications }} $nav.notifications.1 - + {{ endif }} {{ if $nav.messages }} $nav.messages.1 diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index 1fe8fb2f4..4769da8af 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -1559,6 +1559,8 @@ input#dfrn-url { display:block!important; } + + #acl-wrapper { width: 690px; float:left; @@ -1917,6 +1919,10 @@ a.mail-list-link { float: left; width: 175px; } + +#photos-upload-noshare { + margin-bottom: 10px; +} #photos-upload-existing-album-text { float: left; width: 175px; diff --git a/view/theme/testbubble/mail_head.tpl b/view/theme/testbubble/mail_head.tpl index 2a4fc42ea..2a4596cd6 100644 --- a/view/theme/testbubble/mail_head.tpl +++ b/view/theme/testbubble/mail_head.tpl @@ -1,7 +1,7 @@

$messages

diff --git a/view/theme/testbubble/photo_album.tpl b/view/theme/testbubble/photo_album.tpl new file mode 100644 index 000000000..a0e3f46c4 --- /dev/null +++ b/view/theme/testbubble/photo_album.tpl @@ -0,0 +1,8 @@ +
+ + $imgalt +
+

$desc

+ +
+
diff --git a/view/theme/testbubble/photo_top.tpl b/view/theme/testbubble/photo_top.tpl new file mode 100644 index 000000000..d552409c4 --- /dev/null +++ b/view/theme/testbubble/photo_top.tpl @@ -0,0 +1,8 @@ + +
+
+ $imgalt +
+
$albumname
+
+
diff --git a/view/theme/testbubble/style.css b/view/theme/testbubble/style.css index deae9ae58..8ef2b6619 100644 --- a/view/theme/testbubble/style.css +++ b/view/theme/testbubble/style.css @@ -361,7 +361,7 @@ ul#user-menu-popup li a.nav-sep { border-top: 1px solid #989898; border-style:in #notifications { height: 32px; position: absolute; - top:10px; left: 650px; + top:10px; left: 40%; } .nav-ajax-update { width: 44px; @@ -373,10 +373,10 @@ ul#user-menu-popup li a.nav-sep { border-top: 1px solid #989898; border-style:in padding-top: 0.5em; float: left; padding-left: 11px; - display: none; + /*display: none;*/ } #net-update { background-position: 0px 0px; } -#mail-update { background-position: 0px -42px; } +#mail-update { background-position: 0px -40px; } #notify-update { background-position: 0px -84px; } #home-update { background-position: 0px -126px; } @@ -840,11 +840,16 @@ profile-jot-banner-wrapper { /* = Posts = */ /* ========= */ -.wall-item-outside-wrapper { - margin-top: 50px; +.wall-item-outside-wrapper { + max-width: 85%; + border-bottom: 1px solid #dedede; + margin-top: 20px; + padding-right: 10px; + overflow: hidden; } + .wall-item-outside-wrapper-end { clear: both;} -.wall-item-content-wrapper { position: relative; max-width: 95%; } +.wall-item-content-wrapper { position: relative; max-width: 100%; } .wall-item-photo-menu { display: none;} .wall-item-photo-menu-button { display:none; @@ -890,12 +895,13 @@ profile-jot-banner-wrapper { } .wall-item-outside-wrapper.comment .wall-item-tools { - margin: 5px 5px 10px 60px; + margin: 5px 5px 10px 70px; float: left; } .wall-item-like-buttons { float: left; + padding-left: 10px; } .wall-item-like-buttons a.icon { float: left; @@ -924,9 +930,13 @@ profile-jot-banner-wrapper { float: left; } .wall-item-title { font-size: 1.2em; font-weight: bold;} -.wall-item-body { margin-left: 140px; padding-right: 20px; } +.wall-item-body { + margin-left: 140px; + padding-right: 10px; + max-width: 85%; +} + .wall-item-body p { - max-width: 600px; font-size: 0.8em; } .wall-item-lock-wrapper { float: right; } @@ -936,6 +946,7 @@ profile-jot-banner-wrapper { clear: left; font-size: 0.9em; margin: 4px 0px 0px 140px; + padding-left: 10px; font-variant:small-caps; } @@ -1042,11 +1053,7 @@ profile-jot-banner-wrapper { .icon.drop, .icon.drophide { float: left; } #item-delete-selected { overflow: auto; width: 100%;} -.wall-item-outside-wrapper { - max-width: 83%; - border-bottom: 1px solid #dedede; - margin-top: 20px; -} + /* ============ */ /* = Comments = */ @@ -1055,11 +1062,11 @@ profile-jot-banner-wrapper { .ccollapse-wrapper { font-size: 0.9em; color: #898989; - margin-left: 80px; + margin-left: 60px; font-variant:small-caps; } -.wall-item-outside-wrapper.comment { margin-left: 80px; } +.wall-item-outside-wrapper.comment { margin-left: 70px; } .wall-item-outside-wrapper.comment .wall-item-photo { width: 40px!important; height: 40px!important; @@ -1072,7 +1079,13 @@ profile-jot-banner-wrapper { background-position: 35px center; } .wall-item-outside-wrapper.comment .wall-item-info { width: 60px; } -.wall-item-outside-wrapper.comment .wall-item-body { margin-left: 60px; max-width: 85%;} +.wall-item-outside-wrapper.comment .wall-item-body { + margin-left: 70px; + max-width: 85%; + padding-right: 10px; + padding-left: 10px; +} + .wall-item-outside-wrapper.comment .wall-item-author { margin-left: 60px;} .wall-item-outside-wrapper.comment .wall-item-photo-menu { @@ -1133,11 +1146,14 @@ profile-jot-banner-wrapper { } .wall-item-body code { - border-color: #CCCCCC; - border-style: solid; + font-family: Courier, monospace; + white-space: pre; + display: block; + overflow: auto; + border: 1px solid #cccccc; border-width: 1px 1px 1px 10px; - display: block; - padding-left: 10px; + padding-left: 10px; + margin-top: 20px; } /* =========== */ @@ -1249,9 +1265,18 @@ div[id$="wrapper"] br { clear: left; } /* = Photos = */ /* ========== */ +#side-bar-photos-albums h3:before { + content: url("photography.png"); + padding-right: 10px; + vertical-align: middle; +} + #side-bar-photos-albums li { - font-size: 1.2em; + font-size: 14px; font-variant: none; + text-align: left; + padding-left: 20px; + margin-bottom: 5px; } #photo-top-links { @@ -1279,15 +1304,31 @@ div[id$="wrapper"] br { clear: left; } background-color: #b20202; } -.photo-album-image-wrapper, -.photo-top-image-wrapper { - float: left; +.photo-album-image-wrapper { + float: left; margin: 0px 10px 10px 0px; padding-bottom: 30px; position:relative; } -#photo-photo { max-width: 100% } +.photo-top-image-wrapper { + float: left; + width: 180px; + height: 180px; + margin: 0px 10px 10px 0px; + padding-bottom: 30px; + position:relative; +} + +#photo-album-wrapper-inner { + position: relative; + float: left; + width: 180px; + height: 180px; + overflow: hidden; +} + +#photo-photo { max-width: 85%; height: auto; } #photo-photo img { max-width: 100% } .photo-top-image-wrapper a:hover, @@ -1296,12 +1337,8 @@ div[id$="wrapper"] br { clear: left; } border-bottom: 0px; } -.photo-top-photo, -.photo-album-photo { - width: 180px; - height: 180px; - overflow: hidden; -} +.photo-top-photo {} +.photo-album-photo {} .photo-top-album-name { position: absolute; @@ -1499,16 +1536,6 @@ input#photo_edit_form { margin-left: 190px; } -#side-bar-photos-albums h3:before { - content: url("photography.png"); - padding-right: 10px; - vertical-align: middle; -} - -#side-bar-photos-albums li { - margin-bottom: 5px; -} - #photo-album-edit-wrapper { margin-bottom: 10px; } @@ -1687,7 +1714,7 @@ margin-left: 0px; #prvmail-subject { font-weight: bold; - border: none; + border: 1px solid #dddddd; } /* ================= */ @@ -2216,7 +2243,7 @@ margin-left: 0px; display: inline; padding: 5px; margin-bottom: 10px; -/* -moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf; + -moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf; -webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf; box-shadow:inset 0px 1px 0px 0px #cfcfcf; background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) ); @@ -2228,7 +2255,7 @@ margin-left: 0px; border-radius:5px;*/ } -/*.group-delete-wrapper:hover { +.group-delete-wrapper:hover { background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) ); background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% ); filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808'); @@ -2245,7 +2272,7 @@ margin-left: 0px; .group-delete-wrapper a { color: #efefef; font-size: 0.9em; -}*/ +} #group-edit-desc { margin: 10px 0xp; } #group-new-text {font-size: 1.1em;} diff --git a/zot.txt b/zot.txt index 300b695ff..b160788e7 100644 --- a/zot.txt +++ b/zot.txt @@ -1,7 +1,7 @@ This is the Zot! social communications protocol. Specification revision: 1 -15 September 2011 +2 October 2011 Mike Macgirvin This specification is public domain. @@ -78,16 +78,21 @@ zot:env ******* This consists of RFC822-style header fields representing the sender and -recipient(s). Example: +recipient(s). Line lengths have no defined limit and RFC822 continuation +lines are not supported. If an inbound server is not able to process an +envelope or post due to size constraints, it SHOULD return a +"413 Entity too large" HTTP response. -From: bob@example.com -Sender: bob@example.com -To: alice@example.com +Example: -Both "From:" and "Sender:" MUST be provided, and represent a webfinger -address of the author and sender respectively. The webfinger address for -the From address MUST contain a discoverable salmon public key that -is needed to verify the enclosed salmon data. Sender is used to indicate +Z-From: zot:bob@example.com +Z-Sender: zot:bob@example.com +Z-To: zot:alice@example.com + +Both "Z-From:" and "Z-Sender:" MUST be provided, and represent a single +webfinger address of the author and sender respectively. The webfinger +address for the From address MUST contain a discoverable salmon public key +which is needed to verify the enclosed salmon data. Sender is used to indicate the webfinger identity responsible for transmitting this message. From indicates the message author. @@ -95,46 +100,91 @@ In web-based social systems, a reply to a message SHOULD be conveyed to all of the original message participants. Only the author of the original message may know all the recipients (such as those contained in Bcc: elements). The author of a message always provides 'From'. They MUST duplicate this -information as 'Sender'. +information as 'Sender' when posting a followup message. -A reply to a given message MUST be sent to the original From address, and MAY -be sent to any additional addresses in the recipient list. The original author -MUST send the reply to all known recipients of the original message, with -their webfinger identity as Sender, and the comment/reply author as From. +A reply to a given message MUST be sent to the From address of the original +post, and MAY be sent to any additional addresses in the recipient list. The +original post author MUST send the reply to all known recipients of the +original message, with their webfinger identity as Sender, and the +comment/reply author as From. Receiving agents SHOULD validate the From identity as the signer of the salmon magic envelope, and MAY reject it. They SHOULD also verify the Sender signature of the zot packet if it is different than the salmon signature. They MAY reject the message if the Sender is not allowed in their "friend list", or if they do not have a suitable relationship with the Sender, or if either -signature fails to validate. +signature fails to validate. Rejected messages for one of these reasons SHOULD +be indicated with a "400 Bad Request" HTTP response. -To: * +Z-To: * indicates a public message with no specifically enumerated recipients. -The fields To:, Cc:, and/or Bcc: MAY be present. At least one recipient field -MUST be present. These fields may use the entire syntax specified by RFC822, -for example: +The fields Z-To: and/or Z-Bcc: MAY be present. At least one recipient field +MUST be present. -To: "Bob Smith" , "Alice Jones" +Z-To: zot:bob@example.com, zot:alice@example.com, mailto:dave@example.com +Z-Bcc: zot:https://example.com/profile/richard -is a valid entry. A zot envelope is UTF-8 encoded, which differs from RFC822. -The host component MUST be US-ASCII, with punycode translation of -internationalised domain names applied. +are valid entries. Adresses are comma separated and individual entries MUST NOT +contain commas. There MAY be any number of ASCII space characters between +entries for legibility. Header lines are terminated with a linefeed character +(ASCII 0x0A). -The entire envelope is then encrypted using alg with env_key and env_iv and +This specification provides the following foreign protocol address prefixes +for use in Z-To: or Z-Bcc: elements: + +zot: - normal zot delivery using webfinger or LRDD resolvable address +ostatus: - normal OStatus delivery using webfinger or LRDD resovable address +diaspora: - Diaspora network delivery using webfinger address +facebook: - Facebook profile page URL +twitter: - Twitter personal page URL without AJAX '#!' fragment +mailto: - email RFC822/ESMTP address + +Examples: + +twitter:http://twitter.com/bjensen +facebook:http://facebook.com/profile.php?id=000000001 + +Foreign protocol addresses which have not been defined in this specification +or future revisions of this specification and which are unknown to the +recipient delivery process MAY be ignored. + +In cases where an address may contain either a webfinger or LRDD address, the +webfinger address SHOULD be used preferentially. + + +Z-Bcc: +****** + +The Z-Bcc element may contain one or more addresses which are hidden from end +user presentation. A zot receiving system MUST NOT store or allow for +the display of the Bcc information. Implementations which require extreme +privacy SHOULD send individual posts to each of the Bcc: recipients containing +only a single address. They MAY send all Bcc: posts using bulk delivery, +however this may have privacy implications as there is no guarantee a +receiving system will not log, store, or otherwise reveal the contents of the +Bcc recipient list. + +Z-To: addresses MAY be shown to an end user. + + +Envelope encryption +******************* + + +The entire envelope is encrypted using alg with env_key and env_iv and base64url encoded for transmission. -The zot envelope MAY include remote addresses. A zot delivery agent MUST parse -all addresses and determine whether a delivery address to the current endpoint -is valid. This may be the result of: +The zot envelope MAY include remote addresses. A zot inbound delivery agent +MUST parse the envelope and determine whether a delivery address to the +current endpoint is valid. This may be the result of: 1. An address contains the public message wildcard '*' 2. The current endpoint is a personal endpoint and one of the recipients -listed in the To:, Cc:, or Bcc: addresses matches the webfinger address of +listed in the Z-To: or Z-Bcc: addresses matches the webfinger address of the "owner" of the endpoint. 3. The current endpoint is a bulk delivery endpoint. The bulk delivery @@ -219,7 +269,8 @@ We anticipate this specification will in the future allow for a close variant of "message/rfc822" and which may include MIME. This may also be used to embed alternate message formats and protocols such as "application/x-diaspora+xml". If a delivery agent is unable to provide any -acceptable data format, the delivery MUST be terminated/cancelled. +acceptable data format to the remote system, the delivery to that system MUST +be terminated/cancelled. Foreign Messages **************** @@ -233,9 +284,18 @@ systems MAY reject foreign messages. -********************** -* Zid authentication * -********************** + + +******************************* +* Zid (Zot-ID) authentication * +******************************* + +This section of the document is considered separate from the delivery +specification precding it and represents a different protocol, which is +currently incomplete. This will be split off into another document in the +future, but is presented here as a synergistic component of the Zot network +model. + URLs may be present within a zot message which refer to private and/or protected resources. Zid uses OpenID to gain access to these protected